[evolution-data-server/gnome-3-6] update Punjabi Translation



commit 8fb0ae660cc7a59217c05fd98a0f3c0c9a016b15
Author: A S Alam <aalam users sf net>
Date:   Wed Sep 19 19:58:13 2012 +0530

    update Punjabi Translation

 po/pa.po | 3654 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 2026 insertions(+), 1628 deletions(-)
---
diff --git a/po/pa.po b/po/pa.po
index acead8f..f922a1d 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -11,222 +11,283 @@ msgstr ""
 "Project-Id-Version: evolution-data-server.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
-"POT-Creation-Date: 2012-02-23 12:45+0000\n"
-"PO-Revision-Date: 2012-03-21 07:57+0530\n"
+"POT-Creation-Date: 2012-09-16 16:58+0000\n"
+"PO-Revision-Date: 2012-09-19 19:55+0530\n"
 "Last-Translator: A S Alam <aalam users sf net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-users lists sf net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.2\n"
+"X-Generator: Lokalize 1.4\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"Language: pa\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:4596 ../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:164
+#: ../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:525
+#: ../camel/providers/imap/camel-imap-store.c:469
+#: ../libedataserver/e-client.c:165
 msgid "Unknown error"
 msgstr "ààààààà àààà"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:154
+#: ../addressbook/backends/file/e-book-backend-file.c:141
 #, c-format
-#| msgid "Failed to create child process '%s': %s"
 msgid "Failed to remove file '%s': %s"
 msgstr "àààà '%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 "Could not create directory %s: %s"
 msgid "Failed to make directory %s: %s"
 msgstr "ààààààààà %s ààààà àà ààààà: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:472
+#: ../addressbook/backends/file/e-book-backend-file.c:459
 #, c-format
-#| msgid "Failed to create child process '%s': %s"
 msgid "Failed to create hardlink for resource '%s': %s"
 msgstr "'%s' àààà àà àààà-àààà ààààà àà ààààà: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:574
-#: ../addressbook/backends/file/e-book-backend-file.c:1129
+#: ../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 "ààààà àààà ààà UID àààà àà"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1563
-#: ../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 "ààà àààà àà àààà ààâ"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1566
-#: ../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 "ààà àààà ààâ"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:2108
+#: ../addressbook/backends/file/e-book-backend-file.c:2115
 #, c-format
 msgid "Failed to build summary for an address book %s"
 msgstr "ààààà àààà %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 "âàààààà àààà ààààà àà ààààà àààà àà ààà àà"
 
-#: ../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:1918
-msgid "Personal"
-msgstr "ààààà"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:925
-msgid "Friends"
-msgstr "ààààà"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:927
-msgid "Family"
-msgstr "àààààà"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:929
-msgid "Coworkers"
-msgstr "àààà-àààà"
-
 #. 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 "âàààààà àààà ààààà àà ààààà àààà àà ààà àà"
 
-#: ../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 "àààààà ààààà àààà àà ààààà àààà àà"
 
 #. 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 "âàààà ààààà ààààà àà àààà àà"
 
-#: ../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 "Calendar doesn't support Free/Busy"
 msgid "The backend does not support bulk removals"
 msgstr "àààààà ààààà ààààà àà ààààà àààà àà"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1568
+#: ../addressbook/backends/google/e-book-backend-google.c:1351
 msgid "Deleting contactâ"
 msgstr "âààààà ààààà àà àààà àà"
 
-#: ../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 "Key usage does not support certificate signing"
 msgid "The backend does not support bulk modifications"
 msgstr "àààààà ààààà ààà ààà àà ààààà àààà àà"
 
 #. 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 "âààààà ààààà àà àààà àà"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2058
+#: ../addressbook/backends/google/e-book-backend-google.c:1809
 msgid "Loadingâ"
 msgstr "ààà àààà àà àààà ààâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2187
-msgid "Authenticating with the serverâ"
-msgstr "àààà àà àààààààààà àààààà ààâ"
+#: ../addressbook/backends/google/e-book-google-utils.c:1562
+msgid "Personal"
+msgstr "ààààà"
+
+#. System Group: My Contacts
+#: ../addressbook/backends/google/e-book-google-utils.c:1563
+msgid "Friends"
+msgstr "ààààà"
+
+#. System Group: Friends
+#: ../addressbook/backends/google/e-book-google-utils.c:1564
+msgid "Family"
+msgstr "àààààà"
+
+#. System Group: Family
+#: ../addressbook/backends/google/e-book-google-utils.c:1565
+msgid "Coworkers"
+msgstr "àààà-àààà"
 
 #. 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 "àààààà àààà àà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:797
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:793
 msgid "Using Distinguished Name (DN)"
 msgstr "ààààà ààà ààààà (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:800
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:796
 msgid "Using Email Address"
 msgstr "àààà àààààà ààà àà"
 
-#: ../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 "v3 ààà v2 àààà àà ààààà àààà àààà ààà àà ààààà"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1090
 msgid "Reconnecting to LDAP server..."
 msgstr "LDAP àààà ààà ààààà àà àààà àà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1200
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1216
 msgid "Invalid DN syntax"
 msgstr "ààà DN àààààà"
 
-#: ../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 àààà 0x%x (%s)"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1754
 msgid "Adding contact to LDAP server..."
 msgstr "LDAP àààà ààà ààààà ààààà àààà àà ààà àà..."
 
-#: ../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 "LDAP àààà ààà ààààà àààà àà ààà àà..."
 
-#: ../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 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: ààà-ààààà ààà àààà %d ààààà ààààà"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2334
 msgid "Modifying contact from LDAP server..."
 msgstr "LDAP àààà ààà ààààà ààààà àààà àà ààà àà..."
 
-#: ../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: ààà-ààààà ààà ààààà àààà %d ààààà ààààà"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4736
 msgid "Receiving LDAP search results..."
 msgstr "LDAP ààà ààà ààààà àààààà àààà àà ààà àà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4891
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4907
 msgid "Error performing search"
 msgstr "ààà ààààà àààà àààà"
 
-#: ../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 "ààààà (%d) ààààààà àààà àà ààà àà... "
 
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5552
+#, c-format
+#| msgid "Failed to create hardlink for resource '%s': %s"
+msgid "Failed to get the DN for user '%s'"
+msgstr "'%s' àààà àà DN ààà àà ààààà"
+
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:645
+#, c-format
+#| msgid "Failed to remove file '%s': %s"
+msgid "Failed to open addressbook at '%s': %s"
+msgstr "'%s' ààà ààààà-àààà àààààà àà ààààà: %s"
+
 #: ../addressbook/backends/webdav/e-book-backend-webdav.c:354
 #, c-format
 msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgstr "'%s' àààà ààààà àà ààààà, HTTP àààà ààà: %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: àà-àààà àààà àààà àààà UID `%s' àà ààà àààà àààà ààà"
+#| msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgid "DELETE failed with HTTP status %d"
+msgstr "HTTP àààà %d ààà DELETE ààààà àà"
 
-#: ../addressbook/libebook/e-book.c:3514 ../calendar/libecal/e-cal.c:1360
-#: ../libedataserver/e-client.c:1913
-msgid "On This Computer"
-msgstr "àà ààààààà àààà"
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:507
+#| msgid "_Listen for server change notifications"
+msgid "Contact on server changed -> not modifying"
+msgstr "àààà ààà ààààà ààààà -> ààààà àààà"
 
-#: ../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 "àààààà àààà ààààà àààà àà"
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:515
+#, c-format
+#| msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgid "Modify contact failed with HTTP status: %d (%s)"
+msgstr "HTTP àààà %d (%s) ààà ààààà ààà ààààà àà"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:912
+#| msgid "Addressbook..."
+msgid "Loading Addressbook summary..."
+msgstr "...àààààà-àààà ààà ààà àààà àà àààà àà"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:928
+#, c-format
+#| msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
+msgstr "HTTP àààà %d (%s) ààà webdav PROPFIND ààààà àà"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:949
+msgid "No response body in webdav PROPFIND result"
+msgstr "webdav PROPFIND ààààà àààà ààà àààà ààà ààà"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:980
+#, c-format
+#| msgid "Downloading contacts (%d)... "
+msgid "Loading Contacts (%d%%)"
+msgstr "ààààà (%d%%) ààà àààà àà ààà àà"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1287
+msgid "Cannot transform SoupURI to string"
+msgstr "SoupURI ààà ààà àààà ààààààà àààà àààà àà àààà"
 
 #: ../addressbook/libebook/e-book-client.c:95
 msgid "No such book"
 msgstr "ààà àààà àààà àà"
 
 #: ../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 "ààààà àààà ààààà"
 
 #: ../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 "ààààà ID àààààà àà ààààà àà"
 
@@ -235,42 +296,16 @@ msgid "No such source"
 msgstr "ààà àààà àààà"
 
 #: ../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 "ààà àààà àààà"
 
-#: ../addressbook/libebook/e-book-client.c:515
+#: ../addressbook/libebook/e-book-client.c:488
 msgid "Failed to run book factory"
 msgstr "àààà àààààà ààààà àà ààààà àà"
 
-#: ../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 "ààà àààà"
-
-#: ../addressbook/libebook/e-book-client.c:627
-#: ../calendar/libecal/e-cal-client.c:728
-#, c-format
-msgid "Incorrect uri '%s'"
-msgstr "ààà uri '%s'"
-
-#: ../addressbook/libebook/e-book-client.c:665
-msgid "Failed to find system book"
-msgstr "ààààà àààà àààà àà ààààà àà"
-
-#: ../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 "àààà àààà àààà àààà àààà UID '%s' àà ààà àààà àààà ààà"
-
-#: ../addressbook/libebook/e-book-client.c:2566
-#: ../calendar/libecal/e-cal-client.c:4483
+#: ../addressbook/libebook/e-book-client.c:2244
+#: ../calendar/libecal/e-cal-client.c:4602
 msgid "Cannot get connection to view"
 msgstr "ààà àà àààààààà àààà ààà àà àààà"
 
@@ -280,800 +315,866 @@ msgid "Unique ID"
 msgstr "ààààà 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
-#: ../addressbook/libebook/e-contact.c:124
+#. * 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.
+#: ../addressbook/libebook/e-contact.c:126
 msgid "File Under"
 msgstr "àààà ààààà"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:126
-msgid "Book URI"
-msgstr "ààààà URI"
+#: ../addressbook/libebook/e-contact.c:128
+#| msgid "Book URI"
+msgid "Book UID"
+msgstr "ààààà UID"
 
 #. Name fields
 #. FN isn't really a structured field - we use a getter/setter
 #. * so we can set the N property (since evo 1.4 works fine with
 #. * vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:132
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Full Name"
 msgstr "àààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Given Name"
 msgstr "àààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:134
+#: ../addressbook/libebook/e-contact.c:136
 msgid "Family Name"
 msgstr "àààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook/e-contact.c:137
 msgid "Nickname"
 msgstr "àà ààà"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Email 1"
 msgstr "àààà à"
 
-#: ../addressbook/libebook/e-contact.c:139
+#: ../addressbook/libebook/e-contact.c:141
 msgid "Email 2"
 msgstr "àààà à"
 
-#: ../addressbook/libebook/e-contact.c:140
+#: ../addressbook/libebook/e-contact.c:142
 msgid "Email 3"
 msgstr "àààà à"
 
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Email 4"
 msgstr "àààà à"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Mailer"
 msgstr "àààà"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Home Address Label"
 msgstr "àà àààààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Work Address Label"
 msgstr "ààà àààààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Other Address Label"
 msgstr "ààà àààààà àààà"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Assistant Phone"
 msgstr "ààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Business Phone"
 msgstr "àààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Business Phone 2"
 msgstr "àààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Business Fax"
 msgstr "àààààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Callback Phone"
 msgstr "àààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Car Phone"
 msgstr "ààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Company Phone"
 msgstr "ààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Home Phone"
 msgstr "àà ààà"
 
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:161
 msgid "Home Phone 2"
 msgstr "àà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:162
 msgid "Home Fax"
 msgstr "àà àààà"
 
-#: ../addressbook/libebook/e-contact.c:161
+#: ../addressbook/libebook/e-contact.c:163
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:162
+#: ../addressbook/libebook/e-contact.c:164
 msgid "Mobile Phone"
 msgstr "àààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Other Phone"
 msgstr "ààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Other Fax"
 msgstr "ààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Pager"
 msgstr "àààà"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Primary Phone"
 msgstr "àààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Radio"
 msgstr "ààààà"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Telex"
 msgstr "àààààà"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook/e-contact.c:172
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Organization"
 msgstr "ààààà"
 
-#: ../addressbook/libebook/e-contact.c:174
+#: ../addressbook/libebook/e-contact.c:176
 msgid "Organizational Unit"
 msgstr "ààààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:175
+#: ../addressbook/libebook/e-contact.c:177
 msgid "Office"
 msgstr "àààà"
 
-#: ../addressbook/libebook/e-contact.c:176
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Title"
 msgstr "ààààà"
 
-#: ../addressbook/libebook/e-contact.c:177
+#: ../addressbook/libebook/e-contact.c:179
 msgid "Role"
 msgstr "ààà"
 
-#: ../addressbook/libebook/e-contact.c:178
+#: ../addressbook/libebook/e-contact.c:180
 msgid "Manager"
 msgstr "àààààà"
 
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Assistant"
 msgstr "ààààà"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Homepage URL"
 msgstr "àààà ààà URL"
 
-#: ../addressbook/libebook/e-contact.c:183
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Weblog URL"
 msgstr "àààààà URL"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:186
-#: ../libedataserverui/e-categories-dialog.c:88
+#: ../addressbook/libebook/e-contact.c:188
+#: ../libedataserverui/e-categories-dialog.c:90
 msgid "Categories"
 msgstr "ààààààà"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:189
+#: ../addressbook/libebook/e-contact.c:191
 msgid "Calendar URI"
 msgstr "àààààà URI"
 
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:192
 msgid "Free/Busy URL"
 msgstr "ààààà/ààààà URL"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:193
 msgid "ICS Calendar"
 msgstr "ICS àààààà"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:194
 msgid "Video Conferencing URL"
 msgstr "ààààà ààààààààà URL"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:197
 msgid "Spouse's Name"
 msgstr "àààà àà ààà"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:198
 msgid "Note"
 msgstr "àààààà"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:201
 msgid "AIM Home Screen Name 1"
 msgstr "AIM àà ààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:202
 msgid "AIM Home Screen Name 2"
 msgstr "AIM àà ààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:203
 msgid "AIM Home Screen Name 3"
 msgstr "AIM àà ààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:204
 msgid "AIM Work Screen Name 1"
 msgstr "AIM ààà ààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:205
 msgid "AIM Work Screen Name 2"
 msgstr "AIM ààà ààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:206
 msgid "AIM Work Screen Name 3"
 msgstr "AIM ààà ààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:207
 msgid "GroupWise Home Screen Name 1"
 msgstr "àààààààà àà ààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:208
 msgid "GroupWise Home Screen Name 2"
 msgstr "àààààààà àà ààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:209
 msgid "GroupWise Home Screen Name 3"
 msgstr "àààààààà àà ààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:210
 msgid "GroupWise Work Screen Name 1"
 msgstr "àààààààà ààà ààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:211
 msgid "GroupWise Work Screen Name 2"
 msgstr "àààààààà ààà ààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:212
 msgid "GroupWise Work Screen Name 3"
 msgstr "àààààààà ààà ààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Jabber Home ID 1"
 msgstr "Jabber Home ID à"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Jabber Home ID 2"
 msgstr "Jabber Home ID à"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:215
 msgid "Jabber Home ID 3"
 msgstr "Jabber Home ID à"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:216
 msgid "Jabber Work ID 1"
 msgstr "Jabber Work ID à"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Jabber Work ID 2"
 msgstr "Jabber Work ID à"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:218
 msgid "Jabber Work ID 3"
 msgstr "Jabber Work ID à"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:219
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo! Home Screen Name à"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:220
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo! Home Screen Name à"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:221
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo! Home Screen Name à"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:222
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo! Work Screen Name à"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:223
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo! Work Screen Name à"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:224
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo! Work Screen Name à"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:225
 msgid "MSN Home Screen Name 1"
 msgstr "MSN Home Screen Name à"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:226
 msgid "MSN Home Screen Name 2"
 msgstr "MSN Home Screen Name à"
 
-#: ../addressbook/libebook/e-contact.c:225
+#: ../addressbook/libebook/e-contact.c:227
 msgid "MSN Home Screen Name 3"
 msgstr "MSN Home Screen Name à"
 
-#: ../addressbook/libebook/e-contact.c:226
+#: ../addressbook/libebook/e-contact.c:228
 msgid "MSN Work Screen Name 1"
 msgstr "MSN Work Screen Name à"
 
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:229
 msgid "MSN Work Screen Name 2"
 msgstr "MSN Work Screen Name à"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:230
 msgid "MSN Work Screen Name 3"
 msgstr "MSN Work Screen Name à"
 
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook/e-contact.c:231
 msgid "ICQ Home ID 1"
 msgstr "ICQ Home ID à"
 
-#: ../addressbook/libebook/e-contact.c:230
+#: ../addressbook/libebook/e-contact.c:232
 msgid "ICQ Home ID 2"
 msgstr "ICQ Home ID à"
 
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook/e-contact.c:233
 msgid "ICQ Home ID 3"
 msgstr "ICQ Home ID à"
 
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:234
 msgid "ICQ Work ID 1"
 msgstr "ICQ Work ID à"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:235
 msgid "ICQ Work ID 2"
 msgstr "ICQ Work ID à"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:236
 msgid "ICQ Work ID 3"
 msgstr "ICQ Work ID à"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Last Revision"
 msgstr "àààà ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:238
+#. 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.
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Name or Org"
 msgstr "ààà ààà ààààà"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Address List"
 msgstr "àààààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:242
+#: ../addressbook/libebook/e-contact.c:247
 msgid "Home Address"
 msgstr "àà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:248
 msgid "Work Address"
 msgstr "ààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook/e-contact.c:249
 msgid "Other Address"
 msgstr "ààà àààààà"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook/e-contact.c:252
 msgid "Category List"
 msgstr "ààààààà àààà"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:255
 msgid "Photo"
 msgstr "ààààà"
 
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Logo"
 msgstr "àààà"
 
-#: ../addressbook/libebook/e-contact.c:253
+#. 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
+#: ../addressbook/libebook/e-contact.c:260
 msgid "Name"
 msgstr "ààà"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:261
 msgid "Email List"
 msgstr "àààà àààà"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:264
 msgid "AIM Screen Name List"
 msgstr "AIM ààààà ààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:258
+#: ../addressbook/libebook/e-contact.c:265
 msgid "GroupWise ID List"
 msgstr "àààààààà ID àààà"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:266
 msgid "Jabber ID List"
 msgstr "Jabber ID àààà"
 
-#: ../addressbook/libebook/e-contact.c:260
+#: ../addressbook/libebook/e-contact.c:267
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo! Screen ààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:261
+#: ../addressbook/libebook/e-contact.c:268
 msgid "MSN Screen Name List"
 msgstr "MSN Screen ààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:262
+#: ../addressbook/libebook/e-contact.c:269
 msgid "ICQ ID List"
 msgstr "ICQ ID àààà"
 
-#: ../addressbook/libebook/e-contact.c:264
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Wants HTML Mail"
 msgstr "HTML ààà àààààà àà"
 
-#: ../addressbook/libebook/e-contact.c:266
+#. 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/...
+#: ../addressbook/libebook/e-contact.c:276
 msgid "List"
 msgstr "àààà"
 
-#: ../addressbook/libebook/e-contact.c:267
-msgid "List Show Addresses"
-msgstr "ààààà àààààà àààà ààà"
+#. 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.
+#: ../addressbook/libebook/e-contact.c:281
+#| msgid "List Show Addresses"
+msgid "List Shows Addresses"
+msgstr "àààà ààààà àààààààà àà"
 
-#: ../addressbook/libebook/e-contact.c:269
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Birth Date"
 msgstr "ààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:270
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1063
+#: ../addressbook/libebook/e-contact.c:284
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:919
 msgid "Anniversary"
 msgstr "ààà-ààà"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:273
+#: ../addressbook/libebook/e-contact.c:287
 msgid "X.509 Certificate"
 msgstr "X.509 ààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:275
+#: ../addressbook/libebook/e-contact.c:289
 msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu àà ID à"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:290
 msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu àà ID à"
 
-#: ../addressbook/libebook/e-contact.c:277
+#: ../addressbook/libebook/e-contact.c:291
 msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu àà ID à"
 
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:292
 msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu ààà ID à"
 
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:293
 msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu ààà ID à"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:294
 msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu ààà ID à"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:295
 msgid "Gadu-Gadu ID List"
 msgstr "Gadu-Gadu ID àààà"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:298
 msgid "Geographic Information"
 msgstr "ààààààà ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:300
 msgid "Telephone"
 msgstr "ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:288
+#: ../addressbook/libebook/e-contact.c:302
 msgid "Skype Home Name 1"
 msgstr "Skype Home Name à"
 
-#: ../addressbook/libebook/e-contact.c:289
+#: ../addressbook/libebook/e-contact.c:303
 msgid "Skype Home Name 2"
 msgstr "Skype Home Name à"
 
-#: ../addressbook/libebook/e-contact.c:290
+#: ../addressbook/libebook/e-contact.c:304
 msgid "Skype Home Name 3"
 msgstr "Skype Home Name à"
 
-#: ../addressbook/libebook/e-contact.c:291
+#: ../addressbook/libebook/e-contact.c:305
 msgid "Skype Work Name 1"
 msgstr "Skype Work Name à"
 
-#: ../addressbook/libebook/e-contact.c:292
+#: ../addressbook/libebook/e-contact.c:306
 msgid "Skype Work Name 2"
 msgstr "Skype Work Name à"
 
-#: ../addressbook/libebook/e-contact.c:293
+#: ../addressbook/libebook/e-contact.c:307
 msgid "Skype Work Name 3"
 msgstr "Skype Work Name à"
 
-#: ../addressbook/libebook/e-contact.c:294
+#: ../addressbook/libebook/e-contact.c:308
 msgid "Skype Name List"
 msgstr "Skype Name àààà"
 
-#: ../addressbook/libebook/e-contact.c:296
+#: ../addressbook/libebook/e-contact.c:310
 msgid "SIP address"
 msgstr "SIP àààààà"
 
-#: ../addressbook/libebook/e-contact.c:298
+#: ../addressbook/libebook/e-contact.c:312
 msgid "Google Talk Home Name 1"
 msgstr "àààà ààà Home Name 1"
 
-#: ../addressbook/libebook/e-contact.c:299
+#: ../addressbook/libebook/e-contact.c:313
 msgid "Google Talk Home Name 2"
 msgstr "àààà ààà Home Name 2"
 
-#: ../addressbook/libebook/e-contact.c:300
+#: ../addressbook/libebook/e-contact.c:314
 msgid "Google Talk Home Name 3"
 msgstr "àààà ààà Home Name 3"
 
-#: ../addressbook/libebook/e-contact.c:301
+#: ../addressbook/libebook/e-contact.c:315
 msgid "Google Talk Work Name 1"
 msgstr "àààà ààà Work Name 1"
 
-#: ../addressbook/libebook/e-contact.c:302
+#: ../addressbook/libebook/e-contact.c:316
 msgid "Google Talk Work Name 2"
 msgstr "àààà ààà Work Name 2"
 
-#: ../addressbook/libebook/e-contact.c:303
+#: ../addressbook/libebook/e-contact.c:317
 msgid "Google Talk Work Name 3"
 msgstr "àààà ààà Work Name 3"
 
-#: ../addressbook/libebook/e-contact.c:304
+#: ../addressbook/libebook/e-contact.c:318
 msgid "Google Talk Name List"
 msgstr "àààà ààà Name àààà"
 
-#: ../addressbook/libebook/e-contact.c:1597
-#: ../addressbook/libebook/e-destination.c:878
+#: ../addressbook/libebook/e-contact.c:320
+#| msgid "Skype Name List"
+msgid "Twitter Name List"
+msgstr "àààààà ààà àààà"
+
+#: ../addressbook/libebook/e-contact.c:1623
+#: ../addressbook/libebook/e-destination.c:879
 msgid "Unnamed List"
 msgstr "ààààà ààà àààà"
 
-#: ../addressbook/libedata-book/e-book-backend.c:19
+#: ../addressbook/libedata-book/e-book-backend.c:17
 msgid "Cannot process, book backend is opening"
 msgstr "àààààà àààà àà àààà, àààà àààààà ààààààà àà"
 
-#: ../addressbook/libedata-book/e-book-backend.c:91
+#: ../addressbook/libedata-book/e-book-backend.c:90
 #, c-format
 msgid "Unknown book property '%s'"
 msgstr "ààààà àààà ààààààààà '%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 "àààà ààààààààà '%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 "àààààà àààààà àààà"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1093
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1092
 #, c-format
-#| msgid "Contact not found"
 msgid "Contact '%s' not found"
 msgstr "'%s' ààààà àààà ààààà"
 
 #. 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 "ààà ààààà: "
 
-#: ../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 "àààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:312
-#: ../calendar/libecal/e-cal.c:4564 ../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 "àààààà ààà ààààà àà"
 
-#: ../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 "ààààààààà àààààà àà"
 
-#: ../addressbook/libedata-book/e-data-book.c:314
-#: ../calendar/libecal/e-cal.c:4578 ../calendar/libedata-cal/e-data-cal.c:430
-#: ../libedataserver/e-client.c:137
+#: ../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 "àààààà àààààà àà"
 
-#: ../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 "àààààààààà ààààà ààà"
 
-#: ../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 "àààààààààà àààààà àà"
 
-#: ../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 "ààà-ààààà àààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:320
-#: ../calendar/libedata-cal/e-data-cal.c:439 ../libedataserver/e-client.c:145
+#: ../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 "àààà-ààààà ààààààààà ààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:321
-#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:147
+#: ../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 àààààà àààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:323
+#: ../addressbook/libedata-book/e-data-book.c:313
+msgid "Address book does not exist"
+msgstr "àààààà àààà ààààà àààà àà"
+
+#: ../addressbook/libedata-book/e-data-book.c:314
 msgid "Book removed"
 msgstr "àààà àààà"
 
-#: ../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 "àààààà àààà àààààà àààà ààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:325
-#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:149
+#: ../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 "ààà ààààà àààà ààà àà"
 
-#: ../addressbook/libedata-book/e-data-book.c:326
-#: ../calendar/libedata-cal/e-data-cal.c:445 ../libedataserver/e-client.c:151
+#: ../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 "ààà àààà àààà ààà àà"
 
-#: ../addressbook/libedata-book/e-data-book.c:327
-#: ../calendar/libedata-cal/e-data-cal.c:446 ../libedataserver/e-client.c:153
+#: ../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 "ààà ààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:328
-#: ../calendar/libedata-cal/e-data-cal.c:447 ../libedataserver/e-client.c:155
+#: ../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 "ààààà ààà ààààà àààà ààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:329
-#: ../calendar/libedata-cal/e-data-cal.c:448 ../libedataserver/e-client.c:141
+#: ../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 "ààà àààà àààà àà àààà"
 
 #. { 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 "ààà àààà àààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:333
-#: ../calendar/libecal/e-cal.c:4562 ../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 "ààà àààààààà"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:335
-#: ../calendar/libecal/e-cal.c:4601 ../calendar/libedata-cal/e-data-cal.c:453
-#: ../libedataserver/e-client.c:143
+#: ../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 "ààààà àààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:336
-#: ../calendar/libedata-cal/e-data-cal.c:454 ../libedataserver/e-client.c:161
+#: ../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 "àààààà àààà ààààààà àààà àà"
 
-#: ../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:159
+#: ../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 "ààà àààà"
 
 #. 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 "ààààà ààà àààà àà àààà :"
 
 #. 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 "àààà ààààà :"
 
 #. 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 "ààààà ààààà àààà àààà àà àààà: "
 
 #. 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
-#| msgid "Cannot modify contact: "
+#: ../addressbook/libedata-book/e-data-book.c:642
+#: ../addressbook/libedata-book/e-data-book.c:1041
 msgid "Cannot modify contacts: "
 msgstr "ààààà ààààà àààà àà àààà: "
 
 #. 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 "ààààà ààààààà àààà àààà àà àààà: "
-
-#. 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 "àààà àààààà àààà àà àààà: "
 
 #. 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 "àààà àààà àààà àà àààà: "
 
 #. 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 "ààààà àààà ààààà àààà àààà àà àààà: "
 
 #. 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 "àààààà ààààààààà àààà àà àà àààà: "
 
 #. 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 "àààààà ààààààààà àààà àààà àààà àà àààà: "
 
 #. 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 "ààààà àààà àà àààà àà àààà: "
 
 #. 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 "ààààà àààà uid àà àààà àà àààà: "
 
 #. 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 "ààààà àààà àààà àà àààà: "
 
-#: ../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 factory for '%s' of '%s'"
+msgid "No backend name in source '%s'"
+msgstr "'%s' àààà àààà ààà àààààà ààà àààà"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:115
+#: ../calendar/libedata-cal/e-data-cal-factory.c:127
 #, c-format
-msgid "Empty URI"
-msgstr "àààà URI"
+msgid "Invalid backend name '%s' in source '%s'"
+msgstr "àààà '%2$s' àààà ààà àààààà ààà '%1$s'"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:319
+#: ../calendar/libedata-cal/e-data-cal-factory.c:230
+#| msgid "POP Source UID"
+msgid "Missing source UID"
+msgstr "àààà àààà UID"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:546
+#: ../addressbook/libedata-book/e-data-book-factory.c:332
+#: ../calendar/libedata-cal/e-data-cal-factory.c:243
+#, c-format
+#| msgid "No such source"
+msgid "No such source for UID '%s'"
+msgstr "UID '%s' àà ààà àààà àààà"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:568
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "àààà ààààà àààà àààà àà (%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 POP server %s in secure mode: %s"
+msgid "Failed to connect to a server using SSL: %s"
+msgstr "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 ""
+"SSL àà ààààà àààà àààà ààà àààààà ààà àà ààààà ààà ààà àààà àààà àà àààà àààà "
+"ààà ààààààààà àà ààààà ààààà àà àà àà àààà àà, ààààà àà ààà-ààààà àààà "
+"ààààààààà "
+"àààà àààà ààààà àà àààà àààà ààà àà ààààààààà ààààà àààà ààà 'ààà SSL "
+"ààààààààà "
+"ààààààà' ààà ààà ààààààà àààààà ààà àà àààà ààà"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:616
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "ààà HTTP àààà ààà %d ààààà (%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 "Backend is not opened yet"
+msgid "CalDAV backend is not loaded yet"
+msgstr "CalDAV àààààà àààà ààà àààà àààà àà"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1017
+#| msgid "Invalid server URI"
+msgid "Invalid Redirect URL"
+msgstr "ààà ààà-ààààààà URL"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2360
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2722
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1082,471 +1183,472 @@ msgstr ""
 "àààà ààààà 'à àààà àà, àààààà ààà àààà ààààà ààà 'à àà ààààààà àà àààà ààà\n"
 "àààà àààààà: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4482
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2663
+#| msgid "Cannot create calendar object: "
+msgid "Cannot create local store"
+msgstr "àààà àààà ààààà àààà àà àààà"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2672
+#, c-format
+#| msgid "Cannot create folder '%s': %s"
+msgid "Cannot create local cache folder '%s'"
+msgstr "àààà ààà ààààà '%s' ààààà àààà àà àààà"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2683
+#| msgid "Could not create cache file"
+msgid "Could not create synch slave thread"
+msgstr "àààà àààà ààààà ààààà àààà àà àààà"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3677
+#| msgid "The backend does not support bulk additions"
+msgid "CalDAV does not support bulk additions"
+msgstr "CalDAV ààààà àààà àà ààààà àààà àà"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3779
+#| msgid "The backend does not support bulk modifications"
+msgid "CalDAV does not support bulk modifications"
+msgstr "CalDAV ààààà ààà ààà àà ààààà àààà àà"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3947
+#| msgid "The backend does not support bulk removals"
+msgid "CalDAV does not support bulk removals"
+msgstr "CalDAV ààààà ààààà àà ààààà àààà àà"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4606
 msgid "Calendar doesn't support Free/Busy"
 msgstr "àààààà ààààà/ààààà àà ààààà àààà"
 
-#: ../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 ""
-"ààààà àààà %s (ààààà %s) àà àààààà ààà\n"
-"àààà: %s"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4614
+msgid "Schedule outbox url not found"
+msgstr "àààààà ààààààà url àààà ààààà"
 
-#: ../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 "ààààà àààà %s (ààààà %s) àà àààààà ààà"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4713
+msgid "Unexpected result in schedule-response"
+msgstr "àààààà-àààà àààà ààààà ààààà"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1065
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:921
 msgid "Birthday"
 msgstr "àààààà"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1101
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:957
 #, c-format
 msgid "Birthday: %s"
 msgstr "àààààà: %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 "àààààà: %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 "àààààà àààà ààà ààààààà àààà àà àààà àà: àààààà 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 "àààààà àààà ààà ààààààà àààà àà àààà àà"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:405
+#: ../calendar/backends/http/e-cal-backend-http.c:482
+#, c-format
+#| msgid "Malformed signature"
+msgid "Malformed URI: %s"
+msgstr "àààààà URI: %s"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:543
+#, c-format
 msgid "Redirected to Invalid URI"
 msgstr "ààà 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 "ààà àààà àààààà"
 
-#: ../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 "ààà àààààà àààà"
 
-#: ../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:887
+#: ../calendar/backends/http/e-cal-backend-http.c:891
+#: ../calendar/backends/weather/e-cal-backend-weather.c:511
 msgid "Could not create cache file"
 msgstr "ààààà àààà ààà ààààà àààà àà àààà àà"
 
-#: ../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 "ààààà àààà ààà ààààà àààà àà àààà àà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:279
+#: ../calendar/backends/weather/e-cal-backend-weather.c:276
 msgid "Weather: Fog"
 msgstr "àààà: àààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:280
+#: ../calendar/backends/weather/e-cal-backend-weather.c:277
 msgid "Weather: Cloudy Night"
 msgstr "àààà: ààààààà àààà ààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:281
+#: ../calendar/backends/weather/e-cal-backend-weather.c:278
 msgid "Weather: Cloudy"
 msgstr "àààà: ààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:282
+#: ../calendar/backends/weather/e-cal-backend-weather.c:279
 msgid "Weather: Overcast"
 msgstr "àààà: ààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:283
+#: ../calendar/backends/weather/e-cal-backend-weather.c:280
 msgid "Weather: Showers"
 msgstr "àààà: ààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:284
+#: ../calendar/backends/weather/e-cal-backend-weather.c:281
 msgid "Weather: Snow"
 msgstr "àààà: ààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:285
+#: ../calendar/backends/weather/e-cal-backend-weather.c:282
 msgid "Weather: Clear Night"
 msgstr "àààà: àààà ààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:286
+#: ../calendar/backends/weather/e-cal-backend-weather.c:283
 msgid "Weather: Sunny"
 msgstr "àààà: ààààà ààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:287
+#: ../calendar/backends/weather/e-cal-backend-weather.c:284
 msgid "Weather: Thunderstorms"
 msgstr "àààà: àààààà ààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:435
+#: ../calendar/backends/weather/e-cal-backend-weather.c:408
 msgid "Forecast"
 msgstr "àààààà"
 
-#: ../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 "%s àà àààààà ààà (ààààà %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 "%s àà àààààà ààààà %s àà àààààà ààà ààà àà ààà"
-
-#: ../calendar/libecal/e-cal.c:4566
+#: ../calendar/libecal/e-cal.c:4003
 msgid "Repository is offline"
 msgstr "Repository àààààà àà"
 
-#: ../calendar/libecal/e-cal.c:4568 ../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 "ààààà àà ààà àààààà àààà àà"
 
-#: ../calendar/libecal/e-cal.c:4570 ../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 "àààà àààà àà"
 
-#: ../calendar/libecal/e-cal.c:4572 ../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 "ààà àààà"
 
-#: ../calendar/libecal/e-cal.c:4574
+#: ../calendar/libecal/e-cal.c:4011
 msgid "URI not loaded"
 msgstr "URI ààà àààà àà"
 
-#: ../calendar/libecal/e-cal.c:4576
+#: ../calendar/libecal/e-cal.c:4013
 msgid "URI already loaded"
 msgstr "URI àààààà àà ààà àà"
 
-#: ../calendar/libecal/e-cal.c:4580
+#: ../calendar/libecal/e-cal.c:4017
 msgid "Unknown User"
 msgstr "ààààà ààààà"
 
-#: ../calendar/libecal/e-cal.c:4582 ../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 "àààà ID àààààà àà ààààà àà"
 
-#: ../calendar/libecal/e-cal.c:4584
+#: ../calendar/libecal/e-cal.c:4021
 msgid "Protocol not supported"
 msgstr "àààààààà ààààà àààà àà"
 
-#: ../calendar/libecal/e-cal.c:4586
+#: ../calendar/libecal/e-cal.c:4023
 msgid "Operation has been canceled"
 msgstr "àààààà ààà àààà àà àà"
 
-#: ../calendar/libecal/e-cal.c:4588
+#: ../calendar/libecal/e-cal.c:4025
 msgid "Could not cancel operation"
 msgstr "àààààà ààà ààà àààà àààà àà àààà àà"
 
-#: ../calendar/libecal/e-cal.c:4590 ../libedataserver/e-client.c:129
+#: ../calendar/libecal/e-cal.c:4027 ../libedataserver/e-client.c:128
 msgid "Authentication failed"
 msgstr "àààààààààà àààà"
 
-#: ../calendar/libecal/e-cal.c:4592
-#: ../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 "àààààààààà àààààà àà"
 
-#: ../calendar/libecal/e-cal.c:4594
+#: ../calendar/libecal/e-cal.c:4031
 msgid "A D-Bus exception has occurred"
 msgstr "D-BUS àààà ààà"
 
-#: ../calendar/libecal/e-cal.c:4598
+#: ../calendar/libecal/e-cal.c:4035
 msgid "No error"
 msgstr "ààà àààà àààà"
 
-#: ../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 "ààààà ààààà"
 
-#: ../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 "ààà àààà"
 
-#: ../calendar/libecal/e-cal-client.c:603
+#: ../calendar/libecal/e-cal-client.c:610
 msgid "Failed to run calendar factory"
 msgstr "àààààà àààààà ààààà àà ààààà àà"
 
-#: ../calendar/libecal/e-cal-client.c:768
-msgid "Failed to find system calendar"
-msgstr "ààààà àààààà àààà àà ààààà àà"
-
-#: ../calendar/libecal/e-cal-client.c:807
-#: ../calendar/libedata-cal/e-data-cal.c:441
-msgid "Calendar does not exist"
-msgstr "àààààà ààààà àààà"
-
-#: ../calendar/libecal/e-cal-client.c:922
-msgid "Invalid source type"
-msgstr "ààà àààà àààà"
-
-#: ../calendar/libecal/e-cal-component.c:1337
+#: ../calendar/libecal/e-cal-component.c:1339
 msgid "Untitled appointment"
 msgstr "ààààà ààà ààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "1st"
 msgstr "àààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3982
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "2nd"
 msgstr "ààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3983
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "3rd"
 msgstr "ààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3984
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "4th"
 msgstr "ààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3985
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "5th"
 msgstr "àààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3986
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "6th"
 msgstr "àààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "7th"
 msgstr "àààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "8th"
 msgstr "àààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "9th"
 msgstr "àààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "10th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "11th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "12th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "13th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "14th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "15th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "16th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "17th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "18th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "19th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "20th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "21st"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "22nd"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "23rd"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "24th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "25th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "26th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "27th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "28th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "29th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4010
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "30th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4011
+#: ../calendar/libecal/e-cal-recur.c:4017
 msgid "31st"
 msgstr "ààààà"
 
-#: ../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 "ààà"
 
-#: ../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 "ààààà"
 
-#: ../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 "ààà"
 
 #. 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 "àà-àààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:38
+#: ../calendar/libedata-cal/e-cal-backend.c:36
 msgid "Cannot process, calendar backend is opening"
 msgstr "àààààà àààà àà àààà, àààààà àààààà ààààààà àà"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:146
+#: ../calendar/libedata-cal/e-cal-backend.c:135
 #, c-format
 msgid "Unknown calendar property '%s'"
 msgstr "ààààà àààààà ààààààààà '%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 "'%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\" àà ààà àààààààà àà ààà àààà àààààà àà"
 
-#: ../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\" àà ààà àààààààà àààààà àà"
 
-#: ../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\" àà àààààà àààààààà ààà àààà ààààà àà"
 
-#: ../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\" àà àààààà àààààààà ISO 8601 date/time ààà àààà ààààà àà"
 
-#: ../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\" àà àà àààààààà àààààà àà"
 
-#: ../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\" àà àààààà àààààààà 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\" àà àààà àààààààà àààà ààà àààààà àà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:397
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:395
 #, c-format
-#| msgid "\"%s\" expects two arguments"
 msgid "\"%s\" expects two or three arguments"
 msgstr "\"%s\" àà àà ààà àààà àààààààà àààààà àà"
 
-#: ../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\"àà àààà àààààààà 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 first argument to be a string"
 msgid "\"%s\" expects the third argument to be a string"
 msgstr "\"%s\" àà àààà àààààààà ààà àààà ààààà àà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:480
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:478
 #, c-format
-#| msgid "\"%s\" expects two arguments"
 msgid "\"%s\" expects none or two arguments"
 msgstr "\"%s\" àà ààà àààà ààà àà àààààààà àààààà àà"
 
-#: ../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\" àà àààà àààààààà ààà ààà àààà ààààà àà"
 
-#: ../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 "
@@ -1557,12 +1659,12 @@ msgstr ""
 "\"description\", ààà \"location\", ààà \"attendee\", ààà \"organizer\", ààà "
 "\"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\" àà àààà-ààà ààà àààààààà ààààà àà"
 
-#: ../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 "
@@ -1570,96 +1672,100 @@ msgid ""
 msgstr ""
 "\"%s\" àà àà àààààààà ààà ààà ààà ààà ààà àààà ààà àààààààà àààààà (ààà) àààà"
 
-#: ../calendar/libedata-cal/e-data-cal.c:438
+#: ../calendar/libedata-cal/e-data-cal.c:426
 msgid "Unsupported method"
 msgstr "àààà-ààààà ààà"
 
+#: ../calendar/libedata-cal/e-data-cal.c:429
+msgid "Calendar does not exist"
+msgstr "àààààà ààààà àààà"
+
 #. 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 "àààààà ààààààà àààà àà àààà: "
 
 #. 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 "àààààà ààààà àààà àà àààà: "
 
 #. 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 "àààààà ààààà àààà àààà àà àààà: "
 
 #. 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 "àààààà ààààààààà àààààà àààà àààà àà àààà: "
 
 #. 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 "àààààà àààààà ààà ààà àààà àà àààà: "
 
 #. 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 "àààààà àààààà àààà àà àààà àà àààà: "
 
 #. 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 "àààààà ààààà/àààààà àààà àà àààà àà àààà: "
 
 #. 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 "àààààà àààààà ààààà àààà àà àààà: "
 
 #. 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 "àààààà àààààà ààààà àààà àà àààà: "
 
 #. 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 "àààààà àààààà ààààà àààà àà àààà: "
 
 #. 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 "àààààà àààààà ààà àààà àà àààà: "
 
 #. 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 "àààààà àààààà àààà àààà àà àààà: "
 
 #. 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 "ààààà àààààààà uri àà àààà àà ààà: "
 
 #. 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 "ààààààà ààààààà àààà àààà àà àààà: "
 
 #. 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 "àààààà ààà ààà ààà àààà àà àààà: "
 
 #. 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 "àààààà àààà àààà ààà àààà àà àààà: "
 
 #. 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 "àààààà àààà àààà ààààà àààà àà àààà: "
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:199
+#: ../calendar/libedata-cal/e-data-cal-factory.c:220
 #, c-format
 msgid "Invalid call"
 msgstr "ààà ààà"
@@ -1694,15 +1800,15 @@ msgstr "ààààà àà ààààà ààà àà ààààà
 msgid "You may not export keys with this cipher"
 msgstr "ààààà ààààà àà àà ààààààà àààà àà àààà"
 
-#: ../camel/camel-cipher-context.c:805
+#: ../camel/camel-cipher-context.c:817
 msgid "Signing message"
 msgstr "àààààà àààà àààà àà àààà àà"
 
-#: ../camel/camel-cipher-context.c:1046
+#: ../camel/camel-cipher-context.c:1058
 msgid "Encrypting message"
 msgstr "àààààà àààààààà àààà àà àààà àà"
 
-#: ../camel/camel-cipher-context.c:1173
+#: ../camel/camel-cipher-context.c:1185
 msgid "Decrypting message"
 msgstr "àààààà àààààààà àààà àà àààà àà"
 
@@ -1711,12 +1817,16 @@ msgstr "àààààà àààààààà àààà àà àà
 msgid "Unable to create cache path"
 msgstr "àààà àààà ààààà àààà àààà"
 
-#: ../camel/camel-data-cache.c:507
+#: ../camel/camel-data-cache.c:440
+msgid "Empty cache file"
+msgstr "ààà àààà àààà ààà"
+
+#: ../camel/camel-data-cache.c:509
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "àààà àààààà ààà ààààà àààà àà àààà àà: %s: %s"
 
-#: ../camel/camel-disco-diary.c:201
+#: ../camel/camel-disco-diary.c:207
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1727,8 +1837,8 @@ msgstr ""
 "àà àààà àà ààà àààààà àààààà ààààààà àà ààà àààà àà ààà\n"
 "àààààà àà àà àààààà"
 
-#: ../camel/camel-disco-diary.c:266
-#: ../camel/providers/imap/camel-imap-journal.c:309
+#: ../camel/camel-disco-diary.c:271
+#: ../camel/providers/imap/camel-imap-journal.c:312
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1739,7 +1849,7 @@ msgstr ""
 "%s\n"
 "àà ààààà àààà àààààà àààààààà ààà-àààààà àààà àààààà àà àààààààà"
 
-#: ../camel/camel-disco-diary.c:310
+#: ../camel/camel-disco-diary.c:315
 msgid "Resynchronizing with server"
 msgstr "àààà ààà ààà-àààààààààà àààà àà àààà àà"
 
@@ -1747,39 +1857,32 @@ msgstr "àààà ààà ààà-àààààààààà àà
 msgid "Downloading new messages for offline mode"
 msgstr "àààààà ààà àà àààà àààààà ààààààà àààà àà ààà àà"
 
-#: ../camel/camel-disco-folder.c:416
+#: ../camel/camel-disco-folder.c:420
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "ààààà '%s' ààà àààààà àà àààà àààà àà àààà àà"
 
-#: ../camel/camel-disco-folder.c:482 ../camel/camel-offline-folder.c:327
-#| msgid "Copy folder content locally for offline operation"
+#: ../camel/camel-disco-folder.c:487 ../camel/camel-offline-folder.c:334
 msgid "Copy folder content locally for _offline operation"
 msgstr "àààààà àààààà ààààà ààààà ààà àààà ààà(_o)"
 
-#: ../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:1398 ../camel/camel-imapx-store.c:1487
+#: ../camel/camel-imapx-store.c:1536
+#: ../camel/providers/imap/camel-imap-store.c:1270
+#: ../camel/providers/imap/camel-imap-store.c:2033
+#: ../camel/providers/imap/camel-imap-store.c:2509
+#: ../camel/providers/imap/camel-imap-store.c:3289
+#: ../camel/providers/pop3/camel-pop3-folder.c:531
+#: ../camel/providers/pop3/camel-pop3-folder.c:674
+#: ../camel/providers/pop3/camel-pop3-folder.c:874
+#: ../camel/providers/pop3/camel-pop3-folder.c:1074
+#: ../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 "àà àààààà ààà àààààà ààà àà ààààààà àà-àààà ààààà àààààà àà"
@@ -1789,64 +1892,64 @@ msgstr "àà àààààà ààà àààààà ààà àà
 msgid "Canceled"
 msgstr "ààà àààà"
 
-#: ../camel/camel-filter-driver.c:895 ../camel/camel-filter-search.c:762
+#: ../camel/camel-filter-driver.c:916 ../camel/camel-filter-search.c:772
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "àààà àààààà `%s' ààààà àààà àààà: %s"
 
-#: ../camel/camel-filter-driver.c:943
+#: ../camel/camel-filter-driver.c:964
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "%s ààà ààà àààààà ààà àààààà ààà àà: %s"
 
-#: ../camel/camel-filter-driver.c:1139 ../camel/camel-filter-driver.c:1146
+#: ../camel/camel-filter-driver.c:1169 ../camel/camel-filter-driver.c:1178
 msgid "Syncing folders"
 msgstr "ààààà àààààà"
 
-#: ../camel/camel-filter-driver.c:1240 ../camel/camel-filter-driver.c:1695
+#: ../camel/camel-filter-driver.c:1276 ../camel/camel-filter-driver.c:1761
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "ààààà ààà àààà ààà àààà àààà: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1706
+#: ../camel/camel-filter-driver.c:1287 ../camel/camel-filter-driver.c:1774
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "ààààà ààààà àààà àààà: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1347
+#: ../camel/camel-filter-driver.c:1383
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "àààà ààààà àààà àààà àààà"
 
-#: ../camel/camel-filter-driver.c:1359
+#: ../camel/camel-filter-driver.c:1395
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "àààà àààà ààààà àààà ààà àààààà"
 
-#: ../camel/camel-filter-driver.c:1377
+#: ../camel/camel-filter-driver.c:1415
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d àààààà àààààà àààà àà àààà àà(%d%%)"
 
-#: ../camel/camel-filter-driver.c:1384 ../camel/camel-filter-driver.c:1406
+#: ../camel/camel-filter-driver.c:1424 ../camel/camel-filter-driver.c:1446
 #, c-format
 msgid "Failed on message %d"
 msgstr "àààààà %d àà àààà"
 
-#: ../camel/camel-filter-driver.c:1421 ../camel/camel-filter-driver.c:1527
+#: ../camel/camel-filter-driver.c:1463 ../camel/camel-filter-driver.c:1573
 msgid "Syncing folder"
 msgstr "ààààà àààààà àààà àà àààà àà"
 
-#: ../camel/camel-filter-driver.c:1426 ../camel/camel-filter-driver.c:1533
+#: ../camel/camel-filter-driver.c:1468 ../camel/camel-filter-driver.c:1581
 msgid "Complete"
 msgstr "àààààà"
 
-#: ../camel/camel-filter-driver.c:1485
+#: ../camel/camel-filter-driver.c:1529
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%2d àààààà %1d àààààà àààààà àààà àà àààà àà"
 
-#: ../camel/camel-filter-driver.c:1503
+#: ../camel/camel-filter-driver.c:1547
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%2d àààààà %1d àààààà àààààà ààà àà ààààà"
@@ -1863,58 +1966,69 @@ msgstr "(system-flag) àà ààà àààààààà"
 msgid "Invalid arguments to (user-tag)"
 msgstr "ààà àààààààà(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 "ààààà ààà ààààà ààààà àààà: %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] "'%s' àààà àààà ààà àààààà àààààà àà àààà àà"
 msgstr[1] "'%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] "'%s' àààà àààà àà àààààà àààààà àà àààà àà"
 msgstr[1] "'%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] "'%s' àààà àààà àààààà ààààà àààà àà àààà àà"
 msgstr[1] "'%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 "àààààà àààà àà ààà àà"
 
-#: ../camel/camel-folder.c:921
+#: ../camel/camel-folder.c:933
 msgid "Copying messages"
 msgstr "àààààà àààà àààà àà ààà àà"
 
-#: ../camel/camel-folder.c:1233
+#: ../camel/camel-folder.c:1253
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr "'%s' ààààà àà àààà ààààààà ààà àà ààààà àààà àà"
 
-#: ../camel/camel-folder.c:3549
+#: ../camel/camel-folder.c:3372
+#, c-format
+#| msgid "Opening folder '%s'"
+msgid "Expunging folder '%s'"
+msgstr "ààààà '%s' ààààà àààà àà àààà àà"
+
+#: ../camel/camel-folder.c:3604
 #, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "%2$s àààààà àààààà '%1$s' ààà àà àààà àà"
 
-#: ../camel/camel-folder.c:3698
+#: ../camel/camel-folder.c:3755
 #, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "'%s' àà àààà ààààààà àà àà ààà àà"
 
-#: ../camel/camel-folder-search.c:365 ../camel/camel-folder-search.c:479
-#: ../camel/camel-folder-search.c:664
+#: ../camel/camel-folder.c:3987
+#, c-format
+#| msgid "Creating folder '%s'"
+msgid "Refreshing folder '%s'"
+msgstr "'%s' ààààà ààààà àààà àà àààà àà"
+
+#: ../camel/camel-folder-search.c:420 ../camel/camel-folder-search.c:587
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1923,8 +2037,7 @@ msgstr ""
 "ààà àààààà ààà àààà àààà àààà àà àààà àà: %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"
@@ -1934,43 +2047,43 @@ 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) àà ààà ààààà ààà ààààà àààààà àà"
 
 #. 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) %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) àà ààà ààà ààà àààààà àà"
 
 #. 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) àà ààà ààà ààààà àà ààà àà"
 
 #. 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) àà ààààà àààà àà ààà àà"
 
 #: ../camel/camel-gpg-context.c:663 ../camel/camel-gpg-context.c:668
-#: ../camel/camel-gpg-context.c:1327
+#: ../camel/camel-gpg-context.c:1331
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "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 "ààààà"
 
@@ -2018,86 +2131,359 @@ msgstr ""
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "GnuPG ààà '%s' ààà àà-àààààà àààà àààààà àààà"
 
-#: ../camel/camel-gpg-context.c:850
+#: ../camel/camel-gpg-context.c:852
 msgid ""
 "Note the encrypted content doesn't contain information about a recipient, "
 "thus there will be a password prompt for each of stored private key."
 msgstr ""
 "ààà àààà àà àààààààà àààà àààààà àààà àààààààààà àààà ààààààà àààà ààààà àà, "
-"àààààà àà àààà àààà "
-"àààààààà ààààà àà àààààà àààààà ààààààà"
+"àààààà àà "
+"àààà àààà àààààààà ààààà àà àààààà àààààà ààààààà"
 
-#: ../camel/camel-gpg-context.c:879 ../camel/camel-net-utils.c:523
+#: ../camel/camel-gpg-context.c:883 ../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:139 ../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 "ààà àààà"
 
-#: ../camel/camel-gpg-context.c:900
+#: ../camel/camel-gpg-context.c:904
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "àààà àà ààà àààààà àààà àààà: à ààà ààà-àààà ààààà ààà"
 
-#: ../camel/camel-gpg-context.c:913
+#: ../camel/camel-gpg-context.c:917
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG ààà àà-àààààà àààà àààààà àààà: %s"
 
-#: ../camel/camel-gpg-context.c:1044
+#: ../camel/camel-gpg-context.c:1048
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "ààààààà àà àààà:ààà àààà àààààà ààà àààààààà àààà ààà"
 
-#: ../camel/camel-gpg-context.c:1591 ../camel/camel-smime-context.c:831
+#: ../camel/camel-gpg-context.c:1595 ../camel/camel-smime-context.c:832
 msgid "Could not generate signing data: "
 msgstr "àààààà àààà ààààà àààà àà àààà àà: "
 
-#: ../camel/camel-gpg-context.c:1640 ../camel/camel-gpg-context.c:1844
-#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:2101
-#: ../camel/camel-gpg-context.c:2201 ../camel/camel-gpg-context.c:2249
-msgid "Failed to execute gpg."
-msgstr "gpg ààà ààààà àààà àààà"
+#: ../camel/camel-gpg-context.c:1644 ../camel/camel-gpg-context.c:1848
+#: ../camel/camel-gpg-context.c:1958 ../camel/camel-gpg-context.c:2105
+#: ../camel/camel-gpg-context.c:2205 ../camel/camel-gpg-context.c:2253
+msgid "Failed to execute gpg."
+msgstr "gpg ààà ààààà àààà àààà"
+
+#: ../camel/camel-gpg-context.c:1723 ../camel/camel-gpg-context.c:1731
+#: ../camel/camel-gpg-context.c:1739 ../camel/camel-gpg-context.c:1759
+#: ../camel/camel-smime-context.c:959 ../camel/camel-smime-context.c:973
+#: ../camel/camel-smime-context.c:982
+#, c-format
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr "àààààà ààààà ààààà àààà àà ààà àà: ààà àààààà àààààà"
+
+#: ../camel/camel-gpg-context.c:1801
+msgid "Cannot verify message signature: "
+msgstr "àààààà ààààà ààààà àààà àà ààà àà: "
+
+#: ../camel/camel-gpg-context.c:1924
+msgid "Could not generate encrypting data: "
+msgstr "ààààààààà àààà ààààà àààà àà àààà àà: "
+
+#: ../camel/camel-gpg-context.c:1977
+msgid "This is a digitally encrypted message part"
+msgstr "àà àààààà àà àààààà àààààààà ààà àà"
+
+#: ../camel/camel-gpg-context.c:2035 ../camel/camel-gpg-context.c:2044
+#: ../camel/camel-gpg-context.c:2067
+#, c-format
+msgid "Cannot decrypt message: Incorrect message format"
+msgstr "àààààà àà-ààààà àààà àààà àà àààà: ààà àààààà àààààà"
+
+#: ../camel/camel-gpg-context.c:2055
+#, c-format
+msgid "Failed to decrypt MIME part: protocol error"
+msgstr "MIME ààà àààààààà ààà ààà àààà: ààààààààà àààà"
+
+#: ../camel/camel-gpg-context.c:2146 ../camel/camel-smime-context.c:1273
+msgid "Encrypted content"
+msgstr "àààààààà ààà"
+
+#: ../camel/camel-imapx-folder.c:104
+#, c-format
+msgid "Could not create folder summary for %s"
+msgstr "%s àà ààààà ààààà ààààà àààà àà àààà"
+
+#: ../camel/camel-imapx-folder.c:112
+#, c-format
+msgid "Could not create cache for %s: "
+msgstr "%s àà àààà àààà àààà àà ààà: "
+
+#: ../camel/camel-imapx-folder.c:794
+#: ../camel/providers/imap/camel-imap-folder.c:367
+#: ../camel/providers/nntp/camel-nntp-folder.c:738
+msgid "Apply message _filters to this folder"
+msgstr "àà ààààà àààà àààààà ààààà àààà ààà(_f)"
+
+#: ../camel/camel-imapx-server.c:1094
+msgid "Server disconnected"
+msgstr "àààà ààà-àààààà àà ààà"
+
+#: ../camel/camel-imapx-server.c:1549
+msgid "Error writing to cache stream: "
+msgstr "ààà ààààà àààà àà àààà: "
+
+#: ../camel/camel-imapx-server.c:2500
+#, c-format
+msgid "Not authenticated"
+msgstr "ààààààà àààà àà"
+
+#: ../camel/camel-imapx-server.c:2580
+msgid "Error performing IDLE"
+msgstr "IDLE ààà ààààà àààà"
+
+#: ../camel/camel-imapx-server.c:3462
+#: ../camel/providers/imap/camel-imap-store.c:414
+#: ../camel/providers/imap/camel-imap-store.c:468
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "IMAP àààà %s ààà àààààààà ààà ààà àààà àààà àààà: %s"
+
+#: ../camel/camel-imapx-server.c:3463
+#: ../camel/providers/imap/camel-imap-store.c:415
+#: ../camel/providers/smtp/camel-smtp-transport.c:202
+msgid "STARTTLS not supported"
+msgstr "ààààààààà ààààà àààà àà"
+
+#: ../camel/camel-imapx-server.c:3502
+#: ../camel/providers/imap/camel-imap-store.c:440
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: "
+msgstr "IMAP àààà %s ààà àààààààà ààà ààà àààà àààà ààààà: "
+
+#: ../camel/camel-imapx-server.c:3580
+#: ../camel/providers/imap/camel-imap-store.c:749
+#, c-format
+msgid "IMAP server %s does not support %s authentication"
+msgstr "IMAP àààà %s àààààà àààààààààà àààà %s àà ààààà àààà àà"
+
+#: ../camel/camel-imapx-server.c:3591 ../camel/camel-session.c:494
+#: ../camel/providers/imap/camel-imap-store.c:1174
+#: ../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 "àààààààààà ààà %s àà àààà àààà àà"
+
+#: ../camel/camel-imapx-server.c:3610
+#: ../camel/providers/imap/camel-imap-store.c:1142
+#: ../camel/providers/nntp/camel-nntp-store.c:502
+msgid "Cannot authenticate without a username"
+msgstr "ààààà-ààà ààààà ààààààà àààà àààà àà àààà"
+
+#: ../camel/camel-imapx-server.c:3619
+#: ../camel/providers/imap/camel-imap-store.c:1150
+#: ../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 "àààààààààà àààààà àààààà àààà"
+
+#: ../camel/camel-imapx-server.c:3821
+msgid "Error fetching message"
+msgstr "àààààà ààà ààààà àààà"
+
+#: ../camel/camel-imapx-server.c:3903
+#| msgid "Failed to cache %s: "
+msgid "Failed to copy the tmp file"
+msgstr "àààà (tmp) àààà àààà ààà àà ààààà àà"
+
+#: ../camel/camel-imapx-server.c:3917
+#| msgid "Failed to encode data"
+msgid "Failed to close the tmp stream"
+msgstr "àààà (tmp) ààààà ààà ààà àà ààààà àà"
+
+#: ../camel/camel-imapx-server.c:4015
+msgid "Error copying messages"
+msgstr "àààààà àààà ààà ààààà àààà"
+
+#: ../camel/camel-imapx-server.c:4150
+msgid "Error appending message"
+msgstr "àààààà àààà ààààà àààà"
+
+#: ../camel/camel-imapx-server.c:4333
+msgid "Error fetching message headers"
+msgstr "àààààà ààààà ààà ààààà àààà"
+
+#: ../camel/camel-imapx-server.c:4468
+msgid "Error retrieving message"
+msgstr "àààààà àààààà ààà 'à àààà"
+
+#: ../camel/camel-imapx-server.c:4590 ../camel/camel-imapx-server.c:4783
+#, c-format
+#| msgid "Fetching summary information for new messages in %s"
+msgid "Fetching summary information for new messages in '%s'"
+msgstr "'%s' àààà àààà ààààààà àà ààààà ààààààà àà àà ààà àà'"
+
+#: ../camel/camel-imapx-server.c:4641
+#, c-format
+#| msgid "Scanning for changed messages in %s"
+msgid "Scanning for changed messages in '%s'"
+msgstr "'%s' àààà ààààà àààààààà àà àààà àààà àà'"
+
+#: ../camel/camel-imapx-server.c:4684
+msgid "Error fetching new messages"
+msgstr "àààà àààààà ààà àà àààà"
+
+#: ../camel/camel-imapx-server.c:4874
+msgid "Error while fetching messages"
+msgstr "àààààà ààà ààààà àààà"
+
+#: ../camel/camel-imapx-server.c:4882 ../camel/camel-imapx-server.c:4918
+#, c-format
+#| msgid "Fetching summary information for %d message in %s"
+#| msgid_plural "Fetching summary information for %d messages in %s"
+msgid "Fetching summary information for %d message in '%s'"
+msgid_plural "Fetching summary information for %d messages in '%s'"
+msgstr[0] "'%2$s' àààà %1$d àààààà àà ààààà ààààààà àà àà ààà àà"
+msgstr[1] "'%2$s' àààà %1$d àààààààà àà ààààà ààààààà àà àà ààà àà"
+
+#: ../camel/camel-imapx-server.c:5043 ../camel/camel-imapx-server.c:5079
+msgid "Error refreshing folder"
+msgstr "ààààà ààààà ààà ààààà àààà"
+
+#: ../camel/camel-imapx-server.c:5172
+msgid "Error expunging message"
+msgstr "àààààà ààààà ààààà àààà"
+
+#: ../camel/camel-imapx-server.c:5269
+msgid "Error fetching folders"
+msgstr "ààààà ààà ààààà àààà"
+
+#: ../camel/camel-imapx-server.c:5348
+msgid "Error subscribing to folder"
+msgstr "ààààà àà ààààà ààà àà àààà"
+
+#: ../camel/camel-imapx-server.c:5409
+msgid "Error creating folder"
+msgstr "ààààà ààààà ààààà àààà"
+
+#: ../camel/camel-imapx-server.c:5458
+msgid "Error deleting folder"
+msgstr "ààààà ààààà ààààà àààà"
+
+#: ../camel/camel-imapx-server.c:5519
+msgid "Error renaming folder"
+msgstr "ààààà ààà àààà ààààà àààà"
+
+#: ../camel/camel-imapx-server.c:5580
+msgid "Error performing NOOP"
+msgstr "NOOP ààà ààààà àààà"
+
+#: ../camel/camel-imapx-server.c:5676
+msgid "Error syncing changes"
+msgstr "ààààà àààà ààà àà àààà"
+
+#: ../camel/camel-imapx-server.c:6447
+#: ../camel/providers/imap/camel-imap-folder.c:3531
+#, c-format
+msgid "Cannot get message with message ID %s: %s"
+msgstr "àààààà ID %s àààààà àààà àààà àà àààà àà: %s"
+
+#: ../camel/camel-imapx-server.c:6448
+#: ../camel/providers/imap/camel-imap-folder.c:3532
+msgid "No such message available."
+msgstr "ààà àà ààà àààààà àààà ààà"
+
+#: ../camel/camel-imapx-server.c:6603 ../camel/camel-imapx-server.c:6618
+msgid "Cannot create spool file: "
+msgstr "àààà àààà àààà àààà àà àààà: "
+
+#: ../camel/camel-imapx-store.c:157
+#: ../camel/providers/imap/camel-imap-store.c:827
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP àààà %s"
+
+#: ../camel/camel-imapx-store.c:160
+#: ../camel/providers/imap/camel-imap-store.c:830
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP ààààà %2$s àààà %1$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 "àààààà"
+
+#: ../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 "àà ààà IMAP àààà ààà àààà-ààààà àààààà ààà ààààà ààà àà ààààà ààà"
 
-#: ../camel/camel-gpg-context.c:1719 ../camel/camel-gpg-context.c:1727
-#: ../camel/camel-gpg-context.c:1735 ../camel/camel-gpg-context.c:1755
-#: ../camel/camel-smime-context.c:957 ../camel/camel-smime-context.c:971
-#: ../camel/camel-smime-context.c:980
+#: ../camel/camel-imapx-store.c:351
+#: ../camel/providers/imap/camel-imap-store.c:2064
+#: ../camel/providers/imap/camel-imap-store.c:2262
 #, c-format
-msgid "Cannot verify message signature: Incorrect message format"
-msgstr "àààààà ààààà ààààà àààà àà ààà àà: ààà àààààà àààààà"
+msgid "No such folder %s"
+msgstr "ààààà %s ààààà àààà àà"
 
-#: ../camel/camel-gpg-context.c:1797
-msgid "Cannot verify message signature: "
-msgstr "àààààà ààààà ààààà àààà àà ààà àà: "
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/camel-imapx-store.c:376 ../camel/camel-imapx-store.c:866
+#: ../camel/providers/imap/camel-imap-store.c:275
+#: ../camel/providers/imap/camel-imap-store.c:2684
+#: ../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 "ààà-àààà"
 
-#: ../camel/camel-gpg-context.c:1920
-msgid "Could not generate encrypting data: "
-msgstr "ààààààààà àààà ààààà àààà àà àààà àà: "
+#: ../camel/camel-imapx-store.c:1099
+#, c-format
+msgid "Retrieving folder list for %s"
+msgstr "%s àà ààààà àààà àà àà ààà àà"
 
-#: ../camel/camel-gpg-context.c:1973
-msgid "This is a digitally encrypted message part"
-msgstr "àà àààààà àà àààààà àààààààà ààà àà"
+#: ../camel/camel-imapx-store.c:1203
+#: ../camel/providers/nntp/camel-nntp-store.c:1771
+#, c-format
+msgid "No such folder: %s"
+msgstr "àà ààà ààààà àààà àà: %s"
 
-#: ../camel/camel-gpg-context.c:2031 ../camel/camel-gpg-context.c:2040
-#: ../camel/camel-gpg-context.c:2063
+#: ../camel/camel-imapx-store.c:1420
+#: ../camel/providers/imap/camel-imap-store.c:2077
+#: ../camel/providers/imap/camel-imap-store.c:2524
 #, c-format
-msgid "Cannot decrypt message: Incorrect message format"
-msgstr "àààààà àà-ààààà àààà àààà àà àààà: ààà àààààà àààààà"
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "ààààà ààà \"%s\" àààà àààà àà, ààààà àà àààà \"%c\" àààà ààààà ààà"
 
-#: ../camel/camel-gpg-context.c:2051
+#: ../camel/camel-imapx-store.c:1431
+#: ../camel/providers/imap/camel-imap-store.c:2537
 #, c-format
-msgid "Failed to decrypt MIME part: protocol error"
-msgstr "MIME ààà àààààààà ààà ààà àààà: ààààààààà àààà"
+msgid "Unknown parent folder: %s"
+msgstr "àààààà àààààà ààààà: %s"
 
-#: ../camel/camel-gpg-context.c:2142 ../camel/camel-smime-context.c:1268
-msgid "Encrypted content"
-msgstr "àààààààà ààà"
+#: ../camel/camel-imapx-store.c:1441
+#: ../camel/providers/imap/camel-imap-store.c:2140
+#: ../camel/providers/imap/camel-imap-store.c:2589
+#, c-format
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "àààààà ààààà àààà àà-ààààà àààààà àààà ààà"
 
-#: ../camel/camel-http-stream.c:545 ../camel/camel-stream-null.c:78
-msgid "Only reset to beginning is supported with CamelHttpStream"
-msgstr "CamelHttpFilter ààà àààà àààààààà àà ààà-àààà ààà àà ààààà àà"
+#: ../camel/camel-imapx-stream.c:97
+#, c-format
+msgid "Source stream returned no data"
+msgstr "àààà ààààà àà ààà àààà àààà ààààà"
+
+#: ../camel/camel-imapx-stream.c:106
+#, c-format
+msgid "Source stream unavailable"
+msgstr "àààà ààààà àààààà àààà"
 
 #: ../camel/camel-lock.c:102
 #, c-format
@@ -2189,7 +2575,7 @@ msgstr "àààà àààà àààà ààà ààààà àà
 msgid "Error writing mail temp file: %s"
 msgstr "àààà àààà àààà àà àààà àààà àààà: %s"
 
-#: ../camel/camel-movemail.c:491 ../camel/camel-movemail.c:560
+#: ../camel/camel-movemail.c:493 ../camel/camel-movemail.c:562
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "àààà àààà àààà ààà àààà ààà àààà àààà: %s"
@@ -2236,12 +2622,12 @@ msgstr "ààà ààà àààà"
 msgid "Name lookup failed: %s"
 msgstr "ààà ààà àààà: %s"
 
-#: ../camel/camel-network-service.c:112
+#: ../camel/camel-network-service.c:114
 #, c-format
 msgid "Could not connect to %s: "
 msgstr "%s ààà àààààà àààà àààà àà àààà: "
 
-#: ../camel/camel-offline-folder.c:206
+#: ../camel/camel-offline-folder.c:210
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "ààààà `%s' àààà àààààààà ààà àààà àà ààààà àà àààà àà"
@@ -2259,23 +2645,23 @@ msgstr "àààà ààààà àààà àààààà ààà
 msgid "For reading mail as a query of another set of folders"
 msgstr "ààà ààààà àààà àà ààà àààà àà ààà àà ààà àà"
 
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:195
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "%s ààà ààà àààà àààà àà àààà: àà ààààà àà àààààà àààààà àààà àààà ààà"
 
-#: ../camel/camel-provider.c:202
+#: ../camel/camel-provider.c:204
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s ààà ààà àààà àààà àà àààà àà: %s"
 
-#: ../camel/camel-provider.c:211
+#: ../camel/camel-provider.c:213
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 "%s ààà ààà àààà àààà àà àààà àà: àà àààààà àààà ààà ààààààà ààà àààà ààà"
 
-#: ../camel/camel-provider.c:402 ../camel/camel-session.c:388
+#: ../camel/camel-provider.c:412 ../camel/camel-session.c:406
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "àààààààà '%s' àà ààà àààààà àààà àààà àà"
@@ -2345,32 +2731,32 @@ msgstr ""
 "àààà àààà "
 "àààà"
 
-#: ../camel/camel-sasl-digest-md5.c:850
+#: ../camel/camel-sasl-digest-md5.c:855
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "àààà àààààà àààà àààà àà (>2048 octets)"
 
-#: ../camel/camel-sasl-digest-md5.c:861
+#: ../camel/camel-sasl-digest-md5.c:866
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "àààà àààà ààà àà\n"
 
-#: ../camel/camel-sasl-digest-md5.c:869
+#: ../camel/camel-sasl-digest-md5.c:874
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "àààà àààààà àààà \"ààààààà àà ààà\" àààà ààà àà"
 
-#: ../camel/camel-sasl-digest-md5.c:902
+#: ../camel/camel-sasl-digest-md5.c:907
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "àààà àààà àààà ààààààà àààà àààà àà"
 
-#: ../camel/camel-sasl-digest-md5.c:923
+#: ../camel/camel-sasl-digest-md5.c:928
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "àààà àààà àààà àà-àààààà àààààààà àààà àà"
 
-#: ../camel/camel-sasl-digest-md5.c:936
+#: ../camel/camel-sasl-digest-md5.c:941
 #, c-format
 msgid "Server response does not match"
 msgstr "àààà àààà ààà àààà àà àààà àà"
@@ -2440,14 +2826,14 @@ msgstr "àààààà-àààà àà àààààààààà 
 msgid "The referenced credentials have expired."
 msgstr "ààààà àààààà-àààà àà àààà ààààà àà ààààà ààà"
 
-#: ../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:388 ../camel/camel-sasl-gssapi.c:405
+#: ../camel/providers/smtp/camel-smtp-transport.c:575
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "àààà ààà ààà àààà ààààà ààà"
 
-#: ../camel/camel-sasl-gssapi.c:410
+#: ../camel/camel-sasl-gssapi.c:417
 #, c-format
 msgid "Unsupported security layer."
 msgstr "àà ààààà ààààààà àààà"
@@ -2460,7 +2846,7 @@ msgstr "ààààà"
 msgid "This option will connect to the server using a simple password."
 msgstr "àà ààà ààààààà àààà ààà ààààà àààààà ààà ààààààà"
 
-#: ../camel/camel-sasl-login.c:107
+#: ../camel/camel-sasl-login.c:110
 #, c-format
 msgid "Unknown authentication state."
 msgstr "ààààààà àààààààààà àààààà"
@@ -2498,7 +2884,7 @@ msgstr "POP àààà UID"
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "ààà àà-àààà ààààààààà àààà POP SMTP ààààààààà ààà àààààà"
 
-#: ../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 "%s ààààà àààà POP SMTP ààààààààà ààà àààààà ààààààà"
@@ -2508,34 +2894,27 @@ msgstr "%s ààààà àààà POP SMTP ààààààààà à
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "àààààà àààààà ààààààààà àààà: %s: %s"
 
-#: ../camel/camel-session.c:397
+#: ../camel/camel-session.c:415
 #, c-format
 msgid "Invalid GType registered for protocol '%s'"
 msgstr "àààààààà '%s' àà ààà GType àààààà ààà"
 
-#: ../camel/camel-session.c:466
-#: ../camel/providers/imap/camel-imap-store.c:1143
-#: ../camel/providers/imapx/camel-imapx-server.c:2946
-#: ../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 authentication type %s"
-msgid "No support for %s authentication"
-msgstr "àààààààààà ààà %s àà àààà àààà àà"
-
-#: ../camel/camel-session.c:481
+#: ../camel/camel-session.c:509
 #, c-format
-#| msgid "Authentication failed"
 msgid "%s authentication failed"
 msgstr "%s àààààààààà ààààà àà"
 
-#: ../camel/camel-session.c:1187
+#: ../camel/camel-session.c:645
+#| msgid "Operation not supported"
+msgid "Forwarding messages is not supported"
+msgstr "àààààà àààà àààà àà ààààà àààà àà"
+
+#: ../camel/camel-session.c:1362
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "àààà %3$s àà %2$s ààààà %1$s àààààà ààà ààà"
 
-#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1057
+#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1060
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "'%s' àà ààààààààà ààààà àààà àà àààà àà"
@@ -2664,112 +3043,112 @@ msgstr "ààààààààà àààà àààààà, ààà
 msgid "Cannot find signature digests"
 msgstr "àààààà ààààà àààà àààà àà"
 
-#: ../camel/camel-smime-context.c:661
+#: ../camel/camel-smime-context.c:662
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "àààààà: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:842 ../camel/camel-smime-context.c:1130
+#: ../camel/camel-smime-context.c:844 ../camel/camel-smime-context.c:1134
 msgid "Cannot create encoder context"
 msgstr "ààààà àààààà àààà ààààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:848
+#: ../camel/camel-smime-context.c:850
 msgid "Failed to add data to CMS encoder"
 msgstr "CMS ààààà àààà àààà ààààà ààà ààà àààààà"
 
-#: ../camel/camel-smime-context.c:853 ../camel/camel-smime-context.c:1147
+#: ../camel/camel-smime-context.c:855 ../camel/camel-smime-context.c:1151
 msgid "Failed to encode data"
 msgstr "àààà àààààà ààà àààà àààà"
 
-#: ../camel/camel-smime-context.c:996 ../camel/camel-smime-context.c:1243
+#: ../camel/camel-smime-context.c:999 ../camel/camel-smime-context.c:1248
 msgid "Decoder failed"
 msgstr "àààààà àààà"
 
-#: ../camel/camel-smime-context.c:1065
+#: ../camel/camel-smime-context.c:1068
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "àà ààà àààààààà àààààààà ààà ààààà àààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:1073
+#: ../camel/camel-smime-context.c:1076
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "àààààààà ààà àà àà àààà àààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:1084
+#: ../camel/camel-smime-context.c:1087
 msgid "Cannot create CMS Message"
 msgstr "CMS àààààà àààà ààààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:1090
+#: ../camel/camel-smime-context.c:1093
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS àààààà àààà ààààà àààà àà àààà"
 
-#: ../camel/camel-smime-context.c:1096
+#: ../camel/camel-smime-context.c:1099
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS àààààà àààà àààà àààà àà àààà"
 
-#: ../camel/camel-smime-context.c:1102
+#: ../camel/camel-smime-context.c:1105
 msgid "Cannot attach CMS data object"
 msgstr "CMS àààà àààà ààààà àààà àààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:1111
+#: ../camel/camel-smime-context.c:1114
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS àààààà ààààààà àààà àààà àà àààà"
 
-#: ../camel/camel-smime-context.c:1116
+#: ../camel/camel-smime-context.c:1119
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS àààààà ààààààà àààà àààà àààà àà àààà"
 
-#: ../camel/camel-smime-context.c:1141
+#: ../camel/camel-smime-context.c:1145
 msgid "Failed to add data to encoder"
 msgstr "àààà ààà ààààà àààà ààààà ààà àààà àààà"
 
-#: ../camel/camel-smime-context.c:1250
+#: ../camel/camel-smime-context.c:1255
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME Decrypt: ààà àààààààà àààààà àààà àààà àà"
 
-#: ../camel/camel-store.c:1799
+#: ../camel/camel-store.c:1838
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "ààààà '%s' ààààà àààà àà àààà àà: ààààà ààààà àà"
 
-#: ../camel/camel-store.c:1842
+#: ../camel/camel-store.c:1881
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "ààààà '%s' ààààààà àà àààà àà"
 
-#: ../camel/camel-store.c:2027
+#: ../camel/camel-store.c:2066
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "'%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 "àààà"
 
 #. 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 "ààà"
 
-#: ../camel/camel-store.c:2501
+#: ../camel/camel-store.c:2540
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "ààààà ààààà àààà àà àààà %s: ààààà àà"
 
-#: ../camel/camel-store.c:2515
+#: ../camel/camel-store.c:2554
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "'%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 "ààààà ààààà àààà àà àààà àà: %s: ààà àààààà"
 
-#: ../camel/camel-store.c:2776 ../camel/camel-vee-store.c:402
-#: ../camel/providers/local/camel-maildir-store.c:764
+#: ../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 "ààààà àà ààà ààààà àààà àààà àà àààà: %s: ààà àààààà"
@@ -2778,106 +3157,117 @@ msgstr "ààààà àà ààà ààààà àààà ààà
 msgid "Only reset to beginning is supported with CamelStreamFilter"
 msgstr "CamelStreamFilter ààà àààà àààààààà àà ààà-àààà ààà àà ààààà àà"
 
-#: ../camel/camel-stream-process.c:267
+#: ../camel/camel-stream-null.c:78
+msgid "Only reset to beginning is supported with CamelHttpStream"
+msgstr "CamelHttpFilter ààà àààà àààààààà àà ààà-àààà ààà àà ààààà àà"
+
+#: ../camel/camel-stream-process.c:275
 #, c-format
 msgid "Connection cancelled"
 msgstr "ààààààà ààà àààà"
 
-#: ../camel/camel-stream-process.c:272
+#: ../camel/camel-stream-process.c:280
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "ààààà \"%s\" ààà ààààà àààà àà àààà àà: %s"
 
-#: ../camel/camel-tcp-stream-raw.c:303
+#: ../camel/camel-subscribable.c:386
+#, c-format
+#| msgid "Error subscribing to folder"
+msgid "Subscribing to folder '%s'"
+msgstr "'%s' ààààà àà ààààà ààààà àà àààà àà"
+
+#: ../camel/camel-subscribable.c:518
+#, c-format
+#| msgid "Error subscribing to folder"
+msgid "Unsubscribing from folder '%s'"
+msgstr "ààààà '%s' ààà àààààà àààà àà ààà àà"
+
+#: ../camel/camel-tcp-stream-raw.c:310
 #, c-format
 msgid "NSPR error code %d"
 msgstr "NSPR àààà ààà %d"
 
-#: ../camel/camel-tcp-stream-raw.c:640 ../camel/camel-tcp-stream-raw.c:651
+#: ../camel/camel-tcp-stream-raw.c:649 ../camel/camel-tcp-stream-raw.c:662
 #, c-format
 msgid "The proxy host does not support SOCKS4"
 msgstr "àààààà àààà SOCKS4 àà ààààà àààà"
 
-#: ../camel/camel-tcp-stream-raw.c:662
+#: ../camel/camel-tcp-stream-raw.c:675
 #, c-format
 msgid "The proxy host denied our request: code %d"
 msgstr "àààààà àààà àà àààà ààà ààà ààààààà: ààà %d"
 
-#: ../camel/camel-tcp-stream-raw.c:758 ../camel/camel-tcp-stream-raw.c:764
+#: ../camel/camel-tcp-stream-raw.c:773 ../camel/camel-tcp-stream-raw.c:781
 #, c-format
 msgid "The proxy host does not support SOCKS5"
 msgstr "àààààà àààà SOCKS5 àà ààààà àààà"
 
-#: ../camel/camel-tcp-stream-raw.c:770
+#: ../camel/camel-tcp-stream-raw.c:789
 #, c-format
 msgid "Could not find a suitable authentication type: code 0x%x"
 msgstr "àààààà ààààààààà àààà àààà àààà àà ààà: code 0x%x"
 
-#: ../camel/camel-tcp-stream-raw.c:782
+#: ../camel/camel-tcp-stream-raw.c:801
 msgid "General SOCKS server failure"
 msgstr "àà SOCKS àààà ààààà àà"
 
-#: ../camel/camel-tcp-stream-raw.c:783
+#: ../camel/camel-tcp-stream-raw.c:802
 msgid "SOCKS server's rules do not allow connection"
 msgstr "SOCKS àààà àà àààà àààààààà àààààà àààà àààà"
 
-#: ../camel/camel-tcp-stream-raw.c:784
+#: ../camel/camel-tcp-stream-raw.c:803
 msgid "Network is unreachable from SOCKS server"
 msgstr "ààààààà SOCKS àààà ààà àààààààà àààà àà"
 
-#: ../camel/camel-tcp-stream-raw.c:785
+#: ../camel/camel-tcp-stream-raw.c:804
 msgid "Host is unreachable from SOCKS server"
 msgstr "àààà SOCKS àààà ààà àààààààà àààà àà"
 
-#: ../camel/camel-tcp-stream-raw.c:786
+#: ../camel/camel-tcp-stream-raw.c:805
 msgid "Connection refused"
 msgstr "àààààààà ààà ààààà ààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:787
+#: ../camel/camel-tcp-stream-raw.c:806
 msgid "Time-to-live expired"
 msgstr "àààà-àà-ààà ààà"
 
-#: ../camel/camel-tcp-stream-raw.c:788
+#: ../camel/camel-tcp-stream-raw.c:807
 msgid "Command not supported by SOCKS server"
 msgstr "SOCKS àààà àààà ààààà ààààà àààà"
 
-#: ../camel/camel-tcp-stream-raw.c:789
+#: ../camel/camel-tcp-stream-raw.c:808
 msgid "Address type not supported by SOCKS server"
 msgstr "SOCKS àààà àààà àààààà àààà ààààà àààà"
 
-#: ../camel/camel-tcp-stream-raw.c:790
+#: ../camel/camel-tcp-stream-raw.c:809
 msgid "Unknown error from SOCKS server"
 msgstr "SOCKS àààà ààà ààààà àààà"
 
-#: ../camel/camel-tcp-stream-raw.c:823
+#: ../camel/camel-tcp-stream-raw.c:842
 #, c-format
 msgid "Got unknown address type from SOCKS server"
 msgstr "SOCKS àààà ààà ààààà ààààà àààà àààà"
 
-#: ../camel/camel-tcp-stream-raw.c:841
+#: ../camel/camel-tcp-stream-raw.c:860
 #, c-format
 msgid "Incomplete reply from SOCKS server"
 msgstr "SOCKS àààà ààà ààààà àààà"
 
-#: ../camel/camel-tcp-stream-raw.c:861
+#: ../camel/camel-tcp-stream-raw.c:880
 #, c-format
 msgid "Hostname is too long (maximum is 255 characters)"
 msgstr "àààà-ààà àààà àààà àà (àààà-ààà ààà àààà)"
 
 #. SOCKS5
 #. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:893 ../camel/camel-tcp-stream-raw.c:903
+#: ../camel/camel-tcp-stream-raw.c:912 ../camel/camel-tcp-stream-raw.c:922
 #, c-format
 msgid "Invalid reply from proxy server"
 msgstr "àààààà àààà ààà ààà àààà"
 
-#: ../camel/camel-tcp-stream-ssl.c:474
+#: ../camel/camel-tcp-stream-ssl.c:505
 #, c-format
-#| msgid ""
-#| "Issuer:            %s\n"
-#| "Subject:           %s\n"
-#| "Fingerprint:       %s\n"
-#| "Signature:         %s"
 msgid ""
 "   Issuer:       %s\n"
 "   Subject:      %s\n"
@@ -2889,16 +3279,15 @@ msgstr ""
 " ààààà àààààà:       %s\n"
 " ààààà:         %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:480
+#: ../camel/camel-tcp-stream-ssl.c:512
 msgid "GOOD"
 msgstr "àààà"
 
-#: ../camel/camel-tcp-stream-ssl.c:480
+#: ../camel/camel-tcp-stream-ssl.c:512
 msgid "BAD"
 msgstr "àààà"
 
-#. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:484
+#: ../camel/camel-tcp-stream-ssl.c:517
 #, c-format
 msgid ""
 "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
@@ -2911,19 +3300,19 @@ msgstr ""
 "ààààààààà àààà ààààà àààà ààààààà:\n"
 "%s"
 
-#: ../camel/camel-tcp-stream-ssl.c:488
+#: ../camel/camel-tcp-stream-ssl.c:523
 msgid "_Reject"
 msgstr "ààà ààà(_R)"
 
-#: ../camel/camel-tcp-stream-ssl.c:489
+#: ../camel/camel-tcp-stream-ssl.c:524
 msgid "Accept _Temporarily"
 msgstr "ààààà ààà àààà àààààà(_T)"
 
-#: ../camel/camel-tcp-stream-ssl.c:490
+#: ../camel/camel-tcp-stream-ssl.c:525
 msgid "_Accept Permanently"
 msgstr "àààà ààà àààà àààààà(_A)"
 
-#: ../camel/camel-tcp-stream-ssl.c:548
+#: ../camel/camel-tcp-stream-ssl.c:586
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2932,7 +3321,7 @@ msgstr ""
 "ààààààààà àààààà: %s\n"
 "àààà àààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:600
+#: ../camel/camel-tcp-stream-ssl.c:638
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2941,7 +3330,7 @@ msgstr ""
 "ààà ààààààààà ààààà: %s\n"
 "àààà àààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:618
+#: ../camel/camel-tcp-stream-ssl.c:656
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2950,7 +3339,7 @@ msgstr ""
 "ààààààààà àà àààà ààààà: %s\n"
 "àààà àààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:635
+#: ../camel/camel-tcp-stream-ssl.c:673
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2959,48 +3348,56 @@ msgstr ""
 "ààààààààà: %s\n"
 "Issuer: %s"
 
-#: ../camel/camel-url.c:330
+#: ../camel/camel-url.c:331
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "URL '%s' ààà àààà ààà àààà àà àààà"
 
-#: ../camel/camel-vee-folder.c:651
+#: ../camel/camel-vee-folder.c:494
 #, c-format
-#| msgid "Storing folder"
-msgid "Updating %s folder"
-msgstr "%s ààààà àààààà àààà àà àààà àà"
+#| msgid "Creating folder '%s'"
+msgid "Updating folder '%s'"
+msgstr "'%s' ààààà àààààà àààà àà àààà àà"
 
-#: ../camel/camel-vee-folder.c:1325 ../camel/camel-vee-folder.c:1482
+#: ../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 "àààà ààààà àààà ààààààà ààà àààà ààà ààààà àààà àà àààà àà"
 
-#: ../camel/camel-vee-folder.c:1358
+#: ../camel/camel-vee-folder.c:888
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%2$s àààà %1$s àààààà àà ààà àààààà àààà àà"
 
-#: ../camel/camel-vee-folder.c:1426
+#: ../camel/camel-vee-folder.c:941
 #, c-format
 msgid "Error storing '%s': "
 msgstr "'%s' àààà ààà ààààà àààà: "
 
+#: ../camel/camel-vee-folder.c:1169
+msgid "Automatically _update on change in source folders"
+msgstr "àààà ààààà àààà ààààà àààà àààààààà àààààà(_u)"
+
 #. 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 "àà-ààààà"
 
-#: ../camel/camel-vee-store.c:378
+#: ../camel/camel-vee-store.c:436
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "ààààà ààà ààààà àààà àà àààà àà: %s: àààààà àà ààà ààààà àààà àà"
 
-#: ../camel/camel-vee-store.c:412
+#: ../camel/camel-vee-store.c:470
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "ààààà àà ààà ààààà àààà àààà àà àààà àà: %s: àà àààà ààà ààààà àààà àà"
 
+#: ../camel/camel-vee-store.c:532
+msgid "Enable _Unmatched folder"
+msgstr "ààààà ààààà àààà(_U)"
+
 #: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "àààààà ààà àààà àààà àààà àààà àààà àà àààà àà"
@@ -3010,27 +3407,24 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "àààààà ààà ààà ààààà àààà àààà àààà àààà àà àààà àà"
 
 #: ../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 "ààà ààààààà ààààà"
 
 #: ../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 "àààààà ààààà àààà"
 
-#: ../camel/providers/imap/camel-imap-command.c:383
+#: ../camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "àààà àààààà ààà àà ààà àà ààà: %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:\n"
-#| "%s"
 msgid ""
 "Alert from IMAP server %s %s in folder %s:\n"
 "%s"
@@ -3038,7 +3432,7 @@ msgstr ""
 "IMAP àààà %s %s àààà ààààà %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"
@@ -3047,100 +3441,78 @@ msgstr ""
 "IMAP àààà %s %s àààà ààààààà:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:502
+#: ../camel/providers/imap/camel-imap-command.c:512
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP àààà àààà àààààà àààà: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:514
+#: ../camel/providers/imap/camel-imap-command.c:524
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ààààà àààà: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:594
+#: ../camel/providers/imap/camel-imap-command.c:607
 #, c-format
 msgid "Server response ended too soon."
 msgstr "àààà àà àààà ààà àààà ààààà àà ààà ààà"
 
-#: ../camel/providers/imap/camel-imap-command.c:806
+#: ../camel/providers/imap/camel-imap-command.c:822
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP àààà àà àààà àààà %s ààààààà àààà àà"
 
-#: ../camel/providers/imap/camel-imap-command.c:844
+#: ../camel/providers/imap/camel-imap-command.c:860
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP àààà ààà àààààà àà ààà ààà àààà: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:348
-#| msgid "Always check for new mail in this folder"
+#: ../camel/providers/imap/camel-imap-folder.c:356
 msgid "Always check for _new mail in this folder"
 msgstr "àà ààààà àààà àààààà àààà ààààà àààà(_n)"
 
-#: ../camel/providers/imap/camel-imap-folder.c:359
-#: ../camel/providers/imapx/camel-imapx-folder.c:747
-#: ../camel/providers/nntp/camel-nntp-folder.c:760
-#| msgid "Cannot copy messages to the Trash folder"
-msgid "Apply message _filters to this folder"
-msgstr "àà ààààà àààà àààààà ààààà àààà ààà(_f)"
-
-#: ../camel/providers/imap/camel-imap-folder.c:440
+#: ../camel/providers/imap/camel-imap-folder.c:447
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "ààààààààà %s àààà àààà àà àààà àà: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:461
+#: ../camel/providers/imap/camel-imap-folder.c:468
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s àà ààààà ààà àààà àààà àà àààà àà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1119
-#: ../camel/providers/imapx/camel-imapx-server.c:3949
+#: ../camel/providers/imap/camel-imap-folder.c:1137
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "%s àààà ààààà àààààààà àà àààà àààà àà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3478
+#: ../camel/providers/imap/camel-imap-folder.c:3494
 msgid "Unable to retrieve message: "
 msgstr "àààààà ààà àà àààààà: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:3515
-#: ../camel/providers/imapx/camel-imapx-server.c:5509
-#, c-format
-msgid "Cannot get message with message ID %s: %s"
-msgstr "àààààà ID %s àààààà àààà àààà àà àààà àà: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3516
-#: ../camel/providers/imapx/camel-imapx-server.c:5510
-msgid "No such message available."
-msgstr "ààà àà ààà àààààà àààà ààà"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3591
-#: ../camel/providers/imap/camel-imap-folder.c:4469
-#: ../camel/providers/nntp/camel-nntp-folder.c:515
+#: ../camel/providers/imap/camel-imap-folder.c:3620
+#: ../camel/providers/imap/camel-imap-folder.c:4512
+#: ../camel/providers/nntp/camel-nntp-folder.c:493
 #, c-format
 msgid "This message is not currently available"
 msgstr "àà àààààà àààà àà àààààà àà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4050
-#: ../camel/providers/imap/camel-imap-folder.c:4133
-#: ../camel/providers/imapx/camel-imapx-server.c:3901
-#: ../camel/providers/imapx/camel-imapx-server.c:4081
+#: ../camel/providers/imap/camel-imap-folder.c:4085
+#: ../camel/providers/imap/camel-imap-folder.c:4167
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "%s àààà àààà ààààààà àà ààààà ààààààà àà àà ààà àà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4267
+#: ../camel/providers/imap/camel-imap-folder.c:4299
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "àààà ààà ààààà àààà: àààààà %d àà ààà ààààààà àààààà àààà àà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4277
+#: ../camel/providers/imap/camel-imap-folder.c:4309
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "ààààà àààà àààà: àààààà %d àà ààà UID àààààà àààà àà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4509
+#: ../camel/providers/imap/camel-imap-folder.c:4549
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH àààà àààà àààààà ààà àààà àààààà"
@@ -3166,434 +3538,157 @@ msgid "Failed to cache %s: "
 msgstr "ààà %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 "àààà ààà àà àààà àààà àà àààà àà"
 
 #: ../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 "àà ààààààà àààà àààà àààààààà àà àààà(_h)"
 
 #: ../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 "ààààà àààà ààààààà àààà àààà àààààà àààà ààà(_e)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:52
-msgid "Connection to Server"
-msgstr "àààà ààà àààààà ààà"
-
-#: ../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 "àààà ààà àààà àà ààààààà ààààà ààààà(_U)"
-
-#: ../camel/providers/imap/camel-imap-provider.c:52
-msgid "Co_mmand:"
-msgstr "ààààà(_m):"
-
-#: ../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 "ààààà"
 
-#: ../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 "àààààà ààààà àà àààà(_S)"
 
-#: ../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 "àààà-ààààà àààààà ààààà ààà-ààà àààà(_v)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:62
+#: ../camel/providers/imap/camel-imap-provider.c:53
 msgid "Names_pace:"
 msgstr "ààà-àààà(_p):"
 
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imapx/camel-imapx-provider.c:72
-#: ../camel/providers/local/camel-local-provider.c:42
-#: ../camel/providers/local/camel-local-provider.c:84
-#: ../camel/providers/local/camel-local-provider.c:105
+#: ../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
 #: ../camel/providers/nntp/camel-nntp-provider.c:41
 msgid "Options"
 msgstr "ààà"
 
-#: ../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 INBOX"
 msgid "Apply _filters to new messages in all folders"
 msgstr "àà ààààààà àààà àààà ààààààà àà ààààà àààà(_f)"
 
-#: ../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 "àà àààà àà àà-àààà àààà àààà àààààààà àààà ààààà àààà ààà(_A)"
 
-#: ../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 "ààà àààààà àà àààà àààààà àààà ààà(_J)"
 
-#: ../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 "ààà-àààà ààààà àààà ààà àààààààà àà àààà ààà(_B)"
 
-#: ../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 "ààààà ààà ààààà àààààààà àà àààààààààà ààà(_z)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:80
+#: ../camel/providers/imap/camel-imap-provider.c:71
 msgid "IMAP default port"
 msgstr "IMAP àààààà àààà"
 
-#: ../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 "SSL ààà IMAP"
 
-#: ../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 "IMAP àààààà àààà ààà ààà ààà àààààà àà"
-
-#: ../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 "àààààà"
-
-#: ../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 "àà ààà IMAP àààà ààà àààà-ààààà àààààà ààà ààààà ààà àà ààààà ààà"
-
-#. 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:675
-#: ../camel/providers/local/camel-maildir-store.c:681
-#: ../camel/providers/local/camel-maildir-store.c:765
-#: ../camel/providers/local/camel-spool-store.c:387
-msgid "Inbox"
-msgstr "ààà-àààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:409
-#: ../camel/providers/imap/camel-imap-store.c:463
-#: ../camel/providers/imapx/camel-imapx-server.c:2828
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "IMAP àààà %s ààà àààààààà ààà ààà àààà àààà àààà: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:410
-#: ../camel/providers/imapx/camel-imapx-server.c:2829
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
-msgid "STARTTLS not supported"
-msgstr "ààààààààà ààààà àààà àà"
-
-#: ../camel/providers/imap/camel-imap-store.c:435
-#: ../camel/providers/imapx/camel-imapx-server.c:2868
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: "
-msgstr "IMAP àààà %s ààà àààààààà ààà ààà àààà àààà ààààà: "
-
-#: ../camel/providers/imap/camel-imap-store.c:734
-#: ../camel/providers/imapx/camel-imapx-server.c:2935
-#, c-format
-#| msgid "IMAP server %s does not support requested authentication type %s"
-msgid "IMAP server %s does not support %s authentication"
-msgstr "IMAP àààà %s àààààà àààààààààà àààà %s àà ààààà àààà àà"
-
-#: ../camel/providers/imap/camel-imap-store.c:809
-#: ../camel/providers/imapx/camel-imapx-store.c:155
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP àààà %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 ààààà %2$s àààà %1$s àà"
-
-#: ../camel/providers/imap/camel-imap-store.c:1111
-#: ../camel/providers/imapx/camel-imapx-server.c:2965
-#: ../camel/providers/nntp/camel-nntp-store.c:505
-#| msgid "Cannot authenticate to server: %s"
-msgid "Cannot authenticate without a username"
-msgstr "ààààà-ààà ààààà ààààààà àààà àààà àà àààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:1119
-#: ../camel/providers/imapx/camel-imapx-server.c:2974
-#: ../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 Failed"
-msgid "Authentication password not available"
-msgstr "àààààààààà àààààà àààààà àààà"
-
-#: ../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 "ààààà %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 "ààààà ààà \"%s\" àààà àààà àà, ààààà àà àààà \"%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 "àààààà ààààà àààà àà-ààààà àààààà àààà ààà"
-
-#: ../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 "ààààà '%s' àààà ààààà àà àààà àà: ààààà ààààà ààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:2551
-#: ../camel/providers/imapx/camel-imapx-store.c:1399
-#, c-format
-msgid "Unknown parent folder: %s"
-msgstr "àààààà àààààà ààààà: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:3326
-#, c-format
-msgid "Server unexpectedly disconnected"
-msgstr "àààà ààààà ààà-àààààà àà ààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:3329
-msgid "Server unexpectedly disconnected: "
-msgstr "àààà àààààà ààà àà ààà-àààààà àà ààà: "
-
-#: ../camel/providers/imapx/camel-imapx-folder.c:101
-#, c-format
-msgid "Could not create folder summary for %s"
-msgstr "%s àà ààààà ààààà ààààà àààà àà àààà"
-
-#: ../camel/providers/imapx/camel-imapx-folder.c:109
-#, c-format
-msgid "Could not create cache for %s: "
-msgstr "%s àà àààà àààà àààà àà ààà: "
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
-msgid "Use _Quick Resync if the server supports it"
-msgstr "ààààà àààà, àà àààà àà àà ààààà àà(_Q)"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:48
-msgid "_Listen for server change notifications"
-msgstr "àààà ààààà ààààà àà ààààà(_L)"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:56
-msgid "Command:"
-msgstr "ààààà:"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:58
-msgid "Numbe_r of cached connections to use"
-msgstr "àààà àà àààà àààà àà àààààààà àà ààààà(_r)"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:69
-msgid "Namespace:"
-msgstr "ààà-àààà:"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
-msgid "Default IMAP port"
-msgstr "àààààà IMAP àààà"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:96
-msgid "IMAP+"
-msgstr "IMAP+"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:817
-#| msgid "Server unexpectedly disconnected"
-msgid "Server disconnected"
-msgstr "àààà ààà-àààààà àà ààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:1206
-msgid "Error writing to cache stream: "
-msgstr "ààà ààààà àààà àà àààà: "
-
-#: ../camel/providers/imapx/camel-imapx-server.c:1940
-#, c-format
-msgid "Not authenticated"
-msgstr "ààààààà àààà àà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:2005
-#| msgid "Error performing search"
-msgid "Error performing IDLE"
-msgstr "IDLE ààà ààààà àààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3160
-#| msgid "Encrypting message"
-msgid "Error fetching message"
-msgstr "àààààà ààà ààààà àààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3228
-msgid "Closing tmp stream failed: "
-msgstr "ààààà ààààà ààà ààà àà ààààà: "
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3327
-#| msgid "Copying messages"
-msgid "Error copying messages"
-msgstr "àààààà àààà ààà ààààà àààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3457
-#| msgid "Sending message"
-msgid "Error appending message"
-msgstr "àààààà àààà ààààà àààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3637
-msgid "Error fetching message headers"
-msgstr "àààààà ààààà ààà ààààà àààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3778
-#| msgid ""
-#| "Error retrieving newsgroups:\n"
-#| "\n"
-#| "%s"
-msgid "Error retrieving message"
-msgstr "àààààà àààààà ààà 'à àààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3982
-#| msgid "Checking for new messages"
-msgid "Error fetching new messages"
-msgstr "àààà àààààà ààà àà àààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4172
-#| msgid "Verifying message"
-msgid "Error while fetching messages"
-msgstr "àààààà ààà ààààà àààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4180
-#: ../camel/providers/imapx/camel-imapx-server.c:4210
-#, c-format
-#| msgid "Fetching summary information for new messages in %s"
-msgid "Fetching summary information for %d message in %s"
-msgid_plural "Fetching summary information for %d messages in %s"
-msgstr[0] "%2$s àààà %1$d ààààà àà ààààà ààààààà àà àà ààà àà"
-msgstr[1] "%2$s àààà %1$d àààààààà àà ààààà ààààààà àà àà ààà àà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4332
-#: ../camel/providers/imapx/camel-imapx-server.c:4366
-#| msgid "Error performing search"
-msgid "Error refreshing folder"
-msgstr "ààààà ààààà ààà ààààà àààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4455
-#| msgid "Expunging old messages"
-msgid "Error expunging message"
-msgstr "àààààà ààààà ààààà àààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4540
-#| msgid "Creating folder '%s'"
-msgid "Error fetching folders"
-msgstr "ààààà ààà ààààà àààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4614
-#| msgid "_Show only subscribed folders"
-msgid "Error subscribing to folder"
-msgstr "ààààà àà ààààà ààà àà àààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4667
-#| msgid "Storing folder"
-msgid "Error creating folder"
-msgstr "ààààà ààààà ààààà àààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4712
-#| msgid "Storing folder"
-msgid "Error deleting folder"
-msgstr "ààààà ààààà ààààà àààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4762
-#| msgid "Storing folder"
-msgid "Error renaming folder"
-msgstr "ààààà ààà àààà ààààà àààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4813
-#| msgid "Error performing search"
-msgid "Error performing NOOP"
-msgstr "NOOP ààà ààààà àààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4908
-msgid "Error syncing changes"
-msgstr "ààààà àààà ààà àà àààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:5664
-#: ../camel/providers/imapx/camel-imapx-server.c:5679
-msgid "Cannot create spool file: "
-msgstr "àààà àààà àààà àààà àà àààà: "
+#: ../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 "IMAP àààààà àààà ààà ààà ààà àààààà àà"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1076
+#: ../camel/providers/imap/camel-imap-store.c:2191
+#: ../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 quota information for '%s'"
-msgid "Retrieving folder list for %s"
-msgstr "%s àà ààààà àààà àà àà ààà àà"
+msgid "Cannot create folder '%s': folder exists."
+msgstr "ààààà '%s' àààà ààààà àà àààà àà: ààààà ààààà ààà"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1176
-#: ../camel/providers/nntp/camel-nntp-store.c:1790
+#: ../camel/providers/imap/camel-imap-store.c:2984
 #, c-format
-msgid "No such folder: %s"
-msgstr "àà ààà ààààà àààà àà: %s"
+#| msgid "Retrieving folder list for %s"
+msgid "Retrieving list of folders at '%s'"
+msgstr "'%s' àà ààààà àààà àà àà ààà àà"
 
-#: ../camel/providers/imapx/camel-imapx-stream.c:70
+#: ../camel/providers/imap/camel-imap-store.c:3334
 #, c-format
-msgid "Source stream returned no data"
-msgstr "àààà ààààà àà ààà àààà àààà ààààà"
+msgid "Server unexpectedly disconnected"
+msgstr "àààà ààààà ààà-àààààà àà ààà"
 
-#: ../camel/providers/imapx/camel-imapx-stream.c:79
-#, c-format
-msgid "Source stream unavailable"
-msgstr "àààà ààààà àààààà àààà"
+#: ../camel/providers/imap/camel-imap-store.c:3338
+msgid "Server unexpectedly disconnected: "
+msgstr "àààà àààààà ààà àà ààà-àààààà àà ààà: "
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
+msgid "Use _Quick Resync if the server supports it"
+msgstr "ààààà àààà, àà àààà àà àà ààààà àà(_Q)"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
+msgid "_Listen for server change notifications"
+msgstr "àààà ààààà ààààà àà ààààà(_L)"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "Namespace:"
+msgstr "ààà-àààà:"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
+msgid "Default IMAP port"
+msgstr "àààààà IMAP àààà"
+
+#: ../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:483
-#| msgid "Index message body data"
+#: ../camel/providers/local/camel-local-folder.c:499
 msgid "_Index message body data"
 msgstr "àààààà àààààà ààà àààà(_i)"
 
-#: ../camel/providers/local/camel-local-folder.c:712
+#: ../camel/providers/local/camel-local-folder.c:727
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3602,23 +3697,23 @@ msgstr ""
 "%2$s ààààà 'ààà %1$s àààààà àààààà àààà àààà àà àààà\n"
 "%3$s"
 
-#: ../camel/providers/local/camel-local-provider.c:44
+#: ../camel/providers/local/camel-local-provider.c:43
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr "'.folders' ààààà ààààà àààà (exmh) ààààà(_U)"
 
-#: ../camel/providers/local/camel-local-provider.c:51
+#: ../camel/providers/local/camel-local-provider.c:50
 msgid "MH-format mail directories"
 msgstr "MH-format àààà ààààààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:52
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in MH-like mail directories."
 msgstr "MH-like àààà ààààààààà àààà àààààà àà àààà àààà"
 
-#: ../camel/providers/local/camel-local-provider.c:70
+#: ../camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "àààà ààààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:71
+#: ../camel/providers/local/camel-local-provider.c:65
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
@@ -3626,30 +3721,29 @@ msgstr ""
 "ààààààà mbox àààààà àààà ààà ààààààà ààààà àààààà ààààà àààà àààà àààà àààààà "
 "(àààà) ààà ààà"
 
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:107
-#| msgid "_Apply filters to new messages in INBOX"
+#: ../camel/providers/local/camel-local-provider.c:79
+#: ../camel/providers/local/camel-local-provider.c:99
 msgid "_Apply filters to new messages in Inbox"
 msgstr "ààà-àààà àààà àààà ààààààà àà ààààà àààà(_A)"
 
-#: ../camel/providers/local/camel-local-provider.c:93
+#: ../camel/providers/local/camel-local-provider.c:86
 msgid "Maildir-format mail directories"
 msgstr "Maildir-format àààà ààààààààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:94
+#: ../camel/providers/local/camel-local-provider.c:87
 msgid "For storing local mail in maildir directories."
 msgstr "maildir ààààààààààà àààà àààààà àà àààà àààà"
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:100
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "àààà ààààà Elm/Pine/Mutt àààààà àààà àààààà(_S)"
 
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:107
 msgid "Standard Unix mbox spool file"
 msgstr "ààààààà Unix mbox àààà àààà"
 
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:128
+#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:120
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -3657,7 +3751,7 @@ msgstr ""
 "ààààà à-àààà àààà àààààà ààà ààà àààà àààà àààààà àà\n"
 "ààààà Elm, Pine, ààà Mutt àààà ààààà ààà ààà àààà ààà"
 
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:119
 msgid "Standard Unix mbox spool directory"
 msgstr "ààààààà Unix mbox àààà ààààààààà"
 
@@ -3666,169 +3760,168 @@ msgstr "ààààààà Unix mbox àààà ààààààààà
 msgid "Could not rename folder %s to %s: %s"
 msgstr "ààààà %s àà ààà-ààààà %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 "àààà àààà àààà %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 "ààààààà(root) %s ààààà ààà àààà àààà ààà ààà"
 
-#: ../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 "ààààààà(root) %s ààààà ààà àààà ààààààààà àààà ààà"
 
-#: ../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 "ààààà àààààà àààà àààà àà àààà àà: %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 "ààà-àààà àààà àààà ààààà àààà àààà àà"
 
-#: ../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 "ààààà àààààà àààà '%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 "ààààà àààà àààà '%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 "'%s' àà ààà ààààà àààà àààà àà àààà àà: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:527
+#: ../camel/providers/local/camel-local-summary.c:543
 #, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "àààààà ààà ààààà àààà àààààà àààà àààà: àààààà àààà"
 
 #: ../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 "ààà àà ààà àààààà àààà"
 
-#: ../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 "maildir ààààà àààà ààààà ààà àààà àà àààà àà: %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 "%2$s ààààà ààà %1$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 "àààààà ààà àààààà ààààà àààà ààààà àààà àà àààà àà: %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"
 msgid "Cannot create folder: %s: Folder name cannot contain a dot"
 msgstr "%s: ààààà ààààà àààà àà àààà: ààààà ààà àààà ààààà àààà àà àààà"
 
-#: ../camel/providers/local/camel-maildir-store.c:119
-#: ../camel/providers/local/camel-maildir-store.c:782
+#: ../camel/providers/local/camel-maildir-store.c:122
+#: ../camel/providers/local/camel-maildir-store.c:806
 #, c-format
 msgid "Folder %s already exists"
 msgstr "ààààà %s àààààà àà ààààà àà"
 
-#: ../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 "ààààà '%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 "ààààà '%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 "ààààà '%s' àààààà àààà àààà àà àààà àà: ààààà ààààà àààà ààà"
 
-#: ../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 "ààààà '%s' àààààà àààà àààà àà àààà àà: ààà maildir ààààààààà àààà àà"
 
-#: ../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 "ààààà '%s' ààààà àààà àà àààà àà: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:331
+#: ../camel/providers/local/camel-maildir-store.c:340
 msgid "not a maildir directory"
 msgstr "ààà maildir ààààààààà àààà àà"
 
-#: ../camel/providers/local/camel-maildir-store.c:569
-#: ../camel/providers/local/camel-maildir-store.c:970
-#: ../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 "ààààà '%s' àà àààà àààà àà ààà àà: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:773
+#: ../camel/providers/local/camel-maildir-store.c:797
 #, c-format
 msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
 msgstr "%s: ààààà ààà àààà ààààà àà àààà, ààààà ààà àààà ààààà àààà àà àààà"
 
-#: ../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 "maildir ààààààààà àààà ààààààà àààà àà àààà àà: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:540
+#: ../camel/providers/local/camel-maildir-summary.c:558
 msgid "Checking folder consistency"
 msgstr "ààààà ààààààà àà àààà àààà àà"
 
-#: ../camel/providers/local/camel-maildir-summary.c:633
+#: ../camel/providers/local/camel-maildir-summary.c:651
 msgid "Checking for new messages"
 msgstr "àààà ààààààà àà àààà àààà àà"
 
-#: ../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 "ààààà ààààààà àààà àà ààà àà"
 
@@ -3847,39 +3940,39 @@ msgid "The folder appears to be irrecoverably corrupted."
 msgstr "ààààà àààà àà-ààààààààà àààààààà ààà"
 
 #: ../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 "%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 "àà ààà ààà ààààà àààà ààààà àà àààà ààà"
 
-#: ../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 "ààààà '%s' àààààà àààà àààà àà àààà: ààà àààààà àààà àààà ààà"
 
-#: ../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 "ààààààààà '%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 "ààààà ààààà ààà àà àààà àà: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:593
+#: ../camel/providers/local/camel-mbox-store.c:619
 msgid "Folder already exists"
 msgstr "ààààà ààààà àà"
 
-#: ../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"
@@ -3888,33 +3981,33 @@ msgstr ""
 "ààààà '%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' àà àààààà àààà ààà ààà"
 
-#: ../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 "ààààà `'%s' àààà àààà ààà ààààà àààà àààà"
 
-#: ../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 "ààààà ààààà àààà '%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 "àààà ààààà ààà ààà ààà"
 
-#: ../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 "'%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 "'%s' àà ààà %s ààààà àààà àààà àà àààà àà: %s"
@@ -3929,48 +4022,48 @@ msgstr "ààààà ààààààà àààà àà àààà 
 msgid "Fatal mail parser error near position %s in folder %s"
 msgstr "%2$s ààààà 'à %1$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 "ààààà àà àààà àààà àààà àà àààà àà: %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 "àààà àààà àààà àà àààà àà: %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 "àààà 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:920
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "àààà ààààà %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 "àààà ààààà ààà àààà àààà àà àààà: %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 "ààààà àà ààà ààààà àààà àà àààà: %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:1086
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "ààààà ààà ààààààà àààà àà àààà àà: %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:1123
 #, c-format
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
@@ -3980,40 +4073,40 @@ msgstr ""
 "àà àààà "
 "ààààà)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:864
-#: ../camel/providers/local/camel-mbox-summary.c:1124
+#: ../camel/providers/local/camel-mbox-summary.c:866
+#: ../camel/providers/local/camel-mbox-summary.c:1136
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "ààààà àà ààààà ààà àààà àà ààà àà, àààààà ààà ààààà àà"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1029
-#: ../camel/providers/local/camel-spool-summary.c:345
+#: ../camel/providers/local/camel-mbox-summary.c:1031
+#: ../camel/providers/local/camel-spool-summary.c:347
 #, c-format
 msgid "Unknown error: %s"
 msgstr "àààààà àààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1182
-#: ../camel/providers/local/camel-mbox-summary.c:1212
+#: ../camel/providers/local/camel-mbox-summary.c:1194
+#: ../camel/providers/local/camel-mbox-summary.c:1224
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "àààà mailbox àààà ààààà àààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1201
+#: ../camel/providers/local/camel-mbox-summary.c:1213
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "àààà mailbox àààà àààà àà ààààà: %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 "mh ààààà àààà ààààà ààà ààà àààà: %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 "'%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 "ààààà '%s' àààààà àààà àààà àà àààà àà: ààà ààààààààà àààà ààà"
@@ -4023,37 +4116,36 @@ msgstr "ààààà '%s' àààààà àààà àààà àà
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH ààààààààà àààà ààààààà àààà àà àààà àà: %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 "àààà '%s' ààà ààààààà àààà àà àààà àà: %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 "àààà '%s' ààà àààààà àààà ààà ààààààààà àààà àà"
 
-#: ../camel/providers/local/camel-spool-store.c:416
+#: ../camel/providers/local/camel-spool-store.c:425
 #, c-format
 msgid "Spool mail file %s"
 msgstr "àààà àààà àààà %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 "àààà ààààà ààà %s"
 
-#: ../camel/providers/local/camel-spool-store.c:423
-#| msgid "Invalid source"
+#: ../camel/providers/local/camel-spool-store.c:432
 msgid "Invalid spool"
 msgstr "ààà àààà"
 
-#: ../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 "ààààà '%s/%s' ààààà àààà àà"
 
-#: ../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"
@@ -4062,12 +4154,12 @@ msgstr ""
 "ààààà '%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 "ààààà '%s' ààààà àààà ààà"
 
-#: ../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"
@@ -4076,41 +4168,41 @@ msgstr ""
 "ààààà '%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' ààà mailbox àààà àààà àà"
 
-#: ../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 "ààààààà ààà ààà-àààà àà àààà àààà àà"
 
-#: ../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 "àààà ààààà ààààà àààà àà àààà"
 
-#: ../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 "ààà ààààààà àà ààà-ààààà àààà àààà àà àààà àà"
 
-#: ../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 "àààà ààààà %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 "àààà ààààà %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"
@@ -4119,47 +4211,47 @@ msgstr ""
 "àààà ààààà %s ààà àààààààààà àààà àààà àà àààà àà: %s\n"
 "ààààà àààààà àà àààà àà, ààà '%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 "ààààààà àààà: UID ààà àààààà àààà àà: %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:630
+#: ../camel/providers/pop3/camel-pop3-folder.c:1033
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "àààààà %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/nntp/camel-nntp-folder.c:339
+#: ../camel/providers/nntp/camel-nntp-folder.c:504
+#: ../camel/providers/pop3/camel-pop3-folder.c:555
 #: ../camel/providers/pop3/camel-pop3-folder.c:620
+#: ../camel/providers/pop3/camel-pop3-folder.c:639
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "%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 "àààà àààààà àààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:633
+#: ../camel/providers/nntp/camel-nntp-folder.c:606
 msgid "Posting failed: "
 msgstr "àààà ààà àà ààààà: "
 
-#: ../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 "ààààà àààààà ààà àààà àààà NNTP àààààà ààà àààà àààà !"
 
-#: ../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 "ààààà NNTP ààààà ààà àààààà ààà àààà àà àààà àà!"
@@ -4170,48 +4262,48 @@ msgid ""
 msgstr ""
 "ààààà àààà ààà àààà àààà (ààààà àà comp.os.linux àà àààà c.o.linux)(_S)"
 
-#: ../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 "ààààà ààà ààààà àààà, ààààààà ààààà àà ààààà(_d)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:56
+#: ../camel/providers/nntp/camel-nntp-provider.c:57
 msgid "Default NNTP port"
 msgstr "àààààà NNTP àààà"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:58
 msgid "NNTP over SSL"
 msgstr "SSL àààà NNTP"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:63
+#: ../camel/providers/nntp/camel-nntp-provider.c:64
 msgid "USENET news"
 msgstr "USENET ààààà"
 
-#: ../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 "àà ààà-àààà USENET ààà ààà ààà àààà àà àààà ààà"
 
-#: ../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."
 msgstr "àà ààà ààà NNTP àààà àà àààà-ààààà àààààà àààààààààà àà ààààà ààààààà"
 
-#: ../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 "%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 àààà %s àà àààà ààà %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 ààààà %s àààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1072
+#: ../camel/providers/nntp/camel-nntp-store.c:1058
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4222,22 +4314,22 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1165
+#: ../camel/providers/nntp/camel-nntp-store.c:1152
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "ààààà ààà ààààà àààà ààààà àààà ààà àààà àà: àààààà àà àààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1181
+#: ../camel/providers/nntp/camel-nntp-store.c:1168
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "ààà ààààà àààà ààààà àààà ààààà àà àààà ààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1204
+#: ../camel/providers/nntp/camel-nntp-store.c:1191
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "ààààà ààà ààààà àààà ààààà àààà ààà àààà àà: ààààààà àà àààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1402
+#: ../camel/providers/nntp/camel-nntp-store.c:1390
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4248,7 +4340,7 @@ msgstr ""
 "\n"
 "àà àààà àà ààà ààà-àààà àààà ààà àààà àààà àààà àààààà ààààà ààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1453
+#: ../camel/providers/nntp/camel-nntp-store.c:1438
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4259,64 +4351,64 @@ msgstr ""
 "\n"
 "àà àààà àà ààà ààà-àààà àààà ààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1647
+#: ../camel/providers/nntp/camel-nntp-store.c:1628
 msgid "NNTP Command failed: "
 msgstr "NNTP ààààà àààà: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1732
+#: ../camel/providers/nntp/camel-nntp-store.c:1713
 #, c-format
 msgid "Not connected."
 msgstr "àààààà àààà ààà"
 
-#: ../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: àààà àààààààà àà àààà àààà àà"
 
-#: ../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 "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 "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 "àààààà àààà: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:447
-#: ../camel/providers/pop3/camel-pop3-folder.c:517
+#: ../camel/providers/pop3/camel-pop3-folder.c:450
+#: ../camel/providers/pop3/camel-pop3-folder.c:523
 #, c-format
 msgid "No message with UID %s"
 msgstr "UID %s ààà ààà àààààà àààà àà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:533
+#: ../camel/providers/pop3/camel-pop3-folder.c:539
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "POP àààààà %d àààààà àààà àà ààà àà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:612
+#: ../camel/providers/pop3/camel-pop3-folder.c:631
 msgid "Unknown reason"
 msgstr "ààààà àààà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:660
+#: ../camel/providers/pop3/camel-pop3-folder.c:679
 msgid "Retrieving POP summary"
 msgstr "POP ààààà ààààààà àààààà àààà àà ààà àà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:711
+#: ../camel/providers/pop3/camel-pop3-folder.c:740
 msgid "Cannot get POP summary: "
 msgstr "POP ààààà àààààà àààà àààà àà àààà àà: "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:823
+#: ../camel/providers/pop3/camel-pop3-folder.c:859
 msgid "Expunging old messages"
 msgstr "àààà àààààà àààààà àà ààà àà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:843
+#: ../camel/providers/pop3/camel-pop3-folder.c:879
 msgid "Expunging deleted messages"
 msgstr "àààà àààààà àààà àà ààà àà"
 
@@ -4328,37 +4420,38 @@ msgstr "àààààà ààààààà"
 msgid "_Leave messages on server"
 msgstr "àààà àà àààààà àààà(_L)"
 
-#. 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 "%s ààààà àààà àààà(_D)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:46
+#: ../camel/providers/pop3/camel-pop3-provider.c:47
 msgid "Delete _expunged from local Inbox"
 msgstr "àààà àààààà ààà ààààà àààà(_e)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:48
+#: ../camel/providers/pop3/camel-pop3-provider.c:49
 msgid "Disable _support for all POP3 extensions"
 msgstr "àà POP3 ààààààà àà àààààà àààà(_s)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:54
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
 msgid "Default POP3 port"
 msgstr "àààààà POP3 àààà"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:56
 msgid "POP3 over SSL"
 msgstr "SSL ààà POP3"
 
-#: ../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 "àààààà àà POP àààà ààà àààààà àààààà ààà ààà"
 
-#: ../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."
@@ -4367,7 +4460,7 @@ msgstr ""
 "àààà POP "
 "àààààà àà àààààà ààààà ààà"
 
-#: ../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 "
@@ -4383,52 +4476,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 "POP àààà %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 "POP àààà %s ààà àààààààà ààà ààà àààà àààà àààà: %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 ààààà àààà"
 
-#. 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 "POP àààà %s ààà àààààààà ààà ààà àààà àààà àààà%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 "POP àààà %s ààà àààààààà ààà ààà àààà àààà àààà: "
 
-#: ../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 "POP àààà %s àààà ààààà ààà ààà àààà: SASL àààààààà àààà"
 
-#: ../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 "POP àààà %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 àààà %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 ààààà %2$s àààà %1$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 "
@@ -4438,7 +4532,7 @@ msgstr ""
 "àà "
 "àààà ààà àààà àààààààà ààà ààààà àààà"
 
-#: ../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"
@@ -4449,7 +4543,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"
@@ -4458,17 +4552,17 @@ msgstr ""
 "POP àààà %s ààà àààà àààà àààààà ààà\n"
 "ààààà ààà%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 "POP àààà %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 "'%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 àààà à ààà ààààà ààà àààà àà"
@@ -4491,36 +4585,36 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "sendmail ààààààà ààààà àààà àààà"
 
-#: ../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 "àààààà àààà ààà àààà àààà àààà àà àààà àà"
 
-#: ../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 "sendmail ààà ààààà àààà àà àààà àà: %s: àààà ààààà àààà ààà ààà"
 
-#: ../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 "sendmail ààà ààààà àààà àà àààà àà: %s: àààà àààà ààààà àà àààà àà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:184
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:194
 msgid "Could not send message: "
 msgstr "àààààà ààààà àààà àà àààà: "
 
-#: ../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 ààààà %s ààà ààà àà àà àà: àààà àààà ààààà ààà ààà"
 
-#: ../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 "%s ààà ààààà àààà àà àààà: àààà àààà ààààà ààà"
 
-#: ../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 ààààà %d ààà ààà: àààà àààà ààààà àààà"
@@ -4545,359 +4639,574 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "ààààà mailhub ààà 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 "àà àààà ààà àààà àààà: "
 
-#: ../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 "SMTP àààà %s ààà àààààààà ààà ààà ààà àààà àààà: %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 ààààà àààà: "
 
-#: ../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 "SMTP àààà %s ààà àààààààà ààà ààà ààà àààà àààà: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:292
+#: ../camel/providers/smtp/camel-smtp-transport.c:301
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP àààà %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 àààà ààààà %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 requested authentication type %s."
 msgid "SMTP server %s does not support %s authentication"
 msgstr "SMTP àààà %s àààààà àààààààààà àààà %s àà ààààà àààà ààà"
 
-#: ../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 "SASL ààà àààà ààààà ààà àà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:459
-msgid "SMTP Authentication"
-msgstr "SMTP àààààààààà"
-
-#: ../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 ààààà àààà: "
 
-#: ../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 "àààààà ààààà àààà àà àààà: àààà àààà àààà ààà"
 
-#: ../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 "àààààà ààààà àààà àà àààà: àààà àààà àà àààààà àààà àààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:654
+#: ../camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Sending message"
 msgstr "àààààà ààààà àà àààà àà"
 
-#: ../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 "àààààà ààààà àààà àà àààà: ààà àààààà àààà àààà ààà"
 
-#: ../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 "àààààà ààààà àààà àà àààà: ààà ààà ààààà àààààà-àààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:796
+#: ../camel/providers/smtp/camel-smtp-transport.c:807
 msgid "Syntax error, command unrecognized"
 msgstr "àààààà àààà, ààààà ààààà àààà àà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:798
+#: ../camel/providers/smtp/camel-smtp-transport.c:809
 msgid "Syntax error in parameters or arguments"
 msgstr "àààààààà ààà àààààààà àààà àààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:800
+#: ../camel/providers/smtp/camel-smtp-transport.c:811
 msgid "Command not implemented"
 msgstr "ààààà àààà àààà àààà àà ààà àà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:802
+#: ../camel/providers/smtp/camel-smtp-transport.c:813
 msgid "Command parameter not implemented"
 msgstr "ààààà àààààààà àààà àààà àà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:804
+#: ../camel/providers/smtp/camel-smtp-transport.c:815
 msgid "System status, or system help reply"
 msgstr "ààààà ààààà ààà ààààà àààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:806
+#: ../camel/providers/smtp/camel-smtp-transport.c:817
 msgid "Help message"
 msgstr "àààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:808
+#: ../camel/providers/smtp/camel-smtp-transport.c:819
 msgid "Service ready"
 msgstr "ààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:810
+#: ../camel/providers/smtp/camel-smtp-transport.c:821
 msgid "Service closing transmission channel"
 msgstr "ààààà ààà ààà àà ààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:812
+#: ../camel/providers/smtp/camel-smtp-transport.c:823
 msgid "Service not available, closing transmission channel"
 msgstr "ààààà àààààà àààà àà, ààààà àààà ààà àààà àà àààà àà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:814
+#: ../camel/providers/smtp/camel-smtp-transport.c:825
 msgid "Requested mail action okay, completed"
 msgstr "àààààà àààà àààààà ààà àà, ààààà"
 
-#: ../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 "ààààà àààà àààà àà; àààà <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 "àààààà àààà àààààà àààà àààà àà àààà: mailbox àààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:820
+#: ../camel/providers/smtp/camel-smtp-transport.c:831
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "àààààà àààààà àààà àààà àà àààà: mailbox àààààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:822
+#: ../camel/providers/smtp/camel-smtp-transport.c:833
 msgid "Requested action aborted: error in processing"
 msgstr "àààààà àààààà àààà àà àà, àààààà àààà àààà"
 
-#: ../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 "ààààà àààà àààà àà; ààààà àààà <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 "àààààà àààààà àààà àààà àà àààà àà: àààààà ààààà ààà àààààà àààà"
 
-#: ../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 "àààààà àààà àààààà ààààà: àààààà ààà àààà ààà ààààà"
 
-#: ../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 "àààààà àààààà àààà àààà: mailbox ààà àààà àà"
 
-#: ../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 "ààà àààààà àààà; <CRLF>.<CRLF> ààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:834
+#: ../camel/providers/smtp/camel-smtp-transport.c:845
 msgid "Transaction failed"
 msgstr "ààààààààààà ààààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:838
+#: ../camel/providers/smtp/camel-smtp-transport.c:849
 msgid "A password transition is needed"
 msgstr "ààà àààààà àààààà àààààà àà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:840
+#: ../camel/providers/smtp/camel-smtp-transport.c:851
 msgid "Authentication mechanism is too weak"
 msgstr "àààààààààà ààà àààà ààààà àà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:842
+#: ../camel/providers/smtp/camel-smtp-transport.c:853
 msgid "Encryption required for requested authentication mechanism"
 msgstr "àààààà àààààààààà ààà àà àààààààà àààààà àà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:844
+#: ../camel/providers/smtp/camel-smtp-transport.c:855
 msgid "Temporary authentication failure"
 msgstr "àààà àààààààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1095
+#: ../camel/providers/smtp/camel-smtp-transport.c:1112
 msgid "SMTP Greeting"
 msgstr "SMTP ààààà-àààààà"
 
-#: ../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 ààààà àààà: "
 
-#: ../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 ààààà àààà: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1272
+#: ../camel/providers/smtp/camel-smtp-transport.c:1292
 msgid "RCPT TO command failed: "
 msgstr "RCPT TO ààààà ààààà: "
 
-#: ../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> ààààà: "
 
-#: ../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 ààààà ààààà: "
 
-#: ../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 ààààà ààààà: "
 
-#: ../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 ààààà ààààà: "
 
-#: ../libedataserver/e-categories.c:47
+#: ../data/org.gnome.evolution-data-server.addressbook.gschema.xml.in.h:1
+#| msgid "Contact ID already exists"
+msgid "Contact UID of a user"
+msgstr "àààà àà ààààà ID"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:1
+msgid "Birthday and anniversary reminder"
+msgstr "àààààà àà ààààà-ààà ààààààà"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:2
+msgid "Whether to set a reminder for birthdays and anniversaries"
+msgstr "àà àààààà àà ààààà-ààà àà ààà ààààààà ààààà àààà ààà àà"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:3
+msgid "Birthday and anniversary reminder value"
+msgstr "àààààà àà ààààà-ààà ààààààà àààà"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:4
+msgid "Number of units for determining a birthday or anniversary reminder"
+msgstr "àààààà ààà àààààààà ààààààà àààà àà àààààà àà ààààà"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:5
+msgid "Birthday and anniversary reminder units"
+msgstr "àààààà àà ààààà-ààà ààààààà ààààà"
+
+#: ../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 ""
+"àààààà ààà ààààà-ààà ààààààà àà ààààà àà, \"àààà\", \"àààà\" ààà \"ààà\""
+
+#: ../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 "àà àà ààà àààà (ààààà àà ààà àààà?)"
+
+#: ../libebackend/e-authentication-mediator.c:264
+#| msgid "No response from the server"
+msgid "No response from client"
+msgstr "ààààà ààà ààà àààà àààà"
+
+#: ../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 "Could not cancel operation"
+msgid "Client cancelled the operation"
+msgstr "ààààà àà àààààà ààà ààà àààà àààà"
+
+#: ../libebackend/e-authentication-mediator.c:416
+msgid "Client reports password was rejected"
+msgstr "ààààà àààààà àààààà ààà àààà ààà"
+
+#: ../libebackend/e-authentication-session.c:532
+msgid "Add this password to your keyring"
+msgstr "àà àààààà ààà àààààà àààààà ààààà ààà"
+
+#: ../libebackend/e-authentication-session.c:595
+msgid "Password was incorrect"
+msgstr "àààààà ààà àà"
+
+#: ../libebackend/e-authentication-session.c:1331
+#: ../libebackend/e-authentication-session.c:1507
+#: ../libebackend/e-authentication-session.c:1690
+#| msgid "Operation cancelled"
+msgid "Keyring operation was cancelled"
+msgstr "àààààà àààààà ààà àààà àà"
+
+#: ../libebackend/e-backend.c:190
+#, c-format
+#| msgid "IMAP server %s does not support %s authentication"
+msgid "%s does not support authentication"
+msgstr "%s ààààààààà àà ààààà àààà àà"
+
+#: ../libebackend/e-collection-backend.c:734
+#, c-format
+msgid "%s does not support creating remote resources"
+msgstr "%s ààààà àààà ààààà àà ààààà àààà àà"
+
+#: ../libebackend/e-collection-backend.c:793
+#, c-format
+msgid "%s does not support deleting remote resources"
+msgstr "%s ààààà àààààà ààà ààààà àà ààààà àààà àà"
+
+#: ../libebackend/e-server-side-source.c:126
+#, c-format
+msgid "Data source is missing a [%s] group"
+msgstr "àààà àààà àà ààà [%s] ààààà àààà àà"
+
+#: ../libebackend/e-server-side-source.c:916 ../libedataserver/e-source.c:1111
+#, c-format
+msgid "Data source '%s' does not support creating remote resources"
+msgstr "àààà àààà '%s' ààààà àààà ààààà àà ààààà àààà àà"
+
+#: ../libebackend/e-server-side-source.c:930
+#, c-format
+msgid ""
+"Data source '%s' has no collection backend to create the remote resource"
+msgstr "àààà àààà '%s' ààààà àààà àà ààààà àà ààààà àààààà àààà àà"
+
+#: ../libebackend/e-server-side-source.c:958 ../libedataserver/e-source.c:1220
+#, c-format
+msgid "Data source '%s' does not support deleting remote resources"
+msgstr "àààà àààà '%s' ààààà àààààà ààà ààààà àà ààààà àààà àà"
+
+#: ../libebackend/e-server-side-source.c:972
+#, c-format
+msgid ""
+"Data source '%s' has no collection backend to delete the remote resource"
+msgstr "àààà àààà '%s' ààààà àààà àà ààààà àà ààààà àààààà àààà àà"
+
+#: ../libebackend/e-server-side-source.c:1285
+#, c-format
+msgid "File must have a '.source' extension"
+msgstr "àààà '.source' àààààààà àààà àààààà àà"
+
+#: ../libebackend/e-source-registry-server.c:522
+#: ../libedataserver/e-source-registry.c:1523
+#| msgid "Failed to authenticate.\n"
+msgid "The user declined to authenticate"
+msgstr "àààà àà àààààààà ààà ààààà àààà"
+
+#: ../libebackend/e-source-registry-server.c:770
+#, c-format
+msgid "UID '%s' is already in use"
+msgstr "UID '%s' àààààà àà ààààà àààà àà"
+
+#: ../libedataserver/e-categories.c:46
 msgctxt "CategoryName"
 msgid "Anniversary"
 msgstr "ààààà-ààà"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:47
 msgctxt "CategoryName"
 msgid "Birthday"
 msgstr "àààààà"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:48
 msgctxt "CategoryName"
 msgid "Business"
 msgstr "ààààà"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:49
 msgctxt "CategoryName"
 msgid "Competition"
 msgstr "ààààààà"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:50
 msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "ààààààà"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:51
 msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "ààààà"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:52
 msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "àààààà/àààà"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:53
 msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "ààààà"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:54
 msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "ààààà àààà"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:56
 msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "ààààà ààààà"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:57
 msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "ààà"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:58
 msgctxt "CategoryName"
 msgid "International"
 msgstr "àààààààààà"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:59
 msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "ààà àààà"
 
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:60
 msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "ààààà"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:61
 msgctxt "CategoryName"
 msgid "Personal"
 msgstr "ààààà"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:62
 msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "ààà ààà"
 
 #. 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 "àààà"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:65
 msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "àààà"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:66
 msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "àààààà"
 
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:67
 msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "àààà ààà àààà"
 
-#: ../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 "àààà àààà"
 
-#: ../libedataserver/e-client.c:125
+#: ../libedataserver/e-client.c:124
 msgid "Source not loaded"
 msgstr "àààà ààà àààà àà"
 
-#: ../libedataserver/e-client.c:127
+#: ../libedataserver/e-client.c:126
 msgid "Source already loaded"
 msgstr "àààà àààààà àà ààà àà"
 
-#: ../libedataserver/e-client.c:135
+#. 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:136
 msgid "Offline unavailable"
 msgstr "àààààà àààààà àààà"
 
-#: ../libedataserver/e-client.c:157
+#: ../libedataserver/e-client.c:158
 msgid "D-Bus error"
 msgstr "D-Bus àààà"
 
+#: ../libedataserver/e-source-authenticator.c:166
+#| msgid "Authentication required"
+msgid "Address book authentication request"
+msgstr "ààààà àààà àààààààààà ààà"
+
+#: ../libedataserver/e-source-authenticator.c:171
+#| msgid "Authentication required"
+msgid "Calendar authentication request"
+msgstr "àààààà àààààààààà àààààà àà"
+
+#: ../libedataserver/e-source-authenticator.c:175
+#| msgid "Authentication required"
+msgid "Mail authentication request"
+msgstr "ààà àààààààààà àààààà àà"
+
+#. generic account prompt
+#: ../libedataserver/e-source-authenticator.c:178
+#| msgid "Authentication required"
+msgid "Authentication request"
+msgstr "àààààààààà àààààà àà"
+
+#: ../libedataserver/e-source-authenticator.c:188
+#, c-format
+#| msgid "Please enter the %s password for %s on host %s."
+msgid "Please enter the password for address book \"%s\"."
+msgstr "ààààà àààà \"%s\" àà àààààà ààà ààà"
+
+#: ../libedataserver/e-source-authenticator.c:194
+#, c-format
+#| msgid "Please enter the %s password for %s on host %s."
+msgid "Please enter the password for calendar \"%s\"."
+msgstr "àààààà \"%s\" àà àààààà ààà ààà"
+
+#: ../libedataserver/e-source-authenticator.c:200
+#, c-format
+#| msgid "Please enter the %s password for %s on host %s."
+msgid "Please enter the password for mail account \"%s\"."
+msgstr "ààà àààààà \"%s\" àà àààààà ààà ààà"
+
+#: ../libedataserver/e-source-authenticator.c:206
+#, c-format
+#| msgid "Please enter the %s password for %s on host %s."
+msgid "Please enter the password for mail transport \"%s\"."
+msgstr "ààà ààààààààà \"%s\" àà àààààà ààà ààà"
+
+#: ../libedataserver/e-source-authenticator.c:212
+#, c-format
+#| msgid "Please enter the %s password for %s on host %s."
+msgid "Please enter the password for memo list \"%s\"."
+msgstr "àààà àààà \"%s\" àà àààààà ààà ààà"
+
+#: ../libedataserver/e-source-authenticator.c:218
+#, c-format
+#| msgid "Please enter the %s password for %s on host %s."
+msgid "Please enter the password for task list \"%s\"."
+msgstr "àààà àààà \"%s\" àà àààààà ààà ààà"
+
+#: ../libedataserver/e-source-authenticator.c:224
+#, c-format
+#| msgid "Please enter the %s password for %s on host %s."
+msgid "Please enter the password for account \"%s\"."
+msgstr "àààààà \"%s\" àà àààààà ààà ààà"
+
+#: ../libedataserver/e-source.c:621
+#, c-format
+msgid "Source file is missing a [%s] group"
+msgstr "àààà àààà [%s] ààààà àààà àà"
+
+#: ../libedataserver/e-source.c:938
+#, c-format
+msgid "Data source '%s' is not removable"
+msgstr "àààà àààà '%s' àààààààà àààà àà"
+
+#: ../libedataserver/e-source.c:1020
+#, c-format
+msgid "Data source '%s' is not writable"
+msgstr "àààà àààà '%s' ààààààà àààà àà"
+
+#: ../libedataserver/e-source.c:1408
+#| msgid "Unnamed List"
+msgid "Unnamed"
+msgstr "ààà-ààà"
+
+#: ../libedataserver/e-source-mail-signature.c:485
+#, c-format
+msgid "Signature script must be a local file"
+msgstr "ààààà ààààààà àààà àààà àààà àààààà àà"
+
 #. 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"
 
@@ -4905,7 +5214,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"
 
@@ -4913,7 +5222,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"
 
@@ -4921,78 +5230,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"
 
@@ -5000,24 +5309,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"
 
@@ -5031,8 +5341,7 @@ msgid ""
 "means manual proxy."
 msgstr ""
 "ààààà àààààà àààà ààààà ààà \"0\" ààà ààààà, \"1\" ààà ààà àààààà àààà, \"2\" "
-"ààà ààà "
-"ààààà ààààààà"
+"ààà ààà ààààà ààààààà"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
 msgid "Whether to use http-proxy"
@@ -5047,7 +5356,6 @@ msgid "Whether proxy server requires authentication"
 msgstr "àà àààààà àààà àà ààààààààà àà ààà"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
-#| msgid "Bad authentication response from server."
 msgid "Whether authentication is required to access proxy server."
 msgstr "àààààà àààà àààà àà ààààààààà àà ààà ààà"
 
@@ -5068,22 +5376,18 @@ msgid "Port number to use for HTTP requests."
 msgstr "HTTP ààààà àà àààà ààààà àààà àààà ààà"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
-#| msgid "Cannot authenticate user: "
 msgid "Proxy authentication user name"
 msgstr "àààààà ààààààààà ààààà ààà"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
-#| msgid "Unable to authenticate to GroupWise server. "
 msgid "User name to use to authenticate against proxy server."
 msgstr "àààààà àààà àà ààààààà ààà àà àààà ààààà ààààà ààà"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
-#| msgid "Temporary authentication failure"
 msgid "Proxy authentication password"
 msgstr "àààààà ààààààààà àààààà"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
-#| msgid "Unable to authenticate to GroupWise server. "
 msgid "Password to use to authenticate against proxy server."
 msgstr "àààààà àààà àà ààààààà ààà àà àààà ààààà àààààà"
 
@@ -5112,7 +5416,6 @@ msgid "Port number to use for HTTPS requests."
 msgstr "HTTPS ààààà àà àààà ààààà àààà àààà ààà"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:21
-#| msgid "Host is unreachable from SOCKS server"
 msgid "Host name for SOCKS requests"
 msgstr "SOCKS ààààà àà àààà ààà"
 
@@ -5136,193 +5439,135 @@ msgstr "àààààààà àààààà àààààà URL"
 msgid "Where to read automatic proxy configuration from."
 msgstr "àààààààà àààààà àààààà àààààà àààààà ààà"
 
-#: ../libedataserverui/e-book-auth-util.c:96
-#: ../libedataserverui/e-book-auth-util.c:656
-msgid "Accessing LDAP Server anonymously"
-msgstr "LDAP àààà ààà ààààà àà ààà 'àà ààààà"
-
-#: ../libedataserverui/e-book-auth-util.c:197
-#: ../libedataserverui/e-book-auth-util.c:423
-msgid "Failed to authenticate.\n"
-msgstr "ààààààà ààà àà ààààà ààà\n"
-
-#: ../libedataserverui/e-categories-editor.c:228
+#: ../libedataserverui/e-categories-editor.c:230
 msgid "Currently _used categories:"
 msgstr "àà àààà àààààà ààààààààà(_u):"
 
-#: ../libedataserverui/e-categories-editor.c:237
+#: ../libedataserverui/e-categories-editor.c:239
 msgid "_Available Categories:"
 msgstr "àààààà ààààààààà(_A):"
 
-#: ../libedataserverui/e-categories-selector.c:322
+#: ../libedataserverui/e-categories-selector.c:325
 msgid "Icon"
 msgstr "ààààà"
 
-#: ../libedataserverui/e-categories-selector.c:327
+#: ../libedataserverui/e-categories-selector.c:330
 msgid "Category"
 msgstr "ààààààà"
 
-#: ../libedataserverui/e-category-completion.c:299
+#: ../libedataserverui/e-category-completion.c:300
 #, c-format
 msgid "Create category \"%s\""
 msgstr "ààààààà \"%s\" àààà"
 
-#: ../libedataserverui/e-category-editor.c:135
+#: ../libedataserverui/e-category-editor.c:137
 msgid "Category Icon"
 msgstr "ààààààà ààààà"
 
-#: ../libedataserverui/e-category-editor.c:139
+#: ../libedataserverui/e-category-editor.c:141
 msgid "_No Image"
 msgstr "ààà ààààà àààà(_N)"
 
-#: ../libedataserverui/e-category-editor.c:176
+#: ../libedataserverui/e-category-editor.c:178
 msgid "Category _Name"
 msgstr "ààààààà ààà(_N)"
 
-#: ../libedataserverui/e-category-editor.c:184
+#: ../libedataserverui/e-category-editor.c:186
 msgid "Category _Icon"
 msgstr "ààààààà ààààà(_I)"
 
-#: ../libedataserverui/e-category-editor.c:224
+#: ../libedataserverui/e-category-editor.c:226
 msgid "Category Properties"
 msgstr "ààààààà ààà"
 
-#: ../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 "
 "name"
 msgstr "àààààà àààà àààààà àà '%s' ààààààà ààà ààààà àààà ààààà ààà àààààà"
 
-#: ../libedataserverui/e-client-utils.c:856
-#, c-format
-msgid ""
-"Enter password for calendar %s (user %s)\n"
-"Reason: %s"
-msgstr ""
-"àààààà %s (ààààà %s) àà àààààà ààà\n"
-"àààà: %s"
-
-#: ../libedataserverui/e-client-utils.c:858
-#, c-format
-msgid "Enter password for calendar %s (user %s)"
-msgstr "àààààà %s (ààààà %s) àà àààààà ààà"
-
-#: ../libedataserverui/e-client-utils.c:862
-#, c-format
-msgid ""
-"Enter password for task list %s (user %s)\n"
-"Reason: %s"
-msgstr ""
-"àààà àààà %s (ààààà %s) àà àààààà ààà\n"
-"àààà: %s"
-
-#: ../libedataserverui/e-client-utils.c:864
-#, c-format
-msgid "Enter password for task list %s (user %s)"
-msgstr "àààà àààà %s (ààààà %s) àà àààààà ààà"
-
-#: ../libedataserverui/e-client-utils.c:868
-#, c-format
-msgid ""
-"Enter password for memo list %s (user %s)\n"
-"Reason: %s"
-msgstr ""
-"àààà àààà %s (ààààà %s) àà àààààà ààà\n"
-"àààà: %s"
-
-#: ../libedataserverui/e-client-utils.c:870
-#, c-format
-msgid "Enter password for memo list %s (user %s)"
-msgstr "àààà àààà %s (ààààà %s) àà àààààà ààà"
-
-#: ../libedataserverui/e-client-utils.c:981
-msgid "Enter Passphrase"
-msgstr "àààà ààà"
-
-#: ../libedataserverui/e-client-utils.c:983
-msgid "Enter Password"
-msgstr "àààààà ààà"
-
-#: ../libedataserverui/e-name-selector-dialog.c:187
+#: ../libedataserverui/e-name-selector-dialog.c:278
 msgid "Show Contacts"
 msgstr "ààààà ààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:209
+#: ../libedataserverui/e-name-selector-dialog.c:300
 msgid "Address B_ook:"
 msgstr "àààààà àààà(_o):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:217
-msgid "Cate_gory:"
-msgstr "ààààààà(_g):"
+#: ../libedataserverui/e-name-selector-dialog.c:310
+#| msgid "Cate_gory:"
+msgid "Cat_egory:"
+msgstr "ààààààà(_e):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:235
+#: ../libedataserverui/e-name-selector-dialog.c:332
 msgid "_Search:"
 msgstr "ààà(_S):"
 
-#: ../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 "ààà àà ààààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:255
+#: ../libedataserverui/e-name-selector-dialog.c:359
 msgid "Co_ntacts"
 msgstr "ààààà(_n)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:310
+#: ../libedataserverui/e-name-selector-dialog.c:421
 msgid "Search"
 msgstr "ààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:313
+#: ../libedataserverui/e-name-selector-dialog.c:424
 msgid "Address Book"
 msgstr "àààààà àààà"
 
-#: ../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 "ààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:433
+#: ../libedataserverui/e-name-selector-dialog.c:545
 msgid "Select Contacts from Address Book"
 msgstr "àààààà àààà àààààà ààààà àààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:781
+#: ../libedataserverui/e-name-selector-dialog.c:917
 msgid "_Add"
 msgstr "ààààà(_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:785
+#: ../libedataserverui/e-name-selector-dialog.c:921
 msgid "_Remove"
 msgstr "àààà(_R)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:957
+#: ../libedataserverui/e-name-selector-dialog.c:1097
 #, c-format
 msgid "Error loading address book: %s"
 msgstr "àààààà àààà ààà ààà ààààà àààà: %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:3043
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "%s àààà 'à ààààà(_x)"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2838
+#: ../libedataserverui/e-name-selector-entry.c:3059
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s àààà ààà(_y)"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2848
+#: ../libedataserverui/e-name-selector-entry.c:3070
 #, c-format
 msgid "C_ut %s"
 msgstr "%s àààà(_U)"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2865
+#: ../libedataserverui/e-name-selector-entry.c:3088
 #, c-format
 msgid "_Edit %s"
 msgstr "%s ààà(_E)"
 
-#: ../libedataserverui/e-name-selector-list.c:524
+#: ../libedataserverui/e-name-selector-list.c:532
 #, c-format
 msgid "_Delete %s"
 msgstr "%s àààà(_D)"
@@ -5356,31 +5601,205 @@ msgstr "àà àààààà ààà àààà(_R)"
 msgid "_Remember this password for the remainder of this session"
 msgstr "àà ààààà àà àà àààààà ààà àààà(_R)"
 
-#. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:91
+#: ../libedataserverui/e-source-selector-dialog.c:224
+msgid "_Destination"
+msgstr "àààààà(_D)"
+
+#: ../libedataserverui/e-source-selector-dialog.c:326
 msgid "Select destination"
 msgstr "àààààà àààà"
 
-#: ../libedataserverui/e-source-selector-dialog.c:166
-msgid "_Destination"
-msgstr "àààààà(_D)"
+#: ../modules/google-backend/module-google-backend.c:118
+#: ../modules/yahoo-backend/module-yahoo-backend.c:200
+msgid "Calendar"
+msgstr "àààààà"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:184
+#, c-format
+#| msgid "Unexpected response from IMAP server: %s"
+msgid "Code: %u - Unexpected response from server"
+msgstr "ààà: %u - àààà ààà ààààà àààà"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:205
+#, c-format
+#| msgid "Failed to retrieve message"
+msgid "Failed to parse autodiscover response XML"
+msgstr "ààààààààà àààà XML àààà ààà àà ààààà"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:214
+#, c-format
+#| msgid "Failed to find system calendar"
+msgid "Failed to find Autodiscover element"
+msgstr "ààààààààà ààà àààà àà ààààà àà"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:226
+#, c-format
+#| msgid "Failed to find system calendar"
+msgid "Failed to find Response element"
+msgstr "àààà ààà àààà àà àààààà"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:238
+#, c-format
+#| msgid "Failed to find system calendar"
+msgid "Failed to find Account element"
+msgstr "àààààà ààààààà àààà àà ààààà"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:252
+#, c-format
+msgid "Failed to find ASUrl and OABUrl in autodiscover response"
+msgstr "ààààààààà àààà àààà ASUrl and OABUrl àààà àà ààààà"
+
+#: ../modules/yahoo-backend/module-yahoo-backend.c:215
+msgid "Tasks"
+msgstr "ààà"
 
-#: ../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 "àààà ààààà ààà ààà àà àààà ààààà àààà"
 
-#: ../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 "àààà ààà ààà ààààà àààààà àààà ààà àà ààà ààààà àààà"
 
+#: ../tests/libedataserverui/evolution-source-viewer.c:620
+msgid "Evolution Source Viewer"
+msgstr "ààààààà àààà àààà"
+
+#. Translators: The name that is displayed in the user interface
+#: ../tests/libedataserverui/evolution-source-viewer.c:650
+#| msgid "Family Name"
+msgid "Display Name"
+msgstr "àààààà àà ààà"
+
+#: ../tests/libedataserverui/evolution-source-viewer.c:659
+msgid "Flags"
+msgstr "àààà"
+
+#: ../tests/libedataserverui/evolution-source-viewer.c:711
+msgid "Identity"
+msgstr "àààà"
+
+#~ msgid "Authenticating with the serverâ"
+#~ msgstr "àààà àà àààààààààà àààààà ààâ"
+
+#~ msgid "%s: there was no source for UID '%s' stored in GConf."
+#~ msgstr "%s: àà-àààà àààà àààà àààà UID `%s' àà ààà àààà àààà ààà"
+
+#~ msgid "On This Computer"
+#~ msgstr "àà ààààààà àààà"
+
+#~ msgid "Invalid source"
+#~ msgstr "ààà àààà"
+
+#~ msgid "Incorrect uri '%s'"
+#~ msgstr "ààà uri '%s'"
+
+#~ msgid "Failed to find system book"
+#~ msgstr "ààààà àààà àààà àà ààààà àà"
+
+#~ msgid "There was no source for UID '%s' stored in a source list."
+#~ msgstr "àààà àààà àààà àààà àààà UID '%s' àà ààà àààà àààà ààà"
+
+#~ msgid "Cannot authenticate user: "
+#~ msgstr "ààààà ààààààà àààà àààà àà àààà: "
+
+#~ msgid "Empty URI"
+#~ msgstr "àààà URI"
+
+#~ msgid ""
+#~ "Enter password for address book %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr ""
+#~ "ààààà àààà %s (ààààà %s) àà àààààà ààà\n"
+#~ "àààà: %s"
+
+#~ msgid "Enter password for address book %s (user %s)"
+#~ msgstr "ààààà àààà %s (ààààà %s) àà àààààà ààà"
+
+#~ msgid "Enter password for %s (user %s)"
+#~ msgstr "%s àà àààààà ààà (ààààà %s)"
+
+#~ msgid "Enter password for %s to enable proxy for user %s"
+#~ msgstr "%s àà àààààà ààààà %s àà àààààà ààà ààà àà ààà"
+
+#~ msgid "Invalid source type"
+#~ msgstr "ààà àààà àààà"
+
+#~| msgid "Storing folder"
+#~ msgid "Updating %s folder"
+#~ msgstr "%s ààààà àààààà àààà àà àààà àà"
+
+#~ msgid "Connection to Server"
+#~ msgstr "àààà ààà àààààà ààà"
+
+#~ msgid "_Use custom command to connect to server"
+#~ msgstr "àààà ààà àààà àà ààààààà ààààà ààààà(_U)"
+
+#~ msgid "Co_mmand:"
+#~ msgstr "ààààà(_m):"
+
+#~ msgid "Command:"
+#~ msgstr "ààààà:"
+
+#~ msgid "Numbe_r of cached connections to use"
+#~ msgstr "àààà àà àààà àààà àà àààààààà àà ààààà(_r)"
+
+#~ msgid "Closing tmp stream failed: "
+#~ msgstr "ààààà ààààà ààà ààà àà ààààà: "
+
+#~ msgid "SMTP Authentication"
+#~ msgstr "SMTP àààààààààà"
+
+#~ msgid "Accessing LDAP Server anonymously"
+#~ msgstr "LDAP àààà ààà ààààà àà ààà 'àà ààààà"
+
+#~ msgid ""
+#~ "Enter password for calendar %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr ""
+#~ "àààààà %s (ààààà %s) àà àààààà ààà\n"
+#~ "àààà: %s"
+
+#~ msgid "Enter password for calendar %s (user %s)"
+#~ msgstr "àààààà %s (ààààà %s) àà àààààà ààà"
+
+#~ msgid ""
+#~ "Enter password for task list %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr ""
+#~ "àààà àààà %s (ààààà %s) àà àààààà ààà\n"
+#~ "àààà: %s"
+
+#~ msgid "Enter password for task list %s (user %s)"
+#~ msgstr "àààà àààà %s (ààààà %s) àà àààààà ààà"
+
+#~ msgid ""
+#~ "Enter password for memo list %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr ""
+#~ "àààà àààà %s (ààààà %s) àà àààààà ààà\n"
+#~ "àààà: %s"
+
+#~ msgid "Enter password for memo list %s (user %s)"
+#~ msgstr "àààà àààà %s (ààààà %s) àà àààààà ààà"
+
+#~ msgid "Enter Passphrase"
+#~ msgstr "àààà ààà"
+
+#~ msgid "Enter Password"
+#~ msgstr "àààààà ààà"
+
 #~ msgid "Invalid URI"
 #~ msgstr "ààà URI"
 
-#~ msgid "No backend factory for '%s' of '%s'"
-#~ msgstr "'%2$s' àààààà '%1$s' àà àààààà àààààà àààà àà"
-
 #~ msgid "Could not instantiate backend"
 #~ msgstr "àààààà ààààà àààà àààà àà àààà"
 
@@ -5506,12 +5925,6 @@ msgstr "àààà ààà ààà ààààà àààààà à
 #~ msgid "Loading items"
 #~ msgstr "àààààà ààà àààààà àà ààààà àà"
 
-#~ msgid "Calendar"
-#~ msgstr "àààààà"
-
-#~ msgid "Invalid server URI"
-#~ msgstr "ààà àààà URI"
-
 #~ msgid "Could not create thread for populating cache"
 #~ msgstr "ààààà ààààà ààà ààààà àààà àà àààà àà"
 
@@ -5648,9 +6061,6 @@ msgstr "àààà ààà ààà ààààà àààààà à
 #~ msgid "Could not send message: %s"
 #~ msgstr "àààààà àààà ààààà àà àààà : %s"
 
-#~ msgid "Operation cancelled"
-#~ msgstr "àààààà àààà"
-
 #~ msgid "_Apply filters to new messages in INBOX on this server"
 #~ msgstr "àà àààà àààà àà-àààà(INBOX) àààà àààà ààààààà àààà ààààà àààà(_A)"
 
@@ -5675,9 +6085,6 @@ msgstr "àààà ààà ààà ààààà àààààà à
 #~ msgid "Invalid response from server"
 #~ msgstr "àààà ààà ààà àààà"
 
-#~ msgid "No response from the server"
-#~ msgstr "àààà ààà ààà àààà àààà"
-
 #~ msgid "Bad parameter"
 #~ msgstr "ààà àààààààà"
 
@@ -6228,9 +6635,6 @@ msgstr "àààà ààà ààà ààààà àààààà à
 #~ msgid "Function not implemented in this storage"
 #~ msgstr "àà ààààààà àààà àààààà àààà àààà àààà àà"
 
-#~ msgid "Operation not supported"
-#~ msgstr "àààààà ààààà àààà àà"
-
 #~ msgid "The specified type is not supported in this storage"
 #~ msgstr "àà ààààààà àààà ààààà àààà ààààà àààà àà"
 
@@ -6279,9 +6683,6 @@ msgstr "àààà ààà ààà ààààà àààààà à
 #~ msgid "Sent Items"
 #~ msgstr "àààààà àààààà"
 
-#~ msgid "Tasks"
-#~ msgstr "ààà"
-
 #~ msgid "Evolution Addressbook file backend"
 #~ msgstr "ààààààà àààààà àààà àààà àààààà"
 
@@ -6459,6 +6860,3 @@ msgstr "àààà ààà ààà ààààà àààààà à
 
 #~ msgid "Select User"
 #~ msgstr "ààààà àààà"
-
-#~ msgid "Addressbook..."
-#~ msgstr "àààààà ààààà..."



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