aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Withnall <pwithnall@svn.gnome.org>2008-05-25 20:54:42 +0800
committerPhilip Withnall <pwithnall@src.gnome.org>2008-05-25 20:54:42 +0800
commit301cd7ac468273f5b4b321d396bee61444741096 (patch)
tree50e07b20795457c93a1c99d1a1c8b8d701417d4f
parent1f403c4f41bc29e0c2e742e78de4e7411dfb5138 (diff)
downloadgsoc2013-evolution-301cd7ac468273f5b4b321d396bee61444741096.tar.gz
gsoc2013-evolution-301cd7ac468273f5b4b321d396bee61444741096.tar.zst
gsoc2013-evolution-301cd7ac468273f5b4b321d396bee61444741096.zip
Updated British English translation.
2008-05-25 Philip Withnall <pwithnall@svn.gnome.org> * en_GB.po: Updated British English translation. svn path=/trunk/; revision=35546
-rw-r--r--po/ChangeLog4
-rw-r--r--po/en_GB.po4835
2 files changed, 2607 insertions, 2232 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 867de6fff1..e12a42a613 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-25 Philip Withnall <pwithnall@svn.gnome.org>
+
+ * en_GB.po: Updated British English translation.
+
2008-05-25 Clytie Siddall <clytie@riverland.net.au>
* vi.po: Updated Vietnamese translation.
diff --git a/po/en_GB.po b/po/en_GB.po
index c2aa6fe2df..3b0b470821 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,11 +2,12 @@
# Robert Brady <rwb197@zepler.org>, 2000.
# Gareth Owen <gowen72@yahoo.com>, David Lodge <dave@cirt.net>, 2004.
#
+#: ../shell/main.c:695
msgid ""
msgstr ""
"Project-Id-Version: evolution gnome-2.8\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-25 23:19+0000\n"
+"POT-Creation-Date: 2008-05-25 13:54+0100\n"
"PO-Revision-Date: 2008-02-17 10:08-0000\n"
"Last-Translator: David Lodge <dave@cirt.net>\n"
"Language-Team: \n"
@@ -39,7 +40,6 @@ msgstr[0] "current address book folder %s has %d card"
msgstr[1] "current address book folder %s has %d cards"
#: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:13
msgid "Open"
msgstr "Open"
@@ -161,8 +161,8 @@ msgstr "%A %d %b %Y"
#. specifiers or add anything.
#: ../a11y/calendar/ea-gnome-calendar.c:191
#: ../calendar/gui/calendar-component.c:750
-#: ../calendar/gui/e-day-view-top-item.c:841 ../calendar/gui/e-day-view.c:1545
-#: ../calendar/gui/e-week-view-main-item.c:331
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1545
+#: ../calendar/gui/e-week-view-main-item.c:340
msgid "%a %d %b"
msgstr "%a %d %b"
@@ -193,8 +193,8 @@ msgstr "%d %b %Y"
#. change the specifiers or add anything.
#: ../a11y/calendar/ea-gnome-calendar.c:221
#: ../calendar/gui/calendar-component.c:776
-#: ../calendar/gui/e-day-view-top-item.c:845 ../calendar/gui/e-day-view.c:1561
-#: ../calendar/gui/e-week-view-main-item.c:345
+#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1561
+#: ../calendar/gui/e-week-view-main-item.c:354
msgid "%d %b"
msgstr "%d %b"
@@ -381,7 +381,7 @@ msgstr "Could not get schema information for LDAP server."
#: ../addressbook/addressbook.error.xml.h:10
msgid "Could not remove addressbook."
-msgstr "Could not remove addressbook."
+msgstr "Could not remove address book."
#: ../addressbook/addressbook.error.xml.h:11
msgid ""
@@ -399,7 +399,7 @@ msgstr "Delete address book '{0}'?"
#: ../addressbook/addressbook.error.xml.h:13
msgid "Error loading addressbook."
-msgstr "Error loading addressbook."
+msgstr "Error loading address book."
#: ../addressbook/addressbook.error.xml.h:14
msgid "Error saving {0} to {1}: {2}"
@@ -411,7 +411,7 @@ msgstr "Failed to authenticate with LDAP server."
#. Unknown error
#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1730
msgid "Failed to delete contact"
msgstr "Failed to delete contact"
@@ -424,29 +424,25 @@ msgid "LDAP server did not respond with valid schema information."
msgstr "LDAP server did not respond with valid schema information."
#: ../addressbook/addressbook.error.xml.h:19
-msgid "Permission Denied."
-msgstr "Permission Denied."
-
-#: ../addressbook/addressbook.error.xml.h:20
msgid "Server Version"
msgstr "Server Version"
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:20
msgid "Some features may not work properly with your current server"
msgstr "Some features may not work properly with your current server"
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:21
msgid "The Evolution addressbook has quit unexpectedly."
-msgstr "The Evolution addressbook has quit unexpectedly."
+msgstr "The Evolution address book has quit unexpectedly."
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:22
msgid ""
"The image you have selected is large. Do you want to resize and store it?"
msgstr ""
"The image you have selected is large. Do you want to resize and store it?"
# addressbook:ldap-search-base secondary
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:23
msgid ""
"This LDAP server may use an older version of LDAP, which does not support "
"this functionality or it may be misconfigured. Ask your administrator for "
@@ -456,19 +452,19 @@ msgstr ""
"this functionality or it may be misconfigured. Ask your administrator for "
"supported search bases."
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:24
msgid "This address book will be removed permanently."
msgstr "This address book will be removed permanently."
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:25
msgid "This addressbook could not be opened."
-msgstr "This addressbook could not be opened."
+msgstr "This address book could not be opened."
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:26
msgid "This addressbook server does not have any suggested search bases."
-msgstr "This addressbook server does not have any suggested search bases."
+msgstr "This address book server does not have any suggested search bases."
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:27
msgid ""
"This addressbook server might be unreachable or the server name may be "
"misspelled or your network connection could be down."
@@ -476,35 +472,35 @@ msgstr ""
"This addressbook server might be unreachable or the server name may be "
"misspelt or your network connection could be down."
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:28
msgid "This server does not support LDAPv3 schema information."
msgstr "This server does not support LDAPv3 schema information."
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:29
msgid "Unable to open addressbook"
-msgstr "Unable to open addressbook"
+msgstr "Unable to open address book"
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:30
msgid "Unable to perform search."
msgstr "Unable to perform search."
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:31
msgid "Unable to save {0}."
msgstr "Unable to save {0}."
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:32
msgid "Would you like to save your changes?"
msgstr "Would you like to save your changes?"
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:33
msgid ""
"You are attempting to move a contact from one addressbook to another but it "
"cannot be removed from the source. Do you want to save a copy instead?"
msgstr ""
-"You are attempting to move a contact from one addressbook to another but it "
+"You are attempting to move a contact from one address book to another but it "
"cannot be removed from the source. Do you want to save a copy instead?"
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:34
msgid ""
"You are connecting to an unsupported GroupWise server and may encounter "
"problems using Evolution. For best results the server should be upgraded to "
@@ -514,6 +510,13 @@ msgstr ""
"problems using Evolution. For best results the server should be upgraded to "
"a supported version"
+#: ../addressbook/addressbook.error.xml.h:35
+msgid ""
+"You do not have enough permissions to delete contact in this Address Book."
+msgstr ""
+"You do not have enough permissions to delete a contact from this Address "
+"Book."
+
#: ../addressbook/addressbook.error.xml.h:36
msgid ""
"You have made modifications to this contact. Do you want to save these "
@@ -552,7 +555,7 @@ msgid "_Use as it is"
msgstr "_Use as it is"
#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
msgid "{0}"
msgstr "{0}"
@@ -569,7 +572,7 @@ msgstr "Default Sync Address:"
#: ../addressbook/conduit/address-conduit.c:1319
#: ../addressbook/conduit/address-conduit.c:1320
msgid "Could not load addressbook"
-msgstr "Could not load addressbook"
+msgstr "Could not load address book"
#: ../addressbook/conduit/address-conduit.c:1397
#: ../addressbook/conduit/address-conduit.c:1400
@@ -595,7 +598,7 @@ msgstr "Configure autocomplete here"
#. Create the contacts group
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:403
+#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:401
#: ../plugins/exchange-operations/exchange-delegates-user.c:88
#: ../plugins/exchange-operations/exchange-folder.c:581
msgid "Contacts"
@@ -606,8 +609,8 @@ msgid "Evolution Address Book"
msgstr "Evolution Address Book"
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address pop-up"
-msgstr "Evolution Address Book address pop-up"
+msgid "Evolution Address Book address popup"
+msgstr "Evolution Address Book address popup"
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
msgid "Evolution Address Book address viewer"
@@ -638,11 +641,11 @@ msgstr "Manage your S/MIME certificates here"
#: ../addressbook/gui/component/addressbook-component.c:144
#: ../addressbook/gui/component/addressbook-migrate.c:499
#: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:482
-#: ../calendar/gui/migration.c:584 ../calendar/gui/migration.c:1098
+#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:480
+#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1096
#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:308
-#: ../mail/mail-vfolder.c:216
+#: ../mail/mail-vfolder.c:216 ../mail/message-list.c:1455
msgid "On This Computer"
msgstr "On This Computer"
@@ -656,9 +659,9 @@ msgstr "On This Computer"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
#: ../addressbook/gui/widgets/eab-contact-display.c:660
#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:492
-#: ../calendar/gui/migration.c:592 ../calendar/gui/migration.c:1106
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1056
+#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:490
+#: ../calendar/gui/migration.c:590 ../calendar/gui/migration.c:1104
+#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1055
msgid "Personal"
msgstr "Personal"
@@ -715,19 +718,19 @@ msgid "Copy _book content locally for offline operation"
msgstr "Copy _book content locally for offline operation"
#: ../addressbook/gui/component/addressbook-config.c:981
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/ldap-config.glade.h:20
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
#: ../calendar/gui/dialogs/calendar-setup.c:369
#: ../calendar/gui/dialogs/calendar-setup.c:380
#: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:90
-#: ../plugins/itip-formatter/itip-formatter.c:2353
+#: ../mail/em-folder-properties.c:292 ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2362
#: ../smime/gui/smime-ui.glade.h:28
msgid "General"
msgstr "General"
#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:557
+#: ../addressbook/gui/widgets/e-addressbook-view.c:559
#: ../mail/importers/pine-importer.c:387
msgid "Address Book"
msgstr "Address Book"
@@ -741,13 +744,13 @@ msgid "Authentication"
msgstr "Authentication"
#: ../addressbook/gui/component/addressbook-config.c:991
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:15
#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
msgid "Details"
msgstr "Details"
#: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:935
+#: ../mail/em-folder-browser.c:960
msgid "Searching"
msgstr "Searching"
@@ -756,17 +759,17 @@ msgid "Downloading"
msgstr "Downloading"
#: ../addressbook/gui/component/addressbook-config.c:1204
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/ldap-config.glade.h:11
msgid "Address Book Properties"
msgstr "Address Book Properties"
#: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
msgid "Migrating..."
msgstr "Migrating..."
#: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
#, c-format
msgid "Migrating `%s':"
msgstr "Migrating `%s':"
@@ -846,12 +849,12 @@ msgid "Save As vCard..."
msgstr "Save As vCard..."
#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
#: ../calendar/gui/calendar-component.c:609
#: ../calendar/gui/e-calendar-table.c:1387
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:941
+#: ../calendar/gui/e-calendar-view.c:1709 ../calendar/gui/e-memo-table.c:941
#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2091 ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-tree.c:2092 ../mail/em-folder-view.c:1347
#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
#: ../ui/evolution-tasks.xml.h:24
@@ -871,19 +874,19 @@ msgid "Accessing LDAP Server anonymously"
msgstr "Accessing LDAP Server anonymously"
#: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
msgid "Failed to authenticate.\n"
msgstr "Failed to authenticate.\n"
#: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "Enter password for %s (user %s)"
#: ../addressbook/gui/component/addressbook.c:215
#: ../calendar/common/authentication.c:51
-#: ../plugins/publish-calendar/publish-calendar.c:93
+#: ../plugins/publish-calendar/publish-calendar.c:190
#: ../smime/gui/component.c:50
msgid "Enter password"
msgstr "Enter password"
@@ -962,105 +965,97 @@ msgid "<b>Authentication</b>"
msgstr "<b>Authentication</b>"
#: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Display</b>"
-msgstr "<b>Display</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
msgid "<b>Downloading</b>"
msgstr "<b>Downloading</b>"
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
msgid "<b>Searching</b>"
msgstr "<b>Searching</b>"
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "<b>Server Information</b>"
-msgstr "<b>Server Information</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
msgid "<b>Type:</b>"
msgstr "<b>Type:</b>"
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
msgid "Add Address Book"
msgstr "Add Address Book"
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/ldap-config.glade.h:12
#: ../mail/em-account-editor.c:777
msgid "Always"
msgstr "Always"
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
msgid "Anonymously"
msgstr "Anonymously"
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:14
msgid "Basic"
msgstr "Basic"
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:16
msgid "Distinguished name"
msgstr "Distinguished name"
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:17
msgid "Email address"
-msgstr "Email address"
+msgstr "E-mail address"
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:18
msgid ""
"Evolution will use this email address to authenticate you with the server."
msgstr ""
-"Evolution will use this email address to authenticate you with the server."
+"Evolution will use this e-mail address to authenticate you with the server."
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:19
msgid "Find Possible Search Bases"
msgstr "Find Possible Search Bases"
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:21
msgid "Lo_gin:"
msgstr "Lo_gin:"
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:22
#: ../mail/em-account-editor.c:776
msgid "Never"
msgstr "Never"
#. Translators: This string is a "Use secure connection" option for
#. the Mailer. It will not use an encrypted connection.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../addressbook/gui/component/ldap-config.glade.h:23
#: ../mail/em-account-editor.c:304
msgid "No encryption"
msgstr "No encryption"
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:24
msgid "One"
msgstr "One"
#. Translators: This string is a "Use secure connection" option for
#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
#. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:25
#: ../mail/em-account-editor.c:312
msgid "SSL encryption"
msgstr "SSL encryption"
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:26
msgid "Search Filter"
msgstr "Search Filter"
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:27
msgid "Search _base:"
msgstr "Search _base:"
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:28
msgid "Search _filter:"
msgstr "Search _filter:"
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:29
msgid "Search filter"
msgstr "Search filter"
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:30
msgid ""
"Search filter is the type of the objects searched for, while performing the "
"search. If this is not modified, by default search will be performed on "
@@ -1069,7 +1064,7 @@ msgstr ""
"Search filter is the type of object to be searched for. If this is not "
"modified, the default search will be performed on the type \"person\"."
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:31
msgid ""
"Selecting this option means that Evolution will only connect to your LDAP "
"server if your LDAP server supports SSL."
@@ -1077,7 +1072,7 @@ msgstr ""
"Selecting this option means that Evolution will only connect to your LDAP "
"server if your LDAP server supports SSL."
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:32
msgid ""
"Selecting this option means that Evolution will only connect to your LDAP "
"server if your LDAP server supports TLS."
@@ -1085,7 +1080,7 @@ msgstr ""
"Selecting this option means that Evolution will only connect to your LDAP "
"server if your LDAP server supports TLS."
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:33
msgid ""
"Selecting this option means that your server does not support either SSL or "
"TLS. This means that your connection will be insecure, and that you will be "
@@ -1095,23 +1090,23 @@ msgstr ""
"TLS. This means that your connection will be insecure, and that you will be "
"vulnerable to security exploits."
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:34
msgid "Sub"
msgstr "Sub"
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:35
msgid "Supported Search Bases"
msgstr "Supported Search Bases"
#. Translators: This string is a "Use secure connection" option for
#. the Mailer. TLS (Transport Layer Security) is commonly known by
#. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:36
#: ../mail/em-account-editor.c:308
msgid "TLS encryption"
msgstr "TLS encryption"
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:37
msgid ""
"The search base is the distinguished name (DN) of the entry where your "
"searches will begin. If you leave this blank, the search will begin at the "
@@ -1121,7 +1116,7 @@ msgstr ""
"searches will begin. If you leave this blank, the search will begin at the "
"root of the directory tree."
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:38
msgid ""
"The search scope defines how deep you would like the search to extend down "
"the directory tree. A search scope of \"sub\" will include all entries below "
@@ -1133,15 +1128,15 @@ msgstr ""
"your search base. A search scope of \"one\" will only include the entries "
"one level beneath your base."
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:39
msgid ""
"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
"\"."
msgstr ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
"\"."
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:40
msgid ""
"This is the maximum number of entries to download. Setting this number to be "
"too large will slow down your address book."
@@ -1149,17 +1144,17 @@ msgstr ""
"This is the maximum number of entries to download. Setting this number to be "
"too large will slow down your address book."
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:41
msgid ""
"This is the method Evolution will use to authenticate you. Note that "
"setting this to \"Email Address\" requires anonymous access to your ldap "
"server."
msgstr ""
"This is the method Evolution will use to authenticate you. Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
+"setting this to \"E-mail Address\" requires anonymous access to your LDAP "
"server."
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:42
msgid ""
"This is the name for this server that will appear in your Evolution folder "
"list. It is for display purposes only. "
@@ -1167,7 +1162,7 @@ msgstr ""
"This is the name for this server that will appear in your Evolution folder "
"list. It is for display purposes only. "
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:43
msgid ""
"This is the port on the LDAP server that Evolution will try to connect to. A "
"list of standard ports has been provided. Ask your system administrator what "
@@ -1177,69 +1172,69 @@ msgstr ""
"list of standard ports has been provided. Ask your system administrator what "
"port you should specify."
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:44
msgid "Using distinguished name (DN)"
msgstr "Using distinguished name (DN)"
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:45
msgid "Using email address"
-msgstr "Using email address"
+msgstr "Using e-mail address"
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:46
msgid "Whenever Possible"
msgstr "Whenever Possible"
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:47
msgid "_Add Address Book"
msgstr "_Add Address Book"
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:48
msgid "_Download limit:"
msgstr "_Download limit:"
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:49
msgid "_Find Possible Search Bases"
msgstr "_Find Possible Search Bases"
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:50
msgid "_Login method:"
msgstr "_Login method:"
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:51
#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:174
#: ../plugins/groupwise-features/properties.glade.h:11
#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
msgid "_Name:"
msgstr "_Name:"
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:52
msgid "_Port:"
msgstr "_Port:"
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:53
msgid "_Search scope:"
msgstr "_Search scope:"
-#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:184
+#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../mail/mail-config.glade.h:183
#: ../plugins/publish-calendar/publish-calendar.glade.h:26
msgid "_Server:"
msgstr "_Server:"
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:55
msgid "_Timeout:"
msgstr "_Timeout:"
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:56
msgid "_Use secure connection:"
msgstr "_Use secure connection:"
-#: ../addressbook/gui/component/ldap-config.glade.h:59
+#: ../addressbook/gui/component/ldap-config.glade.h:57
msgid "cards"
msgstr "cards"
-#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../addressbook/gui/component/ldap-config.glade.h:58
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
@@ -1251,7 +1246,7 @@ msgstr "minutes"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
msgid "<b>Email</b>"
-msgstr "<b>Email</b>"
+msgstr "<b>E-mail</b>"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
msgid "<b>Home</b>"
@@ -1286,7 +1281,7 @@ msgid "<b>Work</b>"
msgstr "<b>Work</b>"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
#: ../addressbook/gui/widgets/eab-contact-display.c:614
msgid "AIM"
msgstr "AIM"
@@ -1298,16 +1293,16 @@ msgid "Ca_tegories..."
msgstr "Ca_tegories..."
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
-#: ../addressbook/gui/widgets/e-minicard.c:194
+#: ../addressbook/gui/widgets/e-minicard.c:201
msgid "Contact"
msgstr "Contact"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:565
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2430
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:549
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:564
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2429
msgid "Contact Editor"
msgstr "Contact Editor"
@@ -1348,10 +1343,10 @@ msgstr "Telephone"
#. red
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
#: ../addressbook/gui/widgets/eab-contact-display.c:57
#: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1055
+#: ../mail/em-migrate.c:1054
msgid "Work"
msgstr "Work"
@@ -1472,17 +1467,17 @@ msgstr "Address"
#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
#: ../addressbook/gui/widgets/e-addressbook-model.c:312
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:187
+#: ../addressbook/gui/widgets/e-minicard.c:194
#: ../widgets/menus/gal-define-views-model.c:179
-#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3686
-#: ../widgets/text/e-text.c:3687
+#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
+#: ../widgets/text/e-text.c:3688
msgid "Editable"
msgstr "Editable"
@@ -1851,8 +1846,8 @@ msgid "Guinea"
msgstr "Guinea"
#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Guinea-bissau"
-msgstr "Guinea-bissau"
+msgid "Guinea-Bissau"
+msgstr "Guinea-Bissau"
#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
msgid "Guyana"
@@ -2471,7 +2466,7 @@ msgid "AOL Instant Messenger"
msgstr "AOL Instant Messenger"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
#: ../addressbook/gui/widgets/eab-contact-display.c:617
msgid "Jabber"
msgstr "Jabber"
@@ -2485,7 +2480,7 @@ msgid "Gadu-Gadu Messenger"
msgstr "Gadu-Gadu Messenger"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
#: ../addressbook/gui/widgets/eab-contact-display.c:616
msgid "ICQ"
msgstr "ICQ"
@@ -2496,8 +2491,8 @@ msgstr "Service"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:514
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/publish-calendar/publish-calendar.c:693
+#: ../plugins/save-calendar/csv-format.c:379
msgid "Location"
msgstr "Location"
@@ -2506,76 +2501,77 @@ msgid "Username"
msgstr "Username"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
#: ../addressbook/gui/widgets/eab-contact-display.c:58
msgid "Home"
msgstr "Home"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
#: ../addressbook/gui/widgets/eab-contact-display.c:59
+#: ../addressbook/gui/widgets/eab-contact-display.c:528
msgid "Other"
msgstr "Other"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
#: ../addressbook/gui/widgets/eab-contact-display.c:619
msgid "Yahoo"
msgstr "Yahoo"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
#: ../addressbook/gui/widgets/eab-contact-display.c:620
msgid "Gadu-Gadu"
msgstr "Gadu-Gadu"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
#: ../addressbook/gui/widgets/eab-contact-display.c:618
msgid "MSN"
msgstr "MSN"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
#: ../addressbook/gui/widgets/eab-contact-display.c:615
msgid "GroupWise"
msgstr "GroupWise"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
msgid "Source Book"
msgstr "Source Book"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
msgid "Target Book"
msgstr "Target Book"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
msgid "Is New Contact"
msgstr "Is New Contact"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
msgid "Writable Fields"
msgstr "Writable Fields"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
msgid "Required Fields"
msgstr "Required Fields"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:307
msgid "Changed"
msgstr "Changed"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:559
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2424
#, c-format
msgid "Contact Editor - %s"
msgstr "Contact Editor - %s"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2820
msgid "Please select an image for this contact"
msgstr "Please select an image for this contact"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
msgid "_No image"
msgstr "_No image"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3094
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -2583,23 +2579,23 @@ msgstr ""
"The contact data is invalid:\n"
"\n"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
#, c-format
msgid "'%s' has an invalid format"
msgstr "'%s' has an invalid format"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3105
#, c-format
msgid "%s'%s' has an invalid format"
msgstr "%s'%s' has an invalid format"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3120
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3131
#, c-format
msgid "%s'%s' is empty"
msgstr "%s'%s' is empty"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3146
msgid "Invalid contact."
msgstr "Invalid contact."
@@ -2785,7 +2781,7 @@ msgstr "_List name:"
#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
msgid "_Type an email address or drag a contact into the list below:"
-msgstr "_Type an email address or drag a contact into the list below:"
+msgstr "_Type an e-mail address or drag a contact into the list below:"
#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
msgid "Contact List Members"
@@ -2799,8 +2795,8 @@ msgstr "_Members"
#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
#: ../addressbook/gui/widgets/e-addressbook-model.c:298
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:217
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
+#: ../addressbook/gui/widgets/e-addressbook-view.c:216
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
#: ../addressbook/gui/widgets/e-minicard-view.c:508
msgid "Book"
msgstr "Book"
@@ -2827,7 +2823,7 @@ msgid ""
"The name or email of this contact already exists in this folder. Would you "
"like to add it anyway?"
msgstr ""
-"The name or email of this contact already exists in this folder. Would you "
+"The name or e-mail of this contact already exists in this folder. Would you "
"like to add it anyway?"
#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
@@ -2843,7 +2839,7 @@ msgid ""
"The name or email address of this contact already exists\n"
"in this folder. Would you like to add it anyway?"
msgstr ""
-"The name or email address of this contact already exists\n"
+"The name or e-mail address of this contact already exists\n"
"in this folder. Would you like to add it anyway?"
#: ../addressbook/gui/merging/eab-contact-merging.c:190
@@ -2859,10 +2855,10 @@ msgstr "_Merge"
#: ../addressbook/gui/widgets/eab-contact-display.c:592
#: ../addressbook/gui/widgets/eab-contact-display.c:597
#: ../addressbook/gui/widgets/eab-contact-display.c:600
-#: ../addressbook/gui/widgets/eab-contact-display.c:860
+#: ../addressbook/gui/widgets/eab-contact-display.c:879
#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
msgid "Email"
-msgstr "Email"
+msgstr "E-mail"
#: ../addressbook/gui/widgets/addresstypes.xml.h:1
#: ../addressbook/gui/widgets/e-addressbook-view.c:165
@@ -2874,7 +2870,7 @@ msgstr "Any field contains"
#: ../addressbook/gui/widgets/addresstypes.xml.h:2
#: ../addressbook/gui/widgets/e-addressbook-view.c:164
msgid "Email begins with"
-msgstr "Email begins with"
+msgstr "E-mail begins with"
#: ../addressbook/gui/widgets/addresstypes.xml.h:3
#: ../addressbook/gui/widgets/e-addressbook-view.c:163
@@ -2894,8 +2890,8 @@ msgstr[1] "%d contacts"
#: ../addressbook/gui/widgets/e-addressbook-model.c:305
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:231
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
#: ../addressbook/gui/widgets/e-minicard-view.c:515
msgid "Query"
msgstr "Query"
@@ -2908,8 +2904,8 @@ msgstr "Error getting book view"
#: ../widgets/table/e-table-click-to-add.c:510
#: ../widgets/table/e-table-selection-model.c:303
#: ../widgets/table/e-table.c:3335
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3550
-#: ../widgets/text/e-text.c:3551
+#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
+#: ../widgets/text/e-text.c:3552
msgid "Model"
msgstr "Model"
@@ -2917,107 +2913,106 @@ msgstr "Model"
msgid "Error modifying card"
msgstr "Error modifying card"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
msgid "Source"
msgstr "Source"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:501
+#: ../calendar/gui/e-meeting-list-view.c:509
#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
#: ../calendar/gui/e-memo-table.etspec.h:5
msgid "Type"
msgstr "Type"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:814
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:816
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1949
msgid "Save as vCard..."
msgstr "Save as vCard..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/dialogs/comp-editor.c:1128
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../calendar/gui/dialogs/comp-editor.c:1126
#: ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:924
#: ../ui/evolution-addressbook.xml.h:56
msgid "_Open"
msgstr "_Open"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
msgid "_New Contact..."
msgstr "_New Contact..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
msgid "New Contact _List..."
msgstr "New Contact _List..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
msgid "_Save as vCard..."
msgstr "_Save as vCard..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
msgid "_Forward Contact"
msgstr "_Forward Contact"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
msgid "_Forward Contacts"
msgstr "_Forward Contacts"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
msgid "Send _Message to Contact"
msgstr "Send _Message to Contact"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:947
msgid "Send _Message to List"
msgstr "Send _Message to List"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
msgid "Send _Message to Contacts"
msgstr "Send _Message to Contacts"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
msgid "_Print"
msgstr "_Print"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
msgid "Cop_y to Address Book..."
msgstr "Cop_y to Address Book..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
msgid "Mo_ve to Address Book..."
msgstr "Mo_ve to Address Book..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../ui/evolution-editor.xml.h:8
msgid "Cu_t"
msgstr "Cu_t"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/dialogs/comp-editor.c:457
+#: ../addressbook/gui/widgets/e-addressbook-view.c:957
+#: ../calendar/gui/dialogs/comp-editor.c:455
#: ../calendar/gui/e-calendar-table.c:1373
-#: ../calendar/gui/e-calendar-view.c:1690 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:3099 ../mail/em-folder-tree.c:997
-#: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2065
+#: ../calendar/gui/e-calendar-view.c:1694 ../calendar/gui/e-memo-table.c:932
+#: ../composer/e-msg-composer.c:2011 ../mail/em-folder-tree.c:998
+#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2045
#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
-#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution-editor.xml.h:17 ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
msgid "_Copy"
msgstr "_Copy"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:958
msgid "P_aste"
msgstr "P_aste"
#. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1511
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1520
#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
#: ../calendar/gui/cal-search-bar.c:684
msgid "Any Category"
msgstr "Any Category"
#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1730
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
msgid "Other error"
msgstr "Other error"
@@ -3052,7 +3047,7 @@ msgstr "Car Phone"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:169
+#: ../calendar/gui/e-cal-component-memo-preview.c:143
#: ../calendar/gui/e-cal-list-view.etspec.h:1
#: ../calendar/gui/e-calendar-table.etspec.h:3
#: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3070,11 +3065,11 @@ msgstr "Company Phone"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
msgid "Email 2"
-msgstr "Email 2"
+msgstr "E-mail 2"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
msgid "Email 3"
-msgstr "Email 3"
+msgstr "E-mail 3"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
msgid "Family Name"
@@ -3153,7 +3148,7 @@ msgid "Radio"
msgstr "Radio"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:513
+#: ../calendar/gui/e-meeting-list-view.c:521
#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
msgid "Role"
@@ -3188,10 +3183,10 @@ msgstr "Unit"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
msgid "Web Site"
-msgstr "Web Site"
+msgstr "Website"
#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:150
+#: ../addressbook/gui/widgets/e-minicard.c:157
#: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
#: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
#: ../widgets/table/e-table-click-to-add.c:524
@@ -3202,12 +3197,12 @@ msgstr "Web Site"
#: ../widgets/table/e-table-group-leaf.c:628
#: ../widgets/table/e-table-group-leaf.c:629
#: ../widgets/table/e-table-item.c:3078 ../widgets/table/e-table-item.c:3079
-#: ../widgets/text/e-text.c:3728 ../widgets/text/e-text.c:3729
+#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
msgid "Width"
msgstr "Width"
#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:157
+#: ../addressbook/gui/widgets/e-minicard.c:164
#: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
#: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
#: ../widgets/table/e-table-click-to-add.c:531
@@ -3217,12 +3212,12 @@ msgstr "Width"
#: ../widgets/table/e-table-group-leaf.c:621
#: ../widgets/table/e-table-group-leaf.c:622
#: ../widgets/table/e-table-item.c:3084 ../widgets/table/e-table-item.c:3085
-#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
msgid "Height"
msgstr "Height"
#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard.c:172
msgid "Has Focus"
msgstr "Has Focus"
@@ -3242,7 +3237,7 @@ msgstr "Text Model"
msgid "Max field name length"
msgstr "Max field name length"
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:137
msgid "Column Width"
msgstr "Column Width"
@@ -3300,21 +3295,22 @@ msgstr "Adapter"
#: ../addressbook/gui/widgets/e-minicard.c:102
msgid "Work Email"
-msgstr "Work Email"
+msgstr "Work E-mail"
#: ../addressbook/gui/widgets/e-minicard.c:103
msgid "Home Email"
-msgstr "Home Email"
+msgstr "Home E-mail"
#: ../addressbook/gui/widgets/e-minicard.c:104
+#: ../addressbook/gui/widgets/e-minicard.c:833
msgid "Other Email"
-msgstr "Other Email"
+msgstr "Other E-mail"
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:180
msgid "Selected"
msgstr "Selected"
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:187
msgid "Has Cursor"
msgstr "Has Cursor"
@@ -3323,7 +3319,7 @@ msgid "_Open Link in Browser"
msgstr "_Open Link in Browser"
#: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2809
msgid "_Copy Link Location"
msgstr "_Copy Link Location"
@@ -3334,7 +3330,7 @@ msgstr "_Send New Message To..."
#: ../addressbook/gui/widgets/eab-contact-display.c:175
#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
msgid "Copy _Email Address"
-msgstr "Copy _Email Address"
+msgstr "Copy _E-mail Address"
#: ../addressbook/gui/widgets/eab-contact-display.c:296
#: ../addressbook/gui/widgets/eab-contact-display.c:370
@@ -3349,7 +3345,7 @@ msgid "map"
msgstr "map"
#: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:846
msgid "List Members"
msgstr "List Members"
@@ -3373,12 +3369,12 @@ msgstr "Video Chat"
#: ../calendar/gui/calendar-commands.c:99
#: ../calendar/gui/calendar-component.c:795
#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2383
+#: ../calendar/gui/gnome-cal.c:2377
#: ../plugins/exchange-operations/exchange-delegates-user.c:88
#: ../plugins/exchange-operations/exchange-folder.c:575
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:400
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:431
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:544
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
#: ../plugins/hula-account-setup/camel-hula-listener.c:378
#: ../plugins/hula-account-setup/camel-hula-listener.c:407
#: ../plugins/publish-calendar/publish-calendar.glade.h:5
@@ -3410,80 +3406,80 @@ msgid "Web Log"
msgstr "Web Log"
#: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2335
+#: ../calendar/gui/e-calendar-view.c:2362
msgid "Birthday"
msgstr "Birthday"
#: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2336
+#: ../calendar/gui/e-calendar-view.c:2363
msgid "Anniversary"
msgstr "Anniversary"
-#: ../addressbook/gui/widgets/eab-contact-display.c:845
+#: ../addressbook/gui/widgets/eab-contact-display.c:864
msgid "Job Title"
msgstr "Job Title"
-#: ../addressbook/gui/widgets/eab-contact-display.c:881
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
msgid "Home page"
msgstr "Home page"
-#: ../addressbook/gui/widgets/eab-contact-display.c:889
+#: ../addressbook/gui/widgets/eab-contact-display.c:908
msgid "Blog"
msgstr "Blog"
#. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
msgid "Success"
msgstr "Success"
#. E_BOOK_ERROR_INVALID_ARG
#. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
msgid "Backend busy"
msgstr "Backend busy"
#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
msgid "Repository offline"
msgstr "Repository offline"
#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
msgid "Address Book does not exist"
msgstr "Address Book does not exist"
#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
msgid "No Self Contact defined"
msgstr "No Self Contact defined"
#. E_BOOK_ERROR_URI_NOT_LOADED
#. E_BOOK_ERROR_URI_ALREADY_LOADED
#. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
msgid "Permission denied"
msgstr "Permission denied"
#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
msgid "Contact not found"
msgstr "Contact not found"
#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
msgid "Contact ID already exists"
msgstr "Contact ID already exists"
#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
msgid "Protocol not supported"
msgstr "Protocol not supported"
#. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:255
#: ../calendar/gui/e-cal-model-tasks.c:360
#: ../calendar/gui/e-cal-model-tasks.c:677
#: ../calendar/gui/e-calendar-table.c:236
@@ -3492,70 +3488,70 @@ msgid "Canceled"
msgstr "Cancelled"
#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
msgid "Could not cancel"
msgstr "Could not cancel"
#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
#: ../calendar/gui/comp-editor-factory.c:423
msgid "Authentication Failed"
msgstr "Authentication Failed"
#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
msgid "Authentication Required"
msgstr "Authentication Required"
#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
msgid "TLS not Available"
msgstr "TLS not Available"
#. E_BOOK_ERROR_CORBA_EXCEPTION
#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
msgid "No such source"
msgstr "No such source"
#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
msgid "Not available in offline mode"
msgstr "Not available in offline mode"
#. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
msgid "Invalid server version"
msgstr "Invalid server version"
-#: ../addressbook/gui/widgets/eab-gui-util.c:99
+#: ../addressbook/gui/widgets/eab-gui-util.c:101
msgid ""
"We were unable to open this addressbook. This either means this book is not "
"marked for offline usage or not yet downloaded for offline usage. Please "
"load the addressbook once in online mode to download its contents"
msgstr ""
-"We were unable to open this addressbook. This either means this book is not "
+"We were unable to open this address book. This either means this book is not "
"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the addressbook once in online mode to download its contents"
+"load the address book once in online mode to download its contents"
-#: ../addressbook/gui/widgets/eab-gui-util.c:108
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
#, c-format
msgid ""
"We were unable to open this addressbook. Please check that the path %s "
"exists and that you have permission to access it."
msgstr ""
-"We were unable to open this addressbook. Please check that the path %s "
+"We were unable to open this address book. Please check that the path %s "
"exists and that you have permission to access it."
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
msgid ""
"We were unable to open this addressbook. This either means you have entered "
"an incorrect URI, or the LDAP server is unreachable."
msgstr ""
-"We were unable to open this addressbook. This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
+"We were unable to open this address book. This either means you have "
+"entered an incorrect URI, or the LDAP server is unreachable."
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:124
msgid ""
"This version of Evolution does not have LDAP support compiled in to it. If "
"you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3565,15 +3561,15 @@ msgstr ""
"you want to use LDAP in Evolution, you must install an LDAP-enabled "
"Evolution package."
-#: ../addressbook/gui/widgets/eab-gui-util.c:129
+#: ../addressbook/gui/widgets/eab-gui-util.c:131
msgid ""
"We were unable to open this addressbook. This either means you have entered "
"an incorrect URI, or the server is unreachable."
msgstr ""
-"We were unable to open this addressbook. This either means you have entered "
-"an incorrect URI, or the server is unreachable."
+"We were unable to open this address book. This either means you have "
+"entered an incorrect URI, or the server is unreachable."
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:154
msgid ""
"More cards matched this query than either the server is \n"
"configured to return or Evolution is configured to display.\n"
@@ -3583,9 +3579,9 @@ msgstr ""
"More cards matched this query than either the server is \n"
"configured to return or Evolution is configured to display.\n"
"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
+"the directory server preferences for this address book."
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:160
msgid ""
"The time to execute this query exceeded the server limit or the limit\n"
"you have configured for this addressbook. Please make your search\n"
@@ -3593,49 +3589,49 @@ msgid ""
"preferences for this addressbook."
msgstr ""
"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook. Please make your search\n"
+"you have configured for this address book. Please make your search\n"
"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
+"preferences for this address book."
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
msgid "The backend for this addressbook was unable to parse this query."
-msgstr "The backend for this addressbook was unable to parse this query."
+msgstr "The backend for this address book was unable to parse this query."
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
+#: ../addressbook/gui/widgets/eab-gui-util.c:169
msgid "The backend for this addressbook refused to perform this query."
-msgstr "The backend for this addressbook refused to perform this query."
+msgstr "The backend for this address book refused to perform this query."
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
msgid "This query did not complete successfully."
msgstr "This query did not complete successfully."
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:194
msgid "Error adding list"
msgstr "Error adding list"
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:194
#: ../addressbook/gui/widgets/eab-gui-util.c:670
msgid "Error adding contact"
msgstr "Error adding contact"
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:205
msgid "Error modifying list"
msgstr "Error modifying list"
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:205
msgid "Error modifying contact"
msgstr "Error modifying contact"
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
msgid "Error removing list"
msgstr "Error removing list"
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
#: ../addressbook/gui/widgets/eab-gui-util.c:620
msgid "Error removing contact"
msgstr "Error removing contact"
-#: ../addressbook/gui/widgets/eab-gui-util.c:297
+#: ../addressbook/gui/widgets/eab-gui-util.c:299
#, c-format
msgid ""
"Opening %d contact will open %d new window as well.\n"
@@ -3650,16 +3646,16 @@ msgstr[1] ""
"Opening %d contacts will open %d new windows as well.\n"
"Do you really want to display all of these contacts?"
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:307
msgid "_Don't Display"
msgstr "_Don't Display"
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
+#: ../addressbook/gui/widgets/eab-gui-util.c:308
msgid "Display _All Contacts"
msgstr "Display _All Contacts"
#. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#: ../addressbook/gui/widgets/eab-gui-util.c:334
#, c-format
msgid ""
"%s already exists\n"
@@ -3668,7 +3664,7 @@ msgstr ""
"%s already exists\n"
"Do you want to overwrite it?"
-#: ../addressbook/gui/widgets/eab-gui-util.c:336
+#: ../addressbook/gui/widgets/eab-gui-util.c:338
msgid "Overwrite"
msgstr "Overwrite"
@@ -3711,22 +3707,22 @@ msgstr "Move contacts to"
msgid "Copy contacts to"
msgstr "Copy contacts to"
-#: ../addressbook/gui/widgets/eab-gui-util.c:983
+#: ../addressbook/gui/widgets/eab-gui-util.c:883
msgid "Multiple vCards"
msgstr "Multiple vCards"
-#: ../addressbook/gui/widgets/eab-gui-util.c:986
+#: ../addressbook/gui/widgets/eab-gui-util.c:890
#, c-format
msgid "vCard for %s"
msgstr "vCard for %s"
-#: ../addressbook/gui/widgets/eab-gui-util.c:1027
-#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
+#: ../addressbook/gui/widgets/eab-gui-util.c:928
#, c-format
msgid "Contact information"
msgstr "Contact information"
-#: ../addressbook/gui/widgets/eab-gui-util.c:1054
+#: ../addressbook/gui/widgets/eab-gui-util.c:930
#, c-format
msgid "Contact information for %s"
msgstr "Contact information for %s"
@@ -3753,7 +3749,7 @@ msgstr "Show Compact vCard"
#: ../addressbook/gui/widgets/eab-vcard-control.c:284
msgid "Save in addressbook"
-msgstr "Save in addressbook"
+msgstr "Save in address book"
#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
msgid "Card View"
@@ -3852,7 +3848,7 @@ msgstr "Format"
#: ../widgets/table/e-table-field-chooser-dialog.c:81
#: ../widgets/table/e-table-field-chooser-item.c:648
#: ../widgets/table/e-table-field-chooser.c:81
-#: ../widgets/table/e-table-header-item.c:1907
+#: ../widgets/table/e-table-header-item.c:1908
#: ../widgets/table/e-table-selection-model.c:310
msgid "Header"
msgstr "Header"
@@ -3955,7 +3951,7 @@ msgstr "Shading"
#. FIXME: Take care of i18n
#: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:987
+#: ../plugins/exchange-operations/exchange-account-setup.c:986
#: ../plugins/exchange-operations/exchange-calendar.c:231
#: ../plugins/exchange-operations/exchange-contacts.c:217
msgid "Size:"
@@ -4015,7 +4011,7 @@ msgstr "Can not open file"
#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
msgid "Couldn't get list of addressbooks"
-msgstr "Couldn't get list of addressbooks"
+msgstr "Couldn't get list of address books"
#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
msgid "failed to open book"
@@ -4031,7 +4027,7 @@ msgstr "OUTPUTFILE"
#: ../addressbook/tools/evolution-addressbook-export.c:53
msgid "List local addressbook folders"
-msgstr "List local addressbook folders"
+msgstr "List local address book folders"
#: ../addressbook/tools/evolution-addressbook-export.c:56
msgid "Show cards as vcard or csv file"
@@ -4082,13 +4078,22 @@ msgstr "Unhandled error"
#. For Translators: {0} is the name of the calendar source
#: ../calendar/calendar.error.xml.h:2
msgid ""
+"'{0}' is a read-only calendar source. Change Calendar to one that can accept "
+"appointments."
+msgstr ""
+"'{0}' is a read-only calendar source. Change Calendar to one that can accept "
+"appointments."
+
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:4
+msgid ""
"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
"a calendar that can accept appointments."
msgstr ""
"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
"a calendar that can accept appointments."
-#: ../calendar/calendar.error.xml.h:3
+#: ../calendar/calendar.error.xml.h:5
msgid ""
"Adding a meaningful summary to your appointment will give your recipients an "
"idea of what your appointment is about."
@@ -4096,7 +4101,7 @@ msgstr ""
"Adding a meaningful summary to your appointment will give your recipients an "
"idea of what your appointment is about."
-#: ../calendar/calendar.error.xml.h:4
+#: ../calendar/calendar.error.xml.h:6
msgid ""
"Adding a meaningful summary to your task will give your recipients an idea "
"of what your task is about."
@@ -4104,16 +4109,16 @@ msgstr ""
"Adding a meaningful summary to your task will give your recipients an idea "
"of what your task is about."
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:7
msgid "All information in these memos will be deleted and can not be restored."
msgstr ""
"All information in these memos will be deleted and can not be restored."
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:8
msgid "All information in this memo will be deleted and can not be restored."
msgstr "All information in this memo will be deleted and can not be restored."
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:9
msgid ""
"All information on these appointments will be deleted and can not be "
"restored."
@@ -4121,148 +4126,152 @@ msgstr ""
"All information on these appointments will be deleted and can not be "
"restored."
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:10
msgid "All information on these tasks will be deleted and can not be restored."
msgstr ""
"All information on these tasks will be deleted and can not be restored."
-#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/calendar.error.xml.h:11
msgid ""
"All information on this appointment will be deleted and can not be restored."
msgstr ""
"All information on this appointment will be deleted and can not be restored."
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:12
msgid ""
"All information on this meeting will be deleted and can not be restored."
msgstr ""
"All information on this meeting will be deleted and can not be restored."
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:13
msgid "All information on this memo will be deleted and can not be restored."
msgstr "All information on this memo will be deleted and can not be restored."
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:14
msgid "All information on this task will be deleted and can not be restored."
msgstr "All information on this task will be deleted and can not be restored."
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:15
msgid "Are you sure you want to delete the '{0}' task?"
msgstr "Are you sure you want to delete the '{0}' task?"
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:16
msgid "Are you sure you want to delete the appointment titled '{0}'?"
msgstr "Are you sure you want to delete the appointment titled '{0}'?"
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:17
msgid "Are you sure you want to delete the memo '{0}'?"
msgstr "Are you sure you want to delete the memo '{0}'?"
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:18
msgid "Are you sure you want to delete these {0} appointments?"
msgstr "Are you sure you want to delete these {0} appointments?"
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:19
msgid "Are you sure you want to delete these {0} memos?"
msgstr "Are you sure you want to delete these {0} memos?"
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:20
msgid "Are you sure you want to delete these {0} tasks?"
msgstr "Are you sure you want to delete these {0} tasks?"
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:21
msgid "Are you sure you want to delete this appointment?"
msgstr "Are you sure you want to delete this appointment?"
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:22
#: ../calendar/gui/dialogs/delete-comp.c:183
#, c-format
msgid "Are you sure you want to delete this meeting?"
msgstr "Are you sure you want to delete this meeting?"
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:23
#: ../calendar/gui/dialogs/delete-comp.c:189
#, c-format
msgid "Are you sure you want to delete this memo?"
msgstr "Are you sure you want to delete this memo?"
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:24
#: ../calendar/gui/dialogs/delete-comp.c:186
#, c-format
msgid "Are you sure you want to delete this task?"
msgstr "Are you sure you want to delete this task?"
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:25
msgid "Are you sure you want to save the memo without a summary?"
msgstr "Are you sure you want to save the memo without a summary?"
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:26
msgid "Are you sure you want to send the appointment without a summary?"
msgstr "Are you sure you want to send the appointment without a summary?"
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:27
msgid "Are you sure you want to send the task without a summary?"
msgstr "Are you sure you want to send the task without a summary?"
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:28
msgid "Cannot create a new event"
msgstr "Cannot create a new event"
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:29
+msgid "Cannot save event"
+msgstr "Cannot save event"
+
+#: ../calendar/calendar.error.xml.h:30
msgid "Delete calendar '{0}'?"
msgstr "Delete calendar '{0}'?"
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:31
msgid "Delete memo list '{0}'?"
msgstr "Delete memo list '{0}'?"
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:32
msgid "Delete task list '{0}'?"
msgstr "Delete task list '{0}'?"
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:33
msgid "Do _not Send"
msgstr "Do _not Send"
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:34
msgid "Download in progress. Do you want to save the appointment?"
msgstr "Download in progress. Do you want to save the appointment?"
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:35
msgid "Download in progress. Do you want to save the task?"
msgstr "Download in progress. Do you want to save the task?"
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:36
msgid "Editor could not be loaded."
msgstr "Editor could not be loaded."
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:37
msgid ""
"Email invitations will be sent to all participants and allow them to accept "
"this task."
msgstr ""
-"Email invitations will be sent to all participants and allow them to accept "
+"E-mail invitations will be sent to all participants and allow them to accept "
"this task."
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:38
msgid ""
"Email invitations will be sent to all participants and allow them to reply."
msgstr ""
-"Email invitations will be sent to all participants and allow them to reply."
+"E-mail invitations will be sent to all participants and allow them to reply."
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:39
msgid "Error loading calendar"
msgstr "Error loading calendar"
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:40
msgid "Error loading memo list"
msgstr "Error loading memo list"
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:41
msgid "Error loading task list"
msgstr "Error loading task list"
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:42
msgid ""
"If you do not send a cancelation notice, the other participants may not know "
"the meeting is canceled."
@@ -4270,7 +4279,7 @@ msgstr ""
"If you do not send a cancellation notice, the other participants may not "
"know the meeting is cancelled."
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:43
msgid ""
"If you do not send a cancelation notice, the other participants may not know "
"the memo has been deleted."
@@ -4278,7 +4287,7 @@ msgstr ""
"If you do not send a cancellation notice, the other participants may not "
"know the memo has been deleted."
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:44
msgid ""
"If you do not send a cancelation notice, the other participants may not know "
"the task has been deleted."
@@ -4286,7 +4295,7 @@ msgstr ""
"If you do not send a cancellation notice, the other participants may not "
"know the task has been deleted."
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:45
msgid ""
"Sending updated information allows other participants to keep their "
"calendars up to date."
@@ -4294,7 +4303,7 @@ msgstr ""
"Sending updated information allows other participants to keep their "
"calendars up to date."
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
msgid ""
"Sending updated information allows other participants to keep their task "
"lists up to date."
@@ -4302,7 +4311,7 @@ msgstr ""
"Sending updated information allows other participants to keep their task "
"lists up to date."
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
msgid ""
"Some attachments are being downloaded. Saving the appointment would result "
"in the loss of these attachments."
@@ -4310,7 +4319,7 @@ msgstr ""
"Some attachments are being downloaded. Saving the appointment would result "
"in the loss of these attachments."
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
msgid ""
"Some attachments are being downloaded. Saving the task would result in the "
"loss of these attachments."
@@ -4318,85 +4327,85 @@ msgstr ""
"Some attachments are being downloaded. Saving the task would result in the "
"loss of these attachments."
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
msgid "Some features may not work properly with your current server."
msgstr "Some features may not work properly with your current server."
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
msgid "The Evolution calendar has quit unexpectedly."
msgstr "The Evolution calendar has quit unexpectedly."
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
msgid "The Evolution memo has quit unexpectedly."
msgstr "The Evolution memo has quit unexpectedly."
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
msgid "The Evolution tasks have quit unexpectedly."
msgstr "The Evolution tasks have quit unexpectedly."
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
msgid "The calendar is not marked for offline usage."
msgstr "The calendar is not marked for offline usage."
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:54
msgid "The memo list is not marked for offline usage"
msgstr "The memo list is not marked for offline usage"
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
msgid "The task list is not marked for offline usage."
msgstr "The task list is not marked for offline usage."
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
msgid "This calendar will be removed permanently."
msgstr "This calendar will be removed permanently."
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
msgid "This memo list will be removed permanently."
msgstr "This memo list will be removed permanently."
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
msgid "This task list will be removed permanently."
msgstr "This task list will be removed permanently."
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
msgid "Would you like to save your changes to this appointment?"
msgstr "Would you like to save your changes to this appointment?"
# calendar:prompt-save-task primary
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
msgid "Would you like to save your changes to this memo?"
msgstr "Would you like to save your changes to this memo?"
# calendar:prompt-save-task primary
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
msgid "Would you like to save your changes to this task?"
msgstr "Would you like to save your changes to this task?"
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
msgid "Would you like to send a cancelation notice for this memo?"
msgstr "Would you like to send a cancellation notice for this memo?"
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
msgid "Would you like to send all the participants a cancelation notice?"
msgstr "Would you like to send all the participants a cancellation notice?"
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
msgid "Would you like to send meeting invitations to participants?"
msgstr "Would you like to send meeting invitations to participants?"
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
msgid "Would you like to send this task to participants?"
msgstr "Would you like to send this task to participants?"
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:66
msgid "Would you like to send updated meeting information to participants?"
msgstr "Would you like to send updated meeting information to participants?"
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
msgid "Would you like to send updated task information to participants?"
msgstr "Would you like to send updated task information to participants?"
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:68
msgid ""
"You are connecting to an unsupported GroupWise server and may encounter "
"problems using Evolution. For best results, the server should be upgraded to "
@@ -4406,57 +4415,57 @@ msgstr ""
"problems using Evolution. For best results, the server should be upgraded to "
"a supported version."
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:69
msgid "You have changed this appointment, but not yet saved it."
msgstr "You have changed this appointment, but not yet saved it."
# calendar:prompt-save-task secondary
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:70
msgid "You have changed this task, but not yet saved it."
msgstr "You have changed this task, but not yet saved it."
# calendar:prompt-save-task secondary
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:71
msgid "You have made changes to this memo, but not yet saved them."
msgstr "You have made changes to this memo, but not yet saved them."
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:72
msgid "Your calendars will not be available until Evolution is restarted."
msgstr "Your calendars will not be available until Evolution is restarted."
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:73
msgid "Your memos will not be available until Evolution is restarted."
msgstr "Your memos will not be available until Evolution is restarted."
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
msgid "Your tasks will not be available until Evolution is restarted."
msgstr "Your tasks will not be available until Evolution is restarted."
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:75
#: ../composer/mail-composer.error.xml.h:29
msgid "_Discard Changes"
msgstr "_Discard Changes"
-#: ../calendar/calendar.error.xml.h:73 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:59
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:492
+#: ../ui/evolution-editor.xml.h:23
msgid "_Save"
msgstr "_Save"
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
msgid "_Save Changes"
msgstr "_Save Changes"
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:78
#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
msgid "_Send"
msgstr "_Send"
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:79
msgid "_Send Notice"
msgstr "_Send Notice"
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
msgid "{0}."
msgstr "{0}."
@@ -4464,8 +4473,8 @@ msgstr "{0}."
msgid "Split Multi-Day Events:"
msgstr "Split Multi-Day Events:"
-#: ../calendar/conduits/calendar/calendar-conduit.c:1517
-#: ../calendar/conduits/calendar/calendar-conduit.c:1518
+#: ../calendar/conduits/calendar/calendar-conduit.c:1519
+#: ../calendar/conduits/calendar/calendar-conduit.c:1520
#: ../calendar/conduits/memo/memo-conduit.c:818
#: ../calendar/conduits/memo/memo-conduit.c:819
#: ../calendar/conduits/todo/todo-conduit.c:1016
@@ -4473,8 +4482,8 @@ msgstr "Split Multi-Day Events:"
msgid "Could not start evolution-data-server"
msgstr "Could not start evolution-data-server"
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
-#: ../calendar/conduits/calendar/calendar-conduit.c:1628
+#: ../calendar/conduits/calendar/calendar-conduit.c:1627
+#: ../calendar/conduits/calendar/calendar-conduit.c:1630
msgid "Could not read pilot's Calendar application block"
msgstr "Could not read pilot's Calendar application block"
@@ -4503,7 +4512,7 @@ msgid "Could not write pilot's ToDo application block"
msgstr "Could not write pilot's ToDo application block"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2344
+#: ../plugins/itip-formatter/itip-formatter.c:2353
msgid "Calendar and Tasks"
msgstr "Calendar and Tasks"
@@ -4549,16 +4558,16 @@ msgid "Memo_s"
msgstr "Memo_s"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1152
-#: ../calendar/gui/gnome-cal.c:1701 ../calendar/gui/memos-component.c:548
+#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1121
+#: ../calendar/gui/gnome-cal.c:1703 ../calendar/gui/memos-component.c:548
#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
#: ../calendar/gui/memos-control.c:372
msgid "Memos"
msgstr "Memos"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1442
-#: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1966
+#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1430
+#: ../calendar/gui/gnome-cal.c:1575 ../calendar/gui/print.c:1966
#: ../calendar/gui/tasks-component.c:539
#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:495
#: ../calendar/gui/tasks-control.c:511
@@ -4566,8 +4575,8 @@ msgstr "Memos"
#: ../calendar/importers/icalendar-importer.c:741
#: ../plugins/exchange-operations/exchange-delegates-user.c:88
#: ../plugins/exchange-operations/exchange-folder.c:587
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:401
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:545
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
msgid "Tasks"
msgstr "Tasks"
@@ -4585,13 +4594,13 @@ msgstr "_Tasks"
msgid "Evolution Calendar alarm notification service"
msgstr "Evolution Calendar alarm notification service"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:113
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minute"
msgstr[1] "minutes"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:127
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:128
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
@@ -4603,7 +4612,7 @@ msgid_plural "hours"
msgstr[0] "hours"
msgstr[1] "hours"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:284
msgid "Start time"
msgstr "Start time"
@@ -4627,15 +4636,12 @@ msgstr "Snooze _time:"
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:168
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:166
#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
#: ../plugins/publish-calendar/publish-calendar.glade.h:21
#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
-#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-message-composer.xml.h:52
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
+#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:5
+#: ../ui/evolution-memos.xml.h:17 ../ui/evolution-tasks.xml.h:25
#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
msgid "_Edit"
msgstr "_Edit"
@@ -4669,7 +4675,7 @@ msgstr "You have %d alarms"
#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1530
+#: ../mail/mail-component.c:1536
msgid "Warning"
msgstr "Warning"
@@ -4681,8 +4687,8 @@ msgid ""
"a normal reminder dialog box instead."
msgstr ""
"Evolution does not support calendar reminders with\n"
-"email notifications yet, but this reminder was\n"
-"configured to send an email. Evolution will display\n"
+"e-mail notifications yet, but this reminder was\n"
+"configured to send an e-mail. Evolution will display\n"
"a normal reminder dialogue box instead."
#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
@@ -4706,11 +4712,11 @@ msgstr ""
msgid "Do not ask me about this program again."
msgstr "Do not ask me about this program again."
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:139
msgid "Could not initialize Bonobo"
msgstr "Could not initialise Bonobo"
-#: ../calendar/gui/alarm-notify/notify-main.c:153
+#: ../calendar/gui/alarm-notify/notify-main.c:152
msgid ""
"Could not create the alarm notify service factory, maybe it's already "
"running..."
@@ -4986,12 +4992,12 @@ msgid "Show status field in the event/task/meeting editor"
msgstr "Show status field in the event/task/meeting editor"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:122
msgid "Show the \"Preview\" pane"
msgstr "Show the \"Preview\" pane"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:123
msgid "Show the \"Preview\" pane."
msgstr "Show the \"Preview\" pane."
@@ -5253,7 +5259,7 @@ msgstr "Purge events older than"
#: ../plugins/calendar-http/calendar-http.c:290
#: ../plugins/calendar-weather/calendar-weather.c:563
#: ../plugins/google-account-setup/google-source.c:397
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.glade.h:39
msgid "days"
msgstr "days"
@@ -5262,13 +5268,13 @@ msgstr "days"
#. Create the Webcal source group
#. Create the LDAP source group
#: ../calendar/gui/calendar-component.c:273
-#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:512
-#: ../calendar/gui/migration.c:611 ../calendar/gui/migration.c:1125
+#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:510
+#: ../calendar/gui/migration.c:609 ../calendar/gui/migration.c:1123
#: ../calendar/gui/tasks-component.c:231
msgid "On The Web"
msgstr "On The Web"
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:406
+#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:404
msgid "Birthdays & Anniversaries"
msgstr "Birthdays & Anniversaries"
@@ -5284,14 +5290,14 @@ msgstr "_New Calendar"
#: ../calendar/gui/calendar-component.c:606
#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2086
+#: ../mail/em-folder-tree.c:2087
msgid "_Copy..."
msgstr "_Copy..."
#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1130
+#: ../calendar/gui/dialogs/comp-editor.c:1128
#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:3637 ../mail/em-folder-tree.c:2100
+#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2101
#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
msgid "_Properties"
msgstr "_Properties"
@@ -5461,7 +5467,7 @@ msgstr "Send To:"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
#: ../calendar/gui/e-alarm-list.c:454
msgid "Send an email"
-msgstr "Send an email"
+msgstr "Send an e-mail"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
msgid "_Arguments:"
@@ -5530,7 +5536,7 @@ msgid "Alarms"
msgstr "Alarms"
#: ../calendar/gui/dialogs/cal-attachment-select-file.c:92
-#: ../composer/e-msg-composer-select-file.c:93
+#: ../composer/e-composer-actions.c:63
msgid "_Suggest automatic display of attachment"
msgstr "_Suggest automatic display of attachment"
@@ -5561,7 +5567,7 @@ msgstr ""
msgid ""
"<i>%u and %d will be replaced by user and domain from the email address.</i>"
msgstr ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+"<i>%u and %d will be replaced by user and domain from the e-mail address.</i>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
#: ../mail/mail-config.glade.h:10
@@ -5643,7 +5649,7 @@ msgstr ""
"Sunday"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:112
msgid "Pick a color"
msgstr "Pick a colour"
@@ -5803,8 +5809,8 @@ msgid "Cop_y memo list contents locally for offline operation"
msgstr "Cop_y memo list contents locally for offline operation"
#: ../calendar/gui/dialogs/calendar-setup.c:346
-msgid "C_olor:"
-msgstr "C_olour:"
+msgid "Colo_r:"
+msgstr "Colou_r:"
#: ../calendar/gui/dialogs/calendar-setup.c:381
msgid "Task List"
@@ -5814,19 +5820,27 @@ msgstr "Task List"
msgid "Memo List"
msgstr "Memo List"
-#: ../calendar/gui/dialogs/calendar-setup.c:478
+#: ../calendar/gui/dialogs/calendar-setup.c:477
msgid "Calendar Properties"
msgstr "Calendar Properties"
-#: ../calendar/gui/dialogs/calendar-setup.c:480
+#: ../calendar/gui/dialogs/calendar-setup.c:477
msgid "New Calendar"
msgstr "New Calendar"
-#: ../calendar/gui/dialogs/calendar-setup.c:536
+#: ../calendar/gui/dialogs/calendar-setup.c:533
msgid "Task List Properties"
msgstr "Task List Properties"
-#: ../calendar/gui/dialogs/calendar-setup.c:592
+#: ../calendar/gui/dialogs/calendar-setup.c:533
+msgid "New Task List"
+msgstr "New Task List"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:589
+msgid "Memo List Properties"
+msgstr "Memo List Properties"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:589
msgid "New Memo List"
msgstr "New Memo List"
@@ -5874,7 +5888,7 @@ msgstr "%s You have made changes. Forget those changes and update the editor?"
msgid "%s You have made no changes, update the editor?"
msgstr "%s You have made no changes, update the editor?"
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:518
#, c-format
msgid "Validation error: %s"
msgstr "Validation error: %s"
@@ -5899,129 +5913,129 @@ msgstr " (Due "
msgid "Due "
msgstr "Due "
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2849
+#: ../calendar/gui/dialogs/comp-editor.c:207
#, c-format
msgid "Attached message - %s"
msgstr "Attached message - %s"
#. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:387 ../composer/e-msg-composer.c:2854
-#: ../composer/e-msg-composer.c:3036
+#: ../calendar/gui/dialogs/comp-editor.c:212
+#: ../calendar/gui/dialogs/comp-editor.c:385 ../composer/e-msg-composer.c:1725
+#: ../composer/e-msg-composer.c:1944
#, c-format
msgid "Attached message"
msgid_plural "%d attached messages"
msgstr[0] "Attached message"
msgstr[1] "%d attached messages"
-#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:3100
-#: ../mail/em-folder-tree.c:998 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2066
+#: ../calendar/gui/dialogs/comp-editor.c:456 ../composer/e-msg-composer.c:2012
+#: ../mail/em-folder-tree.c:999 ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2046
msgid "_Move"
msgstr "_Move"
-#: ../calendar/gui/dialogs/comp-editor.c:460 ../composer/e-msg-composer.c:3102
-#: ../mail/em-folder-tree.c:1000 ../mail/message-list.c:2068
+#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:2014
+#: ../mail/em-folder-tree.c:1001 ../mail/message-list.c:2048
msgid "Cancel _Drag"
msgstr "Cancel _Drag"
-#: ../calendar/gui/dialogs/comp-editor.c:663
-#: ../calendar/gui/dialogs/comp-editor.c:2821 ../mail/em-utils.c:372
+#: ../calendar/gui/dialogs/comp-editor.c:661
+#: ../calendar/gui/dialogs/comp-editor.c:2856 ../mail/em-utils.c:371
#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:359
+#: ../widgets/misc/e-attachment-bar.c:378
msgid "attachment"
msgstr "attachment"
-#: ../calendar/gui/dialogs/comp-editor.c:825
+#: ../calendar/gui/dialogs/comp-editor.c:823
msgid "Could not update object"
msgstr "Could not update object"
-#: ../calendar/gui/dialogs/comp-editor.c:975 ../composer/e-msg-composer.c:2486
+#: ../calendar/gui/dialogs/comp-editor.c:973
#, c-format
msgid "<b>%d</b> Attachment"
msgid_plural "<b>%d</b> Attachments"
msgstr[0] "<b>%d</b> Attachment"
msgstr[1] "<b>%d</b> Attachments"
-#: ../calendar/gui/dialogs/comp-editor.c:1007
+#: ../calendar/gui/dialogs/comp-editor.c:1005
msgid "Hide Attachment _Bar"
msgstr "Hide Attachment _Bar"
-#: ../calendar/gui/dialogs/comp-editor.c:1010
-#: ../calendar/gui/dialogs/comp-editor.c:1558
+#: ../calendar/gui/dialogs/comp-editor.c:1008
+#: ../calendar/gui/dialogs/comp-editor.c:1591
msgid "Show Attachment _Bar"
msgstr "Show Attachment _Bar"
-#: ../calendar/gui/dialogs/comp-editor.c:1129
+#: ../calendar/gui/dialogs/comp-editor.c:1127
#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:3636
+#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:1046
#: ../plugins/groupwise-features/junk-settings.glade.h:8
#: ../plugins/groupwise-features/properties.glade.h:13
#: ../widgets/table/e-table-config.glade.h:21
msgid "_Remove"
msgstr "_Remove"
-#: ../calendar/gui/dialogs/comp-editor.c:1132
-#: ../composer/e-msg-composer.c:3639
+#: ../calendar/gui/dialogs/comp-editor.c:1130
+#: ../composer/e-msg-composer.c:1049
msgid "_Add attachment..."
msgstr "_Add attachment..."
-#: ../calendar/gui/dialogs/comp-editor.c:1582
-#: ../mail/em-format-html-display.c:2374
+#: ../calendar/gui/dialogs/comp-editor.c:1615
+#: ../mail/em-format-html-display.c:2218
msgid "Show Attachments"
msgstr "Show Attachments"
-#: ../calendar/gui/dialogs/comp-editor.c:1583
+#: ../calendar/gui/dialogs/comp-editor.c:1616
msgid "Press space key to toggle attachment bar"
msgstr "Press space key to toggle attachment bar"
-#: ../calendar/gui/dialogs/comp-editor.c:2189
-#: ../calendar/gui/dialogs/comp-editor.c:2232
+#: ../calendar/gui/dialogs/comp-editor.c:2227
+#: ../calendar/gui/dialogs/comp-editor.c:2270
msgid "Edit Appointment"
msgstr "Edit Appointment"
-#: ../calendar/gui/dialogs/comp-editor.c:2195
-#: ../calendar/gui/dialogs/comp-editor.c:2238
+#: ../calendar/gui/dialogs/comp-editor.c:2233
+#: ../calendar/gui/dialogs/comp-editor.c:2276
#, c-format
msgid "Meeting - %s"
msgstr "Meeting - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2197
-#: ../calendar/gui/dialogs/comp-editor.c:2240
+#: ../calendar/gui/dialogs/comp-editor.c:2235
+#: ../calendar/gui/dialogs/comp-editor.c:2278
#, c-format
msgid "Appointment - %s"
msgstr "Appointment - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2201
-#: ../calendar/gui/dialogs/comp-editor.c:2244
+#: ../calendar/gui/dialogs/comp-editor.c:2239
+#: ../calendar/gui/dialogs/comp-editor.c:2282
#, c-format
msgid "Assigned Task - %s"
msgstr "Assigned Task - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2203
-#: ../calendar/gui/dialogs/comp-editor.c:2246
+#: ../calendar/gui/dialogs/comp-editor.c:2241
+#: ../calendar/gui/dialogs/comp-editor.c:2284
#, c-format
msgid "Task - %s"
msgstr "Task - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2206
-#: ../calendar/gui/dialogs/comp-editor.c:2249
+#: ../calendar/gui/dialogs/comp-editor.c:2244
+#: ../calendar/gui/dialogs/comp-editor.c:2287
#, c-format
msgid "Memo - %s"
msgstr "Memo - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2217
-#: ../calendar/gui/dialogs/comp-editor.c:2259
+#: ../calendar/gui/dialogs/comp-editor.c:2255
+#: ../calendar/gui/dialogs/comp-editor.c:2297
msgid "No summary"
msgstr "No summary"
-#: ../calendar/gui/dialogs/comp-editor.c:2910
-#: ../calendar/gui/dialogs/comp-editor.c:2964
-#: ../calendar/gui/dialogs/comp-editor.c:2988
+#: ../calendar/gui/dialogs/comp-editor.c:2945
+#: ../calendar/gui/dialogs/comp-editor.c:2999
+#: ../calendar/gui/dialogs/comp-editor.c:3023
msgid "Changes made to this item may be discarded if an update arrives"
msgstr "Changes made to this item may be discarded if an update arrives"
-#: ../calendar/gui/dialogs/comp-editor.c:3017
+#: ../calendar/gui/dialogs/comp-editor.c:3052
msgid "Unable to use current version!"
msgstr "Unable to use current version!"
@@ -6221,16 +6235,16 @@ msgstr "Customise"
#: ../calendar/gui/dialogs/meeting-page.glade.h:4
#: ../calendar/gui/e-cal-model-tasks.c:669
#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
-#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:83
+#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1424
+#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:94
#: ../plugins/calendar-weather/calendar-weather.c:370
#: ../plugins/calendar-weather/calendar-weather.c:424
#: ../plugins/exchange-operations/exchange-delegates-user.c:205
#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1531
-#: ../widgets/misc/e-dateedit.c:1745
-#: ../widgets/misc/e-signature-combo-box.c:50
+#: ../plugins/itip-formatter/itip-formatter.c:2016
+#: ../widgets/misc/e-cell-date-edit.c:308 ../widgets/misc/e-dateedit.c:1533
+#: ../widgets/misc/e-dateedit.c:1747
+#: ../widgets/misc/e-signature-combo-box.c:69
msgid "None"
msgstr "None"
@@ -6320,9 +6334,9 @@ msgstr "Memo"
msgid "Unable to open memos in '%s'."
msgstr "Unable to open memos in '%s'."
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1549
-#: ../mail/em-format-html.c:1607 ../mail/em-format-html.c:1633
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:888
+#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1558
+#: ../mail/em-format-html.c:1616 ../mail/em-format-html.c:1642
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
msgid "To"
msgstr "To"
@@ -6572,24 +6586,24 @@ msgstr "<span weight=\"bold\">Status</span>"
#. Pass TRUE as is_utc, so it gets converted to the current
#. timezone.
#: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../calendar/gui/e-cal-component-preview.c:252
#: ../calendar/gui/e-cal-model-tasks.c:358
#: ../calendar/gui/e-cal-model-tasks.c:675
#: ../calendar/gui/e-calendar-table.c:234
#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:933
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/print.c:2520 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/print.c:2520 ../plugins/save-calendar/csv-format.c:369
msgid "Completed"
msgstr "Completed"
#: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:255
+#: ../calendar/gui/e-cal-component-preview.c:271
#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
msgid "High"
msgstr "High"
#: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:249
#: ../calendar/gui/e-cal-model-tasks.c:356
#: ../calendar/gui/e-cal-model-tasks.c:673
#: ../calendar/gui/e-cal-model-tasks.c:750
@@ -6599,20 +6613,20 @@ msgid "In Progress"
msgstr "In Progress"
#: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-cal-component-preview.c:275
#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
msgid "Low"
msgstr "Low"
#: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:257
+#: ../calendar/gui/e-cal-component-preview.c:273
#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
#: ../mail/message-list.c:1064
msgid "Normal"
msgstr "Normal"
#: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../calendar/gui/e-cal-component-preview.c:259
#: ../calendar/gui/e-cal-model-tasks.c:354
#: ../calendar/gui/e-cal-model-tasks.c:671
#: ../calendar/gui/e-calendar-table.c:230
@@ -6638,7 +6652,7 @@ msgid "_Date completed:"
msgstr "_Date completed:"
#: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:34
msgid "_Priority:"
msgstr "_Priority:"
@@ -6647,7 +6661,7 @@ msgid "_Web Page:"
msgstr "_Web Page:"
#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1322
+#: ../calendar/gui/tasks-component.c:1327
msgid "_Task"
msgstr "_Task"
@@ -6766,56 +6780,56 @@ msgid "%s for an unknown trigger type"
msgstr "%s for an unknown trigger type"
#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3328
+#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3329
#, c-format
msgid "Click to open %s"
msgstr "Click to open %s"
-#: ../calendar/gui/e-cal-component-memo-preview.c:160
-#: ../calendar/gui/e-cal-component-preview.c:160 ../filter/filter-rule.c:805
+#: ../calendar/gui/e-cal-component-memo-preview.c:134
+#: ../calendar/gui/e-cal-component-preview.c:176 ../filter/filter-rule.c:805
#: ../shell/e-shell-folder-title-bar.c:593
msgid "Untitled"
msgstr "Untitled"
-#: ../calendar/gui/e-cal-component-memo-preview.c:212
-#: ../calendar/gui/e-cal-component-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:211
+#: ../calendar/gui/e-cal-component-memo-preview.c:186
+#: ../calendar/gui/e-cal-component-preview.c:216
+#: ../calendar/gui/e-cal-component-preview.c:227
msgid "Start Date:"
msgstr "Start Date:"
-#: ../calendar/gui/e-cal-component-memo-preview.c:225
-#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-component-memo-preview.c:199
+#: ../calendar/gui/e-cal-component-preview.c:290
#: ../calendar/gui/e-itip-control.c:1201
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:70
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
#: ../widgets/misc/e-attachment.glade.h:2
msgid "Description:"
msgstr "Description:"
-#: ../calendar/gui/e-cal-component-memo-preview.c:261
-#: ../calendar/gui/e-cal-component-preview.c:307
+#: ../calendar/gui/e-cal-component-memo-preview.c:235
+#: ../calendar/gui/e-cal-component-preview.c:323
msgid "Web Page:"
msgstr "Web Page:"
-#: ../calendar/gui/e-cal-component-preview.c:193
+#: ../calendar/gui/e-cal-component-preview.c:209
#: ../calendar/gui/e-itip-control.c:1145
#: ../calendar/gui/e-itip-control.glade.h:9
msgid "Summary:"
msgstr "Summary:"
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-preview.c:238
msgid "Due Date:"
msgstr "Due Date:"
#. write status
#. Status
-#: ../calendar/gui/e-cal-component-preview.c:229
+#: ../calendar/gui/e-cal-component-preview.c:245
#: ../calendar/gui/e-itip-control.c:1169
-#: ../plugins/exchange-operations/exchange-account-setup.c:269
+#: ../plugins/exchange-operations/exchange-account-setup.c:268
#: ../plugins/itip-formatter/itip-view.c:1029
msgid "Status:"
msgstr "Status:"
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-component-preview.c:269
msgid "Priority:"
msgstr "Priority:"
@@ -6846,7 +6860,7 @@ msgstr "Start Date"
#: ../calendar/gui/e-cal-list-view.etspec.h:5
#: ../calendar/gui/e-calendar-table.etspec.h:11
#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:382
+#: ../plugins/save-calendar/csv-format.c:365
msgid "Summary"
msgstr "Summary"
@@ -6857,7 +6871,7 @@ msgstr "Free"
#: ../calendar/gui/e-cal-model-calendar.c:186
#: ../calendar/gui/e-calendar-table.c:413
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:414
msgid "Busy"
msgstr "Busy"
@@ -6872,34 +6886,34 @@ msgstr ""
"45.436845,125.862501"
#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:156 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/e-meeting-store.c:749
+#: ../calendar/gui/e-meeting-list-view.c:192
+#: ../calendar/gui/e-meeting-store.c:154 ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-meeting-store.c:747
#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
msgid "Yes"
msgstr "Yes"
#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-meeting-list-view.c:193
+#: ../calendar/gui/e-meeting-store.c:166
#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
msgid "No"
msgstr "No"
#. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
+#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:105
+#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
#: ../calendar/gui/e-itip-control.c:1186 ../calendar/gui/e-itip-control.c:1326
-#: ../calendar/gui/e-meeting-list-view.c:169
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:212 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1329
+#: ../calendar/gui/e-meeting-list-view.c:168
+#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:210 ../calendar/gui/print.c:969
+#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
#: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2046
+#: ../plugins/itip-formatter/itip-formatter.c:2041
#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:721
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-attachment-bar.c:742
+#: ../widgets/misc/e-charset-picker.c:55
msgid "Unknown"
msgstr "Unknown"
@@ -6911,35 +6925,35 @@ msgstr "Recurring"
msgid "Assigned"
msgstr "Assigned"
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:427
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:427
msgid "Save As..."
msgstr "Save As..."
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2219
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2052
msgid "Select folder to save selected attachments..."
msgstr "Select folder to save selected attachments..."
-#: ../calendar/gui/e-cal-popup.c:225 ../mail/em-popup.c:455
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:455
#, c-format
msgid "untitled_image.%s"
msgstr "untitled_image.%s"
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1367
-#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:572 ../mail/em-popup.c:583
+#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1367
+#: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:926
+#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:572 ../mail/em-popup.c:583
msgid "_Save As..."
msgstr "_Save As..."
-#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:573
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:573
#: ../mail/em-popup.c:584
msgid "Set as _Background"
msgstr "Set as _Background"
-#: ../calendar/gui/e-cal-popup.c:281
+#: ../calendar/gui/e-cal-popup.c:287
msgid "_Save Selected"
msgstr "_Save Selected"
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:824
+#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:848
#, c-format
msgid "Open in %s..."
msgstr "Open in %s..."
@@ -6989,23 +7003,23 @@ msgid "100%"
msgstr "100%"
#: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-view.c:681 ../calendar/gui/e-memo-table.c:439
msgid "Deleting selected objects"
msgstr "Deleting selected objects"
#: ../calendar/gui/e-calendar-table.c:954
-#: ../calendar/gui/e-calendar-view.c:807 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-view.c:811 ../calendar/gui/e-memo-table.c:645
msgid "Updating objects"
msgstr "Updating objects"
#: ../calendar/gui/e-calendar-table.c:1139
-#: ../calendar/gui/e-calendar-view.c:1233 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-msg-composer.c:1472
+#: ../calendar/gui/e-calendar-view.c:1237 ../calendar/gui/e-memo-table.c:821
+#: ../composer/e-composer-actions.c:277
msgid "Save as..."
msgstr "Save as..."
#: ../calendar/gui/e-calendar-table.c:1362
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1670
msgid "New _Task"
msgstr "New _Task"
@@ -7014,23 +7028,23 @@ msgid "Open _Web Page"
msgstr "Open _Web Page"
#: ../calendar/gui/e-calendar-table.c:1368
-#: ../calendar/gui/e-calendar-view.c:1669 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-view.c:1673 ../calendar/gui/e-memo-table.c:927
msgid "P_rint..."
msgstr "P_rint..."
#: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1689 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-view.c:1693 ../calendar/gui/e-memo-table.c:931
#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "C_ut"
#: ../calendar/gui/e-calendar-table.c:1374
-#: ../calendar/gui/e-calendar-view.c:1672
-#: ../calendar/gui/e-calendar-view.c:1691 ../calendar/gui/e-memo-table.c:933
+#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1695 ../calendar/gui/e-memo-table.c:933
#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
-#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
+#: ../ui/evolution-editor.xml.h:22 ../ui/evolution-memos.xml.h:19
+#: ../ui/evolution-tasks.xml.h:28
msgid "_Paste"
msgstr "_Paste"
@@ -7086,7 +7100,7 @@ msgid "Due date"
msgstr "Due date"
#: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../plugins/save-calendar/csv-format.c:376
msgid "Priority"
msgstr "Priority"
@@ -7095,111 +7109,111 @@ msgid "Start date"
msgstr "Start date"
#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:538
+#: ../calendar/gui/e-meeting-list-view.c:546
#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
#: ../mail/message-list.etspec.h:17
msgid "Status"
msgstr "Status"
-#: ../calendar/gui/e-calendar-view.c:1352
+#: ../calendar/gui/e-calendar-view.c:1356
msgid "Moving items"
msgstr "Moving items"
-#: ../calendar/gui/e-calendar-view.c:1354
+#: ../calendar/gui/e-calendar-view.c:1358
msgid "Copying items"
msgstr "Copying items"
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1667
msgid "New _Appointment..."
msgstr "New _Appointment..."
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1668
msgid "New All Day _Event"
msgstr "New All Day _Event"
-#: ../calendar/gui/e-calendar-view.c:1665
+#: ../calendar/gui/e-calendar-view.c:1669
msgid "New _Meeting"
msgstr "New _Meeting"
#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1680
msgid "_Current View"
msgstr "_Current View"
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1682
msgid "Select T_oday"
msgstr "Select T_oday"
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1683
msgid "_Select Date..."
msgstr "_Select Date..."
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1689
msgid "Pri_nt..."
msgstr "Pri_nt..."
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1699
msgid "Cop_y to Calendar..."
msgstr "Cop_y to Calendar..."
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1700
msgid "Mo_ve to Calendar..."
msgstr "Mo_ve to Calendar..."
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1701
msgid "_Delegate Meeting..."
msgstr "_Delegate Meeting..."
-#: ../calendar/gui/e-calendar-view.c:1698
+#: ../calendar/gui/e-calendar-view.c:1702
msgid "_Schedule Meeting..."
msgstr "_Schedule Meeting..."
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1703
msgid "_Forward as iCalendar..."
msgstr "_Forward as iCalendar..."
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1704
msgid "_Reply"
msgstr "_Reply"
-#: ../calendar/gui/e-calendar-view.c:1701 ../mail/em-folder-view.c:1336
+#: ../calendar/gui/e-calendar-view.c:1705 ../mail/em-folder-view.c:1337
#: ../mail/em-popup.c:577 ../mail/em-popup.c:588
#: ../ui/evolution-mail-message.xml.h:82
msgid "Reply to _All"
msgstr "Reply to _All"
-#: ../calendar/gui/e-calendar-view.c:1706
+#: ../calendar/gui/e-calendar-view.c:1710
msgid "Make this Occurrence _Movable"
msgstr "Make this Occurrence _Movable"
-#: ../calendar/gui/e-calendar-view.c:1707 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1711 ../ui/evolution-calendar.xml.h:9
msgid "Delete this _Occurrence"
msgstr "Delete this _Occurrence"
-#: ../calendar/gui/e-calendar-view.c:1708
+#: ../calendar/gui/e-calendar-view.c:1712
msgid "Delete _All Occurrences"
msgstr "Delete _All Occurrences"
#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2208
+#: ../calendar/gui/e-calendar-view.c:2234
#, c-format
msgid "Organizer: %s <%s>"
msgstr "Organiser: %s <%s>"
#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2212
+#: ../calendar/gui/e-calendar-view.c:2238
#, c-format
msgid "Organizer: %s"
msgstr "Organiser: %s"
#. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2228 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2254 ../calendar/gui/print.c:2477
#, c-format
msgid "Location: %s"
msgstr "Location: %s"
#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2262
+#: ../calendar/gui/e-calendar-view.c:2288
#, c-format
msgid "Time: %s %s"
msgstr "Time: %s %s"
@@ -7227,7 +7241,7 @@ msgstr ""
#. * to change the length of the time division in the calendar day view, e.g.
#. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
#.
-#: ../calendar/gui/e-day-view-time-item.c:583
+#: ../calendar/gui/e-day-view-time-item.c:592
#, c-format
msgid "%02i minute divisions"
msgstr "%02i minute divisions"
@@ -7238,8 +7252,8 @@ msgstr "%02i minute divisions"
#. month, %B = full month name. You can change the
#. order but don't change the specifiers or add
#. anything.
-#: ../calendar/gui/e-day-view-top-item.c:837 ../calendar/gui/e-day-view.c:1528
-#: ../calendar/gui/e-week-view-main-item.c:322 ../calendar/gui/print.c:1656
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1528
+#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1656
msgid "%A %d %B"
msgstr "%A %d %B"
@@ -7360,7 +7374,7 @@ msgid "Ends"
msgstr "Ends"
#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../plugins/save-calendar/csv-format.c:374
msgid "Due"
msgstr "Due"
@@ -7394,23 +7408,23 @@ msgstr ""
"the menu below."
#: ../calendar/gui/e-itip-control.c:1174
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/itip-utils.c:728
-#: ../plugins/itip-formatter/itip-formatter.c:2034
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/itip-utils.c:699
+#: ../plugins/itip-formatter/itip-formatter.c:2029
msgid "Accepted"
msgstr "Accepted"
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:702
+#: ../plugins/itip-formatter/itip-formatter.c:2032
msgid "Tentatively Accepted"
msgstr "Tentatively Accepted"
#: ../calendar/gui/e-itip-control.c:1182
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../calendar/gui/itip-utils.c:734 ../calendar/gui/itip-utils.c:763
-#: ../plugins/itip-formatter/itip-formatter.c:2040
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/itip-utils.c:705 ../calendar/gui/itip-utils.c:734
+#: ../plugins/itip-formatter/itip-formatter.c:2035
msgid "Declined"
msgstr "Declined"
@@ -7630,7 +7644,7 @@ msgid "Attendee status updated\n"
msgstr "Attendee status updated\n"
#: ../calendar/gui/e-itip-control.c:2057
-#: ../plugins/itip-formatter/itip-formatter.c:1251
+#: ../plugins/itip-formatter/itip-formatter.c:1254
msgid "Attendee status can not be updated because the item no longer exists"
msgstr "Attendee status can not be updated because the item no longer exists"
@@ -7676,7 +7690,7 @@ msgstr "Update respondent status"
msgid "Send Latest Information"
msgstr "Send Latest Information"
-#: ../calendar/gui/e-itip-control.c:2447 ../calendar/gui/itip-utils.c:751
+#: ../calendar/gui/e-itip-control.c:2447 ../calendar/gui/itip-utils.c:722
#: ../ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "Cancel"
@@ -7705,112 +7719,112 @@ msgstr "Loading calendar..."
msgid "Server Message:"
msgstr "Server Message:"
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:69
msgid "Chair Persons"
msgstr "Chair Persons"
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:70
msgid "Required Participants"
msgstr "Required Participants"
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:71
msgid "Optional Participants"
msgstr "Optional Participants"
-#: ../calendar/gui/e-meeting-list-view.c:73
+#: ../calendar/gui/e-meeting-list-view.c:72
msgid "Resources"
msgstr "Resources"
-#: ../calendar/gui/e-meeting-list-view.c:154
+#: ../calendar/gui/e-meeting-list-view.c:153
msgid "Attendees"
msgstr "Attendees"
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:965
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
+#: ../calendar/gui/e-meeting-store.c:741 ../calendar/gui/print.c:965
msgid "Individual"
msgstr "Individual"
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
msgid "Group"
msgstr "Group"
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
#: ../calendar/gui/print.c:967
msgid "Resource"
msgstr "Resource"
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
#: ../calendar/gui/print.c:968
msgid "Room"
msgstr "Room"
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
#: ../calendar/gui/print.c:982
msgid "Chair"
msgstr "Chair"
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/e-meeting-store.c:746 ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/e-meeting-store.c:744 ../calendar/gui/print.c:983
msgid "Required Participant"
msgstr "Required Participant"
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
#: ../calendar/gui/print.c:984
msgid "Optional Participant"
msgstr "Optional Participant"
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
#: ../calendar/gui/print.c:985
msgid "Non-Participant"
msgstr "Non-Participant"
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/e-meeting-store.c:756
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
+#: ../calendar/gui/e-meeting-store.c:754
msgid "Needs Action"
msgstr "Needs Action"
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
+#: ../calendar/gui/e-meeting-time-sel.c:413
msgid "Tentative"
msgstr "Tentative"
-#: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../calendar/gui/itip-utils.c:737
-#: ../plugins/itip-formatter/itip-formatter.c:2043
+#: ../calendar/gui/e-meeting-list-view.c:207
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/itip-utils.c:708
+#: ../plugins/itip-formatter/itip-formatter.c:2038
msgid "Delegated"
msgstr "Delegated"
#. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:484
+#: ../calendar/gui/e-meeting-list-view.c:492
msgid "Attendee "
msgstr "Attendee "
#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:526
+#: ../calendar/gui/e-meeting-list-view.c:534
#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr "RSVP"
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
msgid "In Process"
msgstr "In Process"
#. This is a strftime() format string %A = full weekday name,
#. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:464
-#: ../calendar/gui/e-meeting-time-sel.c:2137
+#: ../calendar/gui/e-meeting-time-sel-item.c:473
+#: ../calendar/gui/e-meeting-time-sel.c:2138
msgid "%A, %B %d, %Y"
msgstr "%A, %d %B, %Y"
@@ -7818,78 +7832,78 @@ msgstr "%A, %d %B, %Y"
#. name, %m = month number, %d = month day, %Y = full year.
#. This is a strftime() format string %a = abbreviated weekday name,
#. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:468
-#: ../calendar/gui/e-meeting-time-sel.c:2168
+#: ../calendar/gui/e-meeting-time-sel-item.c:477
+#: ../calendar/gui/e-meeting-time-sel.c:2169
msgid "%a %m/%d/%Y"
msgstr "%a %d/%m/%Y"
#. This is a strftime() format string %m = month number,
#. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:481
msgid "%m/%d/%Y"
msgstr "%d/%m/%Y"
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:415
msgid "Out of Office"
msgstr "Out of Office"
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:416
msgid "No Information"
msgstr "No Information"
-#: ../calendar/gui/e-meeting-time-sel.c:430
+#: ../calendar/gui/e-meeting-time-sel.c:431
msgid "A_ttendees..."
msgstr "A_ttendees..."
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:452
msgid "O_ptions"
msgstr "O_ptions"
-#: ../calendar/gui/e-meeting-time-sel.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:469
msgid "Show _only working hours"
msgstr "Show _only working hours"
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:479
msgid "Show _zoomed out"
msgstr "Show _zoomed out"
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:494
msgid "_Update free/busy"
msgstr "_Update free/busy"
-#: ../calendar/gui/e-meeting-time-sel.c:508
+#: ../calendar/gui/e-meeting-time-sel.c:509
msgid "_<<"
msgstr "_<<"
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:527
msgid "_Autopick"
msgstr "_Autopick"
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:542
msgid ">_>"
msgstr ">_>"
-#: ../calendar/gui/e-meeting-time-sel.c:558
+#: ../calendar/gui/e-meeting-time-sel.c:559
msgid "_All people and resources"
msgstr "_All people and resources"
-#: ../calendar/gui/e-meeting-time-sel.c:567
+#: ../calendar/gui/e-meeting-time-sel.c:568
msgid "All _people and one resource"
msgstr "All _people and one resource"
-#: ../calendar/gui/e-meeting-time-sel.c:576
+#: ../calendar/gui/e-meeting-time-sel.c:577
msgid "_Required people"
msgstr "_Required people"
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:586
msgid "Required people and _one resource"
msgstr "Required people and _one resource"
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:622
msgid "_Start time:"
msgstr "_Start time:"
-#: ../calendar/gui/e-meeting-time-sel.c:648
+#: ../calendar/gui/e-meeting-time-sel.c:649
msgid "_End time:"
msgstr "_End time:"
@@ -7929,8 +7943,8 @@ msgstr "_Delete Selected Memos"
msgid "Click to add a memo"
msgstr "Click to add a memo"
-#: ../calendar/gui/e-memos.c:791 ../calendar/gui/e-tasks.c:923
-#: ../calendar/gui/gnome-cal.c:2871
+#: ../calendar/gui/e-memos.c:761 ../calendar/gui/e-tasks.c:911
+#: ../calendar/gui/gnome-cal.c:2865
#, c-format
msgid ""
"Error on %s:\n"
@@ -7939,84 +7953,84 @@ msgstr ""
"Error on %s:\n"
" %s"
-#: ../calendar/gui/e-memos.c:840
+#: ../calendar/gui/e-memos.c:810
msgid "Loading memos"
msgstr "Loading memos"
-#: ../calendar/gui/e-memos.c:921
+#: ../calendar/gui/e-memos.c:891
#, c-format
msgid "Opening memos at %s"
msgstr "Opening memos at %s"
-#: ../calendar/gui/e-memos.c:1094 ../calendar/gui/e-tasks.c:1334
+#: ../calendar/gui/e-memos.c:1063 ../calendar/gui/e-tasks.c:1322
msgid "Deleting selected objects..."
msgstr "Deleting selected objects..."
-#: ../calendar/gui/e-tasks.c:976
+#: ../calendar/gui/e-tasks.c:964
msgid "Loading tasks"
msgstr "Loading tasks"
-#: ../calendar/gui/e-tasks.c:1066
+#: ../calendar/gui/e-tasks.c:1054
#, c-format
msgid "Opening tasks at %s"
msgstr "Opening tasks at %s"
-#: ../calendar/gui/e-tasks.c:1311
+#: ../calendar/gui/e-tasks.c:1299
msgid "Completing tasks..."
msgstr "Completing tasks..."
-#: ../calendar/gui/e-tasks.c:1361
+#: ../calendar/gui/e-tasks.c:1349
msgid "Expunging"
msgstr "Expunging"
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:134
msgid "Select Timezone"
msgstr "Select Timezone"
#. strftime format %d = day of month, %B = full
#. month name. You can change the order but don't
#. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:339 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1637
msgid "%d %B"
msgstr "%d %B"
-#: ../calendar/gui/gnome-cal.c:828
+#: ../calendar/gui/gnome-cal.c:831
msgid "Updating query"
msgstr "Updating query"
-#: ../calendar/gui/gnome-cal.c:2508
+#: ../calendar/gui/gnome-cal.c:2502
msgid "_Custom View"
msgstr "_Custom View"
-#: ../calendar/gui/gnome-cal.c:2509
+#: ../calendar/gui/gnome-cal.c:2503
msgid "_Save Custom View"
msgstr "_Save Custom View"
-#: ../calendar/gui/gnome-cal.c:2514
+#: ../calendar/gui/gnome-cal.c:2508
msgid "_Define Views..."
msgstr "_Define Views..."
-#: ../calendar/gui/gnome-cal.c:2695
+#: ../calendar/gui/gnome-cal.c:2689
#, c-format
msgid "Loading appointments at %s"
msgstr "Loading appointments at %s"
-#: ../calendar/gui/gnome-cal.c:2714
+#: ../calendar/gui/gnome-cal.c:2708
#, c-format
msgid "Loading tasks at %s"
msgstr "Loading tasks at %s"
-#: ../calendar/gui/gnome-cal.c:2723
+#: ../calendar/gui/gnome-cal.c:2717
#, c-format
msgid "Loading memos at %s"
msgstr "Loading memos at %s"
-#: ../calendar/gui/gnome-cal.c:2830
+#: ../calendar/gui/gnome-cal.c:2824
#, c-format
msgid "Opening %s"
msgstr "Opening %s"
-#: ../calendar/gui/gnome-cal.c:3787
+#: ../calendar/gui/gnome-cal.c:3780
msgid "Purging"
msgstr "Purging"
@@ -8076,57 +8090,57 @@ msgstr "September"
msgid "_Select Today"
msgstr "_Select Today"
-#: ../calendar/gui/itip-utils.c:449 ../calendar/gui/itip-utils.c:498
-#: ../calendar/gui/itip-utils.c:604
+#: ../calendar/gui/itip-utils.c:439 ../calendar/gui/itip-utils.c:491
+#: ../calendar/gui/itip-utils.c:579
msgid "An organizer must be set."
msgstr "An organiser must be set."
-#: ../calendar/gui/itip-utils.c:485
+#: ../calendar/gui/itip-utils.c:483
msgid "At least one attendee is necessary"
msgstr "At least one attendee is necessary"
-#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:661 ../calendar/gui/itip-utils.c:776
msgid "Event information"
msgstr "Event information"
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:663 ../calendar/gui/itip-utils.c:779
msgid "Task information"
msgstr "Task information"
-#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:665 ../calendar/gui/itip-utils.c:782
msgid "Memo information"
msgstr "Memo information"
-#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:667 ../calendar/gui/itip-utils.c:800
msgid "Free/Busy information"
msgstr "Free/Busy information"
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:669
msgid "Calendar information"
msgstr "Calendar information"
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:718
msgid "Updated"
msgstr "Updated"
-#: ../calendar/gui/itip-utils.c:755
+#: ../calendar/gui/itip-utils.c:726
msgid "Refresh"
msgstr "Refresh"
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:730
msgid "Counter-proposal"
msgstr "Counter-proposal"
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:797
#, c-format
msgid "Free/Busy information (%s to %s)"
msgstr "Free/Busy information (%s to %s)"
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:805
msgid "iCalendar information"
msgstr "iCalendar information"
-#: ../calendar/gui/itip-utils.c:1009
+#: ../calendar/gui/itip-utils.c:976
msgid "You must be an attendee of the event."
msgstr "You must be an attendee of the event."
@@ -8205,7 +8219,7 @@ msgstr "Create a new memo list"
msgid "Print Memos"
msgstr "Print Memos"
-#: ../calendar/gui/migration.c:164
+#: ../calendar/gui/migration.c:162
msgid ""
"The location and hierarchy of the Evolution task folders has changed since "
"Evolution 1.x.\n"
@@ -8217,7 +8231,7 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your folders..."
-#: ../calendar/gui/migration.c:168
+#: ../calendar/gui/migration.c:166
msgid ""
"The location and hierarchy of the Evolution calendar folders has changed "
"since Evolution 1.x.\n"
@@ -8230,27 +8244,27 @@ msgstr ""
"Please be patient while Evolution migrates your folders..."
#. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:782 ../calendar/gui/migration.c:950
+#: ../calendar/gui/migration.c:780 ../calendar/gui/migration.c:948
#, c-format
msgid "Unable to migrate old settings from evolution/config.xmldb"
msgstr "Unable to migrate old settings from evolution/config.xmldb"
#. FIXME: domain/code
-#: ../calendar/gui/migration.c:811
+#: ../calendar/gui/migration.c:809
#, c-format
msgid "Unable to migrate calendar `%s'"
msgstr "Unable to migrate calendar `%s'"
#. FIXME: domain/code
-#: ../calendar/gui/migration.c:979
+#: ../calendar/gui/migration.c:977
#, c-format
msgid "Unable to migrate tasks `%s'"
msgstr "Unable to migrate tasks `%s'"
-#: ../calendar/gui/migration.c:1234
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:402
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:433
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:546
+#: ../calendar/gui/migration.c:1232
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:427
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:458
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:571
msgid "Notes"
msgstr "Notes"
@@ -8486,35 +8500,35 @@ msgstr "There is no calendar available for creating tasks"
msgid "Task Source Selector"
msgstr "Task Source Selector"
-#: ../calendar/gui/tasks-component.c:1321
+#: ../calendar/gui/tasks-component.c:1326
msgid "New task"
msgstr "New task"
-#: ../calendar/gui/tasks-component.c:1323
+#: ../calendar/gui/tasks-component.c:1328
msgid "Create a new task"
msgstr "Create a new task"
-#: ../calendar/gui/tasks-component.c:1329
+#: ../calendar/gui/tasks-component.c:1334
msgid "New assigned task"
msgstr "New assigned task"
-#: ../calendar/gui/tasks-component.c:1330
+#: ../calendar/gui/tasks-component.c:1335
msgid "Assigne_d Task"
msgstr "Assigne_d Task"
-#: ../calendar/gui/tasks-component.c:1331
+#: ../calendar/gui/tasks-component.c:1336
msgid "Create a new assigned task"
msgstr "Create a new assigned task"
-#: ../calendar/gui/tasks-component.c:1337
+#: ../calendar/gui/tasks-component.c:1342
msgid "New task list"
msgstr "New task list"
-#: ../calendar/gui/tasks-component.c:1338
+#: ../calendar/gui/tasks-component.c:1343
msgid "Tas_k list"
msgstr "Tas_k list"
-#: ../calendar/gui/tasks-component.c:1339
+#: ../calendar/gui/tasks-component.c:1344
msgid "Create a new task list"
msgstr "Create a new task list"
@@ -8530,7 +8544,7 @@ msgstr ""
"\n"
"Really erase these tasks?"
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1132
+#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1133
msgid "Do not ask me again."
msgstr "Do not ask me again."
@@ -8544,7 +8558,7 @@ msgstr "Appointments and Meetings"
#: ../calendar/importers/icalendar-importer.c:337
#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1580
+#: ../plugins/itip-formatter/itip-formatter.c:1573
msgid "Opening calendar"
msgstr "Opening calendar"
@@ -10106,56 +10120,217 @@ msgstr "Pacific/Wallis"
msgid "Pacific/Yap"
msgstr "Pacific/Yap"
-#: ../composer/e-composer-name-header.c:95
-msgid "Click here for the address book"
-msgstr "Click here for the address book"
+#: ../composer/e-composer-autosave.c:275
+msgid "Could not open autosave file"
+msgstr "Could not open autosave file"
-#: ../composer/e-composer-post-header.c:117
-msgid "Posting destination"
-msgstr "Posting destination"
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
+msgstr "Unable to retrieve message from editor"
-#: ../composer/e-composer-post-header.c:118
-msgid "Choose folders to post the message to."
-msgstr "Choose folders to post the message to."
+#: ../composer/e-composer-actions.c:46
+msgid "Insert Attachment"
+msgstr "Insert Attachment"
-#: ../composer/e-composer-post-header.c:152
-msgid "Click here to select folders to post to"
-msgstr "Click here to select folders to post to"
+#: ../composer/e-composer-actions.c:50
+msgid "A_ttach"
+msgstr "A_ttach"
-#. Now add the signature stuff.
-#: ../composer/e-msg-composer-hdrs.c:221
-msgid "Si_gnature:"
-msgstr "Si_gnature:"
+#: ../composer/e-composer-actions.c:142
+msgid "Untitled Message"
+msgstr "Untitled Message"
-#: ../composer/e-msg-composer-hdrs.c:326
-msgid "Fr_om:"
-msgstr "Fr_om:"
+#: ../composer/e-composer-actions.c:464 ../ui/evolution-editor.xml.h:15
+msgid "_Attachment..."
+msgstr "_Attachment..."
-#: ../composer/e-msg-composer-hdrs.c:332
-msgid "_Reply-To:"
-msgstr "_Reply-To:"
+#: ../composer/e-composer-actions.c:466
+msgid "Attach a file"
+msgstr "Attach a file"
-#: ../composer/e-msg-composer-hdrs.c:335
-msgid "_To:"
-msgstr "_To:"
+#: ../composer/e-composer-actions.c:471 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "_Close"
+
+#: ../composer/e-composer-actions.c:473
+msgid "Close the current file"
+msgstr "Close the current file"
+
+#: ../composer/e-composer-actions.c:478 ../mail/em-folder-view.c:1344
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
+msgid "_Print..."
+msgstr "_Print..."
+
+#: ../composer/e-composer-actions.c:485 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
+msgid "Print Pre_view"
+msgstr "Print Pre_view"
+
+#: ../composer/e-composer-actions.c:494
+msgid "Save the current file"
+msgstr "Save the current file"
+
+#: ../composer/e-composer-actions.c:499
+msgid "Save _As..."
+msgstr "Save _As..."
+
+#: ../composer/e-composer-actions.c:501
+msgid "Save the current file with a different name"
+msgstr "Save the current file with a different name"
+
+#: ../composer/e-composer-actions.c:506
+msgid "Save _Draft"
+msgstr "Save _Draft"
+
+#: ../composer/e-composer-actions.c:508
+msgid "Save as draft"
+msgstr "Save as draft"
+
+#: ../composer/e-composer-actions.c:513
+msgid "S_end"
+msgstr "S_end"
+
+#: ../composer/e-composer-actions.c:515
+msgid "Send this message"
+msgstr "Send this message"
+
+#: ../composer/e-composer-actions.c:520 ../ui/evolution-task-editor.xml.h:23
+msgid "_Send Options"
+msgstr "_Send Options"
+
+#: ../composer/e-composer-actions.c:522
+msgid "Insert Send options"
+msgstr "Insert Send options"
+
+#: ../composer/e-composer-actions.c:529
+msgid "Character _Encoding"
+msgstr "Character _Encoding"
+
+#: ../composer/e-composer-actions.c:536
+msgid "_Security"
+msgstr "_Security"
+
+#: ../composer/e-composer-actions.c:546
+msgid "PGP _Encrypt"
+msgstr "PGP _Encrypt"
+
+#: ../composer/e-composer-actions.c:548
+msgid "Encrypt this message with PGP"
+msgstr "Encrypt this message with PGP"
+
+#: ../composer/e-composer-actions.c:554
+msgid "PGP _Sign"
+msgstr "PGP _Sign"
+
+#: ../composer/e-composer-actions.c:556
+msgid "Sign this message with your PGP key"
+msgstr "Sign this message with your PGP key"
+
+#: ../composer/e-composer-actions.c:562
+msgid "_Prioritize Message"
+msgstr "_Prioritise Message"
+
+#: ../composer/e-composer-actions.c:564
+msgid "Set the message priority to high"
+msgstr "Set the message priority to high"
+
+#: ../composer/e-composer-actions.c:570
+msgid "Re_quest Read Receipt"
+msgstr "Re_quest Read Receipt"
+
+#: ../composer/e-composer-actions.c:572
+msgid "Get delivery notification when your message is read"
+msgstr "Get delivery notification when your message is read"
-#: ../composer/e-msg-composer-hdrs.c:337
+#: ../composer/e-composer-actions.c:578
+msgid "S/MIME En_crypt"
+msgstr "S/MIME En_crypt"
+
+#: ../composer/e-composer-actions.c:580
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "Encrypt this message with your S/MIME Encryption Certificate"
+
+#: ../composer/e-composer-actions.c:586
+msgid "S/MIME Sig_n"
+msgstr "S/MIME Sig_n"
+
+#: ../composer/e-composer-actions.c:588
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Sign this message with your S/MIME Signature Certificate"
+
+#: ../composer/e-composer-actions.c:594
+msgid "_Bcc Field"
+msgstr "_Bcc Field"
+
+#: ../composer/e-composer-actions.c:596
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Toggles whether the BCC field is displayed"
+
+#: ../composer/e-composer-actions.c:602
+msgid "_Cc Field"
+msgstr "_Cc Field"
+
+#: ../composer/e-composer-actions.c:604
+msgid "Toggles whether the CC field is displayed"
+msgstr "Toggles whether the CC field is displayed"
+
+#: ../composer/e-composer-actions.c:610
+msgid "_From Field"
+msgstr "_From Field"
+
+#: ../composer/e-composer-actions.c:612
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Toggles whether the From chooser is displayed"
+
+#: ../composer/e-composer-actions.c:618
+msgid "_Post-To Field"
+msgstr "_Post-To Field"
+
+#: ../composer/e-composer-actions.c:620
+msgid "Toggles whether the Post-To field is displayed"
+msgstr "Toggles whether the Post-To field is displayed"
+
+#: ../composer/e-composer-actions.c:626
+msgid "_Reply-To Field"
+msgstr "_Reply-To Field"
+
+#: ../composer/e-composer-actions.c:628
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "Toggles whether the Reply-To field is displayed"
+
+#: ../composer/e-composer-actions.c:634
+msgid "_Subject Field"
+msgstr "_Subject Field"
+
+#: ../composer/e-composer-actions.c:636
+msgid "Toggles whether the Subject field is displayed"
+msgstr "Toggles whether the Subject field is displayed"
+
+#: ../composer/e-composer-actions.c:642
+msgid "_To Field"
+msgstr "_To Field"
+
+#: ../composer/e-composer-actions.c:644
+msgid "Toggles whether the To field is displayed"
+msgstr "Toggles whether the To field is displayed"
+
+#: ../composer/e-composer-actions.c:685 ../ui/evolution-editor.xml.h:1
+msgid "Attach"
+msgstr "Attach"
+
+#: ../composer/e-composer-header-table.c:66
msgid "Enter the recipients of the message"
msgstr "Enter the recipients of the message"
-#: ../composer/e-msg-composer-hdrs.c:340
-msgid "_Cc:"
-msgstr "_Cc:"
-
-#: ../composer/e-msg-composer-hdrs.c:342
+#: ../composer/e-composer-header-table.c:68
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr "Enter the addresses that will receive a carbon copy of the message"
-#: ../composer/e-msg-composer-hdrs.c:346
-msgid "_Bcc:"
-msgstr "_Bcc:"
-
-#: ../composer/e-msg-composer-hdrs.c:348
+#: ../composer/e-composer-header-table.c:71
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message"
@@ -10163,29 +10338,69 @@ msgstr ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message"
-#: ../composer/e-msg-composer-hdrs.c:353
+#: ../composer/e-composer-header-table.c:645
+msgid "Fr_om:"
+msgstr "Fr_om:"
+
+#: ../composer/e-composer-header-table.c:654
+msgid "_Reply-To:"
+msgstr "_Reply-To:"
+
+#: ../composer/e-composer-header-table.c:658
+msgid "_To:"
+msgstr "_To:"
+
+#: ../composer/e-composer-header-table.c:663
+msgid "_Cc:"
+msgstr "_Cc:"
+
+#: ../composer/e-composer-header-table.c:668
+msgid "_Bcc:"
+msgstr "_Bcc:"
+
+#: ../composer/e-composer-header-table.c:673
msgid "_Post To:"
msgstr "_Post To:"
-#: ../composer/e-msg-composer-hdrs.c:356
+#: ../composer/e-composer-header-table.c:677
msgid "S_ubject:"
msgstr "S_ubject:"
-#: ../composer/e-msg-composer-select-file.c:77
-msgid "A_ttach"
-msgstr "A_ttach"
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr "Si_gnature:"
-#: ../composer/e-msg-composer-select-file.c:198
-msgid "Insert Attachment"
-msgstr "Insert Attachment"
+#: ../composer/e-composer-name-header.c:114
+msgid "Click here for the address book"
+msgstr "Click here for the address book"
-#: ../composer/e-msg-composer.c:819
+#: ../composer/e-composer-post-header.c:136
+msgid "Posting destination"
+msgstr "Posting destination"
+
+#: ../composer/e-composer-post-header.c:137
+msgid "Choose folders to post the message to."
+msgstr "Choose folders to post the message to."
+
+#: ../composer/e-composer-post-header.c:171
+msgid "Click here to select folders to post to"
+msgstr "Click here to select folders to post to"
+
+#: ../composer/e-composer-private.c:65
+msgid "Recent _Documents"
+msgstr "Recent _Documents"
+
+#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1559
+msgid "Show _Attachment Bar"
+msgstr "Show _Attachment Bar"
+
+#: ../composer/e-msg-composer.c:873
msgid ""
"Cannot sign outgoing message: No signing certificate set for this account"
msgstr ""
"Cannot sign outgoing message: No signing certificate set for this account"
-#: ../composer/e-msg-composer.c:826
+#: ../composer/e-msg-composer.c:880
msgid ""
"Cannot encrypt outgoing message: No encryption certificate set for this "
"account"
@@ -10193,42 +10408,23 @@ msgstr ""
"Cannot encrypt outgoing message: No encryption certificate set for this "
"account"
-#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2515
+#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1936
+#: ../mail/em-format-html-display.c:2426 ../mail/mail-config.glade.h:45
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Attachment"
+msgstr[1] "Attachments"
+
+#: ../composer/e-msg-composer.c:1557
msgid "Hide _Attachment Bar"
msgstr "Hide _Attachment Bar"
-#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2518
-#: ../composer/e-msg-composer.c:3884
-msgid "Show _Attachment Bar"
-msgstr "Show _Attachment Bar"
-
-#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
-msgid "Unknown reason"
-msgstr "Unknown reason"
-
-#: ../composer/e-msg-composer.c:1525
-msgid "Could not open file"
-msgstr "Could not open file"
-
-#: ../composer/e-msg-composer.c:1533
-msgid "Unable to retrieve message from editor"
-msgstr "Unable to retrieve message from editor"
-
-#: ../composer/e-msg-composer.c:1819
-msgid "Untitled Message"
-msgstr "Untitled Message"
-
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1855
-msgid "Open File"
-msgstr "Open File"
-
-#: ../composer/e-msg-composer.c:2529 ../composer/e-msg-composer.c:3764
-#: ../composer/e-msg-composer.c:3767
+#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2734
msgid "Compose Message"
msgstr "Compose Message"
-#: ../composer/e-msg-composer.c:5037
+#: ../composer/e-msg-composer.c:4009
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)</"
"b>"
@@ -10261,8 +10457,7 @@ msgid "Because &quot;{0}&quot;, you may need to select different mail options."
msgstr ""
"Because &quot;{0}&quot;, you may need to select different mail options."
-#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:5
msgid "Because &quot;{1}&quot;."
msgstr "Because &quot;{1}&quot;."
@@ -10380,7 +10575,7 @@ msgstr "You need to configure an account before you can compose mail."
msgid "_Do not Recover"
msgstr "_Do not Recover"
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:317
+#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:318
msgid "_Recover"
msgstr "_Recover"
@@ -10392,13 +10587,13 @@ msgstr "_Save Message"
msgid "Evolution Mail and Calendar"
msgstr "Evolution Mail and Calendar"
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:753
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:751
msgid "Groupware Suite"
msgstr "Groupware Suite"
#: ../data/evolution.desktop.in.in.h:3
msgid "Manage your email, contacts and schedule"
-msgstr "Manage your email, contacts and schedule"
+msgstr "Manage your e-mail, contacts and schedule"
#: ../data/evolution.keys.in.in.h:1
msgid "address card"
@@ -10425,11 +10620,22 @@ msgid "Evolution Query"
msgstr "Evolution Query"
#. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:458
#, c-format
msgid "Internal error, unknown error '%s' requested"
msgstr "Internal error, unknown error '%s' requested"
+#: ../e-util/e-plugin.c:308 ../mail/em-account-prefs.c:489
+#: ../mail/em-composer-prefs.c:979
+#: ../plugins/plugin-manager/plugin-manager.c:331
+#: ../plugins/publish-calendar/publish-calendar.c:689
+msgid "Enabled"
+msgstr "Enabled"
+
+#: ../e-util/e-plugin.c:309
+msgid "Whether the plugin is enabled"
+msgstr "Whether the plugin is enabled"
+
#: ../e-util/e-print.c:138
msgid "An error occurred while printing"
msgstr "An error occurred whilst printing"
@@ -10444,21 +10650,25 @@ msgid ""
msgstr ""
"The printing system did not report any additional details about the error."
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+msgid "Because \"{1}\"."
+msgstr "Because \"{1}\"."
+
#: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file &quot;{0}&quot;."
-msgstr "Cannot open file &quot;{0}&quot;."
+msgid "Cannot open file \"{0}\"."
+msgstr "Cannot open file \"{0}\"."
#: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file &quot;{0}&quot;."
-msgstr "Cannot save file &quot;{0}&quot;."
+msgid "Cannot save file \"{0}\"."
+msgstr "Cannot save file \"{0}\"."
#: ../e-util/e-system.error.xml.h:4
msgid "Do you wish to overwrite it?"
msgstr "Do you wish to overwrite it?"
#: ../e-util/e-system.error.xml.h:5
-msgid "File exists &quot;{0}&quot;."
-msgstr "File exists &quot;{0}&quot;."
+msgid "File exists \"{0}\"."
+msgstr "File exists \"{0}\"."
#: ../e-util/e-system.error.xml.h:6
msgid "Overwrite file?"
@@ -10496,21 +10706,34 @@ msgstr "_Later"
msgid "Label _Name:"
msgstr "Label _Name:"
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:340
msgid "Edit Label"
msgstr "Edit Label"
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:340
msgid "Add Label"
msgstr "Add Label"
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:359
msgid "Label name cannot be empty."
msgstr "Label name cannot be empty."
-#: ../e-util/e-util-labels.c:362
-msgid "Label with same tag already exists. Rename your label please."
-msgstr "Label with same tag already exists. Rename your label please."
+#: ../e-util/e-util-labels.c:364
+msgid ""
+"A label having the same tag already exists on the server. Please rename your "
+"label."
+msgstr ""
+"A label having the same tag already exists on the server. Please rename your "
+"label."
+
+#: ../e-util/gconf-bridge.c:1218
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf error: %s"
+
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr "All further errors shown only on terminal."
#: ../filter/filter-datespec.c:80
#, c-format
@@ -10682,11 +10905,11 @@ msgid "I_nclude threads"
msgstr "I_nclude threads"
#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../mail/em-utils.c:308
msgid "Incoming"
msgstr "Incoming"
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:990 ../mail/em-utils.c:309
msgid "Outgoing"
msgstr "Outgoing"
@@ -10710,7 +10933,7 @@ msgstr "Missing date."
msgid "Missing file name."
msgstr "Missing file name."
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
msgid "Missing name."
msgstr "Missing name."
@@ -10786,7 +11009,7 @@ msgstr "in the future"
msgid "months"
msgstr "months"
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:194
msgid "seconds"
msgstr "seconds"
@@ -10836,7 +11059,7 @@ msgstr "Configure spell-checking, signatures, and the message composer here"
#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
msgid "Configure your email accounts here"
-msgstr "Configure your email accounts here"
+msgstr "Configure your e-mail accounts here"
#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
msgid "Configure your network connection settings here"
@@ -10870,10 +11093,10 @@ msgstr "Evolution Mail preferences control"
msgid "Evolution Network configuration control"
msgstr "Evolution Network configuration control"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:611
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:578 ../mail/mail-component.c:579
-#: ../mail/mail-component.c:743
+#: ../mail/mail-component.c:584 ../mail/mail-component.c:585
+#: ../mail/mail-component.c:749
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
msgid "Mail"
msgstr "Mail"
@@ -10884,7 +11107,7 @@ msgid "Mail Accounts"
msgstr "Mail Accounts"
#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:103
msgid "Mail Preferences"
msgstr "Mail Preferences"
@@ -10920,7 +11143,7 @@ msgid "Select Folder"
msgstr "Select Folder"
#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:78
+#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:97
msgid "Autogenerated"
msgstr "Autogenerated"
@@ -10928,50 +11151,50 @@ msgstr "Autogenerated"
msgid "Ask for each message"
msgstr "Ask for each message"
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:95
+#: ../mail/em-account-editor.c:1825 ../mail/mail-config.glade.h:94
msgid "Identity"
msgstr "Identity"
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:125
+#: ../mail/em-account-editor.c:1874 ../mail/mail-config.glade.h:123
msgid "Receiving Email"
-msgstr "Receiving Email"
+msgstr "Receiving E-mail"
-#: ../mail/em-account-editor.c:2053
+#: ../mail/em-account-editor.c:2056
msgid "Check for _new messages every"
msgstr "Check for _new messages every"
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2064
msgid "minu_tes"
msgstr "minu_tes"
-#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:137
+#: ../mail/em-account-editor.c:2238 ../mail/mail-config.glade.h:135
msgid "Sending Email"
-msgstr "Sending Email"
+msgstr "Sending E-mail"
-#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2297 ../mail/mail-config.glade.h:67
msgid "Defaults"
msgstr "Defaults"
#. Security settings
-#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:132
-#: ../plugins/exchange-operations/exchange-account-setup.c:317
+#: ../mail/em-account-editor.c:2363 ../mail/mail-config.glade.h:130
+#: ../plugins/exchange-operations/exchange-account-setup.c:316
msgid "Security"
msgstr "Security"
#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
+#: ../mail/em-account-editor.c:2400 ../mail/em-account-editor.c:2491
msgid "Receiving Options"
msgstr "Receiving Options"
-#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2401 ../mail/em-account-editor.c:2492
msgid "Checking for New Messages"
msgstr "Checking for New Messages"
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2843 ../mail/mail-config.glade.h:34
msgid "Account Editor"
msgstr "Account Editor"
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:84
+#: ../mail/em-account-editor.c:2843 ../mail/mail-config.glade.h:83
msgid "Evolution Account Assistant"
msgstr "Evolution Account Assistant"
@@ -10980,12 +11203,6 @@ msgstr "Evolution Account Assistant"
msgid "[Default]"
msgstr "[Default]"
-#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:947
-#: ../plugins/plugin-manager/plugin-manager.c:331
-#: ../plugins/publish-calendar/publish-calendar.c:510
-msgid "Enabled"
-msgstr "Enabled"
-
#: ../mail/em-account-prefs.c:495
msgid "Account name"
msgstr "Account name"
@@ -10994,35 +11211,35 @@ msgstr "Account name"
msgid "Protocol"
msgstr "Protocol"
-#: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:1062
+#: ../mail/em-composer-prefs.c:300 ../mail/em-composer-prefs.c:435
+#: ../mail/mail-config.c:1117 ../mail/mail-signature-editor.c:478
msgid "Unnamed"
msgstr "Unnamed"
-#: ../mail/em-composer-prefs.c:953
+#: ../mail/em-composer-prefs.c:983
msgid "Language(s)"
msgstr "Language(s)"
-#: ../mail/em-composer-prefs.c:996
+#: ../mail/em-composer-prefs.c:1032
msgid "Add signature script"
msgstr "Add signature script"
-#: ../mail/em-composer-prefs.c:1016
+#: ../mail/em-composer-prefs.c:1074
msgid "Signature(s)"
msgstr "Signature(s)"
-#: ../mail/em-composer-utils.c:898 ../mail/em-format-quote.c:399
+#: ../mail/em-composer-utils.c:938 ../mail/em-format-quote.c:413
msgid "-------- Forwarded Message --------"
msgstr "-------- Forwarded Message --------"
-#: ../mail/em-composer-utils.c:1703
+#: ../mail/em-composer-utils.c:1754
msgid "an unknown sender"
msgstr "an unknown sender"
#. Note to translators: this is the attribution string used when quoting messages.
#. * each ${Variable} gets replaced with a value. To see a full list of available
#. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1750
+#: ../mail/em-composer-utils.c:1801
msgid ""
"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
"${TimeZone}, ${Sender} wrote:"
@@ -11030,7 +11247,7 @@ msgstr ""
"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
"${TimeZone}, ${Sender} wrote:"
-#: ../mail/em-composer-utils.c:1891
+#: ../mail/em-composer-utils.c:1942
msgid "-----Original Message-----"
msgstr "-----Original Message-----"
@@ -11151,7 +11368,7 @@ msgstr "Expression"
msgid "Follow Up"
msgstr "Follow Up"
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1054
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1053
msgid "Important"
msgstr "Important"
@@ -11195,7 +11412,7 @@ msgstr "is not set"
msgid "is set"
msgstr "is set"
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:98
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
#: ../ui/evolution-mail-message.xml.h:48
msgid "Junk"
msgstr "Junk"
@@ -11318,10 +11535,9 @@ msgstr "starts with"
msgid "Stop Processing"
msgstr "Stop Processing"
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-html.c:1706
-#: ../mail/em-format-quote.c:322 ../mail/em-format.c:891
-#: ../mail/em-mailer-prefs.c:95 ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:337
+#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:95
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:337
#: ../plugins/groupwise-features/properties.glade.h:7
#: ../smime/lib/e-cert.c:1132
msgid "Subject"
@@ -11340,56 +11556,56 @@ msgstr "Then"
msgid "Add Ac_tion"
msgstr "Add Ac_tion"
-#: ../mail/em-folder-browser.c:189
+#: ../mail/em-folder-browser.c:190
msgid "C_reate Search Folder From Search..."
msgstr "C_reate Search Folder From Search..."
-#: ../mail/em-folder-browser.c:214
+#: ../mail/em-folder-browser.c:215
msgid "All Messages"
msgstr "All Messages"
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:216
msgid "Unread Messages"
msgstr "Unread Messages"
-#: ../mail/em-folder-browser.c:217
+#: ../mail/em-folder-browser.c:218
msgid "No Label"
msgstr "No Label"
-#: ../mail/em-folder-browser.c:224
+#: ../mail/em-folder-browser.c:225
msgid "Read Messages"
msgstr "Read Messages"
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:226
msgid "Recent Messages"
msgstr "Recent Messages"
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:227
msgid "Last 5 Days' Messages"
msgstr "Last 5 Days' Messages"
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:228
msgid "Messages with Attachments"
msgstr "Messages with Attachments"
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
msgid "Important Messages"
msgstr "Important Messages"
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
msgid "Messages Not Junk"
msgstr "Messages Not Junk"
-#: ../mail/em-folder-browser.c:1123
+#: ../mail/em-folder-browser.c:1148
msgid "Account Search"
msgstr "Account Search"
-#: ../mail/em-folder-browser.c:1176
+#: ../mail/em-folder-browser.c:1201
msgid "All Account Search"
msgstr "All Account Search"
#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:149
+#: ../mail/em-folder-properties.c:185
msgid "Unread messages:"
msgid_plural "Unread messages:"
msgstr[0] "Unread messages:"
@@ -11397,13 +11613,17 @@ msgstr[1] "Unread messages:"
#. TODO: can this be done in a loop?
#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:163
+#: ../mail/em-folder-properties.c:189
msgid "Total messages:"
msgid_plural "Total messages:"
msgstr[0] "Total messages:"
msgstr[1] "Total messages:"
-#: ../mail/em-folder-properties.c:323
+#: ../mail/em-folder-properties.c:205 ../mail/em-folder-properties.c:207
+msgid "Quota usage"
+msgstr "Quota usage"
+
+#: ../mail/em-folder-properties.c:397
#: ../plugins/groupwise-features/properties.glade.h:4
msgid "Folder Properties"
msgstr "Folder Properties"
@@ -11435,7 +11655,7 @@ msgid "Drafts"
msgstr "Drafts"
#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:503 ../mail/em-folder-tree.c:2536
+#: ../mail/em-folder-tree-model.c:503 ../mail/em-folder-tree.c:2537
#: ../mail/mail-component.c:157
#: ../plugins/exchange-operations/exchange-delegates-user.c:88
#: ../plugins/exchange-operations/exchange-folder.c:593
@@ -11474,81 +11694,80 @@ msgstr "Loading..."
msgid "folder-display|%s (%u)"
msgstr "%s (%u)"
-#: ../mail/em-folder-tree.c:733
+#: ../mail/em-folder-tree.c:734
msgid "Mail Folder Tree"
msgstr "Mail Folder Tree"
-#: ../mail/em-folder-tree.c:892
+#: ../mail/em-folder-tree.c:893
#, c-format
msgid "Moving folder %s"
msgstr "Moving folder %s"
-#: ../mail/em-folder-tree.c:894
+#: ../mail/em-folder-tree.c:895
#, c-format
msgid "Copying folder %s"
msgstr "Copying folder %s"
-#: ../mail/em-folder-tree.c:901 ../mail/message-list.c:1974
+#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1954
#, c-format
msgid "Moving messages into folder %s"
msgstr "Moving messages into folder %s"
-#: ../mail/em-folder-tree.c:903 ../mail/message-list.c:1976
+#: ../mail/em-folder-tree.c:904 ../mail/message-list.c:1956
#, c-format
msgid "Copying messages into folder %s"
msgstr "Copying messages into folder %s"
-#: ../mail/em-folder-tree.c:918
+#: ../mail/em-folder-tree.c:919
msgid "Cannot drop message(s) into toplevel store"
msgstr "Cannot drop message(s) into toplevel store"
-#: ../mail/em-folder-tree.c:995 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:996 ../ui/evolution-mail-message.xml.h:105
msgid "_Copy to Folder"
msgstr "_Copy to Folder"
-#: ../mail/em-folder-tree.c:996 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:997 ../ui/evolution-mail-message.xml.h:118
msgid "_Move to Folder"
msgstr "_Move to Folder"
-#: ../mail/em-folder-tree.c:1705 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1706 ../mail/mail-ops.c:1056
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "Scanning folders in \"%s\""
-#: ../mail/em-folder-tree.c:2078 ../ui/evolution-addressbook.xml.h:64
+#: ../mail/em-folder-tree.c:2079 ../ui/evolution-addressbook.xml.h:64
#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
#: ../ui/evolution.xml.h:54
msgid "_View"
msgstr "_View"
-#: ../mail/em-folder-tree.c:2079
+#: ../mail/em-folder-tree.c:2080
msgid "Open in _New Window"
msgstr "Open in _New Window"
#. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2084
+#: ../mail/em-folder-tree.c:2085
msgid "_New Folder..."
msgstr "_New Folder..."
-#: ../mail/em-folder-tree.c:2087
+#: ../mail/em-folder-tree.c:2088
msgid "_Move..."
msgstr "_Move..."
-#: ../mail/em-folder-tree.c:2094 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2095 ../ui/evolution-mail-list.xml.h:39
msgid "_Rename..."
msgstr "_Rename..."
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2096
msgid "Re_fresh"
msgstr "Re_fresh"
-#: ../mail/em-folder-tree.c:2096
+#: ../mail/em-folder-tree.c:2097
msgid "Fl_ush Outbox"
msgstr "Fl_ush Outbox"
-#: ../mail/em-folder-tree.c:2102 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2103 ../mail/mail.error.xml.h:138
msgid "_Empty Trash"
msgstr "_Empty Wastebasket"
@@ -11557,13 +11776,13 @@ msgstr "_Empty Wastebasket"
msgid "Copying `%s' to `%s'"
msgstr "Copying `%s' to `%s'"
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1192
-#: ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
+#: ../mail/em-folder-view.c:1208
#: ../mail/importers/evolution-mbox-importer.c:86
msgid "Select folder"
msgstr "Select folder"
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
msgid "C_opy"
msgstr "C_opy"
@@ -11585,207 +11804,199 @@ msgstr "Create folder"
msgid "Specify where to create the folder:"
msgstr "Specify where to create the folder:"
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
msgid "Mail Deletion Failed"
msgstr "Mail Deletion Failed"
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
msgid "You do not have sufficient permissions to delete this mail."
msgstr "You do not have sufficient permission to delete this mail."
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
msgid "_Reply to Sender"
msgstr "_Reply to Sender"
-#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:579 ../mail/em-popup.c:590
+#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:579 ../mail/em-popup.c:590
#: ../ui/evolution-mail-message.xml.h:110
msgid "_Forward"
msgstr "_Forward"
#. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1341 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1342 ../ui/evolution-mail-message.xml.h:107
msgid "_Edit as New Message..."
msgstr "_Edit as New Message..."
-#: ../mail/em-folder-view.c:1343
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "_Print..."
-
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1348
msgid "U_ndelete"
msgstr "U_ndelete"
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1349
msgid "_Move to Folder..."
msgstr "_Move to Folder..."
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1350
msgid "_Copy to Folder..."
msgstr "_Copy to Folder..."
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1353
msgid "Mar_k as Read"
msgstr "Mar_k as Read"
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1354
msgid "Mark as _Unread"
msgstr "Mark as _Unread"
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1355
msgid "Mark as _Important"
msgstr "Mark as _Important"
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1356
msgid "Mark as Un_important"
msgstr "Mark as Un_important"
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1357
msgid "Mark as _Junk"
msgstr "Mark as _Junk"
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1358
msgid "Mark as _Not Junk"
msgstr "Mark as _Not Junk"
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1359
msgid "Mark for Follo_w Up..."
msgstr "Mark for Follo_w Up..."
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1361
msgid "_Label"
msgstr "_Label"
#. Note that we don't show this here, since by default a 'None' date
#. is not permitted.
-#: ../mail/em-folder-view.c:1361 ../widgets/misc/e-dateedit.c:498
+#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:500
msgid "_None"
msgstr "_None"
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1365
msgid "_New Label"
msgstr "_New Label"
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1369
msgid "Fla_g Completed"
msgstr "Fla_g Completed"
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1370
msgid "Cl_ear Flag"
msgstr "Cl_ear Flag"
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1373
msgid "Crea_te Rule From Message"
msgstr "Crea_te Rule From Message"
#. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1374
+#: ../mail/em-folder-view.c:1375
msgid "Search Folder based on _Subject"
msgstr "Search Folder based on _Subject"
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1376
msgid "Search Folder based on Se_nder"
msgstr "Search Folder based on Se_nder"
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1377
msgid "Search Folder based on _Recipients"
msgstr "Search Folder based on _Recipients"
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1378
msgid "Search Folder based on Mailing _List"
msgstr "Search Folder based on Mailing _List"
#. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1382
+#: ../mail/em-folder-view.c:1383
msgid "Filter based on Sub_ject"
msgstr "Filter based on Sub_ject"
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1384
msgid "Filter based on Sen_der"
msgstr "Filter based on Sen_der"
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1385
msgid "Filter based on Re_cipients"
msgstr "Filter based on Re_cipients"
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1386
msgid "Filter based on _Mailing List"
msgstr "Filter based on _Mailing List"
#. default charset used in mail view
-#: ../mail/em-folder-view.c:2267 ../mail/em-folder-view.c:2311
+#: ../mail/em-folder-view.c:2268 ../mail/em-folder-view.c:2312
msgid "Default"
msgstr "Default"
-#: ../mail/em-folder-view.c:2529
+#: ../mail/em-folder-view.c:2530
msgid "Unable to retrieve message"
msgstr "Unable to retrieve message"
-#: ../mail/em-folder-view.c:2548
+#: ../mail/em-folder-view.c:2549
msgid "Retrieving Message..."
msgstr "Retrieving Message..."
-#: ../mail/em-folder-view.c:2807
+#: ../mail/em-folder-view.c:2808
msgid "C_all To..."
msgstr "C_all To..."
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2811
msgid "Create _Search Folder"
msgstr "Create _Search Folder"
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2812
msgid "_From this Address"
msgstr "_From this Address"
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2813
msgid "_To this Address"
msgstr "_To this Address"
-#: ../mail/em-folder-view.c:3309
+#: ../mail/em-folder-view.c:3310
#, c-format
msgid "Click to mail %s"
msgstr "Click to mail %s"
-#: ../mail/em-folder-view.c:3321
+#: ../mail/em-folder-view.c:3322
#, c-format
msgid "Click to call %s"
msgstr "Click to call %s"
-#: ../mail/em-folder-view.c:3326
+#: ../mail/em-folder-view.c:3327
msgid "Click to hide/unhide addresses"
msgstr "Click to hide/unhide addresses"
#. message-search popup match count string
-#: ../mail/em-format-html-display.c:515
+#: ../mail/em-format-html-display.c:494
#, c-format
msgid "Matches: %d"
msgstr "Matches: %d"
-#: ../mail/em-format-html-display.c:659
+#: ../mail/em-format-html-display.c:638
msgid "Fin_d:"
msgstr "Fin_d:"
#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:662
msgid "_Previous"
msgstr "_Previous"
-#: ../mail/em-format-html-display.c:688
+#: ../mail/em-format-html-display.c:667
msgid "_Next"
msgstr "_Next"
-#: ../mail/em-format-html-display.c:693
+#: ../mail/em-format-html-display.c:672
msgid "M_atch case"
msgstr "M_atch case"
-#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:645
+#: ../mail/em-format-html-display.c:971 ../mail/em-format-html.c:647
msgid "Unsigned"
msgstr "Unsigned"
-#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:971
msgid ""
"This message is not signed. There is no guarantee that this message is "
"authentic."
@@ -11793,11 +12004,11 @@ msgstr ""
"This message is not signed. There is no guarantee that this message is "
"authentic."
-#: ../mail/em-format-html-display.c:993 ../mail/em-format-html.c:646
+#: ../mail/em-format-html-display.c:972 ../mail/em-format-html.c:648
msgid "Valid signature"
msgstr "Valid signature"
-#: ../mail/em-format-html-display.c:993
+#: ../mail/em-format-html-display.c:972
msgid ""
"This message is signed and is valid meaning that it is very likely that this "
"message is authentic."
@@ -11805,11 +12016,11 @@ msgstr ""
"This message is signed and is valid meaning that it is very likely that this "
"message is authentic."
-#: ../mail/em-format-html-display.c:994 ../mail/em-format-html.c:647
+#: ../mail/em-format-html-display.c:973 ../mail/em-format-html.c:649
msgid "Invalid signature"
msgstr "Invalid signature"
-#: ../mail/em-format-html-display.c:994
+#: ../mail/em-format-html-display.c:973
msgid ""
"The signature of this message cannot be verified, it may have been altered "
"in transit."
@@ -11817,11 +12028,11 @@ msgstr ""
"The signature of this message cannot be verified, it may have been altered "
"in transit."
-#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:648
+#: ../mail/em-format-html-display.c:974 ../mail/em-format-html.c:650
msgid "Valid signature, but cannot verify sender"
msgstr "Valid signature, but cannot verify sender"
-#: ../mail/em-format-html-display.c:995
+#: ../mail/em-format-html-display.c:974
msgid ""
"This message is signed with a valid signature, but the sender of the message "
"cannot be verified."
@@ -11829,11 +12040,11 @@ msgstr ""
"This message is signed with a valid signature, but the sender of the message "
"cannot be verified."
-#: ../mail/em-format-html-display.c:996 ../mail/em-format-html.c:649
+#: ../mail/em-format-html-display.c:975 ../mail/em-format-html.c:651
msgid "Signature exists, but need public key"
msgstr "Signature exists, but need public key"
-#: ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:975
msgid ""
"This message is signed with a signature, but there is no corresponding "
"public key."
@@ -11841,11 +12052,11 @@ msgstr ""
"This message is signed with a signature, but there is no corresponding "
"public key."
-#: ../mail/em-format-html-display.c:1003 ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:982 ../mail/em-format-html.c:657
msgid "Unencrypted"
msgstr "Unencrypted"
-#: ../mail/em-format-html-display.c:1003
+#: ../mail/em-format-html-display.c:982
msgid ""
"This message is not encrypted. Its content may be viewed in transit across "
"the Internet."
@@ -11853,11 +12064,11 @@ msgstr ""
"This message is not encrypted. Its content may be viewed in transit across "
"the Internet."
-#: ../mail/em-format-html-display.c:1004 ../mail/em-format-html.c:656
+#: ../mail/em-format-html-display.c:983 ../mail/em-format-html.c:658
msgid "Encrypted, weak"
msgstr "Encrypted, weak"
-#: ../mail/em-format-html-display.c:1004
+#: ../mail/em-format-html-display.c:983
msgid ""
"This message is encrypted, but with a weak encryption algorithm. It would be "
"difficult, but not impossible for an outsider to view the content of this "
@@ -11867,11 +12078,11 @@ msgstr ""
"difficult, but not impossible for an outsider to view the content of this "
"message in a practical amount of time."
-#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:984 ../mail/em-format-html.c:659
msgid "Encrypted"
msgstr "Encrypted"
-#: ../mail/em-format-html-display.c:1005
+#: ../mail/em-format-html-display.c:984
msgid ""
"This message is encrypted. It would be difficult for an outsider to view "
"the content of this message."
@@ -11879,11 +12090,11 @@ msgstr ""
"This message is encrypted. It would be difficult for an outsider to view "
"the content of this message."
-#: ../mail/em-format-html-display.c:1006 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:985 ../mail/em-format-html.c:660
msgid "Encrypted, strong"
msgstr "Encrypted, strong"
-#: ../mail/em-format-html-display.c:1006
+#: ../mail/em-format-html-display.c:985
msgid ""
"This message is encrypted, with a strong encryption algorithm. It would be "
"very difficult for an outsider to view the content of this message in a "
@@ -11893,97 +12104,92 @@ msgstr ""
"very difficult for an outsider to view the content of this message in a "
"practical amount of time."
-#: ../mail/em-format-html-display.c:1107 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1086 ../smime/gui/smime-ui.glade.h:48
msgid "_View Certificate"
msgstr "_View Certificate"
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1101
msgid "This certificate is not viewable"
msgstr "This certificate is not viewable"
-#: ../mail/em-format-html-display.c:1441
+#: ../mail/em-format-html-display.c:1394
msgid "Completed on %B %d, %Y, %l:%M %p"
msgstr "Completed on %d %B, %Y, %l:%M %p"
-#: ../mail/em-format-html-display.c:1449
+#: ../mail/em-format-html-display.c:1402
msgid "Overdue:"
msgstr "Overdue:"
-#: ../mail/em-format-html-display.c:1452
+#: ../mail/em-format-html-display.c:1405
msgid "by %B %d, %Y, %l:%M %p"
msgstr "by %d %B, %Y, %l:%M %p"
-#: ../mail/em-format-html-display.c:1512
+#: ../mail/em-format-html-display.c:1483
msgid "_View Inline"
msgstr "_View Inline"
-#: ../mail/em-format-html-display.c:1513
+#: ../mail/em-format-html-display.c:1484
msgid "_Hide"
msgstr "_Hide"
-#: ../mail/em-format-html-display.c:1514
+#: ../mail/em-format-html-display.c:1485
msgid "_Fit to Width"
msgstr "_Fit to Width"
-#: ../mail/em-format-html-display.c:1515
+#: ../mail/em-format-html-display.c:1486
msgid "Show _Original Size"
msgstr "Show _Original Size"
-#: ../mail/em-format-html-display.c:1959 ../mail/em-format-html-display.c:2572
-#: ../mail/mail-config.glade.h:46 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "Attachment"
-
-#: ../mail/em-format-html-display.c:2173
+#: ../mail/em-format-html-display.c:2006
msgid "Save attachment as"
msgstr "Save attachment as"
-#: ../mail/em-format-html-display.c:2177
+#: ../mail/em-format-html-display.c:2010
msgid "Select folder to save all attachments"
msgstr "Select folder to save all attachments"
-#: ../mail/em-format-html-display.c:2228
+#: ../mail/em-format-html-display.c:2061
msgid "_Save Selected..."
msgstr "_Save Selected..."
#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2295
+#: ../mail/em-format-html-display.c:2128
#, c-format
msgid "%d at_tachment"
msgid_plural "%d at_tachments"
msgstr[0] "%d at_tachment"
msgstr[1] "%d at_tachments"
-#: ../mail/em-format-html-display.c:2302 ../mail/em-format-html-display.c:2380
+#: ../mail/em-format-html-display.c:2135 ../mail/em-format-html-display.c:2224
msgid "S_ave"
msgstr "S_ave"
-#: ../mail/em-format-html-display.c:2313
+#: ../mail/em-format-html-display.c:2146
msgid "S_ave All"
msgstr "S_ave All"
-#: ../mail/em-format-html-display.c:2376
+#: ../mail/em-format-html-display.c:2220
msgid "No Attachment"
msgstr "No Attachment"
-#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
+#: ../mail/em-format-html-display.c:2361 ../mail/em-format-html-display.c:2399
msgid "View _Unformatted"
msgstr "View _Unformatted"
-#: ../mail/em-format-html-display.c:2509
+#: ../mail/em-format-html-display.c:2363
msgid "Hide _Unformatted"
msgstr "Hide _Unformatted"
-#: ../mail/em-format-html-display.c:2564
+#: ../mail/em-format-html-display.c:2418
msgid "O_pen With"
msgstr "O_pen With"
-#: ../mail/em-format-html-display.c:2635
+#: ../mail/em-format-html-display.c:2489
msgid ""
"Evolution cannot render this email as it is too large to handle. You can "
"view it unformatted or with an external text editor."
msgstr ""
-"Evolution cannot render this email as it is too large to handle. You can "
+"Evolution cannot render this e-mail as it is too large to handle. You can "
"view it unformatted or with an external text editor."
#: ../mail/em-format-html-print.c:156
@@ -11991,112 +12197,110 @@ msgstr ""
msgid "Page %d of %d"
msgstr "Page %d of %d"
-#: ../mail/em-format-html.c:499 ../mail/em-format-html.c:508
+#: ../mail/em-format-html.c:501 ../mail/em-format-html.c:510
#, c-format
msgid "Retrieving `%s'"
msgstr "Retrieving `%s'"
-#: ../mail/em-format-html.c:920
+#: ../mail/em-format-html.c:922
msgid "Unknown external-body part."
msgstr "Unknown external-body part."
-#: ../mail/em-format-html.c:928
+#: ../mail/em-format-html.c:930
msgid "Malformed external-body part."
msgstr "Malformed external-body part."
-#: ../mail/em-format-html.c:958
+#: ../mail/em-format-html.c:960
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "Pointer to FTP site (%s)"
-#: ../mail/em-format-html.c:969
+#: ../mail/em-format-html.c:971
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr "Pointer to local file (%s) valid at site \"%s\""
-#: ../mail/em-format-html.c:971
+#: ../mail/em-format-html.c:973
#, c-format
msgid "Pointer to local file (%s)"
msgstr "Pointer to local file (%s)"
-#: ../mail/em-format-html.c:992
+#: ../mail/em-format-html.c:994
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "Pointer to remote data (%s)"
-#: ../mail/em-format-html.c:1003
+#: ../mail/em-format-html.c:1005
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "Pointer to unknown external data (\"%s\" type)"
-#: ../mail/em-format-html.c:1231
+#: ../mail/em-format-html.c:1233
msgid "Formatting message"
msgstr "Formatting message"
-#: ../mail/em-format-html.c:1398
+#: ../mail/em-format-html.c:1407
msgid "Formatting Message..."
msgstr "Formatting Message..."
-#: ../mail/em-format-html.c:1550 ../mail/em-format-html.c:1614
-#: ../mail/em-format-html.c:1636 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:93
+#: ../mail/em-format-html.c:1559 ../mail/em-format-html.c:1623
+#: ../mail/em-format-html.c:1645 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:93
msgid "Cc"
msgstr "Cc"
-#: ../mail/em-format-html.c:1551 ../mail/em-format-html.c:1620
-#: ../mail/em-format-html.c:1639 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:94
+#: ../mail/em-format-html.c:1560 ../mail/em-format-html.c:1629
+#: ../mail/em-format-html.c:1648 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:94
msgid "Bcc"
msgstr "Bcc"
#. pseudo-header
-#: ../mail/em-format-html.c:1710 ../mail/em-format-quote.c:331
-#: ../mail/em-mailer-prefs.c:1458
+#: ../mail/em-format-html.c:1740 ../mail/em-format-quote.c:350
+#: ../mail/em-mailer-prefs.c:1465
msgid "Mailer"
msgstr "Mailer"
#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1737
+#: ../mail/em-format-html.c:1767
msgid " (%a, %R %Z)"
msgstr " (%a, %R %Z)"
#. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1742
+#: ../mail/em-format-html.c:1772
msgid " (%R %Z)"
msgstr " (%R %Z)"
-#: ../mail/em-format-html.c:1754 ../mail/em-format-quote.c:338
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:96
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
-msgid "Date"
-msgstr "Date"
-
-#: ../mail/em-format-html.c:1777 ../mail/em-format.c:893
-#: ../mail/em-mailer-prefs.c:97
-msgid "Newsgroups"
-msgstr "Newsgroups"
-
#. To translators: This message suggests to the receipients that the sender of the mail is
#. different from the one listed in From field.
#.
-#: ../mail/em-format-html.c:1870
+#: ../mail/em-format-html.c:1903
#, c-format
msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
msgstr "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
#: ../mail/message-tag-followup.c:333
msgid "From"
msgstr "From"
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:887
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
#: ../mail/em-mailer-prefs.c:91
msgid "Reply-To"
msgstr "Reply-To"
-#: ../mail/em-format.c:1157
+#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:96
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
+#: ../widgets/misc/e-dateedit.c:368
+msgid "Date"
+msgstr "Date"
+
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:97
+msgid "Newsgroups"
+msgstr "Newsgroups"
+
+#: ../mail/em-format.c:1156
#, c-format
msgid "%s attachment"
msgstr "%s attachment"
@@ -12182,34 +12386,34 @@ msgid "Tag"
msgstr "Tag"
#. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1140
+#: ../mail/em-mailer-prefs.c:1093 ../mail/em-mailer-prefs.c:1147
#, c-format
msgid "%s plugin is available and the binary is installed."
msgstr "%s plugin is available and the binary is installed."
#. May be a better text
-#: ../mail/em-mailer-prefs.c:1094 ../mail/em-mailer-prefs.c:1149
+#: ../mail/em-mailer-prefs.c:1101 ../mail/em-mailer-prefs.c:1156
#, c-format
msgid ""
"%s plugin is not available. Please check whether the package is installed."
msgstr ""
"%s plugin is not available. Please check whether the package is installed."
-#: ../mail/em-mailer-prefs.c:1115
+#: ../mail/em-mailer-prefs.c:1122
msgid "No Junk plugin available"
msgstr "No Junk plugin available"
#. green
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1056
msgid "To Do"
msgstr "To Do"
#. blue
-#: ../mail/em-migrate.c:1058
+#: ../mail/em-migrate.c:1057
msgid "Later"
msgstr "Later"
-#: ../mail/em-migrate.c:1211
+#: ../mail/em-migrate.c:1210
msgid ""
"The location and hierarchy of the Evolution mailbox folders has changed "
"since Evolution 1.x.\n"
@@ -12221,47 +12425,47 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your folders..."
-#: ../mail/em-migrate.c:1650
+#: ../mail/em-migrate.c:1649
#, c-format
msgid "Unable to create new folder `%s': %s"
msgstr "Unable to create new folder `%s': %s"
-#: ../mail/em-migrate.c:1676
+#: ../mail/em-migrate.c:1675
#, c-format
msgid "Unable to copy folder `%s' to `%s': %s"
msgstr "Unable to copy folder `%s' to `%s': %s"
-#: ../mail/em-migrate.c:1861
+#: ../mail/em-migrate.c:1860
#, c-format
msgid "Unable to scan for existing mailboxes at `%s': %s"
msgstr "Unable to scan for existing mailboxes at `%s': %s"
-#: ../mail/em-migrate.c:2065
+#: ../mail/em-migrate.c:2064
#, c-format
msgid "Unable to open old POP keep-on-server data `%s': %s"
msgstr "Unable to open old POP keep-on-server data `%s': %s"
-#: ../mail/em-migrate.c:2079
+#: ../mail/em-migrate.c:2078
#, c-format
msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
msgstr "Unable to create POP3 keep-on-server data directory `%s': %s"
-#: ../mail/em-migrate.c:2108
+#: ../mail/em-migrate.c:2107
#, c-format
msgid "Unable to copy POP3 keep-on-server data `%s': %s"
msgstr "Unable to copy POP3 keep-on-server data `%s': %s"
-#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
+#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
#, c-format
msgid "Failed to create local mail storage `%s': %s"
msgstr "Failed to create local mail storage `%s': %s"
-#: ../mail/em-migrate.c:2852
+#: ../mail/em-migrate.c:2851
#, c-format
msgid "Unable to create local mail folders at `%s': %s"
msgstr "Unable to create local mail folders at `%s': %s"
-#: ../mail/em-migrate.c:2871
+#: ../mail/em-migrate.c:2870
msgid ""
"Unable to read settings from previous Evolution install, `evolution/config."
"xmldb' does not exist or is corrupt."
@@ -12279,53 +12483,54 @@ msgid "Reply to _List"
msgstr "Reply to _List"
#. make it first item
-#: ../mail/em-popup.c:640 ../mail/em-popup.c:845
+#: ../mail/em-popup.c:640 ../mail/em-popup.c:869
msgid "_Add to Address Book"
msgstr "_Add to Address Book"
-#: ../mail/em-subscribe-editor.c:595
+#: ../mail/em-subscribe-editor.c:596
msgid "This store does not support subscriptions, or they are not enabled."
msgstr "This store does not support subscriptions, or they are not enabled."
-#: ../mail/em-subscribe-editor.c:628
+#: ../mail/em-subscribe-editor.c:629
msgid "Subscribed"
msgstr "Subscribed"
-#: ../mail/em-subscribe-editor.c:632
+#: ../mail/em-subscribe-editor.c:633
msgid "Folder"
msgstr "Folder"
#. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:834
+#: ../mail/em-subscribe-editor.c:835
msgid "Please select a server."
msgstr "Please select a server."
-#: ../mail/em-subscribe-editor.c:855
+#: ../mail/em-subscribe-editor.c:856
msgid "No server has been selected"
msgstr "No server has been selected"
-#: ../mail/em-utils.c:121
+#: ../mail/em-utils.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:125
msgid "_Do not show this message again."
msgstr "_Do not show this message again."
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:316
msgid "Message Filters"
msgstr "Message Filters"
-#: ../mail/em-utils.c:370
+#: ../mail/em-utils.c:369
msgid "message"
msgstr "message"
-#: ../mail/em-utils.c:645
+#: ../mail/em-utils.c:653
msgid "Save Message..."
msgstr "Save Message..."
-#: ../mail/em-utils.c:692
+#: ../mail/em-utils.c:703
msgid "Add address"
msgstr "Add address"
#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1213
+#: ../mail/em-utils.c:1224
#, c-format
msgid "Messages from %s"
msgstr "Messages from %s"
@@ -12339,54 +12544,66 @@ msgid "Search Folder source"
msgstr "Search Folder source"
#: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Send and Receive Mail\" window height"
+msgstr "\"Send and Receive Mail\" window height"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr "\"Send and Receive Mail\" window maximize state"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "\"Send and Receive Mail\" window width"
+msgstr "\"Send and Receive Mail\" window width"
+
+#: ../mail/evolution-mail.schemas.in.h:4
msgid "Allows evolution to display text part of limited size"
msgstr "Allows evolution to display text part of limited size"
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:5
msgid "Always request read receipt"
msgstr "Always request read receipt"
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:6
msgid "Amount of time in seconds the error should be shown on the status bar."
msgstr "Amount of time in seconds the error should be shown on the status bar."
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:7
msgid "Automatic emoticon recognition"
msgstr "Automatic emoticon recognition"
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
msgid "Automatic link recognition"
msgstr "Automatic link recognition"
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
msgid "Check incoming mail being junk"
msgstr "Check incoming mail being junk"
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
msgid "Citation highlight color"
msgstr "Citation highlight colour"
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
msgid "Citation highlight color."
msgstr "Citation highlight colour."
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
msgid "Composer Window default height"
msgstr "Composer Window default height"
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
msgid "Composer Window default width"
msgstr "Composer Window default width"
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
msgid "Composer load/attach directory"
msgstr "Composer load/attach directory"
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
msgid "Compress display of addresses in TO/CC/BCC"
msgstr "Compress display of addresses in TO/CC/BCC"
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
msgid ""
"Compress display of addresses in TO/CC/BCC to the number specified in "
"address_count."
@@ -12394,79 +12611,99 @@ msgstr ""
"Compress display of addresses in TO/CC/BCC to the number specified in "
"address_count."
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:17
+msgid "Custom headers to use while checking for junk."
+msgstr "Custom headers to use while checking for junk."
+
+#: ../mail/evolution-mail.schemas.in.h:18
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr ""
+"Custom headers to use while checking for junk. The list elements are strings "
+"in the format \"headername=value\"."
+
+#: ../mail/evolution-mail.schemas.in.h:19
msgid "Default charset in which to compose messages"
msgstr "Default charset in which to compose messages"
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:20
msgid "Default charset in which to compose messages."
msgstr "Default charset in which to compose messages."
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:21
msgid "Default charset in which to display messages"
msgstr "Default charset in which to display messages"
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:22
msgid "Default charset in which to display messages."
msgstr "Default charset in which to display messages."
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:23
msgid "Default forward style"
msgstr "Default forward style"
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:24
msgid "Default height of the Composer Window."
msgstr "Default height of the Composer Window."
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:25
msgid "Default height of the message window."
msgstr "Default height of the message window."
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:26
msgid "Default height of the subscribe dialog."
msgstr "Default height of the subscribe dialogue."
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:27
msgid "Default reply style"
msgstr "Default reply style"
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:28
msgid "Default value for thread expand state"
msgstr "Default value for thread expand state"
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:29
msgid "Default width of the Composer Window."
msgstr "Default width of the Composer Window."
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:30
msgid "Default width of the message window."
msgstr "Default width of the message window."
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:31
msgid "Default width of the subscribe dialog."
msgstr "Default width of the subscribe dialogue."
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:32
+msgid ""
+"Determines whether to look up addresses for junk filtering in local "
+"addressbook only"
+msgstr ""
+"Determines whether to look up addresses for junk filtering in the local "
+"address book only"
+
+#: ../mail/evolution-mail.schemas.in.h:33
msgid "Determines whether to lookup in addressbook for sender email"
-msgstr "Determines whether to look up in address book for sender email"
+msgstr "Determines whether to look up in address book for sender e-mail"
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:34
msgid ""
"Determines whether to loopup the sender email in addressbook. If found, it "
"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
"can be slow, if remote addressbooks (like ldap) are marked for "
"autocompletion."
msgstr ""
-"Determines whether to look up the sender email in the address book. If "
+"Determines whether to look up the sender e-mail in the address book. If "
"found, it shouldn't be a spam. It looks up in the books marked for "
-"autocompletion. It can be slow, if remote address books (like ldap) are "
+"autocompletion. It can be slow, if remote address books (like LDAP) are "
"marked for autocompletion."
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:35
msgid "Determines whether to use custom headers to check for junk"
msgstr "Determines whether to use custom headers to check for junk"
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:36
msgid ""
"Determines whether to use custom headers to check for junk. If this option "
"is enabled and the headers are mentioned, it will be improve the junk "
@@ -12476,7 +12713,7 @@ msgstr ""
"is enabled and the headers are mentioned, it will be improve the junk "
"checking speed."
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:37
msgid ""
"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
"lines in the \"Messages\" column in vertical view."
@@ -12484,55 +12721,59 @@ msgstr ""
"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
"lines in the \"Messages\" column in vertical view."
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:38
msgid "Directory for loading/attaching files to composer."
msgstr "Directory for loading/attaching files to composer."
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:39
msgid "Directory for saving mail component files."
msgstr "Directory for saving mail component files."
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:40
+msgid "Disable or enable ellipsizing of folder names in folder tree"
+msgstr "Disable or enable ellipsizing of folder names in folder tree"
+
+#: ../mail/evolution-mail.schemas.in.h:41
msgid "Draw spelling error indicators on words as you type."
msgstr "Draw spelling error indicators on words as you type."
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:42
msgid "Empty Junk folders on exit"
msgstr "Empty Junk folders on exit"
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:43
msgid "Empty Trash folders on exit"
msgstr "Empty Wastebasket folders on exit"
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:44
msgid "Empty all Junk folders when exiting Evolution."
msgstr "Empty all Junk folders when exiting Evolution."
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:45
msgid "Empty all Trash folders when exiting Evolution."
msgstr "Empty all Wastebasket folders when exiting Evolution."
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:46
msgid "Enable caret mode, so that you can see a cursor when reading mail."
msgstr "Enable caret mode, so that you can see a cursor when reading mail."
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:47
msgid "Enable or disable magic space bar"
msgstr "Enable or disable magic space bar"
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:48
msgid "Enable or disable type ahead search feature"
msgstr "Enable or disable type ahead search feature"
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:49
msgid "Enable search folders"
msgstr "Enable search folders"
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:50
msgid "Enable search folders on startup."
msgstr "Enable search folders on startup."
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:51
msgid ""
"Enable side bar search feature so that you can start interactive searching "
"by typing in the text. Use is that you can easily find a folder in that side "
@@ -12544,7 +12785,7 @@ msgstr ""
"bar by just typing the folder name and the selection jumps automatically to "
"that folder."
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:52
msgid ""
"Enable this to use Space bar key to scroll in message preview, message list "
"and folders."
@@ -12552,27 +12793,27 @@ msgstr ""
"Enable this to use Space bar key to scroll in message preview, message list "
"and folders."
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:53
msgid "Enable to render message text part of limited size."
msgstr "Enable to render message text part of limited size."
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:54
msgid "Enable/disable caret mode"
msgstr "Enable/disable caret mode"
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:55
msgid "Height of the message-list pane"
msgstr "Height of the message-list pane"
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:56
msgid "Height of the message-list pane."
msgstr "Height of the message-list pane."
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:57
msgid "Hides the per-folder preview and removes the selection"
msgstr "Hides the per-folder preview and removes the selection"
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:58
msgid ""
"If a user tries to open 10 or more messages at one time, ask the user if "
"they really want to do it."
@@ -12580,7 +12821,7 @@ msgstr ""
"If a user tries to open 10 or more messages at one time, ask the user if "
"they really want to do it."
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:59
msgid ""
"If the \"Preview\" pane is on, then show it side-by-side rather than "
"vertically."
@@ -12588,7 +12829,7 @@ msgstr ""
"If the \"Preview\" pane is on, then show it side-by-side rather than "
"vertically."
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:60
msgid ""
"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
"any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -12598,11 +12839,41 @@ msgstr ""
"any mime-types appearing in this list which map to a bonobo-component viewer "
"in GNOME's mime-type database may be used for displaying content."
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:61
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+
+#: ../mail/evolution-mail.schemas.in.h:62
+msgid ""
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
+msgstr ""
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
+
+#: ../mail/evolution-mail.schemas.in.h:63
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+
+#: ../mail/evolution-mail.schemas.in.h:64
msgid "It disables/enables the prompt while marking multiple messages."
msgstr "Enable or disable the prompt whilst marking multiple messages."
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:65
msgid ""
"It disables/enables the repeated prompts to ask if offline sync is required "
"before going into offline mode."
@@ -12610,7 +12881,7 @@ msgstr ""
"It disables/enables the repeated prompts to ask if offline synchronisation "
"is required before going into offline mode."
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:66
msgid ""
"It disables/enables the repeated prompts to warn that deleting messages from "
"a search folder permanently deletes the message, not simply removing it from "
@@ -12620,31 +12891,31 @@ msgstr ""
"a search folder permanently deletes the message, not simply removing it from "
"the search results."
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:67
msgid "Last time empty junk was run"
msgstr "Last time empty junk was run"
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:68
msgid "Last time empty trash was run"
msgstr "Last time empty wastebasket was run"
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:69
msgid "Level beyond which the message should be logged."
msgstr "Level beyond which the message should be logged."
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:70
msgid "List of Labels and their associated colors"
msgstr "List of Labels and their associated colours"
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:71
msgid "List of accepted licenses"
msgstr "List of accepted licences"
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:72
msgid "List of accounts"
msgstr "List of accounts"
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:73
msgid ""
"List of accounts known to the mail component of Evolution. The list contains "
"strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12652,11 +12923,15 @@ msgstr ""
"List of accounts known to the mail component of Evolution. The list contains "
"strings naming subdirectories relative to /apps/evolution/mail/accounts."
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:74
msgid "List of custom headers and whether they are enabled."
msgstr "List of custom headers and whether they are enabled."
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:75
+msgid "List of dictionary language codes used for spell checking."
+msgstr "List of dictionary language codes used for spell checking."
+
+#: ../mail/evolution-mail.schemas.in.h:76
msgid ""
"List of labels known to the mail component of Evolution. The list contains "
"strings containing name:color where color uses the HTML hex encoding."
@@ -12664,19 +12939,19 @@ msgstr ""
"List of labels known to the mail component of Evolution. The list contains "
"strings containing name:colour where colour uses the HTML hex encoding."
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:77
msgid "List of mime types to check for bonobo component viewers"
msgstr "List of mime types to check for bonobo component viewers"
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:78
msgid "List of protocol names whose license has been accepted."
msgstr "List of protocol names whose licence has been accepted."
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:79
msgid "Load images for HTML messages over http"
msgstr "Load images for HTML messages over HTTP"
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:80
msgid ""
"Load images for HTML messages over http(s). Possible values are: 0 - Never "
"load images off the net. 1 - Load images in messages from contacts. 2 - "
@@ -12686,105 +12961,105 @@ msgstr ""
"load images off the net 1 - Load images in messages from contacts 2 - Always "
"load images off the net"
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:81
msgid "Log filter actions"
msgstr "Log filter actions"
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:82
msgid "Log filter actions to the specified log file."
msgstr "Log filter actions to the specified log file."
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:83
msgid "Logfile to log filter actions"
msgstr "Logfile to log filter actions"
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:84
msgid "Logfile to log filter actions."
msgstr "Logfile to log filter actions."
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:85
msgid "Mark as Seen after specified timeout"
msgstr "Mark as Seen after specified timeout"
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:86
msgid "Mark as Seen after specified timeout."
msgstr "Mark as Seen after specified timeout."
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:87
msgid "Mark citations in the message \"Preview\""
msgstr "Mark citations in the message \"Preview\""
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:88
msgid "Mark citations in the message \"Preview\"."
msgstr "Mark citations in the message \"Preview\"."
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:89
msgid "Message Window default height"
msgstr "Message Window default height"
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:90
msgid "Message Window default width"
msgstr "Message Window default width"
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:91
msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
msgstr "Message-display style (\"normal\", \"full headers\", \"source\")"
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:92
msgid "Minimum days between emptying the junk on exit"
msgstr "Minimum days between emptying the junk on exit"
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:93
msgid "Minimum days between emptying the trash on exit"
msgstr "Minimum number of days between emptying the wastebasket on exit"
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:94
msgid "Minimum time between emptying the junk on exit, in days."
msgstr "Minimum time between emptying the junk on exit, in days."
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:95
msgid "Minimum time between emptying the trash on exit, in days."
msgstr "Minimum time between emptying the wastebasket on exit, in days."
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:96
msgid "Number of addresses to display in TO/CC/BCC"
msgstr "Number of addresses to display in TO/CC/BCC"
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:97
msgid "Prompt on empty subject"
msgstr "Prompt on empty subject"
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:98
msgid "Prompt the user when he or she tries to expunge a folder."
msgstr "Prompt the user when he or she tries to expunge a folder."
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:99
msgid ""
"Prompt the user when he or she tries to send a message without a Subject."
msgstr ""
"Prompt the user when he or she tries to send a message without a Subject."
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:100
msgid "Prompt to check if the user wants to go offline immediately"
msgstr "Prompt to check if the user wants to go offline immediately"
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:101
msgid "Prompt when deleting messages in search folder"
msgstr "Prompt when deleting messages in search folder"
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:102
msgid "Prompt when user expunges"
msgstr "Prompt when user expunges"
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:103
msgid "Prompt when user only fills Bcc"
msgstr "Prompt when user only fills Bcc"
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:104
msgid "Prompt when user tries to open 10 or more messages at once"
msgstr "Prompt when user tries to open 10 or more messages at once"
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:105
msgid ""
"Prompt when user tries to send HTML mail to recipients that may not want to "
"receive HTML mail."
@@ -12792,135 +13067,131 @@ msgstr ""
"Prompt when user tries to send HTML mail to recipients that may not want to "
"receive HTML mail."
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:106
msgid "Prompt when user tries to send a message with no To or Cc recipients."
msgstr "Prompt when user tries to send a message with no To or Cc recipients."
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:107
msgid "Prompt when user tries to send unwanted HTML"
msgstr "Prompt when user tries to send unwanted HTML"
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:108
msgid "Prompt while marking multiple messages"
msgstr "Prompt while marking multiple messages"
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:109
msgid "Recognize emoticons in text and replace them with images."
msgstr "Recognise emoticons in text and replace them with images."
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:110
msgid "Recognize links in text and replace them."
msgstr "Recognise links in text and replace them."
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:111
msgid "Run junk test on incoming mail."
msgstr "Run junk test on incoming mail."
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:112
msgid "Save directory"
msgstr "Save directory"
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:113
msgid "Search for the sender photo in local addressbooks"
-msgstr "Search for the sender photo in local addressbooks"
+msgstr "Search for the sender photo in local address books"
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:114
msgid "Send HTML mail by default"
msgstr "Send HTML mail by default"
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:115
msgid "Send HTML mail by default."
msgstr "Send HTML mail by default."
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:116
msgid "Sender email-address column in the message list"
-msgstr "Sender email address column in the message list"
+msgstr "Sender e-mail address column in the message list"
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:117
msgid "Show Animations"
msgstr "Show Animations"
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:118
msgid "Show animated images as animations."
msgstr "Show animated images as animations."
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:119
msgid "Show deleted messages (with a strike-through) in the message-list."
msgstr "Show deleted messages (with a strike-through) in the message-list."
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:120
msgid "Show deleted messages in the message-list"
msgstr "Show deleted messages in the message-list"
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:121
msgid "Show photo of the sender"
msgstr "Show photo of the sender"
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:124
msgid ""
"Show the email-address of the sender in a separate column in the message "
"list."
msgstr ""
-"Show the email address of the sender in a separate column in the message "
+"Show the e-mail address of the sender in a separate column in the message "
"list."
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:125
msgid "Show the photo of the sender in the message reading pane."
msgstr "Show the photo of the sender in the message reading pane."
-#: ../mail/evolution-mail.schemas.in.h:115
-msgid "Specifies the header to check for junk."
-msgstr "Specifies the header to check for junk."
-
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid ""
-"Specifies the header to check for junk. The format is headername=value in "
-"gconf."
-msgstr ""
-"Specifies the header to check for junk. The format is headername=value in "
-"gconf."
-
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:126
msgid "Spell check inline"
msgstr "Spell check inline"
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "Spell checking color"
+msgstr "Spell checking colour"
+
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Spell checking languages"
+msgstr "Spell checking languages"
+
+#: ../mail/evolution-mail.schemas.in.h:129
msgid "Subscribe dialog default height"
msgstr "Subscribe dialogue default height"
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:130
msgid "Subscribe dialog default width"
msgstr "Subscribe dialogue default width"
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:131
msgid "Terminal font"
msgstr "Terminal font"
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:132
msgid "Text message part limit"
msgstr "Text message part limit"
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:133
msgid "The default plugin for Junk hook"
msgstr "The default plugin for Junk hook"
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:134
msgid "The last time empty junk was run, in days since the epoch."
msgstr "The last time empty junk was run, in days since the epoch."
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:135
msgid "The last time empty trash was run, in days since the epoch."
msgstr "The last time empty wastebasket was run, in days since the epoch."
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:136
msgid "The terminal font for mail display."
msgstr "The terminal font for mail display."
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:137
msgid "The variable width font for mail display."
msgstr "The variable width font for mail display."
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:138
msgid ""
"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
"debug messages."
@@ -12928,7 +13199,7 @@ msgstr ""
"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
"debug messages."
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:139
msgid ""
"This decides the max size of the text part that can be formatted under "
"evolution. The default is 4MB / 4096 KB and is specified interms of KB."
@@ -12936,7 +13207,7 @@ msgstr ""
"This decides the max size of the text part that can be formatted under "
"evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:140
msgid ""
"This is the default junk plugin, even though there are multiple plugins "
"enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -12946,7 +13217,7 @@ msgstr ""
"enabled. If the default listed plugin is disabled, then it won't fall back "
"to the other available plugins."
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:141
msgid ""
"This key is read only once and reset to false after read. This unselects the "
"mail in the list and removes the preview for that folder."
@@ -12954,7 +13225,7 @@ msgstr ""
"This key is read only once and reset to false after read. This unselects the "
"mail in the list and removes the preview for that folder."
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:142
msgid ""
"This key should contain a list of XML structures specifying custom headers, "
"and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -12966,11 +13237,21 @@ msgstr ""
"header enabled&gt; - set enabled if the header is to be displayed in the "
"mail view."
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local addressbook only to exclude "
+"mail sent by known contacts from junk filtering."
+msgstr ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local address book only to exclude "
+"mail sent by known contacts from junk filtering."
+
+#: ../mail/evolution-mail.schemas.in.h:144
msgid "This option would help in improving the speed of fetching."
msgstr "This option would help in improving the speed of fetching."
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:145
msgid ""
"This sets the number of addresses to show in default message list view, "
"beyond which a '...' is shown."
@@ -12978,7 +13259,7 @@ msgstr ""
"This sets the number of addresses to show in default message list view, "
"beyond which a '...' is shown."
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:146
msgid ""
"This setting specifies whether the threads should be in expanded or "
"collapsed state by default. Evolution requires a restart."
@@ -12986,7 +13267,7 @@ msgstr ""
"This setting specifies whether the threads should be in expanded or "
"collapsed state by default. Evolution requires a restart."
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:147
msgid ""
"This setting specifies whether the threads should be sorted based on latest "
"message in each thread, rather than by message's date. Evolution requires a "
@@ -12996,107 +13277,115 @@ msgstr ""
"message in each thread, rather than by message's date. Evolution requires a "
"restart."
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:148
msgid "Thread the message list."
msgstr "Thread the message list."
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:149
msgid "Thread the message-list"
msgstr "Thread the message-list"
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:150
msgid "Thread the message-list based on Subject"
msgstr "Thread the message-list based on Subject"
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:151
msgid "Timeout for marking message as seen"
msgstr "Timeout for marking message as seen"
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:152
msgid "Timeout for marking message as seen."
msgstr "Timeout for marking message as seen."
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:153
msgid "UID string of the default account."
msgstr "UID string of the default account."
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:154
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr "Underline colour for misspelled words when using inline spelling."
+
+#: ../mail/evolution-mail.schemas.in.h:155
msgid "Use SpamAssassin daemon and client"
msgstr "Use SpamAssassin daemon and client"
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:156
msgid "Use SpamAssassin daemon and client (spamc/spamd)."
msgstr "Use SpamAssassin daemon and client (spamc/spamd)."
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:157
msgid "Use custom fonts"
msgstr "Use custom fonts"
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:158
msgid "Use custom fonts for displaying mail."
msgstr "Use custom fonts for displaying mail."
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:159
msgid "Use only local spam tests."
msgstr "Use only local spam tests."
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:160
msgid "Use only the local spam tests (no DNS)."
msgstr "Use only the local spam tests (no DNS)."
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:161
msgid "Use side-by-side or wide layout"
msgstr "Use side-by-side or wide layout"
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:162
msgid "Variable width font"
msgstr "Variable width font"
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:163
msgid "View/Bcc menu item is checked"
msgstr "View/Bcc menu item is checked"
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:164
msgid "View/Bcc menu item is checked."
msgstr "View/Bcc menu item is checked."
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:165
msgid "View/Cc menu item is checked"
msgstr "View/Cc menu item is checked"
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:166
msgid "View/Cc menu item is checked."
msgstr "View/Cc menu item is checked."
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:167
msgid "View/From menu item is checked"
msgstr "View/From menu item is checked"
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:168
msgid "View/From menu item is checked."
msgstr "View/From menu item is checked."
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:169
msgid "View/PostTo menu item is checked"
msgstr "View/PostTo menu item is checked"
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:170
msgid "View/PostTo menu item is checked."
msgstr "View/PostTo menu item is checked."
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:171
msgid "View/ReplyTo menu item is checked"
msgstr "View/ReplyTo menu item is checked"
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:172
msgid "View/ReplyTo menu item is checked."
msgstr "View/ReplyTo menu item is checked."
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:173
msgid "Whether a read receipt request gets added to every message by default."
msgstr "Whether a read receipt request gets added to every message by default."
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:174
+msgid "Whether disable ellipsizing feature of folder names in folder tree."
+msgstr "Whether disable ellipsizing feature of folder names in folder tree."
+
+#: ../mail/evolution-mail.schemas.in.h:175
msgid ""
"Whether or not to fall back on threading by subjects when the messages do "
"not contain In-Reply-To or References headers."
@@ -13104,15 +13393,15 @@ msgstr ""
"Whether or not to fall back on threading by subjects when the messages do "
"not contain In-Reply-To or References headers."
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:176
msgid "Whether sort threads based on latest message in that thread"
msgstr "Whether sort threads based on latest message in that thread"
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:177
msgid "Width of the message-list pane"
msgstr "Width of the message-list pane"
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:178
msgid "Width of the message-list pane."
msgstr "Width of the message-list pane."
@@ -13194,141 +13483,146 @@ msgstr "%s mailing list"
msgid "Add Filter Rule"
msgstr "Add Filter Rule"
-#: ../mail/mail-component.c:538
+#: ../mail/mail-component.c:539
#, c-format
msgid "%d selected, "
msgid_plural "%d selected, "
msgstr[0] "%d selected, "
msgstr[1] "%d selected, "
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:543
#, c-format
msgid "%d deleted"
msgid_plural "%d deleted"
msgstr[0] "%d deleted"
msgstr[1] "%d deleted"
-#: ../mail/mail-component.c:544
+#: ../mail/mail-component.c:550
#, c-format
msgid "%d junk"
msgid_plural "%d junk"
msgstr[0] "%d junk"
msgstr[1] "%d junk"
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:553
#, c-format
msgid "%d draft"
msgid_plural "%d drafts"
msgstr[0] "%d draft"
msgstr[1] "%d drafts"
-#: ../mail/mail-component.c:549
+#: ../mail/mail-component.c:555
#, c-format
msgid "%d sent"
msgid_plural "%d sent"
msgstr[0] "%d sent"
msgstr[1] "%d sent"
-#: ../mail/mail-component.c:551
+#: ../mail/mail-component.c:557
#, c-format
msgid "%d unsent"
msgid_plural "%d unsent"
msgstr[0] "%d unsent"
msgstr[1] "%d unsent"
-#: ../mail/mail-component.c:557
+#: ../mail/mail-component.c:563
#, c-format
msgid "%d unread, "
msgid_plural "%d unread, "
msgstr[0] "%d unread, "
msgstr[1] "%d unread, "
-#: ../mail/mail-component.c:558
+#: ../mail/mail-component.c:564
#, c-format
msgid "%d total"
msgid_plural "%d total"
msgstr[0] "%d total"
msgstr[1] "%d total"
-#: ../mail/mail-component.c:899
+#: ../mail/mail-component.c:905
msgid "New Mail Message"
msgstr "New Mail Message"
-#: ../mail/mail-component.c:900
+#: ../mail/mail-component.c:906
msgid "_Mail Message"
msgstr "_Mail Message"
-#: ../mail/mail-component.c:901
+#: ../mail/mail-component.c:907
msgid "Compose a new mail message"
msgstr "Compose a new mail message"
-#: ../mail/mail-component.c:907
+#: ../mail/mail-component.c:913
msgid "New Mail Folder"
msgstr "New Mail Folder"
-#: ../mail/mail-component.c:908
+#: ../mail/mail-component.c:914
msgid "Mail _Folder"
msgstr "Mail _Folder"
-#: ../mail/mail-component.c:909
+#: ../mail/mail-component.c:915
msgid "Create a new mail folder"
msgstr "Create a new mail folder"
-#: ../mail/mail-component.c:1056
+#: ../mail/mail-component.c:1062
msgid "Failed upgrading Mail settings or folders."
msgstr "Failed upgrading Mail settings or folders."
-#: ../mail/mail-component.c:1529
+#: ../mail/mail-component.c:1535
msgid "Error"
msgstr "Error"
-#: ../mail/mail-component.c:1529
+#: ../mail/mail-component.c:1535
msgid "Errors"
msgstr "Errors"
-#: ../mail/mail-component.c:1530
+#: ../mail/mail-component.c:1536
msgid "Warnings and Errors"
msgstr "Warnings and Errors"
-#: ../mail/mail-component.c:1531
+#: ../mail/mail-component.c:1537
msgid "Debug"
msgstr "Debug"
-#: ../mail/mail-component.c:1531
+#: ../mail/mail-component.c:1537
msgid "Error, Warnings and Debug messages"
msgstr "Error, Warnings and Debug messages"
-#: ../mail/mail-component.c:1641
+#: ../mail/mail-component.c:1664
msgid "Debug Logs"
msgstr "Debug Logs"
-#. Translators: This is the first part of the sentence "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1646
+#: ../mail/mail-component.c:1678
msgid "Show _errors in the status bar for"
msgstr "Show _errors in the status bar for"
-#. Translators: This is the second part of the sentence "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1654
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../mail/mail-component.c:1694
msgid "second(s)."
msgstr "second(s)."
-#: ../mail/mail-component.c:1664
+#: ../mail/mail-component.c:1700
msgid "Log Messages:"
msgstr "Log Messages:"
-#: ../mail/mail-component.c:1716
+#: ../mail/mail-component.c:1741
msgid "Log Level"
msgstr "Log Level"
-#: ../mail/mail-component.c:1723 ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1750 ../widgets/misc/e-dateedit.c:410
msgid "Time"
msgstr "Time"
-#: ../mail/mail-component.c:1730 ../mail/message-list.c:2406
+#: ../mail/mail-component.c:1760 ../mail/message-list.c:2386
#: ../mail/message-list.etspec.h:10
msgid "Messages"
msgstr "Messages"
+#: ../mail/mail-component.c:1769 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Close this window"
+
#: ../mail/mail-config.glade.h:1
msgid " Ch_eck for Supported Types "
msgstr " Ch_eck for Supported Types "
@@ -13342,8 +13636,8 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
msgstr "<b>SSL is not supported in this build of Evolution</b>"
#: ../mail/mail-config.glade.h:5
-msgid "<b>Sender Photograph</b>"
-msgstr "<b>Sender Photograph</b>"
+msgid "<b>Sender Photograph</b>"
+msgstr "<b>Sender Photograph</b>"
#: ../mail/mail-config.glade.h:6
msgid "<b>Sig_natures</b>"
@@ -13490,63 +13784,59 @@ msgstr "Always encrypt to _myself when sending encrypted messages"
msgid "Always request rea_d receipt"
msgstr "Always request rea_d receipt"
-#: ../mail/mail-config.glade.h:45
-msgid "Attach original message"
-msgstr "Attach original message"
-
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:46
msgid "Automatically insert _emoticon images"
msgstr "Automatically insert _emoticon images"
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:47
msgid "Baltic (ISO-8859-13)"
msgstr "Baltic (ISO-8859-13)"
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:48
msgid "Baltic (ISO-8859-4)"
msgstr "Baltic (ISO-8859-4)"
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:49
msgid "C_haracter set:"
msgstr "C_haracter set:"
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:50
msgid "Ch_eck for Supported Types "
msgstr "Ch_eck for Supported Types "
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:51
msgid "Check cu_stom headers for junk"
msgstr "Check cu_stom headers for junk"
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:52
msgid "Check incoming _messages for junk"
msgstr "Check incoming _messages for junk"
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:53
msgid "Check spelling while I _type"
msgstr "Check spelling while I _type"
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:54
msgid "Checks incoming mail messages to be Junk"
msgstr "Checks incoming mail messages to be Junk"
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:55
msgid "Cle_ar"
msgstr "Cle_ar"
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:56
msgid "Clea_r"
msgstr "Clea_r"
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:57
msgid "Color for _misspelled words:"
msgstr "Colour for _misspelled words:"
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:58
msgid "Confirm _when expunging a folder"
msgstr "Confirm _when expunging a folder"
-#: ../mail/mail-config.glade.h:60
+#: ../mail/mail-config.glade.h:59
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -13557,158 +13847,158 @@ msgid ""
msgstr ""
"Congratulations, your mail configuration is complete.\n"
"\n"
-"You are now ready to send and receive email \n"
+"You are now ready to send and receive e-mail \n"
"using Evolution. \n"
"\n"
"Click \"Apply\" to save your settings."
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:65
msgid "De_fault"
msgstr "De_fault"
-#: ../mail/mail-config.glade.h:67
+#: ../mail/mail-config.glade.h:66
msgid "Default character e_ncoding:"
msgstr "Default character e_ncoding:"
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:68
msgid "Delete junk messages on e_xit"
msgstr "Delete junk messages on e_xit"
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:70
msgid "Digitally sign o_utgoing messages (by default)"
msgstr "Digitally sign o_utgoing messages (by default)"
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:71
msgid "Do not format text contents in messages if the text si_ze exceeds"
msgstr "Do not format text contents in messages if the text si_ze exceeds"
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:72
msgid "Do not mar_k messages as junk if sender is in my addressbook"
-msgstr "Do not mar_k messages as junk if sender is in my addressbook"
+msgstr "Do not mar_k messages as junk if sender is in my address book"
-#: ../mail/mail-config.glade.h:74
-msgid "Do not quote original message"
-msgstr "Do not quote original message"
+#: ../mail/mail-config.glade.h:73
+msgid "Do not quote"
+msgstr "Do not quote"
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:74
msgid "Done"
msgstr "Done"
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:75
msgid "Drafts _Folder:"
msgstr "Drafts _Folder:"
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:76
msgid "Email Accounts"
-msgstr "Email Accounts"
+msgstr "E-mail Accounts"
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:77
msgid "Email _Address:"
-msgstr "Email _Address:"
+msgstr "E-mail _Address:"
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:78
msgid "Empty trash folders on e_xit"
msgstr "Empty wastebasket folders on e_xit"
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:79
msgid "Enable Magic S_pacebar "
msgstr "Enable Magic S_pacebar "
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:80
msgid "Enable Sea_rch Folders"
msgstr "Enable Sea_rch Folders"
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:81
msgid "Encry_ption certificate:"
msgstr "Encry_ption certificate:"
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:82
msgid "Encrypt out_going messages (by default)"
msgstr "Encrypt out_going messages (by default)"
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:84
msgid "Fi_xed-width:"
msgstr "Fi_xed-width:"
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:85
msgid "Fix_ed width Font:"
msgstr "Fix_ed width Font:"
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:86
msgid "Font Properties"
msgstr "Font Properties"
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:87
msgid "Format messages in _HTML"
msgstr "Format messages in _HTML"
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:88
msgid "Full Nam_e:"
msgstr "Full Nam_e:"
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:90
msgid "HTML Messages"
msgstr "HTML Messages"
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:91
msgid "H_TTP Proxy:"
msgstr "H_TTP Proxy:"
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:92
msgid "Headers"
msgstr "Headers"
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:93
msgid "Highlight _quotations with"
msgstr "Highlight _quotations with"
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:95
msgid "Inline"
msgstr "Inline"
-#: ../mail/mail-config.glade.h:97
-msgid "Inline original message (Outlook style)"
-msgstr "Inline original message (Outlook style)"
+#: ../mail/mail-config.glade.h:96
+msgid "Inline (Outlook style)"
+msgstr "Inline (Outlook style)"
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:98
msgid "KB"
msgstr "KB"
-#: ../mail/mail-config.glade.h:100 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
msgid "Labels"
msgstr "Labels"
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:100
msgid "Languages Table"
msgstr "Languages Table"
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:101
msgid "Mail Configuration"
msgstr "Mail Configuration"
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:102
msgid "Mail Headers Table"
msgstr "Mail Headers Table"
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:104
msgid "Mailbox location"
msgstr "Mailbox location"
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:105
msgid "Message Composer"
msgstr "Message Composer"
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:106
msgid "No _Proxy for:"
msgstr "No _Proxy for:"
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:107
msgid ""
"Note: Underscore in the label name is used as mnemonic identifier in menu."
msgstr ""
"Note: Underscore in the label name is used as mnemonic identifier in menu."
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:108
msgid ""
"Note: you will not be prompted for a password until you connect for the "
"first time"
@@ -13716,19 +14006,19 @@ msgstr ""
"Note: you will not be prompted for a password until you connect for the "
"first time"
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:109
msgid "Or_ganization:"
msgstr "Or_ganisation:"
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:110
msgid "PGP/GPG _Key ID:"
msgstr "PGP/GPG _Key ID:"
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:111
msgid "Pass_word:"
msgstr "Pass_word:"
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:113
msgid ""
"Please enter a descriptive name for this account in the space below.\n"
"This name will be used for display purposes only."
@@ -13736,7 +14026,7 @@ msgstr ""
"Please enter a descriptive name for this account in the space below.\n"
"This name will be used for display purposes only."
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:115
msgid ""
"Please enter information about the way you will send mail. If you are not "
"sure, ask your system administrator or Internet Service Provider."
@@ -13744,125 +14034,121 @@ msgstr ""
"Please enter information about the way you will send mail. If you are not "
"sure, ask your system administrator or Internet Service Provider."
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:116
msgid ""
"Please enter your name and email address below. The \"optional\" fields "
"below do not need to be filled in, unless you wish to include this "
"information in email you send."
msgstr ""
-"Please enter your name and email address below. The \"optional\" fields "
+"Please enter your name and e-mail address below. The \"optional\" fields "
"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+"information in e-mail you send."
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:117
msgid "Please select among the following options"
msgstr "Please select among the following options"
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:118
msgid "Port:"
msgstr "Port:"
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:119
msgid "Pr_ompt when sending messages with only Bcc recipients defined"
msgstr "Pr_ompt when sending messages with only Bcc recipients defined"
-#: ../mail/mail-config.glade.h:121
-msgid "Quote original message"
-msgstr "Quote original message"
-
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:120
msgid "Quoted"
msgstr "Quoted"
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:121
msgid "Re_member password"
msgstr "Re_member password"
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:122
msgid "Re_ply-To:"
msgstr "Re_ply-To:"
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:124
msgid "Remember _password"
msgstr "Remember _password"
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:125
msgid "S_OCKS Host:"
msgstr "S_OCKS Host:"
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:126
msgid "S_earch for sender photograph only in local addressbooks"
-msgstr "S_earch for sender photograph only in local addressbooks"
+msgstr "S_earch for sender photograph only in local address books"
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:127
msgid "S_elect..."
msgstr "S_elect..."
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:128
msgid "S_end message receipts:"
msgstr "S_end message receipts:"
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:129
msgid "S_tandard Font:"
msgstr "S_tandard Font:"
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:131
msgid "Select HTML fixed width font"
msgstr "Select HTML fixed width font"
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:132
msgid "Select HTML fixed width font for printing"
msgstr "Select HTML fixed width font for printing"
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:133
msgid "Select HTML variable width font"
msgstr "Select HTML variable width font"
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:134
msgid "Select HTML variable width font for printing"
msgstr "Select HTML variable width font for printing"
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:136
msgid "Sending Mail"
msgstr "Sending Mail"
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:137
msgid "Sent _Messages Folder:"
msgstr "Sent _Messages Folder:"
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:138
msgid "Ser_ver requires authentication"
msgstr "Ser_ver requires authentication"
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:139
msgid "Server _Type: "
msgstr "Server _Type: "
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:140
msgid "Sig_ning certificate:"
msgstr "Sig_ning certificate:"
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:141
msgid "Signat_ure:"
msgstr "Signat_ure:"
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:142
msgid "Signatures"
msgstr "Signatures"
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:143
msgid "Signatures Table"
msgstr "Signatures Table"
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:144
msgid "Spell Checking"
msgstr "Spell Checking"
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:145
msgid "T_ype: "
msgstr "T_ype: "
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:146
msgid ""
"The list of languages here reflects only the languages for which you have a "
"dictionary installed."
@@ -13870,7 +14156,7 @@ msgstr ""
"The list of languages here reflects only the languages for which you have a "
"dictionary installed."
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:147
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used\n"
@@ -13880,13 +14166,13 @@ msgstr ""
"signature. The name you specify will be used\n"
"for display purposes only. "
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:150
msgid ""
"This option will be overridden if a match for custom junk headers is found."
msgstr ""
"This option will be over-ridden if a match for custom junk headers is found."
-#: ../mail/mail-config.glade.h:153
+#: ../mail/mail-config.glade.h:151
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
@@ -13894,24 +14180,24 @@ msgstr ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:153
msgid "Us_ername:"
msgstr "Us_ername:"
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:154
msgid "Use Authe_ntication"
msgstr "Use Authe_ntication"
-#: ../mail/mail-config.glade.h:157 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:155 ../plugins/caldav/caldav-source.c:282
#: ../plugins/google-account-setup/google-source.c:358
msgid "User_name:"
msgstr "User_name:"
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:156
msgid "V_ariable-width:"
msgstr "V_ariable-width:"
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:157
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -13921,120 +14207,124 @@ msgstr ""
"\n"
"Click \"Forward\" to begin. "
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:160
msgid "_Add Signature"
msgstr "_Add Signature"
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:161
msgid "_Always load images from the Internet"
msgstr "_Always load images from the Internet"
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:162
msgid "_Automatic proxy configuration URL:"
msgstr "_Automatic proxy configuration URL:"
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:163
msgid "_Default junk plugin:"
msgstr "_Default junk plugin:"
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:164
msgid "_Direct connection to the Internet"
msgstr "_Direct connection to the Internet"
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:165
msgid "_Do not sign meeting requests (for Outlook compatibility)"
msgstr "_Do not sign meeting requests (for Outlook compatibility)"
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:167
msgid "_Forward style:"
msgstr "_Forward style:"
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:168
msgid "_Keep Signature above the original message on replying"
msgstr "_Keep Signature above the original message on replying"
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:169
msgid "_Load images in messages from contacts"
msgstr "_Load images in messages from contacts"
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:170
+msgid "_Lookup in local addressbook only"
+msgstr "_Lookup in local address book only"
+
+#: ../mail/mail-config.glade.h:171
msgid "_Make this my default account"
msgstr "_Make this my default account"
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:172
msgid "_Manual proxy configuration:"
msgstr "_Manual proxy configuration:"
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:173
msgid "_Mark messages as read after"
msgstr "_Mark messages as read after"
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:175
msgid "_Never load images from the Internet"
msgstr "_Never load images from the Internet"
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:176
msgid "_Path:"
msgstr "_Path:"
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:177
msgid "_Prompt when sending HTML messages to contacts that do not want them"
msgstr "_Prompt when sending HTML messages to contacts that do not want them"
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:178
msgid "_Prompt when sending messages with an empty subject line"
msgstr "_Prompt when sending messages with an empty subject line"
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:179
msgid "_Reply style:"
msgstr "_Reply style:"
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:180
msgid "_Script:"
msgstr "_Script:"
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:181
msgid "_Secure HTTP Proxy:"
msgstr "_Secure HTTP Proxy:"
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:182
msgid "_Select..."
msgstr "_Select..."
#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:185
msgid "_Show image animations"
msgstr "_Show image animations"
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:186
msgid "_Show the photograph of sender in the message preview"
msgstr "_Show the photograph of sender in the message preview"
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:187
msgid "_Shrink To / Cc / Bcc headers to "
msgstr "_Shrink To / Cc / Bcc headers to "
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:188
msgid "_Use Secure Connection:"
msgstr "_Use Secure Connection:"
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:189
msgid "_Use system defaults"
msgstr "_Use system defaults"
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:190
msgid "_Use the same fonts as other applications"
msgstr "_Use the same fonts as other applications"
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:191
msgid "addresses"
msgstr "addresses"
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:192
msgid "color"
msgstr "colour"
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:193
msgid "description"
msgstr "description"
@@ -14134,7 +14424,7 @@ msgstr "_Flag:"
msgid "_Tick this to accept the license agreement"
msgstr "_Tick this to accept the licence agreement"
-#: ../mail/mail-folder-cache.c:826
+#: ../mail/mail-folder-cache.c:832
#, c-format
msgid "Pinging %s"
msgstr "Pinging %s"
@@ -14181,11 +14471,11 @@ msgstr "Sending message %d of %d"
msgid "Failed to send %d of %d messages"
msgstr "Failed to send %d of %d messages"
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:704
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:711
msgid "Canceled."
msgstr "Cancelled."
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:706
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:713
msgid "Complete."
msgstr "Complete."
@@ -14214,66 +14504,71 @@ msgstr "Opening folder %s"
#: ../mail/mail-ops.c:1270
#, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr "Retrieving quota information for folder %s"
+
+#: ../mail/mail-ops.c:1339
+#, c-format
msgid "Opening store %s"
msgstr "Opening store %s"
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1410
#, c-format
msgid "Removing folder %s"
msgstr "Removing folder %s"
-#: ../mail/mail-ops.c:1430
+#: ../mail/mail-ops.c:1499
#, c-format
msgid "Storing folder '%s'"
msgstr "Storing folder '%s'"
-#: ../mail/mail-ops.c:1493
+#: ../mail/mail-ops.c:1562
#, c-format
msgid "Expunging and storing account '%s'"
msgstr "Expunging and storing account '%s'"
-#: ../mail/mail-ops.c:1494
+#: ../mail/mail-ops.c:1563
#, c-format
msgid "Storing account '%s'"
msgstr "Storing account '%s'"
-#: ../mail/mail-ops.c:1548
+#: ../mail/mail-ops.c:1617
msgid "Refreshing folder"
msgstr "Refreshing folder"
-#: ../mail/mail-ops.c:1585 ../mail/mail-ops.c:1635
+#: ../mail/mail-ops.c:1654 ../mail/mail-ops.c:1704
msgid "Expunging folder"
msgstr "Expunging folder"
-#: ../mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1701
#, c-format
msgid "Emptying trash in '%s'"
msgstr "Emptying wastebasket in '%s'"
-#: ../mail/mail-ops.c:1633
+#: ../mail/mail-ops.c:1702
msgid "Local Folders"
msgstr "Local Folders"
-#: ../mail/mail-ops.c:1714
+#: ../mail/mail-ops.c:1783
#, c-format
msgid "Retrieving message %s"
msgstr "Retrieving message %s"
-#: ../mail/mail-ops.c:1821
+#: ../mail/mail-ops.c:1890
#, c-format
msgid "Retrieving %d message"
msgid_plural "Retrieving %d messages"
msgstr[0] "Retrieving %d message"
msgstr[1] "Retrieving %d messages"
-#: ../mail/mail-ops.c:1906
+#: ../mail/mail-ops.c:1975
#, c-format
msgid "Saving %d message"
msgid_plural "Saving %d messsages"
msgstr[0] "Saving %d message"
msgstr[1] "Saving %d messages"
-#: ../mail/mail-ops.c:1976
+#: ../mail/mail-ops.c:2053
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -14282,11 +14577,11 @@ msgstr ""
"Error saving messages to: %s:\n"
" %s"
-#: ../mail/mail-ops.c:2048
+#: ../mail/mail-ops.c:2125
msgid "Saving attachment"
msgstr "Saving attachment"
-#: ../mail/mail-ops.c:2060 ../mail/mail-ops.c:2066
+#: ../mail/mail-ops.c:2143 ../mail/mail-ops.c:2151
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -14295,51 +14590,51 @@ msgstr ""
"Cannot create output file: %s:\n"
" %s"
-#: ../mail/mail-ops.c:2076
+#: ../mail/mail-ops.c:2166
#, c-format
msgid "Could not write data: %s"
msgstr "Could not write data: %s"
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2312
#, c-format
msgid "Disconnecting from %s"
msgstr "Disconnecting from %s"
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2312
#, c-format
msgid "Reconnecting to %s"
msgstr "Reconnecting to %s"
-#: ../mail/mail-ops.c:2318
+#: ../mail/mail-ops.c:2408
#, c-format
msgid "Preparing account '%s' for offline"
msgstr "Preparing account '%s' for offline"
-#: ../mail/mail-ops.c:2404
+#: ../mail/mail-ops.c:2494
msgid "Checking Service"
msgstr "Checking Service"
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:194
msgid "Canceling..."
msgstr "Cancelling..."
-#: ../mail/mail-send-recv.c:393
+#: ../mail/mail-send-recv.c:397
msgid "Send & Receive Mail"
msgstr "Send & Receive Mail"
-#: ../mail/mail-send-recv.c:400
+#: ../mail/mail-send-recv.c:408
msgid "Cancel _All"
msgstr "Cancel _All"
-#: ../mail/mail-send-recv.c:510
+#: ../mail/mail-send-recv.c:517
msgid "Updating..."
msgstr "Updating..."
-#: ../mail/mail-send-recv.c:510 ../mail/mail-send-recv.c:583
+#: ../mail/mail-send-recv.c:517 ../mail/mail-send-recv.c:590
msgid "Waiting..."
msgstr "Waiting..."
-#: ../mail/mail-send-recv.c:810
+#: ../mail/mail-send-recv.c:817
#, c-format
msgid "Checking for new mail"
msgstr "Checking for new mail"
@@ -14367,17 +14662,22 @@ msgstr "Enter Password"
msgid "User canceled operation."
msgstr "User cancelled operation."
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "Edit signature"
+#: ../mail/mail-signature-editor.c:201
+msgid "_Save and Close"
+msgstr "_Save and Close"
+
+#: ../mail/mail-signature-editor.c:208 ../ui/evolution-editor.xml.h:19
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
+msgid "_File"
+msgstr "_File"
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "Enter a name for this signature."
+#: ../mail/mail-signature-editor.c:355
+msgid "Edit Signature"
+msgstr "Edit Signature"
-#: ../mail/mail-signature-editor.c:434
-msgid "Name:"
-msgstr "Name:"
+#: ../mail/mail-signature-editor.c:370
+msgid "_Signature Name:"
+msgstr "_Signature Name:"
#: ../mail/mail-tools.c:120
#, c-format
@@ -14427,44 +14727,40 @@ msgid "New Search Folder"
msgstr "New Search Folder"
#: ../mail/mail.error.xml.h:1
-msgid ""
-"A folder named &quot;{0}&quot; already exists. Please use a different name."
-msgstr ""
-"A folder named &quot;{0}&quot; already exists. Please use a different name."
+msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgstr "A folder named \"{0}\" already exists. Please use a different name."
#: ../mail/mail.error.xml.h:2
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
-msgstr ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "A folder named \"{1}\" already exists. Please use a different name."
#: ../mail/mail.error.xml.h:3
msgid ""
-"A non-empty folder at &quot;{1}&quot; already exists.\n"
+"A non-empty folder at \"{1}\" already exists.\n"
"\n"
"You can choose to ignore this folder, overwrite or append its contents, or "
"quit."
msgstr ""
-"A non-empty folder at &quot;{1}&quot; already exists.\n"
+"A non-empty folder at \"{1}\" already exists.\n"
"\n"
"You can choose to ignore this folder, overwrite or append its contents, or "
"quit."
#: ../mail/mail.error.xml.h:6
msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
-"receipt notification to {0}?"
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
msgstr ""
-"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
-"receipt notification to {0}?"
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
#: ../mail/mail.error.xml.h:7
msgid ""
-"A signature already exists with the name &quot;{0}&quot;. Please specify a "
-"different name."
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
msgstr ""
-"A signature already exists with the name &quot;{0}&quot;. Please specify a "
-"different name."
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
#: ../mail/mail.error.xml.h:8
msgid ""
@@ -14503,10 +14799,10 @@ msgstr ""
#: ../mail/mail.error.xml.h:14
msgid ""
"Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
+"folder \"{0}\"?"
msgstr ""
"Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
+"folder \"{0}\"?"
#: ../mail/mail.error.xml.h:15
msgid "Are you sure you want to send a message in HTML format?"
@@ -14521,100 +14817,102 @@ msgid "Are you sure you want to send a message without a subject?"
msgstr "Are you sure you want to send a message without a subject?"
#: ../mail/mail.error.xml.h:18
-msgid "Because &quot;{0}&quot;."
-msgstr "Because &quot;{0}&quot;."
+msgid "Because \"{0}\"."
+msgstr "Because \"{0}\"."
#: ../mail/mail.error.xml.h:20
-msgid "Because &quot;{2}&quot;."
-msgstr "Because &quot;{2}&quot;."
+msgid "Because \"{2}\"."
+msgstr "Because \"{2}\"."
#: ../mail/mail.error.xml.h:21
msgid "Blank Signature"
msgstr "Blank Signature"
#: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder &quot;{0}&quot;."
-msgstr "Cannot add Search Folder &quot;{0}&quot;."
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr "Cannot add Search Folder \"{0}\"."
#: ../mail/mail.error.xml.h:23
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Cannot copy folder \"{0}\" to \"{1}\"."
#: ../mail/mail.error.xml.h:24
-msgid "Cannot create folder &quot;{0}&quot;."
-msgstr "Cannot create folder &quot;{0}&quot;."
+msgid "Cannot create folder \"{0}\"."
+msgstr "Cannot create folder \"{0}\"."
#: ../mail/mail.error.xml.h:25
msgid "Cannot create temporary save directory."
msgstr "Cannot create temporary save directory."
#: ../mail/mail.error.xml.h:26
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
-msgstr "Cannot create the save directory, because &quot;{1}&quot;"
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "Cannot create the save directory, because \"{1}\""
#: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder &quot;{0}&quot;."
-msgstr "Cannot delete folder &quot;{0}&quot;."
+msgid "Cannot delete folder \"{0}\"."
+msgstr "Cannot delete folder \"{0}\"."
#: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder &quot;{0}&quot;."
-msgstr "Cannot delete system folder &quot;{0}&quot;."
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Cannot delete system folder \"{0}\"."
#: ../mail/mail.error.xml.h:29
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
-msgstr "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr "Cannot edit Search Folder \"{0}\" as it does not exist."
#: ../mail/mail.error.xml.h:30
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Cannot move folder \"{0}\" to \"{1}\"."
#: ../mail/mail.error.xml.h:31
-msgid "Cannot open source &quot;{1}&quot;"
-msgstr "Cannot open source &quot;{1}&quot;"
+msgid "Cannot open source \"{1}\""
+msgstr "Cannot open source \"{1}\""
#: ../mail/mail.error.xml.h:32
-msgid "Cannot open source &quot;{2}&quot;."
-msgstr "Cannot open source &quot;{2}&quot;."
+msgid "Cannot open source \"{2}\"."
+msgstr "Cannot open source \"{2}\"."
#: ../mail/mail.error.xml.h:33
-msgid "Cannot open target &quot;{2}&quot;."
-msgstr "Cannot open target &quot;{2}&quot;."
+msgid "Cannot open target \"{2}\"."
+msgstr "Cannot open target \"{2}\"."
#: ../mail/mail.error.xml.h:34
msgid ""
-"Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem. You will not be able to use this provider until you can accept its "
-"license."
+"Cannot read the license file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its license."
msgstr ""
-"Cannot read the licence file &quot;{0}&quot;, due to an installation "
-"problem. You will not be able to use this provider until you can accept its "
-"licence."
+"Cannot read the licence file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its licence."
#: ../mail/mail.error.xml.h:35
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "Cannot rename \"{0}\" to \"{1}\"."
#: ../mail/mail.error.xml.h:36
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
-msgstr "Cannot rename or move system folder &quot;{0}&quot;."
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Cannot rename or move system folder \"{0}\"."
#: ../mail/mail.error.xml.h:37
msgid "Cannot save changes to account."
msgstr "Cannot save changes to account."
#: ../mail/mail.error.xml.h:38
-msgid "Cannot save to directory &quot;{0}&quot;."
-msgstr "Cannot save to directory &quot;{0}&quot;."
+msgid "Cannot save to directory \"{0}\"."
+msgstr "Cannot save to directory \"{0}\"."
#: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file &quot;{0}&quot;."
-msgstr "Cannot save to file &quot;{0}&quot;."
+msgid "Cannot save to file \"{0}\"."
+msgstr "Cannot save to file \"{0}\"."
#: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script &quot;{0}&quot;."
-msgstr "Cannot set signature script &quot;{0}&quot;."
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Cannot set signature script \"{0}\"."
#: ../mail/mail.error.xml.h:41
+msgid "Check Junk Failed"
+msgstr "Check Junk Failed"
+
+#: ../mail/mail.error.xml.h:42
msgid ""
"Check to make sure your password is spelled correctly. Remember that many "
"passwords are case sensitive; your caps lock might be on."
@@ -14622,46 +14920,42 @@ msgstr ""
"Check to make sure your password is spelt correctly. Remember that many "
"passwords are case sensitive; your caps lock might be on."
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
msgid "Could not save signature file."
msgstr "Could not save signature file."
-#: ../mail/mail.error.xml.h:43
-msgid "Delete &quot;{0}&quot;?"
-msgstr "Delete &quot;{0}&quot;?"
-
#: ../mail/mail.error.xml.h:44
-msgid "Delete account?"
-msgstr "Delete account?"
+msgid "Delete \"{0}\"?"
+msgstr "Delete \"{0}\"?"
#: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-msgstr "Delete messages in Search Folder &quot;{0}&quot;?"
+msgid "Delete account?"
+msgstr "Delete account?"
#: ../mail/mail.error.xml.h:46
+msgid "Delete messages in Search Folder \"{0}\"?"
+msgstr "Delete messages in Search Folder \"{0}\"?"
+
+#: ../mail/mail.error.xml.h:47
msgid "Delete messages in Search Folder?"
msgstr "Delete messages in Search Folder?"
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
msgid "Discard changes?"
msgstr "Discard changes?"
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
msgid "Do not d_elete"
msgstr "Do not d_elete"
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
msgid "Do not delete"
msgstr "Do not delete"
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
msgid "Do not disable"
msgstr "Do not disable"
-#: ../mail/mail.error.xml.h:51
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr "Do you want the operation to be performed also in the subfolders?"
-
#: ../mail/mail.error.xml.h:52
msgid ""
"Do you want to locally synchronize the folders that are marked for offline "
@@ -14757,7 +15051,7 @@ msgid ""
"your message anyway. To avoid this, you should add at least one To: or CC: "
"recipient."
msgstr ""
-"Many email systems add an Apparently-To header to messages that only have "
+"Many e-mail systems add an Apparently-To header to messages that only have "
"BCC recipients. This header, if added, will list all of your recipients to "
"your message anyway. To avoid this, you should add at least one To: or CC: "
"recipient."
@@ -14767,80 +15061,80 @@ msgid "Mark all messages as read"
msgstr "Mark all messages as read"
#: ../mail/mail.error.xml.h:74
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "Mark all messages in this folder and subfolders as read?"
-
-#: ../mail/mail.error.xml.h:75
msgid "Missing folder."
msgstr "Missing folder."
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
msgid "No sources selected."
msgstr "No sources selected."
-#: ../mail/mail.error.xml.h:78
-msgid "Only on _Current Folder"
-msgstr "Only on _Current Folder"
-
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:77
msgid "Opening too many messages at once may take a long time."
msgstr "Opening too many messages at once may take a long time."
# mail:gw-accountsetup-error secondary
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:78
msgid "Please check your account settings and try again."
msgstr "Please check your account settings and try again."
# mail:gw-accountsetup-error secondary
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:79
msgid "Please enable the account or send using another account."
msgstr "Please enable the account or send using another account."
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:80
msgid ""
"Please enter a valid email address in the To: field. You can search for "
"email addresses by clicking on the To: button next to the entry box."
msgstr ""
-"Please enter a valid email address in the To: field. You can search for "
-"email addresses by clicking on the To: button next to the entry box."
+"Please enter a valid e-mail address in the To: field. You can search for e-"
+"mail addresses by clicking on the To: button next to the entry box."
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
msgid ""
"Please make sure the following recipients are willing and able to receive "
"HTML email:\n"
"{0}"
msgstr ""
"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
+"HTML e-mail:\n"
"{0}"
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
msgid "Please provide an unique name to identify this signature."
msgstr "Please provide an unique name to identify this signature."
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:84
msgid "Please wait."
msgstr "Please wait."
-#: ../mail/mail.error.xml.h:87
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
-msgstr "Problem migrating old mail folder &quot;{0}&quot;."
+#: ../mail/mail.error.xml.h:85
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr "Problem migrating old mail folder \"{0}\"."
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
msgid "Querying server"
msgstr "Querying server"
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:87
msgid "Querying server for a list of supported authentication mechanisms."
msgstr "Querying server for a list of supported authentication mechanisms."
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:88
msgid "Read receipt requested."
msgstr "Read receipt requested."
+#: ../mail/mail.error.xml.h:89
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Really delete folder \"{0}\" and all of its subfolders?"
+
+#: ../mail/mail.error.xml.h:90
+msgid "Report Junk Failed"
+msgstr "Report Junk Failed"
+
#: ../mail/mail.error.xml.h:91
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
-msgstr "Really delete folder &quot;{0}&quot; and all of its subfolders?"
+msgid "Report Not Junk Failed"
+msgstr "Report Not Junk Failed"
#: ../mail/mail.error.xml.h:92
msgid "Search Folders automatically updated."
@@ -14881,7 +15175,7 @@ msgid ""
msgstr ""
"The contact list you are sending to is configured to hide list recipients.\n"
"\n"
-"Many email systems add an Apparently-To header to messages that only have "
+"Many e-mail systems add an Apparently-To header to messages that only have "
"BCC recipients. This header, if added, will list all of your recipients in "
"your message. To avoid this, you should add at least one To: or CC: "
"recipient. "
@@ -14891,13 +15185,13 @@ msgid ""
"The following Search Folder(s):\n"
"{0}\n"
"Used the now removed folder:\n"
-" &quot;{1}&quot;\n"
+" \"{1}\"\n"
"And have been updated."
msgstr ""
"The following Search Folder(s):\n"
"{0}\n"
-"Used the now removed folder:\n"
-" &quot;{1}&quot;\n"
+"Used the now-removed folder:\n"
+" \"{1}\"\n"
"And have been updated."
#: ../mail/mail.error.xml.h:106
@@ -14905,13 +15199,13 @@ msgid ""
"The following filter rule(s):\n"
"{0}\n"
"Used the now removed folder:\n"
-" &quot;{1}&quot;\n"
+" \"{1}\"\n"
"And have been updated."
msgstr ""
"The following filter rule(s):\n"
"{0}\n"
-"Used the now removed folder:\n"
-" &quot;{1}&quot;\n"
+"Used the now-removed folder:\n"
+" \"{1}\"\n"
"And have been updated."
#: ../mail/mail.error.xml.h:111
@@ -15026,8 +15320,8 @@ msgstr ""
"folders, all remote folders, or both."
#: ../mail/mail.error.xml.h:134
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr "Your login to your server \"{0}\" as \"{0}\" failed."
#: ../mail/mail.error.xml.h:135
msgid "_Append"
@@ -15049,10 +15343,6 @@ msgstr "_Expunge"
msgid "_Open Messages"
msgstr "_Open Messages"
-#: ../mail/mail.error.xml.h:143
-msgid "on Current Folder and _Subfolders"
-msgstr "on Current Folder and _Subfolders"
-
#: ../mail/message-list.c:1053
msgid "Unseen"
msgstr "Unseen"
@@ -15089,37 +15379,49 @@ msgstr "Higher"
msgid "Highest"
msgstr "Highest"
-#: ../mail/message-list.c:1614 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1594 ../widgets/table/e-cell-date.c:55
msgid "?"
msgstr "?"
#. strftime format of a time,
#. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1621 ../plugins/itip-formatter/itip-view.c:206
+#: ../mail/message-list.c:1601 ../plugins/itip-formatter/itip-view.c:206
#: ../widgets/table/e-cell-date.c:70
msgid "Today %l:%M %p"
msgstr "Today %l:%M %p"
-#: ../mail/message-list.c:1630 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1610 ../widgets/table/e-cell-date.c:80
msgid "Yesterday %l:%M %p"
msgstr "Yesterday %l:%M %p"
-#: ../mail/message-list.c:1642 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1622 ../widgets/table/e-cell-date.c:92
msgid "%a %l:%M %p"
msgstr "%a %l:%M %p"
-#: ../mail/message-list.c:1650 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1630 ../widgets/table/e-cell-date.c:100
msgid "%b %d %l:%M %p"
msgstr "%d %b %l:%M %p"
-#: ../mail/message-list.c:1652 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:102
msgid "%b %d %Y"
msgstr "%d %b %Y"
-#: ../mail/message-list.c:3849
+#: ../mail/message-list.c:3818
msgid "Generating message list"
msgstr "Generating message list"
+#: ../mail/message-list.c:4081
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+
+#: ../mail/message-list.c:4083
+msgid "There are no messages in this folder."
+msgstr "There are no messages in this folder."
+
#: ../mail/message-list.etspec.h:3
msgid "Due By"
msgstr "Due By"
@@ -15218,14 +15520,6 @@ msgid "Provides core functionality for local address books."
msgstr "Provides core functionality for local address books."
#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "Enable attachment reminder plugin"
-msgstr "Enable attachment reminder plugin"
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid "Enable attachment reminder plugin."
-msgstr "Enable attachment reminder plugin."
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
msgid ""
"List of clues for the attachment reminder plugin to look for in a message "
"body"
@@ -15233,7 +15527,7 @@ msgstr ""
"List of clues for the attachment reminder plugin to look for in a message "
"body"
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:4
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
msgid ""
"List of clues for the attachment reminder plugin to look for in a message "
"body."
@@ -15241,14 +15535,10 @@ msgstr ""
"List of clues for the attachment reminder plugin to look for in a message "
"body."
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/attachment-reminder/attachment-reminder.c:469
msgid "Keywords"
msgstr "Keywords"
-#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
-msgid "Remind _missing attachments"
-msgstr "Remind _missing attachments"
-
#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
msgid "Attachment Reminder"
@@ -15275,8 +15565,8 @@ msgid "Message has no attachments"
msgstr "Message has no attachments"
#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Continue Editing"
-msgstr "_Continue Editing"
+msgid "_Edit Message"
+msgstr "_Edit Message"
#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
msgid ""
@@ -15290,27 +15580,27 @@ msgstr ""
msgid "Audio inline plugin"
msgstr "Audio inline plugin"
-#: ../plugins/backup-restore/backup-restore.c:96
+#: ../plugins/backup-restore/backup-restore.c:107
msgid "Select name of the Evolution backup file"
msgstr "Select name of the Evolution backup file"
-#: ../plugins/backup-restore/backup-restore.c:120
+#: ../plugins/backup-restore/backup-restore.c:136
msgid "_Restart Evolution after backup"
msgstr "_Restart Evolution after backup"
-#: ../plugins/backup-restore/backup-restore.c:139
+#: ../plugins/backup-restore/backup-restore.c:159
msgid "Select name of the Evolution backup file to restore"
msgstr "Select name of the Evolution backup file to restore"
-#: ../plugins/backup-restore/backup-restore.c:163
+#: ../plugins/backup-restore/backup-restore.c:183
msgid "_Restart Evolution after restore"
msgstr "_Restart Evolution after restore"
-#: ../plugins/backup-restore/backup-restore.c:236
+#: ../plugins/backup-restore/backup-restore.c:256
msgid "Restore from backup"
msgstr "Restore from backup"
-#: ../plugins/backup-restore/backup-restore.c:238
+#: ../plugins/backup-restore/backup-restore.c:258
msgid ""
"You can restore Evolution from your backup. It can restore all the Mails, "
"Calendars, Tasks, Memos, Contacts. \n"
@@ -15320,15 +15610,15 @@ msgstr ""
"Calendars, Tasks, Memos, Contacts. \n"
"It also restores all your personal settings, mail filters etc."
-#: ../plugins/backup-restore/backup-restore.c:244
+#: ../plugins/backup-restore/backup-restore.c:264
msgid "_Restore Evolution from the backup file"
msgstr "_Restore Evolution from the backup file"
-#: ../plugins/backup-restore/backup-restore.c:251
+#: ../plugins/backup-restore/backup-restore.c:271
msgid "Please select an Evolution Archive to restore:"
msgstr "Please select an Evolution Archive to restore:"
-#: ../plugins/backup-restore/backup-restore.c:254
+#: ../plugins/backup-restore/backup-restore.c:274
msgid "Choose a file to restore"
msgstr "Choose a file to restore"
@@ -15441,14 +15731,23 @@ msgstr ""
"toggle button."
#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Insufficient Permissions"
+msgstr "Insufficient Permissions"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
msgid "Invalid Evolution backup file"
msgstr "Invalid Evolution backup file"
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
msgid "Please select a valid backup file to restore."
msgstr "Please select a valid backup file to restore."
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+msgid "The selected folder does not have enough permissions to create the file"
+msgstr ""
+"The selected folder does not have enough permissions to create the file"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
msgid ""
"This will delete all your current Evolution data and settings and restore "
"them from your backup. Evolution restore can start only when Evolution is "
@@ -15484,7 +15783,7 @@ msgstr "Automatic Contacts"
msgid ""
"_Automatically create entries in the addressbook when responding to messages"
msgstr ""
-"_Automatically create entries in the addressbook when responding to messages"
+"_Automatically create entries in the address book when responding to messages"
#: ../plugins/bbdb/bbdb.c:571
msgid "Select Address book for Automatic Contacts"
@@ -15518,7 +15817,7 @@ msgid ""
"reply to messages. Also fills in IM contact information from your buddy "
"lists."
msgstr ""
-"Automatically fills your addressbook with names and email addresses as you "
+"Automatically fills your address book with names and e-mail addresses as you "
"reply to messages. Also fills in IM contact information from your buddy "
"lists."
@@ -15526,7 +15825,28 @@ msgstr ""
msgid "BBDB"
msgstr "BBDB"
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:303
+#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:114
+#, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr "Error occurred while spawning %s: %s."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr "Bogofilter child process does not respond, killing..."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr "Wait for Bogofilter child process interrupted, terminating..."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr "Pipe to Bogofilter failed, error code: %d."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
msgid "Convert message text to _Unicode"
msgstr "Convert message text to _Unicode"
@@ -15587,8 +15907,8 @@ msgstr "Provides core functionality for local calendars."
#: ../plugins/calendar-http/calendar-http.c:273
#: ../plugins/calendar-weather/calendar-weather.c:546
#: ../plugins/google-account-setup/google-source.c:375
-msgid "_Refresh:"
-msgstr "_Refresh:"
+msgid "Re_fresh:"
+msgstr "Re_fresh:"
#: ../plugins/calendar-http/calendar-http.c:341
msgid "_Secure connection"
@@ -15694,14 +16014,25 @@ msgid "Do you want to make Evolution your default e-mail client?"
msgstr "Do you want to make Evolution your default e-mail client?"
#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:690
+#: ../shell/main.c:691
msgid "Evolution"
msgstr "Evolution"
#: ../plugins/default-source/default-source.c:81
-#: ../plugins/default-source/default-source.c:108
-msgid "Mark as _default folder"
-msgstr "Mark as _default folder"
+msgid "Mark as _default address book"
+msgstr "Mark as _default address book"
+
+#: ../plugins/default-source/default-source.c:102
+msgid "Mark as _default calendar"
+msgstr "Mark as _default calendar"
+
+#: ../plugins/default-source/default-source.c:103
+msgid "Mark as _default task list"
+msgstr "Mark as _default task list"
+
+#: ../plugins/default-source/default-source.c:104
+msgid "Mark as _default memo list"
+msgstr "Mark as _default memo list"
#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
msgid "Default Sources"
@@ -15715,6 +16046,41 @@ msgstr ""
"Provides functionallity for marking a calendar or address book as the "
"default one."
+#: ../plugins/email-custom-header/email-custom-header.c:541
+msgid "_Custom Header"
+msgstr "_Custom Header"
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
+msgid "Custom Header Options"
+msgstr "Custom Header Options"
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:2
+msgid "Email Custom Header"
+msgstr "E-mail Custom Header"
+
+#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
+msgid "Adds custom header to outgoing messages."
+msgstr "Adds custom header to outgoing messages."
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+msgid "Custom Header"
+msgstr "Custom Header"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Header"
+msgstr "List of Custom Header"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+
#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
msgid "Open Other User's Folder"
msgstr "Open Other User's Folder"
@@ -15732,12 +16098,12 @@ msgid "_User:"
msgstr "_User:"
#. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
+#: ../plugins/exchange-operations/exchange-account-setup.c:62
msgid "Secure Password"
msgstr "Secure Password"
#. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
+#: ../plugins/exchange-operations/exchange-account-setup.c:65
msgid ""
"This option will connect to the Exchange server using secure password (NTLM) "
"authentication."
@@ -15745,11 +16111,11 @@ msgstr ""
"This option will connect to the Exchange server using secure password (NTLM) "
"authentication."
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:73
msgid "Plaintext Password"
msgstr "Plaintext Password"
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
+#: ../plugins/exchange-operations/exchange-account-setup.c:75
msgid ""
"This option will connect to the Exchange server using standard plaintext "
"password authentication."
@@ -15757,11 +16123,11 @@ msgstr ""
"This option will connect to the Exchange server using standard plaintext "
"password authentication."
-#: ../plugins/exchange-operations/exchange-account-setup.c:257
+#: ../plugins/exchange-operations/exchange-account-setup.c:256
msgid "Out Of Office"
msgstr "Out Of Office"
-#: ../plugins/exchange-operations/exchange-account-setup.c:264
+#: ../plugins/exchange-operations/exchange-account-setup.c:263
msgid ""
"The message specified below will be automatically sent to \n"
"each person who sends mail to you while you are out of the office."
@@ -15769,77 +16135,77 @@ msgstr ""
"The message specified below will be automatically sent to \n"
"each person who sends mail to you while you are out of the office."
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:281
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:280
msgid "I am out of the office"
msgstr "I am out of the office"
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:276
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
msgid "I am in the office"
msgstr "I am in the office"
#. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:327
msgid "Change the password for Exchange account"
msgstr "Change the password for Exchange account"
-#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-account-setup.c:329
#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
msgid "Change Password"
msgstr "Change Password"
#. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:334
msgid "Manage the delegate settings for Exchange account"
msgstr "Manage the delegate settings for Exchange account"
-#: ../plugins/exchange-operations/exchange-account-setup.c:337
+#: ../plugins/exchange-operations/exchange-account-setup.c:336
msgid "Delegation Assistant"
msgstr "Delegation Assistant"
#. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:348
msgid "Miscelleneous"
msgstr "Miscelleneous"
#. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:358
msgid "View the size of all Exchange folders"
msgstr "View the size of all Exchange folders"
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
+#: ../plugins/exchange-operations/exchange-account-setup.c:360
msgid "Folders Size"
msgstr "Folders Size"
-#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/exchange-account-setup.c:367
#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
msgid "Exchange Settings"
msgstr "Exchange Settings"
-#: ../plugins/exchange-operations/exchange-account-setup.c:625
+#: ../plugins/exchange-operations/exchange-account-setup.c:624
msgid "_OWA URL:"
msgstr "_OWA URL:"
-#: ../plugins/exchange-operations/exchange-account-setup.c:651
+#: ../plugins/exchange-operations/exchange-account-setup.c:650
msgid "A_uthenticate"
msgstr "A_uthenticate"
-#: ../plugins/exchange-operations/exchange-account-setup.c:854
+#: ../plugins/exchange-operations/exchange-account-setup.c:853
msgid "_Authentication Type"
msgstr "_Authentication Type"
-#: ../plugins/exchange-operations/exchange-account-setup.c:868
+#: ../plugins/exchange-operations/exchange-account-setup.c:867
msgid "Ch_eck for Supported Types"
msgstr "Ch_eck for Supported Types"
-#: ../plugins/exchange-operations/exchange-account-setup.c:980
+#: ../plugins/exchange-operations/exchange-account-setup.c:979
#: ../plugins/exchange-operations/exchange-contacts.c:212
#, c-format
msgid "%s KB"
msgstr "%s KB"
-#: ../plugins/exchange-operations/exchange-account-setup.c:982
+#: ../plugins/exchange-operations/exchange-account-setup.c:981
#: ../plugins/exchange-operations/exchange-contacts.c:214
#, c-format
msgid "0 KB"
@@ -16041,7 +16407,7 @@ msgstr "_Summarise permissions"
msgid "_Tasks:"
msgstr "_Tasks:"
-#: ../plugins/exchange-operations/exchange-folder-permission.c:61
+#: ../plugins/exchange-operations/exchange-folder-permission.c:60
#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
msgid "Permissions..."
msgstr "Permissions..."
@@ -16055,11 +16421,11 @@ msgid "Folder Size"
msgstr "Folder Size"
#. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
msgid "User"
msgstr "User"
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:316
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:315
#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
msgid "Subscribe to Other User's Folder"
msgstr "Subscribe to Other User's Folder"
@@ -16155,6 +16521,7 @@ msgid "Add User:"
msgstr "Add User:"
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-send-options.c:417
#: ../plugins/groupwise-features/proxy.c:946
#: ../plugins/groupwise-features/share-folder.c:726
msgid "Add User"
@@ -16640,6 +17007,14 @@ msgstr "Subscribe to Other User's Tasks"
msgid "Check folder permissions"
msgstr "Check folder permissions"
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Default External Editor"
+msgstr "Default External Editor"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+msgid "The default command that must be used as the editor."
+msgstr "The default command that must be used as the editor."
+
#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
msgid ""
"A plugin for using an external editor as the composer. You can send only "
@@ -16653,6 +17028,30 @@ msgstr ""
msgid "External Editor"
msgstr "External Editor"
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+msgid "Cannot create Temporary File"
+msgstr "Cannot create Temporary File"
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+msgid "Editor not launchable"
+msgstr "Editor not launchable"
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
+msgid ""
+"Evolution is unable to create a temporary file to save your mail. Retry "
+"later."
+msgstr ""
+"Evolution is unable to create a temporary file to save your mail. Retry "
+"later."
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+
#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
msgid "Compose in External Editor"
msgstr "Compose in External Editor"
@@ -16661,6 +17060,18 @@ msgstr "Compose in External Editor"
msgid "Compose messages using an external editor"
msgstr "Compose messages using an external editor"
+#: ../plugins/external-editor/external-editor.c:91
+msgid "Command to be executed to launch the editor: "
+msgstr "Command to be executed to launch the editor: "
+
+#: ../plugins/external-editor/external-editor.c:92
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim\""
+msgstr ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim\""
+
#: ../plugins/face/face.c:58
msgid "Select a (48*48) png of size < 700bytes"
msgstr "Select a (48*48) png of size < 700bytes"
@@ -16669,7 +17080,7 @@ msgstr "Select a (48*48) png of size < 700bytes"
msgid "PNG files"
msgstr "PNG files"
-#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#: ../plugins/face/face.c:125
msgid "_Face"
msgstr "_Face"
@@ -16717,7 +17128,7 @@ msgstr "A plugin to setup google calendar."
msgid "Google sources"
msgstr "Google sources"
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
msgid "Checklist"
msgstr "Checklist"
@@ -16781,7 +17192,7 @@ msgstr "<b>Junk List:</b>"
#: ../plugins/groupwise-features/junk-settings.glade.h:2
msgid "Email:"
-msgstr "Email:"
+msgstr "E-mail:"
#: ../plugins/groupwise-features/junk-settings.glade.h:5
#: ../plugins/mail-account-disable/mail-account-disable.c:46
@@ -16822,6 +17233,69 @@ msgstr "A plugin for the features in Groupwise accounts."
msgid "Groupwise Features"
msgstr "Groupwise Features"
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+msgid "Message retract failed"
+msgstr "Message retract failed"
+
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
+msgid "The server did not allow the selected message to be retracted."
+msgstr "The server did not allow the selected message to be retracted."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
+msgid "Invalid user"
+msgstr "Invalid user"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr "Proxy access cannot be given to user &quot;{0}&quot;"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+msgid "Specify User"
+msgstr "Specify User"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+msgid "You have already given proxy permissions to this user."
+msgstr "You have already given proxy permissions to this user."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+msgid "You have to specify a valid user name to give proxy rights."
+msgstr "You have to specify a valid user name to give proxy rights."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr "Account &quot;{0}&quot; already exists. Please check your folder tree."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
+msgid "Account Already Exists"
+msgstr "Account Already Exists"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and "
+"try again."
+msgstr ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and "
+"try again."
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+msgid "This is a recurring meeting"
+msgstr "This is a recurring meeting"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+msgid "What would you like to {0}?"
+msgstr "What would you like to {0}?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgstr "You cannot share folder with specified user &quot;{0}&quot;"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+msgid "You have to specify a user name whom you want to add to the list"
+msgstr "You have to specify a user name whom you want to add to the list"
+
#: ../plugins/groupwise-features/process-meeting.c:49
msgid "Accept Tentatively"
msgstr "Accept Tentatively"
@@ -16960,6 +17434,10 @@ msgstr "New _Shared Folder..."
msgid "Sharing"
msgstr "Sharing"
+#: ../plugins/groupwise-features/share-folder.c:544
+msgid "Custom Notification"
+msgstr "Custom Notification"
+
#: ../plugins/groupwise-features/share-folder.c:766
msgid "Add "
msgstr "Add "
@@ -17087,27 +17565,27 @@ msgstr "A plugin for the features in the IMAP accounts."
msgid "IMAP Features"
msgstr "IMAP Features"
-#: ../plugins/import-ics-attachments/icsimporter.c:82
+#: ../plugins/import-ics-attachments/icsimporter.c:78
msgid "_Import to Calendar"
msgstr "_Import to Calendar"
-#: ../plugins/import-ics-attachments/icsimporter.c:87
+#: ../plugins/import-ics-attachments/icsimporter.c:83
msgid "_Import to Tasks"
msgstr "_Import to Tasks"
-#: ../plugins/import-ics-attachments/icsimporter.c:205
+#: ../plugins/import-ics-attachments/icsimporter.c:201
msgid "Import ICS"
msgstr "Import ICS"
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:224
msgid "Select Task List"
msgstr "Select Task List"
-#: ../plugins/import-ics-attachments/icsimporter.c:232
+#: ../plugins/import-ics-attachments/icsimporter.c:228
msgid "Select Calendar"
msgstr "Select Calendar"
-#: ../plugins/import-ics-attachments/icsimporter.c:263
+#: ../plugins/import-ics-attachments/icsimporter.c:259
#: ../shell/e-shell-importer.c:703
msgid "_Import"
msgstr "_Import"
@@ -17145,15 +17623,15 @@ msgstr ""
"Evolution could not find an iPod to synchronise with. Either the iPod is not "
"connected to the system or it is not powered on."
-#: ../plugins/ipod-sync/ical-format.c:133
-#: ../plugins/save-calendar/ical-format.c:190
+#: ../plugins/ipod-sync/ical-format.c:123
+#: ../plugins/save-calendar/ical-format.c:167
msgid "iCalendar format (.ics)"
msgstr "iCalendar format (.ics)"
#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
msgstr ""
-"Synchronise the selected task/memo/calendar/addressbook with an Apple iPod"
+"Synchronise the selected task/memo/calendar/address book with an Apple iPod"
#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
msgid "Synchronize to iPod"
@@ -17199,92 +17677,92 @@ msgstr "Unable to find this memo in any memo list"
msgid "Searching for an existing version of this appointment"
msgstr "Searching for an existing version of this appointment"
-#: ../plugins/itip-formatter/itip-formatter.c:943
+#: ../plugins/itip-formatter/itip-formatter.c:946
msgid "Unable to parse item"
msgstr "Unable to parse item"
-#: ../plugins/itip-formatter/itip-formatter.c:1001
+#: ../plugins/itip-formatter/itip-formatter.c:1004
#, c-format
msgid "Unable to send item to calendar '%s'. %s"
msgstr "Unable to send item to calendar '%s'. %s"
-#: ../plugins/itip-formatter/itip-formatter.c:1013
+#: ../plugins/itip-formatter/itip-formatter.c:1016
#, c-format
msgid "Sent to calendar '%s' as accepted"
msgstr "Sent to calendar '%s' as accepted"
-#: ../plugins/itip-formatter/itip-formatter.c:1017
+#: ../plugins/itip-formatter/itip-formatter.c:1020
#, c-format
msgid "Sent to calendar '%s' as tentative"
msgstr "Sent to calendar '%s' as tentative"
-#: ../plugins/itip-formatter/itip-formatter.c:1022
+#: ../plugins/itip-formatter/itip-formatter.c:1025
#, c-format
msgid "Sent to calendar '%s' as declined"
msgstr "Sent to calendar '%s' as declined"
-#: ../plugins/itip-formatter/itip-formatter.c:1027
+#: ../plugins/itip-formatter/itip-formatter.c:1030
#, c-format
msgid "Sent to calendar '%s' as canceled"
msgstr "Sent to calendar '%s' as cancelled"
-#: ../plugins/itip-formatter/itip-formatter.c:1121
+#: ../plugins/itip-formatter/itip-formatter.c:1124
#, c-format
msgid "Organizer has removed the delegate %s "
msgstr "Organiser has removed the delegate %s "
-#: ../plugins/itip-formatter/itip-formatter.c:1128
+#: ../plugins/itip-formatter/itip-formatter.c:1131
msgid "Sent a cancelation notice to the delegate"
msgstr "Sent a cancellation notice to the delegate"
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1133
msgid "Could not send the cancelation notice to the delegate"
msgstr "Could not send the cancellation notice to the delegate"
-#: ../plugins/itip-formatter/itip-formatter.c:1216
+#: ../plugins/itip-formatter/itip-formatter.c:1219
msgid "Attendee status could not be updated because the status is invalid"
msgstr "Attendee status could not be updated because the status is invalid"
-#: ../plugins/itip-formatter/itip-formatter.c:1243
+#: ../plugins/itip-formatter/itip-formatter.c:1246
#, c-format
msgid "Unable to update attendee. %s"
msgstr "Unable to update attendee. %s"
-#: ../plugins/itip-formatter/itip-formatter.c:1247
+#: ../plugins/itip-formatter/itip-formatter.c:1250
msgid "Attendee status updated"
msgstr "Attendee status updated"
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1276
msgid "Meeting information sent"
msgstr "Meeting information sent"
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1279
msgid "Task information sent"
msgstr "Task information sent"
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1282
msgid "Memo information sent"
msgstr "Memo information sent"
-#: ../plugins/itip-formatter/itip-formatter.c:1288
+#: ../plugins/itip-formatter/itip-formatter.c:1291
msgid "Unable to send meeting information, the meeting does not exist"
msgstr "Unable to send meeting information, the meeting does not exist"
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1294
msgid "Unable to send task information, the task does not exist"
msgstr "Unable to send task information, the task does not exist"
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1297
msgid "Unable to send memo information, the memo does not exist"
msgstr "Unable to send memo information, the memo does not exist"
-#: ../plugins/itip-formatter/itip-formatter.c:1369
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
msgid "The calendar attached is not valid"
msgstr "The calendar attached is not valid"
-#: ../plugins/itip-formatter/itip-formatter.c:1370
-#: ../plugins/itip-formatter/itip-formatter.c:1385
+#: ../plugins/itip-formatter/itip-formatter.c:1367
+#: ../plugins/itip-formatter/itip-formatter.c:1378
msgid ""
"The message claims to contain a calendar, but the calendar is not a valid "
"iCalendar."
@@ -17292,15 +17770,15 @@ msgstr ""
"The message claims to contain a calendar, but the calendar is not a valid "
"iCalendar."
-#: ../plugins/itip-formatter/itip-formatter.c:1420
-#: ../plugins/itip-formatter/itip-formatter.c:1438
-#: ../plugins/itip-formatter/itip-formatter.c:1520
+#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1431
+#: ../plugins/itip-formatter/itip-formatter.c:1513
msgid "The item in the calendar is not valid"
msgstr "The item in the calendar is not valid"
-#: ../plugins/itip-formatter/itip-formatter.c:1421
-#: ../plugins/itip-formatter/itip-formatter.c:1439
-#: ../plugins/itip-formatter/itip-formatter.c:1521
+#: ../plugins/itip-formatter/itip-formatter.c:1414
+#: ../plugins/itip-formatter/itip-formatter.c:1432
+#: ../plugins/itip-formatter/itip-formatter.c:1514
msgid ""
"The message does contain a calendar, but the calendar contains no events, "
"tasks or free/busy information"
@@ -17308,11 +17786,11 @@ msgstr ""
"The message does contain a calendar, but the calendar contains no events, "
"tasks or free/busy information"
-#: ../plugins/itip-formatter/itip-formatter.c:1450
+#: ../plugins/itip-formatter/itip-formatter.c:1443
msgid "The calendar attached contains multiple items"
msgstr "The calendar attached contains multiple items"
-#: ../plugins/itip-formatter/itip-formatter.c:1451
+#: ../plugins/itip-formatter/itip-formatter.c:1444
msgid ""
"To process all of these items, the file should be saved and the calendar "
"imported"
@@ -17320,37 +17798,37 @@ msgstr ""
"To process all of these items, the file should be saved and the calendar "
"imported"
-#: ../plugins/itip-formatter/itip-formatter.c:2148
+#: ../plugins/itip-formatter/itip-formatter.c:2143
msgid "This meeting recurs"
msgstr "This meeting recurs"
-#: ../plugins/itip-formatter/itip-formatter.c:2151
+#: ../plugins/itip-formatter/itip-formatter.c:2146
msgid "This task recurs"
msgstr "This task recurs"
-#: ../plugins/itip-formatter/itip-formatter.c:2154
+#: ../plugins/itip-formatter/itip-formatter.c:2149
msgid "This memo recurs"
msgstr "This memo recurs"
#. Delete message after acting
#. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2369
+#: ../plugins/itip-formatter/itip-formatter.c:2378
msgid "_Delete message after acting"
msgstr "_Delete message after acting"
-#: ../plugins/itip-formatter/itip-formatter.c:2379
-#: ../plugins/itip-formatter/itip-formatter.c:2411
+#: ../plugins/itip-formatter/itip-formatter.c:2388
+#: ../plugins/itip-formatter/itip-formatter.c:2420
msgid "Conflict Search"
msgstr "Conflict Search"
#. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2403
msgid "Select the calendars to search for meeting conflicts"
msgstr "Select the calendars to search for meeting conflicts"
#. strftime format of a weekday and a date.
#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:239
+#: ../widgets/misc/e-cell-date-edit.c:300
msgid "Today"
msgstr "Today"
@@ -17951,7 +18429,7 @@ msgstr[1] "You have received %d new messages."
#: ../plugins/mail-notification/mail-notification.c:380
#: ../plugins/mail-notification/mail-notification.c:385
msgid "New email"
-msgstr "New email"
+msgstr "New e-mail"
#: ../plugins/mail-notification/mail-notification.c:440
msgid "Show icon in _notification area"
@@ -18222,6 +18700,26 @@ msgstr "_Subscribe to List"
msgid "_Unsubscribe from List"
msgstr "_Unsubscribe from List"
+#: ../plugins/mark-all-read/mark-all-read.c:37
+msgid "Mark all messages in this folder and subfolders as read?"
+msgstr "Mark all messages in this folder and subfolders as read?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:39
+msgid "Do you want the operation to be performed also in the subfolders?"
+msgstr "Do you want the operation to be performed also in the subfolders?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:85
+msgid "Mark All Messages as Read"
+msgstr "Mark All Messages as Read"
+
+#: ../plugins/mark-all-read/mark-all-read.c:162
+msgid "Current Folder and _Subfolders"
+msgstr "Current Folder and _Subfolders"
+
+#: ../plugins/mark-all-read/mark-all-read.c:174
+msgid "Current _Folder Only"
+msgstr "Current _Folder Only"
+
#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
msgid "Mark All Read"
msgstr "Mark All Read"
@@ -18327,41 +18825,22 @@ msgstr "Plain Text Mode"
msgid "Prefer plain-text"
msgstr "Prefer plain-text"
-#: ../plugins/prefer-plain/prefer-plain.c:139
+#: ../plugins/prefer-plain/prefer-plain.c:158
msgid "Show HTML if present"
msgstr "Show HTML if present"
-#: ../plugins/prefer-plain/prefer-plain.c:140
+#: ../plugins/prefer-plain/prefer-plain.c:159
msgid "Prefer PLAIN"
msgstr "Prefer PLAIN"
-#: ../plugins/prefer-plain/prefer-plain.c:141
+#: ../plugins/prefer-plain/prefer-plain.c:160
msgid "Only ever show PLAIN"
msgstr "Only ever show PLAIN"
-#: ../plugins/prefer-plain/prefer-plain.c:184
+#: ../plugins/prefer-plain/prefer-plain.c:203
msgid "HTML _Mode"
msgstr "HTML _Mode"
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print from the composer."
-msgstr "Gives an option to print from the composer."
-
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-msgid "Print Message"
-msgstr "Print Message"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
-#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
-#: ../ui/evolution-tasks.xml.h:15
-msgid "Print Pre_view"
-msgstr "Print Pre_view"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
-msgid "Prints the message"
-msgstr "Prints the message"
-
#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
msgid "Evolution Profiler"
msgstr "Evolution Profiler"
@@ -18386,13 +18865,7 @@ msgstr "Locations"
msgid "_Publish Calendar Information"
msgstr "_Publish Calendar Information"
-#: ../plugins/publish-calendar/publish-calendar.c:91
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "Enter the password for `%s'"
-
-#: ../plugins/publish-calendar/publish-calendar.c:416
+#: ../plugins/publish-calendar/publish-calendar.c:595
msgid "Are you sure you want to remove this URL?"
msgstr "Are you sure you want to remove this URL?"
@@ -18484,11 +18957,47 @@ msgstr ""
msgid "SpamAssassin (built-in)"
msgstr "SpamAssassin (built-in)"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:848
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#, c-format
+msgid "SpamAssassin not found, code: %d"
+msgstr "SpamAssassin not found, code: %d"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#, c-format
+msgid "Failed to create pipe: %s"
+msgstr "Failed to create pipe: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#, c-format
+msgid "Error after fork: %s"
+msgstr "Error after fork: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr "SpamAssassin child process does not respond, killing..."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#, c-format
+msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgstr "Wait for Spamassassin child process interrupted, terminating..."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr "Pipe to SpamAssassin failed, error code: %d"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#, c-format
+msgid "SpamAssassin is not available."
+msgstr "SpamAssassin is not available."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
msgid "This will make SpamAssassin more reliable, but slower"
msgstr "This will make SpamAssassin more reliable, but slower"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
msgid "I_nclude remote tests"
msgstr "I_nclude remote tests"
@@ -18535,7 +19044,7 @@ msgid "MIME Type"
msgstr "MIME Type"
#: ../plugins/save-attachments/save-attachments.c:363
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-editor.xml.h:12
msgid "Save"
msgstr "Save"
@@ -18543,79 +19052,79 @@ msgstr "Save"
#. * Translator: the %F %T is the thirth argument for a strftime function.
#. * It lets you define the formatting of the date in the csv-file.
#. *
-#: ../plugins/save-calendar/csv-format.c:167
+#: ../plugins/save-calendar/csv-format.c:166
msgid "%F %T"
msgstr "%F %T"
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:364
msgid "UID"
msgstr "UID"
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:366
msgid "Description List"
msgstr "Description List"
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:367
msgid "Categories List"
msgstr "Categories List"
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:368
msgid "Comment List"
msgstr "Comment List"
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:370
msgid "Created"
msgstr "Created"
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:371
msgid "Contact List"
msgstr "Contact List"
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:372
msgid "Start"
msgstr "Start"
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:373
msgid "End"
msgstr "End"
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:375
msgid "percent Done"
msgstr "percent Done"
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:377
msgid "URL"
msgstr "URL"
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:378
msgid "Attendees List"
msgstr "Attendees List"
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:380
msgid "Modified"
msgstr "Modified"
-#: ../plugins/save-calendar/csv-format.c:545
+#: ../plugins/save-calendar/csv-format.c:535
msgid "Advanced options for the CSV format"
msgstr "Advanced options for the CSV format"
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:542
msgid "Prepend a header"
msgstr "Prepend a header"
-#: ../plugins/save-calendar/csv-format.c:561
+#: ../plugins/save-calendar/csv-format.c:551
msgid "Value delimiter:"
msgstr "Value delimiter:"
-#: ../plugins/save-calendar/csv-format.c:567
+#: ../plugins/save-calendar/csv-format.c:557
msgid "Record delimiter:"
msgstr "Record delimiter:"
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:563
msgid "Encapsulate values with:"
msgstr "Encapsulate values with:"
-#: ../plugins/save-calendar/csv-format.c:595
+#: ../plugins/save-calendar/csv-format.c:585
msgid "Comma separated value format (.csv)"
msgstr "Comma separated value format (.csv)"
@@ -18637,15 +19146,15 @@ msgstr "_Save to Disk"
#. * It lets you define the formatting of the date in the rdf-file.
#. * Also check out http://www.w3.org/2002/12/cal/tzd
#. *
-#: ../plugins/save-calendar/rdf-format.c:154
+#: ../plugins/save-calendar/rdf-format.c:153
msgid "%FT%T"
msgstr "%FT%T"
-#: ../plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/rdf-format.c:380
msgid "RDF format (.rdf)"
msgstr "RDF format (.rdf)"
-#: ../plugins/save-calendar/save-calendar.c:164
+#: ../plugins/save-calendar/save-calendar.c:165
msgid "Select destination file"
msgstr "Select destination file"
@@ -18693,7 +19202,7 @@ msgid ""
"Please click the \"Forward\" button to continue. "
msgstr ""
"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications. \n"
+"to your e-mail accounts, and to import files from other applications. \n"
"\n"
"Please click the \"Forward\" button to continue. "
@@ -18898,7 +19407,7 @@ msgstr "Skip development warning dialogue"
msgid "Skip recovery warning dialog"
msgstr "Skip recovery warning dialogue"
-#: ../shell/apps_evolution_shell.schemas.in.h:30 ../shell/main.c:576
+#: ../shell/apps_evolution_shell.schemas.in.h:30 ../shell/main.c:577
msgid "Start in offline mode"
msgstr "Start in offline mode"
@@ -19147,70 +19656,70 @@ msgstr "'.' and '..' are reserved folder names."
#. To translators: This is the window title and %s is the
#. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:50 ../shell/e-shell-window.c:342
+#: ../shell/e-shell-view.c:50 ../shell/e-shell-window.c:343
#, c-format
msgid "%s - Evolution"
msgstr "%s - Evolution"
-#: ../shell/e-shell-window-commands.c:77
+#: ../shell/e-shell-window-commands.c:75
msgid "The GNOME Pilot tools do not appear to be installed on this system."
msgstr "The GNOME Pilot tools do not appear to be installed on this system."
-#: ../shell/e-shell-window-commands.c:85
+#: ../shell/e-shell-window-commands.c:83
#, c-format
msgid "Error executing %s."
msgstr "Error executing %s."
-#: ../shell/e-shell-window-commands.c:141
+#: ../shell/e-shell-window-commands.c:139
msgid "Bug buddy is not installed."
msgstr "Bug buddy is not installed."
-#: ../shell/e-shell-window-commands.c:144
+#: ../shell/e-shell-window-commands.c:142
msgid "Bug buddy could not be run."
msgstr "Bug buddy could not be run."
#. The translator-credits string is for translators to list
#. * per-language credits for translation, displayed in the
#. * about dialog.
-#: ../shell/e-shell-window-commands.c:744
+#: ../shell/e-shell-window-commands.c:742
msgid "translator-credits"
msgstr ""
"Gareth Owen <gowen72@yahoo.com>\n"
"David Lodge <dave@cirt.net>"
-#: ../shell/e-shell-window-commands.c:755
+#: ../shell/e-shell-window-commands.c:753
msgid "Evolution Website"
msgstr "Evolution Website"
-#: ../shell/e-shell-window-commands.c:773
+#: ../shell/e-shell-window-commands.c:771
msgid "Error opening the FAQ webpage."
msgstr "Error opening the FAQ webpage."
-#: ../shell/e-shell-window-commands.c:970
+#: ../shell/e-shell-window-commands.c:968
msgid "_Work Online"
msgstr "_Work Online"
-#: ../shell/e-shell-window-commands.c:983 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:981 ../ui/evolution.xml.h:56
msgid "_Work Offline"
msgstr "_Work Offline"
-#: ../shell/e-shell-window-commands.c:996
+#: ../shell/e-shell-window-commands.c:994
msgid "Work Offline"
msgstr "Work Offline"
-#: ../shell/e-shell-window.c:382
+#: ../shell/e-shell-window.c:392
msgid "Evolution is currently online. Click on this button to work offline."
msgstr "Evolution is currently online. Click on this button to work offline."
-#: ../shell/e-shell-window.c:389
+#: ../shell/e-shell-window.c:399
msgid "Evolution is in the process of going offline."
msgstr "Evolution is in the process of going offline."
-#: ../shell/e-shell-window.c:396
+#: ../shell/e-shell-window.c:406
msgid "Evolution is currently offline. Click on this button to work online."
msgstr "Evolution is currently offline. Click on this button to work online."
-#: ../shell/e-shell-window.c:805
+#: ../shell/e-shell-window.c:815
#, c-format
msgid "Switch to %s"
msgstr "Switch to %s"
@@ -19224,7 +19733,7 @@ msgstr "Unknown system error."
msgid "%ld KB"
msgstr "%ld KB"
-#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:316
msgid "OK"
msgstr "OK"
@@ -19297,7 +19806,7 @@ msgstr ""
"importing external files into Evolution."
#. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:234
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -19332,7 +19841,7 @@ msgstr ""
"We hope that you enjoy the results of our hard work, and we\n"
"eagerly await your contributions!\n"
-#: ../shell/main.c:257
+#: ../shell/main.c:258
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -19340,19 +19849,19 @@ msgstr ""
"Thanks\n"
"The Evolution Team\n"
-#: ../shell/main.c:264
+#: ../shell/main.c:265
msgid "Do not tell me again"
msgstr "Do not tell me again"
-#: ../shell/main.c:314
+#: ../shell/main.c:315
msgid "Evolution Crash Detection"
msgstr "Evolution Crash Detection"
-#: ../shell/main.c:316
+#: ../shell/main.c:317
msgid "Ig_nore"
msgstr "Ig_nore"
-#: ../shell/main.c:331
+#: ../shell/main.c:332
#, no-c-format
msgid ""
"Evolution appears to have exited unexpectedly the last time it was\n"
@@ -19363,43 +19872,43 @@ msgstr ""
"run. As a precautionary measure, all preview panes will be hidden.\n"
"You can restore the preview panes from the View menu.\n"
-#: ../shell/main.c:342
+#: ../shell/main.c:343
msgid "_Do not show this message again"
msgstr "_Do not show this message again"
-#: ../shell/main.c:574
+#: ../shell/main.c:575
msgid "Start Evolution activating the specified component"
msgstr "Start Evolution activating the specified component"
-#: ../shell/main.c:578
+#: ../shell/main.c:579
msgid "Start in online mode"
msgstr "Start in online mode"
-#: ../shell/main.c:581
+#: ../shell/main.c:582
msgid "Forcibly shut down all Evolution components"
msgstr "Forcibly shut down all Evolution components"
-#: ../shell/main.c:585
+#: ../shell/main.c:586
msgid "Forcibly re-migrate from Evolution 1.4"
msgstr "Forcibly re-migrate from Evolution 1.4"
-#: ../shell/main.c:588
+#: ../shell/main.c:589
msgid "Send the debugging output of all components to a file."
msgstr "Send the debugging output of all components to a file."
-#: ../shell/main.c:590
+#: ../shell/main.c:591
msgid "Disable loading of any plugins."
msgstr "Disable loading of any plugins."
-#: ../shell/main.c:592
+#: ../shell/main.c:593
msgid "Disable preview pane of Mail, Contacts and Tasks."
msgstr "Disable preview pane of Mail, Contacts and Tasks."
-#: ../shell/main.c:677
+#: ../shell/main.c:678
msgid "- The Evolution PIM and Email Client"
-msgstr "- The Evolution PIM and Email Client"
+msgstr "- The Evolution PIM and E-mail Client"
-#: ../shell/main.c:694
+#: ../shell/main.c:706
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -19619,7 +20128,7 @@ msgstr "Expires"
#: ../smime/gui/certificate-manager.c:389
msgid "All email certificate files"
-msgstr "All email certificate files"
+msgstr "All e-mail certificate files"
#: ../smime/gui/certificate-manager.c:489
msgid "E-Mail Address"
@@ -19634,6 +20143,11 @@ msgstr "All CA certificate files"
msgid "Certificate Viewer: %s"
msgstr "Certificate Viewer: %s"
+#: ../smime/gui/component.c:47
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "Enter the password for `%s'"
+
#. we're setting the password initially
#: ../smime/gui/component.c:70
msgid "Enter new password for certificate database"
@@ -19760,15 +20274,15 @@ msgstr "Edit"
#: ../smime/gui/smime-ui.glade.h:24
msgid "Email Certificate Trust Settings"
-msgstr "Email Certificate Trust Settings"
+msgstr "E-mail Certificate Trust Settings"
#: ../smime/gui/smime-ui.glade.h:25
msgid "Email Recipient Certificate"
-msgstr "Email Recipient Certificate"
+msgstr "E-mail Recipient Certificate"
#: ../smime/gui/smime-ui.glade.h:26
msgid "Email Signer Certificate"
-msgstr "Email Signer Certificate"
+msgstr "E-mail Signer Certificate"
#: ../smime/gui/smime-ui.glade.h:27
msgid "Expires On"
@@ -19812,7 +20326,7 @@ msgstr "Trust the authenticity of this certificate"
#: ../smime/gui/smime-ui.glade.h:39
msgid "Trust this CA to identify email users."
-msgstr "Trust this CA to identify email users."
+msgstr "Trust this CA to identify e-mail users."
#: ../smime/gui/smime-ui.glade.h:40
msgid "Trust this CA to identify software developers."
@@ -19820,7 +20334,7 @@ msgstr "Trust this CA to identify software developers."
#: ../smime/gui/smime-ui.glade.h:41
msgid "Trust this CA to identify web sites."
-msgstr "Trust this CA to identify web sites."
+msgstr "Trust this CA to identify websites."
#: ../smime/gui/smime-ui.glade.h:42
msgid "View"
@@ -19949,7 +20463,7 @@ msgstr "SSL Certificate Authority"
#: ../smime/lib/e-cert.c:839
msgid "Email Certificate Authority"
-msgstr "Email Certificate Authority"
+msgstr "E-mail Certificate Authority"
#: ../smime/lib/e-cert.c:867
msgid "Signing"
@@ -20057,8 +20571,7 @@ msgstr "Co_py All Contacts To..."
msgid "Contact _Preview"
msgstr "Contact _Preview"
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
#: ../ui/evolution-tasks.xml.h:2
msgid "Copy"
msgstr "Copy"
@@ -20081,10 +20594,9 @@ msgstr "Copy to Folder..."
#: ../ui/evolution-addressbook.xml.h:11
msgid "Create a new addressbook folder"
-msgstr "Create a new addressbook folder"
+msgstr "Create a new address book folder"
-#: ../ui/evolution-addressbook.xml.h:12
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
#: ../ui/evolution-tasks.xml.h:4
msgid "Cut"
msgstr "Cut"
@@ -20125,8 +20637,7 @@ msgstr "Move the contacts of the selected folder into another folder"
msgid "Move to Folder..."
msgstr "Move to Folder..."
-#: ../ui/evolution-addressbook.xml.h:23
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
#: ../ui/evolution-tasks.xml.h:11
msgid "Paste"
msgstr "Paste"
@@ -20163,13 +20674,11 @@ msgstr "Save selected contacts as a VCard."
msgid "Save the contacts of the selected folder as VCard"
msgstr "Save the contacts of the selected folder as VCard"
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2722
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
msgid "Select All"
msgstr "Select All"
-#: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:6
+#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-editor.xml.h:13
msgid "Select _All"
msgstr "Select _All"
@@ -20376,38 +20885,6 @@ msgstr "Work Week"
msgid "_Open Appointment"
msgstr "_Open Appointment"
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Copy selected text to the clipboard"
-
-#: ../ui/evolution-composer-entries.xml.h:3
-msgid "Copy selection to clipboard"
-msgstr "Copy selection to clipboard"
-
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "Cut selected text to the clipboard"
-
-#: ../ui/evolution-composer-entries.xml.h:7
-msgid "Cut selection to clipboard"
-msgstr "Cut selection to clipboard"
-
-#: ../ui/evolution-composer-entries.xml.h:9
-msgid "Paste from clipboard"
-msgstr "Paste from clipboard"
-
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "Paste text from the clipboard"
-
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Select all text"
-
-#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Attach"
-
#: ../ui/evolution-editor.xml.h:2
msgid "Click here to attach a file"
msgstr "Click here to attach a file"
@@ -20424,37 +20901,29 @@ msgstr "Click here to save the current window"
msgid "Click here to view help available"
msgstr "Click here to view help available"
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:3
-#: ../ui/evolution-signature-editor.xml.h:7
msgid "Close"
msgstr "Close"
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
+#: ../ui/evolution-editor.xml.h:7
+msgid "Copy selected text to the clipboard"
+msgstr "Copy selected text to the clipboard"
+
+#: ../ui/evolution-editor.xml.h:9
+msgid "Cut selected text to the clipboard"
+msgstr "Cut selected text to the clipboard"
+
+#: ../ui/evolution-editor.xml.h:10
msgid "I_nsert"
msgstr "I_nsert"
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
-msgid "_Attachment..."
-msgstr "_Attachment..."
-
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:50 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "_Close"
+#: ../ui/evolution-editor.xml.h:11
+msgid "Paste text from the clipboard"
+msgstr "Paste text from the clipboard"
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:53
-#: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "_File"
+#: ../ui/evolution-editor.xml.h:14
+msgid "Select all text"
+msgstr "Select all text"
#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
#: ../ui/evolution.xml.h:45
@@ -20631,7 +21100,6 @@ msgid "Empty _Trash"
msgstr "Empty Wastebaske_t"
#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-#: ../ui/evolution-subscribe.xml.h:2
msgid "F_older"
msgstr "F_older"
@@ -21190,11 +21658,11 @@ msgstr "Show messages in the normal style"
#: ../ui/evolution-mail-message.xml.h:96
msgid "Show messages with all email headers"
-msgstr "Show messages with all email headers"
+msgstr "Show messages with all e-mail headers"
#: ../ui/evolution-mail-message.xml.h:97
msgid "Show the raw email source of the message"
-msgstr "Show the raw email source of the message"
+msgstr "Show the raw e-mail source of the message"
#: ../ui/evolution-mail-message.xml.h:98
msgid "Undelete the selected messages"
@@ -21305,10 +21773,6 @@ msgstr "_Zoom"
msgid "_Zoom In"
msgstr "_Zoom In"
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Close this window"
-
#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
msgid "Main toolbar"
msgstr "Main toolbar"
@@ -21345,274 +21809,6 @@ msgstr "View the selected memo"
msgid "_Open Memo"
msgstr "_Open Memo"
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Attach a file"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:13
-msgid "Close the current file"
-msgstr "Close the current file"
-
-#: ../ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "Delete all but signature"
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "Encrypt this message with PGP"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "Encrypt this message with your S/MIME Encryption Certificate"
-
-#: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "For_mat"
-
-#: ../ui/evolution-message-composer.xml.h:9
-msgid "Get delivery notification when your message is read"
-msgstr "Get delivery notification when your message is read"
-
-#: ../ui/evolution-message-composer.xml.h:10
-msgid "HT_ML"
-msgstr "HT_ML"
-
-#: ../ui/evolution-message-composer.xml.h:12
-msgid "Insert Send options"
-msgstr "Insert Send options"
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "Open a file"
-msgstr "Open a file"
-
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "PGP Encrypt"
-msgstr "PGP Encrypt"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "PGP Sign"
-msgstr "PGP Sign"
-
-#: ../ui/evolution-message-composer.xml.h:17
-msgid "PGP _Encrypt"
-msgstr "PGP _Encrypt"
-
-#: ../ui/evolution-message-composer.xml.h:18
-msgid "PGP _Sign"
-msgstr "PGP _Sign"
-
-#: ../ui/evolution-message-composer.xml.h:19
-msgid "R_equest Read Receipt"
-msgstr "R_equest Read Receipt"
-
-#: ../ui/evolution-message-composer.xml.h:20
-msgid "S/MIME En_crypt"
-msgstr "S/MIME En_crypt"
-
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "S/MIME Encrypt"
-msgstr "S/MIME Encrypt"
-
-#: ../ui/evolution-message-composer.xml.h:22
-msgid "S/MIME Sig_n"
-msgstr "S/MIME Sig_n"
-
-#: ../ui/evolution-message-composer.xml.h:23
-msgid "S/MIME Sign"
-msgstr "S/MIME Sign"
-
-#: ../ui/evolution-message-composer.xml.h:24
-msgid "S_end"
-msgstr "S_end"
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save As"
-msgstr "Save As"
-
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Save Draft"
-msgstr "Save Draft"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Save _As..."
-msgstr "Save _As..."
-
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Save _Draft"
-msgstr "Save _Draft"
-
-#: ../ui/evolution-message-composer.xml.h:30
-msgid "Save as draft"
-msgstr "Save as draft"
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Save in folder..."
-msgstr "Save in folder..."
-
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Save the current file"
-msgstr "Save the current file"
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Save the current file with a different name"
-msgstr "Save the current file with a different name"
-
-#: ../ui/evolution-message-composer.xml.h:34
-msgid "Save the message in a specified folder"
-msgstr "Save the message in a specified folder"
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Send"
-msgstr "Send"
-
-#: ../ui/evolution-message-composer.xml.h:36
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "Send the mail in HTML format"
-
-#: ../ui/evolution-message-composer.xml.h:37
-msgid "Send this message"
-msgstr "Send this message"
-
-#: ../ui/evolution-message-composer.xml.h:38
-msgid "Set the message priority to high"
-msgstr "Set the message priority to high"
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "Sign this message with your PGP key"
-msgstr "Sign this message with your PGP key"
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "Sign this message with your S/MIME Signature Certificate"
-
-#: ../ui/evolution-message-composer.xml.h:41
-msgid "Toggles whether the BCC field is displayed"
-msgstr "Toggles whether the BCC field is displayed"
-
-#: ../ui/evolution-message-composer.xml.h:42
-msgid "Toggles whether the CC field is displayed"
-msgstr "Toggles whether the CC field is displayed"
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "Toggles whether the From chooser is displayed"
-msgstr "Toggles whether the From chooser is displayed"
-
-#: ../ui/evolution-message-composer.xml.h:44
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "Toggles whether the Post-To field is displayed"
-
-#: ../ui/evolution-message-composer.xml.h:45
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "Toggles whether the Reply-To field is displayed"
-
-#: ../ui/evolution-message-composer.xml.h:46
-msgid "Toggles whether the To field is displayed"
-msgstr "Toggles whether the To field is displayed"
-
-#: ../ui/evolution-message-composer.xml.h:48
-msgid "_Bcc Field"
-msgstr "_Bcc Field"
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Cc Field"
-msgstr "_Cc Field"
-
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Delete all"
-msgstr "_Delete all"
-
-#: ../ui/evolution-message-composer.xml.h:54
-msgid "_From Field"
-msgstr "_From Field"
-
-#: ../ui/evolution-message-composer.xml.h:55
-msgid "_Open..."
-msgstr "_Open..."
-
-#: ../ui/evolution-message-composer.xml.h:56
-msgid "_Post-To Field"
-msgstr "_Post-To Field"
-
-#: ../ui/evolution-message-composer.xml.h:57
-msgid "_Prioritize Message"
-msgstr "_Prioritise Message"
-
-#: ../ui/evolution-message-composer.xml.h:58
-msgid "_Reply-To Field"
-msgstr "_Reply-To Field"
-
-#: ../ui/evolution-message-composer.xml.h:60
-msgid "_Security"
-msgstr "_Security"
-
-#: ../ui/evolution-message-composer.xml.h:61
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "_Send Options"
-
-#: ../ui/evolution-message-composer.xml.h:62
-msgid "_To Field"
-msgstr "_To Field"
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "C_lose"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "H_TML"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "Save and Close"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "Save and _Close"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "Save the current file and close the window"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Add folder to your list of subscribed folders"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "Refresh List"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "Refresh List of Folders"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Remove folder from your list of subscribed folders"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "Subscribe"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "Unsubscribe"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Invert Selection"
-
#: ../ui/evolution-task-editor.xml.h:4
msgid "Click change / view the status details of the task"
msgstr "Click change / view the status details of the task"
@@ -21963,8 +22159,8 @@ msgid "Select a Time Zone"
msgstr "Select a Time Zone"
#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-msgid "TimeZone Combobox"
-msgstr "TimeZone Combobox"
+msgid "Timezone drop-down combination box"
+msgstr "Timezone drop-down combination box"
#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
msgid ""
@@ -21998,7 +22194,7 @@ msgid "Define Views for \"%s\""
msgstr "Define Views for \"%s\""
#: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-header-item.c:1922
#: ../widgets/table/e-table-scrolled.c:216
#: ../widgets/table/e-table-scrolled.c:217
msgid "Table"
@@ -22080,17 +22276,43 @@ msgstr "Type of View"
msgid "Type of view:"
msgstr "Type of view:"
-#: ../widgets/misc/e-attachment-bar.c:1028
+#: ../widgets/misc/e-attachment-bar.c:103
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u byte"
+msgstr[1] "%u bytes"
+
+#: ../widgets/misc/e-attachment-bar.c:109
+#, c-format
+msgid "%.1f KB"
+msgstr "%.1f KB"
+
+#: ../widgets/misc/e-attachment-bar.c:112
+#, c-format
+msgid "%.1f MB"
+msgstr "%.1f MB"
+
+#: ../widgets/misc/e-attachment-bar.c:115
+#, c-format
+msgid "%.1f GB"
+msgstr "%.1f GB"
+
+#: ../widgets/misc/e-attachment-bar.c:1058
msgid "Attachment Bar"
msgstr "Attachment Bar"
-#: ../widgets/misc/e-attachment.c:317 ../widgets/misc/e-attachment.c:332
-#: ../widgets/misc/e-attachment.c:533 ../widgets/misc/e-attachment.c:550
+#: ../widgets/misc/e-attachment-bar.c:1304
+msgid "Recent Docu_ments"
+msgstr "Recent Docu_ments"
+
+#: ../widgets/misc/e-attachment.c:296 ../widgets/misc/e-attachment.c:311
+#: ../widgets/misc/e-attachment.c:596 ../widgets/misc/e-attachment.c:613
#, c-format
msgid "Cannot attach file %s: %s"
msgstr "Cannot attach file %s: %s"
-#: ../widgets/misc/e-attachment.c:325 ../widgets/misc/e-attachment.c:542
+#: ../widgets/misc/e-attachment.c:304 ../widgets/misc/e-attachment.c:605
#, c-format
msgid "Cannot attach file %s: not a regular file"
msgstr "Cannot attach file %s: not a regular file"
@@ -22112,7 +22334,7 @@ msgid "Suggest automatic display of attachment"
msgstr "Suggest automatic display of attachment"
#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1099
+#: ../widgets/misc/e-calendar-item.c:1278
msgid "%B %Y"
msgstr "%B %Y"
@@ -22121,23 +22343,23 @@ msgid "Month Calendar"
msgstr "Month Calendar"
#: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3642
-#: ../widgets/text/e-text.c:3643
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
+#: ../widgets/text/e-text.c:3644
msgid "Fill color"
msgstr "Fill colour"
#: ../widgets/misc/e-canvas-background.c:460
#: ../widgets/misc/e-canvas-background.c:461
#: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3649
-#: ../widgets/text/e-text.c:3650 ../widgets/text/e-text.c:3657
-#: ../widgets/text/e-text.c:3658
+#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3650
+#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
+#: ../widgets/text/e-text.c:3659
msgid "GDK fill color"
msgstr "GDK fill colour"
#: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3664
-#: ../widgets/text/e-text.c:3665
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3666
msgid "Fill stipple"
msgstr "Fill stipple"
@@ -22180,11 +22402,11 @@ msgstr "Minimum Width"
msgid "Spacing"
msgstr "Spacing"
-#: ../widgets/misc/e-cell-date-edit.c:231
+#: ../widgets/misc/e-cell-date-edit.c:292
msgid "Now"
msgstr "Now"
-#: ../widgets/misc/e-cell-date-edit.c:795
+#: ../widgets/misc/e-cell-date-edit.c:849
#, c-format
msgid "The time must be in the format: %s"
msgstr "The time must be in the format: %s"
@@ -22193,100 +22415,98 @@ msgstr "The time must be in the format: %s"
msgid "The percent value must be between 0 and 100, inclusive"
msgstr "The percent value must be between 0 and 100, inclusive"
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:56
msgid "Arabic"
msgstr "Arabic"
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:57
msgid "Baltic"
msgstr "Baltic"
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:58
msgid "Central European"
msgstr "Central European"
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:59
msgid "Chinese"
msgstr "Chinese"
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:60
msgid "Cyrillic"
msgstr "Cyrillic"
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:61
msgid "Greek"
msgstr "Greek"
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:62
msgid "Hebrew"
msgstr "Hebrew"
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:63
msgid "Japanese"
msgstr "Japanese"
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:64
msgid "Korean"
msgstr "Korean"
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:65
msgid "Thai"
msgstr "Thai"
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:66
msgid "Turkish"
msgstr "Turkish"
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:67
msgid "Unicode"
msgstr "Unicode"
-#: ../widgets/misc/e-charset-picker.c:77
+#: ../widgets/misc/e-charset-picker.c:68
msgid "Western European"
msgstr "Western European"
-#: ../widgets/misc/e-charset-picker.c:78
+#: ../widgets/misc/e-charset-picker.c:69
msgid "Western European, New"
msgstr "Western European, New"
-#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
-#: ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c:88 ../widgets/misc/e-charset-picker.c:89
+#: ../widgets/misc/e-charset-picker.c:90
msgid "Traditional"
msgstr "Traditional"
-#: ../widgets/misc/e-charset-picker.c:100
-#: ../widgets/misc/e-charset-picker.c:101
-#: ../widgets/misc/e-charset-picker.c:102
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
msgid "Simplified"
msgstr "Simplified"
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:97
msgid "Ukrainian"
msgstr "Ukrainian"
-#: ../widgets/misc/e-charset-picker.c:109
+#: ../widgets/misc/e-charset-picker.c:100
msgid "Visual"
msgstr "Visual"
-#: ../widgets/misc/e-charset-picker.c:178
+#: ../widgets/misc/e-charset-picker.c:169
#, c-format
msgid "Unknown character set: %s"
msgstr "Unknown character set: %s"
-#: ../widgets/misc/e-charset-picker.c:223
+#: ../widgets/misc/e-charset-picker.c:214
msgid "Character Encoding"
msgstr "Character Encoding"
-#: ../widgets/misc/e-charset-picker.c:238
+#: ../widgets/misc/e-charset-picker.c:229
msgid "Enter the character set to use"
msgstr "Enter the character set to use"
-#: ../widgets/misc/e-charset-picker.c:345
+#: ../widgets/misc/e-charset-picker.c:336
msgid "Other..."
msgstr "Other..."
-#: ../widgets/misc/e-charset-picker.c:486
+#: ../widgets/misc/e-charset-picker.c:598
msgid "Ch_aracter Encoding"
msgstr "Ch_aracter Encoding"
@@ -22303,22 +22523,22 @@ msgid "Click this button to show a calendar"
msgstr "Click this button to show a calendar"
#: ../widgets/misc/e-dateedit.c:409
-msgid "Combo box to select time"
-msgstr "Combo box to select time"
+msgid "Drop-down combination box to select time"
+msgstr "Drop-down combination box to select time"
-#: ../widgets/misc/e-dateedit.c:484
+#: ../widgets/misc/e-dateedit.c:486
msgid "No_w"
msgstr "No_w"
-#: ../widgets/misc/e-dateedit.c:490
+#: ../widgets/misc/e-dateedit.c:492
msgid "_Today"
msgstr "_Today"
-#: ../widgets/misc/e-dateedit.c:1655
+#: ../widgets/misc/e-dateedit.c:1657
msgid "Invalid Date Value"
msgstr "Invalid Date Value"
-#: ../widgets/misc/e-dateedit.c:1684
+#: ../widgets/misc/e-dateedit.c:1686
msgid "Invalid Time Value"
msgstr "Invalid Time Value"
@@ -22358,11 +22578,11 @@ msgstr "Label widget"
msgid "A widget to display in place of the usual expander label"
msgstr "A widget to display in place of the usual expander label"
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3356
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3369
msgid "Expander Size"
msgstr "Expander Size"
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3357
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3370
msgid "Size of the expander arrow"
msgstr "Size of the expander arrow"
@@ -22376,7 +22596,7 @@ msgstr "Spacing around expander arrow"
#. FIXME: get the toplevel window...
#: ../widgets/misc/e-filter-bar.c:130 ../widgets/misc/e-filter-bar.c:183
-#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:748
+#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:753
msgid "Advanced Search"
msgstr "Advanced Search"
@@ -22425,17 +22645,17 @@ msgstr "Current Message"
msgid "Choose Image"
msgstr "Choose Image"
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:627
msgid "World Map"
msgstr "World Map"
-#: ../widgets/misc/e-map.c:628
+#: ../widgets/misc/e-map.c:629
msgid ""
"Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should select the timezone from the below combo box instead."
+"should instead select the timezone from the drop-down combination box below."
msgstr ""
"Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should select the timezone from the below combo box instead."
+"should instead select the timezone from the drop-down combination box below."
#: ../widgets/misc/e-pilot-settings.c:103
msgid "Sync with:"
@@ -22487,8 +22707,8 @@ msgstr "_Clear"
msgid "Item ID"
msgstr "Item ID"
-#: ../widgets/misc/e-search-bar.c:884 ../widgets/text/e-text.c:3564
-#: ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:884 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
msgid "Text"
msgstr "Text"
@@ -22640,27 +22860,28 @@ msgstr "_After:"
msgid "_All information"
msgstr "_All information"
-#: ../widgets/misc/e-send-options.glade.h:31
+#. To translators: This means Delay the message delivery for some time
+#: ../widgets/misc/e-send-options.glade.h:32
msgid "_Delay message delivery"
msgstr "_Delay message delivery"
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:33
msgid "_Delivered"
msgstr "_Delivered"
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:35
msgid "_Set expiration date"
msgstr "_Set expiration date"
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:36
msgid "_Until:"
msgstr "_Until:"
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:37
msgid "_When convenient"
msgstr "_When convenient"
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:38
msgid "_When opened:"
msgstr "_When opened:"
@@ -22697,7 +22918,7 @@ msgstr "_Available Categories:"
msgid "categories"
msgstr "categories"
-#: ../widgets/table/e-cell-combo.c:169
+#: ../widgets/table/e-cell-combo.c:170
msgid "popup list"
msgstr "popup list"
@@ -22717,23 +22938,23 @@ msgstr "Focused Column"
msgid "Unselected Column"
msgstr "Unselected Column"
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1808
msgid "Strikeout Column"
msgstr "Strikeout Column"
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1815
msgid "Underline Column"
msgstr "Underline Column"
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1822
msgid "Bold Column"
msgstr "Bold Column"
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1829
msgid "Color Column"
msgstr "Colour Column"
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1843
msgid "BG Color Column"
msgstr "BG Colour Column"
@@ -22771,7 +22992,7 @@ msgid "A_vailable Fields:"
msgstr "A_vailable Fields:"
#: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
msgid "Ascending"
msgstr "Ascending"
@@ -22784,7 +23005,7 @@ msgid "Clear _All"
msgstr "Clear _All"
#: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
msgid "Descending"
msgstr "Descending"
@@ -22847,14 +23068,14 @@ msgstr "_Sort..."
#: ../widgets/table/e-table-field-chooser-dialog.c:67
#: ../widgets/table/e-table-field-chooser-item.c:634
#: ../widgets/table/e-table-field-chooser.c:67
-#: ../widgets/table/e-table-header-item.c:1886
+#: ../widgets/table/e-table-header-item.c:1887
msgid "DnD code"
msgstr "DnD code"
#: ../widgets/table/e-table-field-chooser-dialog.c:74
#: ../widgets/table/e-table-field-chooser-item.c:641
#: ../widgets/table/e-table-field-chooser.c:74
-#: ../widgets/table/e-table-header-item.c:1900
+#: ../widgets/table/e-table-header-item.c:1901
msgid "Full Header"
msgstr "Full Header"
@@ -22901,7 +23122,7 @@ msgstr "Alternating Row Colours"
#: ../widgets/table/e-table-group-leaf.c:579
#: ../widgets/table/e-table-group-leaf.c:580
#: ../widgets/table/e-table-item.c:3036 ../widgets/table/e-table-item.c:3037
-#: ../widgets/table/e-tree.c:3309 ../widgets/table/e-tree.c:3310
+#: ../widgets/table/e-tree.c:3322 ../widgets/table/e-tree.c:3323
msgid "Horizontal Draw Grid"
msgstr "Horizontal Draw Grid"
@@ -22910,7 +23131,7 @@ msgstr "Horizontal Draw Grid"
#: ../widgets/table/e-table-group-leaf.c:586
#: ../widgets/table/e-table-group-leaf.c:587
#: ../widgets/table/e-table-item.c:3043 ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-tree.c:3315 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
msgid "Vertical Draw Grid"
msgstr "Vertical Draw Grid"
@@ -22919,7 +23140,7 @@ msgstr "Vertical Draw Grid"
#: ../widgets/table/e-table-group-leaf.c:593
#: ../widgets/table/e-table-group-leaf.c:594
#: ../widgets/table/e-table-item.c:3050 ../widgets/table/e-table-item.c:3051
-#: ../widgets/table/e-tree.c:3321 ../widgets/table/e-tree.c:3322
+#: ../widgets/table/e-tree.c:3334 ../widgets/table/e-tree.c:3335
msgid "Draw focus"
msgstr "Draw focus"
@@ -22944,8 +23165,8 @@ msgstr "Selection model"
#: ../widgets/table/e-table-group-leaf.c:607
#: ../widgets/table/e-table-group-leaf.c:608
#: ../widgets/table/e-table-item.c:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3303
-#: ../widgets/table/e-tree.c:3304
+#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-tree.c:3317
msgid "Length Threshold"
msgstr "Length Threshold"
@@ -22954,8 +23175,8 @@ msgstr "Length Threshold"
#: ../widgets/table/e-table-group-leaf.c:649
#: ../widgets/table/e-table-group-leaf.c:650
#: ../widgets/table/e-table-item.c:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3335
-#: ../widgets/table/e-tree.c:3336
+#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3348
+#: ../widgets/table/e-tree.c:3349
msgid "Uniform row height"
msgstr "Uniform row height"
@@ -22966,73 +23187,73 @@ msgstr "Uniform row height"
msgid "Frozen"
msgstr "Frozen"
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1453
msgid "Customize Current View"
msgstr "Customise Current View"
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1473
msgid "Sort _Ascending"
msgstr "Sort _Ascending"
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1474
msgid "Sort _Descending"
msgstr "Sort _Descending"
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1475
msgid "_Unsort"
msgstr "_Unsort"
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1477
msgid "Group By This _Field"
msgstr "Group By This _Field"
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1478
msgid "Group By _Box"
msgstr "Group By _Box"
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1480
msgid "Remove This _Column"
msgstr "Remove This _Column"
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1481
msgid "Add a C_olumn..."
msgstr "Add a C_olumn..."
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1483
msgid "A_lignment"
msgstr "A_lignment"
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1484
msgid "B_est Fit"
msgstr "B_est Fit"
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1485
msgid "Format Column_s..."
msgstr "Format Column_s..."
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1487
msgid "Custo_mize Current View..."
msgstr "Custo_mise Current View..."
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1543
msgid "_Sort By"
msgstr "_Sort By"
#. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1561
msgid "_Custom"
msgstr "_Custom"
-#: ../widgets/table/e-table-header-item.c:1893
+#: ../widgets/table/e-table-header-item.c:1894
msgid "Font Description"
msgstr "Font Description"
-#: ../widgets/table/e-table-header-item.c:1914
+#: ../widgets/table/e-table-header-item.c:1915
#: ../widgets/table/e-table-sorter.c:173
msgid "Sort Info"
msgstr "Sort Info"
-#: ../widgets/table/e-table-header-item.c:1928
+#: ../widgets/table/e-table-header-item.c:1929
#: ../widgets/table/e-tree-scrolled.c:225
#: ../widgets/table/e-tree-scrolled.c:226
msgid "Tree"
@@ -23050,8 +23271,8 @@ msgstr "Table model"
msgid "Cursor row"
msgstr "Cursor row"
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3342
-#: ../widgets/table/e-tree.c:3343
+#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3355
+#: ../widgets/table/e-tree.c:3356
msgid "Always search"
msgstr "Always search"
@@ -23059,122 +23280,288 @@ msgstr "Always search"
msgid "Use click to add"
msgstr "Use click to add"
-#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
+#: ../widgets/table/e-tree.c:3341 ../widgets/table/e-tree.c:3342
msgid "ETree table adapter"
msgstr "ETree table adapter"
-#: ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-tree.c:3362
msgid "Retro Look"
msgstr "Retro Look"
-#: ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-tree.c:3363
msgid "Draw lines and +/- expanders."
msgstr "Draw lines and +/- expanders."
-#: ../widgets/text/e-text.c:2734
+#: ../widgets/text/e-text.c:2735
msgid "Input Methods"
msgstr "Input Methods"
-#: ../widgets/text/e-text.c:3557 ../widgets/text/e-text.c:3558
+#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
msgid "Event Processor"
msgstr "Event Processor"
-#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
msgid "Bold"
msgstr "Bold"
-#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
msgid "Strikeout"
msgstr "Strikeout"
-#: ../widgets/text/e-text.c:3585 ../widgets/text/e-text.c:3586
+#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
msgid "Anchor"
msgstr "Anchor"
-#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
msgid "Justification"
msgstr "Justification"
-#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
msgid "Clip Width"
msgstr "Clip Width"
-#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
msgid "Clip Height"
msgstr "Clip Height"
-#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
msgid "Clip"
msgstr "Clip"
-#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
msgid "Fill clip rectangle"
msgstr "Fill clip rectangle"
-#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
msgid "X Offset"
msgstr "X Offset"
-#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
msgid "Y Offset"
msgstr "Y Offset"
-#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
msgid "Text width"
msgstr "Text width"
-#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
msgid "Text height"
msgstr "Text height"
-#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
msgid "Use ellipsis"
msgstr "Use ellipsis"
-#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
msgid "Ellipsis"
msgstr "Ellipsis"
-#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
msgid "Line wrap"
msgstr "Line wrap"
-#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
msgid "Break characters"
msgstr "Break characters"
-#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
+#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
msgid "Max lines"
msgstr "Max lines"
-#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
msgid "Draw borders"
msgstr "Draw borders"
-#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
msgid "Allow newlines"
msgstr "Allow newlines"
-#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
msgid "Draw background"
msgstr "Draw background"
-#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
msgid "Draw button"
msgstr "Draw button"
-#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
msgid "Cursor position"
msgstr "Cursor position"
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
msgid "IM Context"
msgstr "IM Context"
-#: ../widgets/text/e-text.c:3785 ../widgets/text/e-text.c:3786
+#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
msgid "Handle Popup"
msgstr "Handle Popup"
+#~ msgid "Permission Denied."
+#~ msgstr "Permission Denied."
+
+#~ msgid "<b>Display</b>"
+#~ msgstr "<b>Display</b>"
+
+#~ msgid "<b>Server Information</b>"
+#~ msgstr "<b>Server Information</b>"
+
+#~ msgid "Unknown reason"
+#~ msgstr "Unknown reason"
+
+#~ msgid "Open File"
+#~ msgstr "Open File"
+
+#~ msgid "Cannot open file &quot;{0}&quot;."
+#~ msgstr "Cannot open file &quot;{0}&quot;."
+
+#~ msgid "Attach original message"
+#~ msgstr "Attach original message"
+
+#~ msgid "Do not quote original message"
+#~ msgstr "Do not quote original message"
+
+#~ msgid "Quote original message"
+#~ msgstr "Quote original message"
+
+#~ msgid "Enter a name for this signature."
+#~ msgstr "Enter a name for this signature."
+
+#~ msgid "Name:"
+#~ msgstr "Name:"
+
+#~ msgid ""
+#~ "Are you sure you want to permanently remove all the deleted messages in "
+#~ "folder &quot;{0}&quot;?"
+#~ msgstr ""
+#~ "Are you sure you want to permanently remove all the deleted messages in "
+#~ "folder &quot;{0}&quot;?"
+
+#~ msgid "Delete &quot;{0}&quot;?"
+#~ msgstr "Delete &quot;{0}&quot;?"
+
+#~ msgid "Delete messages in Search Folder &quot;{0}&quot;?"
+#~ msgstr "Delete messages in Search Folder &quot;{0}&quot;?"
+
+#~ msgid "Only on _Current Folder"
+#~ msgstr "Only on _Current Folder"
+
+#~ msgid "Enable attachment reminder plugin"
+#~ msgstr "Enable attachment reminder plugin"
+
+#~ msgid "Enable attachment reminder plugin."
+#~ msgstr "Enable attachment reminder plugin."
+
+#~ msgid "Remind _missing attachments"
+#~ msgstr "Remind _missing attachments"
+
+#~ msgid "_Continue Editing"
+#~ msgstr "_Continue Editing"
+
+#~ msgid "_Refresh:"
+#~ msgstr "_Refresh:"
+
+#~ msgid "Gives an option to print from the composer."
+#~ msgstr "Gives an option to print from the composer."
+
+#~ msgid "Print Message"
+#~ msgstr "Print Message"
+
+#~ msgid "Prints the message"
+#~ msgstr "Prints the message"
+
+#~ msgid "Copy selection to clipboard"
+#~ msgstr "Copy selection to clipboard"
+
+#~ msgid "Cut selection to clipboard"
+#~ msgstr "Cut selection to clipboard"
+
+#~ msgid "Paste from clipboard"
+#~ msgstr "Paste from clipboard"
+
+#~ msgid "Delete all but signature"
+#~ msgstr "Delete all but signature"
+
+#~ msgid "For_mat"
+#~ msgstr "For_mat"
+
+#~ msgid "HT_ML"
+#~ msgstr "HT_ML"
+
+#~ msgid "Open a file"
+#~ msgstr "Open a file"
+
+#~ msgid "PGP Encrypt"
+#~ msgstr "PGP Encrypt"
+
+#~ msgid "PGP Sign"
+#~ msgstr "PGP Sign"
+
+#~ msgid "S/MIME Encrypt"
+#~ msgstr "S/MIME Encrypt"
+
+#~ msgid "S/MIME Sign"
+#~ msgstr "S/MIME Sign"
+
+#~ msgid "Save As"
+#~ msgstr "Save As"
+
+#~ msgid "Save Draft"
+#~ msgstr "Save Draft"
+
+#~ msgid "Save in folder..."
+#~ msgstr "Save in folder..."
+
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "Save the message in a specified folder"
+
+#~ msgid "Send"
+#~ msgstr "Send"
+
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "Send the mail in HTML format"
+
+#~ msgid "_Delete all"
+#~ msgstr "_Delete all"
+
+#~ msgid "_Open..."
+#~ msgstr "_Open..."
+
+#~ msgid "C_lose"
+#~ msgstr "C_lose"
+
+#~ msgid "H_TML"
+#~ msgstr "H_TML"
+
+#~ msgid "Save and _Close"
+#~ msgstr "Save and _Close"
+
+#~ msgid "Save the current file and close the window"
+#~ msgstr "Save the current file and close the window"
+
+#~ msgid "Add folder to your list of subscribed folders"
+#~ msgstr "Add folder to your list of subscribed folders"
+
+#~ msgid "Refresh List"
+#~ msgstr "Refresh List"
+
+#~ msgid "Refresh List of Folders"
+#~ msgstr "Refresh List of Folders"
+
+#~ msgid "Remove folder from your list of subscribed folders"
+#~ msgstr "Remove folder from your list of subscribed folders"
+
+#~ msgid "Subscribe"
+#~ msgstr "Subscribe"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "Unsubscribe"
+
+#~ msgid "_Invert Selection"
+#~ msgstr "_Invert Selection"
+
+#~ msgid "TimeZone Combobox"
+#~ msgstr "TimeZone Combobox"
+
#~ msgid "A Folder with this name already exists"
#~ msgstr "A Folder with this name already exists"
@@ -23355,12 +23742,6 @@ msgstr "Handle Popup"
#~ msgid "%.0fK"
#~ msgstr "%.0fK"
-#~ msgid "%.0fM"
-#~ msgstr "%.0fM"
-
-#~ msgid "%.0fG"
-#~ msgstr "%.0fG"
-
#~ msgid "Post To:"
#~ msgstr "Post To:"
@@ -23541,9 +23922,6 @@ msgstr "Handle Popup"
#~ msgid "System error: %s"
#~ msgstr "System error: %s"
-#~ msgid "Camel error: %s"
-#~ msgstr "Camel error: %s"
-
#~ msgid "Account cannot send e-mail"
#~ msgstr "Account cannot send e-mail"
@@ -24054,13 +24432,6 @@ msgstr "Handle Popup"
#~ msgid "_Subscribe"
#~ msgstr "_Subscribe"
-#~ msgid ""
-#~ "Unable to create output file: %s\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Unable to create output file: %s\n"
-#~ " %s"
-
#~ msgid "Server: %s, Type: %s"
#~ msgstr "Server: %s, Type: %s"