[evolution-data-server] Updated Marathi Translations



commit dd5a321ce6bc249c6b4f7423c4a400ab91ce3dab
Author: Sandeep Sheshrao Shedmake <sshedmak redhat com>
Date:   Thu Aug 9 17:03:52 2012 +0530

    Updated Marathi Translations

 po/mr.po | 3375 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 1729 insertions(+), 1646 deletions(-)
---
diff --git a/po/mr.po b/po/mr.po
index c6652f4..42b29af 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -3,290 +3,229 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Rahul Bhalerao <b rahul pm gmail com>, 2006.
-# Sandeep Shedmake <sandeep shedmake gmail com>, 2008, 2009.
+# Sandeep Shedmake <sshedmak redhat com>, 2008, 2009.
 # Sandeep Shedmake <sshedmak redhat com>, 2009, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: mr\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-26 16:06+0530\n"
+"POT-Creation-Date: 2012-08-07 17:05+0000\n"
+"PO-Revision-Date: 2012-08-09 17:00+0530\n"
 "Last-Translator: Sandeep Shedmake <sshedmak redhat com>\n"
 "Language-Team: Marathi <fedora-trans-mr redhat com>\n"
+"Language: mr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.2\n"
+"X-Generator: Lokalize 1.4\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"Language: mr\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:569
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:599
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:618
+#: ../calendar/libecal/e-cal.c:4033 ../calendar/libecal/e-cal-client.c:148
+#: ../camel/camel-imapx-command.c:594
+#: ../camel/providers/imap/camel-imap-command.c: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 "àààà àààà ààà..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1566
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4870
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:518
+#: ../addressbook/backends/file/e-book-backend-file.c:1572
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4886
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:510
 msgid "Searching..."
 msgstr "àààà ààà..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:2108
+#: ../addressbook/backends/file/e-book-backend-file.c:2115
 #, c-format
 msgid "Failed to build summary for an address book %s"
 msgstr "ààààà àààààààà %s ààààà àààààà ààààà ààààààà ààààà"
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:874
+#: ../addressbook/backends/google/e-book-backend-google.c:709
 msgid "Querying for updated contactsâ"
 msgstr "ààààààà ààààààààààààà àààààâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:923
-#: ../addressbook/libebook/e-book.c:3531 ../calendar/libecal/e-cal.c:1380
-#: ../libedataserver/e-client.c:1918
-msgid "Personal"
-msgstr "ààààà"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:925
-#| msgid "Favorites"
-msgid "Friends"
-msgstr "ààààà"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:927
-#| msgid "Family Name"
-msgid "Family"
-msgstr "àààààà"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:929
-msgid "Coworkers"
-msgstr "àààààààààààà"
-
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1019
+#: ../addressbook/backends/google/e-book-backend-google.c:846
 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:1275
+#: ../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:1307
 msgid "Creating new contactâ"
 msgstr "àààà àààààààààà ààààààà ààà àààâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1540
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:327
+#: ../addressbook/backends/google/e-book-backend-google.c:1396
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:319
 #: ../addressbook/backends/webdav/e-book-backend-webdav.c:433
 msgid "The backend does not support bulk removals"
 msgstr "àààààà àààà àààààààààààà àààààà ààààà àààà"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1568
+#: ../addressbook/backends/google/e-book-backend-google.c:1424
 msgid "Deleting contactâ"
 msgstr "àààààà ààààà àààà àààâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1818
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2296
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:375
+#: ../addressbook/backends/google/e-book-backend-google.c:1674
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2312
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:367
 #: ../addressbook/backends/webdav/e-book-backend-webdav.c:487
-#| msgid "Key usage does not support certificate signing"
 msgid "The backend does not support bulk modifications"
 msgstr "àààààà ààààà ààààààààààà àààààà ààààà àààà"
 
 #. Update the contact on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1851
+#: ../addressbook/backends/google/e-book-backend-google.c:1712
 msgid "Modifying contactâ"
 msgstr "àààààà ààààààà ààà àààâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2058
-#| msgid "Loading..."
+#: ../addressbook/backends/google/e-book-backend-google.c:1895
 msgid "Loadingâ"
 msgstr "ààà ààà ààà..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2187
-#| msgid "Authentication required"
-msgid "Authenticating with the serverâ"
-msgstr "ààààààààà ààà àààà àààâ"
+#: ../addressbook/backends/google/e-book-google-utils.c:1562
+msgid "Personal"
+msgstr "ààààà"
+
+#. System Group: My Contacts
+#: ../addressbook/backends/google/e-book-google-utils.c:1563
+msgid "Friends"
+msgstr "ààààà"
+
+#. System Group: Friends
+#: ../addressbook/backends/google/e-book-google-utils.c:1564
+msgid "Family"
+msgstr "àààààà"
+
+#. System Group: Family
+#: ../addressbook/backends/google/e-book-google-utils.c:1565
+msgid "Coworkers"
+msgstr "àààààààààààà"
 
 #. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:177
-#| msgid "Not connected."
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:165
 msgid "Not connected"
 msgstr "ààààà àààà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:797
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:793
 msgid "Using Distinguished Name (DN)"
 msgstr "àààààà ààà ààààà ààà (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:800
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:796
 msgid "Using Email Address"
 msgstr "àààà ààààà ààààà ààà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1071
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1090
 msgid "Reconnecting to LDAP server..."
 msgstr "LDAP àààààà àààààà àààà ààà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1200
-#| msgid "Invalid argument"
+#: ../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 ààà àààààà ààààà ààà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4891
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4907
 msgid "Error performing search"
 msgstr "àààààààà àààààà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5012
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5028
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "àààààà ààààààà ààà ààà (%d)... "
 
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5564
+#, c-format
+#| msgid "Failed to create hardlink for resource '%s': %s"
+msgid "Failed to get the DN for user '%s'"
+msgstr "ààààààààà '%s' ààààà DN ààààààà ààààààà ààààà"
+
 #: ../addressbook/backends/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."
-msgid "%s: there was no source for UID '%s' stored in GConf."
-msgstr "%s: GConf ààààà UID '%s' ààààà ààààà ààààà àààà."
-
-#: ../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 "Folder '%s/%s' does not exist."
-msgid "Address book does not exist"
-msgstr "ààààà àààààààà àààààààààà àààà"
-
 #: ../addressbook/libebook/e-book-client.c:95
-#| msgid "No such folder %s"
 msgid "No such book"
 msgstr "ààà àààààà ààààà àààà"
 
 #: ../addressbook/libebook/e-book-client.c:97
-#: ../addressbook/libedata-book/e-data-book.c:315
-#| msgid "Object not found"
+#: ../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
-#| msgid "Object ID already exists"
+#: ../addressbook/libedata-book/e-data-book.c:307
 msgid "Contact ID already exists"
 msgstr "àààààà ID àààà àààààààààà ààà"
 
 #: ../addressbook/libebook/e-book-client.c:101
-#| msgid "No such message"
 msgid "No such source"
 msgstr "ààà ààààà ààààà àààà"
 
 #: ../addressbook/libebook/e-book-client.c:103
-#: ../addressbook/libedata-book/e-data-book.c:332
-#| msgid "Namespace"
+#: ../addressbook/libedata-book/e-data-book.c:323
 msgid "No space"
 msgstr "ààààà ààààà àààà"
 
-#: ../addressbook/libebook/e-book-client.c:515
-#| msgid "Failed to encode data"
+#: ../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 "%s: Invalid source."
-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 on message %d"
-msgid "Failed to find system book"
-msgstr "ààààààà àààààà àààààààà ààààà"
-
-#: ../addressbook/libebook/e-book-client.c:774
-#: ../calendar/libecal/e-cal-client.c:881
-#, c-format
-#| msgid "%s: there was no source for uid `%s' stored in gconf."
-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
-#| msgid "Connection to Server"
+#: ../addressbook/libebook/e-book-client.c:2282
+#: ../calendar/libecal/e-cal-client.c:4640
 msgid "Cannot get connection to view"
 msgstr "ààààààààà ààààà ààààààà àààà ààààà"
 
@@ -296,850 +235,854 @@ msgid "Unique ID"
 msgstr "àààààààà ID"
 
 #. FILE_AS is not really a structured field - we use a getter/setter
-#. *         so we can generate its value if necessary in the getter
-#: ../addressbook/libebook/e-contact.c:124
+#. * so we can generate its value if necessary in the getter
+#. Translators: This is an EContact field description, in this case it's a
+#. * preferred user's description (or display name) of the contact. Note 'File' is a verb here.
+#: ../addressbook/libebook/e-contact.c:126
 msgid "File Under"
 msgstr "ààààààà àààà "
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:126
-msgid "Book URI"
-msgstr "àààààà URI"
+#: ../addressbook/libebook/e-contact.c:128
+#| msgid "Book URI"
+msgid "Book UID"
+msgstr "àààààà UID"
 
 #. Name fields
 #. FN isn't really a structured field - we use a getter/setter
 #. * so we can set the N property (since evo 1.4 works fine with
 #. * vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:132
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Full Name"
 msgstr "ààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Given Name"
 msgstr "àààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:134
+#: ../addressbook/libebook/e-contact.c:136
 msgid "Family Name"
 msgstr "àààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook/e-contact.c:137
 msgid "Nickname"
 msgstr "ààààààà"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Email 1"
 msgstr "àààà 1"
 
-#: ../addressbook/libebook/e-contact.c:139
+#: ../addressbook/libebook/e-contact.c:141
 msgid "Email 2"
-msgstr "àààà à"
+msgstr "àààà 2"
 
-#: ../addressbook/libebook/e-contact.c:140
+#: ../addressbook/libebook/e-contact.c:142
 msgid "Email 3"
-msgstr "àààà à"
+msgstr "àààà 3"
 
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Email 4"
 msgstr "àààà 4"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Mailer"
 msgstr "àààà"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Home Address Label"
 msgstr "àà ààààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Work Address Label"
 msgstr "ààààà ààààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Other Address Label"
 msgstr "ààà ààààà àààà"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Assistant Phone"
 msgstr "ààààààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Business Phone"
 msgstr "àààààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Business Phone 2"
-msgstr "àààààà àààààààà à"
+msgstr "àààààà àààààààà 2"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Business Fax"
 msgstr "àààààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Callback Phone"
 msgstr "àààààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Car Phone"
 msgstr "ààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Company Phone"
 msgstr "ààààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Home Phone"
 msgstr "àààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:161
 msgid "Home Phone 2"
-msgstr "àààà ààààààààà"
+msgstr "àààà àààààààà 2"
 
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:162
 msgid "Home Fax"
 msgstr "àààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:161
+#: ../addressbook/libebook/e-contact.c:163
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:162
+#: ../addressbook/libebook/e-contact.c:164
 msgid "Mobile Phone"
 msgstr "àààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Other Phone"
 msgstr "ààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Other Fax"
 msgstr "ààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Pager"
 msgstr "àààà"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Primary Phone"
 msgstr "àààààààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Radio"
 msgstr "ààààà"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Telex"
 msgstr "ààààààà"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook/e-contact.c:172
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Organization"
 msgstr "àààààà"
 
-#: ../addressbook/libebook/e-contact.c:174
+#: ../addressbook/libebook/e-contact.c:176
 msgid "Organizational Unit"
 msgstr "àààààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:175
+#: ../addressbook/libebook/e-contact.c:177
 msgid "Office"
 msgstr "àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:176
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Title"
 msgstr "àààààà"
 
-#: ../addressbook/libebook/e-contact.c:177
+#: ../addressbook/libebook/e-contact.c:179
 msgid "Role"
 msgstr "àààààà"
 
-#: ../addressbook/libebook/e-contact.c:178
+#: ../addressbook/libebook/e-contact.c:180
 msgid "Manager"
 msgstr "àààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Assistant"
 msgstr "ààààààà"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Homepage URL"
 msgstr "àààààà URL"
 
-#: ../addressbook/libebook/e-contact.c:183
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Weblog URL"
 msgstr "ààààààà URL"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:186
-#: ../libedataserverui/e-categories-dialog.c:88
+#: ../addressbook/libebook/e-contact.c:188
+#: ../libedataserverui/e-categories-dialog.c:90
 msgid "Categories"
 msgstr "ààààààà"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:189
+#: ../addressbook/libebook/e-contact.c:191
 msgid "Calendar URI"
 msgstr "àààààààààà URI"
 
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:192
 msgid "Free/Busy URL"
 msgstr "ààààà/àààààà URL"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:193
 msgid "ICS Calendar"
 msgstr "ICS àààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:194
 msgid "Video Conferencing URL"
 msgstr "àààààà ààààààà URL"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:197
 msgid "Spouse's Name"
 msgstr "ààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:198
 msgid "Note"
 msgstr "àààà"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:201
 msgid "AIM Home Screen Name 1"
 msgstr "AIM ààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:202
 msgid "AIM Home Screen Name 2"
 msgstr "AIM ààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:203
 msgid "AIM Home Screen Name 3"
 msgstr "AIM ààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:204
 msgid "AIM Work Screen Name 1"
 msgstr "AIM ààààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:205
 msgid "AIM Work Screen Name 2"
 msgstr "AIM ààààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:206
 msgid "AIM Work Screen Name 3"
 msgstr "AIM ààààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:207
 msgid "GroupWise Home Screen Name 1"
 msgstr "àààà àààààà ààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:208
 msgid "GroupWise Home Screen Name 2"
 msgstr "àààà àààààà ààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:209
 msgid "GroupWise Home Screen Name 3"
 msgstr "àààà àààààà ààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:210
 msgid "GroupWise Work Screen Name 1"
 msgstr "àààà àààààà ààààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:211
 msgid "GroupWise Work Screen Name 2"
 msgstr "àààà àààààà ààààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:212
 msgid "GroupWise Work Screen Name 3"
 msgstr "àààà àààààà ààààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:211
-#| msgid "Jabber Home Id 1"
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Jabber Home ID 1"
 msgstr "àààà ààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:212
-#| msgid "Jabber Home Id 2"
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Jabber Home ID 2"
 msgstr "àààà ààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:213
-#| msgid "Jabber Home Id 3"
+#: ../addressbook/libebook/e-contact.c:215
 msgid "Jabber Home ID 3"
 msgstr "àààà ààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:214
-#| msgid "Jabber Work Id 1"
+#: ../addressbook/libebook/e-contact.c:216
 msgid "Jabber Work ID 1"
 msgstr "àààà àààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:215
-#| msgid "Jabber Work Id 2"
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Jabber Work ID 2"
 msgstr "àààà àààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:216
-#| msgid "Jabber Work Id 3"
+#: ../addressbook/libebook/e-contact.c:218
 msgid "Jabber Work ID 3"
 msgstr "àààà àààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:219
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo! ààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:220
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo! ààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:221
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo! ààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:222
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo! ààààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:223
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo! ààààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:224
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo! ààààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:225
 msgid "MSN Home Screen Name 1"
 msgstr "MSN ààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:226
 msgid "MSN Home Screen Name 2"
 msgstr "MSN ààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:225
+#: ../addressbook/libebook/e-contact.c:227
 msgid "MSN Home Screen Name 3"
 msgstr "MSN ààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:226
+#: ../addressbook/libebook/e-contact.c:228
 msgid "MSN Work Screen Name 1"
 msgstr "MSN ààààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:229
 msgid "MSN Work Screen Name 2"
 msgstr "MSN ààààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:230
 msgid "MSN Work Screen Name 3"
 msgstr "MSN ààààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:229
-#| msgid "ICQ Home Id 1"
+#: ../addressbook/libebook/e-contact.c:231
 msgid "ICQ Home ID 1"
 msgstr "ICQ ààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:230
-#| msgid "ICQ Home Id 2"
+#: ../addressbook/libebook/e-contact.c:232
 msgid "ICQ Home ID 2"
 msgstr "ICQ ààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:231
-#| msgid "ICQ Home Id 3"
+#: ../addressbook/libebook/e-contact.c:233
 msgid "ICQ Home ID 3"
 msgstr "ICQ ààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:232
-#| msgid "ICQ Work Id 1"
+#: ../addressbook/libebook/e-contact.c:234
 msgid "ICQ Work ID 1"
 msgstr "ICQ àààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:233
-#| msgid "ICQ Work Id 2"
+#: ../addressbook/libebook/e-contact.c:235
 msgid "ICQ Work ID 2"
 msgstr "ICQ àààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:234
-#| msgid "ICQ Work Id 3"
+#: ../addressbook/libebook/e-contact.c:236
 msgid "ICQ Work ID 3"
 msgstr "ICQ àààà ID 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Last Revision"
 msgstr "ààààà ààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:238
+#. Translators: This is an EContact field description, in this case it's a
+#. * virtual field, which returns either name of the contact or the organization
+#. * name, recognized by multiple other fields, where the first filled is used.
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Name or Org"
 msgstr "ààà ààààà ààààà"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Address List"
 msgstr "ààààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:242
+#: ../addressbook/libebook/e-contact.c:247
 msgid "Home Address"
 msgstr "àààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:248
 msgid "Work Address"
 msgstr "àààààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook/e-contact.c:249
 msgid "Other Address"
 msgstr "ààà ààààà"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook/e-contact.c:252
 msgid "Category List"
 msgstr "àààààà àààà"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:255
 msgid "Photo"
 msgstr "àààà"
 
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Logo"
 msgstr "ààààà"
 
-#: ../addressbook/libebook/e-contact.c:253
+#. Translators: This is an EContact field description, in this case it's a name
+#. * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2
+#: ../addressbook/libebook/e-contact.c:260
 msgid "Name"
 msgstr "ààà"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:261
 msgid "Email List"
 msgstr "àààà àààà"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:264
 msgid "AIM Screen Name List"
 msgstr "AIM ààààààà ààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:258
-#| msgid "GroupWise Id List"
+#: ../addressbook/libebook/e-contact.c:265
 msgid "GroupWise ID List"
 msgstr "GroupWise ID àààà"
 
-#: ../addressbook/libebook/e-contact.c:259
-#| msgid "Jabber Id List"
+#: ../addressbook/libebook/e-contact.c:266
 msgid "Jabber ID List"
 msgstr "àààà 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
-#| msgid "ICQ Id List"
+#: ../addressbook/libebook/e-contact.c:269
 msgid "ICQ ID List"
 msgstr "ICQ ID àààà"
 
-#: ../addressbook/libebook/e-contact.c:264
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Wants HTML Mail"
 msgstr "HTML ààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:266
+#. Translators: This is an EContact field description, in this case it's a
+#. * field describing whether it's a Contact list (list of email addresses) or a
+#. * regular contact for one person/organization/...
+#: ../addressbook/libebook/e-contact.c:276
 msgid "List"
 msgstr "àààà"
 
-#: ../addressbook/libebook/e-contact.c:267
-msgid "List Show Addresses"
-msgstr "ààààà ààààà àààà"
+#. Translators: This is an EContact field description, in this case it's a flag
+#. * used to determine whether when sending to Contact lists the addresses should be
+#. * shown or not to other recipients - basically whether to use BCC field or CC
+#. * message header when sending messages to this Contact list.
+#: ../addressbook/libebook/e-contact.c:281
+#| msgid "List Show Addresses"
+msgid "List Shows Addresses"
+msgstr "àààà ààààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:269
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Birth Date"
 msgstr "ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:270
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1063
+#: ../addressbook/libebook/e-contact.c:284
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:919
 msgid "Anniversary"
 msgstr "ààààààà"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:273
+#: ../addressbook/libebook/e-contact.c:287
 msgid "X.509 Certificate"
 msgstr "X.509 àààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:275
-#| msgid "Gadu-Gadu Home Id 1"
+#: ../addressbook/libebook/e-contact.c:289
 msgid "Gadu-Gadu Home ID 1"
 msgstr "ààà-ààà ààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:276
-#| msgid "Gadu-Gadu Home Id 2"
+#: ../addressbook/libebook/e-contact.c:290
 msgid "Gadu-Gadu Home ID 2"
 msgstr "ààà-ààà ààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:277
-#| msgid "Gadu-Gadu Home Id 3"
+#: ../addressbook/libebook/e-contact.c:291
 msgid "Gadu-Gadu Home ID 3"
 msgstr "ààà-ààà ààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:278
-#| msgid "Gadu-Gadu Work Id 1"
+#: ../addressbook/libebook/e-contact.c:292
 msgid "Gadu-Gadu Work ID 1"
 msgstr "ààà-ààà àààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:279
-#| msgid "Gadu-Gadu Work Id 2"
+#: ../addressbook/libebook/e-contact.c:293
 msgid "Gadu-Gadu Work ID 2"
 msgstr "ààà-ààà àààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:280
-#| msgid "Gadu-Gadu Work Id 3"
+#: ../addressbook/libebook/e-contact.c:294
 msgid "Gadu-Gadu Work ID 3"
 msgstr "ààà-ààà àààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:281
-#| msgid "Gadu-Gadu Id List"
+#: ../addressbook/libebook/e-contact.c:295
 msgid "Gadu-Gadu ID List"
 msgstr "ààà-ààà ID àààà"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:298
 msgid "Geographic Information"
 msgstr "ààààààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:300
 msgid "Telephone"
 msgstr "àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:288
+#: ../addressbook/libebook/e-contact.c:302
 msgid "Skype Home Name 1"
 msgstr "Skype Home Name 1"
 
-#: ../addressbook/libebook/e-contact.c:289
+#: ../addressbook/libebook/e-contact.c:303
 msgid "Skype Home Name 2"
 msgstr "Skype Home Name 2"
 
-#: ../addressbook/libebook/e-contact.c:290
+#: ../addressbook/libebook/e-contact.c:304
 msgid "Skype Home Name 3"
 msgstr "Skype Home Name 3"
 
-#: ../addressbook/libebook/e-contact.c:291
+#: ../addressbook/libebook/e-contact.c:305
 msgid "Skype Work Name 1"
 msgstr "Skype Work Name 1"
 
-#: ../addressbook/libebook/e-contact.c:292
+#: ../addressbook/libebook/e-contact.c:306
 msgid "Skype Work Name 2"
 msgstr "Skype Work Name 2"
 
-#: ../addressbook/libebook/e-contact.c:293
+#: ../addressbook/libebook/e-contact.c:307
 msgid "Skype Work Name 3"
 msgstr "Skype Work Name 3"
 
-#: ../addressbook/libebook/e-contact.c:294
+#: ../addressbook/libebook/e-contact.c:308
 msgid "Skype Name List"
 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
-#| msgid "Skype Home Name 1"
+#: ../addressbook/libebook/e-contact.c:312
 msgid "Google Talk Home Name 1"
 msgstr "Google Talk ààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:299
-#| msgid "Skype Home Name 2"
+#: ../addressbook/libebook/e-contact.c:313
 msgid "Google Talk Home Name 2"
 msgstr "Google Talk ààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:300
-#| msgid "Skype Home Name 3"
+#: ../addressbook/libebook/e-contact.c:314
 msgid "Google Talk Home Name 3"
 msgstr "Google Talk ààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:301
-#| msgid "Skype Work Name 1"
+#: ../addressbook/libebook/e-contact.c:315
 msgid "Google Talk Work Name 1"
 msgstr "Google Talk àààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:302
-#| msgid "Skype Work Name 2"
+#: ../addressbook/libebook/e-contact.c:316
 msgid "Google Talk Work Name 2"
 msgstr "Google Talk àààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:303
-#| msgid "Skype Work Name 3"
+#: ../addressbook/libebook/e-contact.c:317
 msgid "Google Talk Work Name 3"
 msgstr "Google Talk àààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:304
-#| msgid "Skype Name List"
+#: ../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 "Skype Name List"
+msgid "Twitter Name List"
+msgstr "àààààà ààà àààà"
+
+#: ../addressbook/libebook/e-contact.c:1623
+#: ../addressbook/libebook/e-destination.c:879
 msgid "Unnamed List"
 msgstr "àààààà àààà"
 
-#: ../addressbook/libedata-book/e-book-backend.c:19
+#: ../addressbook/libedata-book/e-book-backend.c:17
 msgid "Cannot process, book backend is opening"
 msgstr "àààààààà ààààà, ààà àààààà àààà ààà"
 
-#: ../addressbook/libedata-book/e-book-backend.c:91
+#: ../addressbook/libedata-book/e-book-backend.c:90
 #, c-format
-#| msgid "Unknown error: %s"
 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 create folder '%s': %s"
 msgid "Cannot change value of book property '%s'"
 msgstr "ààààààààà ààààààà '%s' àààà ààààà ààààà ààààà"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:501
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:500
 #: ../camel/camel-db.c:503
 #, c-format
 msgid "Insufficient memory"
 msgstr "ààààà àààààà"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1093
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1092
 #, c-format
-#| msgid "Object 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
-#| msgid "Invalid query"
+#: ../addressbook/libedata-book/e-data-book.c:201
+#: ../addressbook/libedata-book/e-data-book.c:214
+#: ../addressbook/libedata-book/e-data-book.c:724
 msgid "Invalid query: "
 msgstr "àààà ààààà: "
 
-#: ../addressbook/libedata-book/e-data-book.c:311
-#: ../calendar/libedata-cal/e-data-cal.c:427
+#: ../addressbook/libedata-book/e-data-book.c:302
+#: ../calendar/libedata-cal/e-data-cal.c:415
 msgid "Success"
 msgstr "àà"
 
-#: ../addressbook/libedata-book/e-data-book.c:312
-#: ../calendar/libecal/e-cal.c:4564 ../calendar/libedata-cal/e-data-cal.c:428
-#: ../libedataserver/e-client.c:123
+#: ../addressbook/libedata-book/e-data-book.c:303
+#: ../calendar/libecal/e-cal.c:4001 ../calendar/libedata-cal/e-data-cal.c:416
+#: ../libedataserver/e-client.c:122
 msgid "Backend is busy"
 msgstr "àààààà àààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:313
-#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:133
-#| msgid "Repository is offline"
+#: ../addressbook/libedata-book/e-data-book.c:304
+#: ../calendar/libedata-cal/e-data-cal.c:417 ../libedataserver/e-client.c:132
 msgid "Repository offline"
 msgstr "ààààààààà àààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:314
-#: ../calendar/libecal/e-cal.c:4578 ../calendar/libedata-cal/e-data-cal.c:430
-#: ../libedataserver/e-client.c:137
+#: ../addressbook/libedata-book/e-data-book.c:305
+#: ../calendar/libecal/e-cal.c:4015 ../calendar/libedata-cal/e-data-cal.c:418
+#: ../libedataserver/e-client.c:138
 msgid "Permission denied"
 msgstr "ààààààà ààààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:317
-#: ../calendar/libedata-cal/e-data-cal.c:435
-#| msgid "Authentication failed"
+#: ../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
-#| msgid "Authentication required"
+#: ../addressbook/libedata-book/e-data-book.c:309
+#: ../calendar/libedata-cal/e-data-cal.c:424
 msgid "Authentication Required"
 msgstr "ààà àààà àààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:319
-#: ../calendar/libedata-cal/e-data-cal.c:437
+#: ../addressbook/libedata-book/e-data-book.c:310
+#: ../calendar/libedata-cal/e-data-cal.c:425
 msgid "Unsupported field"
 msgstr "àààààààà ààààààà àààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:320
-#: ../calendar/libedata-cal/e-data-cal.c:439 ../libedataserver/e-client.c:145
+#: ../addressbook/libedata-book/e-data-book.c:311
+#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:146
 msgid "Unsupported authentication method"
 msgstr "àààààààààà àààààà ààààààà àààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:321
-#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:147
+#: ../addressbook/libedata-book/e-data-book.c:312
+#: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:148
 msgid "TLS not available"
 msgstr "TLS àààààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:323
+#: ../addressbook/libedata-book/e-data-book.c:313
+msgid "Address book does not exist"
+msgstr "ààààà àààààààà àààààààààà àààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:314
 msgid "Book removed"
 msgstr "ààà ààààà ààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:324
-#: ../calendar/libedata-cal/e-data-cal.c:443
-#| msgid "This message is not available in offline mode."
+#: ../addressbook/libedata-book/e-data-book.c:315
+#: ../calendar/libedata-cal/e-data-cal.c:431
 msgid "Not available in offline mode"
 msgstr "àààààà ààààààà àààààà àààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:325
-#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:149
+#: ../addressbook/libedata-book/e-data-book.c:316
+#: ../calendar/libedata-cal/e-data-cal.c:432 ../libedataserver/e-client.c:150
 msgid "Search size limit exceeded"
 msgstr "ààà àààà ààààààà ààààà ààà àààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:326
-#: ../calendar/libedata-cal/e-data-cal.c:445 ../libedataserver/e-client.c:151
+#: ../addressbook/libedata-book/e-data-book.c:317
+#: ../calendar/libedata-cal/e-data-cal.c:433 ../libedataserver/e-client.c:152
 msgid "Search time limit exceeded"
 msgstr "ààà ààà ààààààà ààààà ààà àààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:327
-#: ../calendar/libedata-cal/e-data-cal.c:446 ../libedataserver/e-client.c:153
+#: ../addressbook/libedata-book/e-data-book.c:318
+#: ../calendar/libedata-cal/e-data-cal.c:434 ../libedataserver/e-client.c:154
 msgid "Invalid query"
 msgstr "àààà àààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:328
-#: ../calendar/libedata-cal/e-data-cal.c:447 ../libedataserver/e-client.c:155
+#: ../addressbook/libedata-book/e-data-book.c:319
+#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:156
 msgid "Query refused"
 msgstr "àààààà ààààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:329
-#: ../calendar/libedata-cal/e-data-cal.c:448 ../libedataserver/e-client.c:141
-#| msgid "%s: could not cancel"
+#: ../addressbook/libedata-book/e-data-book.c:320
+#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:142
 msgid "Could not cancel"
 msgstr "àààà àààà ààààà"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
 #. { OtherError,			N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:331
-#: ../calendar/libedata-cal/e-data-cal.c:450
+#: ../addressbook/libedata-book/e-data-book.c:322
+#: ../calendar/libedata-cal/e-data-cal.c:438
 msgid "Invalid server version"
 msgstr "àààà ààààà ààààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:333
-#: ../calendar/libecal/e-cal.c:4562 ../calendar/libedata-cal/e-data-cal.c:451
-#: ../libedataserver/e-client.c:121
+#: ../addressbook/libedata-book/e-data-book.c:324
+#: ../calendar/libecal/e-cal.c:3999 ../calendar/libedata-cal/e-data-cal.c:439
+#: ../libedataserver/e-client.c:120
 msgid "Invalid argument"
 msgstr "àààà àààà"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:335
-#: ../calendar/libecal/e-cal.c:4601 ../calendar/libedata-cal/e-data-cal.c:453
-#: ../libedataserver/e-client.c:143
-#| msgid "Protocol not supported"
+#: ../addressbook/libedata-book/e-data-book.c:326
+#: ../calendar/libecal/e-cal.c:4038 ../calendar/libedata-cal/e-data-cal.c:441
+#: ../libedataserver/e-client.c:144
 msgid "Not supported"
 msgstr "ààààààà àààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:336
-#: ../calendar/libedata-cal/e-data-cal.c:454 ../libedataserver/e-client.c:161
-#| msgid "Backend is busy"
+#: ../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
-#| msgid "I/O error"
+#: ../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
-#| msgid "Cannot get folder container %s"
+#: ../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
-#| msgid "Cannot add encryption certificate"
+#: ../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
+#: ../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 to server: %s"
-msgid "Cannot authenticate user: "
-msgstr "ààààààààààààà ààà ààààà ààààà: "
-
-#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:830
-#| msgid "Cannot open mailbox: %s: %s\n"
+#: ../addressbook/libedata-book/e-data-book.c:796
 msgid "Cannot open book: "
 msgstr "àààààà ààààà ààààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:846
+#: ../addressbook/libedata-book/e-data-book.c:812
 msgid "Cannot remove book: "
 msgstr "àààààà ààààà ààààà ààààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:873
+#: ../addressbook/libedata-book/e-data-book.c:839
 msgid "Cannot refresh address book: "
 msgstr "ààààà àààààààà àààààààà àààà ààààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:899
+#: ../addressbook/libedata-book/e-data-book.c:865
 msgid "Cannot get backend property: "
 msgstr "àààààà ààààààà ààààààà àààà ààààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:924
-#: ../calendar/libedata-cal/e-data-cal.c:1069
+#: ../addressbook/libedata-book/e-data-book.c:890
+#: ../calendar/libedata-cal/e-data-cal.c:1016
 msgid "Cannot set backend property: "
 msgstr "àààààà ààààààà ààà àààà ààààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:961
-#| msgid "Cannot get folder container %s"
+#: ../addressbook/libedata-book/e-data-book.c:927
 msgid "Cannot get contact list: "
 msgstr "àààààà àààà ààààààà àààà ààààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:995
-#| msgid "Cannot get folder container %s"
+#: ../addressbook/libedata-book/e-data-book.c:961
 msgid "Cannot get contact list uids: "
 msgstr "àààààà àààà uids ààààààà àààà ààààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1100
-#| msgid "Cannot create encoder context"
+#: ../addressbook/libedata-book/e-data-book.c:1066
 msgid "Cannot remove contacts: "
 msgstr "àààààà ààààà ààààà ààààà: "
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:184
-#: ../addressbook/libedata-book/e-data-book-factory.c:212
-#: ../calendar/libedata-cal/e-data-cal-factory.c:229
+#: ../addressbook/libedata-book/e-data-book-factory.c:103
+#: ../calendar/libedata-cal/e-data-cal-factory.c:114
 #, c-format
-msgid "Empty URI"
-msgstr "àààààà URI"
+msgid "No backend name in source '%s'"
+msgstr "ààààà '%s' ààààà àààààà ààà ààààà àààà"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:546
+#: ../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 "POP Source UID"
+msgid "Missing source UID"
+msgstr "ààààà UID ààààà àààà"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:332
+#: ../calendar/libedata-cal/e-data-cal-factory.c:243
+#, c-format
+#| msgid "No such source"
+msgid "No such source for UID '%s'"
+msgstr "UID '%s' ààààà ààààà ààààà àààà"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:567
 #, 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:597
+#, c-format
+#| msgid "Failed to connect to POP server %s in secure mode: %s"
+msgid "Failed to connect to a server using SSL: %s"
+msgstr "SSL: %sàà àààà àààà ààààààààà ààààà àààà ààààà"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:602
+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:615
 #, c-format
-#| msgid ""
-#| "Unexpected GnuPG status message encountered:\n"
-#| "\n"
-#| "%s"
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "ààààààààà HTTP àààààà ààà %d àààààà (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2212
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2567
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2330
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2700
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1148,485 +1091,448 @@ msgstr ""
 "ààààààà àààààààààààà àààà, àààààààààà àààà àààààà àààààààà ààààà ààà.\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:3696
+#| msgid "The backend does not support bulk additions"
+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 %s (user %s)"
-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:3798
+#| msgid "The backend does not support bulk modifications"
+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 %s (user %s)"
-msgid "Enter password for address book %s (user %s)"
-msgstr "ààààà àààààààà %s (ààààààààà %s) ààààà ààààààà àààà"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3966
+#| msgid "The backend does not support bulk removals"
+msgid "CalDAV does not support bulk removals"
+msgstr "CalDAV àààààà ààààààààààààà àààààà ààààà àààà"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1065
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4625
+msgid "Calendar doesn't support Free/Busy"
+msgstr "àààààààààà ààààà/àààààà ààààà àààààà ààààà àààà"
+
+#: ../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:481
+#, c-format
+#| msgid "Malformed signature"
+msgid "Malformed URI: %s"
+msgstr "àààààà URI: %s"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:542
+#, 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:579
+#, c-format
 msgid "Bad file format."
 msgstr "àààà àààà àààààà."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:454
+#: ../calendar/backends/http/e-cal-backend-http.c:589
+#, 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:929
+#: ../calendar/backends/http/e-cal-backend-http.c:933
+#: ../calendar/backends/weather/e-cal-backend-weather.c:511
 msgid "Could not create cache file"
 msgstr "ààà àààà àààà ààààà ààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:183
+#: ../calendar/backends/weather/e-cal-backend-weather.c:171
 msgid "Could not retrieve weather data"
 msgstr "àààààà àààà àààà àààààà ààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:279
+#: ../calendar/backends/weather/e-cal-backend-weather.c:276
 msgid "Weather: Fog"
 msgstr "àààààà: àààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:280
+#: ../calendar/backends/weather/e-cal-backend-weather.c:277
 msgid "Weather: Cloudy Night"
 msgstr "àààààà: àààà ààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:281
+#: ../calendar/backends/weather/e-cal-backend-weather.c:278
 msgid "Weather: Cloudy"
 msgstr "àààààà: àààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:282
+#: ../calendar/backends/weather/e-cal-backend-weather.c:279
 msgid "Weather: Overcast"
 msgstr "àààààà: ààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:283
+#: ../calendar/backends/weather/e-cal-backend-weather.c:280
 msgid "Weather: Showers"
 msgstr "àààààà: ààààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:284
+#: ../calendar/backends/weather/e-cal-backend-weather.c:281
 msgid "Weather: Snow"
 msgstr "àààààà: ààààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:285
+#: ../calendar/backends/weather/e-cal-backend-weather.c:282
 msgid "Weather: Clear Night"
 msgstr "àààààà: àààààà ààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:286
+#: ../calendar/backends/weather/e-cal-backend-weather.c:283
 msgid "Weather: Sunny"
 msgstr "àààààà: ààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:287
+#: ../calendar/backends/weather/e-cal-backend-weather.c:284
 msgid "Weather: Thunderstorms"
 msgstr "àààààà: ààààà àààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:435
+#: ../calendar/backends/weather/e-cal-backend-weather.c:408
 msgid "Forecast"
 msgstr "àààààà"
 
-#: ../calendar/libecal/e-cal.c:891 ../libedataserverui/e-book-auth-util.c:204
-#: ../libedataserverui/e-book-auth-util.c:428
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "%s (àààààààà %s)àààà ààààààààà àààà ààà"
-
-#.
-#. * This password prompt will be prompted rarely. Since the key that is passed to
-#. * the auth_func corresponds to the parent user.
-#.
-#: ../calendar/libecal/e-cal.c:905
-#, c-format
-msgid "Enter password for %s to enable proxy for user %s"
-msgstr "%s àààà ààààààààà àààà ààà àààààààà %sàààà àààààààà ààààà àààààààààà"
-
-#: ../calendar/libecal/e-cal.c:4566
+#: ../calendar/libecal/e-cal.c:4003
 msgid "Repository is offline"
 msgstr "àààààààààà àààààà"
 
-#: ../calendar/libecal/e-cal.c:4568 ../calendar/libecal/e-cal-client.c:137
+#: ../calendar/libecal/e-cal.c:4005 ../calendar/libecal/e-cal-client.c:135
 msgid "No such calendar"
 msgstr "ààà àààààààààà àààà"
 
-#: ../calendar/libecal/e-cal.c:4570 ../calendar/libecal/e-cal-client.c:139
-#: ../calendar/libedata-cal/e-data-cal.c:432
+#: ../calendar/libecal/e-cal.c:4007 ../calendar/libecal/e-cal-client.c:137
+#: ../calendar/libedata-cal/e-data-cal.c:420
 msgid "Object not found"
 msgstr "ààààà àààà àààààà"
 
-#: ../calendar/libecal/e-cal.c:4572 ../calendar/libecal/e-cal-client.c:141
-#: ../calendar/libedata-cal/e-data-cal.c:433
+#: ../calendar/libecal/e-cal.c:4009 ../calendar/libecal/e-cal-client.c:139
+#: ../calendar/libedata-cal/e-data-cal.c:421
 msgid "Invalid object"
 msgstr "àààà ààààà"
 
-#: ../calendar/libecal/e-cal.c:4574
+#: ../calendar/libecal/e-cal.c:4011
 msgid "URI not loaded"
 msgstr "URI ààààà àààà"
 
-#: ../calendar/libecal/e-cal.c:4576
+#: ../calendar/libecal/e-cal.c:4013
 msgid "URI already loaded"
 msgstr "URI àààà ààà"
 
-#: ../calendar/libecal/e-cal.c:4580
+#: ../calendar/libecal/e-cal.c:4017
 msgid "Unknown User"
 msgstr "ààààààà àààààààà"
 
-#: ../calendar/libecal/e-cal.c:4582 ../calendar/libecal/e-cal-client.c:145
-#: ../calendar/libedata-cal/e-data-cal.c:434
+#: ../calendar/libecal/e-cal.c:4019 ../calendar/libecal/e-cal-client.c:143
+#: ../calendar/libedata-cal/e-data-cal.c:422
 msgid "Object ID already exists"
 msgstr "ààààà ID àààà àààààààààà"
 
-#: ../calendar/libecal/e-cal.c:4584
+#: ../calendar/libecal/e-cal.c:4021
 msgid "Protocol not supported"
 msgstr "ààààààààà àààààààà àààà"
 
-#: ../calendar/libecal/e-cal.c:4586
+#: ../calendar/libecal/e-cal.c:4023
 msgid "Operation has been canceled"
 msgstr "àààààà àààà ààààààà ààà ààà"
 
-#: ../calendar/libecal/e-cal.c:4588
+#: ../calendar/libecal/e-cal.c:4025
 msgid "Could not cancel operation"
 msgstr "àààààà àààà àààà àààà ààà"
 
-#: ../calendar/libecal/e-cal.c:4590 ../libedataserver/e-client.c:129
+#: ../calendar/libecal/e-cal.c:4027 ../libedataserver/e-client.c:128
 msgid "Authentication failed"
 msgstr "ààà àààà àààà"
 
-#: ../calendar/libecal/e-cal.c:4592
-#: ../camel/providers/smtp/camel-smtp-transport.c:846
-#: ../libedataserver/e-client.c:131
+#: ../calendar/libecal/e-cal.c:4029
+#: ../camel/providers/smtp/camel-smtp-transport.c:845
+#: ../libedataserver/e-client.c:130
 msgid "Authentication required"
 msgstr "àààààààààà àààààà"
 
-#: ../calendar/libecal/e-cal.c:4594
-#| msgid "A CORBA exception has occurred"
+#: ../calendar/libecal/e-cal.c:4031
 msgid "A D-Bus exception has occurred"
 msgstr "D-Bus ààààà ààààà"
 
-#: ../calendar/libecal/e-cal.c:4598
+#: ../calendar/libecal/e-cal.c:4035
 msgid "No error"
 msgstr "àààà àààààà àààà"
 
-#: ../calendar/libecal/e-cal-client.c:143
-#: ../calendar/libedata-cal/e-data-cal.c:442
-#| msgid "Unknown User"
+#: ../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
-#| msgid "Failed to encode data"
+#: ../calendar/libecal/e-cal-client.c:610
 msgid "Failed to run calendar factory"
 msgstr "àààààààààà àààààààà ààààààààà ààààà"
 
-#: ../calendar/libecal/e-cal-client.c:768
-#| msgid "Failed to encode data"
-msgid "Failed to find system calendar"
-msgstr "ààààààà àààààààààà àààààààà ààààà"
-
-#: ../calendar/libecal/e-cal-client.c:807
-#: ../calendar/libedata-cal/e-data-cal.c:441
-#| msgid "Folder '%s' does not exist."
-msgid "Calendar does not exist"
-msgstr "àààààààààà àààààààààà àààà"
-
-#: ../calendar/libecal/e-cal-client.c:922
-#| msgid "%s: Invalid source."
-msgid "Invalid source type"
-msgstr "àààà ààààà àààààà"
-
-#: ../calendar/libecal/e-cal-component.c:1337
+#: ../calendar/libecal/e-cal-component.c:1339
 msgid "Untitled appointment"
 msgstr "ààààààààà àààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "1st"
 msgstr "1st"
 
-#: ../calendar/libecal/e-cal-recur.c:3982
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "2nd"
 msgstr "2nd"
 
-#: ../calendar/libecal/e-cal-recur.c:3983
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "3rd"
 msgstr "3rd"
 
-#: ../calendar/libecal/e-cal-recur.c:3984
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "4th"
 msgstr "4th"
 
-#: ../calendar/libecal/e-cal-recur.c:3985
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "5th"
 msgstr "5th"
 
-#: ../calendar/libecal/e-cal-recur.c:3986
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "6th"
 msgstr "6th"
 
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "7th"
 msgstr "7th"
 
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "8th"
 msgstr "8th"
 
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "9th"
 msgstr "9th"
 
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "10th"
 msgstr "10th"
 
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "11th"
 msgstr "11th"
 
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "12th"
 msgstr "12th"
 
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "13th"
 msgstr "13th"
 
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "14th"
 msgstr "14th"
 
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "15th"
 msgstr "15th"
 
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "16th"
 msgstr "16th"
 
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "17th"
 msgstr "17th"
 
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "18th"
 msgstr "18th"
 
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "19th"
 msgstr "19th"
 
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "20th"
 msgstr "20th"
 
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "21st"
 msgstr "21st"
 
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "22nd"
 msgstr "22nd"
 
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "23rd"
 msgstr "23rd"
 
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "24th"
 msgstr "24th"
 
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "25th"
 msgstr "25th"
 
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "26th"
 msgstr "26th"
 
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "27th"
 msgstr "27th"
 
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "28th"
 msgstr "28th"
 
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "29th"
 msgstr "29th"
 
-#: ../calendar/libecal/e-cal-recur.c:4010
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "30th"
 msgstr "30th"
 
-#: ../calendar/libecal/e-cal-recur.c:4011
+#: ../calendar/libecal/e-cal-recur.c:4017
 msgid "31st"
 msgstr "31st"
 
-#: ../calendar/libecal/e-cal-util.c:691 ../calendar/libecal/e-cal-util.c:718
-#| msgid "High"
+#: ../calendar/libecal/e-cal-util.c:696 ../calendar/libecal/e-cal-util.c:723
 msgctxt "Priority"
 msgid "High"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-util.c:693 ../calendar/libecal/e-cal-util.c:720
-#| msgid "Normal"
+#: ../calendar/libecal/e-cal-util.c:698 ../calendar/libecal/e-cal-util.c:725
 msgctxt "Priority"
 msgid "Normal"
 msgstr "ààààààà"
 
-#: ../calendar/libecal/e-cal-util.c:695 ../calendar/libecal/e-cal-util.c:722
-#| msgid "Low"
+#: ../calendar/libecal/e-cal-util.c:700 ../calendar/libecal/e-cal-util.c:727
 msgctxt "Priority"
 msgid "Low"
 msgstr "ààà"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:716
-#| msgid "Undefined"
+#: ../calendar/libecal/e-cal-util.c:721
 msgctxt "Priority"
 msgid "Undefined"
 msgstr "àààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:38
+#: ../calendar/libedata-cal/e-cal-backend.c:36
 msgid "Cannot process, calendar backend is opening"
 msgstr "àààààààà ààààà, àààààààààà àààààà àààà ààà"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:146
+#: ../calendar/libedata-cal/e-cal-backend.c:135
 #, c-format
-#| msgid "Unknown error: %s"
 msgid "Unknown calendar property '%s'"
 msgstr "ààààààà àààààààààà ààààààà '%s'"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:163
+#: ../calendar/libedata-cal/e-cal-backend.c:152
 #, c-format
-#| msgid "Cannot save calendar data"
 msgid "Cannot change value of calendar property '%s'"
 msgstr "àààààààààà ààààààà '%s' àààà ààààà ààààà ààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:79
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:819
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:841
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:956
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:987
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1187
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1217
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:77
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:839
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:954
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:985
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1185
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1215
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "\"%s\" àà ààààààà ààààààààààà àààààààà àààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:231
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:276
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:315
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1258
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:229
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:274
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:313
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1256
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\" àà ààà ààààààààààààà ààààààà ààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:128
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:321
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:886
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:119
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:126
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:319
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:884
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "\"%s\" àààà ààààààààààà àààààààà àààà àààààààà àààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:136
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:134
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr "\"%s\" ààà àààààà ISO 8601 date/time àààààààà àààààààà ààà àààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:178
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:537
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:880
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1022
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:535
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1020
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "\"%s\" ààà ààààààààààààà ààààààà ààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:184
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:237
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:282
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:403
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:486
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:543
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1028
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1264
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:182
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:235
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:280
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:401
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:484
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:541
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1026
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1262
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "\"%s\" ààààà ààààààààààà time_t àààààààà ààààààà àààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:192
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:190
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "\"%s\" ààààà ààààààààààà àà àààààààà àààààààà ààààààà àààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:397
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:395
 #, c-format
-#| msgid "\"%s\" expects two arguments"
 msgid "\"%s\" expects two or three arguments"
 msgstr "\"%s\" ààà ààààà ààà àààà àààààààà àààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:411
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:492
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:552
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1036
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:409
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:490
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:550
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1034
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "\"%s\" ààààà ààààààààààà àà time_t àààààààà ààààààà àààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:420
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:418
 #, c-format
-#| msgid "\"%s\" expects the first argument to be a string"
 msgid "\"%s\" expects the third argument to be a string"
 msgstr "\"%s\" ààààààà àààààà àààààààà àààààà àààààààà àààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:480
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:478
 #, c-format
-#| msgid "\"%s\" expects two arguments"
 msgid "\"%s\" expects none or two arguments"
 msgstr "\"%s\" ààààà ààààà ààààà ààà àààà àààààààà ààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:894
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:892
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "\"%s\" ààààà ààààààààààà àà àààààààà àààààààà ààààààà àààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:924
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:922
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1637,12 +1543,12 @@ msgstr ""
 "\"ààààà\" "
 "ààààààà ààààà àààààààà ààààààà àààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1086
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1084
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "\"%s\" àààà ààà àà ààààààààààààà ààààààà àààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1100
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1098
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1652,115 +1558,101 @@ msgstr ""
 "ààà (#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
-#| msgid "Cannot save calendar data"
+#: ../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
-#| msgid "Cannot save calendar data"
+#: ../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
-#| msgid "Cannot save calendar data"
+#: ../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
-#| msgid "Cannot create encoder context"
+#: ../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
-#| msgid "Cannot save calendar data"
+#: ../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
-#| msgid "Cannot save calendar data"
+#: ../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
-#| msgid "Cannot save calendar data"
+#: ../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
-#| msgid "Cannot create encoder context"
+#: ../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
-#| msgid "Cannot save calendar data"
+#: ../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
-#| msgid "Cannot save calendar data"
+#: ../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
-#| msgid "Cannot save calendar data"
+#: ../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
-#| msgid "Cannot save calendar data"
+#: ../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
-#| msgid "Could not retrieve weather data"
+#: ../calendar/libedata-cal/e-data-cal.c:1317
 msgid "Could not retrieve attachment uris: "
 msgstr "àààààààà uris ààààààààààà àààà ààààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1372
-#| msgid "Could not store folder: %s"
+#: ../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
-#| msgid "Could not generate encrypting data: %s"
+#: ../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
-#| msgid "Could not retrieve weather data"
+#: ../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
-#| msgid "Could not rename folder: %s"
+#: ../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 range"
 msgid "Invalid call"
 msgstr "àààà ààà"
 
@@ -1794,15 +1686,15 @@ msgstr "àà àààààààààà àààààà àà àà
 msgid "You may not export keys with this cipher"
 msgstr "àà àààààààààà àààààà àà ààààààà ààààà àààà"
 
-#: ../camel/camel-cipher-context.c:805
+#: ../camel/camel-cipher-context.c:817
 msgid "Signing message"
 msgstr "àààààààà ààààààààà ààà ààà"
 
-#: ../camel/camel-cipher-context.c:1046
+#: ../camel/camel-cipher-context.c:1058
 msgid "Encrypting message"
 msgstr "ààààà  ààààààààà ààà ààà"
 
-#: ../camel/camel-cipher-context.c:1173
+#: ../camel/camel-cipher-context.c:1185
 msgid "Decrypting message"
 msgstr "ààààà àà ààààààààà ààà ààà"
 
@@ -1811,7 +1703,11 @@ msgstr "ààààà àà ààààààààà ààà ààà"
 msgid "Unable to create cache path"
 msgstr "ààà àà ààààààà ààààààà ààààà"
 
-#: ../camel/camel-data-cache.c:507
+#: ../camel/camel-data-cache.c:440
+msgid "Empty cache file"
+msgstr "àààà àààà àààààà ààà"
+
+#: ../camel/camel-data-cache.c:509
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "ààà ààààààààà àààà àààà ààà: %s: %s"
@@ -1847,40 +1743,33 @@ msgstr "ààààààà àààààààààààà ààà à
 msgid "Downloading new messages for offline mode"
 msgstr "àààààà ààààààà àààà ààààà ààààààà ààà ààà"
 
-#: ../camel/camel-disco-folder.c:416
+#: ../camel/camel-disco-folder.c:417
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "àààààààààà '%s' àààààà àààà ààà ààà"
 
-#: ../camel/camel-disco-folder.c:482 ../camel/camel-offline-folder.c:327
-#| msgid "Copy folder content locally for offline operation"
+#: ../camel/camel-disco-folder.c:484 ../camel/camel-offline-folder.c:331
 msgid "Copy folder content locally for _offline operation"
 msgstr ""
 "àààààà àààààààààà ààààààààààààà àààààààààà àààààààà àààààààà àààà àààà (_o)"
 
-#: ../camel/camel-disco-store.c:456
-#: ../camel/providers/imap/camel-imap-store.c:1239
-#: ../camel/providers/imap/camel-imap-store.c:2028
-#: ../camel/providers/imap/camel-imap-store.c:2523
-#: ../camel/providers/imap/camel-imap-store.c:3282
-#: ../camel/providers/imapx/camel-imapx-folder.c:407
-#: ../camel/providers/imapx/camel-imapx-folder.c:440
-#: ../camel/providers/imapx/camel-imapx-folder.c:474
-#: ../camel/providers/imapx/camel-imapx-folder.c:530
-#: ../camel/providers/imapx/camel-imapx-folder.c:587
-#: ../camel/providers/imapx/camel-imapx-folder.c:621
-#: ../camel/providers/imapx/camel-imapx-folder.c:661
-#: ../camel/providers/imapx/camel-imapx-folder.c:697
-#: ../camel/providers/imapx/camel-imapx-store.c:276
-#: ../camel/providers/imapx/camel-imapx-store.c:1367
-#: ../camel/providers/imapx/camel-imapx-store.c:1455
-#: ../camel/providers/imapx/camel-imapx-store.c:1501
+#: ../camel/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:1364 ../camel/camel-imapx-store.c:1452
+#: ../camel/camel-imapx-store.c:1498
+#: ../camel/providers/imap/camel-imap-store.c:1246
+#: ../camel/providers/imap/camel-imap-store.c:2002
+#: ../camel/providers/imap/camel-imap-store.c:2471
+#: ../camel/providers/imap/camel-imap-store.c:3221
 #: ../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 ""
@@ -1905,12 +1794,12 @@ msgstr "%s àààà àààà ààààà àààà àààà
 msgid "Syncing folders"
 msgstr "àààààà àààààààààà ààà ààà"
 
-#: ../camel/camel-filter-driver.c:1240 ../camel/camel-filter-driver.c:1695
+#: ../camel/camel-filter-driver.c:1240 ../camel/camel-filter-driver.c:1705
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "àààà àààààààààà àààààà: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1706
+#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1716
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "àààà ààààààààà àààààà: %s: %s"
@@ -1970,58 +1859,64 @@ msgstr "(àààààààà-ààà) àà àààà àààà"
 msgid "Error executing filter search: %s: %s"
 msgstr "àààà ààà ààààààààà àààààà: %s: %s"
 
-#: ../camel/camel-folder.c:262
+#: ../camel/camel-folder.c:270
 #, c-format
-#| msgid "Scanning for changed messages in %s"
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
 msgstr[0] "'%s' ààààà àààà ààààà ààààà àààà ààà"
 msgstr[1] "'%s' ààààà àààà ààààà ààààà àààà ààà"
 
-#: ../camel/camel-folder.c:302
+#: ../camel/camel-folder.c:310
 #, c-format
-#| msgid "Scanning for changed messages in %s"
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
 msgstr[0] "'%s' ààààà àààà ààà ààààà àààà ààà"
 msgstr[1] "'%s' ààààà àààà ààà ààààà àààà ààà"
 
-#: ../camel/camel-folder.c:350
+#: ../camel/camel-folder.c:358
 #, c-format
-#| msgid "Filtering new message(s)"
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
 msgstr[0] "'%s' ààààà àààà ààààà àààààà ààà ààà"
 msgstr[1] "'%s' ààààà àààà ààààà àààààà ààà ààà"
 
-#: ../camel/camel-folder.c:918
-#: ../camel/providers/local/camel-maildir-folder.c:322
+#: ../camel/camel-folder.c:930
+#: ../camel/providers/local/camel-maildir-folder.c:321
 msgid "Moving messages"
 msgstr "ààààà àààààààààààà ààà ààà"
 
-#: ../camel/camel-folder.c:921
+#: ../camel/camel-folder.c:933
 msgid "Copying messages"
 msgstr "ààààà ààààààààà ààà ààà"
 
-#: ../camel/camel-folder.c:1233
+#: ../camel/camel-folder.c:1253
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr "àààà àààààà àààààà '%s' ààààà ààààààà àààà"
 
-#: ../camel/camel-folder.c:3549
+#: ../camel/camel-folder.c:3371
+#, c-format
+#| msgid "Opening folder '%s'"
+msgid "Expunging folder '%s'"
+msgstr "àààààà '%s' àààà ààà ààà"
+
+#: ../camel/camel-folder.c:3603
 #, c-format
-#| msgid "Retrieving POP message %d"
 msgid "Retrieving message '%s' in %s"
 msgstr "%2$s ààààà ààààà '%1$s' ààààààààààà ààà ààà"
 
-#: ../camel/camel-folder.c:3698
+#: ../camel/camel-folder.c:3753
 #, c-format
-#| msgid "Fetching summary information for new messages in %s"
 msgid "Retrieving quota information for '%s'"
 msgstr "'%s' ààààà àààà àààààà ààààààààààà ààà "
 
-#: ../camel/camel-folder-search.c:365 ../camel/camel-folder-search.c:479
-#: ../camel/camel-folder-search.c:664
+#: ../camel/camel-folder.c:3985
+#, c-format
+#| msgid "Creating folder '%s'"
+msgid "Refreshing folder '%s'"
+msgstr "àààààà '%s' àààà ààà ààà"
+
+#: ../camel/camel-folder-search.c:417 ../camel/camel-folder-search.c:581
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2030,8 +1925,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:429 ../camel/camel-folder-search.c:593
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2041,31 +1935,31 @@ msgstr ""
 "%s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:890 ../camel/camel-folder-search.c:933
+#: ../camel/camel-folder-search.c:811 ../camel/camel-folder-search.c:854
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) àà bool àààààààà àààààààà ààà"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:994
+#: ../camel/camel-folder-search.c:921
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "%s àààà àà (%s) àà ààààààà àààà"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1001 ../camel/camel-folder-search.c:1009
+#: ../camel/camel-folder-search.c:928 ../camel/camel-folder-search.c:936
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) àà àààààà àààààà ààààààààààà àààààààà ààà"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1037
+#: ../camel/camel-folder-search.c:964
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) àà àààààààà àààààààà ààààààà ààà"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1047
+#: ../camel/camel-folder-search.c:974
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) àààà àààààà ààà ààààà ààà"
@@ -2077,7 +1971,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 "ààààààà"
 
@@ -2131,21 +2025,21 @@ msgid ""
 "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 "Canceled"
 msgid "Cancelled"
 msgstr "àààà àààà"
 
 #: ../camel/camel-gpg-context.c:900
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr "ààààà àà àààààààà àààà:à àààààà ààààààààà àààà àààà."
+msgstr "ààààà àà àààààààà àààà:3 àààààà ààààààààààà àààà àààà."
 
 #: ../camel/camel-gpg-context.c:913
 #, c-format
@@ -2158,7 +2052,6 @@ msgid "Failed to encrypt: No valid recipients specified."
 msgstr "ààààààààà ààààààà àààà: àààà ààà àààààààààààà àààà."
 
 #: ../camel/camel-gpg-context.c:1591 ../camel/camel-smime-context.c:831
-#| msgid "Could not generate signing data: %s"
 msgid "Could not generate signing data: "
 msgstr "ààààààààà àààà ààààààà àààà ààààà: "
 
@@ -2177,37 +2070,309 @@ msgid "Cannot verify message signature: Incorrect message format"
 msgstr "ààààà ààààààààààà ààààààà àààà ààà ààà: àààààà ààààà àààààà"
 
 #: ../camel/camel-gpg-context.c:1797
-#| msgid "Cannot verify message signature: Incorrect message format"
 msgid "Cannot verify message signature: "
 msgstr "ààààà ààààààààààà àààààà ààààà: "
 
 #: ../camel/camel-gpg-context.c:1920
-#| msgid "Could not generate encrypting data: %s"
 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: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:738
+msgid "Apply message _filters to this folder"
+msgstr "àà ààààààààààà ààààà àààààà àààà ààà (_f)"
+
+#: ../camel/camel-imapx-server.c:1020
+msgid "Server disconnected"
+msgstr "ààààààà ààààà àààà"
+
+#: ../camel/camel-imapx-server.c:1472
+msgid "Error writing to cache stream: "
+msgstr "àààà àààààààààààà ààààààààà àààààà: "
+
+#: ../camel/camel-imapx-server.c:2401
+#, c-format
+msgid "Not authenticated"
+msgstr "ààà ààààà ààààà"
+
+#: ../camel/camel-imapx-server.c:2470
+msgid "Error performing IDLE"
+msgstr "IDLE àààààààà àààààà ààààà"
+
+#: ../camel/camel-imapx-server.c:3314
+#: ../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 "%s àààààààà ààààààà IMAP àààààààààààà àààààà àààààààà àààà ààà: %s"
+
+#: ../camel/camel-imapx-server.c:3315
+#: ../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:3354
+#: ../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:3421
+#: ../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:3432 ../camel/camel-session.c:486
+#: ../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:3451
+#: ../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:3460
+#: ../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:3650
+msgid "Error fetching message"
+msgstr "ààààà ààààààà àààààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:3732
+#| msgid "Failed to cache %s: "
+msgid "Failed to copy the tmp file"
+msgstr "tmp àààààà àààà àààààààà ààààà"
+
+#: ../camel/camel-imapx-server.c:3746
+#| msgid "Failed to encode data"
+msgid "Failed to close the tmp stream"
+msgstr "tmp ààààààà ààà àààààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:3844
+msgid "Error copying messages"
+msgstr "ààààààààà àààà ààààààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:3979
+msgid "Error appending message"
+msgstr "ààààà àààààààà àààààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:4166
+msgid "Error fetching message headers"
+msgstr "ààààà ààààààà ààààààà àààààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:4305
+msgid "Error retrieving message"
+msgstr "ààààà àààààààààààààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:4427 ../camel/camel-imapx-server.c:4627
+#, c-format
+#| msgid "Fetching summary information for new messages in %s"
+msgid "Fetching summary information for new messages in '%s'"
+msgstr "'%s' àààà àààà àààààààààà àààààà àààààà ààààààà àààà ààà"
+
+#: ../camel/camel-imapx-server.c:4480
+#, c-format
+#| msgid "Scanning for changed messages in %s"
+msgid "Scanning for changed messages in '%s'"
+msgstr "'%s' ààààà àààààààà àààààààààà ààààà àààà ààà"
+
+#: ../camel/camel-imapx-server.c:4523
+msgid "Error fetching new messages"
+msgstr "àààà ààààà ààààààà àààààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:4723
+msgid "Error while fetching messages"
+msgstr "ààààà ààààààà àààààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:4731 ../camel/camel-imapx-server.c:4767
+#, c-format
+#| msgid "Fetching summary information for %d message in %s"
+#| msgid_plural "Fetching summary information for %d messages in %s"
+msgid "Fetching summary information for %d message in '%s'"
+msgid_plural "Fetching summary information for %d messages in '%s'"
+msgstr[0] "'%2$s' àààà %1$d àààààààààà àààààà àààààà ààààààà ààà ààà"
+msgstr[1] "'%2$s' àààà %1$d àààààààààà àààààà àààààà ààààààà ààà ààà"
+
+#: ../camel/camel-imapx-server.c:4894 ../camel/camel-imapx-server.c:4930
+msgid "Error refreshing folder"
+msgstr "àààààà àààààààà àààààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:5023
+msgid "Error expunging message"
+msgstr "ààààà ààààà ààààààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:5120
+msgid "Error fetching folders"
+msgstr "ààààààààà ààààààà àààààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:5199
+msgid "Error subscribing to folder"
+msgstr "àààààààà àààààààààà àààààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:5256
+msgid "Error creating folder"
+msgstr "àààààà ààààààà àààààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:5305
+msgid "Error deleting folder"
+msgstr "àààààà àààà àààààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:5359
+msgid "Error renaming folder"
+msgstr "àààààààà ààààààààààà àààààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:5414
+msgid "Error performing NOOP"
+msgstr "NOOP àààààààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:5512
+msgid "Error syncing changes"
+msgstr "ààà àààà àààààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:6142
+#: ../camel/providers/imap/camel-imap-folder.c:3500
+#, c-format
+msgid "Cannot get message with message ID %s: %s"
+msgstr "ààààà ID %s àààààà ààààà ààààààà ààà ààà àààà: %s"
+
+#: ../camel/camel-imapx-server.c:6143
+#: ../camel/providers/imap/camel-imap-folder.c:3501
+msgid "No such message available."
+msgstr "ààààààà ààààà àààààà àààà."
+
+#: ../camel/camel-imapx-server.c:6298 ../camel/camel-imapx-server.c:6313
+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 àà %s ààààà IMAP àààààà"
+
+#: ../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:2229
+#, c-format
+msgid "No such folder %s"
+msgstr "%s ààà àààààà àààà"
+
+#. 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:2642
+#: ../camel/providers/local/camel-maildir-folder.c:473
+#: ../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-imapx-store.c:1071
+#, c-format
+msgid "Retrieving folder list for %s"
+msgstr "%s ààààà àààààà àààà ààààààààààà ààà ààà"
+
+#: ../camel/camel-imapx-store.c:1172
+#: ../camel/providers/nntp/camel-nntp-store.c:1749
+#, c-format
+msgid "No such folder: %s"
+msgstr "ààà àààààà àààà: %s"
+
+#: ../camel/camel-imapx-store.c:1385
+#: ../camel/providers/imap/camel-imap-store.c:2046
+#: ../camel/providers/imap/camel-imap-store.c:2486
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "àààààààà ààà \"%s\" àààà ààà àààà ààààà àààààà àààà \"%c\""
 
-#: ../camel/camel-gpg-context.c:2031 ../camel/camel-gpg-context.c:2040
-#: ../camel/camel-gpg-context.c:2063
+#: ../camel/camel-imapx-store.c:1396
+#: ../camel/providers/imap/camel-imap-store.c:2499
 #, c-format
-msgid "Cannot decrypt message: Incorrect message format"
-msgstr "ààààà ààààààààà àà ààààààà àààà ààà ààà: àààààà ààààà àààààà"
+msgid "Unknown parent folder: %s"
+msgstr "ààààààà àààà àààààà: %s"
 
-#: ../camel/camel-gpg-context.c:2051
+#: ../camel/camel-imapx-store.c:1406
+#: ../camel/providers/imap/camel-imap-store.c:2109
+#: ../camel/providers/imap/camel-imap-store.c:2550
 #, c-format
-msgid "Failed to decrypt MIME part: protocol error"
-msgstr "MIME ààààà ààààààààà ààààààà àààà: ààààààààà àààààà"
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "ààà ààààààà àààààààà àààààààà ààààààà àààà"
 
-#: ../camel/camel-gpg-context.c:2142 ../camel/camel-smime-context.c:1268
-msgid "Encrypted content"
-msgstr "ààààààààààà àààààààà"
+#: ../camel/camel-imapx-stream.c:72
+#, c-format
+msgid "Source stream returned no data"
+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:81
+#, c-format
+msgid "Source stream unavailable"
+msgstr "ààààààà ààààààà àààààààà"
 
 #: ../camel/camel-lock.c:102
 #, c-format
@@ -2216,7 +2381,6 @@ msgstr "%s àààà àààà àààà àààà ààààà 
 
 #: ../camel/camel-lock.c:145
 #, c-format
-#| msgid "Timed out trying to get lock file on %s. Try again later."
 msgid "Timed out trying to get lock file on %s.  Try again later."
 msgstr "%s àà ààà àààà ààààààà àààààààà àààààààààà ààààà.  ààààààààààà àààà."
 
@@ -2306,13 +2470,11 @@ msgstr "ààà ààààààà àààà ààààààààà
 
 #: ../camel/camel-multipart-signed.c:297
 #, c-format
-#| msgid "No description available"
 msgid "No content available"
 msgstr "àààààààà àààààà àààààà àààà"
 
 #: ../camel/camel-multipart-signed.c:305
 #, c-format
-#| msgid "No description available"
 msgid "No signature available"
 msgstr "ààààààààà àààààà àààà"
 
@@ -2350,11 +2512,10 @@ msgstr "ààà ààààà àààà: %s"
 
 #: ../camel/camel-network-service.c:112
 #, c-format
-#| msgid "Could not connect to %s: %s"
 msgid "Could not connect to %s: "
 msgstr "%s àà ààààà ààààà: "
 
-#: ../camel/camel-offline-folder.c:206
+#: ../camel/camel-offline-folder.c:207
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "%s àààààà àààà ààààà ààààà ààààà àààà ààà ààà"
@@ -2389,7 +2550,7 @@ msgid "Could not load %s: No initialization code in module."
 msgstr ""
 "%s àà ààààà àààà àààà ààà: ààààààà ààààà ààààààà àààààààà ààà àààà ààà."
 
-#: ../camel/camel-provider.c:402 ../camel/camel-session.c:388
+#: ../camel/camel-provider.c:410 ../camel/camel-session.c:398
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "ààààààààà '%s' ààààà ààààààà ààààààààààà àààààà àààà"
@@ -2560,7 +2721,7 @@ 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 "ààààà àààà àààààà àààààààààà àààààààà."
@@ -2609,13 +2770,11 @@ msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "SMTP ààààààààààà ààààààààààà àà àààààà ààà àààààààà ààààààà àààà"
 
 #: ../camel/camel-sasl-popb4smtp.c:84
-#| msgid "POP Source URI"
 msgid "POP Source UID"
 msgstr "POP ààààà UID"
 
 #: ../camel/camel-sasl-popb4smtp.c:96
 #, c-format
-#| msgid "POP Before SMTP auth using an unknown transport"
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "ààààààà àààààààààààààà àààà àààà POP ààààà SMTP ààà àààà"
 
@@ -2630,30 +2789,17 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "àààààààà ààààààààà ààààààààà àààà: %s: %s"
 
-#: ../camel/camel-session.c:397
+#: ../camel/camel-session.c:407
 #, c-format
-#| msgid "No provider available for protocol '%s'"
 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:501
 #, c-format
-#| msgid "Authentication failed"
 msgid "%s authentication failed"
 msgstr "%s ààà àààà ààààà"
 
-#: ../camel/camel-session.c:1187
+#: ../camel/camel-session.c:1239
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "ààààà %3$s àààà %2$s ààààà %1$s ààààààààà àààààààà ààà."
@@ -2848,54 +2994,51 @@ msgstr "àààààààà àààààà ààààà àààà
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME Decrypt: ààààààà àààààààààà àààààà àààààà àààààà àààà"
 
-#: ../camel/camel-store.c:1799
+#: ../camel/camel-store.c:1838
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "àààààà '%s' àààà ààà àààà: àààààà àààààààààà ààà"
 
-#: ../camel/camel-store.c:1842
+#: ../camel/camel-store.c:1881
 #, c-format
-#| msgid "Syncing folders"
 msgid "Opening folder '%s'"
 msgstr "'%s' àààà ààà"
 
-#: ../camel/camel-store.c:2027
+#: ../camel/camel-store.c:2066
 #, c-format
-#| msgid "Scanning for changed messages in %s"
 msgid "Scanning folders in '%s'"
 msgstr "'%s' ààààà ààààààààà ààààà ààà"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2039 ../camel/camel-store.c:2049
+#: ../camel/camel-store.c:2078 ../camel/camel-store.c:2088
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "àààà"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2042 ../camel/camel-store.c:2053
+#: ../camel/camel-store.c:2081 ../camel/camel-store.c:2092
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "ààà"
 
-#: ../camel/camel-store.c:2501
+#: ../camel/camel-store.c:2540
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "àààààà àààà ààà àààà: %s: àààààà àààààààààà ààà"
 
-#: ../camel/camel-store.c:2515
+#: ../camel/camel-store.c:2554
 #, c-format
-#| msgid "Cannot get folder '%s': %s"
 msgid "Creating folder '%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: àààà ààààààààà"
 
-#: ../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: àààà ààààààààà"
@@ -2904,6 +3047,10 @@ msgstr "àààààààà ààà ààà ààà ààà àà
 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"
@@ -2914,103 +3061,103 @@ msgstr "ààààà àààà"
 msgid "Could not connect with command \"%s\": %s"
 msgstr "\"%s\" àààà ààààààà àààààà ààààà ààà àààà: %s"
 
-#: ../camel/camel-tcp-stream-raw.c:303
+#: ../camel/camel-subscribable.c:386
+#, c-format
+#| msgid "Error subscribing to folder"
+msgid "Subscribing to folder '%s'"
+msgstr "àààààà '%s' ààààà àààààààààà àààààààà àààààà"
+
+#: ../camel/camel-subscribable.c:518
+#, c-format
+#| msgid "Error subscribing to folder"
+msgid "Unsubscribing from folder '%s'"
+msgstr "àààààà '%s' ààààà àààààààààà ààààà àààààààà àààààà"
+
+#: ../camel/camel-tcp-stream-raw.c:310
 #, c-format
 msgid "NSPR error code %d"
 msgstr "NSPR àààààà ààà %d"
 
-#: ../camel/camel-tcp-stream-raw.c:640 ../camel/camel-tcp-stream-raw.c:651
+#: ../camel/camel-tcp-stream-raw.c: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"
 
-#: ../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 "No support for authentication type %s"
 msgid "Could not find a suitable authentication type: code 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
-#| msgid "Connection canceled"
+#: ../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
-#| msgid "STLS not supported by server"
+#: ../camel/camel-tcp-stream-raw.c:795
 msgid "Command not supported by SOCKS server"
 msgstr "SOCKS àààààààààààà àààà ààààààà àààà"
 
-#: ../camel/camel-tcp-stream-raw.c:789
-#| msgid "STLS not supported by server"
+#: ../camel/camel-tcp-stream-raw.c:796
 msgid "Address type not supported by SOCKS server"
 msgstr "SOCKS àààààààààààà ààààà àààààà ààààààà àààà"
 
-#: ../camel/camel-tcp-stream-raw.c:790
-#| msgid "Unknown error: %s"
+#: ../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 "Invalid response from server"
 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 "àààààààà ààà àààà ààà (àààà 255 àààààà ààà)"
 
 #. 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 response from server"
 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"
@@ -3022,16 +3169,16 @@ msgstr ""
 "   ààààààààààà:  %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"
@@ -3044,19 +3191,19 @@ msgstr ""
 "ààààààààààààààà àààààà àààààà:\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"
@@ -3065,7 +3212,7 @@ msgstr ""
 "àààààààààà àààààà: %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"
@@ -3074,7 +3221,7 @@ msgstr ""
 "àààà àààààààààà ààààà: %s\n"
 "ààààààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:618
+#: ../camel/camel-tcp-stream-ssl.c:649
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -3083,7 +3230,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"
@@ -3097,44 +3244,51 @@ msgstr ""
 msgid "Could not parse URL '%s'"
 msgstr "URL '%s' àààà àààà àààà"
 
-#: ../camel/camel-vee-folder.c:651
+#: ../camel/camel-vee-folder.c:491
 #, c-format
-#| msgid "Storing folder"
-msgid "Updating %s folder"
-msgstr "%s àààààà ààààààà ààà ààà"
+#| msgid "Creating folder '%s'"
+msgid "Updating folder '%s'"
+msgstr "àààààà '%s' ààààààà ààà ààà"
 
-#: ../camel/camel-vee-folder.c:1325 ../camel/camel-vee-folder.c:1482
+#: ../camel/camel-vee-folder.c:850 ../camel/camel-vee-folder.c:960
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "ààààààààààà àààààà ààààà àààààààà ààààà àààà ààà àààà"
 
-#: ../camel/camel-vee-folder.c:1358
+#: ../camel/camel-vee-folder.c:883
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%s ààààà ààà ààààààà ààààà àààà %s"
 
-#: ../camel/camel-vee-folder.c:1426
+#: ../camel/camel-vee-folder.c:936
 #, c-format
-#| msgid "Error storing '%s': %s"
 msgid "Error storing '%s': "
 msgstr "'%s' àààààààààà àààààà: "
 
+#: ../camel/camel-vee-folder.c:1164
+msgid "Automatically _update on change in source folders"
+msgstr "ààààà ààààààààààà ààààààà ààààààààààà ààààààà ààà (_u)"
+
 #. Translators: 'Unmatched' is a folder name under Search folders where are shown
 #. * all messages not belonging into any other configured search folder
-#: ../camel/camel-vee-store.c:37
+#: ../camel/camel-vee-store.c:38
 msgid "Unmatched"
 msgstr "àààààà"
 
-#: ../camel/camel-vee-store.c:378
+#: ../camel/camel-vee-store.c:436
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "àààààà ààà ààà ààà àààà: %s: ààà ààààà àààà"
 
-#: ../camel/camel-vee-store.c:412
+#: ../camel/camel-vee-store.c:470
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "àààààààà ààà ààà ààà ààà àààà: %s: ààà ààààà àààà"
 
+#: ../camel/camel-vee-store.c:532
+msgid "Enable _Unmatched folder"
+msgstr "àààààààààà àààààà àààà ààà (_U)"
+
 #: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "àààà àààààààà ààààà ààààààààà ààà ààà àààà"
@@ -3144,27 +3298,24 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "ààààà àààààààà ààààà ààààààààà ààà ààà àààà"
 
 #: ../camel/providers/imap/camel-imap-command.c:200
-#: ../camel/providers/imap/camel-imap-command.c:297
+#: ../camel/providers/imap/camel-imap-command.c:299
 #, c-format
 msgid "No output stream"
 msgstr "àààààà ààààààà àààà"
 
 #: ../camel/providers/imap/camel-imap-command.c:208
-#: ../camel/providers/imap/camel-imap-command.c:305
+#: ../camel/providers/imap/camel-imap-command.c:307
 #, c-format
 msgid "No input stream"
 msgstr "ààààà ààààààà àààà"
 
-#: ../camel/providers/imap/camel-imap-command.c:383
+#: ../camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Server unexpectedly disconnected: %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"
@@ -3172,7 +3323,7 @@ msgstr ""
 "IMAP ààààààà %s %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"
@@ -3181,108 +3332,84 @@ msgstr ""
 "%s %s: IMAP àààààààààà ààààà ààà\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"
 
-#: ../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 "ààààààà àààààààà ààà àààà ààààà."
 
-#: ../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 "%s àààààà IMAP ààààààààà àààààààààà àààààà "
 
-#: ../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"
 
-#: ../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
+#: ../camel/providers/imap/camel-imap-folder.c:1127
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "%s àààà ààààà àààààààà ààààà ààààà ààààà àààà ààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3478
-#| msgid "Unable to retrieve message: %s"
+#: ../camel/providers/imap/camel-imap-folder.c:3463
 msgid "Unable to retrieve message: "
 msgstr "ààààà ààààààààààà ààààààà ààààà: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:3515
-#: ../camel/providers/imapx/camel-imapx-server.c:5509
-#, c-format
-msgid "Cannot get message with message ID %s: %s"
-msgstr "ààààà ID %s àààààà ààààà ààààààà ààà ààà àààà: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3516
-#: ../camel/providers/imapx/camel-imapx-server.c:5510
-msgid "No such message available."
-msgstr "ààààààà ààààà àààààà àààà."
-
-#: ../camel/providers/imap/camel-imap-folder.c:3591
-#: ../camel/providers/imap/camel-imap-folder.c:4469
-#: ../camel/providers/nntp/camel-nntp-folder.c:515
+#: ../camel/providers/imap/camel-imap-folder.c:3577
+#: ../camel/providers/imap/camel-imap-folder.c:4462
+#: ../camel/providers/nntp/camel-nntp-folder.c:493
 #, c-format
 msgid "This message is not currently available"
 msgstr "àà ààààà ààààà àààààà àààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4050
-#: ../camel/providers/imap/camel-imap-folder.c:4133
-#: ../camel/providers/imapx/camel-imapx-server.c:3901
-#: ../camel/providers/imapx/camel-imapx-server.c:4081
+#: ../camel/providers/imap/camel-imap-folder.c:4038
+#: ../camel/providers/imap/camel-imap-folder.c:4118
 #, 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:4249
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "àààààà ààààààà àààààààà: %d àààààààààà àààààà àààààà àààààà àààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4277
+#: ../camel/providers/imap/camel-imap-folder.c:4259
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "àààààà ààààààà àààààààà: %d àààààààààà àààààà UID àààààà àààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4509
+#: ../camel/providers/imap/camel-imap-folder.c:4499
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH àààààààààà àààààààà àà àààààà àààà."
 
 #: ../camel/providers/imap/camel-imap-message-cache.c:196
 #: ../camel/providers/imap/camel-imap-message-cache.c:253
-#| msgid "Could not open cache directory: %s"
 msgid "Could not open cache directory: "
 msgstr "àààà àààààààààà ààààà ààààà: "
 
@@ -3293,435 +3420,144 @@ msgstr "%s: %s ààà ààààà ààààààà"
 
 #: ../camel/providers/imap/camel-imap-message-cache.c:397
 #, c-format
-#| msgid "Failed to cache message %s: %s"
 msgid "Failed to cache message %s: "
 msgstr "ààààà %s ààà ààààààà ààààà: "
 
 #: ../camel/providers/imap/camel-imap-message-cache.c:539
 #, c-format
-#| msgid "Failed to cache %s: %s"
 msgid "Failed to cache %s: "
 msgstr "%s ààà ààààààà ààààà: "
 
 #: ../camel/providers/imap/camel-imap-provider.c:40
-#: ../camel/providers/imapx/camel-imapx-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:38
 msgid "Checking for New Mail"
 msgstr "àààà ààààààààà ààààà ààà"
 
 #: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
 msgid "C_heck for new messages in all folders"
 msgstr "àààà àààààà ààààà àààà ààààà ààààà ààààà (_h)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "àààà ààààà ààààà àààààààààà àààààà ààààààà àààà àààà (_e)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:52
-msgid "Connection to Server"
-msgstr "ààààààà àààà"
-
-#: ../camel/providers/imap/camel-imap-provider.c:50
-#: ../camel/providers/imapx/camel-imapx-provider.c:54
-msgid "_Use custom command to connect to server"
-msgstr "ààààààààà ààààààà ààààà àààààà àààà ààààà (_U)"
-
-#: ../camel/providers/imap/camel-imap-provider.c:52
-#| msgid "Command:"
-msgid "Co_mmand:"
-msgstr "àààà (_m):"
-
-#: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:62
+#: ../camel/providers/imap/camel-imap-provider.c:47
+#: ../camel/providers/imapx/camel-imapx-provider.c:49
 #: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "Folders"
 msgstr "àààààààà"
 
-#: ../camel/providers/imap/camel-imap-provider.c:58
-#: ../camel/providers/imapx/camel-imapx-provider.c:64
+#: ../camel/providers/imap/camel-imap-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:51
 msgid "_Show only subscribed folders"
 msgstr "àààà àààààààà àààààà àààààà àààààà (_S)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imapx/camel-imapx-provider.c:67
+#: ../camel/providers/imap/camel-imap-provider.c:51
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
 msgid "O_verride server-supplied folder namespace"
 msgstr "ààààà àààààà ààààààààà àààààà àààààààààà àààààà ààààà (_v)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#| msgid "Namespace:"
+#: ../camel/providers/imap/camel-imap-provider.c:53
 msgid "Names_pace:"
 msgstr "àààààààà (_p):"
 
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imapx/camel-imapx-provider.c:72
-#: ../camel/providers/local/camel-local-provider.c:42
-#: ../camel/providers/local/camel-local-provider.c:84
-#: ../camel/providers/local/camel-local-provider.c:105
+#: ../camel/providers/imap/camel-imap-provider.c:55
+#: ../camel/providers/imapx/camel-imapx-provider.c:59
+#: ../camel/providers/local/camel-local-provider.c:41
+#: ../camel/providers/local/camel-local-provider.c:77
+#: ../camel/providers/local/camel-local-provider.c:97
 #: ../camel/providers/nntp/camel-nntp-provider.c:41
 msgid "Options"
 msgstr "àààààà"
 
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
+#: ../camel/providers/imap/camel-imap-provider.c:57
+#: ../camel/providers/imapx/camel-imapx-provider.c:61
 #: ../camel/providers/nntp/camel-nntp-provider.c:43
-#| msgid "_Apply filters to new messages in INBOX"
 msgid "Apply _filters to new messages in all folders"
 msgstr "àààà ààààààààà ààààà àààà àààààààààà ààààààààà àààà ààà (_f)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imapx/camel-imapx-provider.c:76
+#: ../camel/providers/imap/camel-imap-provider.c:59
+#: ../camel/providers/imapx/camel-imapx-provider.c:63
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr "àààà ààààààààà ààààààààààà ààààà àààààààààààà ààààààààà àààà(_A)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imapx/camel-imapx-provider.c:78
+#: ../camel/providers/imap/camel-imap-provider.c:61
+#: ../camel/providers/imapx/camel-imapx-provider.c:65
 msgid "Check new messages for _Junk contents"
 msgstr "ààà ààààààà ààààà àààà ààààààà àààààà ààà (_J)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
-#: ../camel/providers/imapx/camel-imapx-provider.c:80
+#: ../camel/providers/imap/camel-imap-provider.c:63
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "ààààààà àààààà ààààà ààà ààààà ààààà àààà ààà (_B)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:74
-#: ../camel/providers/imapx/camel-imapx-provider.c:82
+#: ../camel/providers/imap/camel-imap-provider.c:65
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "àààààà ààà ààààààààààààà ààààà àààààààà ààà (_z)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:80
+#: ../camel/providers/imap/camel-imap-provider.c:71
 msgid "IMAP default port"
 msgstr "IMAP àààààààààààààà ààààà"
 
-#: ../camel/providers/imap/camel-imap-provider.c:81
-#: ../camel/providers/imapx/camel-imapx-provider.c:89
-#| msgid "IMAP server %s"
+#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "IMAP over SSL"
 msgstr "IMAP ààààà SSL"
 
-#: ../camel/providers/imap/camel-imap-provider.c:87
+#: ../camel/providers/imap/camel-imap-provider.c:78
 msgid "IMAP"
-msgstr "IMAP"
-
-#: ../camel/providers/imap/camel-imap-provider.c:89
-#: ../camel/providers/imapx/camel-imapx-provider.c:98
-msgid "For reading and storing mail on IMAP servers."
-msgstr "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 "%s àààààààà ààààààà IMAP àààààààààààà àààààà àààààààà àààà ààà: %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: %s"
-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 àà %s ààààà IMAP àààààà"
-
-#: ../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: %s"
-msgid "Server unexpectedly disconnected: "
-msgstr "ààààààà àààààààààààà ààààà àààà: "
-
-#: ../camel/providers/imapx/camel-imapx-folder.c:101
-#, c-format
-#| msgid "Could not load summary for %s"
-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 file"
-msgid "Could not create cache for %s: "
-msgstr "%s ààààà àààà ààààààà àààà ààààà: "
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
-msgid "Use _Quick Resync if the server supports it"
-msgstr "ààààààà àààààà ààà ààààààà àààà àààààààà àààà ààà (_Q) "
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:48
-msgid "_Listen for server change notifications"
-msgstr "ààààààà ààà ààààààààààà ààà (_L)"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:56
-msgid "Command:"
-msgstr "àààà:"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:58
-msgid "Numbe_r of cached connections to use"
-msgstr "àààààààààààà àààààà àààààààà àààààà (_r)"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:69
-msgid "Namespace:"
-msgstr "àààààààààà:"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
-msgid "Default IMAP port"
-msgstr "àààààààààààààà IMAP ààààà"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:96
-msgid "IMAP+"
-msgstr "IMAP+"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:817
-#| msgid "Server unexpectedly disconnected"
-msgid "Server disconnected"
-msgstr "ààààààà ààààà àààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:1206
-#| msgid "Error writing mail temp file: %s"
-msgid "Error writing to cache stream: "
-msgstr "àààà àààààààààààà ààààààààà àààààà: "
-
-#: ../camel/providers/imapx/camel-imapx-server.c:1940
-#, c-format
-#| msgid "Failed to authenticate.\n"
-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 "Posting failed: %s"
-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 "Verifying message"
-msgid "Error while fetching messages"
-msgstr "ààààà ààààààà àààààààà àààààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4180
-#: ../camel/providers/imapx/camel-imapx-server.c:4210
-#, c-format
-#| msgid "Fetching summary information for new messages in %s"
-msgid "Fetching summary information for %d message in %s"
-msgid_plural "Fetching summary information for %d messages in %s"
-msgstr[0] "%2$s àààà %1$d àààààààààà àààààà àààààà ààààààà ààà ààà"
-msgstr[1] "%2$s àààà %1$d àààààààààààà àààààà àààààà ààààààà ààà ààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4332
-#: ../camel/providers/imapx/camel-imapx-server.c:4366
-#| msgid "Error performing search"
-msgid "Error refreshing folder"
-msgstr "àààààà àààààààà àààààààà àààààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4455
-#| msgid "Expunging old messages"
-msgid "Error expunging message"
-msgstr "ààààà ààààà ààààààààà àààààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4540
-#| msgid "Storing folder"
-msgid "Error fetching folders"
-msgstr "ààààààààà ààààààà àààààààà àààààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4614
-#| msgid "_Show only subscribed folders"
-msgid "Error subscribing to folder"
-msgstr "àààààààà àààààààààà àààààààà àààààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4667
-#| msgid "Storing folder"
-msgid "Error creating folder"
-msgstr "àààààà ààààààà àààààààà àààààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4712
-#| msgid "Storing folder"
-msgid "Error deleting folder"
-msgstr "àààààà àààà àààààààà àààààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4762
-#| msgid "Storing folder"
-msgid "Error renaming folder"
-msgstr "àààààààà ààààààààààà àààààààà àààààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4813
-#| msgid "Error performing search"
-msgid "Error performing NOOP"
-msgstr "NOOP àààààààààà àààààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4908
-msgid "Error syncing changes"
-msgstr "ààà àààà àààààààà àààààà"
+msgstr "IMAP"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5664
-#: ../camel/providers/imapx/camel-imapx-server.c:5679
-#| msgid "Cannot create message: %s"
-msgid "Cannot create spool file: "
-msgstr "ààààà àààà ààààààà àààà ààààà: "
+#: ../camel/providers/imap/camel-imap-provider.c:80
+#: ../camel/providers/imapx/camel-imapx-provider.c:85
+msgid "For reading and storing mail on IMAP servers."
+msgstr "IMAP ààààà àààà ààà àààààààààààà ààà àààààà àààààà ààààà."
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1076
+#: ../camel/providers/imap/camel-imap-store.c: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 "Preparing folder '%s' for offline"
-msgid "Retrieving folder list for %s"
-msgstr "%s ààààà àààààà àààà ààààààààààà ààà ààà"
+msgid "Cannot create folder '%s': folder exists."
+msgstr "àààààà '%s' àààà ààà àààà: àààààà àààààààààà ààà."
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1176
-#: ../camel/providers/nntp/camel-nntp-store.c:1790
+#: ../camel/providers/imap/camel-imap-store.c:2923
 #, c-format
-msgid "No such folder: %s"
-msgstr "ààà àààààà àààà: %s"
+#| msgid "Retrieving folder list for %s"
+msgid "Retrieving list of folders at '%s'"
+msgstr "'%s' ààààà àààààà àààà ààààààààààà ààà ààà"
 
-#: ../camel/providers/imapx/camel-imapx-stream.c:70
+#: ../camel/providers/imap/camel-imap-store.c:3265
 #, c-format
-msgid "Source stream returned no data"
-msgstr "ààààààà ààààààààà àààà àààààà àààà"
+msgid "Server unexpectedly disconnected"
+msgstr "ààààààà àààààà ààààààààààààààà ààààà àààà"
 
-#: ../camel/providers/imapx/camel-imapx-stream.c:79
-#, c-format
-#| msgid "service unavailable"
-msgid "Source stream unavailable"
-msgstr "ààààààà ààààààà àààààààà"
+#: ../camel/providers/imap/camel-imap-store.c:3268
+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
@@ -3739,16 +3575,12 @@ msgstr "ààààààà: %s (%s)"
 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:726
 #, c-format
-#| msgid ""
-#| "Cannot get message: %s from folder %s\n"
-#| "  %s"
 msgid ""
 "Cannot get message %s from folder %s\n"
 "%s"
@@ -3756,23 +3588,23 @@ msgstr ""
 "àààààà %2$s\n"
 "%3$s ààààà ààààà %1$s ààààààà àààà ààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:44
+#: ../camel/providers/local/camel-local-provider.c:43
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr "'.folders' àààààà àààààà àààà ààààà (exmh) (_U)"
 
-#: ../camel/providers/local/camel-local-provider.c:51
+#: ../camel/providers/local/camel-local-provider.c:50
 msgid "MH-format mail directories"
 msgstr "MH-àààààà ààà àààààààààà"
 
-#: ../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-ààààààà àààà ààààà ààààààà àààà ààààààààààààà."
 
-#: ../camel/providers/local/camel-local-provider.c:70
+#: ../camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "ààààààà ààààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:71
+#: ../camel/providers/local/camel-local-provider.c:65
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
@@ -3781,30 +3613,29 @@ msgstr ""
 "ààààà ààààààà "
 "ààà àààà."
 
-#: ../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- àààààà ààà àààààààààà"
 
-#: ../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 "àààààààààà ààààààà ààààààààààààà ààààààà àààà."
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:100
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "Elm/Pine/Mutt àààààààà àààààà àààààà àààààà ààà (_S)"
 
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:107
 msgid "Standard Unix mbox spool file"
 msgstr "àààà Unix mbox ààààà àààà"
 
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:128
+#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:120
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -3813,7 +3644,7 @@ msgstr ""
 "ààààààààààààà.\n"
 "ààà àààà à àà àààà àààààà ààààààààààààà àà àààààà ààà àààà."
 
-#: ../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 ààààà àààààà"
 
@@ -3877,47 +3708,40 @@ msgid "Unable to add message to summary: unknown reason"
 msgstr "àààààààà ààààà ààààààà ààà àààà àààà: ààààààà àààà"
 
 #: ../camel/providers/local/camel-maildir-folder.c:100
-#: ../camel/providers/local/camel-maildir-folder.c:336
+#: ../camel/providers/local/camel-maildir-folder.c:335
 #: ../camel/providers/local/camel-mbox-folder.c:117
 #: ../camel/providers/local/camel-mbox-folder.c:329
-#: ../camel/providers/local/camel-mh-folder.c:160
+#: ../camel/providers/local/camel-mh-folder.c:159
 msgid "No such message"
 msgstr "ààà ààààà àààà"
 
-#: ../camel/providers/local/camel-maildir-folder.c:226
+#: ../camel/providers/local/camel-maildir-folder.c:225
 #, c-format
-#| msgid "Cannot append message to maildir folder: %s: %s"
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "maildir àààààà: %s ààààà ààààà àààààààà àààà ààààà: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:274
-#: ../camel/providers/local/camel-maildir-folder.c:284
+#: ../camel/providers/local/camel-maildir-folder.c:273
+#: ../camel/providers/local/camel-maildir-folder.c:283
 #: ../camel/providers/local/camel-mbox-folder.c:390
-#: ../camel/providers/local/camel-mh-folder.c:172
-#: ../camel/providers/local/camel-mh-folder.c:182
+#: ../camel/providers/local/camel-mh-folder.c:171
+#: ../camel/providers/local/camel-mh-folder.c:181
 #, c-format
-#| msgid ""
-#| "Cannot get message: %s from folder %s\n"
-#| "  %s"
 msgid "Cannot get message %s from folder %s: "
 msgstr "àààààà %2$s ààààà ààààà %1$s ààààààà àààà ààààà: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:354
+#: ../camel/providers/local/camel-maildir-folder.c:353
 #, c-format
-#| msgid "Cannot append message to maildir folder: %s: %s"
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "àààààà àààààà : %s ààààà ààààà ààààààààààà àààà ààààà"
 
 #: ../camel/providers/local/camel-maildir-store.c:109
 #, c-format
-#| msgid "Cannot create folder: %s: folder exists"
 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 already exists"
 msgid "Folder %s already exists"
 msgstr "àààààà %s ààààààààà àààààààààà ààà"
 
@@ -3960,50 +3784,47 @@ msgid "not a maildir directory"
 msgstr "àààààààà àààààà àààà"
 
 #: ../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 create folder: %s: folder exists"
 msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
 msgstr "àààààà: %s àà ààààààààààà ààààà: àààààààààà ààà ààà àààà ààààà"
 
-#: ../camel/providers/local/camel-maildir-summary.c:416
-#: ../camel/providers/local/camel-maildir-summary.c:549
+#: ../camel/providers/local/camel-maildir-summary.c:434
+#: ../camel/providers/local/camel-maildir-summary.c:567
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "ààààààààààààà ààààà àààà ààà àààà: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:540
+#: ../camel/providers/local/camel-maildir-summary.c:558
 msgid "Checking folder consistency"
 msgstr "àààààà ààà àààààà ààà ààà"
 
-#: ../camel/providers/local/camel-maildir-summary.c:633
+#: ../camel/providers/local/camel-maildir-summary.c:651
 msgid "Checking for new messages"
 msgstr "àààà àààààààààà àààààà ààà ààà"
 
-#: ../camel/providers/local/camel-maildir-summary.c:728
+#: ../camel/providers/local/camel-maildir-summary.c:746
 #: ../camel/providers/local/camel-mbox-summary.c:418
-#: ../camel/providers/local/camel-mbox-summary.c:649
-#: ../camel/providers/local/camel-mbox-summary.c:793
-#: ../camel/providers/local/camel-spool-summary.c:130
+#: ../camel/providers/local/camel-mbox-summary.c:650
+#: ../camel/providers/local/camel-mbox-summary.c:794
+#: ../camel/providers/local/camel-spool-summary.c:132
 msgid "Storing folder"
 msgstr "ààààà àààààà ààààà ààà ààà"
 
 #: ../camel/providers/local/camel-mbox-folder.c:187
 #, c-format
-#| msgid "Cannot open mailbox: %s: %s\n"
 msgid "Cannot open mailbox: %s: "
 msgstr "àààààààà: %s ààààà ààààà: "
 
 #: ../camel/providers/local/camel-mbox-folder.c:253
 #, c-format
-#| msgid "Cannot append message to mbox file: %s: %s"
 msgid "Cannot append message to mbox file: %s: "
 msgstr "mbox àààà: %s: ààààà ààààà àààààààà àààà ààààà"
 
@@ -4091,52 +3912,51 @@ msgstr "àààààà àààà ààà àààà: %s: %s"
 
 #: ../camel/providers/local/camel-mbox-summary.c:490
 #, c-format
-#| msgid "Fatal mail parser error near position %ld in folder %s"
 msgid "Fatal mail parser error near position %s in folder %s"
 msgstr "àààààà %2$s ààààà ààààà %1$s àààà ààààà ààà àààààà àààààà ààààà"
 
-#: ../camel/providers/local/camel-mbox-summary.c:574
+#: ../camel/providers/local/camel-mbox-summary.c:575
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "àààààà ààààà ààà àààà: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:662
-#: ../camel/providers/local/camel-mbox-summary.c:802
-#: ../camel/providers/local/camel-spool-summary.c:137
+#: ../camel/providers/local/camel-mbox-summary.c:663
+#: ../camel/providers/local/camel-mbox-summary.c:803
+#: ../camel/providers/local/camel-spool-summary.c:139
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "àààààà àààà ààà àààà: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:676
-#: ../camel/providers/local/camel-spool-summary.c:152
+#: ../camel/providers/local/camel-mbox-summary.c:677
+#: ../camel/providers/local/camel-spool-summary.c:154
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "ààààààà àààààààà àààà ààà àààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:693
-#: ../camel/providers/local/camel-mbox-summary.c:918
+#: ../camel/providers/local/camel-mbox-summary.c:694
+#: ../camel/providers/local/camel-mbox-summary.c:919
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "ààààààà ààààà ààà àààà ààà àààà %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:704
+#: ../camel/providers/local/camel-mbox-summary.c:705
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "ààààààààà àààààà ààà ààà àààà àààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:721
+#: ../camel/providers/local/camel-mbox-summary.c:722
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "àààààààà ààà ààà ààà ààà àààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:816
-#: ../camel/providers/local/camel-mbox-summary.c:1084
+#: ../camel/providers/local/camel-mbox-summary.c:817
+#: ../camel/providers/local/camel-mbox-summary.c:1085
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "àààààà ààààà ààà àààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:855
-#: ../camel/providers/local/camel-mbox-summary.c:1115
+#: ../camel/providers/local/camel-mbox-summary.c:856
+#: ../camel/providers/local/camel-mbox-summary.c:1116
 #, c-format
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
@@ -4145,32 +3965,31 @@ msgstr ""
 "MBOX àààà àààààà ààà, ààààà àààààààà ààà. (ààààà àà àààààààà, ààààà ààààààà "
 "àààà àààà.)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:864
-#: ../camel/providers/local/camel-mbox-summary.c:1124
+#: ../camel/providers/local/camel-mbox-summary.c:865
+#: ../camel/providers/local/camel-mbox-summary.c:1125
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "àààààààà ààààààà àààààààààà, àààààà à à àààààà, àààààà"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1029
-#: ../camel/providers/local/camel-spool-summary.c:345
+#: ../camel/providers/local/camel-mbox-summary.c:1030
+#: ../camel/providers/local/camel-spool-summary.c:347
 #, c-format
 msgid "Unknown error: %s"
 msgstr "ààààààà àààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1182
-#: ../camel/providers/local/camel-mbox-summary.c:1212
+#: ../camel/providers/local/camel-mbox-summary.c:1183
+#: ../camel/providers/local/camel-mbox-summary.c:1213
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "ààààààààà àààààààà ààààà àààààààà ààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1201
+#: ../camel/providers/local/camel-mbox-summary.c:1202
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "ààààààààà àààààààà ààààà àààààààà ààààà: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:119
+#: ../camel/providers/local/camel-mh-folder.c:118
 #, c-format
-#| msgid "Cannot append message to mh folder: %s: %s"
 msgid "Cannot append message to mh folder: %s: "
 msgstr "mh àààààà: %s ààààà ààààà àààààààà àààà ààààà: "
 
@@ -4210,7 +4029,6 @@ msgid "Spool folder tree %s"
 msgstr "ààààà àààààà ààààà %s"
 
 #: ../camel/providers/local/camel-spool-store.c:423
-#| msgid "Invalid purpose"
 msgid "Invalid spool"
 msgstr "àààà ààààà"
 
@@ -4262,27 +4080,22 @@ msgstr "ààààà àààààààà ààààà ààààà
 msgid "Spool folders cannot be renamed"
 msgstr "ààààà àààààààà ààààà ààà àààà ààààà àààà"
 
-#: ../camel/providers/local/camel-spool-summary.c:168
-#: ../camel/providers/local/camel-spool-summary.c:180
-#: ../camel/providers/local/camel-spool-summary.c:192
+#: ../camel/providers/local/camel-spool-summary.c:170
+#: ../camel/providers/local/camel-spool-summary.c:182
+#: ../camel/providers/local/camel-spool-summary.c:194
 #, c-format
-#| msgid "Could not sync temporary folder %s: %s"
 msgid "Could not synchronize temporary folder %s: %s"
 msgstr "àààààààààà àààààà %s: %s ààààààààààà àààà ààààà"
 
-#: ../camel/providers/local/camel-spool-summary.c:210
+#: ../camel/providers/local/camel-spool-summary.c:212
 #, c-format
-#| msgid "Could not sync spool folder %s: %s"
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "ààààà àààààà %s: %s ààààààààààà àààà ààààà"
 
-#: ../camel/providers/local/camel-spool-summary.c:242
-#: ../camel/providers/local/camel-spool-summary.c:261
-#: ../camel/providers/local/camel-spool-summary.c:274
+#: ../camel/providers/local/camel-spool-summary.c:244
+#: ../camel/providers/local/camel-spool-summary.c:263
+#: ../camel/providers/local/camel-spool-summary.c:276
 #, c-format
-#| msgid ""
-#| "Could not sync spool folder %s: %s\n"
-#| "Folder may be corrupt, copy saved in '%s'"
 msgid ""
 "Could not synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in '%s'"
@@ -4290,49 +4103,47 @@ msgstr ""
 "ààààà àààààà %s: %s ààààààààààà àààà ààààà\n"
 "àààààà àààààà ààà àààà, àààà '%s' ààààà àààààà"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:290
-#: ../camel/providers/nntp/camel-nntp-folder.c:379
-#: ../camel/providers/nntp/camel-nntp-folder.c:501
+#: ../camel/providers/nntp/camel-nntp-folder.c:278
+#: ../camel/providers/nntp/camel-nntp-folder.c:360
+#: ../camel/providers/nntp/camel-nntp-folder.c:481
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "àààààà àààààà: UID àààà àààààààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:340
-#: ../camel/providers/nntp/camel-nntp-folder.c:344
+#: ../camel/providers/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
 #, c-format
-#| msgid "Cannot get message %s: %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
-#| msgid "Posting failed: %s"
+#: ../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 ààààààààà àààààà ààààà àààààààà ààà ààà àààà!"
@@ -4371,23 +4182,22 @@ msgid ""
 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: %s"
 msgid "Could not read greeting from %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"
 
-#: ../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 ààààààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1072
+#: ../camel/providers/nntp/camel-nntp-store.c:1044
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4398,24 +4208,24 @@ msgstr ""
 "\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 ""
 "àààààààààààà àààààààà àààààà àààààà ààààààà ààà ààà àààà: àààààààà àààààààààà "
 "ààà."
 
-#: ../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 "ààààà ààààààààààà àààààààà àààààà ààà ààà ààà ààà àààà."
 
-#: ../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 "ààààà àààààààààà àààààà àààààà àààà ààà àààà."
 
-#: ../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"
@@ -4426,7 +4236,7 @@ msgstr ""
 "\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"
@@ -4437,12 +4247,11 @@ msgstr ""
 "\n"
 "àààààààààà àààààà àààààààààà àààà!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1647
-#| msgid "NNTP Command failed: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1606
 msgid "NNTP Command failed: "
 msgstr "NNTP àààà ààààà: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1732
+#: ../camel/providers/nntp/camel-nntp-store.c:1691
 #, c-format
 msgid "Not connected."
 msgstr "ààààà àààà."
@@ -4488,7 +4297,6 @@ msgid "Retrieving POP summary"
 msgstr "ààà àààààà ààà ààààààà ààà ààà"
 
 #: ../camel/providers/pop3/camel-pop3-folder.c:711
-#| msgid "Cannot get POP summary: %s"
 msgid "Cannot get POP summary: "
 msgstr "POP àààààà ààààààà àààà ààààà: "
 
@@ -4501,7 +4309,6 @@ msgid "Expunging deleted messages"
 msgstr "ààààà ààààààà ààààà ààààààà àààà ààà àààà"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:39
-#| msgid "Message storage"
 msgid "Message Storage"
 msgstr "ààààà ààààààà"
 
@@ -4581,13 +4388,11 @@ msgstr "STLS àà ààààà àààààà ààààààà à
 #. Translators: Last %s is an optional explanation beginning with ": " separator
 #: ../camel/providers/pop3/camel-pop3-store.c:172
 #, c-format
-#| msgid "Failed to connect to POP server %s in secure mode: %s"
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr "àààààààà ààà%2$s ààààà POP ààààààà %1$s àà ààààà ààààà"
 
 #: ../camel/providers/pop3/camel-pop3-store.c:185
 #, c-format
-#| msgid "Failed to connect to POP server %s in secure mode: %s"
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "àààààààà àààààààà POP ààààààà %1$s àà ààààà ààààà: "
 
@@ -4598,23 +4403,20 @@ msgstr "àààà POP ààààà àààà àààààà àà
 
 #: ../camel/providers/pop3/camel-pop3-store.c:310
 #, c-format
-#| msgid "Failed to authenticate on POP server %s: %s"
 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 "IMAP server %s"
 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 "IMAP service for %s on %s"
 msgid "POP3 server for %s on %s"
 msgstr "%2$s àààà %1$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 "
@@ -4624,11 +4426,8 @@ msgstr ""
 "ààààà àààà. "
 "ààààà ààààààà àààààààà àààààà ààà."
 
-#: ../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"
-#| "Error sending password: %s"
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: "
@@ -4638,11 +4437,8 @@ 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"
-#| "Error sending username: %s"
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending username%s"
@@ -4650,17 +4446,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"
 
-#: ../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' ààà àààààà àààà."
 
-#: ../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 ààààààààààà àààààà àààààà ààààà àààà"
@@ -4699,7 +4495,6 @@ msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "ààààààààà àààà ààààà àààà ààà àààà: %s: àààà ààààààà àààà"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:184
-#| msgid "Could not send message: %s"
 msgid "Could not send message: "
 msgstr "ààààà àààààà ààààà: "
 
@@ -4723,7 +4518,6 @@ msgid "Default SMTP port"
 msgstr "àààààààààààààà SMTP ààààà"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:43
-#| msgid "SMTP server %s"
 msgid "SMTP over SSL"
 msgstr "SMTP ààààà SSL"
 
@@ -4741,394 +4535,576 @@ msgstr "SMTP àààààà àààààà àààààààà à
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:150
 #: ../camel/providers/smtp/camel-smtp-transport.c:158
-#| msgid "Welcome response error"
 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 "àààà àààààààà ààààààà %s SMTP àààààààààààà àààààà ààààà ààà àààà : %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
-#| msgid "STARTTLS command failed: %s"
+#: ../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: %s"
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "àààààààà àààààààà SMTP ààààààà %1$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 àààà ààààààààà"
 
-#: ../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
-#| msgid "AUTH command failed: %s"
+#: ../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 "ààààà ààààà ààà: àààà ààààààà àààà."
 
-#: ../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 "ààààà ààààà ààà: àààààààààààà ààààà àààààà."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:654
+#: ../camel/providers/smtp/camel-smtp-transport.c:653
 msgid "Sending message"
 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 "ààààà ààààà ààà àààà: àààààà àààààààà ààààà."
 
-#: ../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 "ààààà àààààààà àààà: àà ààààà ààààà àààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:796
+#: ../camel/providers/smtp/camel-smtp-transport.c:795
 msgid "Syntax error, command unrecognized"
 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 "ààààààààà àà ààààààà àààààààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:800
+#: ../camel/providers/smtp/camel-smtp-transport.c:799
 msgid "Command not implemented"
 msgstr "ààààà ààààà àààà àààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:802
+#: ../camel/providers/smtp/camel-smtp-transport.c:801
 msgid "Command parameter not implemented"
 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 "ààààààà àààààà ààààà ààààààà ààà ààààà"
 
-#: ../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 "àààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:810
+#: ../camel/providers/smtp/camel-smtp-transport.c:809
 msgid "Service closing transmission channel"
 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 "àààààà àààààà àààà, àààààààà ààààààà ààààà ààà ààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:814
+#: ../camel/providers/smtp/camel-smtp-transport.c:813
 msgid "Requested mail action okay, completed"
 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 "ààààààààà ààààààà àààà; <ààààà-àààààààà> àààà àààà àààà"
 
-#: ../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 "àààààà ààààà ààààààà ààààà àààà àààà: àààààààà àààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:820
+#: ../camel/providers/smtp/camel-smtp-transport.c:819
 msgid "Requested action not taken: mailbox unavailable"
 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 "àààààà àààààà àààà àààààà àààà: àààààààààà àààààà àààà"
 
-#: ../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 "ààààààààà ààààààà àààà; <ààààà-àààààààà> ààààà ààààààà ààà"
 
-#: ../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 "àààààà àààààà àààà ààààà àààà: ààààà ààààààà àààààà àààààà"
 
-#: ../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 "àààààà àààààà ààà àààà àààààà àààà: àààààààààà àààààààààààà ààààà àààà"
 
-#: ../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 "àààààà àààààà àààà àààà àààà: àààààààààààà àààààà ààààààà àààà"
 
-#: ../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> ààààààààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:834
+#: ../camel/providers/smtp/camel-smtp-transport.c:833
 msgid "Transaction failed"
 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 "àààààààààà ààààà àààà ààààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:842
+#: ../camel/providers/smtp/camel-smtp-transport.c:841
 msgid "Encryption required for requested authentication mechanism"
 msgstr "àààààà àààààààà àààààààààà àààààààààà ààààààààààààà àààààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:844
+#: ../camel/providers/smtp/camel-smtp-transport.c:843
 msgid "Temporary authentication failure"
 msgstr "ààààààààà àààààààààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1095
+#: ../camel/providers/smtp/camel-smtp-transport.c:1094
 msgid "SMTP Greeting"
 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: %s"
 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
-#| msgid "MAIL FROM command failed"
+#: ../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
-#| msgid "RSET command failed: %s"
+#: ../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"
 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
-#| msgid "DATA command failed"
+#: ../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
-#| msgid "RSET command failed: %s"
+#: ../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
-#| msgid "QUIT command failed: %s"
+#: ../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
-#| msgid "Anniversary"
+#: ../data/org.gnome.evolution-data-server.addressbook.gschema.xml.in.h:1
+#| msgid "Contact ID already exists"
+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 the server"
+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 "Could not cancel operation"
+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:1322
+#: ../libebackend/e-authentication-session.c:1494
+#: ../libebackend/e-authentication-session.c:1673
+#| msgid "Operation cancelled"
+msgid "Keyring operation was cancelled"
+msgstr "àààààà ààààà àààà àààà"
+
+#: ../libebackend/e-backend.c:190
+#, c-format
+#| msgid "IMAP server %s does not support %s authentication"
+msgid "%s does not support authentication"
+msgstr "%s ààààààààààààààà àààààà ààààà àààà"
+
+#: ../libebackend/e-collection-backend.c:734
+#, c-format
+msgid "%s does not support creating remote resources"
+msgstr "%s àààààà ààààà ààààààà àààààààààà àààààà àààà"
+
+#: ../libebackend/e-collection-backend.c:793
+#, c-format
+msgid "%s does not support deleting remote resources"
+msgstr "%s ààààà àààààà ààààà àààà àààà ààààààà àààà"
+
+#: ../libebackend/e-server-side-source.c:128
+#, c-format
+msgid "Data source is missing a [%s] group"
+msgstr "àààà àààààààààà [%s] àà ààààà àààà"
+
+#: ../libebackend/e-server-side-source.c:938 ../libedataserver/e-source.c:1084
+#, c-format
+msgid "Data source '%s' does not support creating remote resources"
+msgstr "àààà ààààà '%s' àààààà ààààà ààààààà ààààààà àààààà ààààà àààà"
+
+#: ../libebackend/e-server-side-source.c:952
+#, c-format
+msgid ""
+"Data source '%s' has no collection backend to create the remote resource"
+msgstr ""
+"àààààà ààààà ààààààà àààààààààà àààà ààààà '%s' ààà ààààààà àààààà àààà"
+
+#: ../libebackend/e-server-side-source.c:980 ../libedataserver/e-source.c:1193
+#, c-format
+msgid "Data source '%s' does not support deleting remote resources"
+msgstr "àààà ààààà '%s' ààààà àààààà ààààà àààà àààà ààààààà àààà"
+
+#: ../libebackend/e-server-side-source.c:994
+#, c-format
+msgid ""
+"Data source '%s' has no collection backend to delete the remote resource"
+msgstr "àààààà ààààà àààà àààààààààà àààà ààààà '%s' ààà ààààààà àààààà àààà"
+
+#: ../libebackend/e-server-side-source.c:1329
+#, c-format
+msgid "File must have a '.source' extension"
+msgstr "ààààààààà '.source' ààààààààà àààààà ààà"
+
+#: ../libebackend/e-source-registry-server.c:520
+#: ../libedataserver/e-source-registry.c:1512
+#| msgid "Failed to authenticate.\n"
+msgid "The user declined to authenticate"
+msgstr "ààààààààààààà ààà àààààààà àààà àààà"
+
+#: ../libebackend/e-source-registry-server.c:742
+#, 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
-#| msgid "Birthday"
+#: ../libedataserver/e-categories.c:47
 msgctxt "CategoryName"
 msgid "Birthday"
 msgstr "ààààààà"
 
-#: ../libedataserver/e-categories.c:49
-#| msgid "Business"
+#: ../libedataserver/e-categories.c:48
 msgctxt "CategoryName"
 msgid "Business"
 msgstr "ààààààà"
 
-#: ../libedataserver/e-categories.c:50
-#| msgid "Competition"
+#: ../libedataserver/e-categories.c:49
 msgctxt "CategoryName"
 msgid "Competition"
 msgstr "ààààààààààà"
 
-#: ../libedataserver/e-categories.c:51
-#| msgid "Favorites"
+#: ../libedataserver/e-categories.c:50
 msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "ààààà"
 
-#: ../libedataserver/e-categories.c:52
-#| msgid "Gifts"
+#: ../libedataserver/e-categories.c:51
 msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "ààààà"
 
-#: ../libedataserver/e-categories.c:53
-#| msgid "Goals/Objectives"
+#: ../libedataserver/e-categories.c:52
 msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "àààààà/àààààààà"
 
-#: ../libedataserver/e-categories.c:54
-#| msgid "Holiday"
+#: ../libedataserver/e-categories.c:53
 msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "àààààà"
 
-#: ../libedataserver/e-categories.c:55
-#| msgid "Holiday Cards"
+#: ../libedataserver/e-categories.c:54
 msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "àààààà ààààà"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:57
-#| msgid "Hot Contacts"
+#: ../libedataserver/e-categories.c:56
 msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "àààààààààà àààààà"
 
-#: ../libedataserver/e-categories.c:58
-#| msgid "Ideas"
+#: ../libedataserver/e-categories.c:57
 msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "ààààà"
 
-#: ../libedataserver/e-categories.c:59
-#| msgid "International"
+#: ../libedataserver/e-categories.c:58
 msgctxt "CategoryName"
 msgid "International"
 msgstr "ààààààààààààà"
 
-#: ../libedataserver/e-categories.c:60
-#| msgid "Key Customer"
+#: ../libedataserver/e-categories.c:59
 msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "ààààà àààààà"
 
-#: ../libedataserver/e-categories.c:61
-#| msgid "Miscellaneous"
+#: ../libedataserver/e-categories.c:60
 msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "ààààà"
 
-#: ../libedataserver/e-categories.c:62
-#| msgid "Personal"
+#: ../libedataserver/e-categories.c:61
 msgctxt "CategoryName"
 msgid "Personal"
 msgstr "àààààààà"
 
-#: ../libedataserver/e-categories.c:63
-#| msgid "Phone Calls"
+#: ../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
-#| msgid "Status"
+#: ../libedataserver/e-categories.c:64
 msgctxt "CategoryName"
 msgid "Status"
 msgstr "àààààà"
 
-#: ../libedataserver/e-categories.c:66
-#| msgid "Strategies"
+#: ../libedataserver/e-categories.c:65
 msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "àààààà"
 
-#: ../libedataserver/e-categories.c:67
-#| msgid "Suppliers"
+#: ../libedataserver/e-categories.c:66
 msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "ààààààààà"
 
-#: ../libedataserver/e-categories.c:68
-#| msgid "Time & Expenses"
+#: ../libedataserver/e-categories.c:67
 msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "ààà à àààà"
 
-#: ../libedataserver/e-categories.c:69
-#| msgid "VIP"
+#: ../libedataserver/e-categories.c:68
 msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:70
-#| msgid "Waiting"
+#: ../libedataserver/e-categories.c:69
 msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "ààà àààà ààà"
 
-#: ../libedataserver/e-client.c:125
-#| msgid "URI not loaded"
+#: ../libedataserver/e-client.c:124
 msgid "Source not loaded"
 msgstr "ààààà ààà àààà àààà"
 
-#: ../libedataserver/e-client.c:127
-#| msgid "URI already loaded"
+#: ../libedataserver/e-client.c:126
 msgid "Source already loaded"
 msgstr "ààààààà ààààààààà ààà àààà"
 
-#: ../libedataserver/e-client.c:135
-#| msgid "Offline mode unavailable"
+#. 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
-#| msgid "parse error"
+#: ../libedataserver/e-client.c:158
 msgid "D-Bus error"
 msgstr "àà-àà àààààà"
 
+#: ../libedataserver/e-source-authenticator.c:166
+#| msgid "Authentication required"
+msgid "Address book authentication request"
+msgstr "ààààà àààààààà àààààààààààà àààààà"
+
+#: ../libedataserver/e-source-authenticator.c:171
+#| msgid "Authentication required"
+msgid "Calendar authentication request"
+msgstr "àààààààààà àààààààààààà àààààà"
+
+#: ../libedataserver/e-source-authenticator.c:175
+#| msgid "Authentication required"
+msgid "Mail authentication request"
+msgstr "ààà àààààààààààà àààààà"
+
+#. generic account prompt
+#: ../libedataserver/e-source-authenticator.c:178
+#| msgid "Authentication required"
+msgid "Authentication request"
+msgstr "àààààààààààà àààààà"
+
+#: ../libedataserver/e-source-authenticator.c:188
+#, c-format
+#| msgid "Please enter the %s password for %s on host %s."
+msgid "Please enter the password for address book \"%s\"."
+msgstr "ààààà ààààà àààààààà \"%s\" ààààà ààààààà àààà."
+
+#: ../libedataserver/e-source-authenticator.c:194
+#, c-format
+#| msgid "Please enter the %s password for %s on host %s."
+msgid "Please enter the password for calendar \"%s\"."
+msgstr "ààààà àààààààààà \"%s\" ààààà ààààààà àààà."
+
+#: ../libedataserver/e-source-authenticator.c:200
+#, c-format
+#| msgid "Please enter the %s password for %s on host %s."
+msgid "Please enter the password for mail account \"%s\"."
+msgstr "ààààà ààà àààà \"%s\" ààààà ààààààà àààà."
+
+#: ../libedataserver/e-source-authenticator.c:206
+#, c-format
+#| msgid "Please enter the %s password for %s on host %s."
+msgid "Please enter the password for mail transport \"%s\"."
+msgstr "ààààà ààà àààààààààààà \"%s\" ààààà ààààààà àààà."
+
+#: ../libedataserver/e-source-authenticator.c:212
+#, c-format
+#| msgid "Please enter the %s password for %s on host %s."
+msgid "Please enter the password for memo list \"%s\"."
+msgstr "ààààà àààà àààà \"%s\" ààààà ààààààà àààà."
+
+#: ../libedataserver/e-source-authenticator.c:218
+#, c-format
+#| msgid "Please enter the %s password for %s on host %s."
+msgid "Please enter the password for task list \"%s\"."
+msgstr "ààààà ààààà àààà \"%s\" ààààà ààààààà àààà."
+
+#: ../libedataserver/e-source-authenticator.c:224
+#, c-format
+#| msgid "Please enter the %s password for %s on host %s."
+msgid "Please enter the password for account \"%s\"."
+msgstr "ààààà àààà \"%s\" ààààà ààààààà àààà."
+
+#: ../libedataserver/e-source.c:620
+#, c-format
+msgid "Source file is missing a [%s] group"
+msgstr "ààààà ààààààààà [%s] àà ààààà àààà"
+
+#: ../libedataserver/e-source.c:911
+#, c-format
+msgid "Data source '%s' is not removable"
+msgstr "àààà ààààà '%s' àààààààààààààààà àààà"
+
+#: ../libedataserver/e-source.c:993
+#, c-format
+msgid "Data source '%s' is not writable"
+msgstr "àààà ààààà '%s' ààààààààààà àààà"
+
+#: ../libedataserver/e-source.c:1372
+#| msgid "Unnamed List"
+msgid "Unnamed"
+msgstr "àààààà"
+
+#: ../libedataserver/e-source-mail-signature.c:485
+#, c-format
+msgid "Signature script must be a local file"
+msgstr "àààààààà ààààààààà ààààààà àààà àààààà ààà"
+
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1646 ../libedataserver/e-time-utils.c:1944
+#: ../libedataserver/e-time-utils.c: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"
 
@@ -5136,7 +5112,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"
 
@@ -5144,7 +5120,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"
 
@@ -5152,78 +5128,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"
 
@@ -5231,24 +5207,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"
 
@@ -5262,7 +5238,8 @@ msgid ""
 "means manual proxy."
 msgstr ""
 "ààààà àààààààà àààààààà. \"0\" àààààà ààààààà, \"1\" àààààà àààààààà, \"2\" "
-"àààààà àààààààà àààààààà."
+"àààààà àààààààà "
+"àààààààà."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
 msgid "Whether to use http-proxy"
@@ -5277,7 +5254,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 "àààààààà àààààààààààà àààààààààà ààà ààààààà."
 
@@ -5298,25 +5274,18 @@ msgid "Port number to use for HTTP requests."
 msgstr "HTTP ààààààààààà àààààààààààà ààààà ààààààà."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
-#| msgid "Unknown authentication state."
 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 "àààààààà àààààààààààààà àààààààààààààà àààààààààààà ààààààà."
 
@@ -5368,204 +5337,135 @@ msgstr "ààààà àààààààà àààààà URL"
 msgid "Where to read automatic proxy configuration from."
 msgstr "ààààà àààààààà àààààà ààààà ààààààà."
 
-#: ../libedataserverui/e-book-auth-util.c:96
-#: ../libedataserverui/e-book-auth-util.c:656
-msgid "Accessing LDAP Server anonymously"
-msgstr "LDAP ààààà àààààà àààààààà ààààà ààà"
-
-#: ../libedataserverui/e-book-auth-util.c:197
-#: ../libedataserverui/e-book-auth-util.c:423
-msgid "Failed to authenticate.\n"
-msgstr "àààààààààà ààààààà ààààà.\n"
-
-#: ../libedataserverui/e-categories-editor.c:228
+#: ../libedataserverui/e-categories-editor.c:230
 msgid "Currently _used categories:"
 msgstr "ààààà ààààààààà ààààà (_u):"
 
-#: ../libedataserverui/e-categories-editor.c:237
+#: ../libedataserverui/e-categories-editor.c:239
 msgid "_Available Categories:"
 msgstr "àààààà ààààààà (_A):"
 
-#: ../libedataserverui/e-categories-selector.c:322
+#: ../libedataserverui/e-categories-selector.c: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\" àààà"
 
-#: ../libedataserverui/e-category-editor.c:135
+#: ../libedataserverui/e-category-editor.c:137
 msgid "Category Icon"
 msgstr "ààààààà àààà"
 
-#: ../libedataserverui/e-category-editor.c:139
+#: ../libedataserverui/e-category-editor.c:141
 msgid "_No Image"
 msgstr "ààààààà àààà (_N)"
 
-#: ../libedataserverui/e-category-editor.c:176
+#: ../libedataserverui/e-category-editor.c:178
 msgid "Category _Name"
 msgstr "ààààààà ààà (_N)"
 
-#: ../libedataserverui/e-category-editor.c:184
+#: ../libedataserverui/e-category-editor.c:186
 msgid "Category _Icon"
 msgstr "ààààààà ààà (_I)"
 
-#: ../libedataserverui/e-category-editor.c:224
+#: ../libedataserverui/e-category-editor.c:226
 msgid "Category Properties"
 msgstr "ààààààà ààààààà"
 
-#: ../libedataserverui/e-category-editor.c:285
+#: ../libedataserverui/e-category-editor.c:287
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "àààà ààààààààààà àààà '%s' àà àààààààà ààà. ààààà ààààà ààà àààà"
 
-#: ../libedataserverui/e-client-utils.c:856
-#, c-format
-#| msgid "Enter password for %s (user %s)"
-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 %s (user %s)"
-msgid "Enter password for calendar %s (user %s)"
-msgstr "àààààààààà %s (ààààààààà %s) ààààà ààààààà àààà"
-
-#: ../libedataserverui/e-client-utils.c:862
-#, c-format
-#| msgid "Enter password for %s (user %s)"
-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 %s (user %s)"
-msgid "Enter password for task list %s (user %s)"
-msgstr "ààààà àààà %s (ààààààààà %s) ààààà ààààààà àààà"
-
-#: ../libedataserverui/e-client-utils.c:868
-#, c-format
-#| msgid "Enter password for %s (user %s)"
-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 %s (user %s)"
-msgid "Enter password for memo list %s (user %s)"
-msgstr "àààà àààà %s (ààààààààà %s) ààààà ààààààà àààà"
-
-#: ../libedataserverui/e-client-utils.c:981
-#| msgid "Enter password"
-msgid "Enter Passphrase"
-msgstr "àààààààà àààà"
-
-#: ../libedataserverui/e-client-utils.c:983
-#| msgid "Enter password"
-msgid "Enter Password"
-msgstr "ààààààà àààà"
-
-#: ../libedataserverui/e-name-selector-dialog.c:187
-#| msgid "Hot Contacts"
+#: ../libedataserverui/e-name-selector-dialog.c:278
 msgid "Show Contacts"
 msgstr "àààààà ààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:209
+#: ../libedataserverui/e-name-selector-dialog.c:300
 msgid "Address B_ook:"
 msgstr "ààààà àààààààà (_o):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:217
-msgid "Cate_gory:"
-msgstr "àààààà (_g):"
+#: ../libedataserverui/e-name-selector-dialog.c:308
+#| msgid "Cate_gory:"
+msgid "Cat_egory:"
+msgstr "àààààà (_e):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:235
+#: ../libedataserverui/e-name-selector-dialog.c:326
 msgid "_Search:"
 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 "ààààààà ààààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:255
-#| msgid "Contacts"
+#: ../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 "àààààà"
 
-#: ../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)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:957
+#: ../libedataserverui/e-name-selector-dialog.c:1056
 #, c-format
-#| msgid "Error reading mail file: %s"
 msgid "Error loading address book: %s"
 msgstr "ààààà àààààààà ààà àààààààà àààààà: %s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2823
+#: ../libedataserverui/e-name-selector-entry.c: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 "àààààà (_E) %s"
 
-#: ../libedataserverui/e-name-selector-list.c:524
+#: ../libedataserverui/e-name-selector-list.c:521
 #, c-format
 msgid "_Delete %s"
 msgstr "%s àààà ààà(_D)"
@@ -5599,25 +5499,220 @@ msgstr "ààààààààà àààààà àààà(_R)"
 msgid "_Remember this password for the remainder of this session"
 msgstr "àà ààààààààà ààààààà ààààààààà àà ààààààààà àààààà àààà (_R)"
 
-#. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:91
+#: ../libedataserverui/e-source-selector-dialog.c:224
+msgid "_Destination"
+msgstr "àààààà (_D)"
+
+#: ../libedataserverui/e-source-selector-dialog.c:326
 msgid "Select destination"
 msgstr "àààààà ààààà"
 
-#: ../libedataserverui/e-source-selector-dialog.c:166
-msgid "_Destination"
-msgstr "àààààà (_D)"
+#: ../modules/google-backend/module-google-backend.c:118
+#: ../modules/yahoo-backend/module-yahoo-backend.c:200
+msgid "Calendar"
+msgstr "àààààààààà"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:184
+#, c-format
+#| msgid "Unexpected response from IMAP server: %s"
+msgid "Code: %u - Unexpected response from server"
+msgstr "ààà: %u - ààààààààààà ààààààààà àààààààà ààààààà àààà"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:205
+#, c-format
+#| msgid "Failed to retrieve message"
+msgid "Failed to parse autodiscover response XML"
+msgstr "àààààààààà àààààààà XML àààààààà ààààà"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:214
+#, c-format
+#| msgid "Failed to find system calendar"
+msgid "Failed to find Autodiscover element"
+msgstr "àààààààààà ààààààà àààààààà ààààà"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:226
+#, c-format
+#| msgid "Failed to find system calendar"
+msgid "Failed to find Response element"
+msgstr "àààààààà ààààààà àààààààà ààààà"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:238
+#, c-format
+#| msgid "Failed to find system calendar"
+msgid "Failed to find Account element"
+msgstr "àààààà ààààààà àààààààà ààààà"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:252
+#, c-format
+msgid "Failed to find ASUrl and OABUrl in autodiscover response"
+msgstr "àààààààààà àààààààààààà ASUrl à OABUrl àààààààà ààààà"
+
+#: ../modules/yahoo-backend/module-yahoo-backend.c:215
+msgid "Tasks"
+msgstr "àààà"
 
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:48
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:52
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:47
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:51
 msgid "Keep running after the last client is closed"
 msgstr "àààààà ààààààà ààà àààààààà àààà àààà"
 
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:50
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:54
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:49
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:53
 msgid "Wait running until at least one client is connected"
 msgstr "ààààà àà ààààààà ààààà ààààààààà àààà àààà àààà"
 
+#: ../tests/libedataserverui/evolution-source-viewer.c:620
+msgid "Evolution Source Viewer"
+msgstr "àààààààààà ààààà àààààààà"
+
+#: ../tests/libedataserverui/evolution-source-viewer.c:649
+#| msgid "Family Name"
+msgid "Display Name"
+msgstr "ààà ààààà"
+
+#: ../tests/libedataserverui/evolution-source-viewer.c:658
+msgid "Flags"
+msgstr "àààààààà"
+
+#: ../tests/libedataserverui/evolution-source-viewer.c:710
+msgid "Identity"
+msgstr "ààà"
+
+#~| msgid "Authentication required"
+#~ msgid "Authenticating with the serverâ"
+#~ msgstr "ààààààààà ààà àààà àààâ"
+
+#~| msgid "%s: there was no source for uid `%s' stored in gconf."
+#~ msgid "%s: there was no source for UID '%s' stored in GConf."
+#~ msgstr "%s: GConf ààààà UID '%s' ààààà ààààà ààààà àààà."
+
+#~ msgid "On This Computer"
+#~ msgstr "àààà àààààààà"
+
+#~| msgid "%s: Invalid source."
+#~ msgid "Invalid source"
+#~ msgstr "àààà ààààààà"
+
+#~ msgid "Incorrect uri '%s'"
+#~ msgstr "àààààà uri '%s'"
+
+#~| msgid "Failed on message %d"
+#~ msgid "Failed to find system book"
+#~ msgstr "ààààààà àààààà àààààààà ààààà"
+
+#~| msgid "%s: there was no source for uid `%s' stored in gconf."
+#~ msgid "There was no source for UID '%s' stored in a source list."
+#~ msgstr "ààààà ààààààààà UID '%s' ààààà ààààà ààààà àààà."
+
+#~| msgid "Cannot authenticate to server: %s"
+#~ msgid "Cannot authenticate user: "
+#~ msgstr "ààààààààààààà ààà ààààà ààààà: "
+
+#~ msgid "Empty URI"
+#~ msgstr "àààààà URI"
+
+#~| msgid "Enter password for %s (user %s)"
+#~ msgid ""
+#~ "Enter password for address book %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr ""
+#~ "ààààà àààààààà %s (ààààààààà %s) ààààà ààààààà àààà\n"
+#~ "àààà: %s"
+
+#~| msgid "Enter password for %s (user %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 "%s: Invalid source."
+#~ msgid "Invalid source type"
+#~ msgstr "àààà ààààà àààààà"
+
+#~| msgid "Storing folder"
+#~ msgid "Updating %s folder"
+#~ msgstr "%s àààààà ààààààà ààà ààà"
+
+#~ msgid "Connection to Server"
+#~ msgstr "ààààààà àààà"
+
+#~ msgid "_Use custom command to connect to server"
+#~ msgstr "ààààààààà ààààààà ààààà àààààà àààà ààààà (_U)"
+
+#~| msgid "Command:"
+#~ msgid "Co_mmand:"
+#~ msgstr "àààà (_m):"
+
+#~ msgid "Command:"
+#~ msgstr "àààà:"
+
+#~ msgid "Numbe_r of cached connections to use"
+#~ msgstr "àààààààààààà àààààà àààààààà àààààà (_r)"
+
+#~| msgid "Posting failed: %s"
+#~ msgid "Closing tmp stream failed: "
+#~ msgstr "tmp ààààààà ààà ààààààà ààààà: "
+
+#~ msgid "SMTP Authentication"
+#~ msgstr "SMTP àààààààààà"
+
+#~ msgid "Accessing LDAP Server anonymously"
+#~ msgstr "LDAP ààààà àààààà àààààààà ààààà ààà"
+
+#~| msgid "Enter password for %s (user %s)"
+#~ msgid ""
+#~ "Enter password for calendar %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr ""
+#~ "àààààààààà %s (ààààààààà %s) ààààà ààààààà àààà\n"
+#~ "àààà: %s"
+
+#~| msgid "Enter password for %s (user %s)"
+#~ msgid "Enter password for calendar %s (user %s)"
+#~ msgstr "àààààààààà %s (ààààààààà %s) ààààà ààààààà àààà"
+
+#~| msgid "Enter password for %s (user %s)"
+#~ msgid ""
+#~ "Enter password for task list %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr ""
+#~ "ààààà àààà %s (ààààààààà %s) ààààà ààààààà àààà\n"
+#~ "àààà: %s"
+
+#~| msgid "Enter password for %s (user %s)"
+#~ msgid "Enter password for task list %s (user %s)"
+#~ msgstr "ààààà àààà %s (ààààààààà %s) ààààà ààààààà àààà"
+
+#~| msgid "Enter password for %s (user %s)"
+#~ msgid ""
+#~ "Enter password for memo list %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr ""
+#~ "àààà àààà %s (ààààààààà %s) ààààà ààààààà àààà\n"
+#~ "àààà: %s"
+
+#~| msgid "Enter password for %s (user %s)"
+#~ msgid "Enter password for memo list %s (user %s)"
+#~ msgstr "àààà àààà %s (ààààààààà %s) ààààà ààààààà àààà"
+
+#~| msgid "Enter password"
+#~ msgid "Enter Passphrase"
+#~ msgstr "àààààààà àààà"
+
+#~| msgid "Enter password"
+#~ msgid "Enter Password"
+#~ msgstr "ààààààà àààà"
+
 #~ msgid "Updating contacts cache (%d)... "
 #~ msgstr "àààààà ààà àààààà ààà ààà (%d)... "
 
@@ -5663,9 +5758,6 @@ msgstr "ààààà àà ààààààà ààààà ààà
 #~ msgid "Loading %s items"
 #~ msgstr "%s ààà ààà ààà ààà"
 
-#~ msgid "Calendar"
-#~ msgstr "àààààààààà"
-
 #~ msgid "Invalid server URI"
 #~ msgstr "àààà ààààà URI"
 
@@ -5970,9 +6062,6 @@ msgstr "ààààà àà ààààààà ààààà ààà
 #~ "This option will connect to the Hula server using a plaintext password."
 #~ msgstr "ààààà ààààààààààà àààà àààà àà àààààà Hula ààààààà àààààà àààà."
 
-#~ msgid "Operation cancelled"
-#~ msgstr "àààààà àààà"
-
 #~ msgid "Unexpected response status '%s' after APPEND command"
 #~ msgstr "APPEND àààà àààà ààààààà ààààààààà àààààààà àààààà '%s'"
 
@@ -6407,15 +6496,9 @@ msgstr "ààààà àà ààààààà ààààà ààà
 #~ msgid "Sent Items"
 #~ msgstr "àààààààààà ààààà"
 
-#~ msgid "Tasks"
-#~ msgstr "àààà"
-
 #~ msgid "Invalid connection"
 #~ msgstr "àààà ààààààà"
 
-#~ msgid "No response from the server"
-#~ msgstr "ààààààààà àààààààà àààà"
-
 #~ msgid "Bad parameter"
 #~ msgstr "àààà àààààààà"
 



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