[evolution-data-server] Assamese translation reviewed



commit 0c4d41bc7a7f98bc6440f00322473aaefd66a46b
Author: Nilamdyuti Goswami <nilamdyuti gmail com>
Date:   Thu Jun 14 20:05:38 2012 +0530

    Assamese translation reviewed

 po/as.po | 3772 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 1971 insertions(+), 1801 deletions(-)
---
diff --git a/po/as.po b/po/as.po
index b22a0c7..b1c2d94 100644
--- a/po/as.po
+++ b/po/as.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: as\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-06 13:21+0530\n"
+"POT-Creation-Date: 2012-06-14 11:48+0000\n"
+"PO-Revision-Date: 2012-06-14 19:57+0530\n"
 "Last-Translator: Nilamdyuti Goswami <ngoswami redhat com>\n"
 "Language-Team: as_IN <kde-i18n-doc kde org>\n"
 "MIME-Version: 1.0\n"
@@ -20,254 +20,210 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n!=1)\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:129
+#: ../addressbook/backends/file/e-book-backend-file.c:116
 #: ../addressbook/backends/webdav/e-book-backend-webdav.c:278
 #: ../addressbook/backends/webdav/e-book-backend-webdav.c:939
 #: ../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
+#: ../addressbook/libedata-book/e-data-book.c:432
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:566
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:596
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:615
+#: ../calendar/libecal/e-cal.c:4029 ../calendar/libecal/e-cal-client.c:148
+#: ../camel/camel-imapx-command.c:594
+#: ../camel/providers/imap/camel-imap-command.c:521
 #: ../camel/providers/imap/camel-imap-store.c:464
-#: ../camel/providers/imapx/camel-imapx-command.c:538
-#: ../libedataserver/e-client.c:164
+#: ../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
 #, 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 "à'à ààà àà àààâ"
+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 à àààà àààààà ààààààà àààààà àààààà"
+msgstr "ààà ààààà ààà %s à àààà àààààà àààààà àààààà àààààà"
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:874
+#: ../addressbook/backends/google/e-book-backend-google.c:879
 msgid "Querying for updated contactsâ"
-msgstr "àààààààà àààààààààà àààà àààààà ààà àà ààà..."
+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
+#: ../addressbook/backends/google/e-book-backend-google.c:928
 msgid "Personal"
 msgstr "ààààààààà"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:925
+#. System Group: My Contacts
+#: ../addressbook/backends/google/e-book-backend-google.c:929
 msgid "Friends"
 msgstr "àààààààà"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:927
+#. System Group: Friends
+#: ../addressbook/backends/google/e-book-backend-google.c:930
 msgid "Family"
 msgstr "àààààà"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:929
+#. System Group: Family
+#: ../addressbook/backends/google/e-book-backend-google.c:931
 msgid "Coworkers"
 msgstr "ààààààà"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1019
+#: ../addressbook/backends/google/e-book-backend-google.c:1071
 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:1495
+#: ../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:1522
 msgid "Creating new contactâ"
-msgstr "àààà ààààà àààààà ààà àà àààâ"
+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:1611
+#: ../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:1639
 msgid "Deleting contactâ"
-msgstr "ààààà ààà àààààà àà àààâ"
+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:1889
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2312
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:367
 #: ../addressbook/backends/webdav/e-book-backend-webdav.c:487
 msgid "The backend does not support bulk modifications"
 msgstr "àààààààà àààà àààààààà àààààà àààà"
 
 #. Update the contact on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1851
+#: ../addressbook/backends/google/e-book-backend-google.c:1922
 msgid "Modifying contactâ"
-msgstr "ààààà àààà ààà àà àààâ"
+msgstr "ààààà àààà ààà ààààâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2058
+#: ../addressbook/backends/google/e-book-backend-google.c:2130
 msgid "Loadingâ"
-msgstr "à'à ààà àà àààâ"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:2187
-msgid "Authenticating with the serverâ"
-msgstr "àààààààà àààà àààààààààà ààà àà àààâ"
+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 "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:1090
 msgid "Reconnecting to LDAP server..."
-msgstr "LDAP àààààààà àààà àààààà ààààà ààà àààà..."
+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: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: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:4736
 msgid "Receiving LDAP search results..."
-msgstr "LDAP'à ààààààà ààààà ààààààà ààà àààà..."
+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)... "
+msgstr "ààààààààà ààààà'à ààà àààà (%d)... "
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5567
+#, c-format
+msgid "Failed to get the DN for user '%s'"
+msgstr "ààààààààààà '%s' à àààà DN ààààààà àààààà àààààà"
 
 #: ../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
-#, c-format
-msgid "%s: there was no source for UID '%s' stored in GConf."
-msgstr "%s: UID`%s'à àààà àààà ààà GConf  à àààààààà àààààà"
-
-#: ../addressbook/libebook/e-book.c:3514 ../calendar/libecal/e-cal.c:1360
-#: ../libedataserver/e-client.c:1913
-msgid "On This Computer"
-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/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 ààààààà ààààààà"
+msgstr "ààààà ID àààààààà ààààààà"
 
 #: ../addressbook/libebook/e-book-client.c:101
 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:2280
+#: ../calendar/libecal/e-cal-client.c:4616
 msgid "Cannot get connection to view"
 msgstr "àààààà àààà ààààà àààà ààààà"
 
@@ -277,1273 +233,1296 @@ 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
+#: ../addressbook/libebook/e-contact.c:128
 msgid "Book URI"
-msgstr "àààà URI"
+msgstr "àààààà URI"
 
 #. 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 "ààààààààà àààààà ààààà"
+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 "àààààà ààààààààààà àààà"
 
-#: ../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 "àààààààààààà ààà"
+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 "ààà ààà à"
 
-#: ../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 "ààààà ààà"
+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"
+msgstr "ààààààààà URL"
 
-#: ../addressbook/libebook/e-contact.c:183
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Weblog URL"
-msgstr "ààààà'à 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 "ààààà"
+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"
+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 ààààààààà àààààà ààà à"
+msgstr "AIM àààà àààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:205
 msgid "AIM Work Screen Name 2"
-msgstr "AIM ààààààààà àààààà ààà à"
+msgstr "AIM àààà àààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:206
 msgid "AIM Work Screen Name 3"
-msgstr "AIM ààààààààà àààààà ààà à"
+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 "àààààààà ààààààààà àààààà ààà à"
+msgstr "àààààààà àààà àààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:211
 msgid "GroupWise Work Screen Name 2"
-msgstr "àààààààà ààààààààà àààààà ààà à"
+msgstr "àààààààà àààà àààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:212
 msgid "GroupWise Work Screen Name 3"
-msgstr "àààààààà ààààààààà àààààà ààà à"
+msgstr "àààààààà àààà àààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Jabber Home ID 1"
 msgstr "Jabber àà ID à"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Jabber Home ID 2"
 msgstr "Jabber àà ID à"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:215
 msgid "Jabber Home ID 3"
 msgstr "Jabber àà ID à"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:216
 msgid "Jabber Work ID 1"
 msgstr "Jabber àààà ID à"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Jabber Work ID 2"
 msgstr "Jabber àààà ID à"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:218
 msgid "Jabber Work ID 3"
 msgstr "Jabber àààà ID à"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:219
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo! ààà àààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:220
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo! ààà àààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:221
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo! ààà àààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:222
 msgid "Yahoo! Work Screen Name 1"
-msgstr "Yahoo! ààààààààà àààààà ààà à"
+msgstr "Yahoo! àààà àààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:223
 msgid "Yahoo! Work Screen Name 2"
-msgstr "Yahoo! ààààààààà àààààà ààà à"
+msgstr "Yahoo! àààà àààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:224
 msgid "Yahoo! Work Screen Name 3"
-msgstr "Yahoo! ààààààààà àààààà ààà à"
+msgstr "Yahoo! àààà àààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:225
 msgid "MSN Home Screen Name 1"
 msgstr "MSN ààà àààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:226
 msgid "MSN Home Screen Name 2"
 msgstr "MSN ààà àààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:225
+#: ../addressbook/libebook/e-contact.c:227
 msgid "MSN Home Screen Name 3"
 msgstr "MSN ààà àààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:226
+#: ../addressbook/libebook/e-contact.c:228
 msgid "MSN Work Screen Name 1"
-msgstr "MSN ààààààààà àààààà ààà à"
+msgstr "MSN àààà àààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:229
 msgid "MSN Work Screen Name 2"
-msgstr "MSN ààààààààà àààààà ààà à"
+msgstr "MSN àààà àààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:230
 msgid "MSN Work Screen Name 3"
-msgstr "MSN ààààààààà àààààà ààà à"
+msgstr "MSN àààà àààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook/e-contact.c:231
 msgid "ICQ Home ID 1"
 msgstr "ICQ àà ID à"
 
-#: ../addressbook/libebook/e-contact.c:230
+#: ../addressbook/libebook/e-contact.c:232
 msgid "ICQ Home ID 2"
 msgstr "ICQ àà ID à"
 
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook/e-contact.c:233
 msgid "ICQ Home ID 3"
 msgstr "ICQ àà ID à"
 
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:234
 msgid "ICQ Work ID 1"
 msgstr "ICQ àààà ID à"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:235
 msgid "ICQ Work ID 2"
 msgstr "ICQ àààà ID à"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:236
 msgid "ICQ Work ID 3"
 msgstr "ICQ àààà 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 "ààààààààà ààààà"
+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 "ààààààààààà"
+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! ààààà àààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:261
+#: ../addressbook/libebook/e-contact.c:268
 msgid "MSN Screen Name List"
 msgstr "MSN ààààà àààà àààààà"
 
-#: ../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 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 ààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:289
+#: ../addressbook/libebook/e-contact.c:303
 msgid "Skype Home Name 2"
 msgstr "Skype ààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:290
+#: ../addressbook/libebook/e-contact.c:304
 msgid "Skype Home Name 3"
 msgstr "Skype ààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:291
+#: ../addressbook/libebook/e-contact.c:305
 msgid "Skype Work Name 1"
-msgstr "Skype ààààààààà àààààààà ààà à"
+msgstr "Skype àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:292
+#: ../addressbook/libebook/e-contact.c:306
 msgid "Skype Work Name 2"
-msgstr "Skype ààààààààà àààààààà ààà à"
+msgstr "Skype àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:293
+#: ../addressbook/libebook/e-contact.c:307
 msgid "Skype Work Name 3"
-msgstr "Skype ààààààààà àààààààà ààà à"
+msgstr "Skype àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:294
+#: ../addressbook/libebook/e-contact.c:308
 msgid "Skype Name List"
-msgstr "Skype ààààààà àààà àààààà"
+msgstr "Skype àààà àààààà"
 
-#: ../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 "Google Talk àà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:299
+#: ../addressbook/libebook/e-contact.c:313
 msgid "Google Talk Home Name 2"
 msgstr "Google Talk àà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:300
+#: ../addressbook/libebook/e-contact.c:314
 msgid "Google Talk Home Name 3"
 msgstr "Google Talk àà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:301
+#: ../addressbook/libebook/e-contact.c:315
 msgid "Google Talk Work Name 1"
 msgstr "Google Talk àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:302
+#: ../addressbook/libebook/e-contact.c:316
 msgid "Google Talk Work Name 2"
 msgstr "Google Talk àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:303
+#: ../addressbook/libebook/e-contact.c:317
 msgid "Google Talk Work Name 3"
 msgstr "Google Talk àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:304
+#: ../addressbook/libebook/e-contact.c:318
 msgid "Google Talk Name List"
 msgstr "Google Talk ààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:1597
-#: ../addressbook/libebook/e-destination.c:878
+#: ../addressbook/libebook/e-contact.c:320
+msgid "Twitter Name List"
+msgstr "Twitter àààà àààààà"
+
+#: ../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' à ààà àààà àààà àààààà "
+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:3997 ../calendar/libedata-cal/e-data-cal.c:416
+#: ../libedataserver/e-client.c:122
 msgid "Backend is busy"
-msgstr "ààààà-àààà àààààààà àààààà"
+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:4011 ../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 "àààààààààà ààààààà ààààààà ààà"
+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 "ààààààà àààà àààààààà ààààààà àààààààààà àààà"
+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 "ààààààà àààà àààà àààààààààà àààà"
+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 "àààààà àààààààààààà"
+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 "àààààààà ààààààà ààà ààà"
+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:3995 ../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:4034 ../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 "ààààà ààààà àààà àààà àààààà: "
+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 "ààààà àààààà ààààààà àààà àààààà:  "
+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àààà ààààààà àààà àààààà: "
+msgstr "ààààà àààààà uids ààààààà àààà àààààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1100
+#: ../addressbook/libedata-book/e-data-book.c:1066
 msgid "Cannot remove contacts: "
-msgstr "ààààààààà ààààà àààààà:  "
+msgstr "ààààààààà ààààà àààààà: "
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:103
+#: ../calendar/libedata-cal/e-data-cal-factory.c:114
+#, c-format
+msgid "No backend name in source '%s'"
+msgstr "ààà '%s' à àààà ààààààà ààà ààà"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:115
+#: ../calendar/libedata-cal/e-data-cal-factory.c:127
+#, c-format
+msgid "Invalid backend name '%s' in source '%s'"
+msgstr "ààà '%s' à àààà ààààààà ààà '%s'"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:319
+#: ../calendar/libedata-cal/e-data-cal-factory.c:230
+msgid "Missing source UID"
+msgstr "ààààààààà ààà UID"
 
-#: ../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:332
+#: ../calendar/libedata-cal/e-data-cal-factory.c:243
 #, c-format
-msgid "Empty URI"
-msgstr "URI ààààà ààà"
+msgid "No such source for UID '%s'"
+msgstr "UID '%s' à àààà ààààààà àààà ààà ààà"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:546
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:564
 #, 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:594
+#, c-format
+msgid "Failed to connect to a server using SSL: %s"
+msgstr "SSL ààààààà ààà ààà àààààààà àààà ààààà àààààà àààààà: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:599
+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:612
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
-msgstr "ààààààààààà HTTP àààààà ààà %d ààààà àààà àààà (%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:2302
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2672
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
 "Error message: %s"
 msgstr ""
-"ààààààà ààààààà àààà àààààà, ààààààààà àààà-àààà àààà ààààààà àààà àààà\n"
+"ààààààà ààààààà àààà àààààà, ààààààààà àààà-àààà ààà ààààààà àààà àààà\n"
 "àààààà àààààà: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4482
-msgid "Calendar doesn't support Free/Busy"
-msgstr "ààààààààà ààààà/àààààà àààààà àààà"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3668
+msgid "CalDAV does not support bulk additions"
+msgstr "CalDAV à àààà àààààà àààààà àààà"
 
-#: ../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:3770
+msgid "CalDAV does not support bulk modifications"
+msgstr "CalDAV à àààà àààààààà àààààà àààà"
 
-#: ../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:3938
+msgid "CalDAV does not support bulk removals"
+msgstr "CalDAV à àààà àààààà àààààà àààà"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4597
+msgid "Calendar doesn't support Free/Busy"
+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:480
+#, c-format
+msgid "Malformed URI: %s"
+msgstr "ààààààààààà URI: %s"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:541
+#, 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:578
+#, c-format
 msgid "Bad file format."
 msgstr "àààààààà ààààààà àààà àààà"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:454
+#: ../calendar/backends/http/e-cal-backend-http.c:588
+#, 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:933
+#: ../calendar/backends/http/e-cal-backend-http.c:937
+#: ../calendar/backends/weather/e-cal-backend-weather.c:523
 msgid "Could not create cache file"
-msgstr "ààààà ààààààà ààààààà àààààà àààààà"
+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 "ààà: àààààààà àààà"
+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:429
 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:3999
 msgid "Repository is offline"
 msgstr "ààààà àààààààà àà-àààà ààààààà ààà"
 
-#: ../calendar/libecal/e-cal.c:4568 ../calendar/libecal/e-cal-client.c:137
+#: ../calendar/libecal/e-cal.c:4001 ../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:4003 ../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:4005 ../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:4007
 msgid "URI not loaded"
 msgstr "URI àààààààà à'à ààà ààà"
 
-#: ../calendar/libecal/e-cal.c:4576
+#: ../calendar/libecal/e-cal.c:4009
 msgid "URI already loaded"
 msgstr "URI àààààà à'à ààà àààà"
 
-#: ../calendar/libecal/e-cal.c:4580
+#: ../calendar/libecal/e-cal.c:4013
 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:4015 ../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:4017
 msgid "Protocol not supported"
 msgstr "àààààààà ààààààà"
 
-#: ../calendar/libecal/e-cal.c:4586
+#: ../calendar/libecal/e-cal.c:4019
 msgid "Operation has been canceled"
 msgstr "àààà ààààà ààà àààà"
 
-#: ../calendar/libecal/e-cal.c:4588
+#: ../calendar/libecal/e-cal.c:4021
 msgid "Could not cancel operation"
 msgstr "àààà ààààà àààààà àààààà"
 
-#: ../calendar/libecal/e-cal.c:4590 ../libedataserver/e-client.c:129
+#: ../calendar/libecal/e-cal.c:4023 ../libedataserver/e-client.c:128
 msgid "Authentication failed"
-msgstr "àààààààààà àààà"
+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:4025
+#: ../camel/providers/smtp/camel-smtp-transport.c:845
+#: ../libedataserver/e-client.c:130
 msgid "Authentication required"
 msgstr "àààààààààà àààààà"
 
-#: ../calendar/libecal/e-cal.c:4594
+#: ../calendar/libecal/e-cal.c:4027
 msgid "A D-Bus exception has occurred"
 msgstr "ààà D-Bus ààààààààà àààà àààà"
 
-#: ../calendar/libecal/e-cal.c:4598
+#: ../calendar/libecal/e-cal.c:4031
 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:3980
 msgid "1st"
 msgstr "à-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3982
+#: ../calendar/libecal/e-cal-recur.c:3981
 msgid "2nd"
 msgstr "à-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3983
+#: ../calendar/libecal/e-cal-recur.c:3982
 msgid "3rd"
 msgstr "à-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3984
+#: ../calendar/libecal/e-cal-recur.c:3983
 msgid "4th"
 msgstr "à-ààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3985
+#: ../calendar/libecal/e-cal-recur.c:3984
 msgid "5th"
 msgstr "à-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3986
+#: ../calendar/libecal/e-cal-recur.c:3985
 msgid "6th"
 msgstr "à-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "7th"
 msgstr "à-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "8th"
 msgstr "à-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "9th"
 msgstr "à-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "10th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "11th"
-msgstr "àà-à"
+msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "12th"
-msgstr "àà-à"
+msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "13th"
-msgstr "àà-à"
+msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "14th"
-msgstr "àà-à"
+msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "15th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "16th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "17th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "18th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "19th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "20th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "21st"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "22nd"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "23rd"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "24th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "25th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "26th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "27th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "28th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "29th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:4010
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "30th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:4011
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "31st"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-util.c:691 ../calendar/libecal/e-cal-util.c:718
+#: ../calendar/libecal/e-cal-util.c:693 ../calendar/libecal/e-cal-util.c:720
 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:695 ../calendar/libecal/e-cal-util.c:722
 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:697 ../calendar/libecal/e-cal-util.c:724
 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:718
 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'"
+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\"-à àààà àààà ààààààààà àààà"
+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\" -à ààà àààà ààààààààà ààà"
+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\"à ààààà àààà ààààààà àààà àààààààààà"
+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 ààààà/ààà ààààààà àààà àààààààààà"
+msgstr "\"%s\" à ààààà àààà ààà ISO 8601 ààààà/ààà ààààààà àààà àààààààààà"
 
-#: ../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\" àà àààà àààà àààààààààà"
+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 àààà àààààààààà"
+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\"à ààààààà àààà ààààààààààà àààà àààààààààà"
+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 àààà àààààààààà"
+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\" à àààà ààà àà àààà àààà ààààààààà ààà"
+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\"à ààààààà àààà ààààààà àààà àààààààààà"
+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 "
@@ -1554,110 +1533,114 @@ 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\"-à ààààà ààà àààà ààààààààà ààà"
+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 "
 "be a boolean false (#f)"
 msgstr ""
-"\"%s\"à àààà àààà ààààààà àààà àààà ààà ààà àààà ààààààà false (#f) àààà ààààààààà "
+"\"%s\" à àààà àààà ààààààà àààà àààà ààà ààà àààà ààààààà false (#f) àààà ààààààààà "
 "ààà"
 
-#: ../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àààà àààààà àààà àààààà: "
+msgstr "ààààààààà uris àààààà àààà àààààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1372
+#: ../calendar/libedata-cal/e-data-cal.c:1345
 msgid "Could not discard reminder: "
 msgstr "àààààààààà ààààà àààààà: "
 
 #. 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 "àààà àà"
@@ -1685,34 +1668,34 @@ msgstr "àà àààààà àààààà ààààààààà
 #: ../camel/camel-cipher-context.c:262
 #, c-format
 msgid "You may not import keys with this cipher"
-msgstr "àà àààààà àààààà àààà àààààà ààà ààààà"
+msgstr "àà àààààà àààààà àà ààààààà ààà ààààà"
 
 #: ../camel/camel-cipher-context.c:276
 #, c-format
 msgid "You may not export keys with this cipher"
-msgstr "àà àààààà àààààà àààà ààààààààà ààà ààààà"
+msgstr "àà àààààà àààààà àà ààààààààà ààà ààààà"
 
-#: ../camel/camel-cipher-context.c:805
+#: ../camel/camel-cipher-context.c:817
 msgid "Signing message"
-msgstr "àààààà àààààààà ààààààà"
+msgstr "àààààà àààààààà ààà"
 
-#: ../camel/camel-cipher-context.c:1046
+#: ../camel/camel-cipher-context.c:1058
 msgid "Encrypting message"
-msgstr "àààààà ààààààààà ààààààà"
+msgstr "àààààà ààààààààà ààà"
 
-#: ../camel/camel-cipher-context.c:1173
+#: ../camel/camel-cipher-context.c:1185
 msgid "Decrypting message"
-msgstr "àààààà ààààààààà ààààààà"
+msgstr "àààààà ààààààààà ààà"
 
 #: ../camel/camel-data-cache.c:181
 #, c-format
 msgid "Unable to create cache path"
-msgstr "ààààà àà ààààààà àààààà àààààà"
+msgstr "ààààà àà àààààà àààààà ààààà"
 
 #: ../camel/camel-data-cache.c:507
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
-msgstr "ààààà ààààààà ààààààà ààààà: %s: %s"
+msgstr "ààààà ààààààààà ààààààà ààààà: %s: %s"
 
 #: ../camel/camel-disco-diary.c:201
 #, c-format
@@ -1721,9 +1704,9 @@ msgid ""
 "Further operations on this server will not be replayed when you\n"
 "reconnect to the network."
 msgstr ""
-"ààà ààààààà ààààààà àààààà: %s\n"
+"ààà ààààààààà ààààààà àààààà: %s\n"
 "ààààààààà àààà ààààà àààà àààà àà àààààààà ààà \n"
-"àààààààà àààà àààààà ààà àà'à à"
+"àààààààà àààà àààà ààà àà'àà"
 
 #: ../camel/camel-disco-diary.c:266
 #: ../camel/providers/imap/camel-imap-journal.c:309
@@ -1733,9 +1716,9 @@ msgid ""
 "%s\n"
 "Changes made to this folder will not be resynchronized."
 msgstr ""
-"'%s' ààààà àààààà:\n"
+"'%s' ààààààà àààààà:\n"
 "%s\n"
-"àà àààààààà ààà àààààààà àààààà àààà ààààààà ààà àààà"
+"àà ààààààà àààààà ààà àààààààà àààà ààààààà ààà àààà"
 
 #: ../camel/camel-disco-diary.c:310
 msgid "Resynchronizing with server"
@@ -1750,34 +1733,27 @@ msgstr "àà-àààà ààààààà àààààààà à
 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:482 ../camel/camel-offline-folder.c:329
 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
+msgstr "àà-àààà ààààà àààà àààààààà ààà ààààààààààà ààà ààà (_o)"
+
+#: ../camel/camel-disco-store.c:466 ../camel/camel-imapx-folder.c:410
+#: ../camel/camel-imapx-folder.c:443 ../camel/camel-imapx-folder.c:479
+#: ../camel/camel-imapx-folder.c:535 ../camel/camel-imapx-folder.c:611
+#: ../camel/camel-imapx-folder.c:645 ../camel/camel-imapx-folder.c:685
+#: ../camel/camel-imapx-folder.c:721 ../camel/camel-imapx-store.c:273
+#: ../camel/camel-imapx-store.c:1363 ../camel/camel-imapx-store.c:1451
+#: ../camel/camel-imapx-store.c:1497
+#: ../camel/providers/imap/camel-imap-store.c:1246
+#: ../camel/providers/imap/camel-imap-store.c:2002
+#: ../camel/providers/imap/camel-imap-store.c:2469
+#: ../camel/providers/imap/camel-imap-store.c:3219
 #: ../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/providers/pop3/camel-pop3-store.c:394
+#: ../camel/providers/pop3/camel-pop3-store.c:807
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "àà àààà àààààà àààà àààà àà-àààà ààààààà ààà àààààà"
@@ -1790,12 +1766,12 @@ msgstr "ààààà ààà àààà"
 #: ../camel/camel-filter-driver.c:895 ../camel/camel-filter-search.c:762
 #, c-format
 msgid "Failed to create child process '%s': %s"
-msgstr "àààààà ààààààààà '%s' ààààààà àààààà àààààà: %s"
+msgstr "àààààà ààààààààà '%s' àààààà àààààà àààààà: %s"
 
 #: ../camel/camel-filter-driver.c:943
 #, c-format
 msgid "Invalid message stream received from %s: %s"
-msgstr "%sà ààà àààà àààààà ààààà ààààààà àààà: %s"
+msgstr "%s à ààà àààà àààààà ààààà ààààààà àààà: %s"
 
 #: ../camel/camel-filter-driver.c:1139 ../camel/camel-filter-driver.c:1146
 msgid "Syncing folders"
@@ -1842,77 +1818,76 @@ msgstr "àààààà"
 #: ../camel/camel-filter-driver.c:1485
 #, c-format
 msgid "Getting message %d of %d"
-msgstr "àààààà %d ààààààà ààà àààà, ààà %d à"
+msgstr " %d à %d àààààà ààààààà ààà àààà"
 
 #: ../camel/camel-filter-driver.c:1503
 #, c-format
 msgid "Failed at message %d of %d"
-msgstr "%d àààààà àààààà, ààà %d à"
+msgstr "%d à %d ààààààà àààààà"
 
 #: ../camel/camel-filter-search.c:138
 msgid "Failed to retrieve message"
-msgstr "àààààà àààà àààààà àààààà"
+msgstr "àààààà àààààà àààààà àààààà"
 
 #: ../camel/camel-filter-search.c:512
 msgid "Invalid arguments to (system-flag)"
-msgstr "àààà àààà ààààààà àààà (system-flag)"
+msgstr "(system-flag) àà àààà àààààààà"
 
 #: ../camel/camel-filter-search.c:530
 msgid "Invalid arguments to (user-tag)"
-msgstr "àààà àààà ààààààà àààà (user-tag)"
+msgstr "(user-tag) àà àààà àààààààà"
 
 #: ../camel/camel-filter-search.c:939 ../camel/camel-filter-search.c:948
 #, 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'  à àààà ààààà àààààààààà àààà àà ààà"
+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'  à àààà ààà àààààààààà àààà àà ààà"
+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' à àààà àààààààààà ààààààààà ààà àà ààà"
+msgstr[0] "'%s' ' à àààà àààààà ààààààààà ààà àààà"
+msgstr[1] "'%s' à àààà àààààààààà ààààààààà ààà àààà"
 
-#: ../camel/camel-folder.c:918
+#: ../camel/camel-folder.c:930
 #: ../camel/providers/local/camel-maildir-folder.c:322
 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:3586
 #, c-format
 msgid "Retrieving message '%s' in %s"
-msgstr "'%s' à  '%s'  à àààà àààààà àààààà ààà àà ààà"
+msgstr "'%s' à '%s' à àààà àààààà àààààà ààà àààà"
 
-#: ../camel/camel-folder.c:3698
+#: ../camel/camel-folder.c:3735
 #, c-format
 msgid "Retrieving quota information for '%s'"
-msgstr "'%s' à àààà àààà àààà àààààà ààà àà ààà"
+msgstr "'%s' à àààà àààà àààà àààààà ààà àààà"
 
-#: ../camel/camel-folder-search.c:365 ../camel/camel-folder-search.c:479
-#: ../camel/camel-folder-search.c:664
+#: ../camel/camel-folder-search.c:414 ../camel/camel-folder-search.c:575
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1921,8 +1896,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:426 ../camel/camel-folder-search.c:587
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1932,34 +1906,34 @@ 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:800 ../camel/camel-folder-search.c:843
 #, c-format
 msgid "(%s) requires a single bool result"
-msgstr "(%s)à àààààààà ààà ààààààà ààààà àààààà"
+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:904
 #, c-format
 msgid "(%s) not allowed inside %s"
-msgstr "(%s), %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:911 ../camel/camel-folder-search.c:919
 #, c-format
 msgid "(%s) requires a match type string"
-msgstr "(%s) ààà ààà àààààààà ààààààà àààààà"
+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:947
 #, c-format
 msgid "(%s) expects an array result"
-msgstr "(%s)-à ààà àààààà ààààà àààààààààà"
+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:957
 #, c-format
 msgid "(%s) requires the folder set"
-msgstr "(%s) ààààààà ààààà àààààà"
+msgstr "(%s) à ààààààà àààààà ààààààà"
 
 #: ../camel/camel-gpg-context.c:663 ../camel/camel-gpg-context.c:668
 #: ../camel/camel-gpg-context.c:1327
@@ -1968,7 +1942,7 @@ 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:848
 msgid "Unknown"
 msgstr "âàààààà"
 
@@ -1986,12 +1960,12 @@ msgstr ""
 #: ../camel/camel-gpg-context.c:769
 #, c-format
 msgid "Failed to parse gpg userid hint."
-msgstr "gpg userid'à ààààà àààààààà àààààà ààààààà"
+msgstr "gpg userid à ààààà àààààààà àààààà ààààààà"
 
 #: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:809
 #, c-format
 msgid "Failed to parse gpg passphrase request."
-msgstr "gpg passphrase'à àààààà àààààààà àààààà àààààà"
+msgstr "gpg àààààààààà àààààà àààààààà àààààà àààààà"
 
 #: ../camel/camel-gpg-context.c:830
 #, c-format
@@ -1999,7 +1973,7 @@ msgid ""
 "You need a PIN to unlock the key for your\n"
 "SmartCard: \"%s\""
 msgstr ""
-"ààààà ààààààà-ààààà àààà àààà àààà ààà PIN\n"
+"àààààà ààààààà-ààààà àààà àààà àààà ààà PIN\n"
 "àààààà: \"%s\""
 
 #: ../camel/camel-gpg-context.c:834
@@ -2008,26 +1982,26 @@ msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
-"ààààààà àààààààààààà àà àààà àààà àààà àààààààà\n"
+"ààààààà àààààààààààà àà àààà àààà àààà ààààààààà\n"
 "àààààà ààà àààààà: \"%s\""
 
 #: ../camel/camel-gpg-context.c:840
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
-msgstr "'%s'à àààà GnuPG àààà ààààààààààà àààààà"
+msgstr "'%s à àààà GnuPG ààà ààààààààààà àààààà"
 
 #: ../camel/camel-gpg-context.c:850
 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-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
+#: ../libedataserver/e-client.c:140
 #, c-format
 msgid "Cancelled"
 msgstr "ààààà ààà àààà"
@@ -2035,17 +2009,17 @@ msgstr "ààààà ààà àààà"
 #: ../camel/camel-gpg-context.c:900
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr "àààà-àà àààà àààààà àààààà: à-ààà ààà àààààààà àààà ààààà"
+msgstr "àààà-àà àààà àààààà àààààà: à-ààà ààà àààààààà àààà ààààà"
 
 #: ../camel/camel-gpg-context.c:913
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
-msgstr "GnuPGà ààà ààààààààààà ààààààààààà: %s"
+msgstr "GnuPG à ààà ààààààààààà ààààààààààà: %s"
 
 #: ../camel/camel-gpg-context.c:1044
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
-msgstr "ààààààààà àààààà àààààà: ààà àààààà àààààà ààà àààà àààà"
+msgstr "ààààààààà àààààà àààààà: ààà àààààà àààààà ààà àààà àààà"
 
 #: ../camel/camel-gpg-context.c:1591 ../camel/camel-smime-context.c:831
 msgid "Could not generate signing data: "
@@ -2062,64 +2036,331 @@ msgstr "gpg ààààààà àààààà ààààààà"
 #: ../camel/camel-smime-context.c:957 ../camel/camel-smime-context.c:971
 #: ../camel/camel-smime-context.c:980
 #, c-format
-msgid "Cannot verify message signature: Incorrect message format"
-msgstr "ààààààà àààààààà ààààààà àààààà àààààà: ààààààà ààààààà àààà ààà"
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr "ààààààà àààààààà ààààààà àààààà àààààà: ààààààà ààààààà àààà ààà"
+
+#: ../camel/camel-gpg-context.c:1797
+msgid "Cannot verify message signature: "
+msgstr "àààààà àààààààà ààà àààà àààààà àààà àààààà: "
+
+#: ../camel/camel-gpg-context.c:1920
+msgid "Could not generate encrypting data: "
+msgstr "ààààààààààà àààà àààà àààà àààààà: "
+
+#: ../camel/camel-gpg-context.c:1973
+msgid "This is a digitally encrypted message part"
+msgstr "àààà àààààà àààà ààààààààà ààà ààààààà ààà"
+
+#: ../camel/camel-gpg-context.c:2031 ../camel/camel-gpg-context.c:2040
+#: ../camel/camel-gpg-context.c:2063
+#, c-format
+msgid "Cannot decrypt message: Incorrect message format"
+msgstr "àààààà ààààààààà àààààà àààààà: ààààààà ààààààà àààà ààà"
+
+#: ../camel/camel-gpg-context.c:2051
+#, c-format
+msgid "Failed to decrypt MIME part: protocol error"
+msgstr "MIME à ààà ààààààààà àààààà àààààà: ààààààà àààà àààààà"
+
+#: ../camel/camel-gpg-context.c:2142 ../camel/camel-smime-context.c:1268
+msgid "Encrypted content"
+msgstr "ààààààààà ààà ààà"
+
+#: ../camel/camel-imapx-folder.c:101
+#, c-format
+msgid "Could not create folder summary for %s"
+msgstr "%s à àààà ààààààà àààààà àààààà àààà àààààà"
+
+#: ../camel/camel-imapx-folder.c:109
+#, c-format
+msgid "Could not create cache for %s: "
+msgstr "%s à àààà ààààà àààààà àààà àààààà: "
+
+#: ../camel/camel-imapx-folder.c:791
+#: ../camel/providers/imap/camel-imap-folder.c:359
+#: ../camel/providers/nntp/camel-nntp-folder.c:731
+msgid "Apply message _filters to this folder"
+msgstr "àà àààààààà àààààà ààààààààààààà àààààà ààà (_f)"
+
+#: ../camel/camel-imapx-server.c:855
+msgid "Server disconnected"
+msgstr "ààààààà ààààààààààà"
+
+#: ../camel/camel-imapx-server.c:1264
+msgid "Error writing to cache stream: "
+msgstr "ààààà ààààààà àààààà àààààà:"
+
+#: ../camel/camel-imapx-server.c:1997
+#, c-format
+msgid "Not authenticated"
+msgstr "àààààààà ààà"
+
+#: ../camel/camel-imapx-server.c:2066
+msgid "Error performing IDLE"
+msgstr "IDLE ààààààà ààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:2910
+#: ../camel/providers/imap/camel-imap-store.c:409
+#: ../camel/providers/imap/camel-imap-store.c:463
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "àààààààà ààààààà IMAP ààààààà %s à àààà ààààà àààààà àààààà: %s"
+
+#: ../camel/camel-imapx-server.c:2911
+#: ../camel/providers/imap/camel-imap-store.c:410
+#: ../camel/providers/smtp/camel-smtp-transport.c:197
+msgid "STARTTLS not supported"
+msgstr "STARTTLS ààààààà ààà"
+
+#: ../camel/camel-imapx-server.c:2950
+#: ../camel/providers/imap/camel-imap-store.c:435
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: "
+msgstr "IMAP ààààààà %s àà àààààààà ààààààà ààààà àààààà àààààà: "
+
+#: ../camel/camel-imapx-server.c:3017
+#: ../camel/providers/imap/camel-imap-store.c:734
+#, c-format
+msgid "IMAP server %s does not support %s authentication"
+msgstr "IMAP ààààààà %s à %s àààààààààà àààààà àààà"
+
+#: ../camel/camel-imapx-server.c:3028 ../camel/camel-session.c:483
+#: ../camel/providers/imap/camel-imap-store.c:1150
+#: ../camel/providers/pop3/camel-pop3-store.c:249
+#: ../camel/providers/pop3/camel-pop3-store.c:568
+#: ../camel/providers/smtp/camel-smtp-transport.c:458
+#, c-format
+msgid "No support for %s authentication"
+msgstr "%s àààààààààà àààà àààà àààààà ààà"
+
+#: ../camel/camel-imapx-server.c:3047
+#: ../camel/providers/imap/camel-imap-store.c:1118
+#: ../camel/providers/nntp/camel-nntp-store.c:494
+msgid "Cannot authenticate without a username"
+msgstr "ààà ààààààààààà àààà àààààà àààààààà àààà àààààà"
+
+#: ../camel/camel-imapx-server.c:3056
+#: ../camel/providers/imap/camel-imap-store.c:1126
+#: ../camel/providers/nntp/camel-nntp-store.c:503
+#: ../camel/providers/pop3/camel-pop3-store.c:493
+#: ../camel/providers/pop3/camel-pop3-store.c:513
+msgid "Authentication password not available"
+msgstr "àààààààààà àààààààà àààààà ààà"
+
+#: ../camel/camel-imapx-server.c:3245
+msgid "Error fetching message"
+msgstr "àààààà ààààààà ààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:3317
+msgid "Closing tmp stream failed: "
+msgstr "tmp ààààà àààà ààà àààààà àà: "
+
+#: ../camel/camel-imapx-server.c:3419
+msgid "Error copying messages"
+msgstr "àààààààààà ààà ààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:3554
+msgid "Error appending message"
+msgstr "àààààà àààààà ààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:3741
+msgid "Error fetching message headers"
+msgstr "àààààà ààààààààà ààààààà ààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:3887
+msgid "Error retrieving message"
+msgstr "àààààà àààààà ààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:4009 ../camel/camel-imapx-server.c:4214
+#: ../camel/providers/imap/camel-imap-folder.c:4002
+#: ../camel/providers/imap/camel-imap-folder.c:4082
+#, c-format
+msgid "Fetching summary information for new messages in %s"
+msgstr "%s à àààà ààààààà àààà ààààààà ààààààààà àààà ààààààà ààà àààà"
+
+#: ../camel/camel-imapx-server.c:4068
+#: ../camel/providers/imap/camel-imap-folder.c:1124
+#, c-format
+msgid "Scanning for changed messages in %s"
+msgstr "%s à àààà ààààààààà àààààà ààààààà ààà àààà"
+
+#: ../camel/camel-imapx-server.c:4110
+msgid "Error fetching new messages"
+msgstr "àààà àààààà àààààà ààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:4309
+msgid "Error while fetching messages"
+msgstr "àààààààààà àààààà ààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:4317 ../camel/camel-imapx-server.c:4349
+#, c-format
+msgid "Fetching summary information for %d message in %s"
+msgid_plural "Fetching summary information for %d messages in %s"
+msgstr[0] "àààààà àààà ààààààà ààà %d ààààààà àààà %s à"
+msgstr[1] "àààààà àààà ààààààà ààà %d ààààààààààà àààà %s à"
+
+#: ../camel/camel-imapx-server.c:4474 ../camel/camel-imapx-server.c:4510
+msgid "Error refreshing folder"
+msgstr "ààààààà àààà ààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:4603
+msgid "Error expunging message"
+msgstr "àààààà ààà ààààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:4692
+msgid "Error fetching folders"
+msgstr "ààààààààààà ààààààà ààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:4771
+msgid "Error subscribing to folder"
+msgstr "ààààààààà àààààààà ààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:4828
+msgid "Error creating folder"
+msgstr "ààààààà àààààà ààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:4877
+msgid "Error deleting folder"
+msgstr "ààààààà ààà ààààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:4931
+msgid "Error renaming folder"
+msgstr "ààààààà àààààààààà ààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:4986
+msgid "Error performing NOOP"
+msgstr "NOOP ààààààà ààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:5084
+msgid "Error syncing changes"
+msgstr "àààààààààààà ààààààà ààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:5695
+#: ../camel/providers/imap/camel-imap-folder.c:3470
+#, c-format
+msgid "Cannot get message with message ID %s: %s"
+msgstr "%s ID àà àààààà ààààààà ààààà àààààà: %s"
+
+#: ../camel/camel-imapx-server.c:5696
+#: ../camel/providers/imap/camel-imap-folder.c:3471
+msgid "No such message available."
+msgstr "àà àààà àààà àààààà ààààààà àààà"
+
+#: ../camel/camel-imapx-server.c:5851 ../camel/camel-imapx-server.c:5866
+msgid "Cannot create spool file: "
+msgstr "ààààà ààààààà àààààà àààà àààààà: "
+
+#: ../camel/camel-imapx-store.c:155
+#: ../camel/providers/imap/camel-imap-store.c:810
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP ààààààà %s"
+
+#: ../camel/camel-imapx-store.c:158
+#: ../camel/providers/imap/camel-imap-store.c:813
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s à àààà IMAP àààà, %s à ààà"
+
+#: ../camel/camel-imapx-store.c:249
+#: ../camel/providers/imap/camel-imap-provider.c:98
+#: ../camel/providers/nntp/camel-nntp-provider.c:84
+#: ../camel/providers/pop3/camel-pop3-provider.c:82
+msgid "Password"
+msgstr "àààààààà"
+
+#: ../camel/camel-imapx-store.c:251
+#: ../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-imapx-store.c:342
+#: ../camel/providers/imap/camel-imap-store.c:2033
+#: ../camel/providers/imap/camel-imap-store.c:2227
+#, c-format
+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:367 ../camel/camel-imapx-store.c:838
+#: ../camel/providers/imap/camel-imap-store.c:272
+#: ../camel/providers/imap/camel-imap-store.c:2640
+#: ../camel/providers/local/camel-maildir-folder.c:474
+#: ../camel/providers/local/camel-maildir-store.c:301
+#: ../camel/providers/local/camel-maildir-store.c:679
+#: ../camel/providers/local/camel-maildir-store.c:685
+#: ../camel/providers/local/camel-maildir-store.c:769
+#: ../camel/providers/local/camel-spool-store.c:387
+msgid "Inbox"
+msgstr "àààààà"
 
-#: ../camel/camel-gpg-context.c:1920
-msgid "Could not generate encrypting data: "
-msgstr "ààààààààààà àààà àààà àààà àààààà: "
+#: ../camel/camel-imapx-store.c:1070
+#, 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:1171
+#: ../camel/providers/nntp/camel-nntp-store.c:1749
+#, 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:1384
+#: ../camel/providers/imap/camel-imap-store.c:2046
+#: ../camel/providers/imap/camel-imap-store.c:2484
 #, 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:1395
+#: ../camel/providers/imap/camel-imap-store.c:2497
 #, 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:1405
+#: ../camel/providers/imap/camel-imap-store.c:2109
+#: ../camel/providers/imap/camel-imap-store.c:2548
+#, 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 "CamelHttpStream à àààà àààà ààààààààà ààààààààà àààààà ààà àà"
+#: ../camel/camel-imapx-stream.c:72
+#, c-format
+msgid "Source stream returned no data"
+msgstr "ààà àààààààà àààà àààà ààààà àààààà"
+
+#: ../camel/camel-imapx-stream.c:81
+#, c-format
+msgid "Source stream unavailable"
+msgstr "ààà ààààà àààààà ààà"
 
 #: ../camel/camel-lock.c:102
 #, c-format
 msgid "Could not create lock file for %s: %s"
-msgstr "%s'à àààà àà ààààààà ààààààà àààààà àààààà: %s"
+msgstr "%s à àààà àà ààààààà àààààà àààààà àààààà: %s"
 
 #: ../camel/camel-lock.c:145
 #, c-format
 msgid "Timed out trying to get lock file on %s.  Try again later."
-msgstr "%s à lock file ààààààà ààààà ààà àààà ààà àààà àààààà àààà"
+msgstr "%s à lock file ààààààà ààààà ààà àààà ààà  àààà àààààà àààà"
 
 #: ../camel/camel-lock.c:205
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
-msgstr "fcntl(2)'à àààààààà àà àààààà àààààà: %s"
+msgstr "fcntl(2) à àààààààà àà àààààà àààààà: %s"
 
 #: ../camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
-msgstr "flock(2)'à àààààààà àà àààààà àààààà: %s"
+msgstr "flock(2) à àààààààà àà àààààà àààààà: %s"
 
 #: ../camel/camel-lock-client.c:106
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
-msgstr "àààà ààààààà àààà ààààààà àààààà àààààà: %s"
+msgstr "àààà ààààààà àààà àààààà àààààà àààààà: %s"
 
 #: ../camel/camel-lock-client.c:130
 #, c-format
@@ -2129,7 +2370,7 @@ msgstr "àààà ààààààà fork àààààà àààà
 #: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "'%s' àà àààààà àààààà: lock-helper'à àààààààà àààààààà àààà àààààà"
+msgstr "'%s' àà àààààà àààààà: lock-helper à àààààààà ààààààà àààà àààààà"
 
 #: ../camel/camel-lock-client.c:227
 #, c-format
@@ -2149,17 +2390,17 @@ msgstr "àààà ààààààà %s ààààààà àààà
 #: ../camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
-msgstr "ààààààà àààà ààààààà ààààààà àààààà %s: %s"
+msgstr "ààààààà àààà ààààààà %s ààààààà àààààà: %s"
 
 #: ../camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
-msgstr "ààààààà ààààààà %s'à àààà àààà ààààààà àààààà àààààà: %s"
+msgstr "ààààààà ààààààà %s à àààà àààà ààààààà àààààà àààààà: %s"
 
 #: ../camel/camel-movemail.c:193
 #, c-format
 msgid "Could not create pipe: %s"
-msgstr "àààà ààààààà àààààà àààààà: %s"
+msgstr "àààà àààààà àààààà àààààà: %s"
 
 #: ../camel/camel-movemail.c:207
 #, c-format
@@ -2169,7 +2410,7 @@ msgstr "fork àààààà àààààà: %s"
 #: ../camel/camel-movemail.c:245
 #, c-format
 msgid "Movemail program failed: %s"
-msgstr "Movemail ààààààààà àààà: %s"
+msgstr "Movemail àààààààà àààààà: %s"
 
 #: ../camel/camel-movemail.c:246
 msgid "(Unknown error)"
@@ -2178,12 +2419,12 @@ msgstr "(âàààààà àààààà)"
 #: ../camel/camel-movemail.c:273
 #, c-format
 msgid "Error reading mail file: %s"
-msgstr "àààà ààààààà àààà àààààà: %s"
+msgstr "àààà ààààààà ààààà àààààà: %s"
 
 #: ../camel/camel-movemail.c:286
 #, c-format
 msgid "Error writing mail temp file: %s"
-msgstr "ààààààà àààà ààààààà ààààà àààààà: %s"
+msgstr "ààààààà àààà ààààààà àààààà àààààà: %s"
 
 #: ../camel/camel-movemail.c:491 ../camel/camel-movemail.c:560
 #, c-format
@@ -2208,20 +2449,20 @@ msgstr "àààààààà àààààà àààààà"
 #: ../camel/camel-net-utils.c:703
 #, c-format
 msgid "Resolving: %s"
-msgstr "ààààààà ààà àààà: %s"
+msgstr "àààààà ààà àààà: %s"
 
 #: ../camel/camel-net-utils.c:726
 msgid "Host lookup failed"
-msgstr "ààààà àààààà àààààà"
+msgstr "àààà àààààà àààààà"
 
 #: ../camel/camel-net-utils.c:732
 #, c-format
 msgid "Host lookup failed: %s: %s"
-msgstr "ààààà àààààà àààààà: %s: %s"
+msgstr "àààà àààààà àààààà: %s: %s"
 
 #: ../camel/camel-net-utils.c:853
 msgid "Resolving address"
-msgstr "ààààà ààààààà ààà àààà"
+msgstr "ààààà àààààà ààà àààà"
 
 #: ../camel/camel-net-utils.c:874
 msgid "Name lookup failed"
@@ -2240,25 +2481,25 @@ msgstr "%s àà ààààà àààà àààààà: "
 #: ../camel/camel-offline-folder.c:206
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
-msgstr "'%s' àààààààà àààààà ààààààà àààà àààà ààààààà ààà àààà"
+msgstr "'%s' àààààààà àààààà àààààà àààà àààà ààààààà ààà àààà"
 
 #: ../camel/camel-offline-journal.c:145 ../camel/camel-offline-journal.c:177
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
-msgstr "'%s' àààààààà àààà àà-àààà ààààààà ààààà àààààà: %s"
+msgstr "'%s' àààààààà àààà àà-àààà àààààà àààààà àààààà: %s"
 
 #: ../camel/camel-provider.c:58
 msgid "Virtual folder email provider"
-msgstr "ààààààààà àààààààà à-àààà àààààààààà"
+msgstr "àààààààà àààààààà à-àààà ààààààààà"
 
 #: ../camel/camel-provider.c:60
 msgid "For reading mail as a query of another set of folders"
-msgstr "ààà àààà ààààààà àààààà ààà àààààà àààà àààà àààà àààà ààààààà"
+msgstr "ààà àààà ààààààà àààààà ààà àààààà àààà àààà àààà àààà ààààààà"
 
 #: ../camel/camel-provider.c:193
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
-msgstr "%s à'à àààààà àààààà: ààààààà àààààààà ààààà à'à ààà ààààà àààà"
+msgstr "%s à'à àààààà àààààà: ààààààà àààààààà ààààà à'à ààà ààààà àààà"
 
 #: ../camel/camel-provider.c:202
 #, c-format
@@ -2268,12 +2509,12 @@ msgstr "%s à'à àààààà àààààà: %s"
 #: ../camel/camel-provider.c:211
 #, c-format
 msgid "Could not load %s: No initialization code in module."
-msgstr "%s à'à àààààà àààààà: ààààààà àààà àààààààààà ààà ààààààà àààà"
+msgstr "%s à'à àààààà àààààà: àààààà àààà àààààààààà à'à ààààààà àààà"
 
-#: ../camel/camel-provider.c:402 ../camel/camel-session.c:388
+#: ../camel/camel-provider.c:402 ../camel/camel-session.c:395
 #, c-format
 msgid "No provider available for protocol '%s'"
-msgstr "'%s' àààààààààà àààà àààà àààààààààà ààààààà ààà"
+msgstr "'%s' àààààààà àààà àààà ààààààààà ààààààà ààà"
 
 #: ../camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
@@ -2281,12 +2522,12 @@ msgstr "àààààà"
 
 #: ../camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
-msgstr "àà àààààààà àààààà anonymous àà-àà àààààà àààààà àààà ààààà ààà ààààà"
+msgstr "àà ààààààà àààààà anonymous àà-àà àààààà àààààààà àààà ààààà ààà àààà"
 
 #: ../camel/camel-sasl-anonymous.c:70
 #, c-format
 msgid "Authentication failed."
-msgstr "ààààà àààààà àààààà ààààààà"
+msgstr "àààààààààà ààààààà"
 
 #: ../camel/camel-sasl-anonymous.c:81
 #, c-format
@@ -2294,7 +2535,7 @@ msgid ""
 "Invalid email address trace information:\n"
 "%s"
 msgstr ""
-"à-àààà àààààà àààààààà àààà trace àààà:\n"
+"àààà à-àààà ààààà àààààà àààà:\n"
 "%s"
 
 #: ../camel/camel-sasl-anonymous.c:95
@@ -2303,7 +2544,7 @@ msgid ""
 "Invalid opaque trace information:\n"
 "%s"
 msgstr ""
-"àààà opaque trace àààà:\n"
+"àààà opaque àààààà àààà:\n"
 "%s"
 
 #: ../camel/camel-sasl-anonymous.c:109
@@ -2312,7 +2553,7 @@ msgid ""
 "Invalid trace information:\n"
 "%s"
 msgstr ""
-"àààà trace àààà:\n"
+"àààà àààààà àààà:\n"
 "%s"
 
 #: ../camel/camel-sasl-cram-md5.c:46
@@ -2324,8 +2565,8 @@ msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"àà àààààààà ààà àààààà àààààà ààààààà ààà àààààà CRAM-MD5 àààààààà àààààà àààààà "
-"àààà ààààà ààà ààààà"
+"àà ààààààà àààààààà àààààààà àààààà ààààààà ààà àààààààà CRAM-MD5 àààààààà àààààà "
+"àààààààà àààà ààààà ààà àààà"
 
 #: ../camel/camel-sasl-digest-md5.c:59
 msgid "DIGEST-MD5"
@@ -2336,38 +2577,38 @@ msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
-"àà àààààààà ààà àààààà àààààà ààààààà ààà àààààà DIGEST-MD5 àààààààà àààààà "
-"àààààà àààà ààààà ààà ààààà"
+"àà ààààààà àààààààà àààààààà àààààà ààààààà ààà àààààààà DIGEST-MD5 àààààààà àààààà "
+"àààààààà àààà ààààà ààà àààà"
 
 #: ../camel/camel-sasl-digest-md5.c:850
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
-msgstr "àààààà ààààààààà ààààà ààààà (>àààà ààààà)"
+msgstr "àààààààà àààààààààààà ààààà ààààà (>àààà ààààà)"
 
 #: ../camel/camel-sasl-digest-md5.c:861
 #, c-format
 msgid "Server challenge invalid\n"
-msgstr "àààààà ààààààààà ààà ààà\n"
+msgstr "àààààààà àààààààààààà ààà ààà\n"
 
 #: ../camel/camel-sasl-digest-md5.c:869
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
-msgstr "àààààà àààà àààà \"Quality of Protection\" ààààà ààààààà ààààà"
+msgstr "àààààààà àààà àààà \"Quality of Protection\" ààààà ààààààà ààà"
 
 #: ../camel/camel-sasl-digest-md5.c:902
 #, c-format
 msgid "Server response did not contain authorization data"
-msgstr "àààààààà ààà ààààààà àààààààààààà àààà ààààà àààààà ààààààààà àààà ààààààààà"
+msgstr "àààààààà àààààààààààà àààà àààààààààà àààà ààààààààà"
 
 #: ../camel/camel-sasl-digest-md5.c:923
 #, c-format
 msgid "Server response contained incomplete authorization data"
-msgstr "àààààààà ààà ààààààà àààààààààààà àààà ààààà àààààà ààààààààà àààà ààààààààà"
+msgstr "àààààààà àààààààààààà àààà àààààààààà àààà ààààààààà"
 
 #: ../camel/camel-sasl-digest-md5.c:936
 #, c-format
 msgid "Server response does not match"
-msgstr "àààààà àààààààààààà ààààà"
+msgstr "àààààààà àààààààààààà àààà"
 
 #: ../camel/camel-sasl-gssapi.c:91
 msgid "GSSAPI"
@@ -2375,70 +2616,68 @@ msgstr "GSSAPI"
 
 #: ../camel/camel-sasl-gssapi.c:93
 msgid "This option will connect to the server using Kerberos 5 authentication."
-msgstr ""
-"àà àààààààà ààà Kerberos 5 ààààààààààà àààààààà àààààà àààààà àààà ààààà àààààà "
-"à'àà"
+msgstr "àà ààààààà àààààààà Kerberos 5 àààààààààà àààààà àààààààà àààà ààààà àààà'àà"
 
 #: ../camel/camel-sasl-gssapi.c:134
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
-msgstr "àààààà ààààà àààààà àààààààà àààààààà ààààààà ààà àààà àààààààààà ààààààààà àààààààà"
+msgstr "àààààà ààààà àààààà àààààààà àààààààà ààààààà ààà, àààà àààààà àààààà àààààààà"
 
 #: ../camel/camel-sasl-gssapi.c:139
 msgid "The provided target_name parameter was ill-formed."
-msgstr "àààààààà target_name ààààààà àààààààà àààà ààà"
+msgstr "àààààààà target_name àààààà àààààààà àààà ààà"
 
 #: ../camel/camel-sasl-gssapi.c:142
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
-msgstr "àààààààà target_name àààààààà àààà àààà àààà àààààààà àààà ààà àààààààà"
+msgstr "àààààààà target_name ààààààà àààà àààà àààà àààààààà àààà ààà àààààààà"
 
 #: ../camel/camel-sasl-gssapi.c:146
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
 msgstr ""
-"input_token'à àààà input_chan_bindings àààààààà ààààààà àààààààà ààààààà "
-"ààààààààà ààà àààà ààà àààààààà ààà"
+"input_token à àààà input_chan_bindings ààààààà ààààààà àààààààà ààààààà ààààààààà "
+"ààà àààà ààà àààààààà ààà"
 
 #: ../camel/camel-sasl-gssapi.c:151
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
-msgstr "input_token'à àààà àààà àààààààà àààà àààààààà ààààààà ààà ààààà àààà àààà"
+msgstr "input_token à àààà àààà àààààààà àààà àààààààà ààààààà ààà ààààà àààà àààà"
 
 #: ../camel/camel-sasl-gssapi.c:155
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
 msgstr ""
-"ààààààà àààààààààà àààà àààààààà ààààà ààà ààà, àààà àààààà ààààààààà àààààà àààà "
-"ààààà ààààààà ààà àààààà"
+"ààààààààààààà ààààààààà àààà àààààààà ààààà ààà ààà, àààà àààààà ààààààààà àààààà "
+"àààà ààààà ààààààà ààà àààààà"
 
 #: ../camel/camel-sasl-gssapi.c:160
 msgid "The supplied context handle did not refer to a valid context."
-msgstr "àààààààà àààààààà ààààààààà àààààà ààà àààààààà ààààààà ààà àààà àààà"
+msgstr "àààààààà ààààààààààààà ààààààààà àààààà ààà ààààààààààààà ààààààà ààà àààà àààà"
 
 #: ../camel/camel-sasl-gssapi.c:163
 msgid "The consistency checks performed on the input_token failed."
-msgstr "input_tokenà ààààààà ààààà àààà ààààààààà ààààààààààà àààà ààààà"
+msgstr "input_token à ààààààà ààààààà àààà ààààààààà ààà ààààààààààà àààààà ààààà"
 
 #: ../camel/camel-sasl-gssapi.c:166
 msgid "The consistency checks performed on the credential failed."
-msgstr "àààààà ààààààà ààààà àààà ààààààààà ààààààààààà àààà ààààà"
+msgstr "àààààà ààààààà ààààààà àààà ààààààààà ààà ààààààààààà àààààà ààààà"
 
 #: ../camel/camel-sasl-gssapi.c:169
 msgid "The referenced credentials have expired."
-msgstr "ààààààààà àààààààààà ààààà àààààààà ààààà"
+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/providers/smtp/camel-smtp-transport.c:563
 #, c-format
 msgid "Bad authentication response from server."
-msgstr "àààààààà ààà àààààààààà ààààààààà ààààààààààà àààà àààà"
+msgstr "àààààààà ààà àààààààààà ààààààààààà àààà àààà"
 
 #: ../camel/camel-sasl-gssapi.c:410
 #, c-format
@@ -2451,7 +2690,7 @@ msgstr "àà-àà"
 
 #: ../camel/camel-sasl-login.c:42 ../camel/camel-sasl-plain.c:46
 msgid "This option will connect to the server using a simple password."
-msgstr "àà àààààààà ààà ààà àààààà àààààààà àààààà ààààà ààà à'àà"
+msgstr "àà ààààààà àààààààà ààà àààààà àààààààà àààààà ààààà ààà à'àà"
 
 #: ../camel/camel-sasl-login.c:107
 #, c-format
@@ -2467,8 +2706,8 @@ msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
 msgstr ""
-"àà àààààààà ààà NTLM / àààààà àààààààà àààààààààà (SPA) àààààà ààà Windows-"
-"ààààààà àààààà àààà ààààà ààà à'àà"
+"àà ààààààà àààààààà NTLM / àààààààà àààààààà àààààààààà (SPA) àààààà ààà Windows-"
+"ààààààà àààààààà àààà ààààà ààà à'àà"
 
 #: ../camel/camel-sasl-plain.c:44
 msgid "PLAIN"
@@ -2476,11 +2715,11 @@ msgstr "PLAIN"
 
 #: ../camel/camel-sasl-popb4smtp.c:46
 msgid "POP before SMTP"
-msgstr "SMTP'à àààààà POP"
+msgstr "SMTP à àààààà POP"
 
 #: ../camel/camel-sasl-popb4smtp.c:48
 msgid "This option will authorise a POP connection before attempting SMTP"
-msgstr "àà àààààààà ààà SMTP ààààààà àààààà ààà POP ààààà àààààààààà ààà à'à"
+msgstr "àà ààààààà àààààààà SMTP ààààààà àààààà ààà POP ààààà àààààààààà ààà à'à"
 
 #: ../camel/camel-sasl-popb4smtp.c:84
 msgid "POP Source UID"
@@ -2494,52 +2733,40 @@ msgstr "ààà àààààà àààààà ààààààà 
 #: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:118
 #, c-format
 msgid "POP Before SMTP authentication attempted with a %s service"
-msgstr "ààà %s ààààà àààà POP à ààà SMTP  ààààààààààà àààààà ààà àààà"
+msgstr "ààà %s ààààà àààà POP à ààà SMTP ààààààààààà àààààà ààà àààà"
 
 #: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
-msgstr "ààààààà àààààààààà ààààààà àààààà àààà: %s: %s"
+msgstr "àààààà àààààààààà ààààààà àààààà àààààà: %s: %s"
 
-#: ../camel/camel-session.c:397
+#: ../camel/camel-session.c:404
 #, 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:498
 #, c-format
-#| msgid "Authentication failed"
 msgid "%s authentication failed"
 msgstr "%s àààààààààà àààààà àà"
 
-#: ../camel/camel-session.c:1187
+#: ../camel/camel-session.c:1236
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
-msgstr "ààààààà ààà %s'à àààà %s ààààààà ààà %s ààààààààà àààààà"
+msgstr "ààààààà ààà %s à àààà %s ààààà ààà %s àààààààà ààààà"
 
 #: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1057
 #, c-format
 msgid "Cannot find certificate for '%s'"
-msgstr "'%s'à àààààààààà àààààà àààààà àààààà"
+msgstr "'%s à àààààààààà àààààà àààààà àààààà"
 
 #: ../camel/camel-smime-context.c:379
 msgid "Cannot create CMS message"
-msgstr "CMS àààààà ààààààà àààààà àààààà"
+msgstr "CMS àààààà àààààà àààààà àààààà"
 
 #: ../camel/camel-smime-context.c:384
 msgid "Cannot create CMS signed data"
-msgstr "ààààààààà CMS àààà ààààààà àààààà àààààà"
+msgstr "àààààààààà CMS àààà àààààà àààààà àààààà"
 
 #: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS signed data"
@@ -2551,20 +2778,20 @@ msgstr "CMS àààà ààààààà àààààà àààà
 
 #: ../camel/camel-smime-context.c:403
 msgid "Cannot create CMS Signer information"
-msgstr "CMS'à àààààààààààà àààà ààààààà àààààà àààààà"
+msgstr "CMS à àààààààààààà àààà àààààà àààààà àààààà"
 
 #: ../camel/camel-smime-context.c:409
 msgid "Cannot find certificate chain"
-msgstr "àààààààààà àààà àààààà àààààà àààààà"
+msgstr "àààààààààà ààààà àààààà àààààà àààààà"
 
 #: ../camel/camel-smime-context.c:415
 msgid "Cannot add CMS Signing time"
-msgstr "CMS ààààààààà ààà ààà àààààà àààààà"
+msgstr "CMS ààààààààà ààà ààà àààààà àààààà"
 
 #: ../camel/camel-smime-context.c:439 ../camel/camel-smime-context.c:454
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
-msgstr "'%s'à ààààààààà àààààààààà ààààààààà"
+msgstr "'%s à ààààààààà àààààààààà ààààààààà"
 
 #: ../camel/camel-smime-context.c:461
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
@@ -2589,19 +2816,19 @@ msgstr "ààààààààà"
 
 #: ../camel/camel-smime-context.c:512
 msgid "Good signature"
-msgstr "àààà àààààààà"
+msgstr "ààà àààààààà"
 
 #: ../camel/camel-smime-context.c:514
 msgid "Bad signature"
-msgstr "ààà àààààààà"
+msgstr "àààà àààààààà"
 
 #: ../camel/camel-smime-context.c:516
 msgid "Content tampered with or altered in transit"
-msgstr "ààààààààà àààààààààà àààà ààààààà ààà àààà àààà ààààààààà àààà"
+msgstr "ààààààà àààà àààà àààà ààààà ààà àààà àààà àààààààà ààà àààà"
 
 #: ../camel/camel-smime-context.c:518
 msgid "Signing certificate not found"
-msgstr "àààààààààààà àààààààààà ààààà ààààà"
+msgstr "àààààààààààà àààààààààà àààà ààààà"
 
 #: ../camel/camel-smime-context.c:520
 msgid "Signing certificate not trusted"
@@ -2609,11 +2836,11 @@ msgstr "àààààààààààà àààààààààà à
 
 #: ../camel/camel-smime-context.c:522
 msgid "Signature algorithm unknown"
-msgstr "àààààààààààà ààààààààààà àààààà"
+msgstr "àààààààààààà ààààààà àààààà"
 
 #: ../camel/camel-smime-context.c:524
 msgid "Signature algorithm unsupported"
-msgstr "àààààààààààà ààààààààààà ààààààà ààà"
+msgstr "àààààààààààà ààààààà àààààààà"
 
 #: ../camel/camel-smime-context.c:526
 msgid "Malformed signature"
@@ -2621,7 +2848,7 @@ msgstr "ààà ààààà àààààààà"
 
 #: ../camel/camel-smime-context.c:528
 msgid "Processing error"
-msgstr "àààààààààààààà àààààà"
+msgstr "ààààààààààààà àààààà"
 
 #: ../camel/camel-smime-context.c:573
 msgid "No signed data in signature"
@@ -2629,7 +2856,7 @@ msgstr "ààààààààà àààà àààààààààà
 
 #: ../camel/camel-smime-context.c:578
 msgid "Digests missing from enveloped data"
-msgstr "ààààààà ààà ààààà ààà àààààààà àààààà ààà ààààà"
+msgstr "àààà ààà ààààà ààà àààààààà àààààà ààà ààààà"
 
 #: ../camel/camel-smime-context.c:591 ../camel/camel-smime-context.c:602
 msgid "Cannot calculate digests"
@@ -2637,11 +2864,11 @@ msgstr "àààààààà àààà àààààà ààààà
 
 #: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:613
 msgid "Cannot set message digests"
-msgstr "ààààààà àààààà ààààààà ààààà àààààà àààààà"
+msgstr "ààààààà àààààà ààààààà àààààà àààààà àààààà"
 
 #: ../camel/camel-smime-context.c:623 ../camel/camel-smime-context.c:628
 msgid "Certificate import failed"
-msgstr "àààààààààà àààààààà àààà àààà"
+msgstr "àààààààààà ààààààà àààààà"
 
 #: ../camel/camel-smime-context.c:638
 #, c-format
@@ -2651,11 +2878,11 @@ msgstr "ààààààà àààà ààà ààààààààà
 #: ../camel/camel-smime-context.c:641
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
-msgstr "ààààààà àààà ààà àààààààààà, àààààààààà àààààààà ààà ààààààà ààà àààà"
+msgstr "ààààààà àààà ààà àààààààààà, àààààààààà ààààààà ààà ààààààà ààà àààà"
 
 #: ../camel/camel-smime-context.c:645
 msgid "Cannot find signature digests"
-msgstr "ààààààààà àààààààà ààààà ààààà"
+msgstr "ààààààààà àààààààà àààà ààààà"
 
 #: ../camel/camel-smime-context.c:661
 #, c-format
@@ -2664,35 +2891,35 @@ msgstr "àààààààààààà: %s <%s>: %s\n"
 
 #: ../camel/camel-smime-context.c:842 ../camel/camel-smime-context.c:1130
 msgid "Cannot create encoder context"
-msgstr "ààààààà àààààà ààààààà àààààà àààààà"
+msgstr "ààà'ààà ààààà àààààà àààààà àààààà"
 
 #: ../camel/camel-smime-context.c:848
 msgid "Failed to add data to CMS encoder"
-msgstr "CMS ààààààà'à àààà ààà àààààà àààààà"
+msgstr "CMS ààà'àààà àààà ààà àààààà àààààà"
 
 #: ../camel/camel-smime-context.c:853 ../camel/camel-smime-context.c:1147
 msgid "Failed to encode data"
-msgstr "àààà ààààà àààààà àààààà"
+msgstr "àààà ààà'à àààààà àààààà"
 
 #: ../camel/camel-smime-context.c:996 ../camel/camel-smime-context.c:1243
 msgid "Decoder failed"
-msgstr "ààààààà àààààà"
+msgstr "ààà'ààà àààààà"
 
 #: ../camel/camel-smime-context.c:1065
 msgid "Cannot find common bulk encryption algorithm"
-msgstr "àààààà ààààà ààààààààà ààààààààààà ààààà ààààà"
+msgstr "àààààà ààààà ààààààààà ààààààà àààà ààààà"
 
 #: ../camel/camel-smime-context.c:1073
 msgid "Cannot allocate slot for encryption bulk key"
-msgstr "ààààààààà ààààà-àà'à àààà àààà àààààà ààà ààààà"
+msgstr "ààààààààà ààààà-ààà àààà àààà àààààà ààà ààààà"
 
 #: ../camel/camel-smime-context.c:1084
 msgid "Cannot create CMS Message"
-msgstr "CMS àààààà ààààààà àààààà àààààà"
+msgstr "CMS àààààà àààààà àààààà àààààà"
 
 #: ../camel/camel-smime-context.c:1090
 msgid "Cannot create CMS Enveloped data"
-msgstr "CMS Enveloped àààà ààààààà àààààà àààààà"
+msgstr "CMS Enveloped àààà àààààà àààààà àààààà"
 
 #: ../camel/camel-smime-context.c:1096
 msgid "Cannot attach CMS Enveloped data"
@@ -2700,77 +2927,81 @@ msgstr "CMS Enveloped àààà àààààà àààààà àà
 
 #: ../camel/camel-smime-context.c:1102
 msgid "Cannot attach CMS data object"
-msgstr "CMS àààà ààààà ààààààà àààààà àààààà"
+msgstr "CMS àààà ààààà ààààààà àààààà àààààà"
 
 #: ../camel/camel-smime-context.c:1111
 msgid "Cannot create CMS Recipient information"
-msgstr "CMS àààààà ààààààààà àààà ààààààà àààààà àààààà"
+msgstr "CMS àààààà àààà àààààà àààààà àààààà"
 
 #: ../camel/camel-smime-context.c:1116
 msgid "Cannot add CMS Recipient information"
-msgstr "CMS àààààà ààààààààà àààà ààà àààààà àààààà"
+msgstr "CMS àààààà àààà ààà àààààà àààààà"
 
 #: ../camel/camel-smime-context.c:1141
 msgid "Failed to add data to encoder"
-msgstr "àààààààà àààà ààà àààààà àààààà"
+msgstr "ààà'àààà àààà ààà àààààà àààààà"
 
 #: ../camel/camel-smime-context.c:1250
 msgid "S/MIME Decrypt: No encrypted content found"
-msgstr "S/MIME Decrypt: ààààààààà ààà àààà àààà ààààà ààààà"
+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' ààààààà ààààààà àààààà àààààà: ààààààà àààààààà ààààààà"
+msgstr "`%s' ààààààà àààààà àààààà àààààà: ààààààà àààààààà ààààààà"
 
-#: ../camel/camel-store.c:1842
+#: ../camel/camel-store.c:1881
 #, c-format
 msgid "Opening folder '%s'"
-msgstr "ààààààà '%s' àààà àà ààà"
+msgstr "ààààààà '%s' àààà àààà"
 
-#: ../camel/camel-store.c:2027
+#: ../camel/camel-store.c:2066
 #, c-format
 msgid "Scanning folders in '%s'"
-msgstr "'%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: ààààààà àààààààà ààààààà"
+msgstr "ààààààà àààààà àààààà àààààà: %s: ààààààà àààààààà ààààààà"
 
-#: ../camel/camel-store.c:2515
+#: ../camel/camel-store.c:2554
 #, c-format
 msgid "Creating folder '%s'"
-msgstr "ààààààà '%s' àààààà ààà àà ààà"
+msgstr "ààààààà '%s' àààààà ààà àààà"
 
-#: ../camel/camel-store.c:2633 ../camel/camel-vee-store.c:352
+#: ../camel/camel-store.c:2672 ../camel/camel-vee-store.c:410
 #: ../camel/providers/local/camel-maildir-store.c:300
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
-msgstr "ààààààà àààà àààà ààààà: %s: àààà àààà"
+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:768
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "àààààààà ààà àààààààà àààààà àààààà: %s: àààà àààà"
+msgstr "àààààààà àààààààààà àààààà àààààà: %s: àààà àààà"
 
 #: ../camel/camel-stream-filter.c:334
 msgid "Only reset to beginning is supported with CamelStreamFilter"
 msgstr "CamelStreamFilter à àààà àààà ààààààààà ààààààààà àààààà ààà àà"
 
+#: ../camel/camel-stream-null.c:78
+msgid "Only reset to beginning is supported with CamelHttpStream"
+msgstr "CamelHttpStream à àààà àààà ààààààààà ààààààààà àààààà ààà àà"
+
 #: ../camel/camel-stream-process.c:267
 #, c-format
 msgid "Connection cancelled"
@@ -2781,117 +3012,112 @@ msgstr "ààààà ààààà ààà àààà"
 msgid "Could not connect with command \"%s\": %s"
 msgstr "\"%s\" àààààà àààààà ààààà àààààà àààààà: %s"
 
-#: ../camel/camel-tcp-stream-raw.c:303
+#: ../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:647 ../camel/camel-tcp-stream-raw.c:658
 #, 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:669
 #, c-format
 msgid "The proxy host denied our request: code %d"
-msgstr "ààààààà ààààà àààà àààààà àààà ààààà: ààà %d"
+msgstr "ààààààà ààààà àààà àààààà àààà ààààà: à'à %d"
 
-#: ../camel/camel-tcp-stream-raw.c:758 ../camel/camel-tcp-stream-raw.c:764
+#: ../camel/camel-tcp-stream-raw.c:765 ../camel/camel-tcp-stream-raw.c:771
 #, 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:777
 #, c-format
 msgid "Could not find a suitable authentication type: code 0x%x"
-msgstr "ààà ààààà àààààààààà ààà àààà ààà: ààà 0x%x"
+msgstr "ààà ààààà àààààààààà ààà àààà ààà: à'à 0x%x"
 
-#: ../camel/camel-tcp-stream-raw.c:782
+#: ../camel/camel-tcp-stream-raw.c:789
 msgid "General SOCKS server failure"
 msgstr "àààààà SOCKS ààààààà àààààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:783
+#: ../camel/camel-tcp-stream-raw.c:790
 msgid "SOCKS server's rules do not allow connection"
 msgstr "SOCKS àààààààà ààààààààà àààààà àààààà àààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:784
+#: ../camel/camel-tcp-stream-raw.c:791
 msgid "Network is unreachable from SOCKS server"
 msgstr "àààààààà SOCKS àààààààà ààà ààààààà àààà àààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:785
+#: ../camel/camel-tcp-stream-raw.c:792
 msgid "Host is unreachable from SOCKS server"
 msgstr "àààà SOCKS àààààààà ààà ààààààà àààà àààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:786
+#: ../camel/camel-tcp-stream-raw.c:793
 msgid "Connection refused"
 msgstr "ààààà àààà ààà àààà"
 
-#: ../camel/camel-tcp-stream-raw.c:787
+#: ../camel/camel-tcp-stream-raw.c:794
 msgid "Time-to-live expired"
 msgstr "ààààà-ààà-àààà ààààà ààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:788
+#: ../camel/camel-tcp-stream-raw.c:795
 msgid "Command not supported by SOCKS server"
 msgstr "àààààà SOCKS ààààààà àààààà ààààààà ààà"
 
-#: ../camel/camel-tcp-stream-raw.c:789
+#: ../camel/camel-tcp-stream-raw.c:796
 msgid "Address type not supported by SOCKS server"
 msgstr "ààààà ààà SOCKS ààààààà àààààà ààààààà ààà"
 
-#: ../camel/camel-tcp-stream-raw.c:790
+#: ../camel/camel-tcp-stream-raw.c:797
 msgid "Unknown error from SOCKS server"
 msgstr "SOCKS àààààààà ààà àààààà àààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:823
+#: ../camel/camel-tcp-stream-raw.c:830
 #, 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:848
 #, c-format
 msgid "Incomplete reply from SOCKS server"
 msgstr "SOCKS àààààààà ààà ààààààààà ààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:861
+#: ../camel/camel-tcp-stream-raw.c:868
 #, 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:900 ../camel/camel-tcp-stream-raw.c:910
 #, c-format
 msgid "Invalid reply from proxy server"
 msgstr "ààààààà àààààààà ààà àààà ààààà"
 
-#: ../camel/camel-tcp-stream-ssl.c:474
+#: ../camel/camel-tcp-stream-ssl.c:502
 #, c-format
-#| msgid ""
-#| "Issuer:            %s\n"
-#| "Subject:           %s\n"
-#| "Fingerprint:       %s\n"
-#| "Signature:         %s"
 msgid ""
 "   Issuer:       %s\n"
 "   Subject:      %s\n"
 "   Fingerprint:  %s\n"
 "   Signature:    %s"
 msgstr ""
-"  àààààà:       %s\n"
-"  àààà:           %s\n"
-"  ààààààà-ààààààà:   %s\n"
-"  àààààààà:             %s"
+"   àààààà:    %s\n"
+"   àààà:      %s\n"
+"   àààààà ààà:  %s\n"
+"   àààààààà:       %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:480
+#: ../camel/camel-tcp-stream-ssl.c:508
 msgid "GOOD"
 msgstr "GOOD"
 
-#: ../camel/camel-tcp-stream-ssl.c:480
+#: ../camel/camel-tcp-stream-ssl.c:508
 msgid "BAD"
 msgstr "BAD"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:484
+#: ../camel/camel-tcp-stream-ssl.c:512
 #, c-format
 msgid ""
 "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
@@ -2899,42 +3125,42 @@ msgid ""
 "Detailed information about the certificate:\n"
 "%s"
 msgstr ""
-"'%s' à àààà SSL ààààààààààà àààà àààà ààààààà ààààà àààà ààààà àààà àààààà àà?\n"
+"'%s' à àààà SSL àààààààààà àààà àààà ààààààà ààààà àààà ààààà àààà àààààà àà?\n"
 "\n"
 "ààààààààààà ààààà àààààà àààà:\n"
 "%s"
 
-#: ../camel/camel-tcp-stream-ssl.c:488
+#: ../camel/camel-tcp-stream-ssl.c:516
 msgid "_Reject"
 msgstr "àààà ààà (_R)"
 
-#: ../camel/camel-tcp-stream-ssl.c:489
+#: ../camel/camel-tcp-stream-ssl.c:517
 msgid "Accept _Temporarily"
 msgstr "ààààààààààà ààààà ààà (_T)"
 
-#: ../camel/camel-tcp-stream-ssl.c:490
+#: ../camel/camel-tcp-stream-ssl.c:518
 msgid "_Accept Permanently"
 msgstr "àààààààààà ààààà ààà (_A)"
 
-#: ../camel/camel-tcp-stream-ssl.c:548
+#: ../camel/camel-tcp-stream-ssl.c:579
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
-"àààààààààà ààààààààà àààààà: %s\n"
+"àààààààààà àààààà: %s\n"
 "ààààààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:600
+#: ../camel/camel-tcp-stream-ssl.c:631
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
-"àààààààààààà àààààà àààà ààà: %s\n"
+"àààààààààà àààààà àààà ààà: %s\n"
 "ààààààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:618
+#: ../camel/camel-tcp-stream-ssl.c:649
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2943,7 +3169,7 @@ msgstr ""
 "ààààààààààà ààààà àààààààà àààà: %s\n"
 "ààààààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:635
+#: ../camel/camel-tcp-stream-ssl.c:666
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2955,75 +3181,79 @@ msgstr ""
 #: ../camel/camel-url.c:330
 #, c-format
 msgid "Could not parse URL '%s'"
-msgstr "URL '%s' ààààà ààààà àààààà"
+msgstr "URL '%s' àààààààà ààààà àààààà"
 
-#: ../camel/camel-vee-folder.c:651
+#: ../camel/camel-vee-folder.c:485
 #, c-format
-#| msgid "Storing folder"
 msgid "Updating %s folder"
 msgstr "%s ààààààà àààààà ààà"
 
-#: ../camel/camel-vee-folder.c:1325 ../camel/camel-vee-folder.c:1482
+#: ../camel/camel-vee-folder.c:842 ../camel/camel-vee-folder.c:952
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "ààààààààà àààààààà àààà àààààà ààà àààà àààààààààà ààà ààààà ààà"
+msgstr "àààààààà àààààààà àààà àààààà ààà àààà àààààààààà ààà ààààà ààà"
 
-#: ../camel/camel-vee-folder.c:1358
+#: ../camel/camel-vee-folder.c:875
 #, c-format
 msgid "No such message %s in %s"
-msgstr "%s'à àààààà àààà àààààà %s'à àààà ààà"
+msgstr "%s à àààààà àààà àààààà %s à àààà ààà"
 
-#: ../camel/camel-vee-folder.c:1426
+#: ../camel/camel-vee-folder.c:928
 #, c-format
 msgid "Error storing '%s': "
 msgstr "'%s' ààààààà ààààà àààààà: "
 
+#: ../camel/camel-vee-folder.c:1156
+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 "ààà ààààà ààààà"
+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: àà àààà àààà ààààààà ààààààà ààà"
+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: àà àààà àààà ààààààà ààààààà ààà"
+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 "àààààààà àààààààà àààààà ààà àààààà àààààà"
+msgstr "àààààààà ààààààà àààààà ààà àààààà àààààà"
 
 #: ../camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
-msgstr "àààààààà ààààààà àààààààà àààààà ààà àààààà àààààà"
+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 "àààààà ààààààà ààààààààà"
+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 "ààààà ààààààà ààààààààà"
+msgstr "ààààà ààààà ààààààààà"
 
-#: ../camel/providers/imap/camel-imap-command.c:383
+#: ../camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
-msgstr "àààààà àààà ààààààààààà àààà ààààà ààààààààà ààà àààà: %s"
+msgstr "àààààààà àààà ààààààààààà àààà ààààà ààààààààà ààà àààà: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:416
+#: ../camel/providers/imap/camel-imap-command.c:422
 #, c-format
-#| msgid ""
-#| "Alert from IMAP server %s %s:\n"
-#| "%s"
 msgid ""
 "Alert from IMAP server %s %s in folder %s:\n"
 "%s"
@@ -3031,112 +3261,79 @@ msgstr ""
 "ààààààà %s à IMAP ààààààà %s %s ààà ààààààààààà:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:420
+#: ../camel/providers/imap/camel-imap-command.c:426
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
 "%s"
 msgstr ""
-"IMAP ààààààà %s %sà ààà ààààààà ààààààààààà:\n"
+"IMAP ààààààà %s %s à ààà ààààààà ààààààààààà:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:502
+#: ../camel/providers/imap/camel-imap-command.c:508
 #, 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:520
 #, c-format
 msgid "IMAP command failed: %s"
-msgstr "IMAP àààààà àààà: %s"
+msgstr "IMAP àààààà àààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:594
+#: ../camel/providers/imap/camel-imap-command.c:603
 #, c-format
 msgid "Server response ended too soon."
-msgstr "àààààààà ààà ààààààà àààààààààà ààà ààààà àààààà ààààà"
+msgstr "àààààààà ààà ààààààà ààààààààààà ààà ààààà àààààà ààààà"
 
-#: ../camel/providers/imap/camel-imap-command.c:806
+#: ../camel/providers/imap/camel-imap-command.c:818
 #, c-format
 msgid "IMAP server response did not contain %s information"
-msgstr "IMAP àààààààà ààà ààààààà àààààààààààà àààà %s ààààààààà àààà ààààààààà"
+msgstr "IMAP àààààààà àààààààààààà àààà %s àààà ààààààààà"
 
-#: ../camel/providers/imap/camel-imap-command.c:844
+#: ../camel/providers/imap/camel-imap-command.c:856
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP àààààààà ààà ààààààààààà OK ààààààààààà: %s"
 
 #: ../camel/providers/imap/camel-imap-folder.c:348
-#| msgid "Always check for new mail in this folder"
 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:439
 #, c-format
 msgid "Could not create directory %s: %s"
-msgstr "%s ààààààààà ààààààà àààààà àààààà: %s"
+msgstr "%s ààààààààà àààààà àààààà àààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:461
+#: ../camel/providers/imap/camel-imap-folder.c:460
 #, 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
-#, c-format
-msgid "Scanning for changed messages in %s"
-msgstr "%s'à àààà ààààààààà àààààà ààààààà ààà àààà"
+msgstr "%s à ààààààààà àààà à'à àààààà àààààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3478
+#: ../camel/providers/imap/camel-imap-folder.c:3433
 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 "%s ID àà àààààà ààààààà ààààà àààààà: %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:3544
+#: ../camel/providers/imap/camel-imap-folder.c:4414
+#: ../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
-#, 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:4213
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
-msgstr "àààààààà ààà ààààààà ààààààààààà ààààààààà: àààààà %d ààààààààà àààà àààà ààààààà ààà"
+msgstr "àààààààà ààààààààààà ààààààààà: àààààà %d àààà àààà ààààààà ààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4277
+#: ../camel/providers/imap/camel-imap-folder.c:4223
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
-msgstr "àààààààà ààà ààààààà ààààààààààà ààààààààà: àààààà %d'à UID ààààààà ààà"
+msgstr "àààààààà ààààààààààà ààààààààà: àààààà %d à UID ààààààà ààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4509
+#: ../camel/providers/imap/camel-imap-folder.c:4451
 #, c-format
 msgid "Could not find message body in FETCH response."
-msgstr "FETCH àààààà àààààààààààà àààà ààààààà àààààà ààà àààààààààà"
+msgstr "FETCH ààààà àààààààààààà àààà ààààààà àààààà ààà àààààààààà"
 
 #: ../camel/providers/imap/camel-imap-message-cache.c:196
 #: ../camel/providers/imap/camel-imap-message-cache.c:253
@@ -3159,410 +3356,135 @@ 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 "àààà àààààà àààààààà ààààààà ààà àààà"
+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)"
+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 "ààààààààààà ààà àààààààà àààà àààà ààààààà àààààààà ààààààà ààà ààà (_h)"
+msgstr "àààààààà ààà àààààààà àààà àààà ààààààà àààààààà ààààààà ààà à'à (_h)"
 
-#: ../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 "ààààààà"
+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)"
+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)"
+msgstr "ààààààà àààààà àààààà ààààààà ààààààààà àààààààà ààà (_v)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:62
+#: ../camel/providers/imap/camel-imap-provider.c:53
 msgid "Names_pace:"
-msgstr "ààà-àààààà (_p):"
+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/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
-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
-#| msgid "Check new messages for Jun_k contents"
-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
-msgid "Only check for Junk messages in the IN_BOX folder"
-msgstr "INBOX (àààààà) àààààààà ààà àààààààà àààààà (Junk) ààààààà ààà à'à(_B)"
-
-#: ../camel/providers/imap/camel-imap-provider.c:74
-#: ../camel/providers/imapx/camel-imapx-provider.c:82
-msgid "Automatically synchroni_ze remote mail locally"
-msgstr "àààààààààààààà àààààààà àààààà ààààààààààà àààà ààààààà ààà à'à (_z)"
-
-#: ../camel/providers/imap/camel-imap-provider.c:80
-msgid "IMAP default port"
-msgstr "IMAP ààààààààà ààààà"
-
-#: ../camel/providers/imap/camel-imap-provider.c:81
-#: ../camel/providers/imapx/camel-imapx-provider.c:89
-msgid "IMAP over SSL"
-msgstr "SSL à àààà IMAP"
-
-#: ../camel/providers/imap/camel-imap-provider.c:87
-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 "STARTTLS ààààààà ààà"
-
-#: ../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 "%s'à àààà IMAP ààààààà, %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 "ààààà ààààààààààà ààààààà ààà ààà àààààààà àààà àààààà ààà"
-
-#: ../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 "tmp ààààààà àààà ààà àààààà àà: "
-
-#: ../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 "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] "àààààà àààà ààààààà ààà %d ààààààà àààà %s à"
-msgstr[1] "àààààà àààà ààààààà ààà %d ààààààààààà àààà %s à"
-
-#: ../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 "àààààà ààà ààààààà àààààà"
+msgstr "àààààààààà"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4540
-#| msgid "Creating folder '%s'"
-msgid "Error fetching folders"
-msgstr "ààààààààààà ààààààà ààààà àààààà"
+#: ../camel/providers/imap/camel-imap-provider.c:57
+#: ../camel/providers/imapx/camel-imapx-provider.c:61
+#: ../camel/providers/nntp/camel-nntp-provider.c:43
+msgid "Apply _filters to new messages in all folders"
+msgstr "àààà àààààààààààà àààà ààààààààààà ààààààààààààà àààààà ààà (_f)"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4614
-#| msgid "_Show only subscribed folders"
-msgid "Error subscribing to folder"
-msgstr "ààààààààà àààààààà ààààà àààààà"
+#: ../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/imapx/camel-imapx-server.c:4667
-#| msgid "Storing folder"
-msgid "Error creating folder"
-msgstr "ààààààà àààààà ààààà àààààà"
+#: ../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/imapx/camel-imapx-server.c:4712
-#| msgid "Storing folder"
-msgid "Error deleting folder"
-msgstr "ààààààà ààà ààààààà àààààà"
+#: ../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 "INBOX (àààààà) àààààààà ààà àààààààà àààààà (Junk) ààààààà ààà à'à (_B)"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4762
-#| msgid "Storing folder"
-msgid "Error renaming folder"
-msgstr "ààààààà ààààààààààà ààààà àààààà"
+#: ../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/imapx/camel-imapx-server.c:4813
-#| msgid "Error performing search"
-msgid "Error performing NOOP"
-msgstr "NOOP ààààààà ààààà àààààà"
+#: ../camel/providers/imap/camel-imap-provider.c:71
+msgid "IMAP default port"
+msgstr "IMAP ààààààààà ààààà"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4908
-msgid "Error syncing changes"
-msgstr "àààààààààààà ààààààà ààààà àààààà"
+#: ../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/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:78
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1076
-#, c-format
-#| msgid "Retrieving quota information for '%s'"
-msgid "Retrieving folder list for %s"
-msgstr "%s à àààà ààààààà àààààà àààààà ààà"
+#: ../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:1176
-#: ../camel/providers/nntp/camel-nntp-store.c:1790
+#: ../camel/providers/imap/camel-imap-store.c:2158
+#: ../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 "No such folder: %s"
-msgstr "àà àààà ààààààà ààààààà ààà: %s"
+msgid "Cannot create folder '%s': folder exists."
+msgstr "`%s' ààààààà àààààà àààààà àààààà: ààààààà àààààààà àààààààà"
 
-#: ../camel/providers/imapx/camel-imapx-stream.c:70
+#: ../camel/providers/imap/camel-imap-store.c:2921
 #, c-format
-msgid "Source stream returned no data"
-msgstr "ààà àààààààà àààà àààà ààààà àààààà"
+msgid "Retrieving list of folders at '%s'"
+msgstr "'%s' à àààààààààààà àààààà àààààà ààà àààà"
 
-#: ../camel/providers/imapx/camel-imapx-stream.c:79
+#: ../camel/providers/imap/camel-imap-store.c:3263
 #, c-format
-msgid "Source stream unavailable"
-msgstr "ààà ààààààà àààààà ààà"
+msgid "Server unexpectedly disconnected"
+msgstr "àààààààà àààà ààààààààààà àààà ààààà ààààààààà ààà àààà"
+
+#: ../camel/providers/imap/camel-imap-store.c:3266
+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
 #, c-format
@@ -3573,19 +3495,18 @@ msgstr "~%s (%s)"
 #: ../camel/providers/local/camel-local-folder.c:210
 #, c-format
 msgid "mailbox: %s (%s)"
-msgstr "àààà-àààà:%s (%s)"
+msgstr "àààààààà:%s (%s)"
 
 #: ../camel/providers/local/camel-local-folder.c:219
 #, 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:495
 msgid "_Index message body data"
 msgstr "àààà àààààà àààà àààà (_I)"
 
-#: ../camel/providers/local/camel-local-folder.c:712
+#: ../camel/providers/local/camel-local-folder.c:723
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3594,69 +3515,69 @@ msgstr ""
 "ààààààà %s à ààà àààààà %s ààààààà àààà àààààà\n"
 "%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)"
+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-ààààààààà àààà ààààààààà"
+msgstr "MH-àààààààà àààà ààààààààààààà"
 
-#: ../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-àààààà àààà àààààààààà àààà ààààààà àààà ààààààààà àààààààààà"
+msgstr "MH-àààààà àààà àààààààààà àààà ààààààà àààà àààààààà àààààààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:70
+#: ../camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
-msgstr "ààààààà ààààààààààààà"
+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."
 msgstr ""
-"àààààà mbox-ààààààààà àààààà ààà Evolution àààààà àààààààà àààààààà àààà ààààààà "
-"àààà àààààà (àààààààà) àààààà àààààààà"
+"ààààààààà mbox-àààààààà àààààà ààà Evolution àààààà ààààààààààà àààààààà àààà ààààààà "
+"àààà àààààà (àààààààààà) àààààà àààààààà"
 
-#: ../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-ààààààààà àààà ààààààààà"
+msgstr "Maildir-àààààààà àààà ààààààààààààà"
 
-#: ../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 àààààààààà àààà ààààààà àààà ààààààààà àààààààààà"
+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)"
+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 ààààà ààààààà"
+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."
 msgstr ""
-"àààààààà àààààà mbox ààààà àààààààà àààà ààààààà àààà ààààààà ààà à ààààààààà ààààà\n"
-"Elm, Pine àààà Mutt ààààààààà àààààààà àààà àààà ààààà ààààààà ààà ààààà"
+"ààààààà ààààààààà mbox ààààà àààààààà àààà ààààààà àààà ààààààà ààà ààà àààààààà "
+"ààààà\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 ààààà ààààààààà"
+msgstr "ààààààààà Unix mbox ààààà ààààààààà"
 
 #: ../camel/providers/local/camel-local-store.c:98
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
-msgstr "àààààààà ààà %sà ààà %s'à àààààààà àààààà àààààà: %s"
+msgstr "àààààààà ààà %s à ààà %s àà àààààààà àààààà àààààà: %s"
 
 #: ../camel/providers/local/camel-local-store.c:178
 #, c-format
@@ -3670,12 +3591,12 @@ msgstr "ààààààà àààà ààààààà %s"
 #: ../camel/providers/local/camel-spool-store.c:86
 #, c-format
 msgid "Store root %s is not an absolute path"
-msgstr "àààààààààààà root %s'à ààà ààààààààààà ààà"
+msgstr "ààààààààààà root %s à àà ààààààààààà ààà"
 
 #: ../camel/providers/local/camel-local-store.c:227
 #, c-format
 msgid "Store root %s is not a regular directory"
-msgstr "àààààààààààà root %s ààààààààà ààààààààà ààà"
+msgstr "ààààààààààà root %s ààààààààà ààààààààà ààà"
 
 #: ../camel/providers/local/camel-local-store.c:239
 #: ../camel/providers/local/camel-local-store.c:249
@@ -3683,34 +3604,34 @@ msgstr "àààààààààààà root %s ààààààààà
 #: ../camel/providers/local/camel-maildir-store.c:134
 #, c-format
 msgid "Cannot get folder: %s: %s"
-msgstr "ààààààà ààààààà àààààà àààà: %s: %s"
+msgstr "ààààààà ààààààà àààààà àààààà: %s: %s"
 
 #: ../camel/providers/local/camel-local-store.c:286
 #, c-format
 msgid "Local stores do not have an inbox"
-msgstr "ààààààà àààààààààààà àààà àààààà ààààààààà"
+msgstr "ààààààà ààààààààààà àààà àààààà ààààààààà"
 
 #: ../camel/providers/local/camel-local-store.c:445
 #: ../camel/providers/local/camel-mbox-store.c:722
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
-msgstr "ààààààà ààààààà àààà '%s' àààà ààààà àààààà: %s"
+msgstr "ààààààà àààà ààààààà '%s' ààà ààààààà àààààà: %s"
 
 #: ../camel/providers/local/camel-local-store.c:473
 #: ../camel/providers/local/camel-mbox-store.c:752
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
-msgstr "àààààààà àààà àààà '%s' àààà ààààà àààààà: %s"
+msgstr "àààààààà àààà ààààààà '%s' ààà ààààààà àààààà: %s"
 
 #: ../camel/providers/local/camel-local-store.c:581
 #, c-format
 msgid "Could not rename '%s': %s"
-msgstr "'%s'à àààààààà àààààà àààààà: %s"
+msgstr "'%s' à àààààààààà àààààà àààààà: %s"
 
 #: ../camel/providers/local/camel-local-summary.c:527
 #, c-format
 msgid "Unable to add message to summary: unknown reason"
-msgstr "àààààà àààààà àààà àààààà ààà àààààà àààààà: âàààààà àààà"
+msgstr "àààààà ààààà àààà àààààà ààà àààààà àààààà: âàààààà àààà"
 
 #: ../camel/providers/local/camel-maildir-folder.c:100
 #: ../camel/providers/local/camel-maildir-folder.c:336
@@ -3741,15 +3662,14 @@ msgstr "ààààààà ààààààà ààààààà: %s 
 
 #: ../camel/providers/local/camel-maildir-store.c:109
 #, 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:786
 #, c-format
 msgid "Folder %s already exists"
-msgstr "ààààààà %s ààààààà ààààààà"
+msgstr "ààààààà %s àààààààà ààààààà"
 
 #: ../camel/providers/local/camel-maildir-store.c:215
 #: ../camel/providers/local/camel-maildir-store.c:246
@@ -3757,7 +3677,7 @@ msgstr "ààààààà %s ààààààà ààààààà"
 #: ../camel/providers/local/camel-mbox-store.c:403
 #, c-format
 msgid "Cannot create folder '%s': %s"
-msgstr "ààààààà '%s' ààààààà ààààà àààààà: %s"
+msgstr "ààààààà '%s' àààààà ààààà àààààà: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:230
 #: ../camel/providers/local/camel-mbox-store.c:355
@@ -3776,47 +3696,47 @@ msgstr "ààààààà '%s' ààààààà ààààà àà
 #: ../camel/providers/local/camel-maildir-store.c:263
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
-msgstr "ààààààà '%s' ààààààà ààààà àààààà: maildir ààààààààà àààà"
+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
 #, c-format
 msgid "Could not delete folder '%s': %s"
-msgstr "'%s' ààààààà àààà àààà ààààà: %s"
+msgstr "'%s' ààààààà ààà àààààà ààààà: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:331
 msgid "not a maildir directory"
-msgstr "maildir ààààààààà ààà"
+msgstr "ààà maildir ààààààààà ààà"
 
 #: ../camel/providers/local/camel-maildir-store.c:569
-#: ../camel/providers/local/camel-maildir-store.c:970
+#: ../camel/providers/local/camel-maildir-store.c:974
 #: ../camel/providers/local/camel-spool-store.c:209
 #: ../camel/providers/local/camel-spool-store.c:228
 #, 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:777
 #, c-format
 msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
-msgstr "ààààààà: %s àààà ààààààà àààà àààààà: ààààààà àààà ààà àààààà ààààà ààààààà"
+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"
+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 "àààààààà ààààààà ààààààà àààààààà"
+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
@@ -3836,34 +3756,34 @@ msgstr "mbox ààààààà: %s àà àààààà ààààà
 
 #: ../camel/providers/local/camel-mbox-folder.c:382
 msgid "The folder appears to be irrecoverably corrupted."
-msgstr "ààààààààà àààààààààà ààààààààààà àààà ààà àààààààààà ààà ààààà àààà"
+msgstr "ààààààààà àààààààààà ààààààààààà àààà ààà àààààààààà ààà ààààà àààà"
 
 #: ../camel/providers/local/camel-mbox-folder.c:439
 #: ../camel/providers/local/camel-spool-folder.c:70
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
-msgstr "%s'à ààà ààààààà àà ààààààà àààààà àààààà: %s"
+msgstr "%s à ààà ààààààà àà àààààà àààààà àààààà: %s"
 
 #: ../camel/providers/local/camel-mbox-store.c:377
 #: ../camel/providers/local/camel-mbox-store.c:563
 #, c-format
 msgid "Cannot create a folder by this name."
-msgstr "ààààààà ààà àààààà ààààààà ààààààà àààààà ààààààà"
+msgstr "ààààààà ààà àààààà ààààààà àààààà àààààà ààààààà"
 
 #: ../camel/providers/local/camel-mbox-store.c:414
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
-msgstr "'%s' ààààààà ààààààà ààà ààààà: ààààààààà àààà àààà"
+msgstr "'%s' ààààààà ààààààà ààà ààààà: ààààààààà ààààààà àààà"
 
 #: ../camel/providers/local/camel-mbox-store.c:579
 #, c-format
 msgid "Cannot create directory '%s': %s."
-msgstr "'%s' ààààààààà ààààààà ààààà àààààà: %sà"
+msgstr "'%s' ààààààààà àààààà ààààà àààààà: %sà"
 
 #: ../camel/providers/local/camel-mbox-store.c:591
 #, c-format
 msgid "Cannot create folder: %s: %s"
-msgstr "ààààààà ààààààà àààààà àààààà: %s: %s"
+msgstr "ààààààà àààààà àààààà àààààà: %s: %s"
 
 #: ../camel/providers/local/camel-mbox-store.c:593
 msgid "Folder already exists"
@@ -3877,24 +3797,24 @@ msgid ""
 "Could not delete folder '%s':\n"
 "%s"
 msgstr ""
-"ààààààà '%s' àààà àààà ààààà:\n"
+"ààààààà '%s' ààà àààààà ààààà:\n"
 "%s"
 
 #: ../camel/providers/local/camel-mbox-store.c:656
 #, c-format
 msgid "'%s' is not a regular file."
-msgstr "'%s' ààààààààà àààà àààà"
+msgstr "'%s' ààààààààà ààààààà àààà"
 
 #: ../camel/providers/local/camel-mbox-store.c:665
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
-msgstr "ààààààà '%s' ààààà àààà àààà àààà àààà àààà"
+msgstr "ààààààà '%s' ààààà àààà ààà àààààà àààà àààà"
 
 #: ../camel/providers/local/camel-mbox-store.c:692
 #: ../camel/providers/local/camel-mbox-store.c:707
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
-msgstr "ààààààà àààààà àààà '%s' àààà ààààà àààààà: %s"
+msgstr "ààààààà àààààà ààààààà '%s' ààà ààààààà àààààà: %s"
 
 #: ../camel/providers/local/camel-mbox-store.c:789
 #, c-format
@@ -3904,12 +3824,12 @@ msgstr "àààà àààààààà ààà ààà àààà"
 #: ../camel/providers/local/camel-mbox-store.c:805
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
-msgstr "'%s'à ààà àààààààà ààà ààààà: '%s': %s"
+msgstr "'%s à àààààààààà ààà ààààà: '%s': %s"
 
 #: ../camel/providers/local/camel-mbox-store.c:888
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
-msgstr "'%s'à ààà %s'à àààààààà àààààà àààààà: %s"
+msgstr "'%s à ààà %s àà àààààààààà àààààà àààààà: %s"
 
 #: ../camel/providers/local/camel-mbox-summary.c:428
 #, c-format
@@ -3937,7 +3857,7 @@ msgstr "ààààààà ààààààà àààààà: %s: %s"
 #: ../camel/providers/local/camel-spool-summary.c:152
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
-msgstr "ààààààà àààà-àààà ààààààà àààààà: %s"
+msgstr "ààààààà àààààààà ààààààà àààààà: %s"
 
 #: ../camel/providers/local/camel-mbox-summary.c:693
 #: ../camel/providers/local/camel-mbox-summary.c:918
@@ -3953,7 +3873,7 @@ msgstr "ààààààà ààààààà àààà ààààà
 #: ../camel/providers/local/camel-mbox-summary.c:721
 #, c-format
 msgid "Could not rename folder: %s"
-msgstr "àààààààà ààà àààààààà àààààà àààààà: %s"
+msgstr "àààààààà àààààààààà àààààà àààààà: %s"
 
 #: ../camel/providers/local/camel-mbox-summary.c:816
 #: ../camel/providers/local/camel-mbox-summary.c:1084
@@ -3975,7 +3895,7 @@ msgstr ""
 #: ../camel/providers/local/camel-mbox-summary.c:1124
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
-msgstr "ààààààààà àààà à àààààààà ààààà, àààààààà (sync) ààààà"
+msgstr "ààààààààà àààà ààà ààààààà àààà, àààààààà (sync) ààààà"
 
 #: ../camel/providers/local/camel-mbox-summary.c:1029
 #: ../camel/providers/local/camel-spool-summary.c:345
@@ -3987,12 +3907,12 @@ msgstr "âàààààà àààààà: %s"
 #: ../camel/providers/local/camel-mbox-summary.c:1212
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
-msgstr "ààààààà àààà-ààààà ààààà àààààà: %s"
+msgstr "ààààààà àààààààààà àààààà àààààà: %s"
 
 #: ../camel/providers/local/camel-mbox-summary.c:1201
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
-msgstr "ààààààà àààà-ààààà ààààà àààààà: %s: %s"
+msgstr "ààààààà àààààààààà àààààà àààààà: %s: %s"
 
 #: ../camel/providers/local/camel-mh-folder.c:119
 #, c-format
@@ -4002,27 +3922,27 @@ msgstr "mh ààààààà: %s àà àààààà ààààà
 #: ../camel/providers/local/camel-mh-store.c:535
 #, c-format
 msgid "Could not create folder '%s': %s"
-msgstr "ààààààà '%s' ààààààà ààààà àààààà: %s"
+msgstr "ààààààà '%s' àààààà ààààà àààààà: %s"
 
 #: ../camel/providers/local/camel-mh-store.c:551
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
-msgstr "ààààààà '%s' ààààààà ààààà àààààà: ààààààààà àààà"
+msgstr "ààààààà '%s' ààààààà ààààà àààààà: ààààààààà àààà"
 
 #: ../camel/providers/local/camel-mh-summary.c:227
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
-msgstr "MH àààààààààà ààà ààààààà àààààà: %s: %s"
+msgstr "MH àààààààààà àà ààààààà àààààà: %s: %s"
 
 #: ../camel/providers/local/camel-spool-store.c:94
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
-msgstr "ààààà '%s' ààààà àààààà: %s"
+msgstr "ààààà '%s' ààààààà àààààà: %s"
 
 #: ../camel/providers/local/camel-spool-store.c:108
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
-msgstr "ààààà '%s' ààààààààà àààà àààà ààààààààà ààà"
+msgstr "ààààà '%s' ààààààààà ààààààà àààà ààààààààà ààà"
 
 #: ../camel/providers/local/camel-spool-store.c:416
 #, c-format
@@ -4035,7 +3955,6 @@ msgid "Spool folder tree %s"
 msgstr "ààààà ààààààà àààà %s"
 
 #: ../camel/providers/local/camel-spool-store.c:423
-#| msgid "Invalid source"
 msgid "Invalid spool"
 msgstr "àààà ààààà"
 
@@ -4050,7 +3969,7 @@ msgid ""
 "Could not open folder '%s':\n"
 "%s"
 msgstr ""
-"ààààààà '%s' ààààà àààààà:\n"
+"ààààààà '%s' ààààààà àààààà:\n"
 "%s"
 
 #: ../camel/providers/local/camel-spool-store.c:499
@@ -4064,28 +3983,28 @@ msgid ""
 "Could not create folder '%s':\n"
 "%s"
 msgstr ""
-"ààààààà '%s' ààààààà ààààà àààààà:\n"
+"ààààààà '%s' àààààà ààààà àààààà:\n"
 "%s"
 
 #: ../camel/providers/local/camel-spool-store.c:520
 #, c-format
 msgid "'%s' is not a mailbox file."
-msgstr "'%s' àààà-àààà àààà àààà"
+msgstr "'%s' àààààààà ààààààà àààà"
 
 #: ../camel/providers/local/camel-spool-store.c:584
 #, c-format
 msgid "Store does not support an INBOX"
-msgstr "ààààààààààà INBOX'à àààààààà ààààààà ààà"
+msgstr "àààààààààà INBOX à àààààààà ààààààà ààà"
 
 #: ../camel/providers/local/camel-spool-store.c:603
 #, c-format
 msgid "Spool folders cannot be deleted"
-msgstr "ààààà ààààààà àààà àààà ààààà"
+msgstr "ààààà ààààààà ààà àààààà ààààà"
 
 #: ../camel/providers/local/camel-spool-store.c:618
 #, c-format
 msgid "Spool folders cannot be renamed"
-msgstr "ààààà àààààààà ààà àààààààà ààà ààààà ààà"
+msgstr "ààààà àààààààà àààààààààà ààà ààààà ààà"
 
 #: ../camel/providers/local/camel-spool-summary.c:168
 #: ../camel/providers/local/camel-spool-summary.c:180
@@ -4110,23 +4029,23 @@ 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"
+msgstr "àààààààààà àààààà: UID à ààààààà àààà ààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:340
-#: ../camel/providers/nntp/camel-nntp-folder.c:344
+#: ../camel/providers/nntp/camel-nntp-folder.c:328
+#: ../camel/providers/nntp/camel-nntp-folder.c:332
 #: ../camel/providers/pop3/camel-pop3-folder.c:611
 #: ../camel/providers/pop3/camel-pop3-folder.c:995
 #, 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/nntp/camel-nntp-folder.c:339
+#: ../camel/providers/nntp/camel-nntp-folder.c:504
 #: ../camel/providers/pop3/camel-pop3-folder.c:549
 #: ../camel/providers/pop3/camel-pop3-folder.c:601
 #: ../camel/providers/pop3/camel-pop3-folder.c:620
@@ -4134,23 +4053,23 @@ msgstr "%s àààààà ààààààà àààààà ààà
 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 àààààààà ààà àààààà ààà ààà ààààà ààà!"
@@ -4158,12 +4077,12 @@ msgstr "NNTP àààààààà ààà àààààà ààà à
 #: ../camel/providers/nntp/camel-nntp-provider.c:48
 msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr ""
-"ààààààààà àààààààà ààààààà àààààààà ààà ààà (àààààà comp.os.linux'à àààààààà c.o."
+"ààààààààà ààààààà ààààààà àààààààà ààà à'à (àààààà comp.os.linux à àààààààà c.o."
 "linux) (_S)"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:50
 msgid "In the subscription _dialog, show relative folder names"
-msgstr "àààààààààààà àààààà, àààààààà àààààààà ààà àààààààà ààà ààà (_d)"
+msgstr "ààààààààà àààààà, àààààààà àààààààà ààà àààààààà ààà à'à (_d)"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:56
 msgid "Default NNTP port"
@@ -4175,86 +4094,88 @@ msgstr "SSL à àààà NNTP"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:63
 msgid "USENET news"
-msgstr "USENET àààà"
+msgstr "USENET ààààà"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:65
 msgid "This is a provider for reading from and posting to USENET newsgroups."
-msgstr "USENET àààààààààà àààààà ààà à ààààà àààààà ààààààà àààààà ààààààààà"
+msgstr "USENET àààààààà àààààà ààà ààà ààààà àààààà ààààààà àààààà ààààààààà"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:86
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
-msgstr "àà àààààààà ààà ààà àààààà-àààààà àààààààà àààààà NNTP ààààà àààààààààà ààà à'àà"
+msgstr ""
+"àà ààààààà àààààààà ààà àààààà-ààààà àààààààà àààààà NNTP ààààààà àààààààààà ààà "
+"à'àà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:285
+#: ../camel/providers/nntp/camel-nntp-store.c:283
 #, c-format
 msgid "Could not read greeting from %s: "
-msgstr "%s à ààà ààààààà àààà àààààà: "
+msgstr "%s à ààà àààààààà àààà àààààà: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:297
+#: ../camel/providers/nntp/camel-nntp-store.c:295
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
-msgstr "NNTP ààààààà %s àààààà àààà ààà %d àààààà àààà: %s"
+msgstr "NNTP ààààààà %s àààààà àààà à'à %d àààààà àààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:469
+#: ../camel/providers/nntp/camel-nntp-store.c:458
 #, c-format
 msgid "USENET News via %s"
-msgstr "%s'à ààààààà USENET àààà"
+msgstr "%s à ààààààà USENET ààààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1072
+#: ../camel/providers/nntp/camel-nntp-store.c:1044
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
 "\n"
 "%s"
 msgstr ""
-"àààà-ààààà àààààà àààààà àààààà:\n"
+"ààààààà àààààà àààààà àààààà:\n"
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1165
+#: ../camel/providers/nntp/camel-nntp-store.c:1136
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr "àààà àààààààààààà ààààààà ààààààà àààààà àààààà: àààààààà ààà-àààààààà àààà"
+msgstr "ààààà ààààààààààà ààààààà àààààà àààààà àààààà: àààààààà àààààààà àààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1181
+#: ../camel/providers/nntp/camel-nntp-store.c:1152
 #, c-format
 msgid "You cannot rename a folder in a News store."
-msgstr "àààà àààààààààààà àààà àààààààà ààà àààààààà ààà ààààà àààà"
+msgstr "ààààà ààààààààààà àààà àààààààà àààààààààà ààà ààààà àààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1204
+#: ../camel/providers/nntp/camel-nntp-store.c:1175
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr "àààà àààààààààààà àààà ààààààà àààà àààà ààààà ààà: àààààààà àà-ààààààààààà àààà"
+msgstr "ààààà ààààààààààà àààà ààààààà ààà àààààà ààààà ààà: àààààààà ààààààààà àààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1402
+#: ../camel/providers/nntp/camel-nntp-store.c:1371
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
-"ààààààà àààààààààà ààààààààààà àààààà àààààà:\n"
+"ààààààà ààààààààà àààààààà àààààà àààààà:\n"
 "\n"
-"àà ààààààààà ààààààà àààà ààààààààà ààààààà àààààà ààà ààààààààà àààààààà"
+"àà ààààààà ààààààà àààà ààààààààà ààààààà àààààà ààà àààààà àààààààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1453
+#: ../camel/providers/nntp/camel-nntp-store.c:1416
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
-"ààààààà àààà-àààààà ààà àà-ààààààààààà ààà ààààà ààà:\n"
+"ààààààà àààààààà ààà ààààààààà ààà ààààà ààà:\n"
 "\n"
-"àààà-ààààà ààààààà ààà!"
+"ààààààà ààààààà ààà!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1647
+#: ../camel/providers/nntp/camel-nntp-store.c:1606
 msgid "NNTP Command failed: "
-msgstr "NNTP  àààààà àààààà àà: "
+msgstr "NNTP àààààà àààààà àà: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1732
+#: ../camel/providers/nntp/camel-nntp-store.c:1691
 #, c-format
 msgid "Not connected."
 msgstr "ààààààà àààà"
@@ -4268,17 +4189,17 @@ msgstr "%s: àààà àààààà ààààààà ààà à
 #: ../camel/providers/nntp/camel-nntp-summary.c:213
 #, c-format
 msgid "Unexpected server response from xover: %s"
-msgstr "xoverà ààà ààààààààààà àààààà ààààààààààà ààààààà àààà: %s"
+msgstr "xover à ààà ààààààààààà àààààààà ààààààààààà ààààààà àààà: %s"
 
 #: ../camel/providers/nntp/camel-nntp-summary.c:340
 #, c-format
 msgid "Unexpected server response from head: %s"
-msgstr "headà ààà ààààààààààà àààààà ààààààààààà ààààààà àààà: %s"
+msgstr "head à ààà ààààààààààà àààààààà ààààààààààà ààààààà àààà: %s"
 
 #: ../camel/providers/nntp/camel-nntp-summary.c:387
 #, c-format
 msgid "Operation failed: %s"
-msgstr "àààà àààà: %s"
+msgstr "àààà àààààà: %s"
 
 #: ../camel/providers/pop3/camel-pop3-folder.c:447
 #: ../camel/providers/pop3/camel-pop3-folder.c:517
@@ -4297,7 +4218,7 @@ msgstr "âàààààà àààà"
 
 #: ../camel/providers/pop3/camel-pop3-folder.c:660
 msgid "Retrieving POP summary"
-msgstr "POP'à ààààààààà àààà ààààààà ààà àààà"
+msgstr "POP à ààààààààà àààà ààààààà ààà àààà"
 
 #: ../camel/providers/pop3/camel-pop3-folder.c:711
 msgid "Cannot get POP summary: "
@@ -4305,11 +4226,11 @@ msgstr "POP àààààà ààààààà àààà àààà
 
 #: ../camel/providers/pop3/camel-pop3-folder.c:823
 msgid "Expunging old messages"
-msgstr "àààààà àààààà àààààààààà ààààà ààà àààà"
+msgstr "ààààà àààààà àààààààààà ààààà ààà àààà"
 
 #: ../camel/providers/pop3/camel-pop3-folder.c:843
 msgid "Expunging deleted messages"
-msgstr "àààà àààà àààààà àààààààààà ààààà ààà àààà"
+msgstr "ààà àààààà àààààà àààààààààà ààààà ààà àààà"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:39
 msgid "Message Storage"
@@ -4317,13 +4238,13 @@ msgstr "àààààà ààààààà"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
-msgstr "ààààààà àààà àààààà àààà àààà ààà (_L)"
+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
 #, c-format
 msgid "_Delete after %s day(s)"
-msgstr "%s ààà àààààààààà ààà àààà àààà ààà (_D)"
+msgstr "%s ààà(àààà) ààààààà ààà ààà àààààà à'à (_D)"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:46
 msgid "Delete _expunged from local Inbox"
@@ -4331,7 +4252,7 @@ msgstr "ààààààà ààààààà ààà àààààà
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:48
 msgid "Disable _support for all POP3 extensions"
-msgstr "àààààààà POP3 àààààààààà àààà àààààà ààààààààà ààà ààà (_s)"
+msgstr "àààààààà POP3 àààààààààà àààà àààààà ààààààààà ààà à'à (_s)"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:54
 msgid "Default POP3 port"
@@ -4347,15 +4268,15 @@ msgstr "POP"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:64
 msgid "For connecting to and downloading mail from POP servers."
-msgstr "àààààààà POP àààààà àààà ààààà à àààà ààààà'à ààààà àààààààààà"
+msgstr "àààààààà POP àààààààà àààà ààààà ààà àààà ààààà'à àààà àààààààààà"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:84
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
-"àà àààààààà ààà ààà àààààà-àààààà àààààààà àààààà POP àààààà àààà ààààà ààà à'àà "
-"ààààààà POP àààààà àààààà ààà àà àààààààà ààààààà ààà"
+"àà ààààààà àààààààà ààà àààààà-ààààà àààààààà àààààà POP àààààààà àààà ààààà ààà "
+"à'àà ààààààà POP àààààààà àààààà ààà àà àààààààà ààààààà ààà"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:94
 msgid ""
@@ -4363,9 +4284,9 @@ msgid ""
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
-"àà àààààààà ààà ààà ààààààààà ààà àààààààà àààààà APOP àààààààààà ààààààà POP "
-"àààààà àààà ààààà ààà à'àà àààà àààààà àààààà àà ààààààààà ààààààà àààà àà "
-"àààààààààààààà àààà ààà ààààààà ààà ààà ààààà ààà ààààà"
+"àà ààààààà àààààààà ààà ààààààààà ààà àààààààà àààààà APOP àààààààà ààààààà POP "
+"àààààààà àààà ààààà ààà à'àà ààà àààààààà àààààà àà ààààààààà ààààààà àààà àààà "
+"àààààààààààààààà àààà àààà ààààààà ààà ààààà àààà ààààà"
 
 #. Translators: This is the separator between an error and an explanation
 #: ../camel/providers/pop3/camel-pop3-store.c:83
@@ -4375,16 +4296,16 @@ msgstr ": "
 #: ../camel/providers/pop3/camel-pop3-store.c:136
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
-msgstr "POP ààààààà %sà ààà ààààààà ààààààà àààà àààààà"
+msgstr "POP ààààààà %s à ààà ààààààà àààààààà ààààà àààààà"
 
 #: ../camel/providers/pop3/camel-pop3-store.c:153
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr "àààààà àààà POP ààààààà %s'à àààà ààààà àààààà àààààà: %s"
+msgstr "àààààààà ààààààà POP ààààààà %s à àààà ààààà àààààà àààààà: %s"
 
 #: ../camel/providers/pop3/camel-pop3-store.c:154
 msgid "STLS not supported by server"
-msgstr "àààààà àààààà STLS ààààààà ààà"
+msgstr "àààààààà àààààà STLS ààààààà ààà"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
 #: ../camel/providers/pop3/camel-pop3-store.c:172
@@ -4400,34 +4321,33 @@ msgstr "àààààààà ààààààà POP ààààààà
 #: ../camel/providers/pop3/camel-pop3-store.c:288
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
-msgstr "POP ààààààà %s'à àà-àà àààààà àààààà: SASL àààààààà ààààààààà àààààà"
+msgstr "POP ààààààà %s à àà-àà àààààà àààààà: SASL ààààààà àààààà"
 
 #: ../camel/providers/pop3/camel-pop3-store.c:310
 #, 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:360
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP3 ààààààà %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:362
+#: ../camel/providers/pop3/camel-pop3-store.c:363
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "%s à %s à àààà POP3 ààààààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:525
+#: ../camel/providers/pop3/camel-pop3-store.c:527
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
 "attack suspected. Please contact your admin."
 msgstr ""
-"POP ààààààà %sà àààà ààààà ààààààà àààààà:\tàààà APOP ID àààààààà àààààà àààà ààààà "
-"àààà ààà ààààààààààà ààààààààà ààà ààààà ààààààà ààà ààààààààààààààààààà àààà ààààààà "
-"àààà"
+"POP ààààààà %s à àààà ààààà ààààààà àààààà:\tàààà APOP ID àààààààà àààààà ààà ààààà "
+"àààà ààà ààààààà ààààààààà ààà ààààà ààààààà ààà àààààààà àààà ààààààà àààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:577
+#: ../camel/providers/pop3/camel-pop3-store.c:579
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4438,7 +4358,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:594
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4447,17 +4367,17 @@ msgstr ""
 "POP ààààààà %s àà ààààà àààààà àààààà\n"
 "àààààààààààààà%s àààààà àààààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:650
+#: ../camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "Could not connect to POP server %s"
-msgstr "POP ààààààà %s'à àààà ààààà àààààà àààààà"
+msgstr "POP ààààààà %s à àààà ààààà àààààà àààààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:678
+#: ../camel/providers/pop3/camel-pop3-store.c:680
 #, c-format
 msgid "No such folder '%s'."
-msgstr "'%s'à àààààà ààààààà ààààààà àààà"
+msgstr "'%s à àààààà ààààààà ààààààà àààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:695
+#: ../camel/providers/pop3/camel-pop3-store.c:697
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 àààààààààààà àààà ààààààà ààààààà ààà"
@@ -4470,7 +4390,7 @@ msgstr "Sendmail"
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
-msgstr "ààààààà àààààààà \"sendmail\" ààààààààààà ààààààà àààà àààààà àààààààààà"
+msgstr "ààààààà àààààààà \"sendmail\" ààààààààà ààààààà àààà ààààààà àààààààààà"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:49
 msgid "sendmail"
@@ -4478,22 +4398,22 @@ msgstr "sendmail"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:51
 msgid "Mail delivery via the sendmail program"
-msgstr "sendmail ààààààààààà ààààààà àààà ààààà"
+msgstr "sendmail ààààààààà ààààààà àààà àààààà"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:86
 #, c-format
 msgid "Could not parse recipient list"
-msgstr "ààààààààà àààààà àààààààà àààààà àààààà"
+msgstr "ààààààààààà àààààà àààààààà àààààà àààààà"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:119
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "sendmail'à àààà àààà ààààààà àààààà àààààà: %s: àààà ààààà ààà ààààà"
+msgstr "sendmail à àààà àààà àààààà àààààà àààààà: %s: àààà àààààà ààà ààààà"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:141
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "sendmail fork àààààà àààààà: %s: àààà ààààà ààà ààààà"
+msgstr "sendmail fork àààààà àààààà: %s: àààà àààààà ààà ààààà"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:184
 msgid "Could not send message: "
@@ -4502,17 +4422,17 @@ msgstr "àààààà àààà àààààà: "
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:212
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
-msgstr "àààààà %s àààààà ààà sendmail àààà àààà: àààà ààààà ààà àààààà"
+msgstr "ààààà %s àààààà ààà sendmail àààà àààà: àààà àààààà ààà àààààà"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:219
 #, c-format
 msgid "Could not execute %s: mail not sent."
-msgstr "%s ààààààà àààààà àààààà: àààà ààààà ààà ààààà"
+msgstr "%s ààààààà àààààà àààààà: àààà àààààà ààà ààààà"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:224
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
-msgstr "%d ààààààà ààààà àààààà ààà sendmail àààà àààà: àààà ààààà ààà àààààà"
+msgstr "%d ààààààà ààààà àààààà ààà sendmail àààà àààà: àààà àààààà ààà àààààà"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:42
 msgid "Default SMTP port"
@@ -4532,362 +4452,521 @@ msgstr "SMTP"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:52
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr "SMTP àààààà àààààààà àààà-ààààà àààà ààààà ààà àààà àààààà àààààààààà"
+msgstr "SMTP àààààà àààààààà àààààààà àààà ààààà ààà àààà ààààààà àààààààààà"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:150
 #: ../camel/providers/smtp/camel-smtp-transport.c:158
 msgid "Welcome response error: "
 msgstr "ààààààà ààààààààààà àààààà: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:195
+#: ../camel/providers/smtp/camel-smtp-transport.c:196
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "àààààà àààà SMTP ààààààà %s'à àààà ààààààà àààààà àààààà: %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:205
+#: ../camel/providers/smtp/camel-smtp-transport.c:218
+#: ../camel/providers/smtp/camel-smtp-transport.c:225
 msgid "STARTTLS command failed: "
 msgstr "STARTTLS àààààà àààààà àà: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:235
+#: ../camel/providers/smtp/camel-smtp-transport.c:236
 #, 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:294
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ààààààà %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:295
+#: ../camel/providers/smtp/camel-smtp-transport.c:297
 #, c-format
 msgid "SMTP mail delivery via %s"
-msgstr "%s'à ààààààà SMTP àààà ààààà"
+msgstr "%s à ààààààà SMTP àààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:367
+#: ../camel/providers/smtp/camel-smtp-transport.c:369
 #, 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:449
 #, 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:479
+#: ../camel/providers/smtp/camel-smtp-transport.c:490
+#: ../camel/providers/smtp/camel-smtp-transport.c:503
 msgid "AUTH command failed: "
 msgstr "AUTH àààààà àààààà àà: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:643
+#: ../camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "Cannot send message: service not connected."
-msgstr "àààààà ààààà àààààà àààààà: ààààààà ààààààà àààà"
+msgstr "àààààà àààààà àààààà àààààà: àààà ààààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:650
+#: ../camel/providers/smtp/camel-smtp-transport.c:649
 #, c-format
 msgid "Cannot send message: sender address not valid."
-msgstr "àààààà ààààà àààààà àààààà: ààààààà ààààà ààà àààà"
+msgstr "àààààà àààààà àààààà àààààà: ààààààà ààààà ààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:654
+#: ../camel/providers/smtp/camel-smtp-transport.c:653
 msgid "Sending message"
-msgstr "àààààà ààààà ààà àààà"
+msgstr "àààààà àààààà ààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:679
+#: ../camel/providers/smtp/camel-smtp-transport.c:678
 #, c-format
 msgid "Cannot send message: no recipients defined."
-msgstr "àààààà ààààà àààààà àààààà: àààààà àààààààà àààà àààà"
+msgstr "àààààà àààààà àààààà àààààà: àààààà àààààààà àààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:692
+#: ../camel/providers/smtp/camel-smtp-transport.c:691
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
-msgstr "àààààà ààààà àààààà àààààà: àà àààà àààà àààààà ààà ààà"
+msgstr "àààààà àààààà àààààà àààààà: ààà àààà àààà àààààà ààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:796
+#: ../camel/providers/smtp/camel-smtp-transport.c:795
 msgid "Syntax error, command unrecognized"
-msgstr "àààààààà àààà àààààà, âàààààà àààààà"
+msgstr "àààààààààààà àààà àààààà, âàààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:798
+#: ../camel/providers/smtp/camel-smtp-transport.c:797
 msgid "Syntax error in parameters or arguments"
-msgstr "ààààààà àààà ààààà àààààààà àààà àààààà"
+msgstr "àààààà àààà ààààà àààààààààààà àààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:800
+#: ../camel/providers/smtp/camel-smtp-transport.c:799
 msgid "Command not implemented"
-msgstr "àààààà àààààààà àààà ààà"
+msgstr "àààààà àààààààà àààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:802
+#: ../camel/providers/smtp/camel-smtp-transport.c:801
 msgid "Command parameter not implemented"
-msgstr "àààààààà ààààààà àààààààà àààà ààà"
+msgstr "ààààààà àààààà àààààààà àààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:804
+#: ../camel/providers/smtp/camel-smtp-transport.c:803
 msgid "System status, or system help reply"
-msgstr "ààààààààà àààààà, àààà ààààààà ààààà ààààààààà ààà ààààààà ààààààààààà"
+msgstr "àààààààà àààààà, àààà ààààààà àààààà ààààààààà ààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:806
+#: ../camel/providers/smtp/camel-smtp-transport.c:805
 msgid "Help message"
 msgstr "àààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:808
+#: ../camel/providers/smtp/camel-smtp-transport.c:807
 msgid "Service ready"
-msgstr "ààààààà àààààààà"
+msgstr "àààà àààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:810
+#: ../camel/providers/smtp/camel-smtp-transport.c:809
 msgid "Service closing transmission channel"
-msgstr "àààààààà àààààà àààààà ààààààà àààà ààà àààà"
+msgstr "ààààà àààààà àààààà ààààààà àààà ààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:812
+#: ../camel/providers/smtp/camel-smtp-transport.c:811
 msgid "Service not available, closing transmission channel"
-msgstr "ààààààà àààààà ààà, àààààà ààààààà àààà ààà àààà"
+msgstr "àààà àààààà ààà, àààààà ààààààà àààà ààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:814
+#: ../camel/providers/smtp/camel-smtp-transport.c:813
 msgid "Requested mail action okay, completed"
-msgstr "àààà ààààààààà àààààà ààà àààà àààà, ààààààà ààà àààà"
+msgstr "àààà àààààà ààà àààà àààà, ààààààà ààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:816
+#: ../camel/providers/smtp/camel-smtp-transport.c:815
 msgid "User not local; will forward to <forward-path>"
-msgstr "ààààààà ààààààààààà ààà; <forward-path>'à àààààààà ààà à'à"
+msgstr "ààààààà ààààààààààà ààà; <forward-path> àà àààààààà ààà à'à"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:818
+#: ../camel/providers/smtp/camel-smtp-transport.c:817
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "àààà ààààààààà àààààà ààà àààà àààààààà àààà ààà: àààà-àààà àààààà ààà"
+msgstr "àààà àààààà ààà àààà àààààààà àààà ààà: àààààààà àààààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:820
+#: ../camel/providers/smtp/camel-smtp-transport.c:819
 msgid "Requested action not taken: mailbox unavailable"
-msgstr "àààààà ààà àààà àààààààà àààà ààà: àààà-àààà àààààà ààà"
+msgstr "àààààà ààà àààà àààààààà àààà ààà: àààààààà àààààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:822
+#: ../camel/providers/smtp/camel-smtp-transport.c:821
 msgid "Requested action aborted: error in processing"
-msgstr "àààààà ààà àààà ààààà ààà àààà: ààààààààààààà àààààà"
+msgstr "àààààà ààà àààà ààààà ààà àààà: àààààààààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:824
+#: ../camel/providers/smtp/camel-smtp-transport.c:823
 msgid "User not local; please try <forward-path>"
-msgstr "ààààààà ààààààààààà ààà; ààààààà ààà <forward-path> ààààààààà ààà"
+msgstr "ààààààà ààààààààààà ààà; ààààààà ààà <forward-path> ààààààààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:826
+#: ../camel/providers/smtp/camel-smtp-transport.c:825
 msgid "Requested action not taken: insufficient system storage"
-msgstr "àààààà ààà àààà àààààààà àààà ààà: ààààààààààà àààààààà ààààà ààààààààà"
+msgstr "àààààà ààà àààà àààààààà àààà ààà: ààààààààààà àààààààà ààààà ààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:828
+#: ../camel/providers/smtp/camel-smtp-transport.c:827
 msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr ""
-"àààà ààààààààà àààààà ààà àààà ààààà ààà àààà: ààààààààààà àààààà ààààà àààààààààà àààà"
+msgstr "àààà àààààà ààà àààà ààààà ààà àààà: àààààààààà àààààà ààààà ààààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:830
+#: ../camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Requested action not taken: mailbox name not allowed"
-msgstr "àààààà ààà àààà àààààààà àààà ààà: àààà-àààààà ààà àààààààààà ààà"
+msgstr "àààààà ààà àààà àààààààà àààà ààà: ààààààààà ààà àààààààààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:832
+#: ../camel/providers/smtp/camel-smtp-transport.c:831
 msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr "àààà ààààà ààààà ààà; ààààà ààààààà ààà <CRLF>.<CRLF>"
+msgstr "àààà ààààà ààààà ààà; ààààà ààààààà ààà <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:834
+#: ../camel/providers/smtp/camel-smtp-transport.c:833
 msgid "Transaction failed"
-msgstr "ààààààààààà àààà"
+msgstr "àààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:838
+#: ../camel/providers/smtp/camel-smtp-transport.c:837
 msgid "A password transition is needed"
 msgstr "àààààààà àààààààà ààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:840
+#: ../camel/providers/smtp/camel-smtp-transport.c:839
 msgid "Authentication mechanism is too weak"
-msgstr "àààààààààà ààààààà ààààà ààà"
+msgstr "àààààààààà ààààààà ààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:842
+#: ../camel/providers/smtp/camel-smtp-transport.c:841
 msgid "Encryption required for requested authentication mechanism"
-msgstr "àààààà ààà àààààààààà ààààààààà ààààààààà ààààààà"
+msgstr "àààààà ààà àààààààààà ààààààà àààààààààà ààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:844
+#: ../camel/providers/smtp/camel-smtp-transport.c:843
 msgid "Temporary authentication failure"
-msgstr "ààààààà àààààà ààààààààà àààà"
+msgstr "ààààààà àààààààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1095
+#: ../camel/providers/smtp/camel-smtp-transport.c:1094
 msgid "SMTP Greeting"
-msgstr "SMTP'à ààààààà"
+msgstr "SMTP à àààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1122
+#: ../camel/providers/smtp/camel-smtp-transport.c:1121
 #: ../camel/providers/smtp/camel-smtp-transport.c:1139
 #: ../camel/providers/smtp/camel-smtp-transport.c:1147
 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:1237
+#: ../camel/providers/smtp/camel-smtp-transport.c:1247
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM àààààà àààààà àà: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1272
+#: ../camel/providers/smtp/camel-smtp-transport.c:1274
 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:1291
+#: ../camel/providers/smtp/camel-smtp-transport.c:1301
 #, 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:1343
+#: ../camel/providers/smtp/camel-smtp-transport.c:1354
+#: ../camel/providers/smtp/camel-smtp-transport.c:1365
+#: ../camel/providers/smtp/camel-smtp-transport.c:1424
+#: ../camel/providers/smtp/camel-smtp-transport.c:1444
 #: ../camel/providers/smtp/camel-smtp-transport.c:1458
+#: ../camel/providers/smtp/camel-smtp-transport.c:1467
 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:1492
+#: ../camel/providers/smtp/camel-smtp-transport.c:1507
+#: ../camel/providers/smtp/camel-smtp-transport.c:1516
 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:1541
+#: ../camel/providers/smtp/camel-smtp-transport.c:1555
+#: ../camel/providers/smtp/camel-smtp-transport.c:1562
 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 UID of a user"
+msgstr "ààà àààààààààààà ààààààà UID"
+
+#: ../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:145
+#: ../libebackend/e-authentication-mediator.c:156
+#: ../libebackend/e-authentication-mediator.c:612
+#: ../libebackend/e-authentication-mediator.c:973
+msgid "Bus name vanished (client terminated?)"
+msgstr "ààà ààà ààààà àà (àààààààà àààà ààà àà àààà?)"
+
+#: ../libebackend/e-authentication-mediator.c:204
+msgid "No response from client"
+msgstr "ààààààààà ààà àààà ààààààààààà ààà"
+
+#: ../libebackend/e-authentication-mediator.c:264
+#: ../libebackend/e-authentication-mediator.c:275
+#: ../libebackend/e-authentication-mediator.c:606
+#: ../libebackend/e-authentication-mediator.c:967
+msgid "Client cancelled the operation"
+msgstr "ààààààààà ààààààà ààààà ààààà"
+
+#: ../libebackend/e-authentication-mediator.c:334
+msgid "Client reports password was rejected"
+msgstr "ààààààààà àààààààà àààà ààà ààààà àààà àààààà"
+
+#: ../libebackend/e-authentication-session.c:530
+msgid "Add this password to your keyring"
+msgstr "àà ààààààààà àààààà àà'ààààà ààà ààà"
+
+#: ../libebackend/e-authentication-session.c:593
+msgid "Password was incorrect"
+msgstr "àààààààà ààà àààà"
+
+#: ../libebackend/e-authentication-session.c:1307
+#: ../libebackend/e-authentication-session.c:1479
+#: ../libebackend/e-authentication-session.c:1658
+msgid "Keyring operation was cancelled"
+msgstr "àà'ààà ààààààà ààààà ààà ààààà"
+
+#: ../libebackend/e-server-side-source.c:161
+#, c-format
+msgid "Data source is missing a [%s] group"
+msgstr "ààààà àààà ààà [%s] àà ààààààààà"
+
+#: ../libebackend/e-server-side-source.c:1045
+#, c-format
+msgid "File must have a '.source' extension"
+msgstr "àààààààà ààà '.source' àààààààààà ààààà ààààà"
+
+#: ../libebackend/e-source-registry-server.c:598
+#, 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 "àààà"
+msgstr "àààà"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:54
 msgctxt "CategoryName"
 msgid "Holiday Cards"
-msgstr "àààà ààààààà ààààààààà"
+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 "àààààààààààààà"
+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 "ààà ààààààà à'à ààà àààà"
+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 "Address book authentication request"
+msgstr "ààààà ààà àààààààààà àààààà"
+
+#: ../libedataserver/e-source-authenticator.c:171
+msgid "Calendar authentication request"
+msgstr "ààààààààà àààààààààà àààààà"
+
+#: ../libedataserver/e-source-authenticator.c:175
+msgid "Mail authentication request"
+msgstr "àààà àààààààààà àààààà"
+
+#. generic account prompt
+#: ../libedataserver/e-source-authenticator.c:178
+msgid "Authentication request"
+msgstr "àààààààààà àààààà"
+
+#: ../libedataserver/e-source-authenticator.c:188
+#, c-format
+msgid "Please enter the password for address book \"%s\"."
+msgstr "ààààààà ààà ààààà ààà \"%s\" à àààà àààààààà ààààààààà"
+
+#: ../libedataserver/e-source-authenticator.c:194
+#, c-format
+msgid "Please enter the password for calendar \"%s\"."
+msgstr "ààààààà ààà ààààààààà \"%s\" à àààà àààààààà ààààààààà"
+
+#: ../libedataserver/e-source-authenticator.c:200
+#, c-format
+msgid "Please enter the password for mail account \"%s\"."
+msgstr "ààààààà ààà àààà ààààààà \"%s\" à àààà àààààààà ààààààààà"
+
+#: ../libedataserver/e-source-authenticator.c:206
+#, c-format
+msgid "Please enter the password for mail transport \"%s\"."
+msgstr "ààààààà ààà àààà àààààà \"%s\" à àààà àààààààà ààààààààà"
+
+#: ../libedataserver/e-source-authenticator.c:212
+#, c-format
+msgid "Please enter the password for memo list \"%s\"."
+msgstr "ààààààà ààà àààà àààààà \"%s\" à àààà àààààààà ààààààààà"
+
+#: ../libedataserver/e-source-authenticator.c:218
+#, c-format
+msgid "Please enter the password for task list \"%s\"."
+msgstr "ààààààà ààà ààààààà àààààà \"%s\" à àààà àààààààà ààààààààà"
+
+#: ../libedataserver/e-source-authenticator.c:224
+#, c-format
+msgid "Please enter the password for account \"%s\"."
+msgstr "ààààààà ààà ààààààà \"%s\" à àààà àààààààà ààààààààà"
+
+#: ../libedataserver/e-source.c:551
+#, c-format
+msgid "Source file is missing a [%s] group"
+msgstr "ààà àààààààà ààà [%s] àà ààààààààà"
+
+#: ../libedataserver/e-source.c:827
+#, c-format
+msgid "Data source '%s' is not removable"
+msgstr "àààà ààà '%s' ààààà àààààà"
+
+#: ../libedataserver/e-source.c:909
+#, c-format
+msgid "Data source '%s' is not writable"
+msgstr "àààà ààà '%s' ààààà ààà ààà"
+
+#: ../libedataserver/e-source.c:1083
+msgid "Unnamed"
+msgstr "ààà ààààà"
+
+#: ../libedataserver/e-source-mail-signature.c:480
+#, c-format
+msgid "Signature script must be a local file"
+msgstr "àààààààà àààà ààà ààààààà ààààààà àà ààààà"
+
+#: ../libedataserver/e-source-registry.c:1479
+msgid "The user declined to authenticate"
+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:1647 ../libedataserver/e-time-utils.c:1945
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
@@ -4895,7 +4974,7 @@ msgstr "%a %m/%d/%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:1652 ../libedataserver/e-time-utils.c:1936
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
@@ -4903,7 +4982,7 @@ msgstr "%a %m/%d/%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:1657 ../libedataserver/e-time-utils.c:1941
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
@@ -4911,78 +4990,78 @@ msgstr "%a %m/%d/%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:1662 ../libedataserver/e-time-utils.c:1932
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%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:1667
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %m/%d/%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:1672
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %m/%d/%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:1675 ../libedataserver/e-time-utils.c:1795
+#: ../libedataserver/e-time-utils.c:1927
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1681
+#: ../libedataserver/e-time-utils.c:1682
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%m/%d/%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:1686
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%m/%d/%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:1691
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%m/%d/%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:1696
 msgid "%m/%d/%Y %H:%M"
 msgstr "%m/%d/%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:1701
 msgid "%m/%d/%Y %I %p"
 msgstr "%m/%d/%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:1706
 msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%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:1709 ../libedataserver/e-time-utils.c:1798
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%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:1869 ../libedataserver/e-time-utils.c:1989
 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:1873 ../libedataserver/e-time-utils.c:1981
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4990,24 +5069,24 @@ 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:1878 ../libedataserver/e-time-utils.c:1986
 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:1882 ../libedataserver/e-time-utils.c:1978
 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
+#: ../libedataserver/e-time-utils.c:1885
 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:1889
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -5020,9 +5099,8 @@ msgid ""
 "What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" "
 "means manual proxy."
 msgstr ""
-"ààà ààààààà ààà ààààààà ààà ààà \"0\" à ààààààà ààààà, \"1\" à àààà ààààààà ààà ààààà, "
-"\"2\" "
-"à ààààààààà ààààààà àààààà"
+"ààà ààààààà ààà ààààààà ààà ààà \"0\" à ààààààà ààààà, \"1\" à àààà ààààààà ààà "
+"ààààà, \"2\" à ààààààààà ààààààà àààààà"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
 msgid "Whether to use http-proxy"
@@ -5037,7 +5115,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 "ààààààà ààààààà ààààà àààààà ààààààààààà ààààààà àà ààà"
 
@@ -5058,25 +5135,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 IMAP server.\n"
-#| "%s\n"
-#| "\n"
 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 "Cannot authenticate to server: %s"
 msgid "Password to use to authenticate against proxy server."
 msgstr "ààààààà àààààààà ààààààà àààààààà àààààà ààààààà àààà ààààà àààààààà"
 
@@ -5105,7 +5175,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 ààààààààààà àààà àààà ààà"
 
@@ -5129,258 +5198,359 @@ 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):"
+msgstr "àààààààà ààààààà ààààààààà (_u):"
 
-#: ../libedataserverui/e-categories-editor.c:237
+#: ../libedataserverui/e-categories-editor.c:239
 msgid "_Available Categories:"
-msgstr "àààààà àààààà: (_A)"
+msgstr "àààààà ààààààààà: (_A)"
 
-#: ../libedataserverui/e-categories-selector.c:322
+#: ../libedataserverui/e-categories-selector.c:324
 msgid "Icon"
 msgstr "àààà"
 
-#: ../libedataserverui/e-categories-selector.c:327
+#: ../libedataserverui/e-categories-selector.c:329
 msgid "Category"
 msgstr "ààààà"
 
-#: ../libedataserverui/e-category-completion.c:299
+#: ../libedataserverui/e-category-completion.c:300
 #, c-format
 msgid "Create category \"%s\""
-msgstr "\"%s\" ààààà ààààààà ààà ààà"
+msgstr "\"%s\" ààààà àààààà ààà à'à"
 
-#: ../libedataserverui/e-category-editor.c:135
+#: ../libedataserverui/e-category-editor.c:137
 msgid "Category Icon"
-msgstr "ààààààààààààà àààààà"
+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)"
+msgstr "àààààà ààà (_N)"
 
-#: ../libedataserverui/e-category-editor.c:184
+#: ../libedataserverui/e-category-editor.c:186
 msgid "Category _Icon"
-msgstr "ààààààà àààààà (_I)"
+msgstr "àààààà àààà (_I)"
 
-#: ../libedataserverui/e-category-editor.c:224
+#: ../libedataserverui/e-category-editor.c:226
 msgid "Category Properties"
-msgstr "ààààààààààààà ààààààààà"
+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 "Passphrase àààààà"
+"ààààààà àààààà '%s' àààà ààà ààààà ààààààà àààà ààààààà ààà ààà àààà ààà ààààààà ààà"
 
-#: ../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)"
+msgstr "ààààà ààà (_o):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:217
-msgid "Cate_gory:"
-msgstr "àààààà: (_g)"
+#: ../libedataserverui/e-name-selector-dialog.c:308
+msgid "Cat_egory:"
+msgstr "ààààà (_e):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:235
+#: ../libedataserverui/e-name-selector-dialog.c:326
 msgid "_Search:"
-msgstr "àààààà: (_S)"
+msgstr "àààààà (_S):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:253
-#: ../libedataserverui/e-name-selector-dialog.c:1038
+#: ../libedataserverui/e-name-selector-dialog.c:344
+#: ../libedataserverui/e-name-selector-dialog.c:1141
 msgid "Any Category"
-msgstr "àààààà àààààà"
+msgstr "àààààà ààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:255
+#: ../libedataserverui/e-name-selector-dialog.c:346
 msgid "Co_ntacts"
 msgstr "ààààààààà (_n)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:310
+#: ../libedataserverui/e-name-selector-dialog.c:401
 msgid "Search"
 msgstr "àààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:313
+#: ../libedataserverui/e-name-selector-dialog.c:404
 msgid "Address Book"
 msgstr "ààààà ààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:316
+#: ../libedataserverui/e-name-selector-dialog.c:407
+#: ../modules/google-backend/module-google-backend.c:183
 msgid "Contacts"
-msgstr "ààààà"
+msgstr "ààààààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:433
+#: ../libedataserverui/e-name-selector-dialog.c:522
 msgid "Select Contacts from Address Book"
 msgstr "ààààà àààà ààà ààààà àààààààà ààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:781
+#: ../libedataserverui/e-name-selector-dialog.c:880
 msgid "_Add"
 msgstr "ààà ààà (_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:785
+#: ../libedataserverui/e-name-selector-dialog.c:884
 msgid "_Remove"
-msgstr "àààà ààààà (_R)"
+msgstr "àààààà (_R)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:957
+#: ../libedataserverui/e-name-selector-dialog.c:1056
 #, c-format
 msgid "Error loading address book: %s"
-msgstr "ààààà ààààà à'à ààààà àààààà: %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:2959
 #, 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:2974
 #, 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:2984
 #, 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:3001
 #, c-format
 msgid "_Edit %s"
-msgstr "%s àààààààà (_E)"
+msgstr "%s àààààààà ààà (_E)"
 
-#: ../libedataserverui/e-name-selector-list.c:524
+#: ../libedataserverui/e-name-selector-list.c:521
 #, c-format
 msgid "_Delete %s"
-msgstr "%s àààà ààààà (_D)"
+msgstr "%s ààà àààààà (_D)"
 
 #: ../libedataserverui/e-passwords.c:126
 msgid "Keyring key is unusable: no user or host name"
-msgstr "àà-àààààà àà àààààààààààà ààà: ààààààààààà àààà ààààà-ààà ààààààààà"
+msgstr "àà-àààà àà àààààààààààà ààà: ààààààààààà àààà àààà ààà ààààààààà"
 
 #: ../libedataserverui/e-passwords.c:701
 #: ../libedataserverui/e-passwords-win32.c:614
 msgid "You have the Caps Lock key on."
-msgstr "àààààààà àààààà"
+msgstr "àààààà Caps Lock àà àà àààà"
 
 #: ../libedataserverui/e-passwords.c:821
 #: ../libedataserverui/e-passwords-win32.c:737
 msgid "_Remember this passphrase"
-msgstr "àààààààà ààà àààà à'à (_R)"
+msgstr "ààààààààà ààà àààà (_R)"
 
 #: ../libedataserverui/e-passwords.c:822
 #: ../libedataserverui/e-passwords-win32.c:738
 msgid "_Remember this passphrase for the remainder of this session"
-msgstr "àààààààà àààààà ààààààà àààà àààà àààààààà ààà àààà à'à (_R)"
+msgstr "àààààààà àààààààà ààààààà àààà àààà ààààààààà ààà àààà (_R)"
 
 #: ../libedataserverui/e-passwords.c:827
 #: ../libedataserverui/e-passwords-win32.c:743
 msgid "_Remember this password"
-msgstr "àààààààà ààà àààà à'à (_R)"
+msgstr "àààààààà ààà àààà (_R)"
 
 #: ../libedataserverui/e-passwords.c:828
 #: ../libedataserverui/e-passwords-win32.c:744
 msgid "_Remember this password for the remainder of this session"
-msgstr "àààààààà àààààà ààààààà àààà àààà àààààààà ààà àààà à'à (_R)"
+msgstr "àààààààà àààààààà ààààààà àààà àààà àààààààà ààà àààà (_R)"
+
+#: ../libedataserverui/e-source-selector-dialog.c:224
+msgid "_Destination"
+msgstr "ààààààààààà (_D)"
 
-#. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:91
+#: ../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 "Code: %u - Unexpected response from server"
+msgstr "à'à: %u - àààààààà ààà ààààààààààà ààààààààààà"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:205
+#, c-format
+msgid "Failed to parse autodiscover response XML"
+msgstr "àààààà ààààààààààà XML àààààààà àààààà àààààà"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:214
+#, c-format
+msgid "Failed to find Autodiscover element"
+msgstr "àààààà àààààà àààààà àààààà àààààà"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:226
+#, c-format
+msgid "Failed to find Response element"
+msgstr "ààààààààààà àààààà àààààà àààààà àààààà"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:238
+#, c-format
+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 ààà 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 "ààà àààààààà àààà ààààà àààà ààà àààà"
+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:458
+msgid "Evolution Source Viewer"
+msgstr "Evolution ààà ààààà"
+
+#: ../tests/libedataserverui/evolution-source-viewer.c:487
+msgid "Display Name"
+msgstr "ààà àààààààà ààà"
+
+#: ../tests/libedataserverui/evolution-source-viewer.c:496
+msgid "Flags"
+msgstr "ààààààààà"
+
+#: ../tests/libedataserverui/evolution-source-viewer.c:520
+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' à àààà àààà ààà GConf à àààààààà àààààà"
+
+#~ 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 "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 "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 "àààà URl"
 
-#~ msgid "No backend factory for '%s' of '%s'"
-#~ msgstr " '%s'  à  '%s' à àààà àààà ààààààà àààààà ààà"
-
 #~ msgid "Could not instantiate backend"
 #~ msgstr "ààààààà ààààà àààà àààààà"
 
 #~ msgid "Could not connect to %s: %s"
-#~ msgstr "%s'à àààà ààààà àààààà àààààà: %s"
+#~ msgstr "%s à àààà ààààà àààààà àààààà: %s"
 
 #~ msgid "SSL unavailable"
 #~ msgstr "SSL àààààà ààà"
@@ -5389,10 +5559,10 @@ msgstr "ààààà ààà àààààààà ààààààà
 #~ msgstr "URL '%s' à ààà ààààààààààà ààààààà ààààààà"
 
 #~ msgid "URL '%s' needs a host component"
-#~ msgstr "URL '%s'à àààà ààààà (host) àààààà ààà àààààà"
+#~ msgstr "URL '%s à àààà àààà (host) àààààà ààà àààààà"
 
 #~ msgid "URL '%s' needs a path component"
-#~ msgstr "URL '%s'à àààà ààà (path) àààààà ààà àààààà"
+#~ msgstr "URL '%s à àààà àà (path) àààààà ààà àààààà"
 
 #~ msgid ""
 #~ "SSL Certificate check for %s:\n"
@@ -5401,7 +5571,7 @@ msgstr "ààààà ààà àààààààà ààààààà
 #~ "\n"
 #~ "Do you wish to accept?"
 #~ msgstr ""
-#~ "SSL Certificate check for %s'à àààà SSL àààààààààà ààààààà:\n"
+#~ "SSL Certificate check for %s à àààà SSL àààààààààà ààààààà:\n"
 #~ "\n"
 #~ "%s\n"
 #~ "\n"
@@ -5411,7 +5581,7 @@ msgstr "ààààà ààà àààààààà ààààààà
 #~ msgstr "ààààààà ààààààà àààà SSL àààààà ààà"
 
 #~ msgid "Error creating SASL authentication object."
-#~ msgstr "SASL ààààààààààà ààààà ààààààà àààààà ààààààà"
+#~ msgstr "SASL ààààààààààà ààààà àààààà àààààà ààààààà"
 
 #~ msgid "You did not enter a password."
 #~ msgstr "àààààààà àààààà ààà àààà àààà"
@@ -5429,7 +5599,7 @@ msgstr "ààààà ààà àààààààà ààààààà
 #~ "Unable to connect to POP server %s: No support for requested "
 #~ "authentication mechanism."
 #~ msgstr ""
-#~ "POP ààààààà %s'à àààà ààààà àààààà àààààà: àààààà àààà àààààààààà ààààààà ààààààà "
+#~ "POP ààààààà %s à àààà ààààà àààààà àààààà: àààààà àààà àààààààààà ààààààà ààààààà "
 #~ "àààà"
 
 #~ msgid "SASL '%s' Login failed for POP server %s%s"
@@ -5447,6 +5617,6 @@ msgstr "ààààà ààà àààààààà ààààààà
 #~ "%s\n"
 #~ "\n"
 #~ msgstr ""
-#~ "SMTP ààààà àààààààààà àààààà ààààààà\n"
+#~ "SMTP ààààààà àààààààààà àààààà ààààààà\n"
 #~ "%s\n"
 #~ "\n"



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