[evolution-data-server] Updated British English translation



commit 2ad30477d12f951d354d2071096f492796f5aba3
Author: Chris Leonard <cjl laptop org>
Date:   Sat Sep 1 01:18:40 2012 +0100

    Updated British English translation

 po/en_GB.po | 3130 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 1755 insertions(+), 1375 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 40212ee..b01c142 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,12 +4,13 @@
 # Gareth Owen <gowen72 yahoo com>, David Lodge <dave cirt net>, 2004.
 # Philip Withnall <philip tecnocode co uk>, 2009, 2010.
 # Bruce Cowan <bruce bcowan me uk>, 2010, 2011, 2012.
+# Chris Leonard <cjl laptop org>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-09 13:49+0000\n"
-"PO-Revision-Date: 2012-03-09 13:51+0100\n"
+"POT-Creation-Date: 2012-09-01 01:16+0100\n"
+"PO-Revision-Date: 2012-09-01 01:18+0100\n"
 "Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
 "Language-Team: British English <en li org>\n"
 "Language: en_GB\n"
@@ -18,207 +19,266 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.7.1\n"
+"X-Project-Style: gnome\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:129
+#: ../addressbook/backends/file/e-book-backend-file.c:116
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1232
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4785
 #: ../addressbook/backends/webdav/e-book-backend-webdav.c:278
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:939
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:931
 #: ../addressbook/libebook/e-book-client.c:106
-#: ../addressbook/libedata-book/e-data-book.c:441
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:548
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:577
-#: ../calendar/backends/http/e-cal-backend-http.c:424
-#: ../calendar/libecal/e-cal.c:4597 ../calendar/libecal/e-cal-client.c:150
-#: ../camel/providers/imap/camel-imap-command.c:515
-#: ../camel/providers/imap/camel-imap-store.c:464
-#: ../camel/providers/imapx/camel-imapx-command.c:538
-#: ../libedataserver/e-client.c:166
+#: ../addressbook/libedata-book/e-data-book.c:432
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:570
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:600
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:619
+#: ../calendar/libecal/e-cal.c:4033 ../calendar/libecal/e-cal-client.c:148
+#: ../camel/camel-imapx-command.c:594
+#: ../camel/providers/imap/camel-imap-command.c:524
+#: ../camel/providers/imap/camel-imap-store.c:468
+#: ../libedataserver/e-client.c:165
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:154
+#: ../addressbook/backends/file/e-book-backend-file.c:141
 #, c-format
 msgid "Failed to remove file '%s': %s"
 msgstr "Failed to remove file '%s': %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:177
+#: ../addressbook/backends/file/e-book-backend-file.c:164
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:616
 #, c-format
 msgid "Failed to make directory %s: %s"
 msgstr "Failed to make directory %s: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:473
+#: ../addressbook/backends/file/e-book-backend-file.c:459
 #, c-format
 msgid "Failed to create hardlink for resource '%s': %s"
 msgstr "Failed to create hardlink for resource '%s': %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:575
-#: ../addressbook/backends/file/e-book-backend-file.c:1132
+#: ../addressbook/backends/file/e-book-backend-file.c:561
+#: ../addressbook/backends/file/e-book-backend-file.c:1127
 msgid "No UID in the contact"
 msgstr "No UID in the contact"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1566
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:516
+#: ../addressbook/backends/file/e-book-backend-file.c:1569
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:508
 msgid "Loading..."
 msgstr "Loadingâ"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1569
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4870
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:518
+#: ../addressbook/backends/file/e-book-backend-file.c:1572
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4886
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:510
 msgid "Searching..."
 msgstr "Searchingâ"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:2111
+#: ../addressbook/backends/file/e-book-backend-file.c:2115
 #, c-format
 msgid "Failed to build summary for an address book %s"
 msgstr "Failed to build summary for an address book %s"
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:874
+#: ../addressbook/backends/google/e-book-backend-google.c:645
 msgid "Querying for updated contactsâ"
 msgstr "Querying for updated contactsâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:923
-#: ../addressbook/libebook/e-book.c:3531 ../calendar/libecal/e-cal.c:1380
-#: ../libedataserver/e-client.c:1920
-msgid "Personal"
-msgstr "Personal"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:925
-msgid "Friends"
-msgstr "Friends"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:927
-msgid "Family"
-msgstr "Family"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:929
-msgid "Coworkers"
-msgstr "Coworkers"
-
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1019
+#: ../addressbook/backends/google/e-book-backend-google.c:782
 msgid "Querying for updated groupsâ"
 msgstr "Querying for updated groupsâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1424
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1639
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:295
+#: ../addressbook/backends/google/e-book-backend-google.c:1202
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1655
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:287
 #: ../addressbook/backends/webdav/e-book-backend-webdav.c:326
 msgid "The backend does not support bulk additions"
 msgstr "The backend does not support bulk additions"
 
 #. Insert the entry on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1451
+#: ../addressbook/backends/google/e-book-backend-google.c:1234
 msgid "Creating new contactâ"
 msgstr "Creating new contactâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1540
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:327
+#: ../addressbook/backends/google/e-book-backend-google.c:1323
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:319
 #: ../addressbook/backends/webdav/e-book-backend-webdav.c:433
 msgid "The backend does not support bulk removals"
 msgstr "The backend does not support bulk removals"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1568
+#: ../addressbook/backends/google/e-book-backend-google.c:1351
 msgid "Deleting contactâ"
 msgstr "Deleting contactâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1818
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2296
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:375
+#: ../addressbook/backends/google/e-book-backend-google.c:1601
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2312
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:367
 #: ../addressbook/backends/webdav/e-book-backend-webdav.c:487
 msgid "The backend does not support bulk modifications"
 msgstr "The backend does not support bulk modifications"
 
 #. Update the contact on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1851
+#: ../addressbook/backends/google/e-book-backend-google.c:1639
 msgid "Modifying contactâ"
 msgstr "Modifying contactâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2058
+#: ../addressbook/backends/google/e-book-backend-google.c:1809
 msgid "Loadingâ"
 msgstr "Loadingâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2187
-msgid "Authenticating with the serverâ"
-msgstr "Authenticating with the serverâ"
+#: ../addressbook/backends/google/e-book-google-utils.c:1562
+msgid "Personal"
+msgstr "Personal"
+
+#. System Group: My Contacts
+#: ../addressbook/backends/google/e-book-google-utils.c:1563
+msgid "Friends"
+msgstr "Friends"
+
+#. System Group: Friends
+#: ../addressbook/backends/google/e-book-google-utils.c:1564
+msgid "Family"
+msgstr "Family"
+
+#. System Group: Family
+#: ../addressbook/backends/google/e-book-google-utils.c:1565
+msgid "Coworkers"
+msgstr "Coworkers"
 
 #. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:177
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:165
 msgid "Not connected"
 msgstr "Not connected"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:797
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:793
 msgid "Using Distinguished Name (DN)"
 msgstr "Using Distinguished Name (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:800
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:796
 msgid "Using Email Address"
 msgstr "Using E-mail Address"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1071
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:969
+msgid "Failed to bind using either v3 or v2 binds"
+msgstr "Failed to bind using either v3 or v2 binds"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1090
 msgid "Reconnecting to LDAP server..."
 msgstr "Reconnecting to LDAP serverâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1200
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1216
 msgid "Invalid DN syntax"
 msgstr "Invalid DN syntax"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1738
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1231
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4784
+#, c-format
+msgid "LDAP error 0x%x (%s)"
+msgstr "LDAP error 0x%x (%s)"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1754
 msgid "Adding contact to LDAP server..."
 msgstr "Adding contact to LDAP serverâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1869
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1885
 msgid "Removing contact from LDAP server..."
 msgstr "Removing contact from LDAP serverâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2318
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2022
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2405
+#, c-format
+msgid "%s: NULL returned from ldap_first_entry"
+msgstr "%s: NULL returned from ldap_first_entry"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2265
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2456
+#, c-format
+msgid "%s: Unhandled result type %d returned"
+msgstr "%s: Unhandled result type %d returned"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2334
 msgid "Modifying contact from LDAP server..."
 msgstr "Modifying contact from LDAP serverâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4720
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2673
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2886
+#, c-format
+msgid "%s: Unhandled search result type %d returned"
+msgstr "%s: Unhandled search result type %d returned"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4736
 msgid "Receiving LDAP search results..."
 msgstr "Receiving LDAP search resultsâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4891
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4907
 msgid "Error performing search"
 msgstr "Error performing search"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5012
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5028
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "Downloading contacts (%d)â "
 
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5552
+#, c-format
+msgid "Failed to get the DN for user '%s'"
+msgstr "Failed to get the DN for user '%s'"
+
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:645
+#, c-format
+msgid "Failed to open addressbook at '%s': %s"
+msgstr "Failed to open addressbook at '%s': %s"
+
 #: ../addressbook/backends/webdav/e-book-backend-webdav.c:354
 #, c-format
 msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgstr "Create resource '%s' failed with HTTP status: %d (%s)"
 
-#: ../addressbook/libebook/e-book.c:3198
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:447
 #, c-format
-msgid "%s: there was no source for UID '%s' stored in GConf."
-msgstr "%s: there was no source for UID '%s' stored in GConf."
+msgid "DELETE failed with HTTP status %d"
+msgstr "DELETE failed with HTTP status %d"
 
-#: ../addressbook/libebook/e-book.c:3514 ../calendar/libecal/e-cal.c:1360
-#: ../libedataserver/e-client.c:1915
-msgid "On This Computer"
-msgstr "On This Computer"
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:507
+msgid "Contact on server changed -> not modifying"
+msgstr "Contact on server changed -> not modifying"
 
-#: ../addressbook/libebook/e-book.c:3640
-#: ../addressbook/libebook/e-book-client.c:702
-#: ../addressbook/libedata-book/e-data-book.c:322
-msgid "Address book does not exist"
-msgstr "Address book does not exist"
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:515
+#, c-format
+msgid "Modify contact failed with HTTP status: %d (%s)"
+msgstr "Modify contact failed with HTTP status: %d (%s)"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:912
+msgid "Loading Addressbook summary..."
+msgstr "Loading Addressbook summaryâ"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:928
+#, c-format
+msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
+msgstr "PROPFIND on webdav failed with HTTP status %d (%s)"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:949
+msgid "No response body in webdav PROPFIND result"
+msgstr "No response body in webdav PROPFIND result"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:980
+#, c-format
+msgid "Loading Contacts (%d%%)"
+msgstr "Loading Contacts (%d%%)"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1287
+msgid "Cannot transform SoupURI to string"
+msgstr "Cannot transform SoupURI to string"
 
 #: ../addressbook/libebook/e-book-client.c:95
 msgid "No such book"
 msgstr "No such book"
 
 #: ../addressbook/libebook/e-book-client.c:97
-#: ../addressbook/libedata-book/e-data-book.c:315
+#: ../addressbook/libedata-book/e-data-book.c:306
 msgid "Contact not found"
 msgstr "Contact not found"
 
 #: ../addressbook/libebook/e-book-client.c:99
-#: ../addressbook/libedata-book/e-data-book.c:316
+#: ../addressbook/libedata-book/e-data-book.c:307
 msgid "Contact ID already exists"
 msgstr "Contact ID already exists"
 
@@ -227,42 +287,16 @@ msgid "No such source"
 msgstr "No such source"
 
 #: ../addressbook/libebook/e-book-client.c:103
-#: ../addressbook/libedata-book/e-data-book.c:332
+#: ../addressbook/libedata-book/e-data-book.c:323
 msgid "No space"
 msgstr "No space"
 
-#: ../addressbook/libebook/e-book-client.c:515
+#: ../addressbook/libebook/e-book-client.c:488
 msgid "Failed to run book factory"
 msgstr "Failed to run book factory"
 
-#: ../addressbook/libebook/e-book-client.c:525
-#: ../addressbook/libedata-book/e-data-book-factory.c:196
-#: ../addressbook/libedata-book/e-data-book-factory.c:228
-#: ../calendar/libecal/e-cal-client.c:613
-#: ../calendar/libedata-cal/e-data-cal-factory.c:213
-#: ../calendar/libedata-cal/e-data-cal-factory.c:242
-#, c-format
-msgid "Invalid source"
-msgstr "Invalid source"
-
-#: ../addressbook/libebook/e-book-client.c:627
-#: ../calendar/libecal/e-cal-client.c:728
-#, c-format
-msgid "Incorrect uri '%s'"
-msgstr "Incorrect uri '%s'"
-
-#: ../addressbook/libebook/e-book-client.c:665
-msgid "Failed to find system book"
-msgstr "Failed to find system book"
-
-#: ../addressbook/libebook/e-book-client.c:774
-#: ../calendar/libecal/e-cal-client.c:881
-#, c-format
-msgid "There was no source for UID '%s' stored in a source list."
-msgstr "There was no source for UID '%s' stored in a source list."
-
-#: ../addressbook/libebook/e-book-client.c:2566
-#: ../calendar/libecal/e-cal-client.c:4536
+#: ../addressbook/libebook/e-book-client.c:2244
+#: ../calendar/libecal/e-cal-client.c:4602
 msgid "Cannot get connection to view"
 msgstr "Cannot get connection to view"
 
@@ -274,15 +308,15 @@ msgstr "Unique ID"
 #. FILE_AS is not really a structured field - we use a getter/setter
 #. * so we can generate its value if necessary in the getter
 #. Translators: This is an EContact field description, in this case it's a
-#. preferred user's description (or display name) of the contact. Note 'File' is a verb here.
+#. * preferred user's description (or display name) of the contact. Note 'File' is a verb here.
 #: ../addressbook/libebook/e-contact.c:126
 msgid "File Under"
 msgstr "File Under"
 
 #. URI of the book to which the contact belongs to
 #: ../addressbook/libebook/e-contact.c:128
-msgid "Book URI"
-msgstr "Book URI"
+msgid "Book UID"
+msgstr "Book UID"
 
 #. Name fields
 #. FN isn't really a structured field - we use a getter/setter
@@ -456,7 +490,7 @@ msgstr "Weblog URL"
 
 #. Contact categories
 #: ../addressbook/libebook/e-contact.c:188
-#: ../libedataserverui/e-categories-dialog.c:88
+#: ../libedataserverui/e-categories-dialog.c:90
 msgid "Categories"
 msgstr "Categories"
 
@@ -637,8 +671,8 @@ msgid "Last Revision"
 msgstr "Last Revision"
 
 #. Translators: This is an EContact field description, in this case it's a
-#. virtual field, which returns either name of the contact or the organization
-#. name, recognized by multiple other fields, where the first filled is used.
+#. * virtual field, which returns either name of the contact or the organization
+#. * name, recognized by multiple other fields, where the first filled is used.
 #: ../addressbook/libebook/e-contact.c:243
 msgid "Name or Org"
 msgstr "Name or Org"
@@ -675,7 +709,7 @@ msgid "Logo"
 msgstr "Logo"
 
 #. Translators: This is an EContact field description, in this case it's a name
-#. of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2
+#. * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2
 #: ../addressbook/libebook/e-contact.c:260
 msgid "Name"
 msgstr "Name"
@@ -714,26 +748,26 @@ msgid "Wants HTML Mail"
 msgstr "Wants HTML Mail"
 
 #. Translators: This is an EContact field description, in this case it's a
-#. field describing whether it's a Contact list (list of email addresses) or a
-#. regular contact for one person/organization/...
+#. * field describing whether it's a Contact list (list of email addresses) or a
+#. * regular contact for one person/organization/...
 #: ../addressbook/libebook/e-contact.c:276
 msgid "List"
 msgstr "List"
 
 #. Translators: This is an EContact field description, in this case it's a flag
-#. used to determine whether when sending to Contact lists the addresses should be
-#. shown or not to other recipients - basically whether to use BCC field or CC
-#. message header when sending messages to this Contact list.
+#. * used to determine whether when sending to Contact lists the addresses should be
+#. * shown or not to other recipients - basically whether to use BCC field or CC
+#. * message header when sending messages to this Contact list.
 #: ../addressbook/libebook/e-contact.c:281
-msgid "List Show Addresses"
-msgstr "List Show Addresses"
+msgid "List Shows Addresses"
+msgstr "List Shows Addresses"
 
 #: ../addressbook/libebook/e-contact.c:283
 msgid "Birth Date"
 msgstr "Birth Date"
 
 #: ../addressbook/libebook/e-contact.c:284
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1063
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:919
 msgid "Anniversary"
 msgstr "Anniversary"
 
@@ -839,245 +873,288 @@ msgstr "Google Talk Work Name 3"
 msgid "Google Talk Name List"
 msgstr "Google Talk Name List"
 
-#: ../addressbook/libebook/e-contact.c:1611
-#: ../addressbook/libebook/e-destination.c:878
+#: ../addressbook/libebook/e-contact.c:320
+msgid "Twitter Name List"
+msgstr "Twitter Name List"
+
+#: ../addressbook/libebook/e-contact.c:1623
+#: ../addressbook/libebook/e-destination.c:879
 msgid "Unnamed List"
 msgstr "Unnamed List"
 
-#: ../addressbook/libedata-book/e-book-backend.c:19
+#: ../addressbook/libedata-book/e-book-backend.c:17
 msgid "Cannot process, book backend is opening"
 msgstr "Cannot process, book backend is opening"
 
-#: ../addressbook/libedata-book/e-book-backend.c:91
+#: ../addressbook/libedata-book/e-book-backend.c:90
 #, c-format
 msgid "Unknown book property '%s'"
 msgstr "Unknown book property '%s'"
 
-#: ../addressbook/libedata-book/e-book-backend.c:108
+#: ../addressbook/libedata-book/e-book-backend.c:107
 #, c-format
 msgid "Cannot change value of book property '%s'"
 msgstr "Cannot change value of book property '%s'"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:501
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:500
 #: ../camel/camel-db.c:503
 #, c-format
 msgid "Insufficient memory"
 msgstr "Insufficient memory"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1093
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1092
 #, c-format
 msgid "Contact '%s' not found"
 msgstr "Contact '%s' not found"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:206
-#: ../addressbook/libedata-book/e-data-book.c:219
-#: ../addressbook/libedata-book/e-data-book.c:733
+#: ../addressbook/libedata-book/e-data-book.c:201
+#: ../addressbook/libedata-book/e-data-book.c:214
+#: ../addressbook/libedata-book/e-data-book.c:724
 msgid "Invalid query: "
 msgstr "Invalid query: "
 
-#: ../addressbook/libedata-book/e-data-book.c:311
-#: ../calendar/libedata-cal/e-data-cal.c:427
+#: ../addressbook/libedata-book/e-data-book.c:302
+#: ../calendar/libedata-cal/e-data-cal.c:415
 msgid "Success"
 msgstr "Success"
 
-#: ../addressbook/libedata-book/e-data-book.c:312
-#: ../calendar/libecal/e-cal.c:4565 ../calendar/libedata-cal/e-data-cal.c:428
-#: ../libedataserver/e-client.c:123
+#: ../addressbook/libedata-book/e-data-book.c:303
+#: ../calendar/libecal/e-cal.c:4001 ../calendar/libedata-cal/e-data-cal.c:416
+#: ../libedataserver/e-client.c:122
 msgid "Backend is busy"
 msgstr "Backend is busy"
 
-#: ../addressbook/libedata-book/e-data-book.c:313
-#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:133
+#: ../addressbook/libedata-book/e-data-book.c:304
+#: ../calendar/libedata-cal/e-data-cal.c:417 ../libedataserver/e-client.c:132
 msgid "Repository offline"
 msgstr "Repository offline"
 
-#: ../addressbook/libedata-book/e-data-book.c:314
-#: ../calendar/libecal/e-cal.c:4579 ../calendar/libedata-cal/e-data-cal.c:430
-#: ../libedataserver/e-client.c:139
+#: ../addressbook/libedata-book/e-data-book.c:305
+#: ../calendar/libecal/e-cal.c:4015 ../calendar/libedata-cal/e-data-cal.c:418
+#: ../libedataserver/e-client.c:138
 msgid "Permission denied"
 msgstr "Permission denied"
 
-#: ../addressbook/libedata-book/e-data-book.c:317
-#: ../calendar/libedata-cal/e-data-cal.c:435
+#: ../addressbook/libedata-book/e-data-book.c:308
+#: ../calendar/libedata-cal/e-data-cal.c:423
 msgid "Authentication Failed"
 msgstr "Authentication Failed"
 
-#: ../addressbook/libedata-book/e-data-book.c:318
-#: ../calendar/libedata-cal/e-data-cal.c:436
+#: ../addressbook/libedata-book/e-data-book.c:309
+#: ../calendar/libedata-cal/e-data-cal.c:424
 msgid "Authentication Required"
 msgstr "Authentication Required"
 
-#: ../addressbook/libedata-book/e-data-book.c:319
-#: ../calendar/libedata-cal/e-data-cal.c:437
+#: ../addressbook/libedata-book/e-data-book.c:310
+#: ../calendar/libedata-cal/e-data-cal.c:425
 msgid "Unsupported field"
 msgstr "Unsupported field"
 
-#: ../addressbook/libedata-book/e-data-book.c:320
-#: ../calendar/libedata-cal/e-data-cal.c:439 ../libedataserver/e-client.c:147
+#: ../addressbook/libedata-book/e-data-book.c:311
+#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:146
 msgid "Unsupported authentication method"
 msgstr "Unsupported authentication method"
 
-#: ../addressbook/libedata-book/e-data-book.c:321
-#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:149
+#: ../addressbook/libedata-book/e-data-book.c:312
+#: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:148
 msgid "TLS not available"
 msgstr "TLS not available"
 
-#: ../addressbook/libedata-book/e-data-book.c:323
+#: ../addressbook/libedata-book/e-data-book.c:313
+msgid "Address book does not exist"
+msgstr "Address book does not exist"
+
+#: ../addressbook/libedata-book/e-data-book.c:314
 msgid "Book removed"
 msgstr "Book removed"
 
-#: ../addressbook/libedata-book/e-data-book.c:324
-#: ../calendar/libedata-cal/e-data-cal.c:443
+#: ../addressbook/libedata-book/e-data-book.c:315
+#: ../calendar/libedata-cal/e-data-cal.c:431
 msgid "Not available in offline mode"
 msgstr "Not available in offline mode"
 
-#: ../addressbook/libedata-book/e-data-book.c:325
-#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:151
+#: ../addressbook/libedata-book/e-data-book.c:316
+#: ../calendar/libedata-cal/e-data-cal.c:432 ../libedataserver/e-client.c:150
 msgid "Search size limit exceeded"
 msgstr "Search size limit exceeded"
 
-#: ../addressbook/libedata-book/e-data-book.c:326
-#: ../calendar/libedata-cal/e-data-cal.c:445 ../libedataserver/e-client.c:153
+#: ../addressbook/libedata-book/e-data-book.c:317
+#: ../calendar/libedata-cal/e-data-cal.c:433 ../libedataserver/e-client.c:152
 msgid "Search time limit exceeded"
 msgstr "Search time limit exceeded"
 
-#: ../addressbook/libedata-book/e-data-book.c:327
-#: ../calendar/libedata-cal/e-data-cal.c:446 ../libedataserver/e-client.c:155
+#: ../addressbook/libedata-book/e-data-book.c:318
+#: ../calendar/libedata-cal/e-data-cal.c:434 ../libedataserver/e-client.c:154
 msgid "Invalid query"
 msgstr "Invalid query"
 
-#: ../addressbook/libedata-book/e-data-book.c:328
-#: ../calendar/libedata-cal/e-data-cal.c:447 ../libedataserver/e-client.c:157
+#: ../addressbook/libedata-book/e-data-book.c:319
+#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:156
 msgid "Query refused"
 msgstr "Query refused"
 
-#: ../addressbook/libedata-book/e-data-book.c:329
-#: ../calendar/libedata-cal/e-data-cal.c:448 ../libedataserver/e-client.c:143
+#: ../addressbook/libedata-book/e-data-book.c:320
+#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:142
 msgid "Could not cancel"
 msgstr "Could not cancel"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
 #. { OtherError,			N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:331
-#: ../calendar/libedata-cal/e-data-cal.c:450
+#: ../addressbook/libedata-book/e-data-book.c:322
+#: ../calendar/libedata-cal/e-data-cal.c:438
 msgid "Invalid server version"
 msgstr "Invalid server version"
 
-#: ../addressbook/libedata-book/e-data-book.c:333
-#: ../calendar/libecal/e-cal.c:4563 ../calendar/libedata-cal/e-data-cal.c:451
-#: ../libedataserver/e-client.c:121
+#: ../addressbook/libedata-book/e-data-book.c:324
+#: ../calendar/libecal/e-cal.c:3999 ../calendar/libedata-cal/e-data-cal.c:439
+#: ../libedataserver/e-client.c:120
 msgid "Invalid argument"
 msgstr "Invalid argument"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:335
-#: ../calendar/libecal/e-cal.c:4602 ../calendar/libedata-cal/e-data-cal.c:453
-#: ../libedataserver/e-client.c:145
+#: ../addressbook/libedata-book/e-data-book.c:326
+#: ../calendar/libecal/e-cal.c:4038 ../calendar/libedata-cal/e-data-cal.c:441
+#: ../libedataserver/e-client.c:144
 msgid "Not supported"
 msgstr "Not supported"
 
-#: ../addressbook/libedata-book/e-data-book.c:336
-#: ../calendar/libedata-cal/e-data-cal.c:454 ../libedataserver/e-client.c:163
+#: ../addressbook/libedata-book/e-data-book.c:327
+#: ../calendar/libedata-cal/e-data-cal.c:442 ../libedataserver/e-client.c:162
 msgid "Backend is not opened yet"
 msgstr "Backend is not opened yet"
 
-#: ../addressbook/libedata-book/e-data-book.c:344
-#: ../calendar/libecal/e-cal-client.c:621
-#: ../calendar/libedata-cal/e-data-cal.c:462 ../libedataserver/e-client.c:161
+#: ../addressbook/libedata-book/e-data-book.c:335
+#: ../calendar/libecal/e-cal-client.c:619
+#: ../calendar/libedata-cal/e-data-cal.c:450 ../libedataserver/e-client.c:160
 msgid "Other error"
 msgstr "Other error"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:551
-#: ../addressbook/libedata-book/e-data-book.c:943
+#: ../addressbook/libedata-book/e-data-book.c:542
+#: ../addressbook/libedata-book/e-data-book.c:909
 msgid "Cannot get contact: "
 msgstr "Cannot get contact: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:576
-#: ../addressbook/libedata-book/e-data-book.c:601
+#: ../addressbook/libedata-book/e-data-book.c:567
+#: ../addressbook/libedata-book/e-data-book.c:592
 msgid "Empty query: "
 msgstr "Empty query: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:626
-#: ../addressbook/libedata-book/e-data-book.c:1041
+#: ../addressbook/libedata-book/e-data-book.c:617
+#: ../addressbook/libedata-book/e-data-book.c:1007
 msgid "Cannot add contact: "
 msgstr "Cannot add contact: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:651
-#: ../addressbook/libedata-book/e-data-book.c:1075
+#: ../addressbook/libedata-book/e-data-book.c:642
+#: ../addressbook/libedata-book/e-data-book.c:1041
 msgid "Cannot modify contacts: "
 msgstr "Cannot modify contacts: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:759
-#: ../calendar/libedata-cal/e-data-cal.c:866
-msgid "Cannot authenticate user: "
-msgstr "Cannot authenticate user: "
-
-#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:830
+#: ../addressbook/libedata-book/e-data-book.c:796
 msgid "Cannot open book: "
 msgstr "Cannot open book: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:846
+#: ../addressbook/libedata-book/e-data-book.c:812
 msgid "Cannot remove book: "
 msgstr "Cannot remove book: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:873
+#: ../addressbook/libedata-book/e-data-book.c:839
 msgid "Cannot refresh address book: "
 msgstr "Cannot refresh address book: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:899
+#: ../addressbook/libedata-book/e-data-book.c:865
 msgid "Cannot get backend property: "
 msgstr "Cannot get backend property: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:924
-#: ../calendar/libedata-cal/e-data-cal.c:1069
+#: ../addressbook/libedata-book/e-data-book.c:890
+#: ../calendar/libedata-cal/e-data-cal.c:1016
 msgid "Cannot set backend property: "
 msgstr "Cannot set backend property: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:961
+#: ../addressbook/libedata-book/e-data-book.c:927
 msgid "Cannot get contact list: "
 msgstr "Cannot get contact list: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:995
+#: ../addressbook/libedata-book/e-data-book.c:961
 msgid "Cannot get contact list uids: "
 msgstr "Cannot get contact list uids: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1100
+#: ../addressbook/libedata-book/e-data-book.c:1066
 msgid "Cannot remove contacts: "
 msgstr "Cannot remove contacts: "
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:184
-#: ../addressbook/libedata-book/e-data-book-factory.c:212
-#: ../calendar/libedata-cal/e-data-cal-factory.c:229
+#: ../addressbook/libedata-book/e-data-book-factory.c:103
+#: ../calendar/libedata-cal/e-data-cal-factory.c:114
+#, c-format
+msgid "No backend name in source '%s'"
+msgstr "No backend name in source '%s'"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:115
+#: ../calendar/libedata-cal/e-data-cal-factory.c:127
+#, c-format
+msgid "Invalid backend name '%s' in source '%s'"
+msgstr "Invalid backend name '%s' in source '%s'"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:319
+#: ../calendar/libedata-cal/e-data-cal-factory.c:230
+msgid "Missing source UID"
+msgstr "Missing source UID"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:332
+#: ../calendar/libedata-cal/e-data-cal-factory.c:243
 #, c-format
-msgid "Empty URI"
-msgstr "Empty URI"
+msgid "No such source for UID '%s'"
+msgstr "No such source for UID '%s'"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:546
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:568
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "Server is unreachable (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:574
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:598
+#, c-format
+msgid "Failed to connect to a server using SSL: %s"
+msgstr "Failed to connect to a server using SSL: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:603
+msgid ""
+"Failed to connect to a server using SSL. One possible reason is an invalid "
+"certificate being used by the server. If this is expected, like self-signed "
+"certificate being used on the server, then disable certificate validity "
+"tests by selecting 'Ignore invalid SSL certificate' option in Properties"
+msgstr ""
+"Failed to connect to a server using SSL. One possible reason is an invalid "
+"certificate being used by the server. If this is expected, like self-signed "
+"certificate being used on the server, then disable certificate validity "
+"tests by selecting 'Ignore invalid SSL certificate' option in Properties"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:616
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "Unexpected HTTP status code %d returned (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2212
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2567
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:635
+msgid "CalDAV backend is not loaded yet"
+msgstr "CalDAV backend is not loaded yet"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1017
+msgid "Invalid Redirect URL"
+msgstr "Invalid Redirect URL"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2360
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2716
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1086,468 +1163,465 @@ msgstr ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
 "Error message: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4482
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2639
+msgid "Cannot create local store"
+msgstr "Cannot create local store"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2648
+#, c-format
+msgid "Cannot create local cache folder '%s'"
+msgstr "Cannot create local cache folder '%s'"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2659
+msgid "Could not create synch slave thread"
+msgstr "Could not create synch slave thread"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3671
+msgid "CalDAV does not support bulk additions"
+msgstr "CalDAV does not support bulk additions"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3773
+msgid "CalDAV does not support bulk modifications"
+msgstr "CalDAV does not support bulk modifications"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3941
+msgid "CalDAV does not support bulk removals"
+msgstr "CalDAV does not support bulk removals"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4600
 msgid "Calendar doesn't support Free/Busy"
 msgstr "Calendar doesn't support Free/Busy"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:219
-#: ../libedataserverui/e-client-utils.c:875
-#, c-format
-msgid ""
-"Enter password for address book %s (user %s)\n"
-"Reason: %s"
-msgstr ""
-"Enter password for address book %s (user %s)\n"
-"Reason: %s"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4608
+msgid "Schedule outbox url not found"
+msgstr "Schedule outbox url not found"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:221
-#: ../libedataserverui/e-client-utils.c:877
-#, c-format
-msgid "Enter password for address book %s (user %s)"
-msgstr "Enter password for address book %s (user %s)"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4707
+msgid "Unexpected result in schedule-response"
+msgstr "Unexpected result in schedule-response"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1065
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:921
 msgid "Birthday"
 msgstr "Birthday"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1101
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:957
 #, c-format
 msgid "Birthday: %s"
 msgstr "Birthday: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1132
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:988
 #, c-format
 msgid "Anniversary: %s"
 msgstr "Anniversary: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:251
+#: ../calendar/backends/file/e-cal-backend-file.c:235
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "Cannot save calendar data: Malformed URI."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:258
-#: ../calendar/backends/file/e-cal-backend-file.c:264
+#: ../calendar/backends/file/e-cal-backend-file.c:242
+#: ../calendar/backends/file/e-cal-backend-file.c:248
 msgid "Cannot save calendar data"
 msgstr "Cannot save calendar data"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:405
+#: ../calendar/backends/http/e-cal-backend-http.c:482
+#, c-format
+msgid "Malformed URI: %s"
+msgstr "Malformed URI: %s"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:543
+#, c-format
 msgid "Redirected to Invalid URI"
 msgstr "Redirected to Invalid URI"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:446
+#: ../calendar/backends/http/e-cal-backend-http.c:580
+#, c-format
 msgid "Bad file format."
 msgstr "Bad file format."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:454
+#: ../calendar/backends/http/e-cal-backend-http.c:590
+#, c-format
 msgid "Not a calendar."
 msgstr "Not a calendar."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:780
-#: ../calendar/backends/http/e-cal-backend-http.c:781
-#: ../calendar/backends/weather/e-cal-backend-weather.c:524
+#: ../calendar/backends/http/e-cal-backend-http.c:886
+#: ../calendar/backends/http/e-cal-backend-http.c:890
+#: ../calendar/backends/weather/e-cal-backend-weather.c:511
 msgid "Could not create cache file"
 msgstr "Could not create cache file"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:183
+#: ../calendar/backends/weather/e-cal-backend-weather.c:171
 msgid "Could not retrieve weather data"
 msgstr "Could not retrieve weather data"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:279
+#: ../calendar/backends/weather/e-cal-backend-weather.c:276
 msgid "Weather: Fog"
 msgstr "Weather: Fog"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:280
+#: ../calendar/backends/weather/e-cal-backend-weather.c:277
 msgid "Weather: Cloudy Night"
 msgstr "Weather: Cloudy Night"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:281
+#: ../calendar/backends/weather/e-cal-backend-weather.c:278
 msgid "Weather: Cloudy"
 msgstr "Weather: Cloudy"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:282
+#: ../calendar/backends/weather/e-cal-backend-weather.c:279
 msgid "Weather: Overcast"
 msgstr "Weather: Overcast"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:283
+#: ../calendar/backends/weather/e-cal-backend-weather.c:280
 msgid "Weather: Showers"
 msgstr "Weather: Showers"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:284
+#: ../calendar/backends/weather/e-cal-backend-weather.c:281
 msgid "Weather: Snow"
 msgstr "Weather: Snow"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:285
+#: ../calendar/backends/weather/e-cal-backend-weather.c:282
 msgid "Weather: Clear Night"
 msgstr "Weather: Clear Night"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:286
+#: ../calendar/backends/weather/e-cal-backend-weather.c:283
 msgid "Weather: Sunny"
 msgstr "Weather: Sunny"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:287
+#: ../calendar/backends/weather/e-cal-backend-weather.c:284
 msgid "Weather: Thunderstorms"
 msgstr "Weather: Thunderstorms"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:435
+#: ../calendar/backends/weather/e-cal-backend-weather.c:408
 msgid "Forecast"
 msgstr "Forecast"
 
-#: ../calendar/libecal/e-cal.c:891 ../libedataserverui/e-book-auth-util.c:204
-#: ../libedataserverui/e-book-auth-util.c:428
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "Enter password for %s (user %s)"
-
-#.
-#. * This password prompt will be prompted rarely. Since the key that is passed to
-#. * the auth_func corresponds to the parent user.
-#.
-#: ../calendar/libecal/e-cal.c:905
-#, c-format
-msgid "Enter password for %s to enable proxy for user %s"
-msgstr "Enter password for %s to enable proxy for user %s"
-
-#: ../calendar/libecal/e-cal.c:4567
+#: ../calendar/libecal/e-cal.c:4003
 msgid "Repository is offline"
 msgstr "Repository is offline"
 
-#: ../calendar/libecal/e-cal.c:4569 ../calendar/libecal/e-cal-client.c:137
+#: ../calendar/libecal/e-cal.c:4005 ../calendar/libecal/e-cal-client.c:135
 msgid "No such calendar"
 msgstr "No such calendar"
 
-#: ../calendar/libecal/e-cal.c:4571 ../calendar/libecal/e-cal-client.c:139
-#: ../calendar/libedata-cal/e-data-cal.c:432
+#: ../calendar/libecal/e-cal.c:4007 ../calendar/libecal/e-cal-client.c:137
+#: ../calendar/libedata-cal/e-data-cal.c:420
 msgid "Object not found"
 msgstr "Object not found"
 
-#: ../calendar/libecal/e-cal.c:4573 ../calendar/libecal/e-cal-client.c:141
-#: ../calendar/libedata-cal/e-data-cal.c:433
+#: ../calendar/libecal/e-cal.c:4009 ../calendar/libecal/e-cal-client.c:139
+#: ../calendar/libedata-cal/e-data-cal.c:421
 msgid "Invalid object"
 msgstr "Invalid object"
 
-#: ../calendar/libecal/e-cal.c:4575
+#: ../calendar/libecal/e-cal.c:4011
 msgid "URI not loaded"
 msgstr "URI not loaded"
 
-#: ../calendar/libecal/e-cal.c:4577
+#: ../calendar/libecal/e-cal.c:4013
 msgid "URI already loaded"
 msgstr "URI already loaded"
 
-#: ../calendar/libecal/e-cal.c:4581
+#: ../calendar/libecal/e-cal.c:4017
 msgid "Unknown User"
 msgstr "Unknown User"
 
-#: ../calendar/libecal/e-cal.c:4583 ../calendar/libecal/e-cal-client.c:145
-#: ../calendar/libedata-cal/e-data-cal.c:434
+#: ../calendar/libecal/e-cal.c:4019 ../calendar/libecal/e-cal-client.c:143
+#: ../calendar/libedata-cal/e-data-cal.c:422
 msgid "Object ID already exists"
 msgstr "Object ID already exists"
 
-#: ../calendar/libecal/e-cal.c:4585
+#: ../calendar/libecal/e-cal.c:4021
 msgid "Protocol not supported"
 msgstr "Protocol not supported"
 
-#: ../calendar/libecal/e-cal.c:4587
+#: ../calendar/libecal/e-cal.c:4023
 msgid "Operation has been canceled"
 msgstr "Operation has been cancelled"
 
-#: ../calendar/libecal/e-cal.c:4589
+#: ../calendar/libecal/e-cal.c:4025
 msgid "Could not cancel operation"
 msgstr "Could not cancel operation"
 
-#: ../calendar/libecal/e-cal.c:4591 ../libedataserver/e-client.c:129
+#: ../calendar/libecal/e-cal.c:4027 ../libedataserver/e-client.c:128
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
-#: ../calendar/libecal/e-cal.c:4593
-#: ../camel/providers/smtp/camel-smtp-transport.c:846
-#: ../libedataserver/e-client.c:131
+#: ../calendar/libecal/e-cal.c:4029
+#: ../camel/providers/smtp/camel-smtp-transport.c:857
+#: ../libedataserver/e-client.c:130
 msgid "Authentication required"
 msgstr "Authentication required"
 
-#: ../calendar/libecal/e-cal.c:4595
+#: ../calendar/libecal/e-cal.c:4031
 msgid "A D-Bus exception has occurred"
 msgstr "A D-Bus exception has occurred"
 
-#: ../calendar/libecal/e-cal.c:4599
+#: ../calendar/libecal/e-cal.c:4035
 msgid "No error"
 msgstr "No error"
 
-#: ../calendar/libecal/e-cal-client.c:143
-#: ../calendar/libedata-cal/e-data-cal.c:442
+#: ../calendar/libecal/e-cal-client.c:141
+#: ../calendar/libedata-cal/e-data-cal.c:430
 msgid "Unknown user"
 msgstr "Unknown user"
 
-#: ../calendar/libecal/e-cal-client.c:147
-#: ../calendar/libedata-cal/e-data-cal.c:431
+#: ../calendar/libecal/e-cal-client.c:145
+#: ../calendar/libedata-cal/e-data-cal.c:419
 msgid "Invalid range"
 msgstr "Invalid range"
 
-#: ../calendar/libecal/e-cal-client.c:603
+#: ../calendar/libecal/e-cal-client.c:610
 msgid "Failed to run calendar factory"
 msgstr "Failed to run calendar factory"
 
-#: ../calendar/libecal/e-cal-client.c:768
-msgid "Failed to find system calendar"
-msgstr "Failed to find system calendar"
-
-#: ../calendar/libecal/e-cal-client.c:807
-#: ../calendar/libedata-cal/e-data-cal.c:441
-msgid "Calendar does not exist"
-msgstr "Calendar does not exist"
-
-#: ../calendar/libecal/e-cal-client.c:922
-msgid "Invalid source type"
-msgstr "Invalid source type"
-
-#: ../calendar/libecal/e-cal-component.c:1337
+#: ../calendar/libecal/e-cal-component.c:1339
 msgid "Untitled appointment"
 msgstr "Untitled appointment"
 
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "1st"
 msgstr "1st"
 
-#: ../calendar/libecal/e-cal-recur.c:3982
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "2nd"
 msgstr "2nd"
 
-#: ../calendar/libecal/e-cal-recur.c:3983
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "3rd"
 msgstr "3rd"
 
-#: ../calendar/libecal/e-cal-recur.c:3984
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "4th"
 msgstr "4th"
 
-#: ../calendar/libecal/e-cal-recur.c:3985
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "5th"
 msgstr "5th"
 
-#: ../calendar/libecal/e-cal-recur.c:3986
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "6th"
 msgstr "6th"
 
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "7th"
 msgstr "7th"
 
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "8th"
 msgstr "8th"
 
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "9th"
 msgstr "9th"
 
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "10th"
 msgstr "10th"
 
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "11th"
 msgstr "11th"
 
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "12th"
 msgstr "12th"
 
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "13th"
 msgstr "13th"
 
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "14th"
 msgstr "14th"
 
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "15th"
 msgstr "15th"
 
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "16th"
 msgstr "16th"
 
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "17th"
 msgstr "17th"
 
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "18th"
 msgstr "18th"
 
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "19th"
 msgstr "19th"
 
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "20th"
 msgstr "20th"
 
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "21st"
 msgstr "21st"
 
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "22nd"
 msgstr "22nd"
 
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "23rd"
 msgstr "23rd"
 
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "24th"
 msgstr "24th"
 
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "25th"
 msgstr "25th"
 
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "26th"
 msgstr "26th"
 
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "27th"
 msgstr "27th"
 
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "28th"
 msgstr "28th"
 
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "29th"
 msgstr "29th"
 
-#: ../calendar/libecal/e-cal-recur.c:4010
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "30th"
 msgstr "30th"
 
-#: ../calendar/libecal/e-cal-recur.c:4011
+#: ../calendar/libecal/e-cal-recur.c:4017
 msgid "31st"
 msgstr "31st"
 
-#: ../calendar/libecal/e-cal-util.c:691 ../calendar/libecal/e-cal-util.c:718
+#: ../calendar/libecal/e-cal-util.c:696 ../calendar/libecal/e-cal-util.c:723
 msgctxt "Priority"
 msgid "High"
 msgstr "High"
 
-#: ../calendar/libecal/e-cal-util.c:693 ../calendar/libecal/e-cal-util.c:720
+#: ../calendar/libecal/e-cal-util.c:698 ../calendar/libecal/e-cal-util.c:725
 msgctxt "Priority"
 msgid "Normal"
 msgstr "Normal"
 
-#: ../calendar/libecal/e-cal-util.c:695 ../calendar/libecal/e-cal-util.c:722
+#: ../calendar/libecal/e-cal-util.c:700 ../calendar/libecal/e-cal-util.c:727
 msgctxt "Priority"
 msgid "Low"
 msgstr "Low"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:716
+#: ../calendar/libecal/e-cal-util.c:721
 msgctxt "Priority"
 msgid "Undefined"
 msgstr "Undefined"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:38
+#: ../calendar/libedata-cal/e-cal-backend.c:36
 msgid "Cannot process, calendar backend is opening"
 msgstr "Cannot process, calendar backend is opening"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:146
+#: ../calendar/libedata-cal/e-cal-backend.c:135
 #, c-format
 msgid "Unknown calendar property '%s'"
 msgstr "Unknown calendar property '%s'"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:163
+#: ../calendar/libedata-cal/e-cal-backend.c:152
 #, c-format
 msgid "Cannot change value of calendar property '%s'"
 msgstr "Cannot change value of calendar property '%s'"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:79
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:819
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:841
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:956
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:987
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1187
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1217
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:77
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:839
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:954
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:985
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1185
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1215
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "\"%s\" expects no arguments"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:231
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:276
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:315
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1258
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:229
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:274
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:313
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1256
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\" expects one argument"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:128
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:321
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:886
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:119
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:126
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:319
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:884
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "\"%s\" expects the first argument to be a string"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:136
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:134
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:178
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:537
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:880
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1022
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:535
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1020
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "\"%s\" expects two arguments"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:184
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:237
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:282
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:403
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:486
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:543
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1028
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1264
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:182
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:235
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:280
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:401
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:484
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:541
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1026
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1262
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "\"%s\" expects the first argument to be a time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:192
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:190
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "\"%s\" expects the second argument to be an integer"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:397
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:395
 #, c-format
 msgid "\"%s\" expects two or three arguments"
 msgstr "\"%s\" expects two or three arguments"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:411
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:492
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:552
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1036
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:409
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:490
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:550
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1034
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "\"%s\" expects the second argument to be a time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:420
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:418
 #, c-format
 msgid "\"%s\" expects the third argument to be a string"
 msgstr "\"%s\" expects the third argument to be a string"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:480
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:478
 #, c-format
 msgid "\"%s\" expects none or two arguments"
 msgstr "\"%s\" expects none or two arguments"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:894
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:892
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "\"%s\" expects the second argument to be a string"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:924
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:922
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1558,12 +1632,12 @@ msgstr ""
 "\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
 "\"classification\""
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1086
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1084
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "\"%s\" expects at least one argument"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1100
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1098
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1572,96 +1646,100 @@ msgstr ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
 "be a boolean false (#f)"
 
-#: ../calendar/libedata-cal/e-data-cal.c:438
+#: ../calendar/libedata-cal/e-data-cal.c:426
 msgid "Unsupported method"
 msgstr "Unsupported method"
 
+#: ../calendar/libedata-cal/e-data-cal.c:429
+msgid "Calendar does not exist"
+msgstr "Calendar does not exist"
+
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:962
+#: ../calendar/libedata-cal/e-data-cal.c:909
 msgid "Cannot open calendar: "
 msgstr "Cannot open calendar: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:987
+#: ../calendar/libedata-cal/e-data-cal.c:934
 msgid "Cannot remove calendar: "
 msgstr "Cannot remove calendar: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1014
+#: ../calendar/libedata-cal/e-data-cal.c:961
 msgid "Cannot refresh calendar: "
 msgstr "Cannot refresh calendar: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1043
+#: ../calendar/libedata-cal/e-data-cal.c:990
 msgid "Cannot retrieve backend property: "
 msgstr "Cannot retrieve backend property: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1098
+#: ../calendar/libedata-cal/e-data-cal.c:1045
 msgid "Cannot retrieve calendar object path: "
 msgstr "Cannot retrieve calendar object path: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1128
+#: ../calendar/libedata-cal/e-data-cal.c:1075
 msgid "Cannot retrieve calendar object list: "
 msgstr "Cannot retrieve calendar object list: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1157
+#: ../calendar/libedata-cal/e-data-cal.c:1104
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "Cannot retrieve calendar free/busy list: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1188
+#: ../calendar/libedata-cal/e-data-cal.c:1142
 msgid "Cannot create calendar object: "
 msgstr "Cannot create calendar object: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1220
+#: ../calendar/libedata-cal/e-data-cal.c:1177
 msgid "Cannot modify calendar object: "
 msgstr "Cannot modify calendar object: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1254
+#: ../calendar/libedata-cal/e-data-cal.c:1217
 msgid "Cannot remove calendar object: "
 msgstr "Cannot remove calendar object: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1281
+#: ../calendar/libedata-cal/e-data-cal.c:1254
 msgid "Cannot receive calendar objects: "
 msgstr "Cannot receive calendar objects: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1312
+#: ../calendar/libedata-cal/e-data-cal.c:1285
 msgid "Cannot send calendar objects: "
 msgstr "Cannot send calendar objects: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1344
+#: ../calendar/libedata-cal/e-data-cal.c:1317
 msgid "Could not retrieve attachment uris: "
 msgstr "Could not retrieve attachment uris: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1372
+#: ../calendar/libedata-cal/e-data-cal.c:1345
 msgid "Could not discard reminder: "
 msgstr "Could not discard reminder: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1401
+#: ../calendar/libedata-cal/e-data-cal.c:1374
 msgid "Could not get calendar view path: "
 msgstr "Could not get calendar view path: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1431
+#: ../calendar/libedata-cal/e-data-cal.c:1404
 msgid "Could not retrieve calendar time zone: "
 msgstr "Could not retrieve calendar time zone: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1457
+#: ../calendar/libedata-cal/e-data-cal.c:1430
 msgid "Could not add calendar time zone: "
 msgstr "Could not add calendar time zone: "
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:199
+#: ../calendar/libedata-cal/e-data-cal-factory.c:220
 #, c-format
 msgid "Invalid call"
 msgstr "Invalid call"
@@ -1696,15 +1774,15 @@ msgstr "You may not import keys with this cypher"
 msgid "You may not export keys with this cipher"
 msgstr "You may not export keys with this cypher"
 
-#: ../camel/camel-cipher-context.c:805
+#: ../camel/camel-cipher-context.c:817
 msgid "Signing message"
 msgstr "Signing message"
 
-#: ../camel/camel-cipher-context.c:1046
+#: ../camel/camel-cipher-context.c:1058
 msgid "Encrypting message"
 msgstr "Encrypting message"
 
-#: ../camel/camel-cipher-context.c:1173
+#: ../camel/camel-cipher-context.c:1185
 msgid "Decrypting message"
 msgstr "Decrypting message"
 
@@ -1713,7 +1791,11 @@ msgstr "Decrypting message"
 msgid "Unable to create cache path"
 msgstr "Unable to create cache path"
 
-#: ../camel/camel-data-cache.c:507
+#: ../camel/camel-data-cache.c:440
+msgid "Empty cache file"
+msgstr "Empty cache file"
+
+#: ../camel/camel-data-cache.c:509
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Could not remove cache entry: %s: %s"
@@ -1749,38 +1831,32 @@ msgstr "Resynchronising with server"
 msgid "Downloading new messages for offline mode"
 msgstr "Downloading new messages for offline mode"
 
-#: ../camel/camel-disco-folder.c:416
+#: ../camel/camel-disco-folder.c:420
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Preparing folder '%s' for offline"
 
-#: ../camel/camel-disco-folder.c:482 ../camel/camel-offline-folder.c:327
+#: ../camel/camel-disco-folder.c:487 ../camel/camel-offline-folder.c:334
 msgid "Copy folder content locally for _offline operation"
 msgstr "Copy folder content locally for _offline operation"
 
-#: ../camel/camel-disco-store.c:456
-#: ../camel/providers/imap/camel-imap-store.c:1239
-#: ../camel/providers/imap/camel-imap-store.c:2028
-#: ../camel/providers/imap/camel-imap-store.c:2523
-#: ../camel/providers/imap/camel-imap-store.c:3282
-#: ../camel/providers/imapx/camel-imapx-folder.c:407
-#: ../camel/providers/imapx/camel-imapx-folder.c:440
-#: ../camel/providers/imapx/camel-imapx-folder.c:474
-#: ../camel/providers/imapx/camel-imapx-folder.c:530
-#: ../camel/providers/imapx/camel-imapx-folder.c:587
-#: ../camel/providers/imapx/camel-imapx-folder.c:621
-#: ../camel/providers/imapx/camel-imapx-folder.c:661
-#: ../camel/providers/imapx/camel-imapx-folder.c:697
-#: ../camel/providers/imapx/camel-imapx-store.c:276
-#: ../camel/providers/imapx/camel-imapx-store.c:1367
-#: ../camel/providers/imapx/camel-imapx-store.c:1455
-#: ../camel/providers/imapx/camel-imapx-store.c:1501
-#: ../camel/providers/pop3/camel-pop3-folder.c:525
-#: ../camel/providers/pop3/camel-pop3-folder.c:655
-#: ../camel/providers/pop3/camel-pop3-folder.c:838
-#: ../camel/providers/pop3/camel-pop3-folder.c:1036
-#: ../camel/providers/pop3/camel-pop3-store.c:393
-#: ../camel/providers/pop3/camel-pop3-store.c:805
+#: ../camel/camel-disco-store.c:469 ../camel/camel-imapx-folder.c:413
+#: ../camel/camel-imapx-folder.c:446 ../camel/camel-imapx-folder.c:482
+#: ../camel/camel-imapx-folder.c:538 ../camel/camel-imapx-folder.c:614
+#: ../camel/camel-imapx-folder.c:648 ../camel/camel-imapx-folder.c:688
+#: ../camel/camel-imapx-folder.c:724 ../camel/camel-imapx-store.c:276
+#: ../camel/camel-imapx-store.c:1390 ../camel/camel-imapx-store.c:1479
+#: ../camel/camel-imapx-store.c:1528
+#: ../camel/providers/imap/camel-imap-store.c:1268
+#: ../camel/providers/imap/camel-imap-store.c:2030
+#: ../camel/providers/imap/camel-imap-store.c:2502
+#: ../camel/providers/imap/camel-imap-store.c:3265
+#: ../camel/providers/pop3/camel-pop3-folder.c:524
+#: ../camel/providers/pop3/camel-pop3-folder.c:654
+#: ../camel/providers/pop3/camel-pop3-folder.c:844
+#: ../camel/providers/pop3/camel-pop3-folder.c:1046
+#: ../camel/providers/pop3/camel-pop3-store.c:408
+#: ../camel/providers/pop3/camel-pop3-store.c:831
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "You must be working online to complete this operation"
@@ -1790,64 +1866,64 @@ msgstr "You must be working online to complete this operation"
 msgid "Canceled"
 msgstr "Cancelled"
 
-#: ../camel/camel-filter-driver.c:895 ../camel/camel-filter-search.c:762
+#: ../camel/camel-filter-driver.c:897 ../camel/camel-filter-search.c:772
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Failed to create child process '%s': %s"
 
-#: ../camel/camel-filter-driver.c:943
+#: ../camel/camel-filter-driver.c:945
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Invalid message stream received from %s: %s"
 
-#: ../camel/camel-filter-driver.c:1139 ../camel/camel-filter-driver.c:1146
+#: ../camel/camel-filter-driver.c:1141 ../camel/camel-filter-driver.c:1148
 msgid "Syncing folders"
 msgstr "Syncing folders"
 
-#: ../camel/camel-filter-driver.c:1240 ../camel/camel-filter-driver.c:1695
+#: ../camel/camel-filter-driver.c:1242 ../camel/camel-filter-driver.c:1707
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error parsing filter: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1706
+#: ../camel/camel-filter-driver.c:1253 ../camel/camel-filter-driver.c:1718
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error executing filter: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1347
+#: ../camel/camel-filter-driver.c:1349
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "Unable to open spool folder"
 
-#: ../camel/camel-filter-driver.c:1359
+#: ../camel/camel-filter-driver.c:1361
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "Unable to process spool folder"
 
-#: ../camel/camel-filter-driver.c:1377
+#: ../camel/camel-filter-driver.c:1379
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Getting message %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1384 ../camel/camel-filter-driver.c:1406
+#: ../camel/camel-filter-driver.c:1386 ../camel/camel-filter-driver.c:1408
 #, c-format
 msgid "Failed on message %d"
 msgstr "Failed on message %d"
 
-#: ../camel/camel-filter-driver.c:1421 ../camel/camel-filter-driver.c:1527
+#: ../camel/camel-filter-driver.c:1423 ../camel/camel-filter-driver.c:1529
 msgid "Syncing folder"
 msgstr "Syncing folder"
 
-#: ../camel/camel-filter-driver.c:1426 ../camel/camel-filter-driver.c:1533
+#: ../camel/camel-filter-driver.c:1428 ../camel/camel-filter-driver.c:1535
 msgid "Complete"
 msgstr "Complete"
 
-#: ../camel/camel-filter-driver.c:1485
+#: ../camel/camel-filter-driver.c:1487
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Getting message %d of %d"
 
-#: ../camel/camel-filter-driver.c:1503
+#: ../camel/camel-filter-driver.c:1505
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Failed at message %d of %d"
@@ -1864,58 +1940,67 @@ msgstr "Invalid arguments to (system-flag)"
 msgid "Invalid arguments to (user-tag)"
 msgstr "Invalid arguments to (user-tag)"
 
-#: ../camel/camel-filter-search.c:939 ../camel/camel-filter-search.c:948
+#: ../camel/camel-filter-search.c:949 ../camel/camel-filter-search.c:958
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error executing filter search: %s: %s"
 
-#: ../camel/camel-folder.c:262
+#: ../camel/camel-folder.c:270
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
 msgstr[0] "Learning new spam message in '%s'"
 msgstr[1] "Learning new spam messages in '%s'"
 
-#: ../camel/camel-folder.c:302
+#: ../camel/camel-folder.c:310
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
 msgstr[0] "Learning new ham message in '%s'"
 msgstr[1] "Learning new ham messages in '%s'"
 
-#: ../camel/camel-folder.c:350
+#: ../camel/camel-folder.c:358
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
 msgstr[0] "Filtering new message in '%s'"
 msgstr[1] "Filtering new messages in '%s'"
 
-#: ../camel/camel-folder.c:918
-#: ../camel/providers/local/camel-maildir-folder.c:322
+#: ../camel/camel-folder.c:930
+#: ../camel/providers/local/camel-maildir-folder.c:321
 msgid "Moving messages"
 msgstr "Moving messages"
 
-#: ../camel/camel-folder.c:921
+#: ../camel/camel-folder.c:933
 msgid "Copying messages"
 msgstr "Copying messages"
 
-#: ../camel/camel-folder.c:1233
+#: ../camel/camel-folder.c:1253
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr "Quota information not supported for folder '%s'"
 
-#: ../camel/camel-folder.c:3549
+#: ../camel/camel-folder.c:3371
+#, c-format
+msgid "Expunging folder '%s'"
+msgstr "Expunging folder '%s'"
+
+#: ../camel/camel-folder.c:3603
 #, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "Retrieving message '%s' in %s"
 
-#: ../camel/camel-folder.c:3698
+#: ../camel/camel-folder.c:3753
 #, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "Retrieving quota information for '%s'"
 
-#: ../camel/camel-folder-search.c:365 ../camel/camel-folder-search.c:479
-#: ../camel/camel-folder-search.c:664
+#: ../camel/camel-folder.c:3985
+#, c-format
+msgid "Refreshing folder '%s'"
+msgstr "Refreshing folder '%s'"
+
+#: ../camel/camel-folder-search.c:420 ../camel/camel-folder-search.c:587
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1924,8 +2009,7 @@ msgstr ""
 "Cannot parse search expression: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:377 ../camel/camel-folder-search.c:491
-#: ../camel/camel-folder-search.c:676
+#: ../camel/camel-folder-search.c:432 ../camel/camel-folder-search.c:599
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1935,31 +2019,31 @@ msgstr ""
 "%s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:890 ../camel/camel-folder-search.c:933
+#: ../camel/camel-folder-search.c:822 ../camel/camel-folder-search.c:865
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) requires a single bool result"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:994
+#: ../camel/camel-folder-search.c:932
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) not allowed inside %s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1001 ../camel/camel-folder-search.c:1009
+#: ../camel/camel-folder-search.c:939 ../camel/camel-folder-search.c:947
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) requires a match type string"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1037
+#: ../camel/camel-folder-search.c:975
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) expects an array result"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1047
+#: ../camel/camel-folder-search.c:985
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) requires the folder set"
@@ -1971,7 +2055,7 @@ msgid "Failed to execute gpg: %s"
 msgstr "Failed to execute gpg: %s"
 
 #: ../camel/camel-gpg-context.c:668
-#: ../camel/providers/smtp/camel-smtp-transport.c:849
+#: ../camel/providers/smtp/camel-smtp-transport.c:860
 msgid "Unknown"
 msgstr "Unknown"
 
@@ -2029,8 +2113,8 @@ msgstr ""
 
 #: ../camel/camel-gpg-context.c:879 ../camel/camel-net-utils.c:523
 #: ../camel/camel-tcp-stream-raw.c:268
-#: ../camel/providers/nntp/camel-nntp-summary.c:382
-#: ../libedataserver/e-client.c:141 ../libedataserverui/e-book-auth-util.c:227
+#: ../camel/providers/nntp/camel-nntp-summary.c:388
+#: ../libedataserver/e-client.c:140
 #, c-format
 msgid "Cancelled"
 msgstr "Cancelled"
@@ -2095,49 +2179,318 @@ msgstr "Failed to decrypt MIME part: protocol error"
 msgid "Encrypted content"
 msgstr "Encrypted content"
 
-#: ../camel/camel-http-stream.c:545 ../camel/camel-stream-null.c:78
-msgid "Only reset to beginning is supported with CamelHttpStream"
-msgstr "Only reset to beginning is supported with CamelHttpStream"
-
-#: ../camel/camel-lock.c:102
+#: ../camel/camel-imapx-folder.c:104
 #, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Could not create lock file for %s: %s"
+msgid "Could not create folder summary for %s"
+msgstr "Could not create folder summary for %s"
 
-#: ../camel/camel-lock.c:145
+#: ../camel/camel-imapx-folder.c:112
 #, c-format
-msgid "Timed out trying to get lock file on %s.  Try again later."
-msgstr "Timed out trying to get lock file on %s.  Try again later."
+msgid "Could not create cache for %s: "
+msgstr "Could not create cache for %s: "
 
-#: ../camel/camel-lock.c:205
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Failed to get lock using fcntl(2): %s"
+#: ../camel/camel-imapx-folder.c:794
+#: ../camel/providers/imap/camel-imap-folder.c:365
+#: ../camel/providers/nntp/camel-nntp-folder.c:738
+msgid "Apply message _filters to this folder"
+msgstr "Apply message _filters to this folder"
 
-#: ../camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Failed to get lock using flock(2): %s"
+#: ../camel/camel-imapx-server.c:1094
+msgid "Server disconnected"
+msgstr "Server disconnected"
 
-#: ../camel/camel-lock-client.c:106
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Cannot build locking helper pipe: %s"
+#: ../camel/camel-imapx-server.c:1549
+msgid "Error writing to cache stream: "
+msgstr "Error writing to cache stream: "
 
-#: ../camel/camel-lock-client.c:130
+#: ../camel/camel-imapx-server.c:2500
 #, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Cannot fork locking helper: %s"
+msgid "Not authenticated"
+msgstr "Not authenticated"
 
-#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Could not lock '%s': protocol error with lock-helper"
+#: ../camel/camel-imapx-server.c:2580
+msgid "Error performing IDLE"
+msgstr "Error performing IDLE"
 
-#: ../camel/camel-lock-client.c:227
+#: ../camel/camel-imapx-server.c:3464
+#: ../camel/providers/imap/camel-imap-store.c:413
+#: ../camel/providers/imap/camel-imap-store.c:467
 #, c-format
-msgid "Could not lock '%s'"
-msgstr "Could not lock '%s'"
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Failed to connect to IMAP server %s in secure mode: %s"
+
+#: ../camel/camel-imapx-server.c:3465
+#: ../camel/providers/imap/camel-imap-store.c:414
+#: ../camel/providers/smtp/camel-smtp-transport.c:202
+msgid "STARTTLS not supported"
+msgstr "STARTTLS not supported"
+
+#: ../camel/camel-imapx-server.c:3504
+#: ../camel/providers/imap/camel-imap-store.c:439
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: "
+msgstr "Failed to connect to IMAP server %s in secure mode: "
+
+#: ../camel/camel-imapx-server.c:3582
+#: ../camel/providers/imap/camel-imap-store.c:747
+#, c-format
+msgid "IMAP server %s does not support %s authentication"
+msgstr "IMAP server %s does not support %s authentication"
+
+#: ../camel/camel-imapx-server.c:3593 ../camel/camel-session.c:494
+#: ../camel/providers/imap/camel-imap-store.c:1172
+#: ../camel/providers/pop3/camel-pop3-store.c:259
+#: ../camel/providers/pop3/camel-pop3-store.c:587
+#: ../camel/providers/smtp/camel-smtp-transport.c:467
+#, c-format
+msgid "No support for %s authentication"
+msgstr "No support for %s authentication"
+
+#: ../camel/camel-imapx-server.c:3612
+#: ../camel/providers/imap/camel-imap-store.c:1140
+#: ../camel/providers/nntp/camel-nntp-store.c:502
+msgid "Cannot authenticate without a username"
+msgstr "Cannot authenticate without a username"
+
+#: ../camel/camel-imapx-server.c:3621
+#: ../camel/providers/imap/camel-imap-store.c:1148
+#: ../camel/providers/nntp/camel-nntp-store.c:511
+#: ../camel/providers/pop3/camel-pop3-store.c:512
+#: ../camel/providers/pop3/camel-pop3-store.c:532
+msgid "Authentication password not available"
+msgstr "Authentication password not available"
+
+#: ../camel/camel-imapx-server.c:3823
+msgid "Error fetching message"
+msgstr "Error fetching message"
+
+#: ../camel/camel-imapx-server.c:3905
+msgid "Failed to copy the tmp file"
+msgstr "Failed to copy the tmp file"
+
+#: ../camel/camel-imapx-server.c:3919
+msgid "Failed to close the tmp stream"
+msgstr "Failed to close the tmp stream"
+
+#: ../camel/camel-imapx-server.c:4017
+msgid "Error copying messages"
+msgstr "Error copying messages"
+
+#: ../camel/camel-imapx-server.c:4152
+msgid "Error appending message"
+msgstr "Error appending message"
+
+#: ../camel/camel-imapx-server.c:4335
+msgid "Error fetching message headers"
+msgstr "Error fetching message headers"
+
+#: ../camel/camel-imapx-server.c:4470
+msgid "Error retrieving message"
+msgstr "Error retrieving message"
+
+#: ../camel/camel-imapx-server.c:4592 ../camel/camel-imapx-server.c:4785
+#, c-format
+msgid "Fetching summary information for new messages in '%s'"
+msgstr "Fetching summary information for new messages in '%s'"
+
+#: ../camel/camel-imapx-server.c:4643
+#, c-format
+msgid "Scanning for changed messages in '%s'"
+msgstr "Scanning for changed messages in '%s'"
+
+#: ../camel/camel-imapx-server.c:4686
+msgid "Error fetching new messages"
+msgstr "Error fetching new messages"
+
+#: ../camel/camel-imapx-server.c:4876
+msgid "Error while fetching messages"
+msgstr "Error while fetching messages"
+
+#: ../camel/camel-imapx-server.c:4884 ../camel/camel-imapx-server.c:4920
+#, c-format
+msgid "Fetching summary information for %d message in '%s'"
+msgid_plural "Fetching summary information for %d messages in '%s'"
+msgstr[0] "Fetching summary information for %d message in '%s'"
+msgstr[1] "Fetching summary information for %d messages in '%s'"
+
+#: ../camel/camel-imapx-server.c:5045 ../camel/camel-imapx-server.c:5081
+msgid "Error refreshing folder"
+msgstr "Error refreshing folder"
+
+#: ../camel/camel-imapx-server.c:5174
+msgid "Error expunging message"
+msgstr "Error expunging message"
+
+#: ../camel/camel-imapx-server.c:5271
+msgid "Error fetching folders"
+msgstr "Error fetching folders"
+
+#: ../camel/camel-imapx-server.c:5350
+msgid "Error subscribing to folder"
+msgstr "Error subscribing to folder"
+
+#: ../camel/camel-imapx-server.c:5411
+msgid "Error creating folder"
+msgstr "Error creating folder"
+
+#: ../camel/camel-imapx-server.c:5460
+msgid "Error deleting folder"
+msgstr "Error deleting folder"
+
+#: ../camel/camel-imapx-server.c:5521
+msgid "Error renaming folder"
+msgstr "Error renaming folder"
+
+#: ../camel/camel-imapx-server.c:5582
+msgid "Error performing NOOP"
+msgstr "Error performing NOOP"
+
+#: ../camel/camel-imapx-server.c:5678
+msgid "Error syncing changes"
+msgstr "Error syncing changes"
+
+#: ../camel/camel-imapx-server.c:6449
+#: ../camel/providers/imap/camel-imap-folder.c:3517
+#, c-format
+msgid "Cannot get message with message ID %s: %s"
+msgstr "Cannot get message with message ID %s: %s"
+
+#: ../camel/camel-imapx-server.c:6450
+#: ../camel/providers/imap/camel-imap-folder.c:3518
+msgid "No such message available."
+msgstr "No such message available."
+
+#: ../camel/camel-imapx-server.c:6605 ../camel/camel-imapx-server.c:6620
+msgid "Cannot create spool file: "
+msgstr "Cannot create spool file: "
+
+#: ../camel/camel-imapx-store.c:157
+#: ../camel/providers/imap/camel-imap-store.c:825
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP server %s"
+
+#: ../camel/camel-imapx-store.c:160
+#: ../camel/providers/imap/camel-imap-store.c:828
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP service for %s on %s"
+
+#: ../camel/camel-imapx-store.c:251
+#: ../camel/providers/imap/camel-imap-provider.c:98
+#: ../camel/providers/nntp/camel-nntp-provider.c:85
+#: ../camel/providers/pop3/camel-pop3-provider.c:83
+msgid "Password"
+msgstr "Password"
+
+#: ../camel/camel-imapx-store.c:253
+#: ../camel/providers/imap/camel-imap-provider.c:100
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr ""
+"This option will connect to the IMAP server using a plaintext password."
+
+#: ../camel/camel-imapx-store.c:349
+#: ../camel/providers/imap/camel-imap-store.c:2061
+#: ../camel/providers/imap/camel-imap-store.c:2257
+#, c-format
+msgid "No such folder %s"
+msgstr "No such folder %s"
+
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/camel-imapx-store.c:374 ../camel/camel-imapx-store.c:858
+#: ../camel/providers/imap/camel-imap-store.c:274
+#: ../camel/providers/imap/camel-imap-store.c:2673
+#: ../camel/providers/local/camel-maildir-folder.c:473
+#: ../camel/providers/local/camel-maildir-store.c:307
+#: ../camel/providers/local/camel-maildir-store.c:699
+#: ../camel/providers/local/camel-maildir-store.c:705
+#: ../camel/providers/local/camel-maildir-store.c:789
+#: ../camel/providers/local/camel-spool-store.c:393
+msgid "Inbox"
+msgstr "Inbox"
+
+#: ../camel/camel-imapx-store.c:1091
+#, c-format
+msgid "Retrieving folder list for %s"
+msgstr "Retrieving folder list for %s"
+
+#: ../camel/camel-imapx-store.c:1195
+#: ../camel/providers/nntp/camel-nntp-store.c:1769
+#, c-format
+msgid "No such folder: %s"
+msgstr "No such folder: %s"
+
+#: ../camel/camel-imapx-store.c:1412
+#: ../camel/providers/imap/camel-imap-store.c:2074
+#: ../camel/providers/imap/camel-imap-store.c:2517
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+
+#: ../camel/camel-imapx-store.c:1423
+#: ../camel/providers/imap/camel-imap-store.c:2530
+#, c-format
+msgid "Unknown parent folder: %s"
+msgstr "Unknown parent folder: %s"
+
+#: ../camel/camel-imapx-store.c:1433
+#: ../camel/providers/imap/camel-imap-store.c:2137
+#: ../camel/providers/imap/camel-imap-store.c:2581
+#, c-format
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "The parent folder is not allowed to contain subfolders"
+
+#: ../camel/camel-imapx-stream.c:97
+#, c-format
+msgid "Source stream returned no data"
+msgstr "Source stream returned no data"
+
+#: ../camel/camel-imapx-stream.c:106
+#, c-format
+msgid "Source stream unavailable"
+msgstr "Source stream unavailable"
+
+#: ../camel/camel-lock.c:102
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "Could not create lock file for %s: %s"
+
+#: ../camel/camel-lock.c:145
+#, c-format
+msgid "Timed out trying to get lock file on %s.  Try again later."
+msgstr "Timed out trying to get lock file on %s.  Try again later."
+
+#: ../camel/camel-lock.c:205
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "Failed to get lock using fcntl(2): %s"
+
+#: ../camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "Failed to get lock using flock(2): %s"
+
+#: ../camel/camel-lock-client.c:106
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Cannot build locking helper pipe: %s"
+
+#: ../camel/camel-lock-client.c:130
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Cannot fork locking helper: %s"
+
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "Could not lock '%s': protocol error with lock-helper"
+
+#: ../camel/camel-lock-client.c:227
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Could not lock '%s'"
 
 #: ../camel/camel-movemail.c:105
 #, c-format
@@ -2235,12 +2588,12 @@ msgstr "Name lookup failed"
 msgid "Name lookup failed: %s"
 msgstr "Name lookup failed: %s"
 
-#: ../camel/camel-network-service.c:112
+#: ../camel/camel-network-service.c:114
 #, c-format
 msgid "Could not connect to %s: "
 msgstr "Could not connect to %s: "
 
-#: ../camel/camel-offline-folder.c:206
+#: ../camel/camel-offline-folder.c:210
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "Syncing messages in folder '%s' to disk"
@@ -2273,7 +2626,7 @@ msgstr "Could not load %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Could not load %s: No initialisation code in module."
 
-#: ../camel/camel-provider.c:402 ../camel/camel-session.c:384
+#: ../camel/camel-provider.c:410 ../camel/camel-session.c:406
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "No provider available for protocol '%s'"
@@ -2342,32 +2695,32 @@ msgstr ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 
-#: ../camel/camel-sasl-digest-md5.c:850
+#: ../camel/camel-sasl-digest-md5.c:853
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Server challenge too long (>2048 octets)"
 
-#: ../camel/camel-sasl-digest-md5.c:861
+#: ../camel/camel-sasl-digest-md5.c:864
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "Server challenge invalid\n"
 
-#: ../camel/camel-sasl-digest-md5.c:869
+#: ../camel/camel-sasl-digest-md5.c:872
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "Server challenge contained invalid \"Quality of Protection\" token"
 
-#: ../camel/camel-sasl-digest-md5.c:902
+#: ../camel/camel-sasl-digest-md5.c:905
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "Server response did not contain authorisation data"
 
-#: ../camel/camel-sasl-digest-md5.c:923
+#: ../camel/camel-sasl-digest-md5.c:926
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "Server response contained incomplete authorisation data"
 
-#: ../camel/camel-sasl-digest-md5.c:936
+#: ../camel/camel-sasl-digest-md5.c:939
 #, c-format
 msgid "Server response does not match"
 msgstr "Server response does not match"
@@ -2441,14 +2794,14 @@ msgstr "The consistency checks performed on the credential failed."
 msgid "The referenced credentials have expired."
 msgstr "The referenced credentials have expired."
 
-#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:337
-#: ../camel/camel-sasl-gssapi.c:381 ../camel/camel-sasl-gssapi.c:398
-#: ../camel/providers/smtp/camel-smtp-transport.c:562
+#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:340
+#: ../camel/camel-sasl-gssapi.c:384 ../camel/camel-sasl-gssapi.c:401
+#: ../camel/providers/smtp/camel-smtp-transport.c:575
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "Bad authentication response from server."
 
-#: ../camel/camel-sasl-gssapi.c:410
+#: ../camel/camel-sasl-gssapi.c:413
 #, c-format
 msgid "Unsupported security layer."
 msgstr "Unsupported security layer."
@@ -2461,7 +2814,7 @@ msgstr "Login"
 msgid "This option will connect to the server using a simple password."
 msgstr "This option will connect to the server using a simple password."
 
-#: ../camel/camel-sasl-login.c:107
+#: ../camel/camel-sasl-login.c:110
 #, c-format
 msgid "Unknown authentication state."
 msgstr "Unknown authentication state."
@@ -2499,7 +2852,7 @@ msgstr "POP Source UID"
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "POP Before SMTP authentication using an unknown transport"
 
-#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:118
+#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:117
 #, c-format
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "POP Before SMTP authentication attempted with a %s service"
@@ -2509,27 +2862,21 @@ msgstr "POP Before SMTP authentication attempted with a %s service"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Regular expression compilation failed: %s: %s"
 
-#: ../camel/camel-session.c:393
+#: ../camel/camel-session.c:415
 #, c-format
 msgid "Invalid GType registered for protocol '%s'"
 msgstr "Invalid GType registered for protocol '%s'"
 
-#: ../camel/camel-session.c:472
-#: ../camel/providers/imap/camel-imap-store.c:1143
-#: ../camel/providers/imapx/camel-imapx-server.c:2936
-#: ../camel/providers/pop3/camel-pop3-store.c:249
-#: ../camel/providers/pop3/camel-pop3-store.c:566
-#: ../camel/providers/smtp/camel-smtp-transport.c:455
-#, c-format
-msgid "No support for %s authentication"
-msgstr "No support for %s authentication"
-
-#: ../camel/camel-session.c:487
+#: ../camel/camel-session.c:509
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s authentication failed"
 
-#: ../camel/camel-session.c:1194
+#: ../camel/camel-session.c:645
+msgid "Forwarding messages is not supported"
+msgstr "Forwarding messages is not supported"
+
+#: ../camel/camel-session.c:1362
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "Please enter the %s password for %s on host %s."
@@ -2724,51 +3071,51 @@ msgstr "Failed to add data to encoder"
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME Decrypt: No encrypted content found"
 
-#: ../camel/camel-store.c:1799
+#: ../camel/camel-store.c:1838
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "Cannot create folder '%s': folder exists"
 
-#: ../camel/camel-store.c:1842
+#: ../camel/camel-store.c:1881
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Opening folder '%s'"
 
-#: ../camel/camel-store.c:2027
+#: ../camel/camel-store.c:2066
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Scanning folders in '%s'"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2039 ../camel/camel-store.c:2049
+#: ../camel/camel-store.c:2078 ../camel/camel-store.c:2088
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "Wastebasket"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2042 ../camel/camel-store.c:2053
+#: ../camel/camel-store.c:2081 ../camel/camel-store.c:2092
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "Junk"
 
-#: ../camel/camel-store.c:2501
+#: ../camel/camel-store.c:2540
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Cannot create folder: %s: folder exists"
 
-#: ../camel/camel-store.c:2515
+#: ../camel/camel-store.c:2554
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "Creating folder '%s'"
 
-#: ../camel/camel-store.c:2633 ../camel/camel-vee-store.c:352
-#: ../camel/providers/local/camel-maildir-store.c:300
+#: ../camel/camel-store.c:2672 ../camel/camel-vee-store.c:410
+#: ../camel/providers/local/camel-maildir-store.c:306
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Cannot delete folder: %s: Invalid operation"
 
-#: ../camel/camel-store.c:2776 ../camel/camel-vee-store.c:402
-#: ../camel/providers/local/camel-maildir-store.c:768
+#: ../camel/camel-store.c:2815 ../camel/camel-vee-store.c:460
+#: ../camel/providers/local/camel-maildir-store.c:788
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Cannot rename folder: %s: Invalid operation"
@@ -2777,6 +3124,10 @@ msgstr "Cannot rename folder: %s: Invalid operation"
 msgid "Only reset to beginning is supported with CamelStreamFilter"
 msgstr "Only reset to beginning is supported with CamelStreamFilter"
 
+#: ../camel/camel-stream-null.c:78
+msgid "Only reset to beginning is supported with CamelHttpStream"
+msgstr "Only reset to beginning is supported with CamelHttpStream"
+
 #: ../camel/camel-stream-process.c:267
 #, c-format
 msgid "Connection cancelled"
@@ -2787,6 +3138,16 @@ msgstr "Connection cancelled"
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Could not connect with command \"%s\": %s"
 
+#: ../camel/camel-subscribable.c:386
+#, c-format
+msgid "Subscribing to folder '%s'"
+msgstr "Subscribing to folder '%s'"
+
+#: ../camel/camel-subscribable.c:518
+#, c-format
+msgid "Unsubscribing from folder '%s'"
+msgstr "Unsubscribing from folder '%s'"
+
 #: ../camel/camel-tcp-stream-raw.c:310
 #, c-format
 msgid "NSPR error code %d"
@@ -2870,7 +3231,7 @@ msgstr "Hostname is too long (maximum is 255 characters)"
 msgid "Invalid reply from proxy server"
 msgstr "Invalid reply from proxy server"
 
-#: ../camel/camel-tcp-stream-ssl.c:474
+#: ../camel/camel-tcp-stream-ssl.c:502
 #, c-format
 msgid ""
 "   Issuer:       %s\n"
@@ -2883,16 +3244,16 @@ msgstr ""
 "   Fingerprint:  %s\n"
 "   Signature:    %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:480
+#: ../camel/camel-tcp-stream-ssl.c:508
 msgid "GOOD"
 msgstr "GOOD"
 
-#: ../camel/camel-tcp-stream-ssl.c:480
+#: ../camel/camel-tcp-stream-ssl.c:508
 msgid "BAD"
 msgstr "BAD"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:484
+#: ../camel/camel-tcp-stream-ssl.c:512
 #, c-format
 msgid ""
 "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
@@ -2905,19 +3266,19 @@ msgstr ""
 "Detailed information about the certificate:\n"
 "%s"
 
-#: ../camel/camel-tcp-stream-ssl.c:488
+#: ../camel/camel-tcp-stream-ssl.c:516
 msgid "_Reject"
 msgstr "_Reject"
 
-#: ../camel/camel-tcp-stream-ssl.c:489
+#: ../camel/camel-tcp-stream-ssl.c:517
 msgid "Accept _Temporarily"
 msgstr "Accept _Temporarily"
 
-#: ../camel/camel-tcp-stream-ssl.c:490
+#: ../camel/camel-tcp-stream-ssl.c:518
 msgid "_Accept Permanently"
 msgstr "_Accept Permanently"
 
-#: ../camel/camel-tcp-stream-ssl.c:548
+#: ../camel/camel-tcp-stream-ssl.c:579
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2926,7 +3287,7 @@ msgstr ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:600
+#: ../camel/camel-tcp-stream-ssl.c:631
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2935,7 +3296,7 @@ msgstr ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:618
+#: ../camel/camel-tcp-stream-ssl.c:649
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2944,7 +3305,7 @@ msgstr ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:635
+#: ../camel/camel-tcp-stream-ssl.c:666
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2958,42 +3319,50 @@ msgstr ""
 msgid "Could not parse URL '%s'"
 msgstr "Could not parse URL '%s'"
 
-#: ../camel/camel-vee-folder.c:652
+#: ../camel/camel-vee-folder.c:494
 #, c-format
-msgid "Updating %s folder"
-msgstr "Updating %s folder"
+msgid "Updating folder '%s'"
+msgstr "Updating folder '%s'"
 
-#: ../camel/camel-vee-folder.c:1326 ../camel/camel-vee-folder.c:1483
+#: ../camel/camel-vee-folder.c:855 ../camel/camel-vee-folder.c:965
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Cannot copy or move messages into a Virtual Folder"
 
-#: ../camel/camel-vee-folder.c:1359
+#: ../camel/camel-vee-folder.c:888
 #, c-format
 msgid "No such message %s in %s"
 msgstr "No such message %s in %s"
 
-#: ../camel/camel-vee-folder.c:1427
+#: ../camel/camel-vee-folder.c:941
 #, c-format
 msgid "Error storing '%s': "
 msgstr "Error storing '%s': "
 
+#: ../camel/camel-vee-folder.c:1169
+msgid "Automatically _update on change in source folders"
+msgstr "Automatically _update on change in source folders"
+
 #. Translators: 'Unmatched' is a folder name under Search folders where are shown
 #. * all messages not belonging into any other configured search folder
-#: ../camel/camel-vee-store.c:37
+#: ../camel/camel-vee-store.c:38
 msgid "Unmatched"
 msgstr "Unmatched"
 
-#: ../camel/camel-vee-store.c:378
+#: ../camel/camel-vee-store.c:436
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Cannot delete folder: %s: No such folder"
 
-#: ../camel/camel-vee-store.c:412
+#: ../camel/camel-vee-store.c:470
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Cannot rename folder: %s: No such folder"
 
+#: ../camel/camel-vee-store.c:532
+msgid "Enable _Unmatched folder"
+msgstr "Enable _Unmatched folder"
+
 #: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "Cannot copy messages to the Wastebasket folder"
@@ -3003,23 +3372,23 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Cannot copy messages to the Junk folder"
 
 #: ../camel/providers/imap/camel-imap-command.c:200
-#: ../camel/providers/imap/camel-imap-command.c:297
+#: ../camel/providers/imap/camel-imap-command.c:299
 #, c-format
 msgid "No output stream"
 msgstr "No output stream"
 
 #: ../camel/providers/imap/camel-imap-command.c:208
-#: ../camel/providers/imap/camel-imap-command.c:305
+#: ../camel/providers/imap/camel-imap-command.c:307
 #, c-format
 msgid "No input stream"
 msgstr "No input stream"
 
-#: ../camel/providers/imap/camel-imap-command.c:383
+#: ../camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server unexpectedly disconnected: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:416
+#: ../camel/providers/imap/camel-imap-command.c:425
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s in folder %s:\n"
@@ -3028,7 +3397,7 @@ msgstr ""
 "Alert from IMAP server %s %s in folder %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:420
+#: ../camel/providers/imap/camel-imap-command.c:429
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -3037,98 +3406,78 @@ msgstr ""
 "Alert from IMAP server %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:502
+#: ../camel/providers/imap/camel-imap-command.c:511
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Unexpected response from IMAP server: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:514
+#: ../camel/providers/imap/camel-imap-command.c:523
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP command failed: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:594
+#: ../camel/providers/imap/camel-imap-command.c:606
 #, c-format
 msgid "Server response ended too soon."
 msgstr "Server response ended too soon."
 
-#: ../camel/providers/imap/camel-imap-command.c:806
+#: ../camel/providers/imap/camel-imap-command.c:821
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP server response did not contain %s information"
 
-#: ../camel/providers/imap/camel-imap-command.c:844
+#: ../camel/providers/imap/camel-imap-command.c:859
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Unexpected OK response from IMAP server: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:348
+#: ../camel/providers/imap/camel-imap-folder.c:354
 msgid "Always check for _new mail in this folder"
 msgstr "Always check for _new mail in this folder"
 
-#: ../camel/providers/imap/camel-imap-folder.c:359
-#: ../camel/providers/imapx/camel-imapx-folder.c:767
-#: ../camel/providers/nntp/camel-nntp-folder.c:760
-msgid "Apply message _filters to this folder"
-msgstr "Apply message _filters to this folder"
-
-#: ../camel/providers/imap/camel-imap-folder.c:440
+#: ../camel/providers/imap/camel-imap-folder.c:445
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Could not create directory %s: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:461
+#: ../camel/providers/imap/camel-imap-folder.c:466
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Could not load summary for %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1127
-#: ../camel/providers/imapx/camel-imapx-server.c:3938
+#: ../camel/providers/imap/camel-imap-folder.c:1135
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "Scanning for changed messages in %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3486
+#: ../camel/providers/imap/camel-imap-folder.c:3480
 msgid "Unable to retrieve message: "
 msgstr "Unable to retrieve message: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:3523
-#: ../camel/providers/imapx/camel-imapx-server.c:5503
-#, c-format
-msgid "Cannot get message with message ID %s: %s"
-msgstr "Cannot get message with message ID %s: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3524
-#: ../camel/providers/imapx/camel-imapx-server.c:5504
-msgid "No such message available."
-msgstr "No such message available."
-
-#: ../camel/providers/imap/camel-imap-folder.c:3599
-#: ../camel/providers/imap/camel-imap-folder.c:4477
-#: ../camel/providers/nntp/camel-nntp-folder.c:515
+#: ../camel/providers/imap/camel-imap-folder.c:3594
+#: ../camel/providers/imap/camel-imap-folder.c:4485
+#: ../camel/providers/nntp/camel-nntp-folder.c:493
 #, c-format
 msgid "This message is not currently available"
 msgstr "This message is not currently available"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4058
-#: ../camel/providers/imap/camel-imap-folder.c:4141
-#: ../camel/providers/imapx/camel-imapx-server.c:3890
-#: ../camel/providers/imapx/camel-imapx-server.c:4070
+#: ../camel/providers/imap/camel-imap-folder.c:4059
+#: ../camel/providers/imap/camel-imap-folder.c:4140
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "Fetching summary information for new messages in %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4275
+#: ../camel/providers/imap/camel-imap-folder.c:4272
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "Incomplete server response: no information provided for message %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4285
+#: ../camel/providers/imap/camel-imap-folder.c:4282
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "Incomplete server response: no UID provided for message %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4517
+#: ../camel/providers/imap/camel-imap-folder.c:4522
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "Could not find message body in FETCH response."
@@ -3154,56 +3503,42 @@ msgid "Failed to cache %s: "
 msgstr "Failed to cache %s: "
 
 #: ../camel/providers/imap/camel-imap-provider.c:40
-#: ../camel/providers/imapx/camel-imapx-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:38
 msgid "Checking for New Mail"
 msgstr "Checking for New Mail"
 
 #: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
 msgid "C_heck for new messages in all folders"
 msgstr "C_heck for new messages in all folders"
 
 #: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "Ch_eck for new messages in subscribed folders"
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:52
-msgid "Connection to Server"
-msgstr "Connection to Server"
-
-#: ../camel/providers/imap/camel-imap-provider.c:50
-#: ../camel/providers/imapx/camel-imapx-provider.c:54
-msgid "_Use custom command to connect to server"
-msgstr "_Use custom command to connect to server"
-
-#: ../camel/providers/imap/camel-imap-provider.c:52
-msgid "Co_mmand:"
-msgstr "Co_mmand:"
-
-#: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:62
+#: ../camel/providers/imap/camel-imap-provider.c:47
+#: ../camel/providers/imapx/camel-imapx-provider.c:49
 #: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "Folders"
 msgstr "Folders"
 
-#: ../camel/providers/imap/camel-imap-provider.c:58
-#: ../camel/providers/imapx/camel-imapx-provider.c:64
+#: ../camel/providers/imap/camel-imap-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:51
 msgid "_Show only subscribed folders"
 msgstr "_Show only subscribed folders"
 
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imapx/camel-imapx-provider.c:67
+#: ../camel/providers/imap/camel-imap-provider.c:51
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
 msgid "O_verride server-supplied folder namespace"
 msgstr "O_verride server-supplied folder namespace"
 
-#: ../camel/providers/imap/camel-imap-provider.c:62
+#: ../camel/providers/imap/camel-imap-provider.c:53
 msgid "Names_pace:"
 msgstr "Names_pace:"
 
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imapx/camel-imapx-provider.c:72
+#: ../camel/providers/imap/camel-imap-provider.c:55
+#: ../camel/providers/imapx/camel-imapx-provider.c:59
 #: ../camel/providers/local/camel-local-provider.c:41
 #: ../camel/providers/local/camel-local-provider.c:77
 #: ../camel/providers/local/camel-local-provider.c:97
@@ -3211,353 +3546,113 @@ msgstr "Names_pace:"
 msgid "Options"
 msgstr "Options"
 
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
+#: ../camel/providers/imap/camel-imap-provider.c:57
+#: ../camel/providers/imapx/camel-imapx-provider.c:61
 #: ../camel/providers/nntp/camel-nntp-provider.c:43
 msgid "Apply _filters to new messages in all folders"
 msgstr "Apply _filters to new messages in all folders"
 
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imapx/camel-imapx-provider.c:76
+#: ../camel/providers/imap/camel-imap-provider.c:59
+#: ../camel/providers/imapx/camel-imapx-provider.c:63
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr "_Apply filters to new messages in Inbox on this server"
 
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imapx/camel-imapx-provider.c:78
+#: ../camel/providers/imap/camel-imap-provider.c:61
+#: ../camel/providers/imapx/camel-imapx-provider.c:65
 msgid "Check new messages for _Junk contents"
 msgstr "Check new messages for _Junk contents"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
-#: ../camel/providers/imapx/camel-imapx-provider.c:80
+#: ../camel/providers/imap/camel-imap-provider.c:63
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "Only check for Junk messages in the IN_BOX folder"
 
-#: ../camel/providers/imap/camel-imap-provider.c:74
-#: ../camel/providers/imapx/camel-imapx-provider.c:82
+#: ../camel/providers/imap/camel-imap-provider.c:65
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "Automatically synchroni_se remote mail locally"
 
-#: ../camel/providers/imap/camel-imap-provider.c:80
+#: ../camel/providers/imap/camel-imap-provider.c:71
 msgid "IMAP default port"
 msgstr "IMAP default port"
 
-#: ../camel/providers/imap/camel-imap-provider.c:81
-#: ../camel/providers/imapx/camel-imapx-provider.c:89
+#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "IMAP over SSL"
 msgstr "IMAP over SSL"
 
-#: ../camel/providers/imap/camel-imap-provider.c:87
+#: ../camel/providers/imap/camel-imap-provider.c:78
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:89
-#: ../camel/providers/imapx/camel-imapx-provider.c:98
-msgid "For reading and storing mail on IMAP servers."
-msgstr "For reading and storing mail on IMAP servers."
-
-#: ../camel/providers/imap/camel-imap-provider.c:107
-#: ../camel/providers/imapx/camel-imapx-provider.c:118
-#: ../camel/providers/nntp/camel-nntp-provider.c:84
-#: ../camel/providers/pop3/camel-pop3-provider.c:82
-msgid "Password"
-msgstr "Password"
-
-#: ../camel/providers/imap/camel-imap-provider.c:109
-#: ../camel/providers/imapx/camel-imapx-provider.c:120
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-"This option will connect to the IMAP server using a plaintext password."
-
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:272
-#: ../camel/providers/imap/camel-imap-store.c:2694
-#: ../camel/providers/imapx/camel-imapx-store.c:373
-#: ../camel/providers/imapx/camel-imapx-store.c:844
-#: ../camel/providers/local/camel-maildir-folder.c:471
-#: ../camel/providers/local/camel-maildir-store.c:301
-#: ../camel/providers/local/camel-maildir-store.c:679
-#: ../camel/providers/local/camel-maildir-store.c:685
-#: ../camel/providers/local/camel-maildir-store.c:769
-#: ../camel/providers/local/camel-spool-store.c:387
-msgid "Inbox"
-msgstr "Inbox"
-
-#: ../camel/providers/imap/camel-imap-store.c:409
-#: ../camel/providers/imap/camel-imap-store.c:463
-#: ../camel/providers/imapx/camel-imapx-server.c:2818
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Failed to connect to IMAP server %s in secure mode: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:410
-#: ../camel/providers/imapx/camel-imapx-server.c:2819
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
-msgid "STARTTLS not supported"
-msgstr "STARTTLS not supported"
-
-#: ../camel/providers/imap/camel-imap-store.c:435
-#: ../camel/providers/imapx/camel-imapx-server.c:2858
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: "
-msgstr "Failed to connect to IMAP server %s in secure mode: "
-
-#: ../camel/providers/imap/camel-imap-store.c:734
-#: ../camel/providers/imapx/camel-imapx-server.c:2925
-#, c-format
-msgid "IMAP server %s does not support %s authentication"
-msgstr "IMAP server %s does not support %s authentication"
-
-#: ../camel/providers/imap/camel-imap-store.c:809
-#: ../camel/providers/imapx/camel-imapx-store.c:155
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP server %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:812
-#: ../camel/providers/imapx/camel-imapx-store.c:158
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP service for %s on %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:1111
-#: ../camel/providers/imapx/camel-imapx-server.c:2955
-#: ../camel/providers/nntp/camel-nntp-store.c:505
-msgid "Cannot authenticate without a username"
-msgstr "Cannot authenticate without a username"
-
-#: ../camel/providers/imap/camel-imap-store.c:1119
-#: ../camel/providers/imapx/camel-imapx-server.c:2964
-#: ../camel/providers/nntp/camel-nntp-store.c:514
-#: ../camel/providers/pop3/camel-pop3-store.c:491
-#: ../camel/providers/pop3/camel-pop3-store.c:511
-msgid "Authentication password not available"
-msgstr "Authentication password not available"
-
-#: ../camel/providers/imap/camel-imap-store.c:2065
-#: ../camel/providers/imap/camel-imap-store.c:2269
-#: ../camel/providers/imapx/camel-imapx-store.c:348
-#, c-format
-msgid "No such folder %s"
-msgstr "No such folder %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:2079
-#: ../camel/providers/imap/camel-imap-store.c:2538
-#: ../camel/providers/imapx/camel-imapx-store.c:1388
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-
-#: ../camel/providers/imap/camel-imap-store.c:2143
-#: ../camel/providers/imap/camel-imap-store.c:2602
-#: ../camel/providers/imapx/camel-imapx-store.c:1409
-#, c-format
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "The parent folder is not allowed to contain subfolders"
-
-#: ../camel/providers/imap/camel-imap-store.c:2196
-#: ../camel/providers/local/camel-maildir-store.c:268
-#: ../camel/providers/local/camel-mbox-store.c:421
-#: ../camel/providers/local/camel-mh-store.c:558
-#, c-format
-msgid "Cannot create folder '%s': folder exists."
-msgstr "Cannot create folder '%s': folder exists."
-
-#: ../camel/providers/imap/camel-imap-store.c:2551
-#: ../camel/providers/imapx/camel-imapx-store.c:1399
-#, c-format
-msgid "Unknown parent folder: %s"
-msgstr "Unknown parent folder: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:3326
-#, c-format
-msgid "Server unexpectedly disconnected"
-msgstr "Server unexpectedly disconnected"
-
-#: ../camel/providers/imap/camel-imap-store.c:3329
-msgid "Server unexpectedly disconnected: "
-msgstr "Server unexpectedly disconnected: "
-
-#: ../camel/providers/imapx/camel-imapx-folder.c:101
-#, c-format
-msgid "Could not create folder summary for %s"
-msgstr "Could not create folder summary for %s"
-
-#: ../camel/providers/imapx/camel-imapx-folder.c:109
-#, c-format
-msgid "Could not create cache for %s: "
-msgstr "Could not create cache for %s: "
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
-msgid "Use _Quick Resync if the server supports it"
-msgstr "Use _Quick Resync if the server supports it"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:48
-msgid "_Listen for server change notifications"
-msgstr "_Listen for server change notifications"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:56
-msgid "Command:"
-msgstr "Command:"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:58
-msgid "Numbe_r of cached connections to use"
-msgstr "Numbe_r of cached connections to use"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:69
-msgid "Namespace:"
-msgstr "Namespace:"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
-msgid "Default IMAP port"
-msgstr "Default IMAP port"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:96
-msgid "IMAP+"
-msgstr "IMAP+"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:817
-msgid "Server disconnected"
-msgstr "Server disconnected"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:1203
-msgid "Error writing to cache stream: "
-msgstr "Error writing to cache stream: "
-
-#: ../camel/providers/imapx/camel-imapx-server.c:1930
-#, c-format
-msgid "Not authenticated"
-msgstr "Not authenticated"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:1995
-msgid "Error performing IDLE"
-msgstr "Error performing IDLE"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3150
-msgid "Error fetching message"
-msgstr "Error fetching message"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3218
-msgid "Closing tmp stream failed: "
-msgstr "Closing tmp stream failed: "
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3317
-msgid "Error copying messages"
-msgstr "Error copying messages"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3447
-msgid "Error appending message"
-msgstr "Error appending message"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3627
-msgid "Error fetching message headers"
-msgstr "Error fetching message headers"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3768
-msgid "Error retrieving message"
-msgstr "Error retrieving message"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3971
-msgid "Error fetching new messages"
-msgstr "Error fetching new messages"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4161
-msgid "Error while fetching messages"
-msgstr "Error while fetching messages"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4169
-#: ../camel/providers/imapx/camel-imapx-server.c:4199
-#, c-format
-msgid "Fetching summary information for %d message in %s"
-msgid_plural "Fetching summary information for %d messages in %s"
-msgstr[0] "Fetching summary information for %d message in %s"
-msgstr[1] "Fetching summary information for %d messages in %s"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4321
-#: ../camel/providers/imapx/camel-imapx-server.c:4355
-msgid "Error refreshing folder"
-msgstr "Error refreshing folder"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4444
-msgid "Error expunging message"
-msgstr "Error expunging message"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4528
-msgid "Error fetching folders"
-msgstr "Error fetching folders"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4602
-msgid "Error subscribing to folder"
-msgstr "Error subscribing to folder"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4655
-msgid "Error creating folder"
-msgstr "Error creating folder"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4700
-msgid "Error deleting folder"
-msgstr "Error deleting folder"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4750
-msgid "Error renaming folder"
-msgstr "Error renaming folder"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4801
-msgid "Error performing NOOP"
-msgstr "Error performing NOOP"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4896
-msgid "Error syncing changes"
-msgstr "Error syncing changes"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:5658
-#: ../camel/providers/imapx/camel-imapx-server.c:5673
-msgid "Cannot create spool file: "
-msgstr "Cannot create spool file: "
+#: ../camel/providers/imap/camel-imap-provider.c:80
+#: ../camel/providers/imapx/camel-imapx-provider.c:85
+msgid "For reading and storing mail on IMAP servers."
+msgstr "For reading and storing mail on IMAP servers."
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1076
+#: ../camel/providers/imap/camel-imap-store.c:2186
+#: ../camel/providers/local/camel-maildir-store.c:274
+#: ../camel/providers/local/camel-mbox-store.c:442
+#: ../camel/providers/local/camel-mh-store.c:564
 #, c-format
-msgid "Retrieving folder list for %s"
-msgstr "Retrieving folder list for %s"
+msgid "Cannot create folder '%s': folder exists."
+msgstr "Cannot create folder '%s': folder exists."
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1176
-#: ../camel/providers/nntp/camel-nntp-store.c:1790
+#: ../camel/providers/imap/camel-imap-store.c:2961
 #, c-format
-msgid "No such folder: %s"
-msgstr "No such folder: %s"
+msgid "Retrieving list of folders at '%s'"
+msgstr "Retrieving list of folders at '%s'"
 
-#: ../camel/providers/imapx/camel-imapx-stream.c:70
+#: ../camel/providers/imap/camel-imap-store.c:3309
 #, c-format
-msgid "Source stream returned no data"
-msgstr "Source stream returned no data"
+msgid "Server unexpectedly disconnected"
+msgstr "Server unexpectedly disconnected"
 
-#: ../camel/providers/imapx/camel-imapx-stream.c:79
-#, c-format
-msgid "Source stream unavailable"
-msgstr "Source stream unavailable"
+#: ../camel/providers/imap/camel-imap-store.c:3312
+msgid "Server unexpectedly disconnected: "
+msgstr "Server unexpectedly disconnected: "
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
+msgid "Use _Quick Resync if the server supports it"
+msgstr "Use _Quick Resync if the server supports it"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
+msgid "_Listen for server change notifications"
+msgstr "_Listen for server change notifications"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "Namespace:"
+msgstr "Namespace:"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
+msgid "Default IMAP port"
+msgstr "Default IMAP port"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:83
+msgid "IMAP+"
+msgstr "IMAP+"
 
-#: ../camel/providers/local/camel-local-folder.c:191
+#: ../camel/providers/local/camel-local-folder.c:194
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:201
-#: ../camel/providers/local/camel-local-folder.c:210
+#: ../camel/providers/local/camel-local-folder.c:204
+#: ../camel/providers/local/camel-local-folder.c:213
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "mailbox: %s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:219
+#: ../camel/providers/local/camel-local-folder.c:222
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:492
+#: ../camel/providers/local/camel-local-folder.c:499
 msgid "_Index message body data"
 msgstr "_Index message body data"
 
-#: ../camel/providers/local/camel-local-folder.c:721
+#: ../camel/providers/local/camel-local-folder.c:727
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3629,51 +3724,51 @@ msgstr "Standard Unix mbox spool directory"
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Could not rename folder %s to %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:178
+#: ../camel/providers/local/camel-local-store.c:180
 #, c-format
 msgid "Local mail file %s"
 msgstr "Local mail file %s"
 
-#: ../camel/providers/local/camel-local-store.c:218
-#: ../camel/providers/local/camel-local-store.c:375
-#: ../camel/providers/local/camel-maildir-store.c:101
-#: ../camel/providers/local/camel-mbox-store.c:555
-#: ../camel/providers/local/camel-spool-store.c:86
+#: ../camel/providers/local/camel-local-store.c:223
+#: ../camel/providers/local/camel-local-store.c:383
+#: ../camel/providers/local/camel-maildir-store.c:104
+#: ../camel/providers/local/camel-mbox-store.c:581
+#: ../camel/providers/local/camel-spool-store.c:89
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Store root %s is not an absolute path"
 
-#: ../camel/providers/local/camel-local-store.c:227
+#: ../camel/providers/local/camel-local-store.c:232
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Store root %s is not a regular directory"
 
-#: ../camel/providers/local/camel-local-store.c:239
-#: ../camel/providers/local/camel-local-store.c:249
-#: ../camel/providers/local/camel-local-store.c:388
-#: ../camel/providers/local/camel-maildir-store.c:134
+#: ../camel/providers/local/camel-local-store.c:244
+#: ../camel/providers/local/camel-local-store.c:254
+#: ../camel/providers/local/camel-local-store.c:396
+#: ../camel/providers/local/camel-maildir-store.c:137
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Cannot get folder: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:286
+#: ../camel/providers/local/camel-local-store.c:291
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "Local stores do not have an inbox"
 
-#: ../camel/providers/local/camel-local-store.c:445
-#: ../camel/providers/local/camel-mbox-store.c:722
+#: ../camel/providers/local/camel-local-store.c:456
+#: ../camel/providers/local/camel-mbox-store.c:748
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "Could not delete folder index file '%s': %s"
 
-#: ../camel/providers/local/camel-local-store.c:473
-#: ../camel/providers/local/camel-mbox-store.c:752
+#: ../camel/providers/local/camel-local-store.c:484
+#: ../camel/providers/local/camel-mbox-store.c:778
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "Could not delete folder meta file '%s': %s"
 
-#: ../camel/providers/local/camel-local-store.c:581
+#: ../camel/providers/local/camel-local-store.c:596
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Could not rename '%s': %s"
@@ -3684,113 +3779,113 @@ msgid "Unable to add message to summary: unknown reason"
 msgstr "Unable to add message to summary: unknown reason"
 
 #: ../camel/providers/local/camel-maildir-folder.c:100
-#: ../camel/providers/local/camel-maildir-folder.c:336
+#: ../camel/providers/local/camel-maildir-folder.c:335
 #: ../camel/providers/local/camel-mbox-folder.c:117
 #: ../camel/providers/local/camel-mbox-folder.c:329
-#: ../camel/providers/local/camel-mh-folder.c:160
+#: ../camel/providers/local/camel-mh-folder.c:159
 msgid "No such message"
 msgstr "No such message"
 
-#: ../camel/providers/local/camel-maildir-folder.c:226
+#: ../camel/providers/local/camel-maildir-folder.c:225
 #, c-format
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "Cannot append message to maildir folder: %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:274
-#: ../camel/providers/local/camel-maildir-folder.c:284
+#: ../camel/providers/local/camel-maildir-folder.c:273
+#: ../camel/providers/local/camel-maildir-folder.c:283
 #: ../camel/providers/local/camel-mbox-folder.c:390
-#: ../camel/providers/local/camel-mh-folder.c:172
-#: ../camel/providers/local/camel-mh-folder.c:182
+#: ../camel/providers/local/camel-mh-folder.c:171
+#: ../camel/providers/local/camel-mh-folder.c:181
 #, c-format
 msgid "Cannot get message %s from folder %s: "
 msgstr "Cannot get message %s from folder %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:354
+#: ../camel/providers/local/camel-maildir-folder.c:353
 #, c-format
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "Cannot transfer message to destination folder: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:109
+#: ../camel/providers/local/camel-maildir-store.c:112
 #, c-format
 msgid "Cannot create folder: %s: Folder name cannot contain a dot"
 msgstr "Cannot create folder: %s: Folder name cannot contain a dot"
 
-#: ../camel/providers/local/camel-maildir-store.c:119
-#: ../camel/providers/local/camel-maildir-store.c:786
+#: ../camel/providers/local/camel-maildir-store.c:122
+#: ../camel/providers/local/camel-maildir-store.c:806
 #, c-format
 msgid "Folder %s already exists"
 msgstr "Folder %s already exists"
 
-#: ../camel/providers/local/camel-maildir-store.c:215
-#: ../camel/providers/local/camel-maildir-store.c:246
-#: ../camel/providers/local/camel-mbox-store.c:389
+#: ../camel/providers/local/camel-maildir-store.c:221
+#: ../camel/providers/local/camel-maildir-store.c:252
 #: ../camel/providers/local/camel-mbox-store.c:403
+#: ../camel/providers/local/camel-mbox-store.c:424
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "Cannot create folder '%s': %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:230
-#: ../camel/providers/local/camel-mbox-store.c:355
-#: ../camel/providers/local/camel-mh-store.c:516
+#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-mbox-store.c:369
+#: ../camel/providers/local/camel-mh-store.c:522
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "Cannot get folder '%s': %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:236
-#: ../camel/providers/local/camel-mbox-store.c:365
-#: ../camel/providers/local/camel-mh-store.c:525
+#: ../camel/providers/local/camel-maildir-store.c:242
+#: ../camel/providers/local/camel-mbox-store.c:379
+#: ../camel/providers/local/camel-mh-store.c:531
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "Cannot get folder '%s': folder does not exist."
 
-#: ../camel/providers/local/camel-maildir-store.c:263
+#: ../camel/providers/local/camel-maildir-store.c:269
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "Cannot get folder '%s': not a maildir directory."
 
-#: ../camel/providers/local/camel-maildir-store.c:329
-#: ../camel/providers/local/camel-maildir-store.c:369
-#: ../camel/providers/local/camel-mh-store.c:670
+#: ../camel/providers/local/camel-maildir-store.c:338
+#: ../camel/providers/local/camel-maildir-store.c:378
+#: ../camel/providers/local/camel-mh-store.c:682
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "Could not delete folder '%s': %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:331
+#: ../camel/providers/local/camel-maildir-store.c:340
 msgid "not a maildir directory"
 msgstr "not a maildir directory"
 
-#: ../camel/providers/local/camel-maildir-store.c:569
-#: ../camel/providers/local/camel-maildir-store.c:974
-#: ../camel/providers/local/camel-spool-store.c:209
-#: ../camel/providers/local/camel-spool-store.c:228
+#: ../camel/providers/local/camel-maildir-store.c:589
+#: ../camel/providers/local/camel-maildir-store.c:1003
+#: ../camel/providers/local/camel-spool-store.c:212
+#: ../camel/providers/local/camel-spool-store.c:231
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "Could not scan folder '%s': %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:777
+#: ../camel/providers/local/camel-maildir-store.c:797
 #, c-format
 msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
 msgstr "Cannot rename the folder: %s: Folder name cannot contain a dot"
 
-#: ../camel/providers/local/camel-maildir-summary.c:416
-#: ../camel/providers/local/camel-maildir-summary.c:549
+#: ../camel/providers/local/camel-maildir-summary.c:434
+#: ../camel/providers/local/camel-maildir-summary.c:567
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Cannot open maildir directory path: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:540
+#: ../camel/providers/local/camel-maildir-summary.c:558
 msgid "Checking folder consistency"
 msgstr "Checking folder consistency"
 
-#: ../camel/providers/local/camel-maildir-summary.c:633
+#: ../camel/providers/local/camel-maildir-summary.c:651
 msgid "Checking for new messages"
 msgstr "Checking for new messages"
 
-#: ../camel/providers/local/camel-maildir-summary.c:728
+#: ../camel/providers/local/camel-maildir-summary.c:746
 #: ../camel/providers/local/camel-mbox-summary.c:418
-#: ../camel/providers/local/camel-mbox-summary.c:649
-#: ../camel/providers/local/camel-mbox-summary.c:793
-#: ../camel/providers/local/camel-spool-summary.c:130
+#: ../camel/providers/local/camel-mbox-summary.c:650
+#: ../camel/providers/local/camel-mbox-summary.c:794
+#: ../camel/providers/local/camel-spool-summary.c:132
 msgid "Storing folder"
 msgstr "Storing folder"
 
@@ -3809,39 +3904,39 @@ msgid "The folder appears to be irrecoverably corrupted."
 msgstr "The folder appears to be irrecoverably corrupted."
 
 #: ../camel/providers/local/camel-mbox-folder.c:439
-#: ../camel/providers/local/camel-spool-folder.c:70
+#: ../camel/providers/local/camel-spool-folder.c:69
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Cannot create folder lock on %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:377
-#: ../camel/providers/local/camel-mbox-store.c:563
+#: ../camel/providers/local/camel-mbox-store.c:391
+#: ../camel/providers/local/camel-mbox-store.c:589
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "Cannot create a folder by this name."
 
-#: ../camel/providers/local/camel-mbox-store.c:414
+#: ../camel/providers/local/camel-mbox-store.c:435
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "Cannot get folder '%s': not a regular file."
 
-#: ../camel/providers/local/camel-mbox-store.c:579
+#: ../camel/providers/local/camel-mbox-store.c:605
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "Cannot create directory '%s': %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:591
+#: ../camel/providers/local/camel-mbox-store.c:617
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Cannot create folder: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:593
+#: ../camel/providers/local/camel-mbox-store.c:619
 msgid "Folder already exists"
 msgstr "Folder already exists"
 
-#: ../camel/providers/local/camel-mbox-store.c:633
-#: ../camel/providers/local/camel-mbox-store.c:646
-#: ../camel/providers/local/camel-mbox-store.c:675
+#: ../camel/providers/local/camel-mbox-store.c:659
+#: ../camel/providers/local/camel-mbox-store.c:672
+#: ../camel/providers/local/camel-mbox-store.c:701
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3850,33 +3945,33 @@ msgstr ""
 "Could not delete folder '%s':\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:656
+#: ../camel/providers/local/camel-mbox-store.c:682
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "'%s' is not a regular file."
 
-#: ../camel/providers/local/camel-mbox-store.c:665
+#: ../camel/providers/local/camel-mbox-store.c:691
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "Folder '%s' is not empty. Not deleted."
 
-#: ../camel/providers/local/camel-mbox-store.c:692
-#: ../camel/providers/local/camel-mbox-store.c:707
+#: ../camel/providers/local/camel-mbox-store.c:718
+#: ../camel/providers/local/camel-mbox-store.c:733
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "Could not delete folder summary file '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:789
+#: ../camel/providers/local/camel-mbox-store.c:815
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "The new folder name is illegal."
 
-#: ../camel/providers/local/camel-mbox-store.c:805
+#: ../camel/providers/local/camel-mbox-store.c:831
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "Could not rename '%s': '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:888
+#: ../camel/providers/local/camel-mbox-store.c:915
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Could not rename '%s' to %s: %s"
@@ -3891,48 +3986,48 @@ msgstr "Could not open folder: %s: %s"
 msgid "Fatal mail parser error near position %s in folder %s"
 msgstr "Fatal mail parser error near position %s in folder %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:574
+#: ../camel/providers/local/camel-mbox-summary.c:575
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Cannot check folder: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:662
-#: ../camel/providers/local/camel-mbox-summary.c:802
-#: ../camel/providers/local/camel-spool-summary.c:137
+#: ../camel/providers/local/camel-mbox-summary.c:663
+#: ../camel/providers/local/camel-mbox-summary.c:803
+#: ../camel/providers/local/camel-spool-summary.c:139
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Could not open file: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:676
-#: ../camel/providers/local/camel-spool-summary.c:152
+#: ../camel/providers/local/camel-mbox-summary.c:677
+#: ../camel/providers/local/camel-spool-summary.c:154
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Cannot open temporary mailbox: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:693
-#: ../camel/providers/local/camel-mbox-summary.c:918
+#: ../camel/providers/local/camel-mbox-summary.c:694
+#: ../camel/providers/local/camel-mbox-summary.c:919
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Could not close source folder %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:704
+#: ../camel/providers/local/camel-mbox-summary.c:705
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:721
+#: ../camel/providers/local/camel-mbox-summary.c:722
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Could not rename folder: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:816
-#: ../camel/providers/local/camel-mbox-summary.c:1084
+#: ../camel/providers/local/camel-mbox-summary.c:817
+#: ../camel/providers/local/camel-mbox-summary.c:1085
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Could not store folder: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:855
-#: ../camel/providers/local/camel-mbox-summary.c:1115
+#: ../camel/providers/local/camel-mbox-summary.c:856
+#: ../camel/providers/local/camel-mbox-summary.c:1116
 #, c-format
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
@@ -3941,40 +4036,40 @@ msgstr ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
 "it.)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:864
-#: ../camel/providers/local/camel-mbox-summary.c:1124
+#: ../camel/providers/local/camel-mbox-summary.c:865
+#: ../camel/providers/local/camel-mbox-summary.c:1125
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Summary and folder mismatch, even after a sync"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1029
-#: ../camel/providers/local/camel-spool-summary.c:345
+#: ../camel/providers/local/camel-mbox-summary.c:1030
+#: ../camel/providers/local/camel-spool-summary.c:347
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Unknown error: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1182
-#: ../camel/providers/local/camel-mbox-summary.c:1212
+#: ../camel/providers/local/camel-mbox-summary.c:1183
+#: ../camel/providers/local/camel-mbox-summary.c:1213
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "Writing to temporary mailbox failed: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1201
+#: ../camel/providers/local/camel-mbox-summary.c:1202
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "Writing to temporary mailbox failed: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:119
+#: ../camel/providers/local/camel-mh-folder.c:118
 #, c-format
 msgid "Cannot append message to mh folder: %s: "
 msgstr "Cannot append message to mh folder: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:535
+#: ../camel/providers/local/camel-mh-store.c:541
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "Could not create folder '%s': %s"
 
-#: ../camel/providers/local/camel-mh-store.c:551
+#: ../camel/providers/local/camel-mh-store.c:557
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "Cannot get folder '%s': not a directory."
@@ -3984,36 +4079,36 @@ msgstr "Cannot get folder '%s': not a directory."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Cannot open MH directory path: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:94
+#: ../camel/providers/local/camel-spool-store.c:97
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "Spool '%s' cannot be opened: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:108
+#: ../camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "Spool '%s' is not a regular file or directory"
 
-#: ../camel/providers/local/camel-spool-store.c:416
+#: ../camel/providers/local/camel-spool-store.c:425
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool mail file %s"
 
-#: ../camel/providers/local/camel-spool-store.c:420
+#: ../camel/providers/local/camel-spool-store.c:429
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Spool folder tree %s"
 
-#: ../camel/providers/local/camel-spool-store.c:423
+#: ../camel/providers/local/camel-spool-store.c:432
 msgid "Invalid spool"
 msgstr "Invalid spool"
 
-#: ../camel/providers/local/camel-spool-store.c:480
+#: ../camel/providers/local/camel-spool-store.c:492
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "Folder '%s/%s' does not exist."
 
-#: ../camel/providers/local/camel-spool-store.c:493
+#: ../camel/providers/local/camel-spool-store.c:505
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -4022,12 +4117,12 @@ msgstr ""
 "Could not open folder '%s':\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:499
+#: ../camel/providers/local/camel-spool-store.c:511
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "Folder '%s' does not exist."
 
-#: ../camel/providers/local/camel-spool-store.c:507
+#: ../camel/providers/local/camel-spool-store.c:519
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -4036,41 +4131,41 @@ msgstr ""
 "Could not create folder '%s':\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:520
+#: ../camel/providers/local/camel-spool-store.c:532
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "'%s' is not a mailbox file."
 
-#: ../camel/providers/local/camel-spool-store.c:584
+#: ../camel/providers/local/camel-spool-store.c:596
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "Store does not support an INBOX"
 
-#: ../camel/providers/local/camel-spool-store.c:603
+#: ../camel/providers/local/camel-spool-store.c:615
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "Spool folders cannot be deleted"
 
-#: ../camel/providers/local/camel-spool-store.c:618
+#: ../camel/providers/local/camel-spool-store.c:630
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "Spool folders cannot be renamed"
 
-#: ../camel/providers/local/camel-spool-summary.c:168
-#: ../camel/providers/local/camel-spool-summary.c:180
-#: ../camel/providers/local/camel-spool-summary.c:192
+#: ../camel/providers/local/camel-spool-summary.c:170
+#: ../camel/providers/local/camel-spool-summary.c:182
+#: ../camel/providers/local/camel-spool-summary.c:194
 #, c-format
 msgid "Could not synchronize temporary folder %s: %s"
 msgstr "Could not synchronise temporary folder %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:210
+#: ../camel/providers/local/camel-spool-summary.c:212
 #, c-format
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "Could not synchronise spool folder %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:242
-#: ../camel/providers/local/camel-spool-summary.c:261
-#: ../camel/providers/local/camel-spool-summary.c:274
+#: ../camel/providers/local/camel-spool-summary.c:244
+#: ../camel/providers/local/camel-spool-summary.c:263
+#: ../camel/providers/local/camel-spool-summary.c:276
 #, c-format
 msgid ""
 "Could not synchronize spool folder %s: %s\n"
@@ -4079,47 +4174,47 @@ msgstr ""
 "Could not synchronise spool folder %s: %s\n"
 "Folder may be corrupt; copy saved in '%s'"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:290
-#: ../camel/providers/nntp/camel-nntp-folder.c:379
-#: ../camel/providers/nntp/camel-nntp-folder.c:501
+#: ../camel/providers/nntp/camel-nntp-folder.c:278
+#: ../camel/providers/nntp/camel-nntp-folder.c:360
+#: ../camel/providers/nntp/camel-nntp-folder.c:481
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "Internal error: UID in invalid format: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:340
-#: ../camel/providers/nntp/camel-nntp-folder.c:344
-#: ../camel/providers/pop3/camel-pop3-folder.c:611
-#: ../camel/providers/pop3/camel-pop3-folder.c:995
+#: ../camel/providers/nntp/camel-nntp-folder.c:328
+#: ../camel/providers/nntp/camel-nntp-folder.c:332
+#: ../camel/providers/pop3/camel-pop3-folder.c:610
+#: ../camel/providers/pop3/camel-pop3-folder.c:1005
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Cannot get message %s: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:351
-#: ../camel/providers/nntp/camel-nntp-folder.c:526
-#: ../camel/providers/pop3/camel-pop3-folder.c:549
-#: ../camel/providers/pop3/camel-pop3-folder.c:601
-#: ../camel/providers/pop3/camel-pop3-folder.c:620
+#: ../camel/providers/nntp/camel-nntp-folder.c:339
+#: ../camel/providers/nntp/camel-nntp-folder.c:504
+#: ../camel/providers/pop3/camel-pop3-folder.c:548
+#: ../camel/providers/pop3/camel-pop3-folder.c:600
+#: ../camel/providers/pop3/camel-pop3-folder.c:619
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "Cannot get message %s: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:585
-#: ../camel/providers/nntp/camel-nntp-folder.c:591
-#: ../camel/providers/nntp/camel-nntp-folder.c:638
+#: ../camel/providers/nntp/camel-nntp-folder.c:559
+#: ../camel/providers/nntp/camel-nntp-folder.c:565
+#: ../camel/providers/nntp/camel-nntp-folder.c:611
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Posting failed: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:633
+#: ../camel/providers/nntp/camel-nntp-folder.c:606
 msgid "Posting failed: "
 msgstr "Posting failed: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:662
+#: ../camel/providers/nntp/camel-nntp-folder.c:633
 #, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "You cannot post NNTP messages while working offline!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:682
+#: ../camel/providers/nntp/camel-nntp-folder.c:653
 #, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "You cannot copy messages from a NNTP folder!"
@@ -4130,27 +4225,27 @@ msgid ""
 msgstr ""
 "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:50
+#: ../camel/providers/nntp/camel-nntp-provider.c:51
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "In the subscription _dialogue, show relative folder names"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:56
+#: ../camel/providers/nntp/camel-nntp-provider.c:57
 msgid "Default NNTP port"
 msgstr "Default NNTP port"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:58
 msgid "NNTP over SSL"
 msgstr "NNTP over SSL"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:63
+#: ../camel/providers/nntp/camel-nntp-provider.c:64
 msgid "USENET news"
 msgstr "USENET news"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:65
+#: ../camel/providers/nntp/camel-nntp-provider.c:66
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "This is a provider for reading from and posting to USENET newsgroups."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:86
+#: ../camel/providers/nntp/camel-nntp-provider.c:87
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4158,22 +4253,22 @@ msgstr ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:285
+#: ../camel/providers/nntp/camel-nntp-store.c:286
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "Could not read greeting from %s: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:297
+#: ../camel/providers/nntp/camel-nntp-store.c:298
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP server %s returned error code %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:469
+#: ../camel/providers/nntp/camel-nntp-store.c:463
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News via %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1072
+#: ../camel/providers/nntp/camel-nntp-store.c:1058
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4184,22 +4279,22 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1165
+#: ../camel/providers/nntp/camel-nntp-store.c:1150
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "You cannot create a folder in a News store: subscribe instead."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1181
+#: ../camel/providers/nntp/camel-nntp-store.c:1166
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "You cannot rename a folder in a News store."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1204
+#: ../camel/providers/nntp/camel-nntp-store.c:1189
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "You cannot remove a folder in a News store: unsubscribe instead."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1402
+#: ../camel/providers/nntp/camel-nntp-store.c:1388
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4210,7 +4305,7 @@ msgstr ""
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1453
+#: ../camel/providers/nntp/camel-nntp-store.c:1436
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4221,64 +4316,64 @@ msgstr ""
 "\n"
 "newsgroup does not exist!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1647
+#: ../camel/providers/nntp/camel-nntp-store.c:1626
 msgid "NNTP Command failed: "
 msgstr "NNTP Command failed: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1732
+#: ../camel/providers/nntp/camel-nntp-store.c:1711
 #, c-format
 msgid "Not connected."
 msgstr "Not connected."
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:195
-#: ../camel/providers/nntp/camel-nntp-summary.c:322
+#: ../camel/providers/nntp/camel-nntp-summary.c:198
+#: ../camel/providers/nntp/camel-nntp-summary.c:328
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Scanning new messages"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:213
+#: ../camel/providers/nntp/camel-nntp-summary.c:216
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "Unexpected server response from xover: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:340
+#: ../camel/providers/nntp/camel-nntp-summary.c:346
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "Unexpected server response from head: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:387
+#: ../camel/providers/nntp/camel-nntp-summary.c:393
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operation failed: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:447
-#: ../camel/providers/pop3/camel-pop3-folder.c:517
+#: ../camel/providers/pop3/camel-pop3-folder.c:443
+#: ../camel/providers/pop3/camel-pop3-folder.c:516
 #, c-format
 msgid "No message with UID %s"
 msgstr "No message with UID %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:533
+#: ../camel/providers/pop3/camel-pop3-folder.c:532
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Retrieving POP message %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:612
+#: ../camel/providers/pop3/camel-pop3-folder.c:611
 msgid "Unknown reason"
 msgstr "Unknown reason"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:660
+#: ../camel/providers/pop3/camel-pop3-folder.c:659
 msgid "Retrieving POP summary"
 msgstr "Retrieving POP summary"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:711
+#: ../camel/providers/pop3/camel-pop3-folder.c:710
 msgid "Cannot get POP summary: "
 msgstr "Cannot get POP summary: "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:823
+#: ../camel/providers/pop3/camel-pop3-folder.c:829
 msgid "Expunging old messages"
 msgstr "Expunging old messages"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:843
+#: ../camel/providers/pop3/camel-pop3-folder.c:849
 msgid "Expunging deleted messages"
 msgstr "Expunging deleted messages"
 
@@ -4290,37 +4385,38 @@ msgstr "Message Storage"
 msgid "_Leave messages on server"
 msgstr "_Leave messages on server"
 
-#. Translators: '%s' is replaced with a widget, where user can select how many days can be message left on the server
-#: ../camel/providers/pop3/camel-pop3-provider.c:44
+#. Translators: '%s' is replaced with a widget, where user can
+#. * select how many days can be message left on the server.
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "_Delete after %s day(s)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:46
+#: ../camel/providers/pop3/camel-pop3-provider.c:47
 msgid "Delete _expunged from local Inbox"
 msgstr "Delete _expunged from local Inbox"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:48
+#: ../camel/providers/pop3/camel-pop3-provider.c:49
 msgid "Disable _support for all POP3 extensions"
 msgstr "Disable _support for all POP3 extensions"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:54
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
 msgid "Default POP3 port"
 msgstr "Default POP3 port"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:56
 msgid "POP3 over SSL"
 msgstr "POP3 over SSL"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:62
+#: ../camel/providers/pop3/camel-pop3-provider.c:63
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:64
+#: ../camel/providers/pop3/camel-pop3-provider.c:65
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "For connecting to and downloading mail from POP servers."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:84
+#: ../camel/providers/pop3/camel-pop3-provider.c:85
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4328,7 +4424,7 @@ msgstr ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:94
+#: ../camel/providers/pop3/camel-pop3-provider.c:95
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -4343,52 +4439,53 @@ msgstr ""
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:136
+#: ../camel/providers/pop3/camel-pop3-store.c:139
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "Failed to read a valid greeting from POP server %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:153
+#: ../camel/providers/pop3/camel-pop3-store.c:154
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Failed to connect to POP server %s in secure mode: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:154
+#: ../camel/providers/pop3/camel-pop3-store.c:155
 msgid "STLS not supported by server"
 msgstr "STLS not supported by server"
 
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:172
+#. Translators: Last %s is an optional
+#. * explanation beginning with ": " separator.
+#: ../camel/providers/pop3/camel-pop3-store.c:176
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr "Failed to connect to POP server %s in secure mode%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:185
+#: ../camel/providers/pop3/camel-pop3-store.c:189
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "Failed to connect to POP server %s in secure mode: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:288
+#: ../camel/providers/pop3/camel-pop3-store.c:298
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Cannot login to POP server %s: SASL Protocol error"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:310
+#: ../camel/providers/pop3/camel-pop3-store.c:320
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "Failed to authenticate on POP server %s: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:359
+#: ../camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP3 server %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:362
+#: ../camel/providers/pop3/camel-pop3-store.c:374
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "POP3 server for %s on %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:525
+#: ../camel/providers/pop3/camel-pop3-store.c:546
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4397,7 +4494,7 @@ msgstr ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
 "attack suspected. Please contact your admin."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:577
+#: ../camel/providers/pop3/camel-pop3-store.c:598
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4408,7 +4505,7 @@ msgstr ""
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:592
+#: ../camel/providers/pop3/camel-pop3-store.c:613
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4417,17 +4514,17 @@ msgstr ""
 "Unable to connect to POP server %s.\n"
 "Error sending username%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:650
+#: ../camel/providers/pop3/camel-pop3-store.c:673
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Could not connect to POP server %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:678
+#: ../camel/providers/pop3/camel-pop3-store.c:701
 #, c-format
 msgid "No such folder '%s'."
 msgstr "No such folder '%s'."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:695
+#: ../camel/providers/pop3/camel-pop3-store.c:718
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 stores have no folder hierarchy"
@@ -4452,36 +4549,36 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Mail delivery via the sendmail program"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:86
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:93
 #, c-format
 msgid "Could not parse recipient list"
 msgstr "Could not parse recipient list"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:119
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:126
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Could not create pipe to sendmail: %s: mail not sent"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:141
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:148
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Could not fork sendmail: %s: mail not sent"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:184
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:194
 msgid "Could not send message: "
 msgstr "Could not send message: "
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:212
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail exited with signal %s: mail not sent."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:219
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Could not execute %s: mail not sent."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:224
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail exited with status %d: mail not sent."
@@ -4506,360 +4603,559 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "For delivering mail by connecting to a remote mailhub using SMTP."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:150
-#: ../camel/providers/smtp/camel-smtp-transport.c:158
+#: ../camel/providers/smtp/camel-smtp-transport.c:154
+#: ../camel/providers/smtp/camel-smtp-transport.c:162
 msgid "Welcome response error: "
 msgstr "Welcome response error: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:195
+#: ../camel/providers/smtp/camel-smtp-transport.c:201
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Failed to connect to SMTP server %s in secure mode: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:204
-#: ../camel/providers/smtp/camel-smtp-transport.c:217
-#: ../camel/providers/smtp/camel-smtp-transport.c:224
+#: ../camel/providers/smtp/camel-smtp-transport.c:210
+#: ../camel/providers/smtp/camel-smtp-transport.c:223
+#: ../camel/providers/smtp/camel-smtp-transport.c:230
 msgid "STARTTLS command failed: "
 msgstr "STARTTLS command failed: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:235
+#: ../camel/providers/smtp/camel-smtp-transport.c:241
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "Failed to connect to SMTP server %s in secure mode: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:292
+#: ../camel/providers/smtp/camel-smtp-transport.c:301
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:295
+#: ../camel/providers/smtp/camel-smtp-transport.c:304
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP mail delivery via %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:367
+#: ../camel/providers/smtp/camel-smtp-transport.c:378
 #, c-format
 msgid "SMTP server %s does not support %s authentication"
 msgstr "SMTP server %s does not support %s authentication"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:446
+#: ../camel/providers/smtp/camel-smtp-transport.c:458
 #, c-format
 msgid "No SASL mechanism was specified"
 msgstr "No SASL mechanism was specified"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:459
-msgid "SMTP Authentication"
-msgstr "SMTP Authentication"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:478
-#: ../camel/providers/smtp/camel-smtp-transport.c:489
-#: ../camel/providers/smtp/camel-smtp-transport.c:502
+#: ../camel/providers/smtp/camel-smtp-transport.c:488
+#: ../camel/providers/smtp/camel-smtp-transport.c:499
+#: ../camel/providers/smtp/camel-smtp-transport.c:512
 msgid "AUTH command failed: "
 msgstr "AUTH command failed: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:643
+#: ../camel/providers/smtp/camel-smtp-transport.c:654
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "Cannot send message: service not connected."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:650
+#: ../camel/providers/smtp/camel-smtp-transport.c:661
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "Cannot send message: sender address not valid."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:654
+#: ../camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Sending message"
 msgstr "Sending message"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:679
+#: ../camel/providers/smtp/camel-smtp-transport.c:690
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "Cannot send message: no recipients defined."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:692
+#: ../camel/providers/smtp/camel-smtp-transport.c:703
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Cannot send message: one or more invalid recipients"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:796
+#: ../camel/providers/smtp/camel-smtp-transport.c:807
 msgid "Syntax error, command unrecognized"
 msgstr "Syntax error, command unrecognised"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:798
+#: ../camel/providers/smtp/camel-smtp-transport.c:809
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntax error in parameters or arguments"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:800
+#: ../camel/providers/smtp/camel-smtp-transport.c:811
 msgid "Command not implemented"
 msgstr "Command not implemented"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:802
+#: ../camel/providers/smtp/camel-smtp-transport.c:813
 msgid "Command parameter not implemented"
 msgstr "Command parameter not implemented"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:804
+#: ../camel/providers/smtp/camel-smtp-transport.c:815
 msgid "System status, or system help reply"
 msgstr "System status, or system help reply"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:806
+#: ../camel/providers/smtp/camel-smtp-transport.c:817
 msgid "Help message"
 msgstr "Help message"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:808
+#: ../camel/providers/smtp/camel-smtp-transport.c:819
 msgid "Service ready"
 msgstr "Service ready"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:810
+#: ../camel/providers/smtp/camel-smtp-transport.c:821
 msgid "Service closing transmission channel"
 msgstr "Service closing transmission channel"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:812
+#: ../camel/providers/smtp/camel-smtp-transport.c:823
 msgid "Service not available, closing transmission channel"
 msgstr "Service not available, closing transmission channel"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:814
+#: ../camel/providers/smtp/camel-smtp-transport.c:825
 msgid "Requested mail action okay, completed"
 msgstr "Requested mail action okay, completed"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:816
+#: ../camel/providers/smtp/camel-smtp-transport.c:827
 msgid "User not local; will forward to <forward-path>"
 msgstr "User not local; will forward to <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:818
+#: ../camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Requested mail action not taken: mailbox unavailable"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:820
+#: ../camel/providers/smtp/camel-smtp-transport.c:831
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Requested action not taken: mailbox unavailable"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:822
+#: ../camel/providers/smtp/camel-smtp-transport.c:833
 msgid "Requested action aborted: error in processing"
 msgstr "Requested action aborted: error in processing"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:824
+#: ../camel/providers/smtp/camel-smtp-transport.c:835
 msgid "User not local; please try <forward-path>"
 msgstr "User not local; please try <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:826
+#: ../camel/providers/smtp/camel-smtp-transport.c:837
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Requested action not taken: insufficient system storage"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:828
+#: ../camel/providers/smtp/camel-smtp-transport.c:839
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Requested mail action aborted: exceeded storage allocation"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:830
+#: ../camel/providers/smtp/camel-smtp-transport.c:841
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Requested action not taken: mailbox name not allowed"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:832
+#: ../camel/providers/smtp/camel-smtp-transport.c:843
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Start mail input; end with <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:834
+#: ../camel/providers/smtp/camel-smtp-transport.c:845
 msgid "Transaction failed"
 msgstr "Transaction failed"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:838
+#: ../camel/providers/smtp/camel-smtp-transport.c:849
 msgid "A password transition is needed"
 msgstr "A password transition is needed"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:840
+#: ../camel/providers/smtp/camel-smtp-transport.c:851
 msgid "Authentication mechanism is too weak"
 msgstr "Authentication mechanism is too weak"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:842
+#: ../camel/providers/smtp/camel-smtp-transport.c:853
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Encryption required for requested authentication mechanism"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:844
+#: ../camel/providers/smtp/camel-smtp-transport.c:855
 msgid "Temporary authentication failure"
 msgstr "Temporary authentication failure"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1095
+#: ../camel/providers/smtp/camel-smtp-transport.c:1112
 msgid "SMTP Greeting"
 msgstr "SMTP Greeting"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1122
 #: ../camel/providers/smtp/camel-smtp-transport.c:1139
-#: ../camel/providers/smtp/camel-smtp-transport.c:1147
+#: ../camel/providers/smtp/camel-smtp-transport.c:1157
+#: ../camel/providers/smtp/camel-smtp-transport.c:1165
 msgid "HELO command failed: "
 msgstr "HELO command failed: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1222
-#: ../camel/providers/smtp/camel-smtp-transport.c:1236
-#: ../camel/providers/smtp/camel-smtp-transport.c:1245
+#: ../camel/providers/smtp/camel-smtp-transport.c:1240
+#: ../camel/providers/smtp/camel-smtp-transport.c:1255
+#: ../camel/providers/smtp/camel-smtp-transport.c:1265
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM command failed: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1272
+#: ../camel/providers/smtp/camel-smtp-transport.c:1292
 msgid "RCPT TO command failed: "
 msgstr "RCPT TO command failed: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1288
-#: ../camel/providers/smtp/camel-smtp-transport.c:1297
+#: ../camel/providers/smtp/camel-smtp-transport.c:1309
+#: ../camel/providers/smtp/camel-smtp-transport.c:1319
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> failed: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1339
-#: ../camel/providers/smtp/camel-smtp-transport.c:1349
-#: ../camel/providers/smtp/camel-smtp-transport.c:1359
-#: ../camel/providers/smtp/camel-smtp-transport.c:1418
-#: ../camel/providers/smtp/camel-smtp-transport.c:1437
-#: ../camel/providers/smtp/camel-smtp-transport.c:1450
-#: ../camel/providers/smtp/camel-smtp-transport.c:1458
+#: ../camel/providers/smtp/camel-smtp-transport.c:1362
+#: ../camel/providers/smtp/camel-smtp-transport.c:1373
+#: ../camel/providers/smtp/camel-smtp-transport.c:1384
+#: ../camel/providers/smtp/camel-smtp-transport.c:1443
+#: ../camel/providers/smtp/camel-smtp-transport.c:1463
+#: ../camel/providers/smtp/camel-smtp-transport.c:1477
+#: ../camel/providers/smtp/camel-smtp-transport.c:1486
 msgid "DATA command failed: "
 msgstr "DATA command failed: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1483
-#: ../camel/providers/smtp/camel-smtp-transport.c:1497
-#: ../camel/providers/smtp/camel-smtp-transport.c:1505
+#: ../camel/providers/smtp/camel-smtp-transport.c:1511
+#: ../camel/providers/smtp/camel-smtp-transport.c:1526
+#: ../camel/providers/smtp/camel-smtp-transport.c:1535
 msgid "RSET command failed: "
 msgstr "RSET command failed: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1530
-#: ../camel/providers/smtp/camel-smtp-transport.c:1544
-#: ../camel/providers/smtp/camel-smtp-transport.c:1551
+#: ../camel/providers/smtp/camel-smtp-transport.c:1560
+#: ../camel/providers/smtp/camel-smtp-transport.c:1574
+#: ../camel/providers/smtp/camel-smtp-transport.c:1581
 msgid "QUIT command failed: "
 msgstr "QUIT command failed: "
 
-#: ../libedataserver/e-categories.c:47
+#: ../data/org.gnome.evolution-data-server.addressbook.gschema.xml.in.h:1
+msgid "Contact UID of a user"
+msgstr "Contact UID of a user"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:1
+msgid "Birthday and anniversary reminder"
+msgstr "Birthday and anniversary reminder"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:2
+msgid "Whether to set a reminder for birthdays and anniversaries"
+msgstr "Whether to set a reminder for birthdays and anniversaries"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:3
+msgid "Birthday and anniversary reminder value"
+msgstr "Birthday and anniversary reminder value"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:4
+msgid "Number of units for determining a birthday or anniversary reminder"
+msgstr "Number of units for determining a birthday or anniversary reminder"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:5
+msgid "Birthday and anniversary reminder units"
+msgstr "Birthday and anniversary reminder units"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:6
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\""
+msgstr ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\""
+
+#: ../libebackend/e-authentication-mediator.c:205
+#: ../libebackend/e-authentication-mediator.c:216
+#: ../libebackend/e-authentication-mediator.c:849
+#: ../libebackend/e-authentication-mediator.c:1179
+msgid "Bus name vanished (client terminated?)"
+msgstr "Bus name vanished (client terminated?)"
+
+#: ../libebackend/e-authentication-mediator.c:264
+msgid "No response from client"
+msgstr "No response from client"
+
+#: ../libebackend/e-authentication-mediator.c:334
+#: ../libebackend/e-authentication-mediator.c:345
+#: ../libebackend/e-authentication-mediator.c:843
+#: ../libebackend/e-authentication-mediator.c:1173
+msgid "Client cancelled the operation"
+msgstr "Client cancelled the operation"
+
+#: ../libebackend/e-authentication-mediator.c:416
+msgid "Client reports password was rejected"
+msgstr "Client reports password was rejected"
+
+#: ../libebackend/e-authentication-session.c:532
+msgid "Add this password to your keyring"
+msgstr "Add this password to your keyring"
+
+#: ../libebackend/e-authentication-session.c:595
+msgid "Password was incorrect"
+msgstr "Password was incorrect"
+
+#: ../libebackend/e-authentication-session.c:1331
+#: ../libebackend/e-authentication-session.c:1507
+#: ../libebackend/e-authentication-session.c:1690
+msgid "Keyring operation was cancelled"
+msgstr "Keyring operation was cancelled"
+
+#: ../libebackend/e-backend.c:190
+#, c-format
+msgid "%s does not support authentication"
+msgstr "%s does not support authentication"
+
+#: ../libebackend/e-collection-backend.c:734
+#, c-format
+msgid "%s does not support creating remote resources"
+msgstr "%s does not support creating remote resources"
+
+#: ../libebackend/e-collection-backend.c:793
+#, c-format
+msgid "%s does not support deleting remote resources"
+msgstr "%s does not support deleting remote resources"
+
+#: ../libebackend/e-server-side-source.c:128
+#, c-format
+msgid "Data source is missing a [%s] group"
+msgstr "Data source is missing a [%s] group"
+
+#: ../libebackend/e-server-side-source.c:945 ../libedataserver/e-source.c:1092
+#, c-format
+msgid "Data source '%s' does not support creating remote resources"
+msgstr "Data source '%s' does not support creating remote resources"
+
+#: ../libebackend/e-server-side-source.c:959
+#, c-format
+msgid ""
+"Data source '%s' has no collection backend to create the remote resource"
+msgstr ""
+"Data source '%s' has no collection backend to create the remote resource"
+
+#: ../libebackend/e-server-side-source.c:987 ../libedataserver/e-source.c:1201
+#, c-format
+msgid "Data source '%s' does not support deleting remote resources"
+msgstr "Data source '%s' does not support deleting remote resources"
+
+#: ../libebackend/e-server-side-source.c:1001
+#, c-format
+msgid ""
+"Data source '%s' has no collection backend to delete the remote resource"
+msgstr ""
+"Data source '%s' has no collection backend to delete the remote resource"
+
+#: ../libebackend/e-server-side-source.c:1336
+#, c-format
+msgid "File must have a '.source' extension"
+msgstr "File must have a '.source' extension"
+
+#: ../libebackend/e-source-registry-server.c:522
+#: ../libedataserver/e-source-registry.c:1512
+msgid "The user declined to authenticate"
+msgstr "The user declined to authenticate"
+
+#: ../libebackend/e-source-registry-server.c:770
+#, c-format
+msgid "UID '%s' is already in use"
+msgstr "UID '%s' is already in use"
+
+#: ../libedataserver/e-categories.c:46
 msgctxt "CategoryName"
 msgid "Anniversary"
 msgstr "Anniversary"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:47
 msgctxt "CategoryName"
 msgid "Birthday"
 msgstr "Birthday"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:48
 msgctxt "CategoryName"
 msgid "Business"
 msgstr "Business"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:49
 msgctxt "CategoryName"
 msgid "Competition"
 msgstr "Competition"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:50
 msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "Favourites"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:51
 msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "Gifts"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:52
 msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "Goals/Objectives"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:53
 msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "Holiday"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:54
 msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "Holiday Cards"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:56
 msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "Hot Contacts"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:57
 msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "Ideas"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:58
 msgctxt "CategoryName"
 msgid "International"
 msgstr "International"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:59
 msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "Key Customer"
 
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:60
 msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "Miscellaneous"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:61
 msgctxt "CategoryName"
 msgid "Personal"
 msgstr "Personal"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:62
 msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "Phone Calls"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:64
 msgctxt "CategoryName"
 msgid "Status"
 msgstr "Status"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:65
 msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "Strategies"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:66
 msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "Suppliers"
 
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:67
 msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "Time & Expenses"
 
-#: ../libedataserver/e-categories.c:69
+#: ../libedataserver/e-categories.c:68
 msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:70
+#: ../libedataserver/e-categories.c:69
 msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "Waiting"
 
-#: ../libedataserver/e-client.c:125
+#: ../libedataserver/e-client.c:124
 msgid "Source not loaded"
 msgstr "Source not loaded"
 
-#: ../libedataserver/e-client.c:127
+#: ../libedataserver/e-client.c:126
 msgid "Source already loaded"
 msgstr "Source already loaded"
 
 #. Translators: This means that the EClient does not support offline mode, or
-#. it's not set to by a user, thus it is unavailable while user is not connected.
-#: ../libedataserver/e-client.c:137
+#. * it's not set to by a user, thus it is unavailable while user is not connected.
+#: ../libedataserver/e-client.c:136
 msgid "Offline unavailable"
 msgstr "Offline unavailable"
 
-#: ../libedataserver/e-client.c:159
+#: ../libedataserver/e-client.c:158
 msgid "D-Bus error"
 msgstr "D-Bus error"
 
+#: ../libedataserver/e-source-authenticator.c:166
+msgid "Address book authentication request"
+msgstr "Address book authentication request"
+
+#: ../libedataserver/e-source-authenticator.c:171
+msgid "Calendar authentication request"
+msgstr "Calendar authentication request"
+
+#: ../libedataserver/e-source-authenticator.c:175
+msgid "Mail authentication request"
+msgstr "Mail authentication request"
+
+#. generic account prompt
+#: ../libedataserver/e-source-authenticator.c:178
+msgid "Authentication request"
+msgstr "Authentication request"
+
+#: ../libedataserver/e-source-authenticator.c:188
+#, c-format
+msgid "Please enter the password for address book \"%s\"."
+msgstr "Please enter the password for address book \"%s\"."
+
+#: ../libedataserver/e-source-authenticator.c:194
+#, c-format
+msgid "Please enter the password for calendar \"%s\"."
+msgstr "Please enter the password for calendar \"%s\"."
+
+#: ../libedataserver/e-source-authenticator.c:200
+#, c-format
+msgid "Please enter the password for mail account \"%s\"."
+msgstr "Please enter the password for mail account \"%s\"."
+
+#: ../libedataserver/e-source-authenticator.c:206
+#, c-format
+msgid "Please enter the password for mail transport \"%s\"."
+msgstr "Please enter the password for mail transport \"%s\"."
+
+#: ../libedataserver/e-source-authenticator.c:212
+#, c-format
+msgid "Please enter the password for memo list \"%s\"."
+msgstr "Please enter the password for memo list \"%s\"."
+
+#: ../libedataserver/e-source-authenticator.c:218
+#, c-format
+msgid "Please enter the password for task list \"%s\"."
+msgstr "Please enter the password for task list \"%s\"."
+
+#: ../libedataserver/e-source-authenticator.c:224
+#, c-format
+msgid "Please enter the password for account \"%s\"."
+msgstr "Please enter the password for account \"%s\"."
+
+#: ../libedataserver/e-source.c:621
+#, c-format
+msgid "Source file is missing a [%s] group"
+msgstr "Source file is missing a [%s] group"
+
+#: ../libedataserver/e-source.c:919
+#, c-format
+msgid "Data source '%s' is not removable"
+msgstr "Data source '%s' is not removable"
+
+#: ../libedataserver/e-source.c:1001
+#, c-format
+msgid "Data source '%s' is not writable"
+msgstr "Data source '%s' is not writable"
+
+#: ../libedataserver/e-source.c:1382
+msgid "Unnamed"
+msgstr "Unnamed"
+
+#: ../libedataserver/e-source-mail-signature.c:485
+#, c-format
+msgid "Signature script must be a local file"
+msgstr "Signature script must be a local file"
+
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1646 ../libedataserver/e-time-utils.c:1944
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1949
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
@@ -4867,7 +5163,7 @@ msgstr "%a %d/%m/%Y %I:%M:%S %p"
 #. * in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1651 ../libedataserver/e-time-utils.c:1935
+#: ../libedataserver/e-time-utils.c:1655 ../libedataserver/e-time-utils.c:1940
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
@@ -4875,7 +5171,7 @@ msgstr "%a %d/%m/%Y %H:%M:%S"
 #. * in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1656 ../libedataserver/e-time-utils.c:1940
+#: ../libedataserver/e-time-utils.c:1660 ../libedataserver/e-time-utils.c:1945
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
@@ -4883,78 +5179,78 @@ msgstr "%a %d/%m/%Y %I:%M %p"
 #. * in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1661 ../libedataserver/e-time-utils.c:1931
+#: ../libedataserver/e-time-utils.c:1665 ../libedataserver/e-time-utils.c:1936
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1666
+#: ../libedataserver/e-time-utils.c:1670
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1671
+#: ../libedataserver/e-time-utils.c:1675
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d/%m/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1674 ../libedataserver/e-time-utils.c:1794
-#: ../libedataserver/e-time-utils.c:1926
+#: ../libedataserver/e-time-utils.c:1678 ../libedataserver/e-time-utils.c:1798
+#: ../libedataserver/e-time-utils.c:1931
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1681
+#: ../libedataserver/e-time-utils.c:1685
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1685
+#: ../libedataserver/e-time-utils.c:1689
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1690
+#: ../libedataserver/e-time-utils.c:1694
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d/%m/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1695
+#: ../libedataserver/e-time-utils.c:1699
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d/%m/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1700
+#: ../libedataserver/e-time-utils.c:1704
 msgid "%m/%d/%Y %I %p"
 msgstr "%d/%m/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1705
+#: ../libedataserver/e-time-utils.c:1709
 msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1708 ../libedataserver/e-time-utils.c:1797
+#: ../libedataserver/e-time-utils.c:1712 ../libedataserver/e-time-utils.c:1801
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1868 ../libedataserver/e-time-utils.c:1988
+#: ../libedataserver/e-time-utils.c:1872 ../libedataserver/e-time-utils.c:1993
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1872 ../libedataserver/e-time-utils.c:1980
+#: ../libedataserver/e-time-utils.c:1876 ../libedataserver/e-time-utils.c:1985
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4962,24 +5258,25 @@ msgstr "%H:%M:%S"
 #. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1877 ../libedataserver/e-time-utils.c:1985
+#: ../libedataserver/e-time-utils.c:1881 ../libedataserver/e-time-utils.c:1990
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1881 ../libedataserver/e-time-utils.c:1977
+#: ../libedataserver/e-time-utils.c:1885 ../libedataserver/e-time-utils.c:1982
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1884
+#. strptime format for time of day, without seconds 24-hour format,
+#. * and no colon.
+#: ../libedataserver/e-time-utils.c:1889
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1888
+#: ../libedataserver/e-time-utils.c:1893
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -4992,8 +5289,8 @@ msgid ""
 "What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" "
 "means manual proxy."
 msgstr ""
-"What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" means "
-"manual proxy."
+"What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" "
+"means manual proxy."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
 msgid "Whether to use http-proxy"
@@ -5091,58 +5388,48 @@ msgstr "Automatic proxy configuration URL"
 msgid "Where to read automatic proxy configuration from."
 msgstr "Where to read automatic proxy configuration from."
 
-#: ../libedataserverui/e-book-auth-util.c:96
-#: ../libedataserverui/e-book-auth-util.c:656
-msgid "Accessing LDAP Server anonymously"
-msgstr "Accessing LDAP Server anonymously"
-
-#: ../libedataserverui/e-book-auth-util.c:197
-#: ../libedataserverui/e-book-auth-util.c:423
-msgid "Failed to authenticate.\n"
-msgstr "Failed to authenticate.\n"
-
-#: ../libedataserverui/e-categories-editor.c:228
+#: ../libedataserverui/e-categories-editor.c:230
 msgid "Currently _used categories:"
 msgstr "Currently _used categories:"
 
-#: ../libedataserverui/e-categories-editor.c:237
+#: ../libedataserverui/e-categories-editor.c:239
 msgid "_Available Categories:"
 msgstr "_Available Categories:"
 
-#: ../libedataserverui/e-categories-selector.c:322
+#: ../libedataserverui/e-categories-selector.c:325
 msgid "Icon"
 msgstr "Icon"
 
-#: ../libedataserverui/e-categories-selector.c:327
+#: ../libedataserverui/e-categories-selector.c:330
 msgid "Category"
 msgstr "Category"
 
-#: ../libedataserverui/e-category-completion.c:299
+#: ../libedataserverui/e-category-completion.c:300
 #, c-format
 msgid "Create category \"%s\""
 msgstr "Create category \"%s\""
 
-#: ../libedataserverui/e-category-editor.c:135
+#: ../libedataserverui/e-category-editor.c:137
 msgid "Category Icon"
 msgstr "Category Icon"
 
-#: ../libedataserverui/e-category-editor.c:139
+#: ../libedataserverui/e-category-editor.c:141
 msgid "_No Image"
 msgstr "_No Image"
 
-#: ../libedataserverui/e-category-editor.c:176
+#: ../libedataserverui/e-category-editor.c:178
 msgid "Category _Name"
 msgstr "Category _Name"
 
-#: ../libedataserverui/e-category-editor.c:184
+#: ../libedataserverui/e-category-editor.c:186
 msgid "Category _Icon"
 msgstr "Category _Icon"
 
-#: ../libedataserverui/e-category-editor.c:224
+#: ../libedataserverui/e-category-editor.c:226
 msgid "Category Properties"
 msgstr "Category Properties"
 
-#: ../libedataserverui/e-category-editor.c:285
+#: ../libedataserverui/e-category-editor.c:287
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
@@ -5151,135 +5438,86 @@ msgstr ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 
-#: ../libedataserverui/e-client-utils.c:856
-#, c-format
-msgid ""
-"Enter password for calendar %s (user %s)\n"
-"Reason: %s"
-msgstr ""
-"Enter password for calendar %s (user %s)\n"
-"Reason: %s"
-
-#: ../libedataserverui/e-client-utils.c:858
-#, c-format
-msgid "Enter password for calendar %s (user %s)"
-msgstr "Enter password for calendar %s (user %s)"
-
-#: ../libedataserverui/e-client-utils.c:862
-#, c-format
-msgid ""
-"Enter password for task list %s (user %s)\n"
-"Reason: %s"
-msgstr ""
-"Enter password for task list %s (user %s)\n"
-"Reason: %s"
-
-#: ../libedataserverui/e-client-utils.c:864
-#, c-format
-msgid "Enter password for task list %s (user %s)"
-msgstr "Enter password for task list %s (user %s)"
-
-#: ../libedataserverui/e-client-utils.c:868
-#, c-format
-msgid ""
-"Enter password for memo list %s (user %s)\n"
-"Reason: %s"
-msgstr ""
-"Enter password for memo list %s (user %s)\n"
-"Reason: %s"
-
-#: ../libedataserverui/e-client-utils.c:870
-#, c-format
-msgid "Enter password for memo list %s (user %s)"
-msgstr "Enter password for memo list %s (user %s)"
-
-#: ../libedataserverui/e-client-utils.c:981
-msgid "Enter Passphrase"
-msgstr "Enter Passphrase"
-
-#: ../libedataserverui/e-client-utils.c:983
-msgid "Enter Password"
-msgstr "Enter Password"
-
-#: ../libedataserverui/e-name-selector-dialog.c:187
+#: ../libedataserverui/e-name-selector-dialog.c:278
 msgid "Show Contacts"
 msgstr "Show Contacts"
 
-#: ../libedataserverui/e-name-selector-dialog.c:209
+#: ../libedataserverui/e-name-selector-dialog.c:300
 msgid "Address B_ook:"
 msgstr "Address B_ook:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:217
-msgid "Cate_gory:"
-msgstr "Cate_gory:"
+#: ../libedataserverui/e-name-selector-dialog.c:310
+msgid "Cat_egory:"
+msgstr "Cat_egory:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:235
+#: ../libedataserverui/e-name-selector-dialog.c:332
 msgid "_Search:"
 msgstr "_Search:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:253
-#: ../libedataserverui/e-name-selector-dialog.c:1038
+#: ../libedataserverui/e-name-selector-dialog.c:357
+#: ../libedataserverui/e-name-selector-dialog.c:1182
 msgid "Any Category"
 msgstr "Any Category"
 
-#: ../libedataserverui/e-name-selector-dialog.c:255
+#: ../libedataserverui/e-name-selector-dialog.c:359
 msgid "Co_ntacts"
 msgstr "Co_ntacts"
 
-#: ../libedataserverui/e-name-selector-dialog.c:310
+#: ../libedataserverui/e-name-selector-dialog.c:421
 msgid "Search"
 msgstr "Search"
 
-#: ../libedataserverui/e-name-selector-dialog.c:313
+#: ../libedataserverui/e-name-selector-dialog.c:424
 msgid "Address Book"
 msgstr "Address Book"
 
-#: ../libedataserverui/e-name-selector-dialog.c:316
+#: ../libedataserverui/e-name-selector-dialog.c:427
+#: ../modules/google-backend/module-google-backend.c:183
 msgid "Contacts"
 msgstr "Contacts"
 
-#: ../libedataserverui/e-name-selector-dialog.c:433
+#: ../libedataserverui/e-name-selector-dialog.c:545
 msgid "Select Contacts from Address Book"
 msgstr "Select Contacts from Address Book"
 
-#: ../libedataserverui/e-name-selector-dialog.c:781
+#: ../libedataserverui/e-name-selector-dialog.c:917
 msgid "_Add"
 msgstr "_Add"
 
-#: ../libedataserverui/e-name-selector-dialog.c:785
+#: ../libedataserverui/e-name-selector-dialog.c:921
 msgid "_Remove"
 msgstr "_Remove"
 
-#: ../libedataserverui/e-name-selector-dialog.c:957
+#: ../libedataserverui/e-name-selector-dialog.c:1097
 #, c-format
 msgid "Error loading address book: %s"
 msgstr "Error loading address book: %s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2823
+#: ../libedataserverui/e-name-selector-entry.c:3008
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "E_xpand %s Inline"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2838
+#: ../libedataserverui/e-name-selector-entry.c:3024
 #, c-format
 msgid "Cop_y %s"
 msgstr "Cop_y %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2848
+#: ../libedataserverui/e-name-selector-entry.c:3035
 #, c-format
 msgid "C_ut %s"
 msgstr "C_ut %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2865
+#: ../libedataserverui/e-name-selector-entry.c:3053
 #, c-format
 msgid "_Edit %s"
 msgstr "_Edit %s"
 
-#: ../libedataserverui/e-name-selector-list.c:524
+#: ../libedataserverui/e-name-selector-list.c:532
 #, c-format
 msgid "_Delete %s"
 msgstr "_Delete %s"
@@ -5313,31 +5551,197 @@ msgstr "_Remember this password"
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Remember this password for the remainder of this session"
 
-#. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:91
+#: ../libedataserverui/e-source-selector-dialog.c:224
+msgid "_Destination"
+msgstr "_Destination"
+
+#: ../libedataserverui/e-source-selector-dialog.c:326
 msgid "Select destination"
 msgstr "Select destination"
 
-#: ../libedataserverui/e-source-selector-dialog.c:166
-msgid "_Destination"
-msgstr "_Destination"
+#: ../modules/google-backend/module-google-backend.c:118
+#: ../modules/yahoo-backend/module-yahoo-backend.c:200
+msgid "Calendar"
+msgstr "Calendar"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:184
+#, c-format
+msgid "Code: %u - Unexpected response from server"
+msgstr "Code: %u - Unexpected response from server"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:205
+#, c-format
+msgid "Failed to parse autodiscover response XML"
+msgstr "Failed to parse autodiscover response XML"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:214
+#, c-format
+msgid "Failed to find Autodiscover element"
+msgstr "Failed to find Autodiscover element"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:226
+#, c-format
+msgid "Failed to find Response element"
+msgstr "Failed to find Response element"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:238
+#, c-format
+msgid "Failed to find Account element"
+msgstr "Failed to find Account element"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:252
+#, c-format
+msgid "Failed to find ASUrl and OABUrl in autodiscover response"
+msgstr "Failed to find ASUrl and OABUrl in autodiscover response"
+
+#: ../modules/yahoo-backend/module-yahoo-backend.c:215
+msgid "Tasks"
+msgstr "Tasks"
 
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:48
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:52
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:47
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:51
 msgid "Keep running after the last client is closed"
 msgstr "Keep running after the last client is closed"
 
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:50
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:54
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:49
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:53
 msgid "Wait running until at least one client is connected"
 msgstr "Wait running until at least one client is connected"
 
+#: ../tests/libedataserverui/evolution-source-viewer.c:620
+msgid "Evolution Source Viewer"
+msgstr "Evolution Source Viewer"
+
+#: ../tests/libedataserverui/evolution-source-viewer.c:649
+msgid "Display Name"
+msgstr "Display Name"
+
+#: ../tests/libedataserverui/evolution-source-viewer.c:658
+msgid "Flags"
+msgstr "Flags"
+
+#: ../tests/libedataserverui/evolution-source-viewer.c:710
+msgid "Identity"
+msgstr "Identity"
+
+#~ msgid "Authenticating with the serverâ"
+#~ msgstr "Authenticating with the serverâ"
+
+#~ msgid "%s: there was no source for UID '%s' stored in GConf."
+#~ msgstr "%s: there was no source for UID '%s' stored in GConf."
+
+#~ msgid "On This Computer"
+#~ msgstr "On This Computer"
+
+#~ msgid "Invalid source"
+#~ msgstr "Invalid source"
+
+#~ msgid "Incorrect uri '%s'"
+#~ msgstr "Incorrect uri '%s'"
+
+#~ msgid "Failed to find system book"
+#~ msgstr "Failed to find system book"
+
+#~ msgid "There was no source for UID '%s' stored in a source list."
+#~ msgstr "There was no source for UID '%s' stored in a source list."
+
+#~ msgid "Cannot authenticate user: "
+#~ msgstr "Cannot authenticate user: "
+
+#~ msgid "Empty URI"
+#~ msgstr "Empty URI"
+
+#~ msgid ""
+#~ "Enter password for address book %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr ""
+#~ "Enter password for address book %s (user %s)\n"
+#~ "Reason: %s"
+
+#~ msgid "Enter password for address book %s (user %s)"
+#~ msgstr "Enter password for address book %s (user %s)"
+
+#~ msgid "Enter password for %s (user %s)"
+#~ msgstr "Enter password for %s (user %s)"
+
+#~ msgid "Enter password for %s to enable proxy for user %s"
+#~ msgstr "Enter password for %s to enable proxy for user %s"
+
+#~ msgid "Invalid source type"
+#~ msgstr "Invalid source type"
+
+#~ msgid "Updating %s folder"
+#~ msgstr "Updating %s folder"
+
+#~ msgid "Connection to Server"
+#~ msgstr "Connection to Server"
+
+#~ msgid "_Use custom command to connect to server"
+#~ msgstr "_Use custom command to connect to server"
+
+#~ msgid "Co_mmand:"
+#~ msgstr "Co_mmand:"
+
+#~ msgid "Command:"
+#~ msgstr "Command:"
+
+#~ msgid "Numbe_r of cached connections to use"
+#~ msgstr "Numbe_r of cached connections to use"
+
+#~ msgid "Closing tmp stream failed: "
+#~ msgstr "Closing tmp stream failed: "
+
+#~ msgid "SMTP Authentication"
+#~ msgstr "SMTP Authentication"
+
+#~ msgid "Accessing LDAP Server anonymously"
+#~ msgstr "Accessing LDAP Server anonymously"
+
+#~ msgid ""
+#~ "Enter password for calendar %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr ""
+#~ "Enter password for calendar %s (user %s)\n"
+#~ "Reason: %s"
+
+#~ msgid "Enter password for calendar %s (user %s)"
+#~ msgstr "Enter password for calendar %s (user %s)"
+
+#~ msgid ""
+#~ "Enter password for task list %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr ""
+#~ "Enter password for task list %s (user %s)\n"
+#~ "Reason: %s"
+
+#~ msgid "Enter password for task list %s (user %s)"
+#~ msgstr "Enter password for task list %s (user %s)"
+
+#~ msgid ""
+#~ "Enter password for memo list %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr ""
+#~ "Enter password for memo list %s (user %s)\n"
+#~ "Reason: %s"
+
+#~ msgid "Enter password for memo list %s (user %s)"
+#~ msgstr "Enter password for memo list %s (user %s)"
+
+#~ msgid "Enter Passphrase"
+#~ msgstr "Enter Passphrase"
+
+#~ msgid "Enter Password"
+#~ msgstr "Enter Password"
+
 #~ msgid "Invalid URI"
 #~ msgstr "Invalid URI"
 
-#~ msgid "No backend factory for '%s' of '%s'"
-#~ msgstr "No backend factory for '%s' of '%s'"
-
 #~ msgid "Could not instantiate backend"
 #~ msgstr "Could not instantiate backend"
 
@@ -5461,12 +5865,6 @@ msgstr "Wait running until at least one client is connected"
 #~ msgid "Loading items"
 #~ msgstr "Loading items"
 
-#~ msgid "Calendar"
-#~ msgstr "Calendar"
-
-#~ msgid "Invalid server URI"
-#~ msgstr "Invalid server URI"
-
 #~ msgid "Could not create thread for populating cache"
 #~ msgstr "Could not create thread for populating cache"
 
@@ -5607,9 +6005,6 @@ msgstr "Wait running until at least one client is connected"
 #~ msgid "Could not send message: %s"
 #~ msgstr "Could not send message: %s"
 
-#~ msgid "Operation cancelled"
-#~ msgstr "Operation cancelled"
-
 #~ msgid "SSL negotiations failed"
 #~ msgstr "SSL negotiations failed"
 
@@ -5628,9 +6023,6 @@ msgstr "Wait running until at least one client is connected"
 #~ msgid "Invalid response from server"
 #~ msgstr "Invalid response from server"
 
-#~ msgid "No response from the server"
-#~ msgstr "No response from the server"
-
 #~ msgid "Bad parameter"
 #~ msgstr "Bad parameter"
 
@@ -5721,9 +6113,6 @@ msgstr "Wait running until at least one client is connected"
 #~ msgid "MH append message canceled"
 #~ msgstr "MH append message cancelled"
 
-#~ msgid "User cancelled the operation"
-#~ msgstr "User cancelled the operation"
-
 #~ msgid "STARTTLS command failed"
 #~ msgstr "STARTTLS command failed"
 
@@ -6171,9 +6560,6 @@ msgstr "Wait running until at least one client is connected"
 #~ msgid "Function not implemented in this storage"
 #~ msgstr "Function not implemented in this storage"
 
-#~ msgid "Operation not supported"
-#~ msgstr "Operation not supported"
-
 #~ msgid "The specified type is not supported in this storage"
 #~ msgstr "The specified type is not supported in this storage"
 
@@ -6222,9 +6608,6 @@ msgstr "Wait running until at least one client is connected"
 #~ msgid "Sent Items"
 #~ msgstr "Sent Items"
 
-#~ msgid "Tasks"
-#~ msgstr "Tasks"
-
 #~ msgid "Evolution Addressbook file backend"
 #~ msgstr "Evolution Addressbook file backend"
 
@@ -6433,9 +6816,6 @@ msgstr "Wait running until at least one client is connected"
 #~ msgid "Select User"
 #~ msgstr "Select User"
 
-#~ msgid "Addressbook..."
-#~ msgstr "Addressbookâ"
-
 #~ msgid "\t\t\t\t\t\t"
 #~ msgstr "\t\t\t\t\t\t"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]