[evolution-data-server] Updated Bengali India Translaion

[Runa Bhattacharjee <runab src gnome org>]

commit 438ec88a5b91ef5664e967c73d15ce77e25acbad
Author: Runa Bhattacharjee <runab redhat com>
Date:   Tue Mar 20 19:15:59 2012 +0530

    Updated Bengali India Translaion

 po/bn_IN.po | 5033 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 2782 insertions(+), 2251 deletions(-)
---
diff --git a/po/bn_IN.po b/po/bn_IN.po
index fbc63ae..e7d90e7 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -4,1013 +4,1147 @@
 #
 # Runa Bhattacharjee <runa bengalinux org>, 2004.
 # Runa Bhattacharjee <runabh gmail com>, 2007.
-# Runa Bhattacharjee <runab redhat com>, 2008, 2009, 2011.
+# Runa Bhattacharjee <runab redhat com>, 2008, 2009, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: bn_IN\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.";
-"cgi?product=evolution-data-server&component=Misc.\n"
-"POT-Creation-Date: 2011-02-07 14:36+0000\n"
-"PO-Revision-Date: 2011-02-11 17:25+0530\n"
-"Last-Translator: \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-20 19:15+0530\n"
+"Last-Translator: Runa Bhattacharjee <runab redhat com>\n"
 "Language-Team: Bengali (India) <anubad lists ankur org in>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.1\n"
+"X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "\n"
+"Language: bn_IN\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:570
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
+#: ../addressbook/backends/file/e-book-backend-file.c:129
+#: ../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
+#: ../camel/providers/imap/camel-imap-store.c:464
+#: ../camel/providers/imapx/camel-imapx-command.c:538
+#: ../libedataserver/e-client.c:164
+msgid "Unknown error"
+msgstr "ààààà àààààà"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:154
+#, 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
+#, 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
+#, 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
+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
 msgid "Loading..."
 msgstr "ààà ààà ààààà ..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:573
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4506
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
+#: ../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
 msgid "Searching..."
 msgstr "ààààààààà ààà ààààà..."
 
+#: ../addressbook/backends/file/e-book-backend-file.c:2108
+#, 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:589
+#: ../addressbook/backends/google/e-book-backend-google.c:874
 msgid "Querying for updated contactsâ"
 msgstr "ààààà ààà àààààààààà àààà ààààààààà ààà àààààâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:624
+#: ../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:626
-#| msgid "Favorites"
+#: ../addressbook/backends/google/e-book-backend-google.c:925
 msgid "Friends"
 msgstr "ààààààààààà"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:628
-#| msgid "Family Name"
+#: ../addressbook/backends/google/e-book-backend-google.c:927
 msgid "Family"
 msgstr "àààààà"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:630
+#: ../addressbook/backends/google/e-book-backend-google.c:929
 msgid "Coworkers"
 msgstr "ààààààà"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:707
+#: ../addressbook/backends/google/e-book-backend-google.c:1019
 msgid "Querying for updated groupsâ"
 msgstr "ààààà àààà àààà àààà ààààààààà ààà àààààâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:891
+#: ../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/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
 msgid "Creating new contactâ"
 msgstr "àààà àààààààà àààà ààà ààààâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:984
+#: ../addressbook/backends/google/e-book-backend-google.c:1540
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:327
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:433
+#| msgid "Calendar doesn't support Free/Busy"
+msgid "The backend does not support bulk removals"
+msgstr "ààààà-ààààà àààààà àààààà àààààà ààààààà ààà àà"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1568
 msgid "Deleting contactâ"
 msgstr "àààààààà àààà àààà àààààâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1092
+#: ../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/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
 msgid "Modifying contactâ"
 msgstr "àààààààà àààà àààààààà ààààâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1199
-#| msgid "Loading..."
+#: ../addressbook/backends/google/e-book-backend-google.c:2058
 msgid "Loadingâ"
 msgstr "ààà ààà ààààà ..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1346
-#| msgid "Authentication required"
+#: ../addressbook/backends/google/e-book-backend-google.c:2187
 msgid "Authenticating with the serverâ"
 msgstr "àààààààà ààààààà ààà àààààâ"
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2699
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4665
-#, c-format
-msgid "Downloading contacts (%d)... "
-msgstr "ààààààààà àààààà ààààààà ààà ààààà (%d)... "
-
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2847
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3030
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3077
-#, c-format
-msgid "Updating contacts cache (%d)... "
-msgstr "ààààààààà ààààààà àààààà ààààà ààà ààààà (%d)... "
-
 #. 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:173
-#| msgid "Not connected."
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:177
 msgid "Not connected"
 msgstr "ààààààà àà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:764
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:797
 msgid "Using Distinguished Name (DN)"
 msgstr "Distinguished Name (DN) ààààààà ààà ààààà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:767
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:800
 msgid "Using Email Address"
 msgstr "à-àààà àààààà ààààààà ààà ààààà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1033
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1071
 msgid "Reconnecting to LDAP server..."
 msgstr "LDAP ààààààà'à àààà àààààà ààààà ààà ààààà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1158
-#| msgid "Invalid argument"
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1200
 msgid "Invalid DN syntax"
 msgstr "DN ààààààààà ààà àà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1675
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1738
 msgid "Adding contact to LDAP server..."
 msgstr "LDAP àààààààà ààààààà ààà ààà ààààà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1807
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1869
 msgid "Removing contact from LDAP server..."
 msgstr "LDAP ààààààà àààà ààààààà àààà àààà ààààà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2243
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2318
 msgid "Modifying contact from LDAP server..."
 msgstr "LDAP àààààààà ààààààà àààààààà ààà ààààà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4356
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4720
 msgid "Receiving LDAP search results..."
 msgstr "LDAP'à ààààààààààà ààààà ààààààà ààà ààààà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4528
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4891
 msgid "Error performing search"
 msgstr "ààààààààààà ààà àààààà"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:273
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:881
-#: ../addressbook/libedata-book/e-data-book.c:441
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:523
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:552
-#: ../calendar/backends/http/e-cal-backend-http.c:435
-#: ../calendar/libecal/e-cal.c:4180
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:160
-#: ../camel/providers/imap/camel-imap-command.c:481
-#: ../camel/providers/imap/camel-imap-store.c:425
-#: ../camel/providers/pop3/camel-pop3-store.c:495
-#: ../camel/providers/smtp/camel-smtp-transport.c:497
-#: ../servers/groupwise/e-gw-connection.c:243
-msgid "Unknown error"
-msgstr "ààààà àààààà"
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5012
+#, c-format
+msgid "Downloading contacts (%d)... "
+msgstr "ààààààààà àààààà ààààààà ààà ààààà (%d)... "
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:335
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:354
 #, c-format
 msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgstr "HTTP àààààà àà '%s' ààààààà ààààààààà àààààà àààààà: %d (%s)"
 
-#: ../addressbook/libebook/e-book.c:3064
+#: ../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: UID `%s'-à àààà àààà ààà gconf-à àààààààà àààà"
 
-#: ../addressbook/libebook/e-book.c:3420
-#: ../addressbook/libedata-book/e-data-book.c:183
-#| msgid "Folder '%s/%s' does not exist."
+#: ../addressbook/libebook/e-book.c:3514 ../calendar/libecal/e-cal.c:1360
+#: ../libedataserver/e-client.c:1913
+msgid "On This Computer"
+msgstr "ààààààà ààààààààààà ààààà"
+
+#: ../addressbook/libebook/e-book.c:3640
+#: ../addressbook/libebook/e-book-client.c:702
+#: ../addressbook/libedata-book/e-data-book.c:322
 msgid "Address book does not exist"
 msgstr "àààààà àà ààààààààà"
 
+#: ../addressbook/libebook/e-book-client.c:95
+#| msgid "No such folder %s"
+msgid "No such book"
+msgstr "àà ààààà àààà àà ààààààà ààà"
+
+#: ../addressbook/libebook/e-book-client.c:97
+#: ../addressbook/libedata-book/e-data-book.c:315
+msgid "Contact not found"
+msgstr "ààààààà ààààà ààààà"
+
+#: ../addressbook/libebook/e-book-client.c:99
+#: ../addressbook/libedata-book/e-data-book.c:316
+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 "No space"
+msgstr "ààààà ààààà ààà"
+
+#: ../addressbook/libebook/e-book-client.c:515
+#| msgid "Failed to encode data"
+msgid "Failed to run book factory"
+msgstr "ààà ààààààààà ààààààà àààà àààààà"
+
+#: ../addressbook/libebook/e-book-client.c:525
+#: ../addressbook/libedata-book/e-data-book-factory.c:196
+#: ../addressbook/libedata-book/e-data-book-factory.c:228
+#: ../calendar/libecal/e-cal-client.c:613
+#: ../calendar/libedata-cal/e-data-cal-factory.c:213
+#: ../calendar/libedata-cal/e-data-cal-factory.c:242
+#, c-format
+msgid "Invalid source"
+msgstr "ààà ààà àà"
+
+#: ../addressbook/libebook/e-book-client.c:627
+#: ../calendar/libecal/e-cal-client.c:728
+#, c-format
+msgid "Incorrect uri '%s'"
+msgstr "ààà uri '%s'"
+
+#: ../addressbook/libebook/e-book-client.c:665
+#| msgid "Failed 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 ""
+
+#: ../addressbook/libebook/e-book-client.c:2566
+#: ../calendar/libecal/e-cal-client.c:4483
+#| msgid "Cannot get contact list: %s"
+msgid "Cannot get connection to view"
+msgstr "àààààààààà àààà ààààà ààààààà àààà àààààà"
+
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:115
+#: ../addressbook/libebook/e-contact.c:121
 msgid "Unique ID"
 msgstr "ààààààààà ID"
 
-#: ../addressbook/libebook/e-contact.c:116
+#. 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
 msgid "File Under"
 msgstr "ààààààà àààààà àààà ààà ààà"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:118
+#: ../addressbook/libebook/e-contact.c:126
 msgid "Book URI"
 msgstr "ààààà URI"
 
 #. Name fields
 #. FN isn't really a structured field - we use a getter/setter
-#. so we can set the N property (since evo 1.4 works fine with
-#. vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:124
+#. * 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
 msgid "Full Name"
 msgstr "àààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Given Name"
 msgstr "ààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:126
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Family Name"
 msgstr "ààààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:127
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Nickname"
 msgstr "ààààà"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Email 1"
 msgstr "à-àààà à"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:139
 msgid "Email 2"
 msgstr "à-àààà à"
 
-#: ../addressbook/libebook/e-contact.c:132
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Email 3"
 msgstr "à-àààà à"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:141
 msgid "Email 4"
 msgstr "à-àààà à"
 
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Mailer"
 msgstr "àààààà"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Home Address Label"
 msgstr "ààààà ààààààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:139
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Work Address Label"
 msgstr "àààààààààà ààààààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:140
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Other Address Label"
 msgstr "àààààààà ààààààà ààààà"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Assistant Phone"
 msgstr "ààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Business Phone"
 msgstr "ààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Business Phone 2"
 msgstr "ààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Business Fax"
 msgstr "ààààààà ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Callback Phone"
 msgstr "àààààààààààà ààààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Car Phone"
 msgstr "ààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Company Phone"
 msgstr "ààààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Home Phone"
 msgstr "ààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Home Phone 2"
 msgstr "ààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Home Fax"
 msgstr "ààààà ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:161
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:162
 msgid "Mobile Phone"
 msgstr "àààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:163
 msgid "Other Phone"
 msgstr "àààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:164
 msgid "Other Fax"
 msgstr "àààààààà ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Pager"
 msgstr "ààààà"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Primary Phone"
 msgstr "àààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Radio"
 msgstr "ààààà"
 
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Telex"
 msgstr "ààààààà"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:162
+#: ../addressbook/libebook/e-contact.c:170
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:173
 msgid "Organization"
 msgstr "àààààà"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Organizational Unit"
 msgstr "ààààààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Office"
 msgstr "àààà"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:176
 msgid "Title"
 msgstr "ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:177
 msgid "Role"
 msgstr "àààààà"
 
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Manager"
 msgstr "ààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:171
+#: ../addressbook/libebook/e-contact.c:179
 msgid "Assistant"
 msgstr "ààààà"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:174
+#: ../addressbook/libebook/e-contact.c:182
 msgid "Homepage URL"
 msgstr "àààààà'à URL"
 
-#: ../addressbook/libebook/e-contact.c:175
+#: ../addressbook/libebook/e-contact.c:183
 msgid "Weblog URL"
 msgstr "àààààà'à URL"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:758
+#: ../addressbook/libebook/e-contact.c:186
+#: ../libedataserverui/e-categories-dialog.c:88
 msgid "Categories"
 msgstr "ààààà"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:189
 msgid "Calendar URI"
 msgstr "àààààààààà'à URI"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:190
 msgid "Free/Busy URL"
 msgstr "ààààà/àààààà URL"
 
-#: ../addressbook/libebook/e-contact.c:183
+#: ../addressbook/libebook/e-contact.c:191
 msgid "ICS Calendar"
 msgstr "ICS ààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:184
+#: ../addressbook/libebook/e-contact.c:192
 msgid "Video Conferencing URL"
 msgstr "ààààà ààààààààààà URL"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:187
+#: ../addressbook/libebook/e-contact.c:195
 msgid "Spouse's Name"
 msgstr "àààààà/àààààà-à ààà"
 
-#: ../addressbook/libebook/e-contact.c:188
+#: ../addressbook/libebook/e-contact.c:196
 msgid "Note"
 msgstr "ààà"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:199
 msgid "AIM Home Screen Name 1"
 msgstr "AIM ààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:200
 msgid "AIM Home Screen Name 2"
 msgstr "AIM ààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:201
 msgid "AIM Home Screen Name 3"
 msgstr "AIM ààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:202
 msgid "AIM Work Screen Name 1"
 msgstr "AIM àààààààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:203
 msgid "AIM Work Screen Name 2"
 msgstr "AIM àààààààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:204
 msgid "AIM Work Screen Name 3"
 msgstr "AIM àààààààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:205
 msgid "GroupWise Home Screen Name 1"
 msgstr "GroupWise ààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:206
 msgid "GroupWise Home Screen Name 2"
 msgstr "GroupWise ààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:207
 msgid "GroupWise Home Screen Name 3"
 msgstr "GroupWise ààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:208
 msgid "GroupWise Work Screen Name 1"
 msgstr "GroupWise àààààààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:209
 msgid "GroupWise Work Screen Name 2"
 msgstr "GroupWise àààààààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:210
 msgid "GroupWise Work Screen Name 3"
 msgstr "GroupWise àààààààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:203
-#| msgid "Jabber Home Id 1"
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Jabber Home ID 1"
 msgstr "Jabber ààààà ID à"
 
-#: ../addressbook/libebook/e-contact.c:204
-#| msgid "Jabber Home Id 2"
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Jabber Home ID 2"
 msgstr "Jabber ààààà Id à"
 
-#: ../addressbook/libebook/e-contact.c:205
-#| msgid "Jabber Home Id 3"
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Jabber Home ID 3"
 msgstr "Jabber ààààà Id à"
 
-#: ../addressbook/libebook/e-contact.c:206
-#| msgid "Jabber Work Id 1"
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Jabber Work ID 1"
 msgstr "Jabber àààààààààà Id à"
 
-#: ../addressbook/libebook/e-contact.c:207
-#| msgid "Jabber Work Id 2"
+#: ../addressbook/libebook/e-contact.c:215
 msgid "Jabber Work ID 2"
 msgstr "Jabber àààààààààà Id à"
 
-#: ../addressbook/libebook/e-contact.c:208
-#| msgid "Jabber Work Id 3"
+#: ../addressbook/libebook/e-contact.c:216
 msgid "Jabber Work ID 3"
 msgstr "Jabber àààààààààà Id à"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo! ààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:218
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo! ààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:219
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo! ààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:220
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo! àààààààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:221
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo! àààààààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:222
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo! àààààààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:223
 msgid "MSN Home Screen Name 1"
 msgstr "MSN ààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:224
 msgid "MSN Home Screen Name 2"
 msgstr "MSN ààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:225
 msgid "MSN Home Screen Name 3"
 msgstr "MSN ààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:226
 msgid "MSN Work Screen Name 1"
 msgstr "MSN àààààààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:227
 msgid "MSN Work Screen Name 2"
 msgstr "MSN àààààààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:228
 msgid "MSN Work Screen Name 3"
 msgstr "MSN àààààààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:221
-#| msgid "ICQ Home Id 1"
+#: ../addressbook/libebook/e-contact.c:229
 msgid "ICQ Home ID 1"
 msgstr "ICQ ààààà ID à"
 
-#: ../addressbook/libebook/e-contact.c:222
-#| msgid "ICQ Home Id 2"
+#: ../addressbook/libebook/e-contact.c:230
 msgid "ICQ Home ID 2"
 msgstr "ICQ ààààà Id à"
 
-#: ../addressbook/libebook/e-contact.c:223
-#| msgid "ICQ Home Id 3"
+#: ../addressbook/libebook/e-contact.c:231
 msgid "ICQ Home ID 3"
 msgstr "ICQ ààààà Id à"
 
-#: ../addressbook/libebook/e-contact.c:224
-#| msgid "ICQ Work Id 1"
+#: ../addressbook/libebook/e-contact.c:232
 msgid "ICQ Work ID 1"
 msgstr "ICQ àààààààààà ID à"
 
-#: ../addressbook/libebook/e-contact.c:225
-#| msgid "ICQ Work Id 2"
+#: ../addressbook/libebook/e-contact.c:233
 msgid "ICQ Work ID 2"
 msgstr "ICQ àààààààààà Id à"
 
-#: ../addressbook/libebook/e-contact.c:226
-#| msgid "ICQ Work Id 3"
+#: ../addressbook/libebook/e-contact.c:234
 msgid "ICQ Work ID 3"
 msgstr "ICQ àààààààààà Id à"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook/e-contact.c:237
 msgid "Last Revision"
 msgstr "ààààààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:230
+#: ../addressbook/libebook/e-contact.c:238
 msgid "Name or Org"
 msgstr "ààà àààà àààààà"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:241
 msgid "Address List"
 msgstr "ààààààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Home Address"
 msgstr "ààààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:235
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Work Address"
 msgstr "àààààààààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:236
+#: ../addressbook/libebook/e-contact.c:244
 msgid "Other Address"
 msgstr "àààààààà àààààà"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:239
+#: ../addressbook/libebook/e-contact.c:247
 msgid "Category List"
 msgstr "ààààààà àààààà"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:242
+#: ../addressbook/libebook/e-contact.c:250
 msgid "Photo"
 msgstr "ààà"
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:251
 msgid "Logo"
 msgstr "ààààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:245
+#: ../addressbook/libebook/e-contact.c:253
 msgid "Name"
 msgstr "ààà"
 
-#: ../addressbook/libebook/e-contact.c:246
+#: ../addressbook/libebook/e-contact.c:254
 msgid "Email List"
 msgstr "à-àààà àààààà"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:257
 msgid "AIM Screen Name List"
 msgstr "AIM ààààààà ààààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:250
-#| msgid "GroupWise Id List"
+#: ../addressbook/libebook/e-contact.c:258
 msgid "GroupWise ID List"
 msgstr "GroupWise Id-à àààààà"
 
-#: ../addressbook/libebook/e-contact.c:251
-#| msgid "Jabber Id List"
+#: ../addressbook/libebook/e-contact.c:259
 msgid "Jabber ID List"
 msgstr "Jabber Id-à àààààà"
 
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:260
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo! ààààààà ààààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:253
+#: ../addressbook/libebook/e-contact.c:261
 msgid "MSN Screen Name List"
 msgstr "MSN ààààààà ààààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:254
-#| msgid "ICQ Id List"
+#: ../addressbook/libebook/e-contact.c:262
 msgid "ICQ ID List"
 msgstr "ICQ ID-à àààààà"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:264
 msgid "Wants HTML Mail"
 msgstr "HTML àààà ààààààà àààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:258
+#: ../addressbook/libebook/e-contact.c:266
 msgid "List"
 msgstr "àààààà"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:267
 msgid "List Show Addresses"
 msgstr "àààààà àààààààààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:261
+#: ../addressbook/libebook/e-contact.c:269
 msgid "Birth Date"
 msgstr "àààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:262
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
+#: ../addressbook/libebook/e-contact.c:270
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1063
 msgid "Anniversary"
 msgstr "àààààààà"
 
 # àààà àààààà ??
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:265
+#: ../addressbook/libebook/e-contact.c:273
 msgid "X.509 Certificate"
 msgstr "X.509 ààààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:267
-#| msgid "Gadu-Gadu Home Id 1"
+#: ../addressbook/libebook/e-contact.c:275
 msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu ààààà ID à"
 
-#: ../addressbook/libebook/e-contact.c:268
-#| msgid "Gadu-Gadu Home Id 2"
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu ààààà ID à"
 
-#: ../addressbook/libebook/e-contact.c:269
-#| msgid "Gadu-Gadu Home Id 3"
+#: ../addressbook/libebook/e-contact.c:277
 msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu ààààà ID à"
 
-#: ../addressbook/libebook/e-contact.c:270
-#| msgid "Gadu-Gadu Work Id 1"
+#: ../addressbook/libebook/e-contact.c:278
 msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu àààààààààà ID à"
 
-#: ../addressbook/libebook/e-contact.c:271
-#| msgid "Gadu-Gadu Work Id 2"
+#: ../addressbook/libebook/e-contact.c:279
 msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu àààààààààà ID à"
 
-#: ../addressbook/libebook/e-contact.c:272
-#| msgid "Gadu-Gadu Work Id 3"
+#: ../addressbook/libebook/e-contact.c:280
 msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu àààààààààà ID à"
 
-#: ../addressbook/libebook/e-contact.c:273
-#| msgid "Gadu-Gadu Id List"
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Gadu-Gadu ID List"
 msgstr "Gadu-Gadu Id-à àààààà"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Geographic Information"
 msgstr "àààààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Telephone"
 msgstr "àààààà"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:288
 msgid "Skype Home Name 1"
 msgstr "Skype ààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:289
 msgid "Skype Home Name 2"
 msgstr "Skype ààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:290
 msgid "Skype Home Name 3"
 msgstr "Skype ààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:291
 msgid "Skype Work Name 1"
 msgstr "Skype àààààààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:292
 msgid "Skype Work Name 2"
 msgstr "Skype àààààààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:285
+#: ../addressbook/libebook/e-contact.c:293
 msgid "Skype Work Name 3"
 msgstr "Skype àààààààààà ààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:294
 msgid "Skype Name List"
 msgstr "Skype ààààààà ààààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:288
+#: ../addressbook/libebook/e-contact.c:296
 msgid "SIP address"
 msgstr "SIP àààààà"
 
-#: ../addressbook/libebook/e-contact.c:1515
-#: ../addressbook/libebook/e-destination.c:739
+#: ../addressbook/libebook/e-contact.c:298
+#| msgid "Skype Home Name 1"
+msgid "Google Talk Home Name 1"
+msgstr "Google Talk ààààà ààààààààà ààà à"
+
+#: ../addressbook/libebook/e-contact.c:299
+#| msgid "Skype Home Name 2"
+msgid "Google Talk Home Name 2"
+msgstr "Google Talk ààààà ààààààààà ààà à"
+
+#: ../addressbook/libebook/e-contact.c:300
+#| msgid "Skype Home Name 3"
+msgid "Google Talk Home Name 3"
+msgstr "Google Talk ààààà ààààààààà ààà à"
+
+#: ../addressbook/libebook/e-contact.c:301
+#| msgid "Skype Work Name 1"
+msgid "Google Talk Work Name 1"
+msgstr "Google Talk àààààààààà ààààààààà ààà à"
+
+#: ../addressbook/libebook/e-contact.c:302
+#| msgid "Skype Work Name 2"
+msgid "Google Talk Work Name 2"
+msgstr "Google Talk àààààààààà ààààààààà ààà à"
+
+#: ../addressbook/libebook/e-contact.c:303
+#| msgid "Skype Work Name 3"
+msgid "Google Talk Work Name 3"
+msgstr "Google Talk àààààààààà ààààààààà ààà à"
+
+#: ../addressbook/libebook/e-contact.c:304
+#| msgid "Skype Name List"
+msgid "Google Talk Name List"
+msgstr "Google Talk ààààà àààààà"
+
+#: ../addressbook/libebook/e-contact.c:1597
+#: ../addressbook/libebook/e-destination.c:878
 msgid "Unnamed List"
 msgstr "àààààààà àààààà"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:304
+#: ../addressbook/libedata-book/e-book-backend.c:19
+msgid "Cannot process, book backend is opening"
+msgstr "ààààààà àààà àààààà, ààààà ààààà-àààà ààààà ààà ààààà"
+
+#: ../addressbook/libedata-book/e-book-backend.c:91
 #, c-format
-msgid "Empty URI"
-msgstr "ààààà URI"
+#| msgid "Unknown error: %s"
+msgid "Unknown book property '%s'"
+msgstr "àà ààààààààà ààààà ààààààààà '%s'"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:323
-#: ../addressbook/libedata-book/e-data-book-factory.c:361
-#: ../calendar/libedata-cal/e-data-cal-factory.c:352
-#: ../calendar/libedata-cal/e-data-cal-factory.c:364
+#: ../addressbook/libedata-book/e-book-backend.c:108
 #, c-format
-#| msgid "%s: Invalid source."
-msgid "Invalid source"
-msgstr "ààà ààà àà"
+#| 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
+#: ../camel/camel-db.c:503
+#, c-format
+msgid "Insufficient memory"
+msgstr "ààààààààà ààààà"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1093
+#, c-format
+#| msgid "Contact not found"
+msgid "Contact '%s' not found"
+msgstr "'%s' ààààààà ààààà ààààà"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:206
+#: ../addressbook/libedata-book/e-data-book.c:219
+#: ../addressbook/libedata-book/e-data-book.c:733
+#| msgid "Invalid query: %s"
+msgid "Invalid query: "
+msgstr "àààà ààààààààà: "
 
-#: ../addressbook/libedata-book/e-data-book.c:173
-#: ../calendar/libedata-cal/e-data-cal.c:110
+#: ../addressbook/libedata-book/e-data-book.c:311
+#: ../calendar/libedata-cal/e-data-cal.c:427
 msgid "Success"
 msgstr "ààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:174
-#: ../calendar/libedata-cal/e-data-cal.c:111
-#| msgid "Repository is offline"
+#: ../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
+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 offline"
 msgstr "ààààààààààà àààààààà àà-àààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:175
-#: ../calendar/libecal/e-cal.c:4162 ../calendar/libedata-cal/e-data-cal.c:112
+#: ../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
 msgid "Permission denied"
 msgstr "àààààà àààààà ààà àààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:176
-#| msgid "Object not found"
-msgid "Contact not found"
-msgstr "ààààààà ààààà ààààà"
+#: ../addressbook/libedata-book/e-data-book.c:317
+#: ../calendar/libedata-cal/e-data-cal.c:435
+msgid "Authentication Failed"
+msgstr "ààààààà àààà àààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:177
-#| msgid "Object ID already exists"
-msgid "Contact ID already exists"
-msgstr "àààààààà ID àààààààà ààààààà"
-
-#: ../addressbook/libedata-book/e-data-book.c:178
-#: ../calendar/libedata-cal/e-data-cal.c:117
-#| msgid "Authentication failed"
-msgid "Authentication Failed"
-msgstr "ààààààà àààà àààà"
-
-#: ../addressbook/libedata-book/e-data-book.c:179
-#: ../calendar/libedata-cal/e-data-cal.c:118
-#| msgid "Authentication required"
+#: ../addressbook/libedata-book/e-data-book.c:318
+#: ../calendar/libedata-cal/e-data-cal.c:436
 msgid "Authentication Required"
 msgstr "ààààààà àààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:180
-#: ../calendar/libedata-cal/e-data-cal.c:119
+#: ../addressbook/libedata-book/e-data-book.c:319
+#: ../calendar/libedata-cal/e-data-cal.c:437
 msgid "Unsupported field"
 msgstr "àààààààà ààààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:181
-#: ../calendar/libedata-cal/e-data-cal.c:121
+#: ../addressbook/libedata-book/e-data-book.c:320
+#: ../calendar/libedata-cal/e-data-cal.c:439 ../libedataserver/e-client.c:145
 msgid "Unsupported authentication method"
 msgstr "ààààààà ààààààà ààààààà àà"
 
-#: ../addressbook/libedata-book/e-data-book.c:182
-#: ../calendar/libedata-cal/e-data-cal.c:122
+#: ../addressbook/libedata-book/e-data-book.c:321
+#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:147
 msgid "TLS not available"
 msgstr "TLS àààààà àà"
 
-#: ../addressbook/libedata-book/e-data-book.c:184
+#: ../addressbook/libedata-book/e-data-book.c:323
 msgid "Book removed"
 msgstr "àà àààà àààà ààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:185
-#: ../calendar/libedata-cal/e-data-cal.c:125
-#| msgid "This message is not available in offline mode."
+#: ../addressbook/libedata-book/e-data-book.c:324
+#: ../calendar/libedata-cal/e-data-cal.c:443
 msgid "Not available in offline mode"
 msgstr "àà-àààà ààààààà àààààà ààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:186
-#: ../calendar/libedata-cal/e-data-cal.c:126
+#: ../addressbook/libedata-book/e-data-book.c:325
+#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:149
 msgid "Search size limit exceeded"
 msgstr "ààààààààààà ààààà àààààààà ààààààà àààààààààà ààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:187
-#: ../calendar/libedata-cal/e-data-cal.c:127
+#: ../addressbook/libedata-book/e-data-book.c:326
+#: ../calendar/libedata-cal/e-data-cal.c:445 ../libedataserver/e-client.c:151
 msgid "Search time limit exceeded"
 msgstr "àààààààààà ààààà àààà àààààààààà ààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:188
-#: ../calendar/libedata-cal/e-data-cal.c:128
+#: ../addressbook/libedata-book/e-data-book.c:327
+#: ../calendar/libedata-cal/e-data-cal.c:446 ../libedataserver/e-client.c:153
 msgid "Invalid query"
 msgstr "àààà àààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:189
-#: ../calendar/libedata-cal/e-data-cal.c:129
+#: ../addressbook/libedata-book/e-data-book.c:328
+#: ../calendar/libedata-cal/e-data-cal.c:447 ../libedataserver/e-client.c:155
 msgid "Query refused"
 msgstr "àààààà àààààààààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:190
-#: ../calendar/libedata-cal/e-data-cal.c:130
-#| msgid "%s: could not cancel"
+#: ../addressbook/libedata-book/e-data-book.c:329
+#: ../calendar/libedata-cal/e-data-cal.c:448 ../libedataserver/e-client.c:141
 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:192
-#: ../calendar/libedata-cal/e-data-cal.c:132
+#: ../addressbook/libedata-book/e-data-book.c:331
+#: ../calendar/libedata-cal/e-data-cal.c:450
 msgid "Invalid server version"
 msgstr "ààààààààà ààààààà ààà àà"
 
-#: ../addressbook/libedata-book/e-data-book.c:193
-#| msgid "Namespace"
-msgid "No space"
-msgstr "ààààà ààààà ààà"
-
-#: ../addressbook/libedata-book/e-data-book.c:194
-#: ../calendar/libecal/e-cal.c:4146 ../calendar/libedata-cal/e-data-cal.c:133
+#: ../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
 msgid "Invalid argument"
 msgstr "àààà àààààààààà"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:196
-#: ../calendar/libecal/e-cal.c:4185 ../calendar/libedata-cal/e-data-cal.c:135
-#| msgid "Protocol not supported"
+#: ../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 "Not supported"
 msgstr "ààààààà àà"
 
-#: ../addressbook/libedata-book/e-data-book.c:204
-#: ../calendar/libedata-cal/e-data-cal.c:143
-#| msgid "I/O error"
+#: ../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"
+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 "Other error"
 msgstr "àààààààà àààààà"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:325
-#, c-format
-#| msgid "Cannot open mailbox: %s: %s\n"
-msgid "Cannot open book: %s"
-msgstr "àà ààààà àààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:347
-#, c-format
-#| msgid "Cannot open mailbox: %s: %s\n"
-msgid "Cannot remove book: %s"
-msgstr "àà àààà ààààà àààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:364
-#: ../addressbook/libedata-book/e-data-book.c:383
-#, c-format
-#| msgid "Cannot get folder container %s"
-msgid "Cannot get contact: %s"
-msgstr "àààààààà àààà ààààààà àààà àààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:402
-#, c-format
-msgid "Empty query: %s"
-msgstr "ààààà ààààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:418
-#, c-format
-#| msgid "Cannot get folder container %s"
-msgid "Cannot get contact list: %s"
-msgstr "àààààààààà àààààà ààààààà àààà àààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:457
-#, c-format
-#| msgid "Cannot authenticate to server: %s"
-msgid "Cannot authenticate user: %s"
-msgstr "ààààààààààààà ààààààà àààà àààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:472
-#: ../addressbook/libedata-book/e-data-book.c:491
+#. 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 contact: %s"
+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
+#| msgid "Empty query: %s"
+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 contact: %s"
+msgid "Cannot add contact: "
+msgstr "ààààààà ààà àààà àààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:651
+#: ../addressbook/libedata-book/e-data-book.c:1075
+#| msgid "Cannot modify contact: %s"
+msgid "Cannot modify contacts: "
+msgstr "àààààààà àààà àààààààà àààà àààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:759
+#: ../calendar/libedata-cal/e-data-cal.c:866
+#| msgid "Cannot authenticate user: %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 book: %s"
+msgid "Cannot open book: "
+msgstr "àà ààààà àààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:846
+#| msgid "Cannot remove book: %s"
+msgid "Cannot remove book: "
+msgstr "àà àààà ààààà àààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:873
+#| msgid "Cannot refresh calendar: %s"
+msgid "Cannot refresh address book: "
+msgstr "àààààà àà àààà ààà àààààààà àààà àààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:899
+#| msgid "Cannot create calendar object: %s"
+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
+#| msgid "Cannot send calendar objects: %s"
+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 contact list: %s"
+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 contact list: %s"
+msgid "Cannot get contact list uids: "
+msgstr "àààààààààà uid-à àààààà ààààààà àààà àààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:1100
+#| msgid "Cannot remove contacts: %s"
+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
 #, c-format
-#| msgid "Cannot get folder container %s"
-msgid "Cannot add contact: %s"
-msgstr "ààààààà ààà àààà àààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:513
-#: ../addressbook/libedata-book/e-data-book.c:532
-#, c-format
-#| msgid "Cannot get folder container %s"
-msgid "Cannot modify contact: %s"
-msgstr "àààààààà àààà àààààààà àààà àààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:571
-#, c-format
-#| msgid "Cannot get folder container %s"
-msgid "Cannot remove contacts: %s"
-msgstr "ààààààààà àààà àààà àààà ààààà àà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:610
-#, c-format
-#| msgid "Cannot get message %s: %s"
-msgid "Cannot get supported fields: %s"
-msgstr "ààààààà ààààààà ààààààà àààà àààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:625
-#, c-format
-#| msgid "Cannot get message %s: %s"
-msgid "Cannot get required fields: %s"
-msgstr "àààààà ààààààààààà ààààààà àààà àààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:640
-#, c-format
-#| msgid "Unsupported authentication method"
-msgid "Cannot get supported authentication methods: %s"
-msgstr "ààààààà ààààààà àààààààààà ààààààà àààà àààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:666
-#: ../addressbook/libedata-book/e-data-book.c:677
-#, c-format
-#| msgid "Invalid query"
-msgid "Invalid query: %s"
-msgstr "àààà ààààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:713
-#, c-format
-#| msgid "Cannot get message %s: %s"
-msgid "Cannot get changes: %s"
-msgstr "àààààààà ààààààà ààà ààààà àà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:755
-#, c-format
-#| msgid "Operation failed: %s"
-msgid "Cancel operation failed: %s"
-msgstr "ààààààà àààà àààààà: %s"
+msgid "Empty URI"
+msgstr "ààààà URI"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:521
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:546
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "ààààààààà àààà ààààà àààààà ààà àààààà àà (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:549
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:574
 #, 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:2090
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2495
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2212
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2567
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
 "Error message: %s"
 msgstr ""
-"ààààààààà àààà ààààà ààà àààààà àà à ààààààààà ààààààààà àààààààà àààà àààà àààààà\n"
+"ààààààààà àààà ààààà ààà àààààà àà à ààààààààà ààààààààà àààààààà àààà àààà "
+"àààààà\n"
 "ààààààà àààààà: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4266
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4482
 msgid "Calendar doesn't support Free/Busy"
 msgstr "ààààààààà àààààà ààààà/àààààà àààààà ààààààà àà àà"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:725
+#: ../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/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/contacts/e-cal-backend-contacts.c:1065
 msgid "Birthday"
 msgstr "ààààààà"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:754
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1101
 #, c-format
 msgid "Birthday: %s"
 msgstr "ààààààà: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:778
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1132
 #, c-format
 msgid "Anniversary: %s"
 msgstr "àààààààà: %s"
@@ -1024,675 +1158,621 @@ msgstr "àààààààààà àààà ààààààà àà
 msgid "Cannot save calendar data"
 msgstr "àààààààààà àààà ààààààà àààà àààààà"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2109
-msgid "Reply Requested: by "
-msgstr "ààààààà àààààà àààààà ààààà: ààààààà ààààà ààààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2114
-msgid "Reply Requested: When convenient"
-msgstr "ààààààà àààààà àààààà ààààà: àààààààààààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:330
-#| msgid "Loading %s items"
-msgid "Loading Appointment items"
-msgstr "àààààààààààà àààà ààà ààà ààààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:332
-#| msgid "Loading %s items"
-msgid "Loading Task items"
-msgstr "ààààààààààà àààà ààà ààà ààààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:334
-#| msgid "Loading %s items"
-msgid "Loading Note items"
-msgstr "ààààà àààà ààà ààà ààààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:336
-#| msgid "Loading %s items"
-msgid "Loading items"
-msgstr "ààààààà ààà ààà ààààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:962
-msgid "Calendar"
-msgstr "ààààààààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1025
-msgid "Invalid server URI"
-msgstr "ààààààààà URI ààà àà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1126
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1386
-#: ../calendar/backends/http/e-cal-backend-http.c:783
-#: ../calendar/backends/weather/e-cal-backend-weather.c:520
-msgid "Could not create cache file"
-msgstr "àààààà àààà ààààààà àààà àààààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1138
-msgid "Could not create thread for populating cache"
-msgstr "ààààààà ààààà àààà àààààà àààà ààààà ààààààà àààà àààààà"
-
-#: ../calendar/backends/http/e-cal-backend-http.c:423
+#: ../calendar/backends/http/e-cal-backend-http.c:405
 msgid "Redirected to Invalid URI"
 msgstr "àààà URI-à àààà ààààààà ààà ààààà"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:456
+#: ../calendar/backends/http/e-cal-backend-http.c:446
 msgid "Bad file format."
 msgstr "àààààà ààààààà àààà ààà"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:463
+#: ../calendar/backends/http/e-cal-backend-http.c:454
 msgid "Not a calendar."
 msgstr "ààààààààà ààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:186
+#: ../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
+msgid "Could not create cache file"
+msgstr "àààààà àààà ààààààà àààà àààààà"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:183
 msgid "Could not retrieve weather data"
 msgstr "ààààààà àààààààà àààà ààààààà àààà àààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:286
+#: ../calendar/backends/weather/e-cal-backend-weather.c:279
 msgid "Weather: Fog"
 msgstr "ààààààà: àààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:287
+#: ../calendar/backends/weather/e-cal-backend-weather.c:280
 msgid "Weather: Cloudy Night"
 msgstr "ààààààà: ààààà ààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+#: ../calendar/backends/weather/e-cal-backend-weather.c:281
 msgid "Weather: Cloudy"
 msgstr "ààààààà: ààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:289
+#: ../calendar/backends/weather/e-cal-backend-weather.c:282
 msgid "Weather: Overcast"
 msgstr "ààààààà: àààààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:290
+#: ../calendar/backends/weather/e-cal-backend-weather.c:283
 msgid "Weather: Showers"
 msgstr "ààààààà: àààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:291
+#: ../calendar/backends/weather/e-cal-backend-weather.c:284
 msgid "Weather: Snow"
 msgstr "ààààààà: àààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:292
+#: ../calendar/backends/weather/e-cal-backend-weather.c:285
 msgid "Weather: Clear Night"
 msgstr "ààààààà: àààààààà ààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:293
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
 msgid "Weather: Sunny"
 msgstr "ààààààà: àààààààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:294
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
 msgid "Weather: Thunderstorms"
 msgstr "ààààààà: ààààààààààààà àààà àààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:440
+#: ../calendar/backends/weather/e-cal-backend-weather.c:435
 msgid "Forecast"
 msgstr "ààààààààà"
 
-#: ../calendar/libecal/e-cal-component.c:1306
+#: ../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
+msgid "Repository is offline"
+msgstr "ààààààààààà àààààààà àà-àààà ààààààà ààà"
+
+#: ../calendar/libecal/e-cal.c:4568 ../calendar/libecal/e-cal-client.c:137
+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
+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
+msgid "Invalid object"
+msgstr "àààà ààààààà"
+
+#: ../calendar/libecal/e-cal.c:4574
+msgid "URI not loaded"
+msgstr "URI àààààààà ààà ààà àà"
+
+#: ../calendar/libecal/e-cal.c:4576
+msgid "URI already loaded"
+msgstr "URI àààààà ààà ààà ààààà"
+
+#: ../calendar/libecal/e-cal.c:4580
+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
+msgid "Object ID already exists"
+msgstr "ààààààà ID àààààààà ààààààà"
+
+#: ../calendar/libecal/e-cal.c:4584
+msgid "Protocol not supported"
+msgstr "àààààààà ààààààà àà"
+
+#: ../calendar/libecal/e-cal.c:4586
+msgid "Operation has been canceled"
+msgstr "àààà ààààà ààà ààààà"
+
+#: ../calendar/libecal/e-cal.c:4588
+msgid "Could not cancel operation"
+msgstr "àààà ààààà àààà àààààà"
+
+#: ../calendar/libecal/e-cal.c:4590 ../libedataserver/e-client.c:129
+msgid "Authentication failed"
+msgstr "ààààààà àààà àààà"
+
+#: ../calendar/libecal/e-cal.c:4592
+#: ../camel/providers/smtp/camel-smtp-transport.c:846
+#: ../libedataserver/e-client.c:131
+msgid "Authentication required"
+msgstr "ààààààà àààààà"
+
+#: ../calendar/libecal/e-cal.c:4594
+msgid "A D-Bus exception has occurred"
+msgstr "àààà D-Bus ààààààà àààààà ààààà"
+
+#: ../calendar/libecal/e-cal.c:4598
+msgid "No error"
+msgstr "àààà àààààà àààà"
+
+#: ../calendar/libecal/e-cal-client.c:143
+#: ../calendar/libedata-cal/e-data-cal.c:442
+msgid "Unknown user"
+msgstr "ààààà ààààààààààà"
+
+#: ../calendar/libecal/e-cal-client.c:147
+#: ../calendar/libedata-cal/e-data-cal.c:431
+msgid "Invalid range"
+msgstr "àààà àààà"
+
+#: ../calendar/libecal/e-cal-client.c:603
+#| msgid "Failed to encode data"
+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 "Calendar does not exist"
+msgstr "ààààààààà àààààààà ààààààààà"
+
+#: ../calendar/libecal/e-cal-client.c:922
+#| msgid "Invalid source"
+msgid "Invalid source type"
+msgstr "ààààà ààà ààà àà"
+
+#: ../calendar/libecal/e-cal-component.c:1337
 msgid "Untitled appointment"
 msgstr "àààààààààà ààààààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3979
+#: ../calendar/libecal/e-cal-recur.c:3981
 msgid "1st"
 msgstr "à-àà"
 
 # ààààà, ààààààà, ààààà ààààà ààà
-#: ../calendar/libecal/e-cal-recur.c:3980
+#: ../calendar/libecal/e-cal-recur.c:3982
 msgid "2nd"
 msgstr "à-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:3983
 msgid "3rd"
 msgstr "à-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3982
+#: ../calendar/libecal/e-cal-recur.c:3984
 msgid "4th"
 msgstr "à-ààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3983
+#: ../calendar/libecal/e-cal-recur.c:3985
 msgid "5th"
 msgstr "à-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3984
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "6th"
 msgstr "à-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3985
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "7th"
 msgstr "à-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3986
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "8th"
 msgstr "à-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "9th"
 msgstr "à-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "10th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "11th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "12th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "13th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "14th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "15th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "16th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "17th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "18th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "19th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "20th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "21st"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "22nd"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "23rd"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "24th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "25th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "26th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "27th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "28th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "29th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "30th"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "31st"
 msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-util.c:678 ../calendar/libecal/e-cal-util.c:705
+#: ../calendar/libecal/e-cal-util.c:691 ../calendar/libecal/e-cal-util.c:718
+#| msgid "High"
+msgctxt "Priority"
 msgid "High"
 msgstr "àààà"
 
-#: ../calendar/libecal/e-cal-util.c:680 ../calendar/libecal/e-cal-util.c:707
+#: ../calendar/libecal/e-cal-util.c:693 ../calendar/libecal/e-cal-util.c:720
+#| msgid "Normal"
+msgctxt "Priority"
 msgid "Normal"
 msgstr "ààààààààà"
 
-#: ../calendar/libecal/e-cal-util.c:682 ../calendar/libecal/e-cal-util.c:709
+#: ../calendar/libecal/e-cal-util.c:695 ../calendar/libecal/e-cal-util.c:722
+#| msgid "Low"
+msgctxt "Priority"
 msgid "Low"
 msgstr "ààààà"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:703
+#: ../calendar/libecal/e-cal-util.c:716
+#| msgid "Undefined"
+msgctxt "Priority"
 msgid "Undefined"
-msgstr "àààààààààà"
+msgstr "àààààààààà"
 
-#: ../calendar/libecal/e-cal.c:1236 ../libedataserverui/e-book-auth-util.c:206
-#: ../libedataserverui/e-book-auth-util.c:440
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "%s'à àààà ààààààààà ààààà (ààààààààààà %s)"
+#: ../calendar/libedata-cal/e-cal-backend.c:38
+#| msgid "Cannot remove calendar object: %s"
+msgid "Cannot process, calendar backend is opening"
+msgstr "ààààààà àààà àààààà, àààààààààà ààààà-àààà ààààà ààà ààààà"
 
-#.
-#. 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:1250
+#: ../calendar/libedata-cal/e-cal-backend.c:146
 #, c-format
-msgid "Enter password for %s to enable proxy for user %s"
-msgstr "%s'à àààà ààààààààà àààààà ààà %s àààààààààààà àààà ààààààà ààààààà àààààà àààà"
-
-#: ../calendar/libecal/e-cal.c:4148
-msgid "Backend is busy"
-msgstr "ààààà-àààà àààààààà àààààà"
-
-#: ../calendar/libecal/e-cal.c:4150
-msgid "Repository is offline"
-msgstr "ààààààààààà àààààààà àà-àààà ààààààà ààà"
-
-#: ../calendar/libecal/e-cal.c:4152
-msgid "No such calendar"
-msgstr "àà ààààà ààààààààà ààààààà ààà"
-
-#: ../calendar/libecal/e-cal.c:4154 ../calendar/libedata-cal/e-data-cal.c:114
-#: ../servers/groupwise/e-gw-connection.c:235
-msgid "Object not found"
-msgstr "ààààààà ààààà ààààà"
-
-#: ../calendar/libecal/e-cal.c:4156 ../calendar/libedata-cal/e-data-cal.c:115
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid object"
-msgstr "àààà ààààààà"
-
-#: ../calendar/libecal/e-cal.c:4158
-msgid "URI not loaded"
-msgstr "URI àààààààà ààà ààà àà"
-
-#: ../calendar/libecal/e-cal.c:4160
-msgid "URI already loaded"
-msgstr "URI àààààà ààà ààà ààààà"
-
-#: ../calendar/libecal/e-cal.c:4164 ../servers/groupwise/e-gw-connection.c:237
-msgid "Unknown User"
-msgstr "ààààà ààààààààààà"
-
-#: ../calendar/libecal/e-cal.c:4166 ../calendar/libedata-cal/e-data-cal.c:116
-msgid "Object ID already exists"
-msgstr "ààààààà ID àààààààà ààààààà"
-
-#: ../calendar/libecal/e-cal.c:4168
-msgid "Protocol not supported"
-msgstr "àààààààà ààààààà àà"
-
-#: ../calendar/libecal/e-cal.c:4170
-msgid "Operation has been canceled"
-msgstr "àààà ààààà ààà ààààà"
-
-#: ../calendar/libecal/e-cal.c:4172
-msgid "Could not cancel operation"
-msgstr "àààà ààààà àààà àààààà"
+#| msgid "Unknown error: %s"
+msgid "Unknown calendar property '%s'"
+msgstr "ààààààààà ààààààààà ààààà ààààààààà '%s'"
 
-#: ../calendar/libecal/e-cal.c:4174
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1311
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1329
-#: ../camel/providers/groupwise/camel-groupwise-store.c:635
-#: ../camel/providers/groupwise/camel-groupwise-store.c:817
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:87
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#: ../calendar/libedata-cal/e-cal-backend.c:163
 #, c-format
-msgid "Authentication failed"
-msgstr "ààààààà àààà àààà"
-
-#: ../calendar/libecal/e-cal.c:4176
-#: ../camel/providers/smtp/camel-smtp-transport.c:775
-msgid "Authentication required"
-msgstr "ààààààà àààààà"
+#| msgid "Cannot create calendar object: %s"
+msgid "Cannot change value of calendar property '%s'"
+msgstr "àààààààààà ààààààààà '%s'-à ààà àààààààà àààà àààààà"
 
-#: ../calendar/libecal/e-cal.c:4178
-#| msgid "A CORBA exception has occurred"
-msgid "A D-Bus exception has occurred"
-msgstr "àààà D-Bus ààààààà àààààà ààààà"
-
-#: ../calendar/libecal/e-cal.c:4182
-msgid "No error"
-msgstr "àààà àààààà àààà"
-
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:695
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:804
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1025
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1052
+#: ../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
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "\"%s\"-à àààà àààààààààà àààààààààà àà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:102
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:212
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:290
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1090
+#: ../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
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\"-à àààà àààààààààà àààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:296
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:737
+#: ../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
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "\"%s\"-à ààààà àààààààààà àààààà (string) àààà àààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:136
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
-msgstr "\"%s\"'à ààààà àààààààààà àààà ISO 8601 date/time àààààà (string) àààà àààààààààà"
+msgstr ""
+"\"%s\"'à ààààà àààààààààà àààà ISO 8601 date/time àààààà (string) àààà "
+"àààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:162
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:363
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:415
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:731
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:864
+#: ../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
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "\"%s\"-à àààà àààààààààà àààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:168
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:218
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:260
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:369
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:421
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:870
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1096
+#: ../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
 #, 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:176
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:192
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "\"%s\"-à ààààààà àààààààààà ààààààààààà àààà àààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:377
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:430
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:397
+#, 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
 #, 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:745
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:420
+#, c-format
+#| msgid "\"%s\" expects the first argument to be a string"
+msgid "\"%s\" expects the third argument to be a string"
+msgstr "\"%s\"-à ààààà àààààààààà àààààà (string) àààà àààààààààà"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:480
+#, 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
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "\"%s\"-à ààààààà àààààààààà àààààà (string) àààà àààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:924
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
 "\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
 "\"classification\""
 msgstr ""
-"\"%s\" àààààà àààààààààà ààààà àààààààààààà àààà àààààààà ààà \"any\", \"summary\", "
+"\"%s\" àààààà àààààààààà ààààà àààààààààààà àààà àààààààà ààà \"any\", "
+"\"summary\", "
 "àààà \"description\" àààà \"location\" àààà \"attendee\" àààà \"organizer\" "
 "àààà \"classification\""
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1086
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "\"%s\"-à ààààà àààà àààààààààà àààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:941
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1100
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
 "be a boolean false (#f)"
 msgstr ""
-"\"%s\"-à ààà àààààààààà àààààà (string) àààà àààà ààààààààà àààà àààààààààà ààààààà "
+"\"%s\"-à ààà àààààààààà àààààà (string) àààà àààà ààààààààà àààà àààààààààà "
+"ààààààà "
 "false (#f) àààà àààààààààà"
 
-#: ../calendar/libedata-cal/e-data-cal.c:113
-msgid "Invalid range"
-msgstr "àààà àààà"
-
-#: ../calendar/libedata-cal/e-data-cal.c:120
+#: ../calendar/libedata-cal/e-data-cal.c:438
 msgid "Unsupported method"
 msgstr "àààààààà àààààà"
 
-#: ../calendar/libedata-cal/e-data-cal.c:123
-#| msgid "Folder '%s' does not exist."
-msgid "Calendar does not exist"
-msgstr "ààààààààà àààààààà ààààààààà"
-
-#: ../calendar/libedata-cal/e-data-cal.c:124
-#| msgid "Unknown User"
-msgid "Unknown user"
-msgstr "ààààà ààààààààààà"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:610
-#, c-format
-#| msgid "Cannot create folder: %s: %s"
-msgid "Cannot retrieve calendar address: %s"
-msgstr "àààààààààà àààààà ààààààà àààà àààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:635
-#, c-format
-#| msgid "Cannot save calendar data: Malformed URI."
-msgid "Cannot retrieve calendar alarm e-mail address: %s"
-msgstr "àààààààààà ààààààààààà à-àààà àààààà ààààààà àààà àààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:660
-#, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot retrieve calendar's LDAP attribute: %s"
-msgstr "àààààààààà LDAP ààààààààà ààààààà àààà àààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:685
-#, c-format
-#| msgid "Cannot create CMS Recipient information"
-msgid "Cannot retrieve calendar scheduling information: %s"
-msgstr "àààààààààà àààààààààà  àààà ààààààà àààà àààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:709
-#, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot open calendar: %s"
-msgstr "ààààààààà ààààà àààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:730
-#, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot refresh calendar: %s"
-msgstr "ààààààààà àààà ààà àààààààà àààà àààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:749
-#, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot remove calendar: %s"
-msgstr "ààààààààà àààà ààààà àààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:770
-#, c-format
-#| msgid "Cannot create message: %s"
-msgid "Cannot create calendar object: %s"
-msgstr "àààààààààà ààààààà àààààààà àààà àààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:798
-#, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot modify calendar object: %s"
-msgstr "àààààààààà ààààààà àààààààà àààà àààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:824
-#, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot remove calendar object: %s"
-msgstr "àààààààààà ààààààà àààà àààà ààààà àà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:845
-#, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot receive calendar objects: %s"
-msgstr "àààààààààà ààààààà ààààààà ààà ààààà àà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:864
-#, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot discard calendar alarm: %s"
-msgstr "àààààààààà ààààààààà ààààà ààà ààààà àà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:885
-#, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot send calendar objects: %s"
-msgstr "àààààààààà ààààààà àààààà ààààà àà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:912
-#, c-format
-msgid "Cannot retrieve default calendar object path: %s"
-msgstr "àààààààààà àààààà ààààààààà ààà ààààààà àààà àààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:937
-#, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot retrieve calendar object path: %s"
-msgstr "àààààààààà ààààààààà ààà àààààà àààà àààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
+#. Translators: This is prefix to a detailed error message
 #: ../calendar/libedata-cal/e-data-cal.c:962
-#, c-format
-#| msgid "Cannot create folder lock on %s: %s"
-msgid "Cannot retrieve calendar object list: %s"
-msgstr "àààààààààà ààààààààà àààààà àààààà àààà àààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:990
-#, c-format
-#| msgid "Could not remove cache entry: %s: %s"
-msgid "Could not retrieve attachment list: %s"
-msgstr "ààààààà àààààà àààààà ààààààà àààà àààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1016
-#, c-format
-#| msgid "Could not open cache directory: %s"
-msgid "Could not complete calendar query: %s"
-msgstr "àààààààààà ààààààààà ààààà ààà ààààà àààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1041
-#, c-format
-#| msgid "Could not rename folder: %s"
-msgid "Could not retrieve calendar time zone: %s"
-msgstr "ààààààààààà ààààààà ààààà ààààà ààààààà ààà ààààà àààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1066
-#, c-format
-#| msgid "Could not rename folder: %s"
-msgid "Could not add calendar time zone: %s"
-msgstr "àààààààààà ààààà ààààà ààà ààà ààààà àààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1085
-#, c-format
-#| msgid "Could not send message: %s"
-msgid "Could not set default calendar time zone: %s"
-msgstr "àààààààààà àààààà ààààà ààààà àààààààà ààà ààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1108
-#, c-format
-#| msgid "Cannot create folder: %s: %s"
-msgid "Cannot retrieve calendar changes: %s"
-msgstr "àààààààààà àààààààààààà ààààààà ààà ààààà àààà: %s"
+#| msgid "Cannot open calendar: %s"
+msgid "Cannot open calendar: "
+msgstr "ààààààààà ààààà àààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:987
+#| msgid "Cannot remove calendar: %s"
+msgid "Cannot remove calendar: "
+msgstr "ààààààààà àààà ààààà àààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1014
+#| msgid "Cannot refresh calendar: %s"
+msgid "Cannot refresh calendar: "
+msgstr "ààààààààà àààà ààà àààààààà àààà àààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1043
+#, fuzzy
+#| msgid "Cannot retrieve calendar address: %s"
+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 retrieve calendar object path: %s"
+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 retrieve calendar object list: %s"
+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 retrieve calendar free/busy list: %s"
+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 calendar object: %s"
+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 modify calendar object: %s"
+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 remove calendar object: %s"
+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 receive calendar objects: %s"
+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 send calendar objects: %s"
+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 attachment list: %s"
+msgid "Could not retrieve attachment uris: "
+msgstr "ààààààà àààààà uri ààààààà àààà àààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1372
+#| msgid "Could not store folder: %s"
+msgid "Could not discard reminder: "
+msgstr ""
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1139
-#, c-format
-msgid "Cannot retrieve calendar free/busy list: %s"
-msgstr "àààààààààà ààààà ààààà/àààààààà àààààà ààààààà àààà àààààà: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1401
+#| msgid "Could not retrieve calendar time zone: %s"
+msgid "Could not get calendar view path: "
+msgstr ""
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:374
-#, c-format
-#| msgid "Invalid server URI"
-msgid "Invalid URI"
-msgstr "URI ààà àà"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1431
+#| msgid "Could not retrieve calendar time zone: %s"
+msgid "Could not retrieve calendar time zone: "
+msgstr "ààààààààààà ààààààà ààààà ààààà ààààààà ààà ààààà àààà: "
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:392
-#, c-format
-msgid "No backend factory for '%s' of '%s'"
-msgstr "'%s' -à ('%s'-à) àààà àààà ààààà-àààà ààààààààà ààààààà ààà"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1457
+#| msgid "Could not add calendar time zone: %s"
+msgid "Could not add calendar time zone: "
+msgstr "àààààààààà ààààà ààààà ààà ààà ààààà àààà: "
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:442
+#: ../calendar/libedata-cal/e-data-cal-factory.c:199
 #, c-format
-#| msgid "Could not create cache file"
-msgid "Could not instantiate backend"
-msgstr "ààààà-àààà ààààà àààà àààààà"
+#| msgid "Invalid range"
+msgid "Invalid call"
+msgstr "àààà àà"
 
-#: ../camel/camel-cipher-context.c:204
+#: ../camel/camel-cipher-context.c:206
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "àà àààààà àààààà àààààààà ààà ààààà àà"
 
-#: ../camel/camel-cipher-context.c:217
+#: ../camel/camel-cipher-context.c:219
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "àà àààààà àààààà ààààà àààààà ààà ààààà àà"
 
-#: ../camel/camel-cipher-context.c:233
+#: ../camel/camel-cipher-context.c:235
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "àà àààààà àààààà ààààààààà ààà ààààà àà"
 
-#: ../camel/camel-cipher-context.c:247
+#: ../camel/camel-cipher-context.c:249
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "àà àààààà àààààà ààààààààà ààà ààààà àà"
 
-#: ../camel/camel-cipher-context.c:260
+#: ../camel/camel-cipher-context.c:262
 #, c-format
 msgid "You may not import keys with this cipher"
 msgstr "àà àààààà àààààà àà àààààààà ààà àààà àà"
 
-#: ../camel/camel-cipher-context.c:274
+#: ../camel/camel-cipher-context.c:276
 #, c-format
 msgid "You may not export keys with this cipher"
 msgstr "àà àààààà àààààà àà ààààààààà ààà àààà àà"
 
-#: ../camel/camel-cipher-context.c:815
+#: ../camel/camel-cipher-context.c:805
 msgid "Signing message"
 msgstr "àààààà àààààààà ààààààà"
 
-#: ../camel/camel-cipher-context.c:1056
+#: ../camel/camel-cipher-context.c:1046
 msgid "Encrypting message"
 msgstr "àààààà ààààààààà ààààààà"
 
-#: ../camel/camel-cipher-context.c:1183
+#: ../camel/camel-cipher-context.c:1173
 msgid "Decrypting message"
 msgstr "àààààà ààààààààà ààààààà"
 
@@ -1701,23 +1781,12 @@ msgstr "àààààà ààààààààà ààààààà"
 msgid "Unable to create cache path"
 msgstr "àààààà ààà ààààààà àààà àààààà"
 
-#: ../camel/camel-data-cache.c:499
+#: ../camel/camel-data-cache.c:507
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "àààààà ààààààà àààà àààà ààààà: %s: %s"
 
-#: ../camel/camel-data-wrapper.c:147
-#, c-format
-#| msgid "No such message available."
-msgid "No stream available"
-msgstr "àààà ààààààà àààààà ààà"
-
-#: ../camel/camel-db.c:455
-#, c-format
-msgid "Insufficient memory"
-msgstr "ààààààààà ààààà"
-
-#: ../camel/camel-disco-diary.c:195
+#: ../camel/camel-disco-diary.c:201
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1728,8 +1797,8 @@ msgstr ""
 "àààààààààà àààààà ààààà àààà ààà àà ààààààààà ààà \n"
 "àààààààà àààà àààààà ààà ààà ààà"
 
-#: ../camel/camel-disco-diary.c:260
-#: ../camel/providers/imap/camel-imap-journal.c:300
+#: ../camel/camel-disco-diary.c:266
+#: ../camel/providers/imap/camel-imap-journal.c:309
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1740,130 +1809,184 @@ msgstr ""
 "%s\n"
 "àà àààààààà ààà àààààààà àààààà àààààà ààà ààà ààà"
 
-#: ../camel/camel-disco-diary.c:304
+#: ../camel/camel-disco-diary.c:310
 msgid "Resynchronizing with server"
 msgstr "ààààààààà àààà àààààà ààà ààà"
 
-#: ../camel/camel-disco-folder.c:67 ../camel/camel-offline-folder.c:83
+#: ../camel/camel-disco-folder.c:76 ../camel/camel-offline-folder.c:93
 msgid "Downloading new messages for offline mode"
 msgstr "àà-àààà ààààààà ààààààààà àààà àààà àààààà ààààààà ààà ààààà"
 
-#: ../camel/camel-disco-folder.c:402
+#: ../camel/camel-disco-folder.c:416
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "àà-àààà ààààààààà àààà '%s' ààààààà àààààààà ààà ààààà"
 
-#: ../camel/camel-disco-folder.c:468 ../camel/camel-offline-folder.c:316
-msgid "Copy folder content locally for offline operation"
-msgstr "àà-àààà àààààà àààà ààààààààà ààààààààà ààààààààààà ààà àààà"
-
-#: ../camel/camel-disco-store.c:420
-#: ../camel/providers/groupwise/camel-groupwise-store.c:232
-#: ../camel/providers/imap/camel-imap-store.c:1250
-#: ../camel/providers/imap/camel-imap-store.c:1771
-#: ../camel/providers/imap/camel-imap-store.c:2244
-#: ../camel/providers/imap/camel-imap-store.c:3094
-#: ../camel/providers/imapx/camel-imapx-folder.c:298
-#: ../camel/providers/imapx/camel-imapx-folder.c:331
-#: ../camel/providers/imapx/camel-imapx-folder.c:385
-#: ../camel/providers/imapx/camel-imapx-folder.c:431
-#: ../camel/providers/imapx/camel-imapx-folder.c:465
-#: ../camel/providers/imapx/camel-imapx-folder.c:505
-#: ../camel/providers/imapx/camel-imapx-folder.c:541
-#: ../camel/providers/imapx/camel-imapx-store.c:277
-#: ../camel/providers/imapx/camel-imapx-store.c:1299
-#: ../camel/providers/imapx/camel-imapx-store.c:1387
-#: ../camel/providers/imapx/camel-imapx-store.c:1422
+#: ../camel/camel-disco-folder.c:482 ../camel/camel-offline-folder.c:327
+#| msgid "Copy folder content locally for offline operation"
+msgid "Copy folder content locally for _offline operation"
+msgstr "àà-àààà àààààà àààà ààààààààà ààààààààà ààààààààààà ààà àààà (_o)"
+
+#: ../camel/camel-disco-store.c:456
+#: ../camel/providers/imap/camel-imap-store.c:1239
+#: ../camel/providers/imap/camel-imap-store.c:2028
+#: ../camel/providers/imap/camel-imap-store.c:2523
+#: ../camel/providers/imap/camel-imap-store.c:3282
+#: ../camel/providers/imapx/camel-imapx-folder.c:407
+#: ../camel/providers/imapx/camel-imapx-folder.c:440
+#: ../camel/providers/imapx/camel-imapx-folder.c:474
+#: ../camel/providers/imapx/camel-imapx-folder.c:530
+#: ../camel/providers/imapx/camel-imapx-folder.c:587
+#: ../camel/providers/imapx/camel-imapx-folder.c:621
+#: ../camel/providers/imapx/camel-imapx-folder.c:661
+#: ../camel/providers/imapx/camel-imapx-folder.c:697
+#: ../camel/providers/imapx/camel-imapx-store.c:276
+#: ../camel/providers/imapx/camel-imapx-store.c:1367
+#: ../camel/providers/imapx/camel-imapx-store.c:1455
+#: ../camel/providers/imapx/camel-imapx-store.c:1501
+#: ../camel/providers/pop3/camel-pop3-folder.c:525
+#: ../camel/providers/pop3/camel-pop3-folder.c:655
+#: ../camel/providers/pop3/camel-pop3-folder.c:838
+#: ../camel/providers/pop3/camel-pop3-folder.c:1036
+#: ../camel/providers/pop3/camel-pop3-store.c:393
+#: ../camel/providers/pop3/camel-pop3-store.c:805
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "àà àààà àààààà àààà àààà àà-àààà ààààààà àààà àààààà"
 
-#: ../camel/camel-file-utils.c:719
+#: ../camel/camel-file-utils.c:732
 #, c-format
 msgid "Canceled"
 msgstr "ààààà ààà ààààà"
 
-#: ../camel/camel-filter-driver.c:839 ../camel/camel-filter-search.c:582
+#: ../camel/camel-filter-driver.c:895 ../camel/camel-filter-search.c:762
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "àààààà àààààà '%s' ààààààà àààà àààààà: %s"
 
-#: ../camel/camel-filter-driver.c:886
+#: ../camel/camel-filter-driver.c:943
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "%s àààà àààà àààààà ààààà ààààààà ààààà: %s"
 
-#: ../camel/camel-filter-driver.c:1073 ../camel/camel-filter-driver.c:1082
+#: ../camel/camel-filter-driver.c:1139 ../camel/camel-filter-driver.c:1146
 msgid "Syncing folders"
 msgstr "ààààààà àààààà ààà ààààà"
 
-#: ../camel/camel-filter-driver.c:1170 ../camel/camel-filter-driver.c:1620
+#: ../camel/camel-filter-driver.c:1240 ../camel/camel-filter-driver.c:1695
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "ààààààà ààààà àààà àààààà: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1181 ../camel/camel-filter-driver.c:1631
+#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1706
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "ààààààà ààààààà àààà àààààà: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1278
+#: ../camel/camel-filter-driver.c:1347
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "ààààà ààààààà ààààà àààààà"
 
-#: ../camel/camel-filter-driver.c:1289
+#: ../camel/camel-filter-driver.c:1359
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "ààààà ààààààà àààààààààààà àààààà"
 
-#: ../camel/camel-filter-driver.c:1307
+#: ../camel/camel-filter-driver.c:1377
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d àààààà ààààààà àààà àààààà (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1314 ../camel/camel-filter-driver.c:1336
+#: ../camel/camel-filter-driver.c:1384 ../camel/camel-filter-driver.c:1406
 #, c-format
 msgid "Failed on message %d"
 msgstr "àààààà %d'à àààààààà"
 
-#: ../camel/camel-filter-driver.c:1351 ../camel/camel-filter-driver.c:1456
+#: ../camel/camel-filter-driver.c:1421 ../camel/camel-filter-driver.c:1527
 msgid "Syncing folder"
 msgstr "ààààààà àààààà ààà ààààà"
 
-#: ../camel/camel-filter-driver.c:1356 ../camel/camel-filter-driver.c:1462
+#: ../camel/camel-filter-driver.c:1426 ../camel/camel-filter-driver.c:1533
 msgid "Complete"
 msgstr "àààààà"
 
-#: ../camel/camel-filter-driver.c:1420
+#: ../camel/camel-filter-driver.c:1485
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "àààààà %d ààààààà ààà ààààà, ààààààà %d"
 
-#: ../camel/camel-filter-driver.c:1438
+#: ../camel/camel-filter-driver.c:1503
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d àààààà àààààà, ààààààà %d"
 
-#: ../camel/camel-filter-search.c:135
+#: ../camel/camel-filter-search.c:138
 msgid "Failed to retrieve message"
 msgstr "àààààà àààà àààà àààààà"
 
-#: ../camel/camel-filter-search.c:401
+#: ../camel/camel-filter-search.c:512
 msgid "Invalid arguments to (system-flag)"
 msgstr "àààà àààààààààà ààààààà ààààà (system-flag)"
 
-#: ../camel/camel-filter-search.c:416
+#: ../camel/camel-filter-search.c:530
 msgid "Invalid arguments to (user-tag)"
 msgstr "àààà àààààààààà ààààààà ààààà (user-tag)"
 
-#: ../camel/camel-filter-search.c:744 ../camel/camel-filter-search.c:753
+#: ../camel/camel-filter-search.c:939 ../camel/camel-filter-search.c:948
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "ààààààà àààààà ààààààààà àààà àààààà: %s: %s"
 
-#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
-#: ../camel/camel-folder-search.c:627
+#: ../camel/camel-folder.c:262
+#, c-format
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "'%s'-à ààààà àààà àààààààà àààààà àààààà ààà ààààà"
+msgstr[1] "'%s'-à ààààà àààà àààààààà àààààà àààààà ààà ààààà"
+
+#: ../camel/camel-folder.c:302
+#, c-format
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "'%s'-à ààààà àààà ààààà àààààà àààààà ààà ààààà"
+msgstr[1] "'%s'-à ààààà àààà ààààà àààààà àààààà ààà ààààà"
+
+#: ../camel/camel-folder.c:350
+#, c-format
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "'%s'-à ààààà àààà àààààà ààààààà ààà ààààà"
+msgstr[1] "'%s'-à ààààà àààà àààààà ààààààà ààà ààààà"
+
+#: ../camel/camel-folder.c:918
+#: ../camel/providers/local/camel-maildir-folder.c:322
+msgid "Moving messages"
+msgstr "àààààà ààààààààààà ààà ààààà"
+
+#: ../camel/camel-folder.c:921
+msgid "Copying messages"
+msgstr "àààààà ààà ààà ààààà"
+
+#: ../camel/camel-folder.c:1233
+#, c-format
+msgid "Quota information not supported for folder '%s'"
+msgstr ""
+
+#: ../camel/camel-folder.c:3549
+#, fuzzy, c-format
+#| msgid "Retrieving message '%s'"
+msgid "Retrieving message '%s' in %s"
+msgstr "àààààà '%s' àààààà ààà ààààà"
+
+#: ../camel/camel-folder.c:3698
+#, fuzzy, 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
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1872,8 +1995,8 @@ msgstr ""
 "ààààààààààà àààà àààààààààà ààààà àààà àààààà: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:468
-#: ../camel/camel-folder-search.c:639
+#: ../camel/camel-folder-search.c:377 ../camel/camel-folder-search.c:491
+#: ../camel/camel-folder-search.c:676
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1882,83 +2005,48 @@ msgstr ""
 "ààààààààààà àààààààààà ààààààà àààà àààààà: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:843 ../camel/camel-folder-search.c:885
+#. 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
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s)-à àààààààà àààà ààààààà ààààà àààààà"
 
-#: ../camel/camel-folder-search.c:938
+#. Translators: Each '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:994
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s), %s-à ààààà ààààààà ààà àààà àà"
 
-#: ../camel/camel-folder-search.c:944 ../camel/camel-folder-search.c:951
+#. 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
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) àààà ààà àààààààà àààààà àààààà"
 
-#: ../camel/camel-folder-search.c:978
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:1037
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s)-à àààà àààààà ààààà àààààààààà"
 
-#: ../camel/camel-folder-search.c:987
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:1047
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) ààààààà ààààà àààààà"
 
-#: ../camel/camel-folder.c:220
-#, 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:244
-#, 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:270
-#, 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:881
-#: ../camel/providers/local/camel-maildir-folder.c:293
-msgid "Moving messages"
-msgstr "àààààà ààààààààààà ààà ààààà"
-
-#: ../camel/camel-folder.c:884
-msgid "Copying messages"
-msgstr "àààààà ààà ààà ààààà"
-
-#: ../camel/camel-folder.c:3253
-#, c-format
-#| msgid "Retrieving POP message %d"
-msgid "Retrieving message '%s'"
-msgstr "àààààà '%s' àààààà ààà ààààà"
-
-#: ../camel/camel-gpg-context.c:646 ../camel/camel-gpg-context.c:651
-#: ../camel/camel-gpg-context.c:1276
+#: ../camel/camel-gpg-context.c:663 ../camel/camel-gpg-context.c:668
+#: ../camel/camel-gpg-context.c:1327
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg ààààààà àààà àààààà: %s"
 
-#: ../camel/camel-gpg-context.c:651
-#: ../camel/providers/smtp/camel-smtp-transport.c:723
-#: ../camel/providers/smtp/camel-smtp-transport.c:778
+#: ../camel/camel-gpg-context.c:668
+#: ../camel/providers/smtp/camel-smtp-transport.c:849
 msgid "Unknown"
 msgstr "ààààà"
 
-#: ../camel/camel-gpg-context.c:715
+#: ../camel/camel-gpg-context.c:733
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1969,17 +2057,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:732
+#: ../camel/camel-gpg-context.c:769
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg userid'à ààààà ààààà àààà ààààààà"
 
-#: ../camel/camel-gpg-context.c:757 ../camel/camel-gpg-context.c:772
+#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:809
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "gpg passphrase'à àààààà ààààà àààà àààààà"
 
-#: ../camel/camel-gpg-context.c:793
+#: ../camel/camel-gpg-context.c:830
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1988,7 +2076,7 @@ msgstr ""
 "ààààà ààààààà-ààààà àà-àà àààà àààà àààà PIN\n"
 "àààààà: \"%s\""
 
-#: ../camel/camel-gpg-context.c:797
+#: ../camel/camel-gpg-context.c:834
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1997,109 +2085,88 @@ msgstr ""
 "ààààààà àààààààààààà àà àà-àà àààà àààà àààààààà\n"
 "àààààà ààà àààààà: \"%s\""
 
-#: ../camel/camel-gpg-context.c:803
+#: ../camel/camel-gpg-context.c:840
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "'%s'-à àààà GnuPG àààà ààààààààààà àààààà"
 
-#: ../camel/camel-gpg-context.c:832 ../camel/camel-net-utils.c:515
-#: ../camel/camel-tcp-stream-raw.c:255
-#: ../camel/providers/imapx/camel-imapx-server.c:4912
-#: ../camel/providers/imapx/camel-imapx-server.c:4929
-#: ../camel/providers/imapx/camel-imapx-store.c:199
-#: ../camel/providers/nntp/camel-nntp-summary.c:402
-#: ../camel/providers/pop3/camel-pop3-folder.c:364
-#: ../camel/providers/pop3/camel-pop3-folder.c:429
-#: ../camel/providers/pop3/camel-pop3-folder.c:504
-#: ../camel/providers/pop3/camel-pop3-store.c:487
-#: ../libedataserverui/e-book-auth-util.c:229
-#, c-format
-#| msgid "Canceled"
+#: ../camel/camel-gpg-context.c:850
+msgid ""
+"Note the encrypted content doesn't contain information about a recipient, "
+"thus there will be a password prompt for each of stored private key."
+msgstr ""
+
+#: ../camel/camel-gpg-context.c:879 ../camel/camel-net-utils.c:523
+#: ../camel/camel-tcp-stream-raw.c:268
+#: ../camel/providers/nntp/camel-nntp-summary.c:382
+#: ../libedataserver/e-client.c:139 ../libedataserverui/e-book-auth-util.c:227
+#, c-format
 msgid "Cancelled"
 msgstr "ààààà ààà ààààà"
 
-#: ../camel/camel-gpg-context.c:850
+#: ../camel/camel-gpg-context.c:900
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "àààà-àà àà-àà àààà àààààà: à-ààà ààà ààààààààà àààà àààààà"
 
-#: ../camel/camel-gpg-context.c:862
+#: ../camel/camel-gpg-context.c:913
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG àààà ààààààààààà ààààààààààà: %s"
 
-#: ../camel/camel-gpg-context.c:993
+#: ../camel/camel-gpg-context.c:1044
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "ààààààààà àààà àààààà: ààà àààààà àààààà ààà ààààà"
 
-#: ../camel/camel-gpg-context.c:1539 ../camel/camel-smime-context.c:824
-#| msgid "Could not generate signing data: %s"
+#: ../camel/camel-gpg-context.c:1591 ../camel/camel-smime-context.c:831
 msgid "Could not generate signing data: "
 msgstr "àààààààà àààà ààààààà àààà ààààààà àààà àààààà: "
 
-#: ../camel/camel-gpg-context.c:1586 ../camel/camel-gpg-context.c:1786
-#: ../camel/camel-gpg-context.c:1896 ../camel/camel-gpg-context.c:2042
-#: ../camel/camel-gpg-context.c:2141 ../camel/camel-gpg-context.c:2189
+#: ../camel/camel-gpg-context.c:1640 ../camel/camel-gpg-context.c:1844
+#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:2101
+#: ../camel/camel-gpg-context.c:2201 ../camel/camel-gpg-context.c:2249
 msgid "Failed to execute gpg."
 msgstr "gpg ààààààà àààà ààààààà"
 
-#: ../camel/camel-gpg-context.c:1666 ../camel/camel-gpg-context.c:1674
-#: ../camel/camel-gpg-context.c:1682 ../camel/camel-gpg-context.c:1701
-#: ../camel/camel-smime-context.c:948 ../camel/camel-smime-context.c:962
-#: ../camel/camel-smime-context.c:971
+#: ../camel/camel-gpg-context.c:1719 ../camel/camel-gpg-context.c:1727
+#: ../camel/camel-gpg-context.c:1735 ../camel/camel-gpg-context.c:1755
+#: ../camel/camel-smime-context.c:957 ../camel/camel-smime-context.c:971
+#: ../camel/camel-smime-context.c:980
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "ààààààà àààààààà ààààààà àààà àààààà: ààààààà ààààààà àààà àà"
 
-#: ../camel/camel-gpg-context.c:1741
-#| msgid "Cannot verify message signature: Incorrect message format"
+#: ../camel/camel-gpg-context.c:1797
 msgid "Cannot verify message signature: "
 msgstr "ààààààà àààààààà ààààààà àààà àààààà: "
 
-#: ../camel/camel-gpg-context.c:1862
-#| msgid "Could not generate encrypting data: %s"
+#: ../camel/camel-gpg-context.c:1920
 msgid "Could not generate encrypting data: "
 msgstr "ààààààààà àààà ààààààà àààà ààààààà àààà àààààà: "
 
-#: ../camel/camel-gpg-context.c:1915
+#: ../camel/camel-gpg-context.c:1973
 msgid "This is a digitally encrypted message part"
 msgstr "ààà ààààààà àààà ààààààààà ààà ààààààà ààà"
 
-#: ../camel/camel-gpg-context.c:1973 ../camel/camel-gpg-context.c:1982
-#: ../camel/camel-gpg-context.c:2005
+#: ../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:1993
+#: ../camel/camel-gpg-context.c:2051
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME'à ààà ààààààààà àààà àààààà: àààààààà àààà àààààà"
 
-#: ../camel/camel-gpg-context.c:2082 ../camel/camel-smime-context.c:1255
+#: ../camel/camel-gpg-context.c:2142 ../camel/camel-smime-context.c:1268
 msgid "Encrypted content"
 msgstr "ààààààààà ààà ààààààààà"
 
-#: ../camel/camel-lock-client.c:106
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "àààà ààààààà àààà ààààààà àààà àààààà: %s"
-
-#: ../camel/camel-lock-client.c:130
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "àààà ààààààà fork àààà àààààà: %s"
-
-#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "'%s' àà àààà àààààà: lock-helper'à àààààààà àààààààà àààà àààààà"
-
-#: ../camel/camel-lock-client.c:227
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "'%s' àà àààà àààààà"
+#: ../camel/camel-http-stream.c:545 ../camel/camel-stream-null.c:78
+msgid "Only reset to beginning is supported with CamelHttpStream"
+msgstr ""
 
 #: ../camel/camel-lock.c:102
 #, c-format
@@ -2108,10 +2175,10 @@ 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-à ààà àà àààà ààààààà àààà ààààààà àààààààà àààààà àààààààà ààà àààààà àààààà "
+"%s-à ààà àà àààà ààààààà àààà ààààààà àààààààà àààààà àààààààà ààà àààààà "
+"àààààà "
 "ààààà"
 
 #: ../camel/camel-lock.c:205
@@ -2124,6 +2191,26 @@ msgstr "fcntl(2)'à àààààààà àà àààà àààà
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2)'à àààààààà àà àààà àààààà: %s"
 
+#: ../camel/camel-lock-client.c:106
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "àààà ààààààà àààà ààààààà àààà àààààà: %s"
+
+#: ../camel/camel-lock-client.c:130
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "àààà ààààààà fork àààà àààààà: %s"
+
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "'%s' àà àààà àààààà: lock-helper'à àààààààà àààààààà àààà àààààà"
+
+#: ../camel/camel-lock-client.c:227
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "'%s' àà àààà àààààà"
+
 #: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -2173,61 +2260,64 @@ msgstr "àààà àààà àààà àààààà: %s"
 msgid "Error writing mail temp file: %s"
 msgstr "ààààààà àààà àààà ààààà àààààà: %s"
 
-#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
+#: ../camel/camel-movemail.c:491 ../camel/camel-movemail.c:560
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "ààààààà àààà àààà ààà àààà àààààà: %s"
 
-#: ../camel/camel-multipart-signed.c:322
+#: ../camel/camel-multipart-signed.c:297
 #, c-format
-#| msgid "No description available"
 msgid "No content available"
 msgstr "àààà àààà àààààà ààà"
 
-#: ../camel/camel-multipart-signed.c:330
+#: ../camel/camel-multipart-signed.c:305
 #, c-format
-#| msgid "No description available"
 msgid "No signature available"
 msgstr "àààà àààààààà àààààà ààà"
 
-#: ../camel/camel-multipart-signed.c:658
+#: ../camel/camel-multipart-signed.c:689
 #, c-format
 msgid "parse error"
 msgstr "ààààà àààà àààààà"
 
-#: ../camel/camel-net-utils.c:695
+#: ../camel/camel-net-utils.c:703
 #, c-format
 msgid "Resolving: %s"
 msgstr "ààààààà ààà ààààà: %s"
 
-#: ../camel/camel-net-utils.c:718
+#: ../camel/camel-net-utils.c:726
 msgid "Host lookup failed"
 msgstr "ààààà ààààààààà àààààà"
 
-#: ../camel/camel-net-utils.c:724
+#: ../camel/camel-net-utils.c:732
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "ààààà ààààààààà àààààà: %s: %s"
 
-#: ../camel/camel-net-utils.c:845
+#: ../camel/camel-net-utils.c:853
 msgid "Resolving address"
 msgstr "àààààà ààààààà ààà ààààà"
 
-#: ../camel/camel-net-utils.c:866
+#: ../camel/camel-net-utils.c:874
 msgid "Name lookup failed"
 msgstr "ààà ààààààààà àààà àààààà"
 
-#: ../camel/camel-net-utils.c:872
+#: ../camel/camel-net-utils.c:880
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "ààà ààààààààà àààà àààààà: %s"
 
-#: ../camel/camel-offline-folder.c:193
+#: ../camel/camel-network-service.c:112
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "%s-à àààà ààààà àààà àààààà: "
+
+#: ../camel/camel-offline-folder.c:206
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "'%s' ààààààààà àààààà ààààààà ààààà àààààà ààà ààààà"
 
-#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:174
+#: ../camel/camel-offline-journal.c:145 ../camel/camel-offline-journal.c:177
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "'%s' ààààààààà àààà àà-àààà ààààààà ààààà àààààà: %s"
@@ -2240,22 +2330,22 @@ msgstr "ààààààààà ààààààààà à-àààà
 msgid "For reading mail as a query of another set of folders"
 msgstr "àààà àààà ààààààà ààààà àààà àààààà àààà àààà àààà àààà ààààààà"
 
-#: ../camel/camel-provider.c:188
+#: ../camel/camel-provider.c:193
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "%s ààà àààà àààààà: ààààààà àààààààà ààààà ààà ààà ààààà ààà"
 
-#: ../camel/camel-provider.c:197
+#: ../camel/camel-provider.c:202
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s ààà àààà àààààà: %s"
 
-#: ../camel/camel-provider.c:206
+#: ../camel/camel-provider.c:211
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s ààà àààà àààààà: ààààààà ààààà àààààààààà ààà ààààààà àààà"
 
-#: ../camel/camel-provider.c:388 ../camel/camel-session.c:206
+#: ../camel/camel-provider.c:402 ../camel/camel-session.c:388
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "'%s' àààààààààà àààà àààà àààààààààà ààààààà ààà"
@@ -2266,7 +2356,8 @@ msgstr "Anonymous"
 
 #: ../camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
-msgstr "àà àààààààà àààààà anonymous àà-àà àààààà ààààààààà àààà ààààà ààà ààààà"
+msgstr ""
+"àà àààààààà àààààà anonymous àà-àà àààààà ààààààààà àààà ààààà ààà ààààà"
 
 #: ../camel/camel-sasl-anonymous.c:70
 #, c-format
@@ -2300,11 +2391,11 @@ msgstr ""
 "àààà trace àààà:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:45
+#: ../camel/camel-sasl-cram-md5.c:46
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:47
+#: ../camel/camel-sasl-cram-md5.c:48
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -2312,75 +2403,82 @@ msgstr ""
 "àà àààààààà ààà ààààààààà àààààà ààààààà ààà àààààà CRAM-MD5 ààààààààà àààààà "
 "ààààààààà àààà ààààà ààà ààààà"
 
-#: ../camel/camel-sasl-digest-md5.c:58
+#: ../camel/camel-sasl-digest-md5.c:59
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:60
+#: ../camel/camel-sasl-digest-md5.c:61
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
-"àà àààààààà ààà ààààààààà àààààà ààààààà ààà àààààà DIGEST-MD5 ààààààààà àààààà "
+"àà àààààààà ààà ààààààààà àààààà ààààààà ààà àààààà DIGEST-MD5 ààààààààà "
+"àààààà "
 "ààààààààà àààà ààààà ààà ààààà"
 
-#: ../camel/camel-sasl-digest-md5.c:821
+#: ../camel/camel-sasl-digest-md5.c:850
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "ààààààààà ààààààààà ààààà ààààà (>àààà ààààà)"
 
-#: ../camel/camel-sasl-digest-md5.c:832
+#: ../camel/camel-sasl-digest-md5.c:861
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "ààààààààà ààààààààà ààà àà\n"
 
-#: ../camel/camel-sasl-digest-md5.c:840
+#: ../camel/camel-sasl-digest-md5.c:869
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "ààààààààà ààààà àààà \"Quality of Protection\" ààààà ààààààà ààààà"
 
-#: ../camel/camel-sasl-digest-md5.c:875
+#: ../camel/camel-sasl-digest-md5.c:902
 #, c-format
 msgid "Server response did not contain authorization data"
-msgstr "ààààààà àààà ààààààà ààààààààààààà ààààà ààààà àààààà ààààààààà àààà ààààààààà"
+msgstr ""
+"ààààààà àààà ààààààà ààààààààààààà ààààà ààààà àààààà ààààààààà àààà ààààààààà"
 
-#: ../camel/camel-sasl-digest-md5.c:896
+#: ../camel/camel-sasl-digest-md5.c:923
 #, c-format
 msgid "Server response contained incomplete authorization data"
-msgstr "ààààààà àààà ààààààà ààààààààààààà ààààà ààààà àààààà ààààààààà àààà ààààààààà"
+msgstr ""
+"ààààààà àààà ààààààà ààààààààààààà ààààà ààààà àààààà ààààààààà àààà ààààààààà"
 
-#: ../camel/camel-sasl-digest-md5.c:909
+#: ../camel/camel-sasl-digest-md5.c:936
 #, c-format
 msgid "Server response does not match"
 msgstr "ààààààààà àààààààààààà ààààà"
 
-#: ../camel/camel-sasl-gssapi.c:85
+#: ../camel/camel-sasl-gssapi.c:91
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:87
+#: ../camel/camel-sasl-gssapi.c:93
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr ""
-"àà àààààààà ààà Kerberos 5 ààààààààààà àààààààà àààààà ààààààààà àààà ààààà àààà "
+"àà àààààààà ààà Kerberos 5 ààààààààààà àààààààà àààààà ààààààààà àààà ààààà "
+"àààà "
 "àààà"
 
-#: ../camel/camel-sasl-gssapi.c:128
+#: ../camel/camel-sasl-gssapi.c:134
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
-msgstr "àààààà ààààà àààààà àààààààà àààààààà ààààààà àà àààà àààààààààà ààààààààà àààààààà"
+msgstr ""
+"àààààà ààààà àààààà àààààààà àààààààà ààààààà àà àààà àààààààààà ààààààààà "
+"àààààààà"
 
-#: ../camel/camel-sasl-gssapi.c:133
+#: ../camel/camel-sasl-gssapi.c:139
 msgid "The provided target_name parameter was ill-formed."
 msgstr "àààààààà target_name ààààààà àààààààà àààà àà"
 
-#: ../camel/camel-sasl-gssapi.c:136
+#: ../camel/camel-sasl-gssapi.c:142
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
-msgstr "àààààààà target_name àààààààà ààààà àààà àààà àààààààà ààààà ààà àààààààà"
+msgstr ""
+"àààààààà target_name àààààààà ààààà àààà àààà àààààààà ààààà ààà àààààààà"
 
-#: ../camel/camel-sasl-gssapi.c:140
+#: ../camel/camel-sasl-gssapi.c:146
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -2388,66 +2486,68 @@ msgstr ""
 "input_token'à ààààà input_chan_bindings àààààààà ààààààà àààààààà ààààààà "
 "àààààààà àààà àààà ààà àààààààà ààà"
 
-#: ../camel/camel-sasl-gssapi.c:145
+#: ../camel/camel-sasl-gssapi.c:151
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
-msgstr "input_token'à ààààà àààà àààààààà àààà àààààààà ààààààà ààà ààààà ààààà"
+msgstr ""
+"input_token'à ààààà àààà àààààààà àààà àààààààà ààààààà ààà ààààà ààààà"
 
-#: ../camel/camel-sasl-gssapi.c:149
+#: ../camel/camel-sasl-gssapi.c:155
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
 msgstr ""
-"ààààààà àààààààààà àààà àààààààà ààààààà ààà àà, àààà àààààààà ààààààààà àààààà àààà "
+"ààààààà àààààààààà àààà àààààààà ààààààà ààà àà, àààà àààààààà ààààààààà "
+"àààààà àààà "
 "ààààà ààààààà ààà àààààà"
 
-#: ../camel/camel-sasl-gssapi.c:154
+#: ../camel/camel-sasl-gssapi.c:160
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "àààààààà àààààààà ààààààààà àààààà ààà àààààààà ààààààà ààà ààààà"
 
-#: ../camel/camel-sasl-gssapi.c:157
+#: ../camel/camel-sasl-gssapi.c:163
 msgid "The consistency checks performed on the input_token failed."
 msgstr "input_token-à ààààààà ààààà àààà ààààààààà ààààààààààà àààà àààààà"
 
-#: ../camel/camel-sasl-gssapi.c:160
+#: ../camel/camel-sasl-gssapi.c:166
 msgid "The consistency checks performed on the credential failed."
 msgstr "àààààààà ààààààà ààààà àààà ààààààààà ààààààààààà àààà àààààà"
 
-#: ../camel/camel-sasl-gssapi.c:163
+#: ../camel/camel-sasl-gssapi.c:169
 msgid "The referenced credentials have expired."
 msgstr "ààààààààà àààààààààààà ààààà àààààààà àààààà"
 
-#: ../camel/camel-sasl-gssapi.c:169 ../camel/camel-sasl-gssapi.c:309
-#: ../camel/camel-sasl-gssapi.c:353 ../camel/camel-sasl-gssapi.c:370
-#: ../camel/providers/smtp/camel-smtp-transport.c:1256
+#: ../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
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "ààààààà àààà ààààààà ààààààààà ààààààààààà àààà ààà"
 
-#: ../camel/camel-sasl-gssapi.c:382
+#: ../camel/camel-sasl-gssapi.c:410
 #, c-format
 msgid "Unsupported security layer."
 msgstr "àààààààà àààààààààà ààààà"
 
-#: ../camel/camel-sasl-login.c:39
+#: ../camel/camel-sasl-login.c:40
 msgid "Login"
 msgstr "àà-àà"
 
-#: ../camel/camel-sasl-login.c:41 ../camel/camel-sasl-plain.c:45
+#: ../camel/camel-sasl-login.c:42 ../camel/camel-sasl-plain.c:46
 msgid "This option will connect to the server using a simple password."
 msgstr "àà àààààààà ààà àààà àààààà ààààààààà àààààà ààààà ààà àààà"
 
-#: ../camel/camel-sasl-login.c:95
+#: ../camel/camel-sasl-login.c:107
 #, c-format
 msgid "Unknown authentication state."
 msgstr "ààààààààà àààààà àààààà"
 
-#: ../camel/camel-sasl-ntlm.c:41
+#: ../camel/camel-sasl-ntlm.c:47
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:43
+#: ../camel/camel-sasl-ntlm.c:49
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -2455,7 +2555,7 @@ msgstr ""
 "àà àààààààà ààà NTLM / àààààà ààààààààà ààààààà (SPA) àààààà àààà Windows-"
 "ààààààà ààààààààà àààà ààààà ààà àààà"
 
-#: ../camel/camel-sasl-plain.c:43
+#: ../camel/camel-sasl-plain.c:44
 msgid "PLAIN"
 msgstr "PLAIN"
 
@@ -2467,20 +2567,21 @@ msgstr "SMTP'à àààààà POP"
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "àà àààààààà ààà SMTP ààààààà àààààà àààà POP ààààà ààààààà ààà ààà"
 
-#: ../camel/camel-sasl-popb4smtp.c:83
-msgid "POP Source URI"
+#: ../camel/camel-sasl-popb4smtp.c:84
+#, fuzzy
+#| msgid "POP Source URI"
+msgid "POP Source UID"
 msgstr "POP Source URI"
 
-#: ../camel/camel-sasl-popb4smtp.c:90
+#: ../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 "ààààà àààààà àààààà SMTP ààààààààà àààààà POP ààààààà"
 
-#: ../camel/camel-sasl-popb4smtp.c:98
-#, c-format
-#| msgid "POP Before SMTP auth using a non-pop source"
-msgid "POP Before SMTP authentication using a non-POP source"
+#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:118
+#, fuzzy, c-format
+#| msgid "POP Before SMTP authentication using a non-POP source"
+msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "ààààà POP àààààà ààà àààààà SMTP ààààààààà àààààà POP ààààààà"
 
 #: ../camel/camel-search-private.c:112
@@ -2488,382 +2589,425 @@ msgstr "ààààà POP àààààà ààà àààààà SMTP
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "ààààààà àààààààààà ààààààà àààà àààà: %s: %s"
 
-#: ../camel/camel-service.c:89
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr "URL '%s'-à àààà àààààààààààà ààà (username) àààààà ààà àààààà"
-
-#: ../camel/camel-service.c:93
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr "URL '%s'-à àààà ààààà (host) àààààà ààà àààààà"
+#: ../camel/camel-session.c:397
+#, fuzzy, c-format
+#| msgid "No provider available for protocol '%s'"
+msgid "Invalid GType registered for protocol '%s'"
+msgstr "'%s' àààààààààà àààà àààà àààààààààà ààààààà ààà"
 
-#: ../camel/camel-service.c:97
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr "URL '%s'-à àààà ààà (path) àààààà ààà àààààà"
+#: ../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
+#, fuzzy, c-format
+#| msgid "No support for authentication type %s"
+msgid "No support for %s authentication"
+msgstr "ààààààà àààààààà %s ààààààà àà"
 
-#: ../camel/camel-session.c:260
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"%s ààààààààà ààààààà àààà àààààà:\n"
-"%s"
+#: ../camel/camel-session.c:481
+#, fuzzy, c-format
+#| msgid "Authentication failed"
+msgid "%s authentication failed"
+msgstr "ààààààà àààà àààà"
 
-#: ../camel/camel-session.c:757
+#: ../camel/camel-session.c:1187
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "ààààààà ààà %s'à àààà %s ààààààà ààà %s ààààààààà àààààà"
 
-#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1048
+#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1057
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "'%s'-à ààààààààààà ààààààààà àààà àààààà"
 
-#: ../camel/camel-smime-context.c:376
+#: ../camel/camel-smime-context.c:379
 msgid "Cannot create CMS message"
 msgstr "CMS àààààà ààààààà àààà àààààà"
 
-#: ../camel/camel-smime-context.c:381
+#: ../camel/camel-smime-context.c:384
 msgid "Cannot create CMS signed data"
 msgstr "ààààààààà CMS àààà ààààààà àààà àààààà"
 
-#: ../camel/camel-smime-context.c:387
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS signed data"
 msgstr "àààààààààà CMS àààà ààààààà àààà àààààà"
 
-#: ../camel/camel-smime-context.c:394
+#: ../camel/camel-smime-context.c:397
 msgid "Cannot attach CMS data"
 msgstr "CMS àààà ààààààà àààà àààààà"
 
-#: ../camel/camel-smime-context.c:400
+#: ../camel/camel-smime-context.c:403
 msgid "Cannot create CMS Signer information"
 msgstr "CMS'à àààààààààààà àààà ààààààà àààà àààààà"
 
-#: ../camel/camel-smime-context.c:406
+#: ../camel/camel-smime-context.c:409
 msgid "Cannot find certificate chain"
 msgstr "ààààààààààà àààà ààààààààà àààà àààààà"
 
-#: ../camel/camel-smime-context.c:412
+#: ../camel/camel-smime-context.c:415
 msgid "Cannot add CMS Signing time"
 msgstr "CMS àààààààààà ààà ààà àààà àààààà"
 
-#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
+#: ../camel/camel-smime-context.c:439 ../camel/camel-smime-context.c:454
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s'-à ààààààààà ààààààààààà ààààààààà"
 
-#: ../camel/camel-smime-context.c:458
+#: ../camel/camel-smime-context.c:461
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "SMIMEEncKeyPrefs ààààààààà ààà àààà àààààà"
 
-#: ../camel/camel-smime-context.c:463
+#: ../camel/camel-smime-context.c:466
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "MS SMIMEEncKeyPrefs ààààààààà ààà àààà àààààà"
 
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:471
 msgid "Cannot add encryption certificate"
 msgstr "ààààààààà ààààààààààà ààà àààà àààààà"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:477
 msgid "Cannot add CMS Signer information"
 msgstr "CMS àààààààààààà àààà ààà àààà àààààà"
 
 #. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../camel/camel-smime-context.c:507
+#: ../camel/camel-smime-context.c:510
 msgid "Unverified"
 msgstr "ààààààààà"
 
-#: ../camel/camel-smime-context.c:509
+#: ../camel/camel-smime-context.c:512
 msgid "Good signature"
 msgstr "àààà àààààààà"
 
-#: ../camel/camel-smime-context.c:511
+#: ../camel/camel-smime-context.c:514
 msgid "Bad signature"
 msgstr "ààà àààààààà"
 
-#: ../camel/camel-smime-context.c:513
+#: ../camel/camel-smime-context.c:516
 msgid "Content tampered with or altered in transit"
 msgstr "ààààààààà àààààààààà àààà ààààààà ààà ààààà àààà ààààààààà ààààà"
 
-#: ../camel/camel-smime-context.c:515
+#: ../camel/camel-smime-context.c:518
 msgid "Signing certificate not found"
 msgstr "àààààààààààà ààààààààààà ààààà ààààà"
 
-#: ../camel/camel-smime-context.c:517
+#: ../camel/camel-smime-context.c:520
 msgid "Signing certificate not trusted"
 msgstr "àààààààààààà ààààààààààà àààààààà àà"
 
-#: ../camel/camel-smime-context.c:519
+#: ../camel/camel-smime-context.c:522
 msgid "Signature algorithm unknown"
 msgstr "àààààààààààà ààààààààààà àààààà"
 
-#: ../camel/camel-smime-context.c:521
+#: ../camel/camel-smime-context.c:524
 msgid "Signature algorithm unsupported"
 msgstr "àààààààààààà ààààààààààà ààààààà àà"
 
-#: ../camel/camel-smime-context.c:523
+#: ../camel/camel-smime-context.c:526
 msgid "Malformed signature"
 msgstr "ààà ààààà àààààààà"
 
-#: ../camel/camel-smime-context.c:525
+#: ../camel/camel-smime-context.c:528
 msgid "Processing error"
 msgstr "àààààààààààààà àààààà"
 
-#: ../camel/camel-smime-context.c:568
+#: ../camel/camel-smime-context.c:573
 msgid "No signed data in signature"
 msgstr "àààààààààà ààààà àààààààààà àààà ààààààààà"
 
-#: ../camel/camel-smime-context.c:573
+#: ../camel/camel-smime-context.c:578
 msgid "Digests missing from enveloped data"
 msgstr "ààààààà ààà àààà àààà àààààààà àààààà ààà ààààà"
 
-#: ../camel/camel-smime-context.c:586 ../camel/camel-smime-context.c:597
+#: ../camel/camel-smime-context.c:591 ../camel/camel-smime-context.c:602
 msgid "Cannot calculate digests"
 msgstr "àààààààà àààà àààà àààààà"
 
-#: ../camel/camel-smime-context.c:604 ../camel/camel-smime-context.c:608
+#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:613
 msgid "Cannot set message digests"
 msgstr "ààààààà àààààà ààààààà àààààà àààà àààààà"
 
-#: ../camel/camel-smime-context.c:618 ../camel/camel-smime-context.c:623
+#: ../camel/camel-smime-context.c:623 ../camel/camel-smime-context.c:628
 msgid "Certificate import failed"
 msgstr "ààààààààààà àààààààà àààà àààà"
 
-#: ../camel/camel-smime-context.c:633
+#: ../camel/camel-smime-context.c:638
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "ààààààà ààààà ààààààààà ààààààààààà, ààààààààààà ààààààà ààà àààà àà"
 
-#: ../camel/camel-smime-context.c:636
+#: ../camel/camel-smime-context.c:641
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
-msgstr "ààààààà ààààà ààààààààà ààààààààààà, ààààààààààà àààààààà ààà ààààààà ààà ààààà"
+msgstr ""
+"ààààààà ààààà ààààààààà ààààààààààà, ààààààààààà àààààààà ààà ààààààà ààà "
+"ààààà"
 
-#: ../camel/camel-smime-context.c:640
+#: ../camel/camel-smime-context.c:645
 msgid "Cannot find signature digests"
 msgstr "àààààààààà àààààààà ààààà ààààà"
 
-#: ../camel/camel-smime-context.c:656
+#: ../camel/camel-smime-context.c:661
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "àààààààààààà: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1121
+#: ../camel/camel-smime-context.c:842 ../camel/camel-smime-context.c:1130
 msgid "Cannot create encoder context"
 msgstr "ààààààà àààààà ààààààà àààà àààààà"
 
-#: ../camel/camel-smime-context.c:841
+#: ../camel/camel-smime-context.c:848
 msgid "Failed to add data to CMS encoder"
 msgstr "CMS ààààààà'à àààà ààà àààà àààààà"
 
-#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1138
+#: ../camel/camel-smime-context.c:853 ../camel/camel-smime-context.c:1147
 msgid "Failed to encode data"
 msgstr "àààà ààààà àààà àààààà"
 
-#: ../camel/camel-smime-context.c:987 ../camel/camel-smime-context.c:1233
+#: ../camel/camel-smime-context.c:996 ../camel/camel-smime-context.c:1243
 msgid "Decoder failed"
 msgstr "ààààààà àààààà"
 
-#: ../camel/camel-smime-context.c:1056
+#: ../camel/camel-smime-context.c:1065
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "àààààà ààààà ààààààààà ààààààààààà ààààà ààààà"
 
-#: ../camel/camel-smime-context.c:1064
+#: ../camel/camel-smime-context.c:1073
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "ààààààààà ààààà-àà'à àààà àààà àààààà ààà ààààà"
 
-#: ../camel/camel-smime-context.c:1075
+#: ../camel/camel-smime-context.c:1084
 msgid "Cannot create CMS Message"
 msgstr "CMS àààààà ààààààà àààà àààààà"
 
-#: ../camel/camel-smime-context.c:1081
+#: ../camel/camel-smime-context.c:1090
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS Enveloped àààà ààààààà àààà àààààà"
 
-#: ../camel/camel-smime-context.c:1087
+#: ../camel/camel-smime-context.c:1096
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS Enveloped àààà àààààà àààà àààààà"
 
-#: ../camel/camel-smime-context.c:1093
+#: ../camel/camel-smime-context.c:1102
 msgid "Cannot attach CMS data object"
 msgstr "CMS àààà ààààààà ààààààà àààà àààààà"
 
-#: ../camel/camel-smime-context.c:1102
+#: ../camel/camel-smime-context.c:1111
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS àààààà ààààààààà àààà ààààààà àààà àààààà"
 
-#: ../camel/camel-smime-context.c:1107
+#: ../camel/camel-smime-context.c:1116
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS àààààà ààààààààà àààà ààà àààà àààààà"
 
-#: ../camel/camel-smime-context.c:1132
+#: ../camel/camel-smime-context.c:1141
 msgid "Failed to add data to encoder"
 msgstr "àààààààà àààà ààà àààà àààààà"
 
-#: ../camel/camel-smime-context.c:1240
+#: ../camel/camel-smime-context.c:1250
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME Decrypt: ààààààààà ààà àààà àààà ààààà ààààà"
 
-#: ../camel/camel-store.c:2184
+#: ../camel/camel-store.c:1799
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "'%s' ààààààà ààààààà àààà àààààà: ààààààà àààààààà ààààààà"
 
+#: ../camel/camel-store.c:1842
+#, fuzzy, c-format
+#| msgid "Syncing folders"
+msgid "Opening folder '%s'"
+msgstr "ààààààà àààààà ààà ààààà"
+
+#: ../camel/camel-store.c:2027
+#, fuzzy, 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:2375 ../camel/camel-store.c:2385
+#: ../camel/camel-store.c:2039 ../camel/camel-store.c:2049
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "ààààààà"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2378 ../camel/camel-store.c:2389
+#: ../camel/camel-store.c:2042 ../camel/camel-store.c:2053
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "àààààààà"
 
-#: ../camel/camel-store.c:2832
+#: ../camel/camel-store.c:2501
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "ààààààà ààààààà àààà àààààà: %s: ààààààà àààààààà ààààààà"
 
-#: ../camel/camel-store.c:2959 ../camel/camel-vee-store.c:367
-#: ../camel/providers/local/camel-maildir-store.c:272
+#: ../camel/camel-store.c:2515
+#, fuzzy, c-format
+#| msgid "Cannot get folder '%s': %s"
+msgid "Creating folder '%s'"
+msgstr "ààààààà '%s' ààààààà àààà àààààà: %s"
+
+#: ../camel/camel-store.c:2633 ../camel/camel-vee-store.c:352
+#: ../camel/providers/local/camel-maildir-store.c:300
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "ààààààà àààà àààà ààààà: %s: àààà àààà"
 
-#: ../camel/camel-store.c:3100 ../camel/camel-vee-store.c:417
-#: ../camel/providers/local/camel-maildir-store.c:662
+#: ../camel/camel-store.c:2776 ../camel/camel-vee-store.c:402
+#: ../camel/providers/local/camel-maildir-store.c:764
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "ààààààààà ààà àààààààà àààà àààààà: %s: àààà àààà"
 
-#: ../camel/camel-tcp-stream-raw.c:749 ../camel/camel-tcp-stream-raw.c:760
+#: ../camel/camel-stream-filter.c:334
+msgid "Only reset to beginning is supported with CamelStreamFilter"
+msgstr ""
+
+#: ../camel/camel-stream-process.c:267
+#, c-format
+msgid "Connection cancelled"
+msgstr "ààààà ààààà ààà ààààà"
+
+#: ../camel/camel-stream-process.c:272
+#, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "\"%s\" àààààà àààààà ààààà àààà àààààà: %s"
+
+#: ../camel/camel-tcp-stream-raw.c:303
+#, c-format
+msgid "NSPR error code %d"
+msgstr ""
+
+#: ../camel/camel-tcp-stream-raw.c:640 ../camel/camel-tcp-stream-raw.c:651
 #, c-format
 msgid "The proxy host does not support SOCKS4"
 msgstr "ààààààà ààààà àààààà SOCKS4 àààààà ààà àà àà"
 
-#: ../camel/camel-tcp-stream-raw.c:771
+#: ../camel/camel-tcp-stream-raw.c:662
 #, c-format
 msgid "The proxy host denied our request: code %d"
 msgstr "ààààààà ààààà àààààà àààààà àààààà àààààààààààà ààà ààààà: ààà %d"
 
-#: ../camel/camel-tcp-stream-raw.c:867 ../camel/camel-tcp-stream-raw.c:873
+#: ../camel/camel-tcp-stream-raw.c:758 ../camel/camel-tcp-stream-raw.c:764
 #, c-format
 msgid "The proxy host does not support SOCKS5"
 msgstr "ààààààà ààààà àààààà SOCKS5 àààààà ààà àà àà"
 
-#: ../camel/camel-tcp-stream-raw.c:879
+#: ../camel/camel-tcp-stream-raw.c:770
 #, c-format
-#| msgid "No support for authentication type %s"
 msgid "Could not find a suitable authentication type: code 0x%x"
 msgstr "ààààà ààààààààà ààà ààààà ààààà: code 0x%x"
 
-#: ../camel/camel-tcp-stream-raw.c:891
+#: ../camel/camel-tcp-stream-raw.c:782
 msgid "General SOCKS server failure"
 msgstr "SOCKS ààààààààà àààààà àààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:892
+#: ../camel/camel-tcp-stream-raw.c:783
 msgid "SOCKS server's rules do not allow connection"
 msgstr "SOCKS ààààààààà àààà ààààààà ààààààà àààààà ààà"
 
-#: ../camel/camel-tcp-stream-raw.c:893
+#: ../camel/camel-tcp-stream-raw.c:784
 msgid "Network is unreachable from SOCKS server"
 msgstr "SOCKS ààààààà àààà ààààààààààà àààà ààààà àààààà ààà àààààà àà"
 
-#: ../camel/camel-tcp-stream-raw.c:894
+#: ../camel/camel-tcp-stream-raw.c:785
 msgid "Host is unreachable from SOCKS server"
 msgstr "SOCKS ààààààà àààà ààààààà àààà ààààà àààààà ààà àààààà àà"
 
-#: ../camel/camel-tcp-stream-raw.c:895
-#| msgid "Connection canceled"
+#: ../camel/camel-tcp-stream-raw.c:786
 msgid "Connection refused"
 msgstr "ààààà àààààààààààà ààà ààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:896
+#: ../camel/camel-tcp-stream-raw.c:787
 msgid "Time-to-live expired"
 msgstr "ààààààà-ààà àààààààà ààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:897
-#| msgid "STLS not supported by server"
+#: ../camel/camel-tcp-stream-raw.c:788
 msgid "Command not supported by SOCKS server"
 msgstr "SOCKS ààààààà àààààà àà àààààà ààààààà àà"
 
-#: ../camel/camel-tcp-stream-raw.c:898
-#| msgid "STLS not supported by server"
+#: ../camel/camel-tcp-stream-raw.c:789
 msgid "Address type not supported by SOCKS server"
 msgstr "SOCKS ààààààà àààààà àà ààààà àààààà ààààààà àà"
 
-#: ../camel/camel-tcp-stream-raw.c:899
-#| msgid "Unknown error: %s"
+#: ../camel/camel-tcp-stream-raw.c:790
 msgid "Unknown error from SOCKS server"
 msgstr "SOCKS ààààààà àààà àààààà ààààà àààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:932
+#: ../camel/camel-tcp-stream-raw.c:823
 #, c-format
 msgid "Got unknown address type from SOCKS server"
 msgstr "SOCKS ààààààà àààà ààààà ààààà àààààà ààààààà ààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:950
+#: ../camel/camel-tcp-stream-raw.c:841
 #, c-format
-#| msgid "Invalid response from server"
 msgid "Incomplete reply from SOCKS server"
 msgstr "SOCKS ààààààà àààà ààààààààà ààààà ààààààà ààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:970
+#: ../camel/camel-tcp-stream-raw.c:861
 #, c-format
 msgid "Hostname is too long (maximum is 255 characters)"
-msgstr "ààààà-ààà àààààààà ààààà (àààà àààà àààààààà ààà-àà ààààà ààààààà ààà àààà)"
+msgstr ""
+"ààààà-ààà àààààààà ààààà (àààà àààà àààààààà ààà-àà ààààà ààààààà ààà àààà)"
 
 #. SOCKS5
 #. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:1002 ../camel/camel-tcp-stream-raw.c:1012
+#: ../camel/camel-tcp-stream-raw.c:893 ../camel/camel-tcp-stream-raw.c:903
 #, c-format
-#| msgid "Invalid response from server"
 msgid "Invalid reply from proxy server"
 msgstr "ààààààà ààààààà àààà ààààààà ààààà ààà àà"
 
-#: ../camel/camel-tcp-stream-ssl.c:457
-#, c-format
+#: ../camel/camel-tcp-stream-ssl.c:474
+#, fuzzy, c-format
+#| msgid ""
+#| "Issuer:            %s\n"
+#| "Subject:           %s\n"
+#| "Fingerprint:       %s\n"
+#| "Signature:         %s"
 msgid ""
-"Issuer:            %s\n"
-"Subject:           %s\n"
-"Fingerprint:       %s\n"
-"Signature:         %s"
+"   Issuer:       %s\n"
+"   Subject:      %s\n"
+"   Fingerprint:  %s\n"
+"   Signature:    %s"
 msgstr ""
 "ààààààà:            %s\n"
 "àààààà:           %s\n"
 "ààààààà-ààààààà:       %s\n"
 "àààààààà:         %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:463
+#: ../camel/camel-tcp-stream-ssl.c:480
 msgid "GOOD"
 msgstr "GOOD"
 
-#: ../camel/camel-tcp-stream-ssl.c:463
+#: ../camel/camel-tcp-stream-ssl.c:480
 msgid "BAD"
 msgstr "BAD"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:467
+#: ../camel/camel-tcp-stream-ssl.c:484
 #, c-format
 msgid ""
-"SSL Certificate check for %s:\n"
-"\n"
-"%s\n"
+"SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
 "\n"
-"Do you wish to accept?"
+"Detailed information about the certificate:\n"
+"%s"
+msgstr ""
+
+#: ../camel/camel-tcp-stream-ssl.c:488
+msgid "_Reject"
+msgstr ""
+
+#: ../camel/camel-tcp-stream-ssl.c:489
+msgid "Accept _Temporarily"
+msgstr ""
+
+#: ../camel/camel-tcp-stream-ssl.c:490
+msgid "_Accept Permanently"
 msgstr ""
-"SSL Certificate check for %s'à àààà SSL ààààààààààà ààààààà:\n"
-"\n"
-"%s\n"
-"\n"
-"ààààà ààààà ààà ààà àà?"
 
-#: ../camel/camel-tcp-stream-ssl.c:511
+#: ../camel/camel-tcp-stream-ssl.c:548
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2872,7 +3016,7 @@ msgstr ""
 "ààààààààààà ààààààààà àààààà: %s\n"
 "ààààààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:563
+#: ../camel/camel-tcp-stream-ssl.c:600
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2881,7 +3025,7 @@ msgstr ""
 "àààààààààààà àààààà àààà àà: %s\n"
 "ààààààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:581
+#: ../camel/camel-tcp-stream-ssl.c:618
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2890,7 +3034,7 @@ msgstr ""
 "ààààààààààààà ààààà àààààààà ààààà: %s\n"
 "ààààààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:598
+#: ../camel/camel-tcp-stream-ssl.c:635
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2899,41 +3043,48 @@ msgstr ""
 "ààààààààààà àààààààààààà ààààààà ààààà àààààààà ààààà: %s\n"
 "ààààààà: %s"
 
-#: ../camel/camel-url.c:314
+#: ../camel/camel-url.c:330
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "URL '%s' ààààà àààà àààààà"
 
-#: ../camel/camel-vee-folder.c:1251 ../camel/camel-vee-folder.c:1414
+#: ../camel/camel-vee-folder.c:651
+#, fuzzy, c-format
+#| msgid "Storing folder"
+msgid "Updating %s folder"
+msgstr "ààààààà ààààààà ààà ààààà"
+
+#: ../camel/camel-vee-folder.c:1325 ../camel/camel-vee-folder.c:1482
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "ààààààààà ààààààààà ààààà àààààà ààà àààà àààààààààà ààà ààààà àà"
 
-#: ../camel/camel-vee-folder.c:1287
+#: ../camel/camel-vee-folder.c:1358
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%s'à àààààà àààà àààààà %s'à ààààà ààà"
 
-#: ../camel/camel-vee-folder.c:1355
+#: ../camel/camel-vee-folder.c:1426
 #, c-format
-#| msgid "Error storing '%s': %s"
 msgid "Error storing '%s': "
 msgstr "'%s' ààààààà àààà àààààà: "
 
-#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
-#: ../camel/camel-vee-store.c:322
+#. 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
 msgid "Unmatched"
 msgstr "ààà ààààà ààààà"
 
-#: ../camel/camel-vee-store.c:393
+#: ../camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "ààààààà àààà àààà ààààà: %s: àà ààààà àààà ààààààà ààààààà ààà"
 
-#: ../camel/camel-vee-store.c:427
+#: ../camel/camel-vee-store.c:412
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
-msgstr "ààààààààà ààà àààààààà ààà ààààà: %s: àà ààààà àààà ààààààà ààààààà ààà"
+msgstr ""
+"ààààààààà ààà àààààààà ààà ààààà: %s: àà ààààà àààà ààààààà ààààààà ààà"
 
 #: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
@@ -2943,282 +3094,36 @@ msgstr "àààààààà àààààààà àààààà à
 msgid "Cannot copy messages to the Junk folder"
 msgstr "àààààààà ààààààà àààààààà àààààà ààà àààà àààààà"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:959
-#: ../camel/providers/imap/camel-imap-folder.c:395
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "%s'à ààààààààà àààà ààà àààà àààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1035
-#, c-format
-#| msgid "Checking for new messages"
-msgid "Checking for deleted messages %s"
-msgstr "àààà àààà ààààààà àààààààà ààààààà ààà ààààà  %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1522
-#: ../camel/providers/groupwise/camel-groupwise-store.c:672
-#: ../camel/providers/groupwise/camel-groupwise-store.c:803
-#: ../camel/providers/imap/camel-imap-folder.c:3965
-#: ../camel/providers/imap/camel-imap-folder.c:4047
-#: ../camel/providers/imapx/camel-imapx-server.c:3889
-#: ../camel/providers/imapx/camel-imapx-server.c:4020
-#, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "%s'à ààààà ààààààà àààà ààààààà ààààààààà àààà ààààààà ààà ààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1994
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2048
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2712
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2722
-#, c-format
-msgid "Could not get message"
-msgstr "àààààà ààààààà àààà àààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2432
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2482
-#, c-format
-msgid "Cannot append message to folder '%s': %s"
-msgstr "'%s' ààààààààà àààà àààààà ààà ààà ààààà: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2468
-#, c-format
-msgid "Cannot create message: %s"
-msgstr "àààààà ààààààà àààà àààààà: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2648
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"àààààà ààààààà àààà àààààà: %s\n"
-"  %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2648
-#: ../camel/providers/local/camel-maildir-folder.c:100
-#: ../camel/providers/local/camel-maildir-folder.c:307
-#: ../camel/providers/local/camel-mbox-folder.c:117
-#: ../camel/providers/local/camel-mbox-folder.c:325
-#: ../camel/providers/local/camel-mh-folder.c:156
-msgid "No such message"
-msgstr "àà ààààà àààà àààààà ààààààà ààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2667
-#: ../camel/providers/nntp/camel-nntp-folder.c:251
-#: ../camel/providers/nntp/camel-nntp-folder.c:418
-#: ../camel/providers/pop3/camel-pop3-folder.c:455
-#, c-format
-#| msgid "Cannot get message %s: %s"
-msgid "Cannot get message %s: "
-msgstr "àààààà ààààààà àààà àààààà %s: "
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2685
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2695
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2899
-#, c-format
-msgid "This message is not available in offline mode."
-msgstr "àà-àààà ààààààà àà àààààààà àààààà àààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:248
-#, c-format
-msgid "Cannot get folder container %s"
-msgstr "ààààààà àààààààà %s ààààààà àààà àààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:318
-#, c-format
-msgid "Cannot append message in offline mode: cache unavailable"
-msgstr "àà-àààà ààààààà àààààà ààà àààà àààààà: àààààà àààààà ààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:335
-#| msgid "Cannot append message in offline mode: %s"
-msgid "Cannot append message in offline mode: "
-msgstr "àà-àààà ààààààà àààààà ààà àààà àààààà: "
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
-msgid "Checking for new mail"
-msgstr "àààà ààààààà àààààààà ààààààà ààà ààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
-#: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
-msgid "C_heck for new messages in all folders"
-msgstr "ààà ààààààààà ààààà àààà ààààààà àààààààà ààààààà ààà ààà (_h)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
-#: ../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:82
-#: ../camel/providers/local/camel-local-provider.c:102
-msgid "Options"
-msgstr "àààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
-msgid "_Apply filters to new messages in Inbox on this server"
-msgstr ""
-"ààààààà ààààààààà àààààààà ààààà ààà àààà ààààààà àààààààà ààààààà àààààà ààà ààà (_A)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
-msgid "Check new messages for J_unk contents"
-msgstr "àààà ààààààà ààààà àààààààà àààààà ààààààà ààà ààà(_u)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imapx/camel-imapx-provider.c:78
-msgid "Only check for Junk messages in the IN_BOX folder"
-msgstr "INBOX (àààààà) àààààààà ààààààààà àààààààà àààààà (Junk) ààààààà ààà ààà(_B)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
-msgid "Automatically synchroni_ze account locally"
-msgstr "àààààààààààààà ààààààààààà àààààààààà àààààà ààà ààà(_z)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
-msgid "SOAP Settings"
-msgstr "SOAP'à ààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
-msgid "Post Office Agent SOAP _Port:"
-msgstr "Post Office Agent SOAP ààààà: (_P)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
-msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
-msgid "For accessing Novell GroupWise servers"
-msgstr "Novell GroupWise ààààààà ààààààààà ààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:98
-#: ../camel/providers/imap/camel-imap-provider.c:97
-#: ../camel/providers/imapx/camel-imapx-provider.c:104
-#: ../camel/providers/nntp/camel-nntp-provider.c:72
-#: ../camel/providers/pop3/camel-pop3-provider.c:73
-msgid "Password"
-msgstr "ààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:100
-msgid "This option will connect to the GroupWise server using a plaintext password."
-msgstr ""
-"àà àààààààà ààà àààà àààààà-àààààà ààààààààà àààààà GroupWise ààààààààà àààà "
-"ààààà ààà àààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:107
-#, c-format
-msgid "Host or user not available in url"
-msgstr "url'à ààààà ààààà àààà ààààààààààà àààààà àà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:209
-#: ../camel/providers/imap/camel-imap-store.c:801
-#: ../camel/providers/imapx/camel-imapx-server.c:3100
-#, c-format
-msgid "You did not enter a password."
-msgstr "ààààààààà àààààà ààà ààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:332
-msgid "Some features may not work correctly with your current server version"
-msgstr ""
-"àààààààà ààààààà ààààààààà ààààààààà àààà àààààà ààààààààà àààààààà àà àààà àààààààà "
-"ààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:563
-#: ../camel/providers/imap/camel-imap-store.c:1808
-#: ../camel/providers/imap/camel-imap-store.c:2005
-#: ../camel/providers/imapx/camel-imapx-store.c:342
-#, c-format
-msgid "No such folder %s"
-msgstr "%s'à àààààà àààà ààààààà ààààààà ààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1224
-#, c-format
-msgid "Cannot create GroupWise folders in offline mode."
-msgstr "àà-àààà ààààààà GroupWise ààààààà ààààààà àààà ààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1233
-#, c-format
-#| msgid "Cannot delete folder '%s': Special folder"
-msgid "Cannot create a special system folder"
-msgstr "ààààà ààààààà ààààààà ààààààà àààà àààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1243
-#: ../camel/providers/imap/camel-imap-store.c:1886
-#: ../camel/providers/imap/camel-imap-store.c:2323
-#: ../camel/providers/imapx/camel-imapx-store.c:1341
-#, c-format
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "ààààààààà àààààààààà ààààà ààà-ààààààà ààààààà ààà àààà àà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1328
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1353
-#, c-format
-msgid "Cannot rename GroupWise folder '%s' to '%s'"
-msgstr "Groupwise ààààààààà ààà '%s' àààà '%s'-à àààààààà ààà àààà àà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1387
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:47
-#, c-format
-msgid "GroupWise server %s"
-msgstr "GroupWise ààààààà %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1389
-#, c-format
-msgid "GroupWise service for %s on %s"
-msgstr "%s'à àààà GroupWise ààààààà %s'à ààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:51
-#, c-format
-msgid "GroupWise mail delivery via %s"
-msgstr "%s'à ààààààà GroupWise àààà ààààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:97
-msgid "Sending Message"
-msgstr "àààààà àààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:107
-#, c-format
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "ààààààà ààààààà àààà àààààà: ààààààà àààààààààààà ààààà àààà ààà àà"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
-#, c-format
-msgid ""
-"You have exceeded this account's storage limit. Your messages are queued in "
-"your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
-"of your mail.\n"
-msgstr ""
-"ààààààà ààààààààààà ààààààààà àààà ààààààààààà ààààà àààààààààà ààààààààà ààààà "
-"àààààààààà àààà àààààà ààààààà àààààààà ààà àààà àààà àààà, àààààà/àààààààà àààà àààà "
-"àààààààààà àààààà àààààààà ààààààààà ààààà\n"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:159
-#, c-format
-msgid "Could not send message: %s"
-msgstr "àààààà àààààà àààà àààààà: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:197
-#: ../camel/providers/imap/camel-imap-command.c:301
+#: ../camel/providers/imap/camel-imap-command.c:200
+#: ../camel/providers/imap/camel-imap-command.c:297
 #, c-format
 msgid "No output stream"
 msgstr "àààààà ààààààà ààààààààà"
 
-#: ../camel/providers/imap/camel-imap-command.c:205
-#: ../camel/providers/imap/camel-imap-command.c:309
+#: ../camel/providers/imap/camel-imap-command.c:208
+#: ../camel/providers/imap/camel-imap-command.c:305
 #, c-format
 msgid "No input stream"
 msgstr "ààààà ààààààà ààààààààà"
 
-#: ../camel/providers/imap/camel-imap-command.c:255
-#, c-format
-msgid "Operation cancelled"
-msgstr "àààà ààààà ààà ààààà"
-
-#: ../camel/providers/imap/camel-imap-command.c:373
+#: ../camel/providers/imap/camel-imap-command.c:383
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "ààààààààà àààà ààààààààààà àààà ààààà ààààààààà ààà ààààà: %s"
 
-#. for imap ALERT codes, account user host
-#. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:394
+#: ../camel/providers/imap/camel-imap-command.c:416
+#, fuzzy, c-format
+#| msgid ""
+#| "Alert from IMAP server %s %s:\n"
+#| "%s"
+msgid ""
+"Alert from IMAP server %s %s in folder %s:\n"
+"%s"
+msgstr ""
+"IMAP ààààààà %s %s àààà ààààààà ààààààààààà:\n"
+"%s"
+
+#: ../camel/providers/imap/camel-imap-command.c:420
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -3227,104 +3132,127 @@ msgstr ""
 "IMAP ààààààà %s %s àààà ààààààà ààààààààààà:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:468
+#: ../camel/providers/imap/camel-imap-command.c:502
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP ààààààà àààà ààààààà ààààààààààà ààààààààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:480
+#: ../camel/providers/imap/camel-imap-command.c:514
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP àààààà àààà: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:560
+#: ../camel/providers/imap/camel-imap-command.c:594
 #, c-format
 msgid "Server response ended too soon."
 msgstr "ààààààà àààà ààààààà àààààààààà ààà ààààà àààààà àààààà"
 
-#: ../camel/providers/imap/camel-imap-command.c:771
+#: ../camel/providers/imap/camel-imap-command.c:806
 #, c-format
 msgid "IMAP server response did not contain %s information"
-msgstr "IMAP ààààààà àààà ààààààà ààààààààààààà àààà %s ààààààààà àààà ààààààààà"
+msgstr ""
+"IMAP ààààààà àààà ààààààà ààààààààààààà àààà %s ààààààààà àààà ààààààààà"
 
-#: ../camel/providers/imap/camel-imap-command.c:809
+#: ../camel/providers/imap/camel-imap-command.c:844
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP ààààààà àààà ààààààààààà OK ààààààààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:296
-msgid "Always check for new mail in this folder"
+#: ../camel/providers/imap/camel-imap-folder.c:348
+#, fuzzy
+#| msgid "Always check for new mail in this folder"
+msgid "Always check for _new mail in this folder"
 msgstr "ààààààà ààààààààà ààààà àààààà àààà ààààààà àààààààà ààààààààà ààà ààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:372
+#: ../camel/providers/imap/camel-imap-folder.c:359
+#: ../camel/providers/imapx/camel-imapx-folder.c:747
+#: ../camel/providers/nntp/camel-nntp-folder.c:760
+#, fuzzy
+#| msgid "Cannot copy messages to the Trash folder"
+msgid "Apply message _filters to this folder"
+msgstr "àààààààà àààààààà àààààà ààà àààà àààààà"
+
+#: ../camel/providers/imap/camel-imap-folder.c:440
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "%s ààààààààà ààààààà àààà àààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:995
-#: ../camel/providers/imapx/camel-imapx-server.c:3933
+#: ../camel/providers/imap/camel-imap-folder.c:461
+#, c-format
+msgid "Could not load summary for %s"
+msgstr "%s'à ààààààààà àààà ààà àààà àààààà"
+
+#: ../camel/providers/imap/camel-imap-folder.c:1119
+#: ../camel/providers/imapx/camel-imapx-server.c:3949
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "%s'à ààààà ààààààààà àààààà ààààààà ààà ààààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3372
-#| msgid "Unable to retrieve message: %s"
+#: ../camel/providers/imap/camel-imap-folder.c:3478
 msgid "Unable to retrieve message: "
 msgstr "àààààà àààààà ààà ààààà: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:3407
-#: ../camel/providers/imapx/camel-imapx-server.c:5213
+#: ../camel/providers/imap/camel-imap-folder.c:3515
+#: ../camel/providers/imapx/camel-imapx-server.c:5509
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "%s ID àà àààààà ààààààà àààà àààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3408
-#: ../camel/providers/imapx/camel-imapx-server.c:5214
+#: ../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:3483
-#: ../camel/providers/imap/camel-imap-folder.c:4378
-#: ../camel/providers/nntp/camel-nntp-folder.c:407
+#: ../camel/providers/imap/camel-imap-folder.c:3591
+#: ../camel/providers/imap/camel-imap-folder.c:4469
+#: ../camel/providers/nntp/camel-nntp-folder.c:515
 #, c-format
 msgid "This message is not currently available"
 msgstr "ààààààà àààààà àààààààà àààààà àà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4179
+#: ../camel/providers/imap/camel-imap-folder.c:4050
+#: ../camel/providers/imap/camel-imap-folder.c:4133
+#: ../camel/providers/imapx/camel-imapx-server.c:3901
+#: ../camel/providers/imapx/camel-imapx-server.c:4081
+#, c-format
+msgid "Fetching summary information for new messages in %s"
+msgstr "%s'à ààààà ààààààà àààà ààààààà ààààààààà àààà ààààààà ààà ààààà"
+
+#: ../camel/providers/imap/camel-imap-folder.c:4267
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
-msgstr "ààààààà àààà ààààààà ààààààààààà ààààààààà: àààààà %d ààààààààà àààà àààà ààààààà ààà"
+msgstr ""
+"ààààààà àààà ààààààà ààààààààààà ààààààààà: àààààà %d ààààààààà àààà àààà "
+"ààààààà ààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4189
+#: ../camel/providers/imap/camel-imap-folder.c:4277
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
-msgstr "ààààààà àààà ààààààà ààààààààààà ààààààààà: àààààà %d'à UID ààààààà ààà"
+msgstr ""
+"ààààààà àààà ààààààà ààààààààààà ààààààààà: àààààà %d'à UID ààààààà ààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4418
+#: ../camel/providers/imap/camel-imap-folder.c:4509
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH àààààà ààààààààààààà ààààà ààààààà àààààà ààà àààààààààà"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:193
+#: ../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 "àààààà ààààààààà àààà ààààà: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:326
+#: ../camel/providers/imap/camel-imap-message-cache.c:331
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "àààààà %s àààààà ààà ààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:391
+#: ../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:529
+#: ../camel/providers/imap/camel-imap-message-cache.c:539
 #, c-format
-#| msgid "Failed to cache %s: %s"
 msgid "Failed to cache %s: "
 msgstr "%s àààààà àààà àààààà: "
 
@@ -3333,10 +3261,16 @@ msgstr "%s àààààà àààà àààààà: "
 msgid "Checking for New Mail"
 msgstr "àààà àààààà àààààààà ààààààà ààà ààààà"
 
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
+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:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
 msgid "Ch_eck for new messages in subscribed folders"
-msgstr "ààààààààààà ààà ààààààààà ààààà àààà ààààààà àààààààà ààààààà ààà ààà (_h)"
+msgstr ""
+"ààààààààààà ààà ààààààààà ààààà àààà ààààààà àààààààà ààààààà ààà ààà (_h)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:48
 #: ../camel/providers/imapx/camel-imapx-provider.c:52
@@ -3349,13 +3283,12 @@ 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/nntp/camel-nntp-provider.c:42
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "Folders"
 msgstr "ààààààà"
 
@@ -3370,203 +3303,218 @@ msgid "O_verride server-supplied folder namespace"
 msgstr "ààààààà àààààà àààààà ààààààà ààà-ààààà àààààààà ààà ààà (_v)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:62
-#| msgid "Namespace:"
 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/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
-msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "ààààààà ààààààààà àààààà ààààààààà àààà ààààààà ààààààà àààààà ààà ààà (_A)"
+#: ../camel/providers/nntp/camel-nntp-provider.c:43
+#, fuzzy
+#| msgid "_Apply filters to new messages in INBOX"
+msgid "Apply _filters to new messages in all folders"
+msgstr "INBOX àààààààà ààà àààà ààààààà ààààààà àààààà ààà ààà (_A)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:68
 #: ../camel/providers/imapx/camel-imapx-provider.c:76
-msgid "Check new messages for Jun_k contents"
-msgstr "àààà ààààààà ààààà àààààààà àààààà ààààààà ààà ààà (_k)"
+msgid "_Apply filters to new messages in Inbox on this server"
+msgstr ""
+"ààààààà ààààààààà àààààààà ààààà ààà àààà ààààààà àààààààà ààààààà àààààà ààà "
+"ààà (_A)"
+
+#: ../camel/providers/imap/camel-imap-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:78
+msgid "Check new messages for _Junk contents"
+msgstr "àààà ààààààà ààààà àààààààà àààààà ààààààà ààà ààà (_J)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:72
 #: ../camel/providers/imapx/camel-imapx-provider.c:80
+msgid "Only check for Junk messages in the IN_BOX folder"
+msgstr ""
+"INBOX (àààààà) àààààààà ààààààààà àààààààà àààààà (Junk) ààààààà ààà ààà(_B)"
+
+#: ../camel/providers/imap/camel-imap-provider.c:74
+#: ../camel/providers/imapx/camel-imapx-provider.c:82
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "àààààààààààààà àààààààà àààààà ààààààààààà àààààà ààà ààà (_z)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:79
+#: ../camel/providers/imap/camel-imap-provider.c:80
+msgid "IMAP default port"
+msgstr ""
+
+#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:89
+#, fuzzy
+#| msgid "IMAP server %s"
+msgid "IMAP over SSL"
+msgstr "IMAP ààààààà %s"
+
+#: ../camel/providers/imap/camel-imap-provider.c:87
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:81
-#: ../camel/providers/imapx/camel-imapx-provider.c:90
+#: ../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:99
-#: ../camel/providers/imapx/camel-imapx-provider.c:106
+#: ../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 ààààààààà àààà ààààà ààà "
+"àà àààààààà ààà àààà àààààà-àààààà ààààààààà àààààà IMAP ààààààààà àààà ààààà "
+"ààà "
 "àààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:243
-#: ../camel/providers/nntp/camel-nntp-store.c:313
-#: ../camel/providers/pop3/camel-pop3-store.c:135
-#: ../camel/providers/smtp/camel-smtp-transport.c:151
-#, c-format
-msgid "Could not connect to %s: %s"
-msgstr "%s'à àààà ààààà àààà àààààà: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:244
-#: ../camel/providers/nntp/camel-nntp-store.c:314
-#: ../camel/providers/pop3/camel-pop3-store.c:136
-#: ../camel/providers/smtp/camel-smtp-transport.c:152
-msgid "SSL unavailable"
-msgstr "SSL àààààà àà"
-
-#: ../camel/providers/imap/camel-imap-store.c:264
-#: ../camel/providers/nntp/camel-nntp-store.c:333
-#, c-format
-#| msgid "Could not connect to %s: %s"
-msgid "Could not connect to %s: "
-msgstr "%s-à àààà ààààà àààà àààààà: "
+#. 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:370
-#: ../camel/providers/imap/camel-imap-store.c:390
-#: ../camel/providers/imap/camel-imap-store.c:397
-#: ../camel/providers/imap/camel-imap-store.c:424
-#: ../camel/providers/imapx/camel-imapx-server.c:2942
-#: ../camel/providers/imapx/camel-imapx-server.c:2982
+#: ../camel/providers/imap/camel-imap-store.c:409
+#: ../camel/providers/imap/camel-imap-store.c:463
+#: ../camel/providers/imapx/camel-imapx-server.c:2828
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "àààààà àààà IMAP ààààààà %s'à àààà ààààà àààà àààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:371
-#: ../camel/providers/imapx/camel-imapx-server.c:2943
-#: ../camel/providers/smtp/camel-smtp-transport.c:238
+#: ../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:391
-#: ../camel/providers/imapx/camel-imapx-server.c:2983
-msgid "SSL negotiations failed"
-msgstr "SSL ààààààà àààà àààààà"
+#: ../camel/providers/imap/camel-imap-store.c:435
+#: ../camel/providers/imapx/camel-imapx-server.c:2868
+#, fuzzy, 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'à àààà ààààà àààà àààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:398
-#: ../camel/providers/smtp/camel-smtp-transport.c:285
-msgid "SSL is not available in this build"
-msgstr "ààààààà ààààààà ààààà SSL àààààà àà"
+#: ../camel/providers/imap/camel-imap-store.c:734
+#: ../camel/providers/imapx/camel-imapx-server.c:2935
+#, fuzzy, 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:549
-#: ../camel/providers/imapx/camel-imapx-server.c:2770
+#: ../camel/providers/imap/camel-imap-store.c:809
+#: ../camel/providers/imapx/camel-imapx-store.c:155
 #, c-format
-msgid "Connection cancelled"
-msgstr "ààààà ààààà ààà ààààà"
+msgid "IMAP server %s"
+msgstr "IMAP ààààààà %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:554
-#: ../camel/providers/imapx/camel-imapx-server.c:2775
+#: ../camel/providers/imap/camel-imap-store.c:812
+#: ../camel/providers/imapx/camel-imapx-store.c:158
 #, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "\"%s\" àààààà àààààà ààààà àààà àààààà: %s"
+msgid "IMAP service for %s on %s"
+msgstr "%s'à àààà IMAP ààààààà, %s'à ààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:740
-#: ../camel/providers/imapx/camel-imapx-server.c:3056
-#, c-format
-msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "IMAP ààààààà %s'à àààààà àààààà ààà ààààààà ààààààà %s ààààààà àà"
+#: ../camel/providers/imap/camel-imap-store.c:1111
+#: ../camel/providers/imapx/camel-imapx-server.c:2965
+#: ../camel/providers/nntp/camel-nntp-store.c:505
+#, fuzzy
+#| msgid "Cannot authenticate to server: %s"
+msgid "Cannot authenticate without a username"
+msgstr "àààààààà ààààààà àààà àààààà: %s"
+
+#: ../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
+#, fuzzy
+#| msgid "Authentication Failed"
+msgid "Authentication password not available"
+msgstr "ààààààà àààà àààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:752
-#: ../camel/providers/imapx/camel-imapx-server.c:3068
-#: ../camel/providers/smtp/camel-smtp-transport.c:420
+#: ../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 support for authentication type %s"
-msgstr "ààààààà àààààààà %s ààààààà àà"
+msgid "No such folder %s"
+msgstr "%s'à àààààà àààà ààààààà ààààààà ààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:836
-#: ../camel/providers/imapx/camel-imapx-server.c:3144
+#: ../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 ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr ""
-"IMAP àààààààà ààààààà àààà ààààààà\n"
-"%s\n"
-"\n"
-
-#: ../camel/providers/imap/camel-imap-store.c:997
-#: ../camel/providers/imapx/camel-imapx-store.c:183
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP ààààààà %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:1001
-#: ../camel/providers/imapx/camel-imapx-store.c:185
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%s'à àààà IMAP ààààààà, %s'à ààà"
+"\"%s\" ààààààààà ààààà ààààà àààà ààààà \"%c\" ààààààà ààààà ààà àà ààà àà"
 
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1367
-#: ../camel/providers/imap/camel-imap-store.c:2416
-#: ../camel/providers/imapx/camel-imapx-store.c:372
-#: ../camel/providers/imapx/camel-imapx-store.c:794
-#: ../camel/providers/local/camel-maildir-folder.c:409
-#: ../camel/providers/local/camel-maildir-store.c:273
-#: ../camel/providers/local/camel-maildir-store.c:609
-#: ../camel/providers/local/camel-maildir-store.c:615
-#: ../camel/providers/local/camel-maildir-store.c:663
-#: ../camel/providers/local/camel-spool-store.c:289
-msgid "Inbox"
-msgstr "àààààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:1822
-#: ../camel/providers/imap/camel-imap-store.c:2259
-#: ../camel/providers/imapx/camel-imapx-store.c:1320
+#: ../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 folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "\"%s\" ààààààààà ààààà ààààà àààà ààààà \"%c\" ààààààà ààààà ààà àà ààà àà"
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "ààààààààà àààààààààà ààààà ààà-ààààààà ààààààà ààà àààà àà"
 
-#: ../camel/providers/imap/camel-imap-store.c:1939
-#: ../camel/providers/local/camel-maildir-store.c:244
-#: ../camel/providers/local/camel-mbox-store.c:413
-#: ../camel/providers/local/camel-mh-store.c:504
+#: ../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:2272
-#: ../camel/providers/imapx/camel-imapx-store.c:1331
+#: ../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:3137
+#: ../camel/providers/imap/camel-imap-store.c:3326
 #, c-format
-#| msgid "Server unexpectedly disconnected: %s"
 msgid "Server unexpectedly disconnected"
 msgstr "ààààààààà àààà ààààààààààà àààà ààààà ààààààààà ààà ààààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:3140
-#| msgid "Server unexpectedly disconnected: %s"
+#: ../camel/providers/imap/camel-imap-store.c:3329
 msgid "Server unexpectedly disconnected: "
 msgstr "ààààààààà àààà ààààààààààà àààà ààààà ààààààààà ààà ààààà: "
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:74
+#: ../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:82
+#: ../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:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
 msgid "Use _Quick Resync if the server supports it"
 msgstr "ààààààà àààààà ààààààà ààà Quick Resync ààààààà ààà ààà (_Q)"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
-msgid "Use I_dle if the server supports it"
-msgstr "ààààààà àààààà ààààààà ààà Idle ààààààà ààà ààà (_d)"
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
+msgid "_Listen for server change notifications"
+msgstr ""
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:56
 msgid "Command:"
@@ -3581,39 +3529,153 @@ msgid "Namespace:"
 msgstr "ààà-ààààà:"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:88
+msgid "Default IMAP port"
+msgstr ""
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:96
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1410
-#| msgid "Error writing mail temp file: %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:817
+#, fuzzy
+#| msgid "Server unexpectedly disconnected"
+msgid "Server disconnected"
+msgstr "ààààààààà àààà ààààààààààà àààà ààààà ààààààààà ààà ààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:1206
 msgid "Error writing to cache stream: "
 msgstr "àààààà àààààààà ààààà àààààà: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2092
+#: ../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:2865
-#, c-format
-#| msgid "Could not connect to %s (port %s): %s"
-msgid "Could not connect to %s (port %s): "
-msgstr "%s-à (ààààà %s) àààà ààààà àààà àààààà"
+#: ../camel/providers/imapx/camel-imapx-server.c:2005
+#, fuzzy
+#| msgid "Error performing search"
+msgid "Error performing IDLE"
+msgstr "ààààààààààà ààà àààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3160
+#, fuzzy
+#| msgid "Encrypting message"
+msgid "Error fetching message"
+msgstr "àààààà ààààààààà ààààààà"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3329
-#| msgid "Posting failed: %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:3228
 msgid "Closing tmp stream failed: "
 msgstr "tmp ààààààà àààà àààà àààààà: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5363
-#: ../camel/providers/imapx/camel-imapx-server.c:5378
-#| msgid "Cannot create message: %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:3327
+#, fuzzy
+#| msgid "Copying messages"
+msgid "Error copying messages"
+msgstr "àààààà ààà ààà ààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3457
+#, fuzzy
+#| 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
+#, fuzzy
+#| msgid "Retrieving message '%s'"
+msgid "Error retrieving message"
+msgstr "àààààà '%s' àààààà ààà ààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3982
+#, fuzzy
+#| msgid "Checking for new messages"
+msgid "Error fetching new messages"
+msgstr "àààà ààààààà àààààààà ààààààà ààà ààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4172
+#, fuzzy
+#| 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
+#, fuzzy, 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] "%s'à ààààà ààààààà àààà ààààààà ààààààààà àààà ààààààà ààà ààààà"
+msgstr[1] "%s'à ààààà ààààààà àààà ààààààà ààààààààà àààà ààààààà ààà ààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4332
+#: ../camel/providers/imapx/camel-imapx-server.c:4366
+#, fuzzy
+#| msgid "Error performing search"
+msgid "Error refreshing folder"
+msgstr "ààààààààààà ààà àààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4455
+#, fuzzy
+#| msgid "Expunging old messages"
+msgid "Error expunging message"
+msgstr "àààààà àààààà àààààààààà ààààà ààà ààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4540
+#, fuzzy
+#| msgid "Storing folder"
+msgid "Error fetching folders"
+msgstr "ààààààà ààààààà ààà ààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4614
+#, fuzzy
+#| msgid "_Show only subscribed folders"
+msgid "Error subscribing to folder"
+msgstr "ààààààààà ààà-àààààààà ààà ààààààà ààààààààà ààà (_S)"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4667
+#, fuzzy
+#| msgid "Storing folder"
+msgid "Error creating folder"
+msgstr "ààààààà ààààààà ààà ààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4712
+#, fuzzy
+#| msgid "Storing folder"
+msgid "Error deleting folder"
+msgstr "ààààààà ààààààà ààà ààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4762
+#, fuzzy
+#| msgid "Storing folder"
+msgid "Error renaming folder"
+msgstr "ààààààà ààààààà ààà ààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4813
+#, fuzzy
+#| msgid "Error performing search"
+msgid "Error performing NOOP"
+msgstr "ààààààààààà ààà àààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4908
+msgid "Error syncing changes"
+msgstr ""
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5664
+#: ../camel/providers/imapx/camel-imapx-server.c:5679
 msgid "Cannot create spool file: "
 msgstr "ààààà àààà ààààààà àààà àààààà: "
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1136
-#: ../camel/providers/nntp/camel-nntp-store.c:1610
+#: ../camel/providers/imapx/camel-imapx-store.c:1076
+#, fuzzy, c-format
+#| msgid "Retrieving message '%s'"
+msgid "Retrieving folder list for %s"
+msgstr "àààààà '%s' àààààà ààà ààààà"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1176
+#: ../camel/providers/nntp/camel-nntp-store.c:1790
 #, c-format
 msgid "No such folder: %s"
 msgstr "àà ààààà ààààààà ààààààà ààà: %s"
@@ -3625,36 +3687,33 @@ msgstr "ààààà ààààààà àààà àààà àà
 
 #: ../camel/providers/imapx/camel-imapx-stream.c:79
 #, c-format
-#| msgid "service unavailable"
 msgid "Source stream unavailable"
 msgstr "ààààà ààààààà àààààà àà"
 
-#: ../camel/providers/local/camel-local-folder.c:182
+#: ../camel/providers/local/camel-local-folder.c:191
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:192
 #: ../camel/providers/local/camel-local-folder.c:201
+#: ../camel/providers/local/camel-local-folder.c:210
 #, c-format
-#| msgid "mailbox:%s (%s)"
 msgid "mailbox: %s (%s)"
 msgstr "àààà-àààà: %s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:210
+#: ../camel/providers/local/camel-local-folder.c:219
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:469
-msgid "Index message body data"
+#: ../camel/providers/local/camel-local-folder.c:483
+#, fuzzy
+#| msgid "Index message body data"
+msgid "_Index message body data"
 msgstr "ààààààà ààààààà àààààà ààààà àààà"
 
-#: ../camel/providers/local/camel-local-folder.c:685
+#: ../camel/providers/local/camel-local-folder.c:712
 #, c-format
-#| msgid ""
-#| "Cannot get message: %s from folder %s\n"
-#| "  %s"
 msgid ""
 "Cannot get message %s from folder %s\n"
 "%s"
@@ -3674,275 +3733,280 @@ msgstr "MH-ààààààààà àààà ààààààààà"
 msgid "For storing local mail in MH-like mail directories."
 msgstr "MH-àààààà àààà àààààààààà ààààà ààààààà àààà ààààààààà àààààààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:69
+#: ../camel/providers/local/camel-local-provider.c:70
 msgid "Local delivery"
 msgstr "ààààààà ààààààààààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:70
+#: ../camel/providers/local/camel-local-provider.c:71
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
 msgstr ""
-"àààààà mbox-ààààààààà ààààà àààà Evolution àààààà àààààààà ààààààààà ààààà ààààààà "
+"àààààà mbox-ààààààààà ààààà àààà Evolution àààààà àààààààà ààààààààà ààààà "
+"ààààààà "
 "àààà àààààà (àààààààà) àààà àààààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:84
-#: ../camel/providers/local/camel-local-provider.c:103
-msgid "_Apply filters to new messages in INBOX"
+#: ../camel/providers/local/camel-local-provider.c:86
+#: ../camel/providers/local/camel-local-provider.c:107
+#, fuzzy
+#| msgid "_Apply filters to new messages in INBOX"
+msgid "_Apply filters to new messages in Inbox"
 msgstr "INBOX àààààààà ààà àààà ààààààà ààààààà àààààà ààà ààà (_A)"
 
-#: ../camel/providers/local/camel-local-provider.c:91
+#: ../camel/providers/local/camel-local-provider.c:93
 msgid "Maildir-format mail directories"
 msgstr "Maildir-ààààààààà àààà ààààààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:92
+#: ../camel/providers/local/camel-local-provider.c:94
 msgid "For storing local mail in maildir directories."
 msgstr "maildir àààààààààà ààààà ààààààà àààà ààààààààà àààààààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:104
+#: ../camel/providers/local/camel-local-provider.c:108
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "àààààààààà ààààà Elm/Pine/Mutt àààààààà ààààààà ààà ààà (_S)"
 
-#: ../camel/providers/local/camel-local-provider.c:111
+#: ../camel/providers/local/camel-local-provider.c:115
 msgid "Standard Unix mbox spool file"
 msgstr "àààààà Unix mbox ààààà àààà"
 
-#: ../camel/providers/local/camel-local-provider.c:112
-#: ../camel/providers/local/camel-local-provider.c:123
+#: ../camel/providers/local/camel-local-provider.c:116
+#: ../camel/providers/local/camel-local-provider.c:128
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
-"àààààààà àààààà mbox ààààà àààààà ààààà ààààààà àààà àààà ààà à ààààààààà ààààà\n"
+"àààààààà àààààà mbox ààààà àààààà ààààà ààààààà àààà àààà ààà à ààààààààà "
+"ààààà\n"
 "Elm, Pine àààà Mutt ààààààààà ààààààààà àààà àààà ààààà ààààààà ààà ààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:122
+#: ../camel/providers/local/camel-local-provider.c:127
 msgid "Standard Unix mbox spool directory"
 msgstr "àààààà Unix mbox ààààà ààààààààà"
 
-#: ../camel/providers/local/camel-local-store.c:174
-#: ../camel/providers/local/camel-local-store.c:319
-#: ../camel/providers/local/camel-maildir-store.c:92
-#: ../camel/providers/local/camel-mbox-store.c:532
-#: ../camel/providers/local/camel-spool-store.c:318
+#: ../camel/providers/local/camel-local-store.c:98
+#, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "ààààààààà ààà %s àààà %s'à àààààààà àààà àààààà: %s"
+
+#: ../camel/providers/local/camel-local-store.c:178
+#, c-format
+msgid "Local mail file %s"
+msgstr "ààààààà àààà àààà %s"
+
+#: ../camel/providers/local/camel-local-store.c:218
+#: ../camel/providers/local/camel-local-store.c:375
+#: ../camel/providers/local/camel-maildir-store.c:101
+#: ../camel/providers/local/camel-mbox-store.c:555
+#: ../camel/providers/local/camel-spool-store.c:86
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "àààààààààààà root %s'à ààà ààààààààààà àà"
 
-#: ../camel/providers/local/camel-local-store.c:183
+#: ../camel/providers/local/camel-local-store.c:227
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "àààààààààààà root %s ààààààààà ààààààààà àà"
 
-#: ../camel/providers/local/camel-local-store.c:194
-#: ../camel/providers/local/camel-local-store.c:204
-#: ../camel/providers/local/camel-local-store.c:332
-#: ../camel/providers/local/camel-maildir-store.c:124
+#: ../camel/providers/local/camel-local-store.c:239
+#: ../camel/providers/local/camel-local-store.c:249
+#: ../camel/providers/local/camel-local-store.c:388
+#: ../camel/providers/local/camel-maildir-store.c:134
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "ààààààà ààààààà àààà àààà: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:220
+#: ../camel/providers/local/camel-local-store.c:286
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "ààààààà àààààààààààà ààààà àààààà ààààààààà"
 
-#: ../camel/providers/local/camel-local-store.c:281
-#, c-format
-msgid "Local mail file %s"
-msgstr "ààààààà àààà àààà %s"
-
-#: ../camel/providers/local/camel-local-store.c:393
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "ààààààààà ààà %s àààà %s'à àààààààà àààà àààààà: %s"
-
-#: ../camel/providers/local/camel-local-store.c:467
-#, c-format
-msgid "Could not rename '%s': %s"
-msgstr "'%s'-à àààààààà àààà àààààà: %s"
-
-#: ../camel/providers/local/camel-local-store.c:498
-#: ../camel/providers/local/camel-mbox-store.c:701
+#: ../camel/providers/local/camel-local-store.c:445
+#: ../camel/providers/local/camel-mbox-store.c:722
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "ààààààà ààààààà àààà '%s' àààà ààààà àààààà: %s"
 
-#: ../camel/providers/local/camel-local-store.c:526
-#: ../camel/providers/local/camel-mbox-store.c:730
+#: ../camel/providers/local/camel-local-store.c:473
+#: ../camel/providers/local/camel-mbox-store.c:752
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "ààààààààà àààà àààà '%s' àààà ààààà àààààà: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:548
+#: ../camel/providers/local/camel-local-store.c:581
+#, c-format
+msgid "Could not rename '%s': %s"
+msgstr "'%s'-à àààààààà àààà àààààà: %s"
+
+#: ../camel/providers/local/camel-local-summary.c:527
 #, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "àààààà àààààà ààààà àààààà ààà àààà àààààà: ààààà àààà"
 
-#: ../camel/providers/local/camel-maildir-folder.c:198
+#: ../camel/providers/local/camel-maildir-folder.c:100
+#: ../camel/providers/local/camel-maildir-folder.c:336
+#: ../camel/providers/local/camel-mbox-folder.c:117
+#: ../camel/providers/local/camel-mbox-folder.c:329
+#: ../camel/providers/local/camel-mh-folder.c:160
+msgid "No such message"
+msgstr "àà ààààà àààà àààààà ààààààà ààà"
+
+#: ../camel/providers/local/camel-maildir-folder.c:226
 #, 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:246
-#: ../camel/providers/local/camel-maildir-folder.c:256
-#: ../camel/providers/local/camel-mbox-folder.c:386
-#: ../camel/providers/local/camel-mh-folder.c:168
-#: ../camel/providers/local/camel-mh-folder.c:178
+#: ../camel/providers/local/camel-maildir-folder.c:274
+#: ../camel/providers/local/camel-maildir-folder.c:284
+#: ../camel/providers/local/camel-mbox-folder.c:390
+#: ../camel/providers/local/camel-mh-folder.c:172
+#: ../camel/providers/local/camel-mh-folder.c:182
 #, c-format
-#| msgid ""
-#| "Cannot get message: %s from folder %s\n"
-#| "  %s"
 msgid "Cannot get message %s from folder %s: "
 msgstr "%s àààààààà %s ààààààà àààà ààààààà ààà ààààà: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:326
+#: ../camel/providers/local/camel-maildir-folder.c:354
 #, 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:100
-#, c-format
-#| msgid "Cannot create folder: %s: folder exists"
-msgid "Cannot create folder: %s : Folder name cannot contain a dot"
+#: ../camel/providers/local/camel-maildir-store.c:109
+#, fuzzy, c-format
+#| msgid "Cannot create folder: %s : Folder name cannot contain a dot"
+msgid "Cannot create folder: %s: Folder name cannot contain a dot"
 msgstr ""
-"ààààààà ààààààà àààà àààààà: %s: ààààààààà ààààà ààààà àààààà ààààà àààààà ààà àààà àà"
+"ààààààà ààààààà àààà àààààà: %s: ààààààààà ààààà ààààà àààààà ààààà àààààà "
+"ààà àààà àà"
 
-#: ../camel/providers/local/camel-maildir-store.c:109
-#: ../camel/providers/local/camel-maildir-store.c:680
+#: ../camel/providers/local/camel-maildir-store.c:119
+#: ../camel/providers/local/camel-maildir-store.c:782
 #, c-format
-#| msgid "Folder already exists"
 msgid "Folder %s already exists"
 msgstr "%s àààààààà àààààààà ààààààà ààààà"
 
-#: ../camel/providers/local/camel-maildir-store.c:191
-#: ../camel/providers/local/camel-maildir-store.c:222
-#: ../camel/providers/local/camel-mbox-store.c:381
-#: ../camel/providers/local/camel-mbox-store.c:395
+#: ../camel/providers/local/camel-maildir-store.c:215
+#: ../camel/providers/local/camel-maildir-store.c:246
+#: ../camel/providers/local/camel-mbox-store.c:389
+#: ../camel/providers/local/camel-mbox-store.c:403
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "ààààààà '%s' ààààààà àààà àààààà: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:206
-#: ../camel/providers/local/camel-mbox-store.c:347
-#: ../camel/providers/local/camel-mh-store.c:464
+#: ../camel/providers/local/camel-maildir-store.c:230
+#: ../camel/providers/local/camel-mbox-store.c:355
+#: ../camel/providers/local/camel-mh-store.c:516
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "ààààààà '%s' ààààààà àààà àààààà: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:212
-#: ../camel/providers/local/camel-mbox-store.c:357
-#: ../camel/providers/local/camel-mh-store.c:473
+#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mh-store.c:525
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "ààààààà '%s' ààààààà àààà àààààà: ààààààà àààààààà ààààààààà"
 
-#: ../camel/providers/local/camel-maildir-store.c:239
+#: ../camel/providers/local/camel-maildir-store.c:263
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "ààààààà '%s' ààààààà àààà àààààà: maildir ààààààààà ààà"
 
-#: ../camel/providers/local/camel-maildir-store.c:293
-#: ../camel/providers/local/camel-maildir-store.c:333
-#: ../camel/providers/local/camel-mh-store.c:584
+#: ../camel/providers/local/camel-maildir-store.c:329
+#: ../camel/providers/local/camel-maildir-store.c:369
+#: ../camel/providers/local/camel-mh-store.c:670
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "'%s' ààààààà àààà àààà ààààà: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:295
+#: ../camel/providers/local/camel-maildir-store.c:331
 msgid "not a maildir directory"
 msgstr "maildir ààààààààà àà"
 
-#: ../camel/providers/local/camel-maildir-store.c:508
-#: ../camel/providers/local/camel-maildir-store.c:819
-#: ../camel/providers/local/camel-spool-store.c:143
-#: ../camel/providers/local/camel-spool-store.c:159
+#: ../camel/providers/local/camel-maildir-store.c:569
+#: ../camel/providers/local/camel-maildir-store.c:970
+#: ../camel/providers/local/camel-spool-store.c:209
+#: ../camel/providers/local/camel-spool-store.c:228
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "'%s' ààààààà ààààààà àààà àààààà: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:671
+#: ../camel/providers/local/camel-maildir-store.c:773
 #, c-format
-#| msgid "Cannot create folder: %s: folder exists"
 msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
 msgstr ""
-"ààààààààà ààà àààààààà àààà àààààà: %s: ààààààààà ààààà ààààà àààààà ààààà ààààààà ààà àààà "
-"àà"
+"ààààààààà ààà àààààààà àààà àààààà: %s: ààààààààà ààààà ààààà àààààà ààààà "
+"ààààààà ààà "
+"àààà àà"
 
-#: ../camel/providers/local/camel-maildir-summary.c:435
-#: ../camel/providers/local/camel-maildir-summary.c:565
+#: ../camel/providers/local/camel-maildir-summary.c:416
+#: ../camel/providers/local/camel-maildir-summary.c:549
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "maildir àààààààààà ààà ààààà àààààà: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:556
+#: ../camel/providers/local/camel-maildir-summary.c:540
 msgid "Checking folder consistency"
 msgstr "ààààààààà ààààààà ààààààà àààààààà"
 
-#: ../camel/providers/local/camel-maildir-summary.c:649
+#: ../camel/providers/local/camel-maildir-summary.c:633
 msgid "Checking for new messages"
 msgstr "àààà ààààààà àààààààà ààààààà ààà ààààà"
 
-#: ../camel/providers/local/camel-maildir-summary.c:742
-#: ../camel/providers/local/camel-mbox-summary.c:468
-#: ../camel/providers/local/camel-mbox-summary.c:690
-#: ../camel/providers/local/camel-mbox-summary.c:826
-#: ../camel/providers/local/camel-spool-summary.c:131
+#: ../camel/providers/local/camel-maildir-summary.c:728
+#: ../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
 msgid "Storing folder"
 msgstr "ààààààà ààààààà ààà ààààà"
 
-#: ../camel/providers/local/camel-mbox-folder.c:183
+#: ../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:249
+#: ../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: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:378
+#: ../camel/providers/local/camel-mbox-folder.c:382
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "ààààààààà àààààààààà ààààààààààà ààààà ààà àààààààààà ààà ààààà ààà"
 
-#: ../camel/providers/local/camel-mbox-folder.c:436
+#: ../camel/providers/local/camel-mbox-folder.c:439
 #: ../camel/providers/local/camel-spool-folder.c:70
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s'à ààà ààààààà àà ààààààà àààà àààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:369
-#: ../camel/providers/local/camel-mbox-store.c:540
+#: ../camel/providers/local/camel-mbox-store.c:377
+#: ../camel/providers/local/camel-mbox-store.c:563
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "ààààààà ààà àààààà ààààààà ààààààà àààà ààààààà"
 
-#: ../camel/providers/local/camel-mbox-store.c:406
+#: ../camel/providers/local/camel-mbox-store.c:414
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "'%s' ààààààà ààààààà ààà ààààà: ààààààààà àààà ààà"
 
-#: ../camel/providers/local/camel-mbox-store.c:556
+#: ../camel/providers/local/camel-mbox-store.c:579
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "'%s' ààààààààà ààààààà àààà àààààà: %sà"
 
-#: ../camel/providers/local/camel-mbox-store.c:572
+#: ../camel/providers/local/camel-mbox-store.c:591
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "ààààààà ààààààà àààà àààààà: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:574
+#: ../camel/providers/local/camel-mbox-store.c:593
 msgid "Folder already exists"
 msgstr "ààààààà àààààààà ààààààà"
 
-#: ../camel/providers/local/camel-mbox-store.c:615
-#: ../camel/providers/local/camel-mbox-store.c:628
-#: ../camel/providers/local/camel-mbox-store.c:657
+#: ../camel/providers/local/camel-mbox-store.c:633
+#: ../camel/providers/local/camel-mbox-store.c:646
+#: ../camel/providers/local/camel-mbox-store.c:675
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3951,168 +4015,173 @@ msgstr ""
 "ààààààà '%s' àààà àààà ààààà:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:638
+#: ../camel/providers/local/camel-mbox-store.c:656
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "'%s' ààààààààà àààà ààà"
 
-#: ../camel/providers/local/camel-mbox-store.c:647
+#: ../camel/providers/local/camel-mbox-store.c:665
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "ààààààà '%s' ààààà ààà àààà àààà ààààà"
 
-#: ../camel/providers/local/camel-mbox-store.c:673
-#: ../camel/providers/local/camel-mbox-store.c:687
+#: ../camel/providers/local/camel-mbox-store.c:692
+#: ../camel/providers/local/camel-mbox-store.c:707
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "ààààààà àààààà àààà '%s' àààà ààààà àààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:767
+#: ../camel/providers/local/camel-mbox-store.c:789
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "àààà ààààààààà ààà ààà ààà"
 
-#: ../camel/providers/local/camel-mbox-store.c:782
+#: ../camel/providers/local/camel-mbox-store.c:805
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "'%s'-à ààà àààààààà ààà ààààà: '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:865
+#: ../camel/providers/local/camel-mbox-store.c:888
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "'%s'à ààà %s'à àààààààà àààà àààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:476
+#: ../camel/providers/local/camel-mbox-summary.c:428
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "ààààààà ààààà àààààà: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:537
+#: ../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 "%s àààààààà, %s ààààààààà ààààà àààà ààààààà ààààààààà àààààà àààààà"
 
-#: ../camel/providers/local/camel-mbox-summary.c:622
+#: ../camel/providers/local/camel-mbox-summary.c:574
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "ààààààà ààààààà ààà ààààà: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:697
-#: ../camel/providers/local/camel-mbox-summary.c:833
-#: ../camel/providers/local/camel-spool-summary.c:138
+#: ../camel/providers/local/camel-mbox-summary.c:662
+#: ../camel/providers/local/camel-mbox-summary.c:802
+#: ../camel/providers/local/camel-spool-summary.c:137
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "àààà ààààà àààààà: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:711
-#: ../camel/providers/local/camel-spool-summary.c:153
+#: ../camel/providers/local/camel-mbox-summary.c:676
+#: ../camel/providers/local/camel-spool-summary.c:152
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "ààààààà àààà-àààà ààààà àààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:728
-#: ../camel/providers/local/camel-mbox-summary.c:949
+#: ../camel/providers/local/camel-mbox-summary.c:693
+#: ../camel/providers/local/camel-mbox-summary.c:918
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "ààà ààààààà %s àààà àààà àààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:739
+#: ../camel/providers/local/camel-mbox-summary.c:704
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "ààààààà ààààààà àààà àààà àààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:756
+#: ../camel/providers/local/camel-mbox-summary.c:721
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "ààààààààà ààà àààààààà àààà àààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:846
-#: ../camel/providers/local/camel-mbox-summary.c:1099
+#: ../camel/providers/local/camel-mbox-summary.c:816
+#: ../camel/providers/local/camel-mbox-summary.c:1084
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "ààààààà ààààààà àààà àààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:886
-#: ../camel/providers/local/camel-mbox-summary.c:1131
+#: ../camel/providers/local/camel-mbox-summary.c:855
+#: ../camel/providers/local/camel-mbox-summary.c:1115
 #, c-format
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
 "it.)"
 msgstr ""
-"MBOX ààààààààààà, ààààààà ààà àà àààààà ààààà (From àààààà àààààà ààààààà àààààà àààààààààà "
-"àààààà àà ààààà àààààà)"
+"MBOX ààààààààààà, ààààààà ààà àà àààààà ààààà (From àààààà àààààà ààààààà "
+"àààààà "
+"àààààààààà àààààà àà ààààà àààààà)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:895
-#: ../camel/providers/local/camel-mbox-summary.c:1140
+#: ../camel/providers/local/camel-mbox-summary.c:864
+#: ../camel/providers/local/camel-mbox-summary.c:1124
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "ààààààààà àààà à àààààààà ààààà, àààààààà (sync) àààà"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1052
-#: ../camel/providers/local/camel-spool-summary.c:343
+#: ../camel/providers/local/camel-mbox-summary.c:1029
+#: ../camel/providers/local/camel-spool-summary.c:345
 #, c-format
 msgid "Unknown error: %s"
 msgstr "ààààà àààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1210
-#: ../camel/providers/local/camel-mbox-summary.c:1240
+#: ../camel/providers/local/camel-mbox-summary.c:1182
+#: ../camel/providers/local/camel-mbox-summary.c:1212
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "ààààààà àààà-ààààà ààààà àààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1229
+#: ../camel/providers/local/camel-mbox-summary.c:1201
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "ààààààà àààà-ààààà ààààà àààààà: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:115
+#: ../camel/providers/local/camel-mh-folder.c:119
 #, c-format
-#| msgid "Cannot append message to mh folder: %s: %s"
 msgid "Cannot append message to mh folder: %s: "
 msgstr "mh ààààààààà àààà àààààà ààà àààà àààààà: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:483
+#: ../camel/providers/local/camel-mh-store.c:535
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "ààààààà '%s' ààààààà àààà àààààà: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:497
+#: ../camel/providers/local/camel-mh-store.c:551
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "ààààààà '%s' ààààààà àààà àààààà: ààààààààà ààà"
 
-#: ../camel/providers/local/camel-mh-summary.c:230
+#: ../camel/providers/local/camel-mh-summary.c:227
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH àààààààààà ààà ààààà àààààà: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:327
+#: ../camel/providers/local/camel-spool-store.c:94
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "ààààà '%s' ààààà àààààà: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:341
+#: ../camel/providers/local/camel-spool-store.c:108
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "ààààà '%s' ààààààààà àààà àààà ààààààààà àà"
 
-#: ../camel/providers/local/camel-spool-store.c:357
+#: ../camel/providers/local/camel-spool-store.c:416
 #, c-format
 msgid "Spool mail file %s"
 msgstr "ààààà àààà àààà %s"
 
-#: ../camel/providers/local/camel-spool-store.c:357
+#: ../camel/providers/local/camel-spool-store.c:420
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "ààààà ààààààà àààà %s"
 
-#: ../camel/providers/local/camel-spool-store.c:391
+#: ../camel/providers/local/camel-spool-store.c:423
+#, fuzzy
+#| msgid "Invalid source"
+msgid "Invalid spool"
+msgstr "ààà ààà àà"
+
+#: ../camel/providers/local/camel-spool-store.c:480
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "ààààààà '%s/%s' àààààààà àààààààààà"
 
-#: ../camel/providers/local/camel-spool-store.c:403
+#: ../camel/providers/local/camel-spool-store.c:493
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -4121,12 +4190,12 @@ msgstr ""
 "ààààààà '%s' ààààà àààààà:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:409
+#: ../camel/providers/local/camel-spool-store.c:499
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "ààààààà '%s' àààààààà àààààààààà"
 
-#: ../camel/providers/local/camel-spool-store.c:416
+#: ../camel/providers/local/camel-spool-store.c:507
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -4135,47 +4204,42 @@ msgstr ""
 "ààààààà '%s' ààààààà àààà àààààà:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:426
+#: ../camel/providers/local/camel-spool-store.c:520
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "'%s' àààà-àààà àààà ààà"
 
-#: ../camel/providers/local/camel-spool-store.c:462
+#: ../camel/providers/local/camel-spool-store.c:584
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "ààààààààààà INBOX'à àààààààà ààààààà àà"
 
-#: ../camel/providers/local/camel-spool-store.c:476
+#: ../camel/providers/local/camel-spool-store.c:603
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "ààààà ààààààà àààà àààà àààà àà"
 
-#: ../camel/providers/local/camel-spool-store.c:491
+#: ../camel/providers/local/camel-spool-store.c:618
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "ààààà ààààààààà ààà àààààààà ààà ààààà àà"
 
-#: ../camel/providers/local/camel-spool-summary.c:169
-#: ../camel/providers/local/camel-spool-summary.c:181
-#: ../camel/providers/local/camel-spool-summary.c:193
+#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-spool-summary.c:180
+#: ../camel/providers/local/camel-spool-summary.c:192
 #, c-format
-#| msgid "Could not sync temporary folder %s: %s"
 msgid "Could not synchronize temporary folder %s: %s"
 msgstr "ààààààà ààààààà %s àààààà (sync) àààà àààààà: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:211
+#: ../camel/providers/local/camel-spool-summary.c:210
 #, c-format
-#| msgid "Could not sync spool folder %s: %s"
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "ààààà ààààààà %s àààààà (sync) ààà ààààà: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:243
-#: ../camel/providers/local/camel-spool-summary.c:262
-#: ../camel/providers/local/camel-spool-summary.c:275
+#: ../camel/providers/local/camel-spool-summary.c:242
+#: ../camel/providers/local/camel-spool-summary.c:261
+#: ../camel/providers/local/camel-spool-summary.c:274
 #, 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'"
@@ -4183,96 +4247,103 @@ msgstr ""
 "ààààà ààààààà %s àààààà (sync) ààà ààààà: %s\n"
 "ààààààà àààààà ààààààààààà, '%s'-à ààà ààààààà ààà ààààà"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:200
-#: ../camel/providers/nntp/camel-nntp-folder.c:279
-#: ../camel/providers/nntp/camel-nntp-folder.c:393
+#: ../camel/providers/nntp/camel-nntp-folder.c:290
+#: ../camel/providers/nntp/camel-nntp-folder.c:379
+#: ../camel/providers/nntp/camel-nntp-folder.c:501
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "àààààààààà àààààà: UID'à ààààààà àààà àà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:241
-#: ../camel/providers/nntp/camel-nntp-folder.c:245
-#: ../camel/providers/pop3/camel-pop3-folder.c:369
-#: ../camel/providers/pop3/camel-pop3-folder.c:434
-#: ../camel/providers/pop3/camel-pop3-folder.c:446
-#: ../camel/providers/pop3/camel-pop3-folder.c:695
+#: ../camel/providers/nntp/camel-nntp-folder.c:340
+#: ../camel/providers/nntp/camel-nntp-folder.c:344
+#: ../camel/providers/pop3/camel-pop3-folder.c:611
+#: ../camel/providers/pop3/camel-pop3-folder.c:995
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "%s àààààà ààààààà àààà àààààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:477
-#: ../camel/providers/nntp/camel-nntp-folder.c:483
-#: ../camel/providers/nntp/camel-nntp-folder.c:530
+#: ../camel/providers/nntp/camel-nntp-folder.c:351
+#: ../camel/providers/nntp/camel-nntp-folder.c:526
+#: ../camel/providers/pop3/camel-pop3-folder.c:549
+#: ../camel/providers/pop3/camel-pop3-folder.c:601
+#: ../camel/providers/pop3/camel-pop3-folder.c:620
+#, c-format
+msgid "Cannot get message %s: "
+msgstr "àààààà ààààààà àààà àààààà %s: "
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:585
+#: ../camel/providers/nntp/camel-nntp-folder.c:591
+#: ../camel/providers/nntp/camel-nntp-folder.c:638
 #, c-format
 msgid "Posting failed: %s"
 msgstr "ààààà àààà àààààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:525
-#| msgid "Posting failed: %s"
+#: ../camel/providers/nntp/camel-nntp-folder.c:633
 msgid "Posting failed: "
 msgstr "ààààà àààà àààààà: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:554
+#: ../camel/providers/nntp/camel-nntp-folder.c:662
 #, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "àà-àààà ààààààà NNTP àààààà ààààà ààà ààààà àà!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:574
+#: ../camel/providers/nntp/camel-nntp-folder.c:682
 #, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "NNTP ààààààà àààà àààààà ààà ààà ààààà àà!"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+#: ../camel/providers/nntp/camel-nntp-provider.c:48
+msgid ""
+"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr ""
-"ààààààààà àààààààà ààààààà àààààààà ààà ààà (àààààà comp.os.linux'à àààààààà c.o."
+"ààààààààà àààààààà ààààààà àààààààà ààà ààà (àààààà comp.os.linux'à àààààààà "
+"c.o."
 "linux) (_S)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:50
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "àààààààààààà àààààà, àààààààà ààààààààà ààà àààààààà ààà ààà (_d)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:53
+#: ../camel/providers/nntp/camel-nntp-provider.c:56
+msgid "Default NNTP port"
+msgstr ""
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:57
+msgid "NNTP over SSL"
+msgstr ""
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:63
 msgid "USENET news"
 msgstr "USENET àààà"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:65
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "USENET àààààààààà àààààà ààà à ààààà àààà ààààààà àààààà ààààààààà"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
+#: ../camel/providers/nntp/camel-nntp-provider.c:86
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
-msgstr "àà àààààààà ààà àààà àààààà-àààààà ààààààààà àààààà NNTP àààààààà ààààààà ààà àààà"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:77
-#, c-format
-msgid "Authentication requested but no username provided"
-msgstr "ààààààààà àààààà àààààà ààààà àààààà àààààààààààà àà àààààààà àààà"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:89
-#, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "àààààààà ààààààà àààà àààààà: %s"
+msgstr ""
+"àà àààààààà ààà àààà àààààà-àààààà ààààààààà àààààà NNTP àààààààà ààààààà ààà "
+"àààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:346
+#: ../camel/providers/nntp/camel-nntp-store.c:285
 #, 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:359
+#: ../camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP ààààààà %s àààààà àààà ààà %d àààààà ààààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:527
+#: ../camel/providers/nntp/camel-nntp-store.c:469
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s'à ààààààà USENET àààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1045
+#: ../camel/providers/nntp/camel-nntp-store.c:1072
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4283,7 +4354,25 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1160
+#: ../camel/providers/nntp/camel-nntp-store.c:1165
+#, c-format
+msgid "You cannot create a folder in a News store: subscribe instead."
+msgstr ""
+"àààà àààààààààààà ààààààà ààààààà àààà àààààà: àààààààà ààà-àààààààà ààààà"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1181
+#, c-format
+msgid "You cannot rename a folder in a News store."
+msgstr "àààà àààààààààààà ààààà ààààààààà ààà àààààààà ààà ààààà ààà"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1204
+#, c-format
+msgid "You cannot remove a folder in a News store: unsubscribe instead."
+msgstr ""
+"àààà àààààààààààà ààààà ààààààà àààà àààà ààààà àà: àààààààà àà-ààààààààààà "
+"ààààà"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1402
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4294,7 +4383,7 @@ msgstr ""
 "\n"
 "àà ààààààààà ààààààà àààà ààààààààà ààààààà àààààà àààà ààààààààà àààààààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1202
+#: ../camel/providers/nntp/camel-nntp-store.c:1453
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4305,86 +4394,73 @@ msgstr ""
 "\n"
 "àààà-ààààà ààààààà ààà!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1235
-#, c-format
-msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr "àààà àààààààààààà ààààààà ààààààà àààà àààààà: àààààààà ààà-àààààààà ààààà"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1251
-#, c-format
-msgid "You cannot rename a folder in a News store."
-msgstr "àààà àààààààààààà ààààà ààààààààà ààà àààààààà ààà ààààà ààà"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1268
-#, c-format
-msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr "àààà àààààààààààà ààààà ààààààà àààà àààà ààààà àà: àààààààà àà-ààààààààààà ààààà"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1479
-#| msgid "NNTP Command failed: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1647
 msgid "NNTP Command failed: "
 msgstr "NNTP àààààà àààààààà àààà: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1553
+#: ../camel/providers/nntp/camel-nntp-store.c:1732
 #, c-format
 msgid "Not connected."
 msgstr "ààààààà ààà"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:234
-#: ../camel/providers/nntp/camel-nntp-summary.c:345
+#: ../camel/providers/nntp/camel-nntp-summary.c:195
+#: ../camel/providers/nntp/camel-nntp-summary.c:322
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: àààà àààààà ààààààà ààà ààààà"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:246
+#: ../camel/providers/nntp/camel-nntp-summary.c:213
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "xover àààà ààààààààààà ààààààààà ààààààààààà ààààààà ààààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:362
+#: ../camel/providers/nntp/camel-nntp-summary.c:340
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "head àààà ààààààààààà ààààààààà ààààààààààà ààààààà ààààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:407
+#: ../camel/providers/nntp/camel-nntp-summary.c:387
 #, c-format
 msgid "Operation failed: %s"
 msgstr "àààà àààà: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:277
-#: ../camel/providers/pop3/camel-pop3-folder.c:334
+#: ../camel/providers/pop3/camel-pop3-folder.c:447
+#: ../camel/providers/pop3/camel-pop3-folder.c:517
 #, c-format
 msgid "No message with UID %s"
 msgstr "UID %s àà àààà àààààà ààààààà ààà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:342
+#: ../camel/providers/pop3/camel-pop3-folder.c:533
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "POP àààààà %d àààààà ààà ààààà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:447
+#: ../camel/providers/pop3/camel-pop3-folder.c:612
 msgid "Unknown reason"
 msgstr "ààààà àààà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:486
+#: ../camel/providers/pop3/camel-pop3-folder.c:660
 msgid "Retrieving POP summary"
 msgstr "POP'à ààààààààà àààà ààààààà ààà ààààà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:509
-#, c-format
-msgid "Cannot get POP summary: %s"
+#: ../camel/providers/pop3/camel-pop3-folder.c:711
+#, fuzzy
+#| msgid "Cannot get POP summary: %s"
+msgid "Cannot get POP summary: "
 msgstr "POP ààààààààà ààààààààà àààà ààààààà àààà àààààà: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:561
+#: ../camel/providers/pop3/camel-pop3-folder.c:823
 msgid "Expunging old messages"
 msgstr "àààààà àààààà àààààààààà ààààà ààà ààààà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:575
+#: ../camel/providers/pop3/camel-pop3-folder.c:843
 msgid "Expunging deleted messages"
 msgstr "àààà àààà àààààà àààààààààà ààààà ààà ààààà"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:39
-msgid "Message storage"
+#, fuzzy
+#| msgid "Message storage"
+msgid "Message Storage"
 msgstr "àààààà àààààà"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:41
@@ -4405,119 +4481,124 @@ msgstr "àààààààààà àààààà ààààààà
 msgid "Disable _support for all POP3 extensions"
 msgstr "ààààààààà POP3 ààààààààààà àààà àààààà ààààààààà ààà ààà (_s)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:56
+#: ../camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Default POP3 port"
+msgstr ""
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#, fuzzy
+#| msgid "POP3 server %s"
+msgid "POP3 over SSL"
+msgstr "POP3 ààààààà %s"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:62
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:58
+#: ../camel/providers/pop3/camel-pop3-provider.c:64
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "ààààààààà POP ààààààààà àààà ààààà à àààà ààààààà àààà àààààààààà"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:75
+#: ../camel/providers/pop3/camel-pop3-provider.c:84
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
-"àà àààààààà ààà àààà àààààà-àààààà ààààààààà àààààà POP ààààààààà àààà ààààà ààà "
+"àà àààààààà ààà àààà àààààà-àààààà ààààààààà àààààà POP ààààààààà àààà ààààà "
+"ààà "
 "àààà ààààààà POP ààààààààà àààààà ààààààààà àà àààààààà ààààààà ààà"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:85
+#: ../camel/providers/pop3/camel-pop3-provider.c:94
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
-"àà àààààààà ààà àààà ààààààààà ààà ààààààààà àààààà APOP àààààààààà ààààààà POP "
-"ààààààààà àààà ààààà ààà àààà àààà ààààààààà àààààà àà ààààààààà ààààààà àààà àà "
+"àà àààààààà ààà àààà ààààààààà ààà ààààààààà àààààà APOP àààààààààà ààààààà "
+"POP "
+"ààààààààà àààà ààààà ààà àààà àààà ààààààààà àààààà àà ààààààààà ààààààà àààà "
+"àà "
 "àààààààààààààà àààà ààà ààààààà ààà ààà ààààà ààà ààààà"
 
 #. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:98
+#: ../camel/providers/pop3/camel-pop3-store.c:83
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:181
+#: ../camel/providers/pop3/camel-pop3-store.c:136
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "POP ààààààà %s àààà ààààààà ààààààà àààà àààààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/pop3/camel-pop3-store.c:230
-#: ../camel/providers/pop3/camel-pop3-store.c:237
+#: ../camel/providers/pop3/camel-pop3-store.c:153
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "àààààà àààà POP ààààààà %s'à àààà ààààà àààà àààààà: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:200
+#: ../camel/providers/pop3/camel-pop3-store.c:154
 msgid "STLS not supported by server"
 msgstr "ààààààààà àààààà STLS ààààààà àà"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:218
+#: ../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 "àààààà àààà POP ààààààà %s-à àààà ààààà àààà àààààà%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:231
-msgid "TLS negotiations failed"
-msgstr "TLS ààààààà àààà àààààà"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:238
-msgid "TLS is not available in this build"
-msgstr "ààààààà àààààà TLS ààààààà àà"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:317
-#: ../camel/providers/pop3/camel-pop3-store.c:472
-#, c-format
-msgid ""
-"Unable to connect to POP server %s: No support for requested authentication "
-"mechanism."
-msgstr "POP ààààààà %s'à àààà ààààà àààà àààààà: àààààà àààà ààààààà ààààààà ààààààà ààà"
-
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:340
-#, c-format
-#| msgid "SASL '%s' Login failed for POP server %s: %s"
-msgid "SASL '%s' Login failed for POP server %s%s"
-msgstr "SASL '%s' àà-àà, POP ààààààà %s%s-4 àààààààà àààà"
+#: ../camel/providers/pop3/camel-pop3-store.c:185
+#, fuzzy, 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 ààààààà %s'à àààà ààààà àààà àààààà: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:357
+#: ../camel/providers/pop3/camel-pop3-store.c:288
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "POP ààààààà %s'à àà-àà àààà àààààà: SASL àààààààà ààààààààà àààààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:374
+#: ../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:439
+#: ../camel/providers/pop3/camel-pop3-store.c:359
+#, c-format
+msgid "POP3 server %s"
+msgstr "POP3 ààààààà %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:362
+#, c-format
+msgid "POP3 server for %s on %s"
+msgstr "%s-à àààà POP3 ààààààà, %s-à ààà"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:525
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
 "attack suspected. Please contact your admin."
 msgstr ""
-"POP ààààààà %s-à àààà ààààà ààààààà àààààà:\tàààà APOP ID àààààààà àààààà àààà ààààà "
-"àààà ààà ààààààààààà ààààààààà ààà àààààà ààààààà ààà àààààààààààààààààààà àààà "
+"POP ààààààà %s-à àààà ààààà ààààààà àààààà:\tàààà APOP ID àààààààà àààààà "
+"àààà ààààà "
+"àààà ààà ààààààààààà ààààààààà ààà àààààà ààààààà ààà àààààààààààààààààààà "
+"àààà "
 "ààààààà ààààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:492
-#, c-format
+#: ../camel/providers/pop3/camel-pop3-store.c:577
+#, fuzzy, 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: %s"
+"Error sending password: "
 msgstr ""
 "POP ààààààà %s'à àààà ààààà ààààà\n"
 "ààààààààà àààààà àààà àààààà: %s"
 
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:505
+#. Translators: Last %s is an optional explanation
+#. * beginning with ": " separator.
+#: ../camel/providers/pop3/camel-pop3-store.c:592
 #, 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"
@@ -4525,42 +4606,17 @@ msgstr ""
 "POP ààààààà %s-à àààà ààààà àààà ààààààà\n"
 "àààààààààààà ààà àààààà àààààà%s"
 
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:518
-#, 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%s"
-msgstr ""
-"POP ààààààà %s-à àààà ààààà àààà ààààààà\n"
-"ààààààààà àààààà àààààà%s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:558
-#, c-format
-#| msgid "IMAP server %s"
-msgid "POP3 server %s"
-msgstr "POP3 ààààààà %s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:562
-#, c-format
-#| msgid "IMAP service for %s on %s"
-msgid "POP3 server for %s on %s"
-msgstr "%s-à àààà POP3 ààààààà, %s-à ààà"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:694
+#: ../camel/providers/pop3/camel-pop3-store.c:650
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "POP ààààààà %s'à àààà ààààà àààà àààààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:721
+#: ../camel/providers/pop3/camel-pop3-store.c:678
 #, c-format
 msgid "No such folder '%s'."
 msgstr "'%s'-à àààààà ààààààà ààààààà àààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:738
+#: ../camel/providers/pop3/camel-pop3-store.c:695
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 àààààààààààà àààà ààààààà ààààààà ààà"
@@ -4573,7 +4629,8 @@ msgstr "Sendmail"
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
-msgstr "ààààààà àààààààà \"sendmail\" ààààààààààà ààààààà àààà ààààààà àààààààààà"
+msgstr ""
+"ààààààà àààààààà \"sendmail\" ààààààààààà ààààààà àààà ààààààà àààààààààà"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:49
 msgid "sendmail"
@@ -4598,734 +4655,1228 @@ msgstr "sendmail'à àààà àààà ààààààà ààà
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "sendmail fork àààà àààààà: %s: àààà àààààà ààà ààààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
-#| msgid "Could not send message: %s"
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:184
 msgid "Could not send message: "
 msgstr "àààààà àààààà àààààà: "
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:212
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "àààààà %s àààààà ààà sendmail àààà ààààà: àààà àààààà ààà àààààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:217
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:219
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "%s ààààààà àààà àààààà: àààà àààààà ààà ààààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:224
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
-msgstr "%d ààààààà ààààà àààààà ààà sendmail àààà ààààà: àààà àààààà ààà àààààà"
+msgstr ""
+"%d ààààààà ààààà àààààà ààà sendmail àààà ààààà: àààà àààààà ààà àààààà"
+
+#: ../camel/providers/smtp/camel-smtp-provider.c:42
+msgid "Default SMTP port"
+msgstr ""
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:43
+#, fuzzy
+#| msgid "SMTP server %s"
+msgid "SMTP over SSL"
+msgstr "SMTP ààààààà %s"
+
+#: ../camel/providers/smtp/camel-smtp-provider.c:44
+msgid "Message submission port"
+msgstr ""
+
+#: ../camel/providers/smtp/camel-smtp-provider.c:50
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:45
+#: ../camel/providers/smtp/camel-smtp-provider.c:52
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "SMTP àààààà àààààààà àààà-ààààà àààà ààààà ààà àààà ààààààà àààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:193
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
-#| msgid "Welcome response error"
+#: ../camel/providers/smtp/camel-smtp-transport.c:150
+#: ../camel/providers/smtp/camel-smtp-transport.c:158
 msgid "Welcome response error: "
 msgstr "ààààààà àààààà ààààààààà àààààà: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:237
-#: ../camel/providers/smtp/camel-smtp-transport.c:277
-#: ../camel/providers/smtp/camel-smtp-transport.c:284
+#: ../camel/providers/smtp/camel-smtp-transport.c:195
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "àààààà àààà SMTP ààààààà %s'à àààà ààààààà àààà àààààà: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:246
-#: ../camel/providers/smtp/camel-smtp-transport.c:259
-#: ../camel/providers/smtp/camel-smtp-transport.c:266
-#| msgid "STARTTLS command failed: %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: "
 msgstr "STARTTLS àààààà àààààààà àààààà: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:357
+#: ../camel/providers/smtp/camel-smtp-transport.c:235
+#, fuzzy, 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 ààààààà %s'à àààà ààààààà àààà àààààà: %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:292
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ààààààà %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:361
+#: ../camel/providers/smtp/camel-smtp-transport.c:295
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s'à ààààààà SMTP àààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:408
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s."
+#: ../camel/providers/smtp/camel-smtp-transport.c:367
+#, fuzzy, 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:495
+#: ../camel/providers/smtp/camel-smtp-transport.c:446
 #, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
+msgid "No SASL mechanism was specified"
 msgstr ""
-"SMTP àààààààà ààààààà àààà ààààààà\n"
-"%s\n"
-"\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:613
+#: ../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: "
+msgstr "AUTH àààààà àààààà: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:643
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "àààààà àààààà àààà àààààà: ààààààà ààààààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:620
+#: ../camel/providers/smtp/camel-smtp-transport.c:650
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "àààààà àààààà àààà àààààà: àààààààà àààààà ààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:624
+#: ../camel/providers/smtp/camel-smtp-transport.c:654
 msgid "Sending message"
 msgstr "àààààà àààààà ààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:649
+#: ../camel/providers/smtp/camel-smtp-transport.c:679
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "àààààà àààààà àààà àààààà: àààààà àààààààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:662
+#: ../camel/providers/smtp/camel-smtp-transport.c:692
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "àààààà àààààà àààà àààààà: àà àààà àààà àààààà ààà àà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:725
+#: ../camel/providers/smtp/camel-smtp-transport.c:796
 msgid "Syntax error, command unrecognized"
 msgstr "àààààààà àààà àààààà, ààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:798
 msgid "Syntax error in parameters or arguments"
 msgstr "ààààààà àààà ààààààààààà àààààààà àààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:729
+#: ../camel/providers/smtp/camel-smtp-transport.c:800
 msgid "Command not implemented"
 msgstr "àààààà àààààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:731
+#: ../camel/providers/smtp/camel-smtp-transport.c:802
 msgid "Command parameter not implemented"
 msgstr "àààààààà ààààààà àààààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:733
+#: ../camel/providers/smtp/camel-smtp-transport.c:804
 msgid "System status, or system help reply"
 msgstr "ààààààààà àààààà, àààà ààààààà ààààà àààààààà àààà ààààààà ààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:735
+#: ../camel/providers/smtp/camel-smtp-transport.c:806
 msgid "Help message"
 msgstr "àààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:737
+#: ../camel/providers/smtp/camel-smtp-transport.c:808
 msgid "Service ready"
 msgstr "ààààààà àààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:739
+#: ../camel/providers/smtp/camel-smtp-transport.c:810
 msgid "Service closing transmission channel"
 msgstr "àààààààà àààààà àààààà ààààààà àààà ààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:741
+#: ../camel/providers/smtp/camel-smtp-transport.c:812
 msgid "Service not available, closing transmission channel"
 msgstr "ààààààà àààààà àà, àààààà ààààààà àààà ààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:743
+#: ../camel/providers/smtp/camel-smtp-transport.c:814
 msgid "Requested mail action okay, completed"
 msgstr "àààà ààààààààà àààààà ààà àààà àààà, ààààààà ààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
+#: ../camel/providers/smtp/camel-smtp-transport.c:816
 msgid "User not local; will forward to <forward-path>"
 msgstr "ààààààà ààààààààààà àà; <forward-path>'à àààààààà ààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:747
+#: ../camel/providers/smtp/camel-smtp-transport.c:818
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "àààà ààààààààà àààààà ààà àààà àààààààà àààà: àààà-àààà àààààà àà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:749
+#: ../camel/providers/smtp/camel-smtp-transport.c:820
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "àààààà ààà àààà àààààààà àààà: àààà-àààà àààààà àà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:751
+#: ../camel/providers/smtp/camel-smtp-transport.c:822
 msgid "Requested action aborted: error in processing"
 msgstr "àààààà ààà àààà ààààà ààà ààààà: ààààààààààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:753
+#: ../camel/providers/smtp/camel-smtp-transport.c:824
 msgid "User not local; please try <forward-path>"
 msgstr "ààààààà ààààààààààà àà; ààààààà ààà <forward-path> ààààààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:755
+#: ../camel/providers/smtp/camel-smtp-transport.c:826
 msgid "Requested action not taken: insufficient system storage"
 msgstr "àààààà ààà àààà àààààààà àààà: ààààààààààà àààààààà ààààà ààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:757
+#: ../camel/providers/smtp/camel-smtp-transport.c:828
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
-"àààà ààààààààà àààààà ààà àààà ààààà ààà ààààà: ààààààààààà àààààà ààààà àààààààààà "
+"àààà ààààààààà àààààà ààà àààà ààààà ààà ààààà: ààààààààààà àààààà ààààà "
+"àààààààààà "
 "ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:759
+#: ../camel/providers/smtp/camel-smtp-transport.c:830
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "àààààà ààà àààà àààààààà àààà: àààà-àààààà ààà àààààààààà àà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:761
+#: ../camel/providers/smtp/camel-smtp-transport.c:832
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "àààà ààààà ààààà àààà; ààààà ààààààà àààà <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:763
+#: ../camel/providers/smtp/camel-smtp-transport.c:834
 msgid "Transaction failed"
 msgstr "ààààààààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:767
+#: ../camel/providers/smtp/camel-smtp-transport.c:838
 msgid "A password transition is needed"
 msgstr "ààààààààà àààààààà ààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:769
+#: ../camel/providers/smtp/camel-smtp-transport.c:840
 msgid "Authentication mechanism is too weak"
 msgstr "ààààààà ààààààà ààààà àà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:771
+#: ../camel/providers/smtp/camel-smtp-transport.c:842
 msgid "Encryption required for requested authentication mechanism"
 msgstr "àààààà ààà ààààààà ààààààààà ààààààààà ààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:773
+#: ../camel/providers/smtp/camel-smtp-transport.c:844
 msgid "Temporary authentication failure"
 msgstr "ààààààà àààààà ààààààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1030
+#: ../camel/providers/smtp/camel-smtp-transport.c:1095
 msgid "SMTP Greeting"
 msgstr "SMTP'à ààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1057
-#: ../camel/providers/smtp/camel-smtp-transport.c:1074
-#: ../camel/providers/smtp/camel-smtp-transport.c:1082
-#| msgid "HELO command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1122
+#: ../camel/providers/smtp/camel-smtp-transport.c:1139
+#: ../camel/providers/smtp/camel-smtp-transport.c:1147
 msgid "HELO command failed: "
 msgstr "HELO àààààà àààààà: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1150
-msgid "SMTP Authentication"
-msgstr "SMTP ààààààà àààààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1157
-#, c-format
-msgid "Error creating SASL authentication object."
-msgstr "SASL ààààààààà ààààààà ààààààà àààà ààààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1176
-#: ../camel/providers/smtp/camel-smtp-transport.c:1187
-#: ../camel/providers/smtp/camel-smtp-transport.c:1196
-#| msgid "AUTH command failed: %s"
-msgid "AUTH command failed: "
-msgstr "AUTH àààààà àààààà: "
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1304
-#: ../camel/providers/smtp/camel-smtp-transport.c:1318
-#: ../camel/providers/smtp/camel-smtp-transport.c:1327
-#| msgid "MAIL FROM command failed"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1222
+#: ../camel/providers/smtp/camel-smtp-transport.c:1236
+#: ../camel/providers/smtp/camel-smtp-transport.c:1245
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM àààààà àààààà: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1354
-#| msgid "RSET command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1272
 msgid "RCPT TO command failed: "
 msgstr "RCPT TO àààààà àààààà: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1370
-#: ../camel/providers/smtp/camel-smtp-transport.c:1379
+#: ../camel/providers/smtp/camel-smtp-transport.c:1288
+#: ../camel/providers/smtp/camel-smtp-transport.c:1297
 #, c-format
-#| msgid "RCPT TO <%s> failed"
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> àààààà: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1421
-#: ../camel/providers/smtp/camel-smtp-transport.c:1431
-#: ../camel/providers/smtp/camel-smtp-transport.c:1441
-#: ../camel/providers/smtp/camel-smtp-transport.c:1500
-#: ../camel/providers/smtp/camel-smtp-transport.c:1519
-#: ../camel/providers/smtp/camel-smtp-transport.c:1532
-#: ../camel/providers/smtp/camel-smtp-transport.c:1540
-#| msgid "DATA command failed"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1339
+#: ../camel/providers/smtp/camel-smtp-transport.c:1349
+#: ../camel/providers/smtp/camel-smtp-transport.c:1359
+#: ../camel/providers/smtp/camel-smtp-transport.c:1418
+#: ../camel/providers/smtp/camel-smtp-transport.c:1437
+#: ../camel/providers/smtp/camel-smtp-transport.c:1450
+#: ../camel/providers/smtp/camel-smtp-transport.c:1458
 msgid "DATA command failed: "
 msgstr "DATA àààààà àààààà: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1565
-#: ../camel/providers/smtp/camel-smtp-transport.c:1579
-#: ../camel/providers/smtp/camel-smtp-transport.c:1587
-#| msgid "RSET command failed: %s"
+#: ../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: "
 msgstr "RSET àààààà àààààà: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1612
-#: ../camel/providers/smtp/camel-smtp-transport.c:1626
-#: ../camel/providers/smtp/camel-smtp-transport.c:1633
-#| msgid "QUIT command failed: %s"
+#: ../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: "
 msgstr "QUIT àààààà àààààà: "
 
 #: ../libedataserver/e-categories.c:47
-#| msgid "Anniversary"
 msgctxt "CategoryName"
 msgid "Anniversary"
 msgstr "ààààààà"
 
 #: ../libedataserver/e-categories.c:48
-#| msgid "Birthday"
 msgctxt "CategoryName"
 msgid "Birthday"
 msgstr "ààààààà"
 
 #: ../libedataserver/e-categories.c:49
-#| msgid "Business"
 msgctxt "CategoryName"
 msgid "Business"
 msgstr "àààààà"
 
 #: ../libedataserver/e-categories.c:50
-#| msgid "Competition"
 msgctxt "CategoryName"
 msgid "Competition"
 msgstr "àààààààààààààà"
 
 #: ../libedataserver/e-categories.c:51
-#| msgid "Favorites"
 msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "ààààà"
 
 #: ../libedataserver/e-categories.c:52
-#| msgid "Gifts"
 msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "ààààà"
 
 #: ../libedataserver/e-categories.c:53
-#| msgid "Goals/Objectives"
 msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "àààààààà"
 
 #: ../libedataserver/e-categories.c:54
-#| msgid "Holiday"
 msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "àààà"
 
 #: ../libedataserver/e-categories.c:55
-#| msgid "Holiday Cards"
 msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "àààà ààààààà ààààà"
 
 #. important people (e.g. new business partners)
 #: ../libedataserver/e-categories.c:57
-#| msgid "Hot Contacts"
 msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "àààààààààààà ààààààà"
 
 #: ../libedataserver/e-categories.c:58
-#| msgid "Ideas"
 msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "ààààà"
 
 #: ../libedataserver/e-categories.c:59
-#| msgid "International"
 msgctxt "CategoryName"
 msgid "International"
 msgstr "ààààààààààà"
 
 #: ../libedataserver/e-categories.c:60
-#| msgid "Key Customer"
 msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "àààààààààààà àààààà"
 
 #: ../libedataserver/e-categories.c:61
-#| msgid "Miscellaneous"
 msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "ààààà"
 
 #: ../libedataserver/e-categories.c:62
-#| msgid "Personal"
 msgctxt "CategoryName"
 msgid "Personal"
 msgstr "ààààààààà"
 
 #: ../libedataserver/e-categories.c:63
-#| msgid "Phone Calls"
 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"
 msgctxt "CategoryName"
 msgid "Status"
 msgstr "àààààà"
 
 #: ../libedataserver/e-categories.c:66
-#| msgid "Strategies"
 msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "àààà"
 
 #: ../libedataserver/e-categories.c:67
-#| msgid "Suppliers"
 msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "àààààààààà"
 
 #: ../libedataserver/e-categories.c:68
-#| msgid "Time & Expenses"
 msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "ààà à àààà"
 
 #: ../libedataserver/e-categories.c:69
-#| msgid "VIP"
 msgctxt "CategoryName"
 msgid "VIP"
 msgstr "àààààààààààà ààààààà (VIP)"
 
 #: ../libedataserver/e-categories.c:70
-#| msgid "Waiting"
 msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "ààààààààà"
 
+#: ../libedataserver/e-client.c:125
+#, fuzzy
+#| msgid "URI not loaded"
+msgid "Source not loaded"
+msgstr "URI àààààààà ààà ààà àà"
+
+#: ../libedataserver/e-client.c:127
+#, fuzzy
+#| msgid "URI already loaded"
+msgid "Source already loaded"
+msgstr "URI àààààà ààà ààà ààààà"
+
+#: ../libedataserver/e-client.c:135
+#, fuzzy
+#| msgid "Offline mode unavailable"
+msgid "Offline unavailable"
+msgstr "àà-àààà ààà àààààà àà"
+
+#: ../libedataserver/e-client.c:157
+#, fuzzy
+#| msgid "parse error"
+msgid "D-Bus error"
+msgstr "ààààà àààà àààààà"
+
 #. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
+#. * in 12-hour format.
 #. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1902
+#. * time, in 12-hour format.
+#: ../libedataserver/e-time-utils.c:1646 ../libedataserver/e-time-utils.c:1944
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
 #. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
+#. * in 24-hour format.
 #. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1893
+#. * time, in 24-hour format.
+#: ../libedataserver/e-time-utils.c:1651 ../libedataserver/e-time-utils.c:1935
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without seconds.
+#. * 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:1645 ../libedataserver/e-time-utils.c:1898
+#. * time, in 12-hour format, without seconds.
+#: ../libedataserver/e-time-utils.c:1656 ../libedataserver/e-time-utils.c:1940
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without seconds.
+#. * 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:1650 ../libedataserver/e-time-utils.c:1889
+#. * time, in 24-hour format, without seconds.
+#: ../libedataserver/e-time-utils.c:1661 ../libedataserver/e-time-utils.c:1931
 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:1655
+#. * in 12-hour format, without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1666
 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:1660
+#. * in 24-hour format, without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1671
 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:1663 ../libedataserver/e-time-utils.c:1765
-#: ../libedataserver/e-time-utils.c:1884
+#: ../libedataserver/e-time-utils.c:1674 ../libedataserver/e-time-utils.c:1794
+#: ../libedataserver/e-time-utils.c:1926
 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:1670
+#: ../libedataserver/e-time-utils.c:1681
 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:1674
+#: ../libedataserver/e-time-utils.c:1685
 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:1679
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1690
 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:1684
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1695
 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:1689
+#. * without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1700
 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:1694
+#. * without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1705
 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:1697 ../libedataserver/e-time-utils.c:1768
+#: ../libedataserver/e-time-utils.c:1708 ../libedataserver/e-time-utils.c:1797
 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:1826 ../libedataserver/e-time-utils.c:1946
+#: ../libedataserver/e-time-utils.c:1868 ../libedataserver/e-time-utils.c:1988
 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:1830 ../libedataserver/e-time-utils.c:1938
+#: ../libedataserver/e-time-utils.c:1872 ../libedataserver/e-time-utils.c:1980
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
-#. in 12-hour format.
+#. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1943
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1877 ../libedataserver/e-time-utils.c:1985
 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:1839 ../libedataserver/e-time-utils.c:1935
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1881 ../libedataserver/e-time-utils.c:1977
 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:1842
+#: ../libedataserver/e-time-utils.c:1884
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1846
+#: ../libedataserver/e-time-utils.c:1888
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-book-auth-util.c:93
-#: ../libedataserverui/e-book-auth-util.c:673
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
+msgid "Proxy type to use"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2
+msgid ""
+"What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" "
+"means manual proxy."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
+msgid "Whether to use http-proxy"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4
+msgid "Whether to use proxy for HTTP requests."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5
+msgid "Whether proxy server requires authentication"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
+#, fuzzy
+#| msgid "Bad authentication response from server."
+msgid "Whether authentication is required to access proxy server."
+msgstr "ààààààà àààà ààààààà ààààààààà ààààààààààà àààà ààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7
+msgid "Host name for HTTP requests"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8
+msgid "Host name to use for HTTP requests."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9
+msgid "Port number for HTTP requests"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10
+msgid "Port number to use for HTTP requests."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
+#, fuzzy
+#| msgid "Unknown authentication state."
+msgid "Proxy authentication user name"
+msgstr "ààààààààà àààààà àààààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
+#, fuzzy
+#| msgid ""
+#| "Unable to authenticate to IMAP server.\n"
+#| "%s\n"
+#| "\n"
+msgid "User name to use to authenticate against proxy server."
+msgstr ""
+"IMAP àààààààà ààààààà àààà ààààààà\n"
+"%s\n"
+"\n"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
+#, fuzzy
+#| msgid "Temporary authentication failure"
+msgid "Proxy authentication password"
+msgstr "ààààààà àààààà ààààààààà àààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
+#, fuzzy
+#| msgid "Cannot authenticate to server: %s"
+msgid "Password to use to authenticate against proxy server."
+msgstr "àààààààà ààààààà àààà àààààà: %s"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:15
+msgid "List of hosts to connect to without proxy"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:16
+msgid "List of hosts for which do not use proxy."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:17
+msgid "Host name for HTTPS requests"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:18
+msgid "Host name to use for HTTPS requests."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:19
+msgid "Port number for HTTPS requests"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:20
+msgid "Port number to use for HTTPS requests."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:21
+#, fuzzy
+#| msgid "Host is unreachable from SOCKS server"
+msgid "Host name for SOCKS requests"
+msgstr "SOCKS ààààààà àààà ààààààà àààà ààààà àààààà ààà àààààà àà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:22
+msgid "Host name to use for SOCKS requests."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:23
+msgid "Port number for SOCKS requests"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:24
+msgid "Port number to use for SOCKS requests."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:25
+msgid "Automatic proxy configuration URL"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:26
+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:199
-#: ../libedataserverui/e-book-auth-util.c:435
+#: ../libedataserverui/e-book-auth-util.c:197
+#: ../libedataserverui/e-book-auth-util.c:423
 msgid "Failed to authenticate.\n"
 msgstr "ààààààà àààà ààààà\n"
 
-#: ../libedataserverui/e-categories-dialog.c:131
-msgid "Category Properties"
-msgstr "ààààààààààààà ààààààààà"
+#: ../libedataserverui/e-categories-editor.c:228
+msgid "Currently _used categories:"
+msgstr "àààààààà ààààààà àààààà: (_u)"
 
-#: ../libedataserverui/e-categories-dialog.c:142
-msgid "Category _Name"
-msgstr "ààààààà ààà (_N)"
+#: ../libedataserverui/e-categories-editor.c:237
+msgid "_Available Categories:"
+msgstr "àààààà àààààà: (_A)"
 
-#: ../libedataserverui/e-categories-dialog.c:148
-msgid "Category _Icon"
-msgstr "ààààààà àààààà (_I)"
+#: ../libedataserverui/e-categories-selector.c:322
+msgid "Icon"
+msgstr "àààà"
 
-#: ../libedataserverui/e-categories-dialog.c:189
+#: ../libedataserverui/e-categories-selector.c:327
+msgid "Category"
+msgstr "ààààààààààà"
+
+#: ../libedataserverui/e-category-completion.c:299
+#, c-format
+msgid "Create category \"%s\""
+msgstr "\"%s\" ààààà ààààààà ààà ààà"
+
+#: ../libedataserverui/e-category-editor.c:135
 msgid "Category Icon"
 msgstr "ààààààààààààà àààààà"
 
-#: ../libedataserverui/e-categories-dialog.c:195
+#: ../libedataserverui/e-category-editor.c:139
 msgid "_No Image"
 msgstr "ààà ààààààààà (_N)"
 
-#: ../libedataserverui/e-categories-dialog.c:406
+#: ../libedataserverui/e-category-editor.c:176
+msgid "Category _Name"
+msgstr "ààààààà ààà (_N)"
+
+#: ../libedataserverui/e-category-editor.c:184
+msgid "Category _Icon"
+msgstr "ààààààà àààààà (_I)"
+
+#: ../libedataserverui/e-category-editor.c:224
+msgid "Category Properties"
+msgstr "ààààààààààààà ààààààààà"
+
+#: ../libedataserverui/e-category-editor.c:285
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr ""
-"ààààààà ààààààààààà '%s' àààà àààà ààààà ààààààà àààààà ààààààà ààà àààà àààà ààà "
+"ààààààà ààààààààààà '%s' àààà àààà ààààà ààààààà àààààà ààààààà ààà àààà àààà "
+"ààà "
 "ààààààà àààà"
 
-#: ../libedataserverui/e-categories-dialog.c:663
-msgid "Currently _used categories:"
-msgstr "àààààààà ààààààà àààààà: (_u)"
+#: ../libedataserverui/e-client-utils.c:856
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid ""
+"Enter password for calendar %s (user %s)\n"
+"Reason: %s"
+msgstr "%s'à àààà ààààààààà ààààà (ààààààààààà %s)"
 
-#: ../libedataserverui/e-categories-dialog.c:670
-msgid "_Available Categories:"
-msgstr "àààààà àààààà: (_A)"
+#: ../libedataserverui/e-client-utils.c:858
+#, fuzzy, 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
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid ""
+"Enter password for task list %s (user %s)\n"
+"Reason: %s"
+msgstr "%s'à àààà ààààààààà ààààà (ààààààààààà %s)"
 
-#: ../libedataserverui/e-categories-dialog.c:713
-msgid "_Edit"
-msgstr "àààààààà (_E)"
+#: ../libedataserverui/e-client-utils.c:864
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid "Enter password for task list %s (user %s)"
+msgstr "%s'à àààà ààààààààà ààààà (ààààààààààà %s)"
 
-#: ../libedataserverui/e-categories-dialog.c:769
-msgid "Icon"
-msgstr "àààà"
+#: ../libedataserverui/e-client-utils.c:868
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid ""
+"Enter password for memo list %s (user %s)\n"
+"Reason: %s"
+msgstr "%s'à àààà ààààààààà ààààà (ààààààààààà %s)"
 
-#: ../libedataserverui/e-categories-dialog.c:774
-msgid "Category"
-msgstr "ààààààààààà"
+#: ../libedataserverui/e-client-utils.c:870
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid "Enter password for memo list %s (user %s)"
+msgstr "%s'à àààà ààààààààà ààààà (ààààààààààà %s)"
 
-#: ../libedataserverui/e-category-completion.c:292
-#, c-format
-msgid "Create category \"%s\""
-msgstr "\"%s\" ààààà ààààààà ààà ààà"
+#: ../libedataserverui/e-client-utils.c:981
+#, fuzzy
+#| msgid "Enter password"
+msgid "Enter Passphrase"
+msgstr "ààààààààà ààààà"
+
+#: ../libedataserverui/e-client-utils.c:983
+#, fuzzy
+#| msgid "Enter password"
+msgid "Enter Password"
+msgstr "ààààààààà ààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:169
-#| msgid "Hot Contacts"
+#: ../libedataserverui/e-name-selector-dialog.c:187
 msgid "Show Contacts"
 msgstr "ààààààà àààààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:191
+#: ../libedataserverui/e-name-selector-dialog.c:209
 msgid "Address B_ook:"
 msgstr "àààààà àà: (_o)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:199
+#: ../libedataserverui/e-name-selector-dialog.c:217
 msgid "Cate_gory:"
 msgstr "àààààà: (_g)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:217
+#: ../libedataserverui/e-name-selector-dialog.c:235
 msgid "_Search:"
 msgstr "ààààààààà: (_S)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:235
-#: ../libedataserverui/e-name-selector-dialog.c:974
+#: ../libedataserverui/e-name-selector-dialog.c:253
+#: ../libedataserverui/e-name-selector-dialog.c:1038
 msgid "Any Category"
 msgstr "àà àààà àààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:237
-#| msgid "Contacts"
+#: ../libedataserverui/e-name-selector-dialog.c:255
 msgid "Co_ntacts"
 msgstr "ààààààà (_n)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:282
+#: ../libedataserverui/e-name-selector-dialog.c:310
 msgid "Search"
 msgstr "ààààààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:285
+#: ../libedataserverui/e-name-selector-dialog.c:313
 msgid "Address Book"
 msgstr "àààààà àà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:288
+#: ../libedataserverui/e-name-selector-dialog.c:316
 msgid "Contacts"
 msgstr "ààààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:405
+#: ../libedataserverui/e-name-selector-dialog.c:433
 msgid "Select Contacts from Address Book"
 msgstr "àààààà àà àààà ààààààà àààààààà àààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:744
+#: ../libedataserverui/e-name-selector-dialog.c:781
 msgid "_Add"
 msgstr "ààà àààà (_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:748
+#: ../libedataserverui/e-name-selector-dialog.c:785
 msgid "_Remove"
 msgstr "àààà ààààà (_R)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:888
+#: ../libedataserverui/e-name-selector-dialog.c:957
 #, 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:2673
+#: ../libedataserverui/e-name-selector-entry.c:2823
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "àà-àààà ààààààà %s ààààààà ààà ààà (_x)"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2688
+#: ../libedataserverui/e-name-selector-entry.c:2838
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s ààà àààà (_y)"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2698
+#: ../libedataserverui/e-name-selector-entry.c:2848
 #, c-format
 msgid "C_ut %s"
 msgstr "%s ààà àààà (_u)"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2715
+#: ../libedataserverui/e-name-selector-entry.c:2865
 #, c-format
 msgid "_Edit %s"
 msgstr "%s àààààààà (_E)"
 
-#: ../libedataserverui/e-name-selector-list.c:513
+#: ../libedataserverui/e-name-selector-list.c:524
 #, c-format
 msgid "_Delete %s"
 msgstr "%s àààà ààààà (_D)"
 
-#: ../libedataserverui/e-passwords.c:127
-#, c-format
+#: ../libedataserverui/e-passwords.c:126
 msgid "Keyring key is unusable: no user or host name"
 msgstr "àà-àààààà àà àààààààààààà àà: ààààààààààà àààà ààààà-ààà ààààààààà"
 
 #: ../libedataserverui/e-passwords.c:701
+#: ../libedataserverui/e-passwords-win32.c:614
 msgid "You have the Caps Lock key on."
 msgstr "àààààà-àà àààààà"
 
 #: ../libedataserverui/e-passwords.c:821
+#: ../libedataserverui/e-passwords-win32.c:737
 msgid "_Remember this passphrase"
 msgstr "àààààààà ààà àààà ààà (_R)"
 
 #: ../libedataserverui/e-passwords.c:822
+#: ../libedataserverui/e-passwords-win32.c:738
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "àààààààà ààààààà ààààààà ààààà àààà àààààààà ààà àààà ààà (_R)"
 
 #: ../libedataserverui/e-passwords.c:827
+#: ../libedataserverui/e-passwords-win32.c:743
 msgid "_Remember this password"
 msgstr "ààààààààà ààà àààà ààà (_R)"
 
 #: ../libedataserverui/e-passwords.c:828
+#: ../libedataserverui/e-passwords-win32.c:744
 msgid "_Remember this password for the remainder of this session"
 msgstr "àààààààà ààààààà ààààààà ààààà àààà ààààààààà ààà àààà ààà (_R)"
 
 #. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:101
+#: ../libedataserverui/e-source-selector-dialog.c:91
 msgid "Select destination"
 msgstr "ààààààààààà àààààààà àààà"
 
-#: ../libedataserverui/e-source-selector-dialog.c:172
+#: ../libedataserverui/e-source-selector-dialog.c:166
 msgid "_Destination"
 msgstr "ààààààààààà (_D)"
 
-#: ../servers/groupwise/e-gw-connection.c:227
-msgid "Invalid connection"
-msgstr "àààà ààààà"
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:48
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:52
+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
+msgid "Wait running until at least one client is connected"
+msgstr ""
+
+#~ msgid "Updating contacts cache (%d)... "
+#~ msgstr "ààààààààà ààààààà àààààà ààààà ààà ààààà (%d)... "
+
+#~| msgid "Cannot get message %s: %s"
+#~ msgid "Cannot get supported fields: %s"
+#~ msgstr "ààààààà ààààààà ààààààà àààà àààààà: %s"
+
+#~| msgid "Cannot get message %s: %s"
+#~ msgid "Cannot get required fields: %s"
+#~ msgstr "àààààà ààààààààààà ààààààà àààà àààààà: %s"
+
+#~| msgid "Unsupported authentication method"
+#~ msgid "Cannot get supported authentication methods: %s"
+#~ msgstr "ààààààà ààààààà àààààààààà ààààààà àààà àààààà: %s"
+
+#~| msgid "Cannot get message %s: %s"
+#~ msgid "Cannot get changes: %s"
+#~ msgstr "àààààààà ààààààà ààà ààààà àà: %s"
+
+#~| msgid "Operation failed: %s"
+#~ msgid "Cancel operation failed: %s"
+#~ msgstr "ààààààà àààà àààààà: %s"
+
+#~ msgid "Reply Requested: by "
+#~ msgstr "ààààààà àààààà àààààà ààààà: ààààààà ààààà ààààà"
+
+#~ msgid "Reply Requested: When convenient"
+#~ msgstr "ààààààà àààààà àààààà ààààà: àààààààààààà"
+
+#~| msgid "Loading %s items"
+#~ msgid "Loading Appointment items"
+#~ msgstr "àààààààààààà àààà ààà ààà ààààà"
+
+#~| msgid "Loading %s items"
+#~ msgid "Loading Task items"
+#~ msgstr "ààààààààààà àààà ààà ààà ààààà"
+
+#~| msgid "Loading %s items"
+#~ msgid "Loading Note items"
+#~ msgstr "ààààà àààà ààà ààà ààààà"
+
+#~| msgid "Loading %s items"
+#~ msgid "Loading items"
+#~ msgstr "ààààààà ààà ààà ààààà"
+
+#~ msgid "Calendar"
+#~ msgstr "ààààààààà"
+
+#~ msgid "Invalid server URI"
+#~ msgstr "ààààààààà URI ààà àà"
+
+#~ msgid "Could not create thread for populating cache"
+#~ msgstr "ààààààà ààààà àààà àààààà àààà ààààà ààààààà àààà àààààà"
+
+#~| msgid "Cannot save calendar data: Malformed URI."
+#~ msgid "Cannot retrieve calendar alarm e-mail address: %s"
+#~ msgstr "àààààààààà ààààààààààà à-àààà àààààà ààààààà àààà àààààà: %s"
+
+#~| msgid "Cannot save calendar data"
+#~ msgid "Cannot retrieve calendar's LDAP attribute: %s"
+#~ msgstr "àààààààààà LDAP ààààààààà ààààààà àààà àààààà: %s"
+
+#~| msgid "Cannot create CMS Recipient information"
+#~ msgid "Cannot retrieve calendar scheduling information: %s"
+#~ msgstr "àààààààààà àààààààààà  àààà ààààààà àààà àààààà: %s"
+
+#~| msgid "Cannot save calendar data"
+#~ msgid "Cannot discard calendar alarm: %s"
+#~ msgstr "àààààààààà ààààààààà ààààà ààà ààààà àà: %s"
+
+#~ msgid "Cannot retrieve default calendar object path: %s"
+#~ msgstr "àààààààààà àààààà ààààààààà ààà ààààààà àààà àààààà: %s"
+
+#~| msgid "Could not open cache directory: %s"
+#~ msgid "Could not complete calendar query: %s"
+#~ msgstr "àààààààààà ààààààààà ààààà ààà ààààà àààà: %s"
+
+#~| msgid "Could not send message: %s"
+#~ msgid "Could not set default calendar time zone: %s"
+#~ msgstr "àààààààààà àààààà ààààà ààààà àààààààà ààà ààààà: %s"
+
+#~| msgid "Cannot create folder: %s: %s"
+#~ msgid "Cannot retrieve calendar changes: %s"
+#~ msgstr "àààààààààà àààààààààààà ààààààà ààà ààààà àààà: %s"
+
+#~| msgid "Invalid server URI"
+#~ msgid "Invalid URI"
+#~ msgstr "URI ààà àà"
+
+#~ msgid "No backend factory for '%s' of '%s'"
+#~ msgstr "'%s' -à ('%s'-à) àààà àààà ààààà-àààà ààààààààà ààààààà ààà"
+
+#~| msgid "Could not create cache file"
+#~ msgid "Could not instantiate backend"
+#~ msgstr "ààààà-àààà ààààà àààà àààààà"
+
+#~| msgid "No such message available."
+#~ msgid "No stream available"
+#~ msgstr "àààà ààààààà àààààà ààà"
+
+#~ msgid "URL '%s' needs a username component"
+#~ msgstr "URL '%s'-à àààà àààààààààààà ààà (username) àààààà ààà àààààà"
+
+#~ msgid "URL '%s' needs a host component"
+#~ msgstr "URL '%s'-à àààà ààààà (host) àààààà ààà àààààà"
+
+#~ msgid "URL '%s' needs a path component"
+#~ msgstr "URL '%s'-à àààà ààà (path) àààààà ààà àààààà"
+
+#~ msgid ""
+#~ "Could not create directory %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s ààààààààà ààààààà àààà àààààà:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "SSL Certificate check for %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you wish to accept?"
+#~ msgstr ""
+#~ "SSL Certificate check for %s'à àààà SSL ààààààààààà ààààààà:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "ààààà ààààà ààà ààà àà?"
+
+#~| msgid "Checking for new messages"
+#~ msgid "Checking for deleted messages %s"
+#~ msgstr "àààà àààà ààààààà àààààààà ààààààà ààà ààààà  %s"
+
+#~ msgid "Could not get message"
+#~ msgstr "àààààà ààààààà àààà àààààà"
+
+#~ msgid "Cannot append message to folder '%s': %s"
+#~ msgstr "'%s' ààààààààà àààà àààààà ààà ààà ààààà: %s"
+
+#~ msgid "Cannot create message: %s"
+#~ msgstr "àààààà ààààààà àààà àààààà: %s"
+
+#~ msgid ""
+#~ "Cannot get message: %s\n"
+#~ "  %s"
+#~ msgstr ""
+#~ "àààààà ààààààà àààà àààààà: %s\n"
+#~ "  %s"
+
+#~ msgid "This message is not available in offline mode."
+#~ msgstr "àà-àààà ààààààà àà àààààààà àààààà àààà"
+
+#~ msgid "Cannot get folder container %s"
+#~ msgstr "ààààààà àààààààà %s ààààààà àààà àààààà"
+
+#~ msgid "Cannot append message in offline mode: cache unavailable"
+#~ msgstr "àà-àààà ààààààà àààààà ààà àààà àààààà: àààààà àààààà ààà"
+
+#~| msgid "Cannot append message in offline mode: %s"
+#~ msgid "Cannot append message in offline mode: "
+#~ msgstr "àà-àààà ààààààà àààààà ààà àààà àààààà: "
+
+#~ msgid "Checking for new mail"
+#~ msgstr "àààà ààààààà àààààààà ààààààà ààà ààààà"
+
+#~ msgid "Check new messages for J_unk contents"
+#~ msgstr "àààà ààààààà ààààà àààààààà àààààà ààààààà ààà ààà(_u)"
 
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "Invalid response from server"
-msgstr "ààààààà àààà ààààààààààà ààààààààààà"
+#~ msgid "Automatically synchroni_ze account locally"
+#~ msgstr "àààààààààààààà ààààààààààà àààààààààà àààààà ààà ààà(_z)"
 
-#: ../servers/groupwise/e-gw-connection.c:233
-msgid "No response from the server"
-msgstr "ààààààà àààà àààà ààààààààààà ààààààà àààà"
+#~ msgid "SOAP Settings"
+#~ msgstr "SOAP'à ààààààààà"
 
-#: ../servers/groupwise/e-gw-connection.c:239
-msgid "Bad parameter"
-msgstr "ààà ààààààà"
+#~ msgid "Post Office Agent SOAP _Port:"
+#~ msgstr "Post Office Agent SOAP ààààà: (_P)"
+
+#~ msgid "Novell GroupWise"
+#~ msgstr "Novell GroupWise"
+
+#~ msgid "For accessing Novell GroupWise servers"
+#~ msgstr "Novell GroupWise ààààààà ààààààààà ààààààààà"
+
+#~ msgid ""
+#~ "This option will connect to the GroupWise server using a plaintext "
+#~ "password."
+#~ msgstr ""
+#~ "àà àààààààà ààà àààà àààààà-àààààà ààààààààà àààààà GroupWise ààààààààà àààà "
+#~ "ààààà ààà àààà"
+
+#~ msgid "Host or user not available in url"
+#~ msgstr "url'à ààààà ààààà àààà ààààààààààà àààààà àà"
+
+#~ msgid "You did not enter a password."
+#~ msgstr "ààààààààà àààààà ààà ààààà"
+
+#~ msgid ""
+#~ "Some features may not work correctly with your current server version"
+#~ msgstr ""
+#~ "àààààààà ààààààà ààààààààà ààààààààà àààà àààààà ààààààààà àààààààà àà àààà "
+#~ "àààààààà ààààà"
+
+#~ msgid "Cannot create GroupWise folders in offline mode."
+#~ msgstr "àà-àààà ààààààà GroupWise ààààààà ààààààà àààà ààààààà"
+
+#~| msgid "Cannot delete folder '%s': Special folder"
+#~ msgid "Cannot create a special system folder"
+#~ msgstr "ààààà ààààààà ààààààà ààààààà àààà àààààà"
+
+#~ msgid "Cannot rename GroupWise folder '%s' to '%s'"
+#~ msgstr "Groupwise ààààààààà ààà '%s' àààà '%s'-à àààààààà ààà àààà àà"
+
+#~ msgid "GroupWise server %s"
+#~ msgstr "GroupWise ààààààà %s"
+
+#~ msgid "GroupWise service for %s on %s"
+#~ msgstr "%s'à àààà GroupWise ààààààà %s'à ààà"
+
+#~ msgid "GroupWise mail delivery via %s"
+#~ msgstr "%s'à ààààààà GroupWise àààà ààààààààààààà"
+
+#~ msgid "Sending Message"
+#~ msgstr "àààààà àààààà"
+
+#~ msgid "Cannot get folder: Invalid operation on this store"
+#~ msgstr "ààààààà ààààààà àààà àààààà: ààààààà àààààààààààà ààààà àààà ààà àà"
+
+#~ msgid ""
+#~ "You have exceeded this account's storage limit. Your messages are queued "
+#~ "in your Outbox. Resend by pressing Send/Receive after deleting/archiving "
+#~ "some of your mail.\n"
+#~ msgstr ""
+#~ "ààààààà ààààààààààà ààààààààà àààà ààààààààààà ààààà àààààààààà ààààààààà ààààà "
+#~ "àààààààààà àààà àààààà ààààààà àààààààà ààà àààà àààà àààà, àààààà/àààààààà àààà "
+#~ "àààà àààààààààà àààààà àààààààà ààààààààà ààààà\n"
+
+#~ msgid "Could not send message: %s"
+#~ msgstr "àààààà àààààà àààà àààààà: %s"
+
+#~ msgid "Operation cancelled"
+#~ msgstr "àààà ààààà ààà ààààà"
+
+#~ msgid "_Apply filters to new messages in INBOX on this server"
+#~ msgstr "ààààààà ààààààààà àààààà ààààààààà àààà ààààààà ààààààà àààààà ààà ààà (_A)"
+
+#~ msgid "Check new messages for Jun_k contents"
+#~ msgstr "àààà ààààààà ààààà àààààààà àààààà ààààààà ààà ààà (_k)"
+
+#~ msgid "Could not connect to %s: %s"
+#~ msgstr "%s'à àààà ààààà àààà àààààà: %s"
+
+#~ msgid "SSL unavailable"
+#~ msgstr "SSL àààààà àà"
+
+#~ msgid "SSL negotiations failed"
+#~ msgstr "SSL ààààààà àààà àààààà"
+
+#~ msgid "SSL is not available in this build"
+#~ msgstr "ààààààà ààààààà ààààà SSL àààààà àà"
+
+#~ msgid "Use I_dle if the server supports it"
+#~ msgstr "ààààààà àààààà ààààààà ààà Idle ààààààà ààà ààà (_d)"
+
+#~| msgid "Could not connect to %s (port %s): %s"
+#~ msgid "Could not connect to %s (port %s): "
+#~ msgstr "%s-à (ààààà %s) àààà ààààà àààà àààààà"
+
+#~ msgid "Authentication requested but no username provided"
+#~ msgstr "ààààààààà àààààà àààààà ààààà àààààà àààààààààààà àà àààààààà àààà"
+
+#~ msgid "TLS negotiations failed"
+#~ msgstr "TLS ààààààà àààà àààààà"
+
+#~ msgid "TLS is not available in this build"
+#~ msgstr "ààààààà àààààà TLS ààààààà àà"
+
+#~ msgid ""
+#~ "Unable to connect to POP server %s: No support for requested "
+#~ "authentication mechanism."
+#~ msgstr ""
+#~ "POP ààààààà %s'à àààà ààààà àààà àààààà: àààààà àààà ààààààà ààààààà ààààààà ààà"
+
+#~| msgid "SASL '%s' Login failed for POP server %s: %s"
+#~ msgid "SASL '%s' Login failed for POP server %s%s"
+#~ msgstr "SASL '%s' àà-àà, POP ààààààà %s%s-4 àààààààà àààà"
+
+#~| 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%s"
+#~ msgstr ""
+#~ "POP ààààààà %s-à àààà ààààà àààà ààààààà\n"
+#~ "ààààààààà àààààà àààààà%s"
+
+#~ msgid ""
+#~ "Unable to authenticate to SMTP server.\n"
+#~ "%s\n"
+#~ "\n"
+#~ msgstr ""
+#~ "SMTP àààààààà ààààààà àààà ààààààà\n"
+#~ "%s\n"
+#~ "\n"
+
+#~ msgid "Error creating SASL authentication object."
+#~ msgstr "SASL ààààààààà ààààààà ààààààà àààà ààààààà"
+
+#~ msgid "_Edit"
+#~ msgstr "àààààààà (_E)"
+
+#~ msgid "Invalid connection"
+#~ msgstr "àààà ààààà"
+
+#~ msgid "Invalid response from server"
+#~ msgstr "ààààààà àààà ààààààààààà ààààààààààà"
+
+#~ msgid "No response from the server"
+#~ msgstr "ààààààà àààà àààà ààààààààààà ààààààà àààà"
+
+#~ msgid "Bad parameter"
+#~ msgstr "ààà ààààààà"
 
 #~ msgid "\"%s\" on book before \"%s\""
 #~ msgstr "ààààà ààààà \"%s\", \"%s\"'à àààààà ààààààà"
@@ -5357,13 +5908,6 @@ msgstr "ààà ààààààà"
 #~ msgid "Could not create thread for getting deltas"
 #~ msgstr "delta ààààààà àààà àààà ààààà ààààààà ààà ààààà"
 
-#~| msgid "Offline unavailable"
-#~ msgid "Offline mode unavailable"
-#~ msgstr "àà-àààà ààà àààààà àà"
-
-#~ msgid "Verifying message"
-#~ msgstr "ààààààà ààààààààààà"
-
 #~ msgid "Cannot open message"
 #~ msgstr "àààààà àààà ààààà"
 
@@ -5510,9 +6054,6 @@ msgstr "ààà ààààààà"
 #~ msgid "AKID/Issuer serial mismatch"
 #~ msgstr "AKID/ààààààà ààààààà ààààà"
 
-#~ msgid "Key usage does not support certificate signing"
-#~ msgstr "àà'à àààààà ààààààààààà àààààààà àààà ààààààà àà"
-
 #~ msgid "Error in application verification"
 #~ msgstr "àààààààààààà àààààààà àààààà"
 
@@ -5648,9 +6189,6 @@ msgstr "ààà ààààààà"
 #~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
 #~ msgstr "ààààààà '%s' àààà '%s' àààààààà àààààà ààà àààà àààààà: àààààà àààà àà"
 
-#~ msgid "Check new messages for _Junk contents"
-#~ msgstr "àààà ààààààà ààààà àààààààà àààààà ààààààà ààà ààà (_J)"
-
 #~ msgid "Only check for Junk messa_ges in the INBOX folder"
 #~ msgstr "àààààà ààààààààà ààààà ààààààààà àààààààà àààààà ààààààà ààà ààà (_g)"
 
@@ -5846,9 +6384,6 @@ msgstr "ààà ààààààà"
 #~ msgid "Enter password for %s"
 #~ msgstr "%s-à àààà ààààààààà ààààà"
 
-#~ msgid "Enter password"
-#~ msgstr "ààààààààà ààààà"
-
 #~ msgid "Owner"
 #~ msgstr "ààààà"
 
@@ -5966,7 +6501,3 @@ msgstr "ààà ààààààà"
 #~ msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
 #~ msgstr ""
 #~ "àààààà ààààààààààà àààà ààààà; àààààà àààà ààààà àààà àààààààà ààà ààààà àà\n"
-
-#: ../calendar/libecal/e-cal.c:1049
-msgid "On This Computer"
-msgstr "ààààààà ààààààààààà ààààà"