[evolution-data-server] Updated Gujarati Translations



commit 36fe4e8d9fd8397b55da0e63369108dcd9651d72
Author: Sweta Kothari <swkothar redhat com>
Date:   Wed Sep 21 16:32:48 2011 +0530

    Updated Gujarati Translations

 po/gu.po | 4441 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 2282 insertions(+), 2159 deletions(-)
---
diff --git a/po/gu.po b/po/gu.po
index 9c05668..08156d9 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -5,15 +5,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gu\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-data-server&component=Misc.\n";
-"POT-Creation-Date: 2011-02-16 16:36+0000\n"
-"PO-Revision-Date: 2011-03-22 14:43+0530\n"
-"Last-Translator: Sweta Kothari <swkothar redhat com>\n"
-"Language-Team: Gujarati\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: 2011-09-19 10:29+0000\n"
+"PO-Revision-Date: 2011-09-21 16:32+0000\n"
+"Last-Translator: \n"
+"Language-Team: gu_IN <kde-i18n-doc kde org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "\n"
 "\n"
@@ -43,1424 +44,1483 @@ msgstr ""
 "\n"
 "\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:828
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:478
 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:831
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4807
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:480
 msgid "Searching..."
 msgstr "àààà ààààà ààà..."
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:589
+#: ../addressbook/backends/google/e-book-backend-google.c:840
 msgid "Querying for updated contactsâ"
 msgstr "ààààààà ààààààà àààà àààààààà ààà ààààà àà..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:624
+#: ../addressbook/backends/google/e-book-backend-google.c:891
+#: ../addressbook/libebook/e-book.c:3549 ../calendar/libecal/e-cal.c:1381
+#: ../libedataserver/e-client.c:1951
 msgid "Personal"
 msgstr "ààààà"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:626
-#| msgid "Favorites"
+#: ../addressbook/backends/google/e-book-backend-google.c:893
 msgid "Friends"
 msgstr "àààààà"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:628
-#| msgid "Family Name"
+#: ../addressbook/backends/google/e-book-backend-google.c:895
 msgid "Family"
 msgstr "àààààà"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:630
+#: ../addressbook/backends/google/e-book-backend-google.c:897
 msgid "Coworkers"
-msgstr ""
+msgstr "ààààààààààà"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:707
+#: ../addressbook/backends/google/e-book-backend-google.c:981
 msgid "Querying for updated groupsâ"
 msgstr "ààààààà àààà àààà àààààààà ààà ààààà àà..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:891
+#. Insert the entry on the server asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:1400
 msgid "Creating new contactâ"
 msgstr "ààà àààààààà ààààà ààààà àà..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:984
+#: ../addressbook/backends/google/e-book-backend-google.c:1510
 msgid "Deleting contactâ"
 msgstr "àààààààà àààà ààààà àà..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1092
+#. Update the contact on the server asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:1791
 msgid "Modifying contactâ"
 msgstr "àààààààà àààà ààààà àà..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1199
-#| msgid "Loading..."
+#: ../addressbook/backends/google/e-book-backend-google.c:1998
 msgid "Loadingâ"
 msgstr "àààà ààààà ààà..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1346
-#| msgid "Authentication required"
+#: ../addressbook/backends/google/e-book-backend-google.c:2156
 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:3028
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3075
-#, 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."
 msgid "Not connected"
 msgstr "ààààààà ààà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:764
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:784
 msgid "Using Distinguished Name (DN)"
 msgstr "ààààààà ààà (DN) ààààà ààààà ààà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:767
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:787
 msgid "Using Email Address"
 msgstr "ààààà ààààààà ààààà ààààà ààà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1033
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1058
 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:1187
 msgid "Invalid DN syntax"
 msgstr "àààààà DN ààààààààà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1675
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1712
 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:1843
 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:2278
 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:4658
 msgid "Receiving LDAP search results..."
 msgstr "LDAP àààààà ààààààà ààààà ààààà ààà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4528
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4828
 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:4177
-#: ../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
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4949
+#, c-format
+msgid "Downloading contacts (%d)... "
+msgstr "ààààààà ààààààà ààà ààààà ààà (%d)... "
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:278
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:906
+#: ../addressbook/libebook/e-book-client.c:103
+#: ../addressbook/libedata-book/e-data-book.c:452
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:530
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:559
+#: ../calendar/backends/http/e-cal-backend-http.c:433
+#: ../calendar/libecal/e-cal.c:4595 ../calendar/libecal/e-cal-client.c:147
+#: ../camel/providers/imap/camel-imap-command.c:484
+#: ../camel/providers/imap/camel-imap-store.c:411
+#: ../camel/providers/imapx/camel-imapx-server.c:2280
+#: ../camel/providers/smtp/camel-smtp-transport.c:442
+#: ../libedataserver/e-client.c:159
 msgid "Unknown error"
 msgstr "ààààà ààà"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:335
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:343
 #, c-format
 msgid "Create resource '%s' failed with HTTP status: %d (%s)"
-msgstr ""
+msgstr "HTTP àààààà àààà àààààà àààà ààààààà '%s' àà ààààà: %d (%s)"
 
-#: ../addressbook/libebook/e-book.c:3064
-#, fuzzy, c-format
+#: ../addressbook/libebook/e-book.c:3216
+#, 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' àààà ààààà ààà ààààà à ààà."
+msgstr "%s: GConf ààà àààààà àààà UID '%s' àààà ààààààà à ààà."
 
-#: ../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:3532 ../calendar/libecal/e-cal.c:1361
+#: ../libedataserver/e-client.c:1946
+msgid "On This Computer"
+msgstr "à àààààààààààà"
+
+#: ../addressbook/libebook/e-book.c:3658
+#: ../addressbook/libebook/e-book-client.c:678
+#: ../addressbook/libedata-book/e-data-book.c:315
 msgid "Address book does not exist"
 msgstr "ààààààà àààààààà ààààààààààà ààà"
 
+#: ../addressbook/libebook/e-book-client.c:92
+#| msgid "No such folder %s"
+msgid "No such book"
+msgstr "ààà ààààà ààà"
+
+#: ../addressbook/libebook/e-book-client.c:94
+#: ../addressbook/libedata-book/e-data-book.c:308
+msgid "Contact not found"
+msgstr "àààààà ààààà ààà"
+
+#: ../addressbook/libebook/e-book-client.c:96
+#: ../addressbook/libedata-book/e-data-book.c:309
+msgid "Contact ID already exists"
+msgstr "àààààà ID ààààààà à àààà àà"
+
+#: ../addressbook/libebook/e-book-client.c:98
+#| msgid "No such message"
+msgid "No such source"
+msgstr "ààà ààààààà ààà"
+
+#: ../addressbook/libebook/e-book-client.c:100
+#: ../addressbook/libedata-book/e-data-book.c:325
+msgid "No space"
+msgstr "ààààà ààà"
+
+#: ../addressbook/libebook/e-book-client.c:491
+#| msgid "Failed to encode data"
+msgid "Failed to run book factory"
+msgstr "ààààà ààààààààà ààààààààà àààààààà"
+
+#: ../addressbook/libebook/e-book-client.c:501
+#: ../addressbook/libedata-book/e-data-book-factory.c:379
+#: ../addressbook/libedata-book/e-data-book-factory.c:437
+#: ../calendar/libecal/e-cal-client.c:610
+#: ../calendar/libedata-cal/e-data-cal-factory.c:399
+#, c-format
+msgid "Invalid source"
+msgstr "àààààà ààààà"
+
+#: ../addressbook/libebook/e-book-client.c:603
+#: ../calendar/libecal/e-cal-client.c:725
+#, c-format
+msgid "Incorrect uri '%s'"
+msgstr "àààààà uri '%s'"
+
+#: ../addressbook/libebook/e-book-client.c:641
+#| msgid "Failed on message %d"
+msgid "Failed to find system book"
+msgstr "àààààà ààààààà àààààààà àààààààà"
+
+#: ../addressbook/libebook/e-book-client.c:750
+#: ../calendar/libecal/e-cal-client.c:878
+#, c-format
+#| msgid "%s: there was no source for uid `%s' stored in gconf."
+msgid "There was no source for UID '%s' stored in a source list."
+msgstr "ààààààà ààààààà àààààà àààà UID '%s' àààà ààààààà à ààà."
+
+#: ../addressbook/libebook/e-book-client.c:2280
+#: ../calendar/libecal/e-cal-client.c:4482
+#| 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:116
 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:119
 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:121
 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:127
 msgid "Full Name"
 msgstr "àààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:128
 msgid "Given Name"
 msgstr "àààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:126
+#: ../addressbook/libebook/e-contact.c:129
 msgid "Family Name"
 msgstr "ààààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:127
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Nickname"
 msgstr "àààààà ààà"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 1"
 msgstr "à-àààà à"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Email 2"
 msgstr "à-àààà à"
 
-#: ../addressbook/libebook/e-contact.c:132
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Email 3"
 msgstr "à-àààà à"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:136
 msgid "Email 4"
 msgstr "à-àààà à"
 
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Mailer"
 msgstr "àààà ààààà"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:141
 msgid "Home Address Label"
 msgstr "àààà ààààààààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:139
+#: ../addressbook/libebook/e-contact.c:142
 msgid "Work Address Label"
 msgstr "ààà àààààà ààààààààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:140
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Other Address Label"
 msgstr "àààà àààààààààà àààà"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Assistant Phone"
 msgstr "àààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Business Phone"
 msgstr "àààà àààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Business Phone 2"
 msgstr "àààà àààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Business Fax"
 msgstr "àààà àààààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Callback Phone"
 msgstr "àààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Car Phone"
 msgstr "àààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Company Phone"
 msgstr "ààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Home Phone"
 msgstr "àààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Home Phone 2"
 msgstr "àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Home Fax"
 msgstr "àààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:156
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Mobile Phone"
 msgstr "àààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Other Phone"
 msgstr "àààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Other Fax"
 msgstr "àààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Pager"
 msgstr "àààà"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:161
 msgid "Primary Phone"
 msgstr "àààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:162
 msgid "Radio"
 msgstr "àààààà"
 
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:163
 msgid "Telex"
 msgstr "ààààààà"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:162
+#: ../addressbook/libebook/e-contact.c:165
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Organization"
 msgstr "àààààà"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Organizational Unit"
 msgstr "àààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Office"
 msgstr "àààà"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Title"
 msgstr "àààààà"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:172
 msgid "Role"
 msgstr "àààààà"
 
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook/e-contact.c:173
 msgid "Manager"
 msgstr "àààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:171
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Assistant"
 msgstr "ààààà"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:174
+#: ../addressbook/libebook/e-contact.c:177
 msgid "Homepage URL"
 msgstr "ààààààà URL"
 
-#: ../addressbook/libebook/e-contact.c:175
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Weblog URL"
 msgstr "àààààà URL"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:756
+#: ../addressbook/libebook/e-contact.c:181
+#: ../libedataserverui/e-categories-dialog.c:85
 msgid "Categories"
 msgstr "ààààà"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Calendar URI"
 msgstr "àààààààà URI"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Free/Busy URL"
 msgstr "ààààà/àààààà URL"
 
-#: ../addressbook/libebook/e-contact.c:183
+#: ../addressbook/libebook/e-contact.c:186
 msgid "ICS Calendar"
 msgstr "ICS àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:184
+#: ../addressbook/libebook/e-contact.c:187
 msgid "Video Conferencing URL"
 msgstr "àààààà ààààààà URL"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:187
+#: ../addressbook/libebook/e-contact.c:190
 msgid "Spouse's Name"
 msgstr "àààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:188
+#: ../addressbook/libebook/e-contact.c:191
 msgid "Note"
 msgstr "àààà"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:194
 msgid "AIM Home Screen Name 1"
 msgstr "AIM àààà àààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Home Screen Name 2"
 msgstr "AIM àààà àààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Home Screen Name 3"
 msgstr "AIM àààà àààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:197
 msgid "AIM Work Screen Name 1"
 msgstr "AIM ààà àààààà àààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:198
 msgid "AIM Work Screen Name 2"
 msgstr "AIM ààà àààààà àààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:199
 msgid "AIM Work Screen Name 3"
 msgstr "AIM ààà àààààà àààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:200
 msgid "GroupWise Home Screen Name 1"
 msgstr "ààà ààààààà àààà àààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Home Screen Name 2"
 msgstr "ààà ààààààà àààà àààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Home Screen Name 3"
 msgstr "ààà ààààààà àààà àààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:203
 msgid "GroupWise Work Screen Name 1"
 msgstr "ààà ààààààà ààà àààààà àààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:204
 msgid "GroupWise Work Screen Name 2"
 msgstr "ààà ààààààà ààà àààààà àààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:205
 msgid "GroupWise Work Screen Name 3"
 msgstr "ààà ààààààà ààà àààààà àààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:203
-#| msgid "Jabber Home Id 1"
+#: ../addressbook/libebook/e-contact.c:206
 msgid "Jabber Home ID 1"
 msgstr "Jabber àà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:204
-#| msgid "Jabber Home Id 2"
+#: ../addressbook/libebook/e-contact.c:207
 msgid "Jabber Home ID 2"
 msgstr "Jabber àà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:205
-#| msgid "Jabber Home Id 3"
+#: ../addressbook/libebook/e-contact.c:208
 msgid "Jabber Home ID 3"
 msgstr "Jabber àà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:206
-#| msgid "Jabber Work Id 1"
+#: ../addressbook/libebook/e-contact.c:209
 msgid "Jabber Work ID 1"
 msgstr "Jabber ààààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:207
-#| msgid "Jabber Work Id 2"
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Jabber Work ID 2"
 msgstr "Jabber ààààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:208
-#| msgid "Jabber Work Id 3"
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Jabber Work ID 3"
 msgstr "Jabber ààààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Home Screen Name 1"
 msgstr "àààà! àà àààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Home Screen Name 2"
 msgstr "àààà! àà àààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Home Screen Name 3"
 msgstr "àààà! àà àààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:215
 msgid "Yahoo! Work Screen Name 1"
 msgstr "àààà! ààà àààààà àààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:216
 msgid "Yahoo! Work Screen Name 2"
 msgstr "àààà! ààà àààààà àààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Yahoo! Work Screen Name 3"
 msgstr "àààà! ààà àààààà àààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:218
 msgid "MSN Home Screen Name 1"
 msgstr "MSN àà àààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Home Screen Name 2"
 msgstr "MSN àà àààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Home Screen Name 3"
 msgstr "MSN àà àààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:221
 msgid "MSN Work Screen Name 1"
 msgstr "MSN ààà àààààà àààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:222
 msgid "MSN Work Screen Name 2"
 msgstr "MSN ààà àààààà àààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:223
 msgid "MSN Work Screen Name 3"
 msgstr "MSN ààà àààààà àààààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:221
-#| msgid "ICQ Home Id 1"
+#: ../addressbook/libebook/e-contact.c:224
 msgid "ICQ Home ID 1"
 msgstr "ICQ àà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:222
-#| msgid "ICQ Home Id 2"
+#: ../addressbook/libebook/e-contact.c:225
 msgid "ICQ Home ID 2"
 msgstr "ICQ àà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:223
-#| msgid "ICQ Home Id 3"
+#: ../addressbook/libebook/e-contact.c:226
 msgid "ICQ Home ID 3"
 msgstr "ICQ àà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:224
-#| msgid "ICQ Work Id 1"
+#: ../addressbook/libebook/e-contact.c:227
 msgid "ICQ Work ID 1"
 msgstr "ICQ ààààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:225
-#| msgid "ICQ Work Id 2"
+#: ../addressbook/libebook/e-contact.c:228
 msgid "ICQ Work ID 2"
 msgstr "ICQ ààààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:226
-#| msgid "ICQ Work Id 3"
+#: ../addressbook/libebook/e-contact.c:229
 msgid "ICQ Work ID 3"
 msgstr "ICQ ààààà ID 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook/e-contact.c:232
 msgid "Last Revision"
 msgstr "ààààààà àààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:230
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Name or Org"
 msgstr "ààà àààà àààààà"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:236
 msgid "Address List"
 msgstr "àààààààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:237
 msgid "Home Address"
 msgstr "ààààà ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:235
+#: ../addressbook/libebook/e-contact.c:238
 msgid "Work Address"
 msgstr "ààà ààààààà ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:236
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Other Address"
 msgstr "àààà ààààààà"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:239
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Category List"
 msgstr "àààààà àààà"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:242
+#: ../addressbook/libebook/e-contact.c:245
 msgid "Photo"
 msgstr "àààà"
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Logo"
 msgstr "àààà"
 
-#: ../addressbook/libebook/e-contact.c:245
+#: ../addressbook/libebook/e-contact.c:248
 msgid "Name"
 msgstr "ààà"
 
-#: ../addressbook/libebook/e-contact.c:246
+#: ../addressbook/libebook/e-contact.c:249
 msgid "Email List"
 msgstr "ààààààà àààà"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:252
 msgid "AIM Screen Name List"
 msgstr "AIM ààààààààà ààààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:250
-#| msgid "GroupWise Id List"
+#: ../addressbook/libebook/e-contact.c:253
 msgid "GroupWise ID List"
 msgstr "GroupWise ID àààà"
 
-#: ../addressbook/libebook/e-contact.c:251
-#| msgid "Jabber Id List"
+#: ../addressbook/libebook/e-contact.c:254
 msgid "Jabber ID List"
 msgstr "Jabber ID àààà"
 
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:255
 msgid "Yahoo! Screen Name List"
 msgstr "àààà ààààààà ààààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:253
+#: ../addressbook/libebook/e-contact.c:256
 msgid "MSN Screen Name List"
 msgstr "MSN ààààààààà ààààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:254
-#| msgid "ICQ Id List"
+#: ../addressbook/libebook/e-contact.c:257
 msgid "ICQ ID List"
 msgstr "ICQ ID àààà"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:259
 msgid "Wants HTML Mail"
 msgstr "àà HTML àààààà àààà àà"
 
-#: ../addressbook/libebook/e-contact.c:258
+#: ../addressbook/libebook/e-contact.c:261
 msgid "List"
 msgstr "àààà"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:262
 msgid "List Show Addresses"
 msgstr "àààà ààààààà ààààà àà"
 
-#: ../addressbook/libebook/e-contact.c:261
+#: ../addressbook/libebook/e-contact.c:264
 msgid "Birth Date"
 msgstr "àààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:262
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
+#: ../addressbook/libebook/e-contact.c:265
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:756
 msgid "Anniversary"
 msgstr "ààààààà"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:265
+#: ../addressbook/libebook/e-contact.c:268
 msgid "X.509 Certificate"
 msgstr "X.509 àààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:267
-#| msgid "Gadu-Gadu Home Id 1"
+#: ../addressbook/libebook/e-contact.c:270
 msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu àà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:268
-#| msgid "Gadu-Gadu Home Id 2"
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu àà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:269
-#| msgid "Gadu-Gadu Home Id 3"
+#: ../addressbook/libebook/e-contact.c:272
 msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu àà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:270
-#| msgid "Gadu-Gadu Work Id 1"
+#: ../addressbook/libebook/e-contact.c:273
 msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu ààààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:271
-#| msgid "Gadu-Gadu Work Id 2"
+#: ../addressbook/libebook/e-contact.c:274
 msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu ààààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:272
-#| msgid "Gadu-Gadu Work Id 3"
+#: ../addressbook/libebook/e-contact.c:275
 msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu ààààà Id 3"
 
-#: ../addressbook/libebook/e-contact.c:273
-#| msgid "Gadu-Gadu Id List"
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Gadu-Gadu ID List"
 msgstr "Gadu-Gadu ID àààà"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:279
 msgid "Geographic Information"
 msgstr "ààààààà ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Telephone"
 msgstr "ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Home Name 1"
 msgstr "Skype ààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Home Name 2"
 msgstr "MSN ààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Home Name 3"
 msgstr "Skype ààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Work Name 1"
 msgstr "Skype àààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:287
 msgid "Skype Work Name 2"
 msgstr "Skype àààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:285
+#: ../addressbook/libebook/e-contact.c:288
 msgid "Skype Work Name 3"
 msgstr "Skype àààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:289
 msgid "Skype Name List"
 msgstr "Skype ààà àà àààà"
 
-#: ../addressbook/libebook/e-contact.c:288
+#: ../addressbook/libebook/e-contact.c:291
 msgid "SIP address"
 msgstr "SIP ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:1517
-#: ../addressbook/libebook/e-destination.c:739
+#: ../addressbook/libebook/e-contact.c:293
+#| msgid "Skype Home Name 1"
+msgid "Google Talk Home Name 1"
+msgstr "Google Talk àà ààà 1"
+
+#: ../addressbook/libebook/e-contact.c:294
+#| msgid "Skype Home Name 2"
+msgid "Google Talk Home Name 2"
+msgstr "Google Talk àà ààà 2"
+
+#: ../addressbook/libebook/e-contact.c:295
+#| msgid "Skype Home Name 3"
+msgid "Google Talk Home Name 3"
+msgstr "Google Talk àà ààà 3"
+
+#: ../addressbook/libebook/e-contact.c:296
+#| msgid "Skype Work Name 1"
+msgid "Google Talk Work Name 1"
+msgstr "Google Talk ààààà ààà 1"
+
+#: ../addressbook/libebook/e-contact.c:297
+#| msgid "Skype Work Name 2"
+msgid "Google Talk Work Name 2"
+msgstr "Google Talk ààààà ààà 2"
+
+#: ../addressbook/libebook/e-contact.c:298
+#| msgid "Skype Work Name 3"
+msgid "Google Talk Work Name 3"
+msgstr "Google Talk ààààà ààà 3"
+
+#: ../addressbook/libebook/e-contact.c:299
+#| msgid "Skype Name List"
+msgid "Google Talk Name List"
+msgstr "Google Talk ààà àààà"
+
+#: ../addressbook/libebook/e-contact.c:1580
+#: ../addressbook/libebook/e-destination.c:884
 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:96
 #, 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:113
 #, 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:470
+#: ../camel/camel-db.c:481
+#, c-format
+msgid "Insufficient memory"
+msgstr "àààààà ààààà"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:199
+#: ../addressbook/libedata-book/e-data-book.c:212
+#: ../addressbook/libedata-book/e-data-book.c:744
+#| 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:304
+#: ../calendar/libedata-cal/e-data-cal.c:419
 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:305
+#: ../calendar/libecal/e-cal.c:4563 ../calendar/libedata-cal/e-data-cal.c:420
+#: ../libedataserver/e-client.c:118
+msgid "Backend is busy"
+msgstr "ààààà ààà àààààà àà"
+
+#: ../addressbook/libedata-book/e-data-book.c:306
+#: ../calendar/libedata-cal/e-data-cal.c:421 ../libedataserver/e-client.c:128
 msgid "Repository offline"
 msgstr "ààààààààà àààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:175
-#: ../calendar/libecal/e-cal.c:4159 ../calendar/libedata-cal/e-data-cal.c:112
+#: ../addressbook/libedata-book/e-data-book.c:307
+#: ../calendar/libecal/e-cal.c:4577 ../calendar/libedata-cal/e-data-cal.c:422
+#: ../libedataserver/e-client.c:132
 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: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"
+#: ../addressbook/libedata-book/e-data-book.c:310
+#: ../calendar/libedata-cal/e-data-cal.c:427
 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:311
+#: ../calendar/libedata-cal/e-data-cal.c:428
 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:312
+#: ../calendar/libedata-cal/e-data-cal.c:429
 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:313
+#: ../calendar/libedata-cal/e-data-cal.c:431 ../libedataserver/e-client.c:140
 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:314
+#: ../calendar/libedata-cal/e-data-cal.c:432 ../libedataserver/e-client.c:142
 msgid "TLS not available"
 msgstr "TLS àààààà ààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:184
+#: ../addressbook/libedata-book/e-data-book.c:316
 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:317
+#: ../calendar/libedata-cal/e-data-cal.c:435
 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:318
+#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:144
 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:319
+#: ../calendar/libedata-cal/e-data-cal.c:437 ../libedataserver/e-client.c:146
 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:320
+#: ../calendar/libedata-cal/e-data-cal.c:438 ../libedataserver/e-client.c:148
 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:321
+#: ../calendar/libedata-cal/e-data-cal.c:439 ../libedataserver/e-client.c:150
 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:322
+#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:136
 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:324
+#: ../calendar/libedata-cal/e-data-cal.c:442
 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:4143 ../calendar/libedata-cal/e-data-cal.c:133
+#: ../addressbook/libedata-book/e-data-book.c:326
+#: ../calendar/libecal/e-cal.c:4561 ../calendar/libedata-cal/e-data-cal.c:443
+#: ../libedataserver/e-client.c:116
 msgid "Invalid argument"
 msgstr "àààààà àààà"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:196
-#: ../calendar/libecal/e-cal.c:4182 ../calendar/libedata-cal/e-data-cal.c:135
-#| msgid "Protocol not supported"
+#: ../addressbook/libedata-book/e-data-book.c:328
+#: ../calendar/libecal/e-cal.c:4600 ../calendar/libedata-cal/e-data-cal.c:445
+#: ../libedataserver/e-client.c:138
 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:329
+#: ../calendar/libedata-cal/e-data-cal.c:446 ../libedataserver/e-client.c:156
+#| msgid "Backend is busy"
+msgid "Backend is not opened yet"
+msgstr "ààààààà ààà ààààà ààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:337
+#: ../calendar/libecal/e-cal-client.c:618
+#: ../calendar/libedata-cal/e-data-cal.c:454 ../libedataserver/e-client.c:154
 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 ""
-
-#. 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
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:562
+#: ../addressbook/libedata-book/e-data-book.c:954
+#| 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:587
+#: ../addressbook/libedata-book/e-data-book.c:612
+msgid "Empty query: "
+msgstr "àààà àààààààà:"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:637
+#: ../addressbook/libedata-book/e-data-book.c:1036
+#| 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:662
+#: ../addressbook/libedata-book/e-data-book.c:1058
+#| msgid "Cannot modify contact: %s"
+msgid "Cannot modify contact: "
+msgstr "àààààààà àààà ààààà ààà:"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:770
+#: ../calendar/libedata-cal/e-data-cal.c:893
+#| 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:841
+#| 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:857
+#| 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:884
+#| 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:910
+#| 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:935
+#: ../calendar/libedata-cal/e-data-cal.c:1096
+#| 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:972
+#| 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:1006
+#| msgid "Cannot get contact list: %s"
+msgid "Cannot get contact list uids: "
+msgstr "àààààà àààà uids àà ààààà ààààà ààà:"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:1079
+#| msgid "Cannot remove contacts: %s"
+msgid "Cannot remove contacts: "
+msgstr "ààààààààà ààà ààà ààààà ààà: "
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:363
+#: ../addressbook/libedata-book/e-data-book-factory.c:396
+#: ../calendar/libedata-cal/e-data-cal-factory.c:414
 #, 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
-#, 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
-#, fuzzy, c-format
-#| msgid "Cannot get message %s: %s"
-msgid "Cannot get supported fields: %s"
-msgstr "àààààà %s ààààà àààà ààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:625
-#, fuzzy, c-format
-#| msgid "Cannot get message %s: %s"
-msgid "Cannot get required fields: %s"
-msgstr "àààààà %s ààààà àààà ààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:640
-#, fuzzy, c-format
-#| msgid "Unsupported authentication method"
-msgid "Cannot get supported authentication methods: %s"
-msgstr "àààààààààà àààààààààà àààààà"
-
-#. 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
-#, fuzzy, c-format
-#| msgid "Cannot get message %s: %s"
-msgid "Cannot get changes: %s"
-msgstr "àààààà %s ààààà àààà ààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:755
-#, fuzzy, 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:528
 #, c-format
 msgid "Server is unreachable (%s)"
-msgstr ""
+msgstr "ààààà ààààààà ààà (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:549
-#, fuzzy, c-format
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:556
+#, c-format
 #| msgid ""
 #| "Unexpected GnuPG status message encountered:\n"
 #| "\n"
 #| "%s"
 msgid "Unexpected HTTP status code %d returned (%s)"
-msgstr ""
-"ààààààààà GnuPG àààààà àààààà ààà ààààà:\n"
-"\n"
-"%s"
+msgstr "ààààààààà HTTP àààààà ààà %d ààà ààààà (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2090
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2490
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2183
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2540
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
 "Error message: %s"
 msgstr ""
+"ààààà ààààààà ààà, àààààààà àààà ààààà àààà àààà ààààààààà ààààà àà.\n"
+"ààà àààààà: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4241
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4476
 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:758
 msgid "Birthday"
 msgstr "àààà àààà"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:754
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:788
 #, c-format
 msgid "Birthday: %s"
 msgstr "àààà àààà: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:778
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:813
 #, c-format
 msgid "Anniversary: %s"
 msgstr "ààààààà: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:251
+#: ../calendar/backends/file/e-cal-backend-file.c:241
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "àààààààà àààààà ààààààà àààà ààà: àààà URI."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:258
-#: ../calendar/backends/file/e-cal-backend-file.c:264
+#: ../calendar/backends/file/e-cal-backend-file.c:248
+#: ../calendar/backends/file/e-cal-backend-file.c:254
 msgid "Cannot save calendar data"
 msgstr "àààààààà àààààà ààààààà àààà ààà"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2105
-msgid "Reply Requested: by "
-msgstr "ààààààààààààà àààààà àààà àà: àààà àààààà "
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2110
-msgid "Reply Requested: When convenient"
-msgstr "ààààààààààààà àààààà àààà àà: àààààà ààààà ààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:329
-#, fuzzy
-#| msgid "Loading %s items"
-msgid "Loading Appointment items"
-msgstr "%s àààààà àààà ààààà ààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:331
-#, fuzzy
-#| msgid "Loading %s items"
-msgid "Loading Task items"
-msgstr "%s àààààà àààà ààààà ààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:333
-#, fuzzy
-#| msgid "Loading %s items"
-msgid "Loading Note items"
-msgstr "%s àààààà àààà ààààà ààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:335
-#| msgid "Loading %s items"
-msgid "Loading items"
-msgstr "àààààààà àààà ààààà àà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:951
-msgid "Calendar"
-msgstr "àààààààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1014
-msgid "Invalid server URI"
-msgstr "àààààà ààààà URI"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1115
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1361
-#: ../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:1127
-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:416
 msgid "Redirected to Invalid URI"
 msgstr "àààààà URI ààààà ààààààà àààààà"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:456
+#: ../calendar/backends/http/e-cal-backend-http.c:454
 msgid "Bad file format."
 msgstr "ààààààà àààààà àààà àà."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:463
+#: ../calendar/backends/http/e-cal-backend-http.c:461
 msgid "Not a calendar."
 msgstr "àààààààà ààà."
 
+#: ../calendar/backends/http/e-cal-backend-http.c:780
+#: ../calendar/backends/http/e-cal-backend-http.c:781
+#: ../calendar/backends/weather/e-cal-backend-weather.c:527
+msgid "Could not create cache file"
+msgstr "ààà àààà ààààà àààà ààà"
+
 #: ../calendar/backends/weather/e-cal-backend-weather.c:186
 msgid "Could not retrieve weather data"
 msgstr "àààààà àààààà ààààà ààààà ààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:286
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
 msgid "Weather: Fog"
 msgstr "àààààà: àààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:287
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
 msgid "Weather: Cloudy Night"
 msgstr "àààààà: ààààààà ààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
 msgid "Weather: Cloudy"
 msgstr "àààààà: àààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:289
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
 msgid "Weather: Overcast"
 msgstr "àààààà: ààààààà àààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:290
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
 msgid "Weather: Showers"
 msgstr "àààààà: àààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:291
+#: ../calendar/backends/weather/e-cal-backend-weather.c:293
 msgid "Weather: Snow"
 msgstr "àààààà: ààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:292
+#: ../calendar/backends/weather/e-cal-backend-weather.c:294
 msgid "Weather: Clear Night"
 msgstr "àààààà: àààààà ààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:293
+#: ../calendar/backends/weather/e-cal-backend-weather.c:295
 msgid "Weather: Sunny"
 msgstr "àààààà: ààààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:294
+#: ../calendar/backends/weather/e-cal-backend-weather.c:296
 msgid "Weather: Thunderstorms"
 msgstr "àààààà: ààààààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:440
+#: ../calendar/backends/weather/e-cal-backend-weather.c:444
 msgid "Forecast"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-component.c:1299
+#: ../calendar/libecal/e-cal.c:892 ../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:906
+#, c-format
+msgid "Enter password for %s to enable proxy for user %s"
+msgstr "àààààààààà %s àààà àààààààà àààààà àààà àààà %s àààà ààààààà àààà ààà"
+
+#: ../calendar/libecal/e-cal.c:4565
+msgid "Repository is offline"
+msgstr "ààààààààà àààààà àà"
+
+#: ../calendar/libecal/e-cal.c:4567 ../calendar/libecal/e-cal-client.c:134
+msgid "No such calendar"
+msgstr "ààà ààà àààààààà à ààà"
+
+#: ../calendar/libecal/e-cal.c:4569 ../calendar/libecal/e-cal-client.c:136
+#: ../calendar/libedata-cal/e-data-cal.c:424
+msgid "Object not found"
+msgstr "àààààààà ààààà ààà"
+
+#: ../calendar/libecal/e-cal.c:4571 ../calendar/libecal/e-cal-client.c:138
+#: ../calendar/libedata-cal/e-data-cal.c:425
+msgid "Invalid object"
+msgstr "àààààà àààààààà"
+
+#: ../calendar/libecal/e-cal.c:4573
+msgid "URI not loaded"
+msgstr "URI àààà ààà"
+
+#: ../calendar/libecal/e-cal.c:4575
+msgid "URI already loaded"
+msgstr "URI ààààààà à àààà àà àà"
+
+#: ../calendar/libecal/e-cal.c:4579
+msgid "Unknown User"
+msgstr "àààààà àààààààààà"
+
+#: ../calendar/libecal/e-cal.c:4581 ../calendar/libecal/e-cal-client.c:142
+#: ../calendar/libedata-cal/e-data-cal.c:426
+msgid "Object ID already exists"
+msgstr "àààààààà ID ààààààà à àààà àà"
+
+#: ../calendar/libecal/e-cal.c:4583
+msgid "Protocol not supported"
+msgstr "ààààààààààà àààà ààà"
+
+#: ../calendar/libecal/e-cal.c:4585
+msgid "Operation has been canceled"
+msgstr "ààààààààà àà àà àà"
+
+#: ../calendar/libecal/e-cal.c:4587
+msgid "Could not cancel operation"
+msgstr "ààààààààà ààààà ààààà ààà"
+
+#: ../calendar/libecal/e-cal.c:4589 ../libedataserver/e-client.c:124
+msgid "Authentication failed"
+msgstr "àààààààààà àààààà"
+
+#: ../calendar/libecal/e-cal.c:4591
+#: ../camel/providers/smtp/camel-smtp-transport.c:759
+#: ../libedataserver/e-client.c:126
+msgid "Authentication required"
+msgstr "àààààààààààà àààààààà àà"
+
+#: ../calendar/libecal/e-cal.c:4593
+#| msgid "A CORBA exception has occurred"
+msgid "A D-Bus exception has occurred"
+msgstr "D-Bus ààààà àààààààà"
+
+#: ../calendar/libecal/e-cal.c:4597
+msgid "No error"
+msgstr "ààà ààà ààà"
+
+#: ../calendar/libecal/e-cal-client.c:140
+#: ../calendar/libedata-cal/e-data-cal.c:434
+msgid "Unknown user"
+msgstr "àààààà àààààààààà"
+
+#: ../calendar/libecal/e-cal-client.c:144
+#: ../calendar/libedata-cal/e-data-cal.c:423
+msgid "Invalid range"
+msgstr "àààààà ààààààà"
+
+#: ../calendar/libecal/e-cal-client.c:600
+#| msgid "Failed to encode data"
+msgid "Failed to run calendar factory"
+msgstr "àààààààà ààààààààà ààààààààà àààààààà"
+
+#: ../calendar/libecal/e-cal-client.c:765
+#| msgid "Failed to encode data"
+msgid "Failed to find system calendar"
+msgstr "àààààà àààààààààà àààààààà àààààààà"
+
+#: ../calendar/libecal/e-cal-client.c:804
+#: ../calendar/libedata-cal/e-data-cal.c:433
+msgid "Calendar does not exist"
+msgstr "àààààààà àààààààà àààààà ààà"
+
+#: ../calendar/libecal/e-cal-client.c:919
+#| msgid "Invalid source"
+msgid "Invalid source type"
+msgstr "àààààà ààààà àààààà"
+
+#: ../calendar/libecal/e-cal-component.c:1326
 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 "àààààààààààà"
 
-#: ../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:34
+#| 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:212
 #, c-format
-msgid "Enter password for %s to enable proxy for user %s"
-msgstr "àààààààààà %s àààà àààààààà àààààà àààà àààà %s àààà ààààààà àààà ààà"
-
-#: ../calendar/libecal/e-cal.c:4145
-msgid "Backend is busy"
-msgstr "ààààà ààà àààààà àà"
-
-#: ../calendar/libecal/e-cal.c:4147
-msgid "Repository is offline"
-msgstr "ààààààààà àààààà àà"
-
-#: ../calendar/libecal/e-cal.c:4149
-msgid "No such calendar"
-msgstr "ààà ààà àààààààà à ààà"
-
-#: ../calendar/libecal/e-cal.c:4151 ../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:4153 ../calendar/libedata-cal/e-data-cal.c:115
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid object"
-msgstr "àààààà àààààààà"
-
-#: ../calendar/libecal/e-cal.c:4155
-msgid "URI not loaded"
-msgstr "URI àààà ààà"
-
-#: ../calendar/libecal/e-cal.c:4157
-msgid "URI already loaded"
-msgstr "URI ààààààà à àààà àà àà"
-
-#: ../calendar/libecal/e-cal.c:4161 ../servers/groupwise/e-gw-connection.c:237
-msgid "Unknown User"
-msgstr "àààààà àààààààààà"
-
-#: ../calendar/libecal/e-cal.c:4163 ../calendar/libedata-cal/e-data-cal.c:116
-msgid "Object ID already exists"
-msgstr "àààààààà ID ààààààà à àààà àà"
-
-#: ../calendar/libecal/e-cal.c:4165
-msgid "Protocol not supported"
-msgstr "ààààààààààà àààà ààà"
-
-#: ../calendar/libecal/e-cal.c:4167
-msgid "Operation has been canceled"
-msgstr "ààààààààà àà àà àà"
-
-#: ../calendar/libecal/e-cal.c:4169
-msgid "Could not cancel operation"
-msgstr "ààààààààà ààààà ààààà ààà"
+#| msgid "Unknown error: %s"
+msgid "Unknown calendar property '%s'"
+msgstr "àààààà àààààààà ààààààà '%s'"
 
-#: ../calendar/libecal/e-cal.c:4171
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1310
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1328
-#: ../camel/providers/groupwise/camel-groupwise-store.c:632
-#: ../camel/providers/groupwise/camel-groupwise-store.c:814
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:87
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#: ../calendar/libedata-cal/e-cal-backend.c:229
 #, c-format
-msgid "Authentication failed"
-msgstr "àààààààààà àààààà"
-
-#: ../calendar/libecal/e-cal.c:4173
-#: ../camel/providers/smtp/camel-smtp-transport.c:775
-msgid "Authentication required"
-msgstr "àààààààààààà àààààààà àà"
-
-#: ../calendar/libecal/e-cal.c:4175
-#, fuzzy
-#| msgid "A CORBA exception has occurred"
-msgid "A D-Bus exception has occurred"
-msgstr "CORBA àà ààààà ààà ààà àà"
-
-#: ../calendar/libecal/e-cal.c:4179
-msgid "No error"
-msgstr "ààà ààà ààà"
+#| msgid "Cannot create calendar object: %s"
+msgid "Cannot change value of calendar property '%s'"
+msgstr "àààààààà ààààààà '%s' àà ààààààà àààà ààààà ààà"
 
-#: ../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:72
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:714
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:736
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:851
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:882
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1082
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1112
 #, 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:108
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:224
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:269
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:308
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1153
 #, 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:114
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:314
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:781
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "\"%s\" à ààààà àààà àààààààà àààà àààà àà ààààà àà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:129
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr "\"%s\" à ààààà àààà ISO 8601 ààààà/ààà àààààààà àààà àààà àà ààààà àà"
 
-#: ../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:171
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:388
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:441
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:917
 #, 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:177
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:230
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:275
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:394
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:447
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:923
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1159
 #, 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:185
 #, 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:402
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:456
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:931
 #, 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:789
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "\"%s\" à àààà àààà àààààààà àààà àààà àà ààààà àà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:819
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1470,12 +1530,12 @@ msgstr ""
 "\"%s\" à ààààà àààà ààààà àà \"ààà àà\", \"àààààà\" àààà \"ààààà\" àààà \"ààààà\" "
 "àààà \"ààààà\", àààà \"ààààà\", àààà \"àààààààà\" àààà àààà àà ààààà àà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:981
 #, 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:995
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1484,264 +1544,187 @@ msgstr ""
 "\"%s\" à ààà ààààà ààààààààà àààà àààà àààà àà ààà  ààààà àà àààà àààààà ààààà "
 "àààà àààà (#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:430
 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
-#, fuzzy, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot retrieve calendar's LDAP attribute: %s"
-msgstr "àààààààà àààààà ààààààà àààà ààà"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:685
-#, fuzzy, c-format
-#| msgid "Cannot create CMS Recipient information"
-msgid "Cannot retrieve calendar scheduling information: %s"
-msgstr "CMS ààààààà ààààààà ààààà àààà ààà"
-
-#. 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
-#: ../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: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:989
+#| msgid "Cannot open calendar: %s"
+msgid "Cannot open calendar: "
+msgstr "àààààààà àààà ààààà ààà: "
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1016
-#, fuzzy, c-format
-#| msgid "Could not open cache directory: %s"
-msgid "Could not complete calendar query: %s"
-msgstr "ààà ààààààààà àààà àààà àààà: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1014
+#| msgid "Cannot remove calendar: %s"
+msgid "Cannot remove calendar: "
+msgstr "àààààààààà ààà ààà ààààà ààà: "
 
-#. 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:1041
+#| 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:1070
+#| 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:1125
+#| 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:1155
+#| 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:1184
+#| msgid "Cannot retrieve calendar object 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:1215
+#| 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:1247
+#| 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:1281
+#| 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:1308
+#| 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:1339
+#| 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:1371
+#| msgid "Could not retrieve attachment list: %s"
+msgid "Could not retrieve attachment uris: "
+msgstr "ààààà uris àà ààààààà ààà ààààà àààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1399
+#| msgid "Could not store folder: %s"
+msgid "Could not discard reminder: "
+msgstr "ààà àààààààà àààà ààààà àààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1428
+#| msgid "Could not retrieve calendar time zone: %s"
+msgid "Could not get calendar view path: "
+msgstr "àààààààà ààààà ààà ààààà ààààà àààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1458
+#| msgid "Could not retrieve calendar time zone: %s"
+msgid "Could not retrieve calendar time zone: "
+msgstr "àààààààà àààà ààààà ààààà ààààà àààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1484
+#| msgid "Could not add calendar time zone: %s"
+msgid "Could not add calendar time zone: "
+msgstr "àààààààà àààà ààààà ààààà ààààà àààà: "
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:387
+#, c-format
+#| msgid "Invalid range"
+msgid "Invalid call"
+msgstr "àààààà ààà"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:428
 #, 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"
-
-#. 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 ""
-
-#: ../calendar/libedata-cal/e-data-cal-factory.c:374
-#, c-format
-#| msgid "Invalid server URI"
 msgid "Invalid URI"
 msgstr "àààààà URI"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:392
+#: ../calendar/libedata-cal/e-data-cal-factory.c:446
 #, c-format
 msgid "No backend factory for '%s' of '%s'"
-msgstr ""
+msgstr "'%s' ààà '%s' àààà ààààààà ààààààà ààà"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:442
-#, fuzzy, c-format
+#: ../calendar/libedata-cal/e-data-cal-factory.c:489
+#, c-format
 #| msgid "Could not create cache file"
 msgid "Could not instantiate backend"
-msgstr "ààà àààà ààààà àààà ààà"
+msgstr "àààààààààà àààààààà ààà ààààà àààà"
 
-#: ../camel/camel-cipher-context.c:204
+#: ../camel/camel-cipher-context.c:200
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "à ààààà àààààà ààààààà ààààààà ààà"
 
-#: ../camel/camel-cipher-context.c:217
+#: ../camel/camel-cipher-context.c:213
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "à ààààà àààààà àààààà ààààààà ààà"
 
-#: ../camel/camel-cipher-context.c:233
+#: ../camel/camel-cipher-context.c:229
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "à ààààà àààààà àààààààààà ààààààà ààà"
 
-#: ../camel/camel-cipher-context.c:247
+#: ../camel/camel-cipher-context.c:243
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "à ààààà àààààà àààààààààà ààààààà ààà"
 
-#: ../camel/camel-cipher-context.c:260
+#: ../camel/camel-cipher-context.c:256
 #, c-format
 msgid "You may not import keys with this cipher"
 msgstr "ààà à ààààà àààà àà àààà ààà àààà àààà"
 
-#: ../camel/camel-cipher-context.c:274
+#: ../camel/camel-cipher-context.c:270
 #, c-format
 msgid "You may not export keys with this cipher"
 msgstr "ààà à ààààà àààà àà ààààà ààà àààà àààà"
 
-#: ../camel/camel-cipher-context.c:815
+#: ../camel/camel-cipher-context.c:812
 msgid "Signing message"
 msgstr "àààààà àààààà"
 
-#: ../camel/camel-cipher-context.c:1056
+#: ../camel/camel-cipher-context.c:1053
 msgid "Encrypting message"
 msgstr "àààààà ààààààààà ààà ààààà ààà"
 
-#: ../camel/camel-cipher-context.c:1183
+#: ../camel/camel-cipher-context.c:1180
 msgid "Decrypting message"
 msgstr "àààààà ààààààààà ààà ààààà ààà"
 
-#: ../camel/camel-data-cache.c:181
+#: ../camel/camel-data-cache.c:178
 #, c-format
 msgid "Unable to create cache path"
 msgstr "ààà àà àààààà ààààà ààà"
 
-#: ../camel/camel-data-cache.c:499
+#: ../camel/camel-data-cache.c:504
 #, 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"
@@ -1752,8 +1735,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"
@@ -1764,130 +1747,179 @@ 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:72 ../camel/camel-offline-folder.c:89
 msgid "Downloading new messages for offline mode"
 msgstr "àààààà àààààà àààà ààà ààààààà ààààààà ààà ààààà ààà"
 
-#: ../camel/camel-disco-folder.c:402
+#: ../camel/camel-disco-folder.c:410
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "àààààà '%s' àà àààààà àààà ààààà ààà ààààà ààà"
 
-#: ../camel/camel-disco-folder.c:468 ../camel/camel-offline-folder.c:316
+#: ../camel/camel-disco-folder.c:476 ../camel/camel-offline-folder.c:325
 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-store.c:456
+#: ../camel/providers/imap/camel-imap-store.c:1157
+#: ../camel/providers/imap/camel-imap-store.c:1935
+#: ../camel/providers/imap/camel-imap-store.c:2430
+#: ../camel/providers/imap/camel-imap-store.c:3192
+#: ../camel/providers/imapx/camel-imapx-folder.c:324
+#: ../camel/providers/imapx/camel-imapx-folder.c:357
+#: ../camel/providers/imapx/camel-imapx-folder.c:411
+#: ../camel/providers/imapx/camel-imapx-folder.c:457
+#: ../camel/providers/imapx/camel-imapx-folder.c:491
+#: ../camel/providers/imapx/camel-imapx-folder.c:531
+#: ../camel/providers/imapx/camel-imapx-folder.c:567
+#: ../camel/providers/imapx/camel-imapx-store.c:242
+#: ../camel/providers/imapx/camel-imapx-store.c:1306
+#: ../camel/providers/imapx/camel-imapx-store.c:1394
+#: ../camel/providers/imapx/camel-imapx-store.c:1440
 #, 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:878 ../camel/camel-filter-search.c:697
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "ààà ààààààààà '%s' ààààààààà àààààà: %s"
 
-#: ../camel/camel-filter-driver.c:886
+#: ../camel/camel-filter-driver.c:926
 #, 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:1131 ../camel/camel-filter-driver.c:1140
 msgid "Syncing folders"
 msgstr "ààààààà ààààà ààà ààààà ààà"
 
-#: ../camel/camel-filter-driver.c:1170 ../camel/camel-filter-driver.c:1620
+#: ../camel/camel-filter-driver.c:1235 ../camel/camel-filter-driver.c:1681
 #, 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:1246 ../camel/camel-filter-driver.c:1692
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "àààààà ààààààà ààà: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1278
+#: ../camel/camel-filter-driver.c:1344
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "ààààà àààààà àààààààà àààààà"
 
-#: ../camel/camel-filter-driver.c:1289
+#: ../camel/camel-filter-driver.c:1355
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "ààààà àààààààà ààààààààà ààààààà àààààà"
 
-#: ../camel/camel-filter-driver.c:1307
+#: ../camel/camel-filter-driver.c:1373
 #, 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:1380 ../camel/camel-filter-driver.c:1402
 #, 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:1417 ../camel/camel-filter-driver.c:1518
 msgid "Syncing folder"
 msgstr "àààààà ààààà ààà ààààà ààà"
 
-#: ../camel/camel-filter-driver.c:1356 ../camel/camel-filter-driver.c:1462
+#: ../camel/camel-filter-driver.c:1422 ../camel/camel-filter-driver.c:1524
 msgid "Complete"
 msgstr "ààààà"
 
-#: ../camel/camel-filter-driver.c:1420
+#: ../camel/camel-filter-driver.c:1482
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d ààààà %d àààààà ààààà ààààà ààà"
 
-#: ../camel/camel-filter-driver.c:1438
+#: ../camel/camel-filter-driver.c:1500
 #, 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:447
 msgid "Invalid arguments to (system-flag)"
 msgstr "àà ààààà àààààà àà (àààààà-ààààà)"
 
-#: ../camel/camel-filter-search.c:416
+#: ../camel/camel-filter-search.c:465
 msgid "Invalid arguments to (user-tag)"
 msgstr "àà ààààà àààààà àà (àààààààààà-ààà)"
 
-#: ../camel/camel-filter-search.c:744 ../camel/camel-filter-search.c:753
+#: ../camel/camel-filter-search.c:874 ../camel/camel-filter-search.c:883
 #, 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:243
+#, 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:283
+#, 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' ààà àààà ham àààààààà àààà ààààà àà"
+msgstr[1] "'%s' ààà àààà ham ààààààà àààà ààààà àà"
+
+#: ../camel/camel-folder.c:331
+#, 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:902
+#: ../camel/providers/local/camel-maildir-folder.c:319
+msgid "Moving messages"
+msgstr "àààààà ààààà ààààà ààà"
+
+#: ../camel/camel-folder.c:905
+msgid "Copying messages"
+msgstr "ààààààà ààà ààà ààààà ààà"
+
+#: ../camel/camel-folder.c:1160
+#, c-format
+msgid "Quota information not supported for folder '%s'"
+msgstr "àààààà '%s' àààà àààààà ààààààà ààààààà ààà"
+
+#: ../camel/camel-folder.c:3271
+#, c-format
+#| msgid "Retrieving message '%s'"
+msgid "Retrieving message '%s' in %s"
+msgstr "%s ààà àààààà '%s' àà ààààààà ààà ààààà àà"
+
+#: ../camel/camel-folder.c:3404
+#, c-format
+#| msgid "Fetching summary information for new messages in %s"
+msgid "Retrieving quota information for '%s'"
+msgstr "'%s' àààà àààààà ààààààààà ààà:ààààààà ààà ààààà àà"
+
+#: ../camel/camel-folder-search.c:348 ../camel/camel-folder-search.c:459
+#: ../camel/camel-folder-search.c:630
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1896,8 +1928,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:360 ../camel/camel-folder-search.c:471
+#: ../camel/camel-folder-search.c:642
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1906,83 +1938,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:856 ../camel/camel-folder-search.c:899
 #, 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:960
 #, 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:967 ../camel/camel-folder-search.c:975
 #, 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:1003
 #, 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:1013
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) àààààà àààà ààààà àà"
 
-#: ../camel/camel-folder.c:220
-#, fuzzy, 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
-#, fuzzy, 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
-#, fuzzy, c-format
-#| msgid "Filtering new message(s)"
-msgid "Filtering new message in '%s'"
-msgid_plural "Filtering new messages in '%s'"
-msgstr[0] "ààà ààààààà àààà ààààà ààà"
-msgstr[1] "ààà ààààààà àààà ààààà ààà"
-
-#: ../camel/camel-folder.c:879
-#: ../camel/providers/local/camel-maildir-folder.c:293
-msgid "Moving messages"
-msgstr "àààààà ààààà ààààà ààà"
-
-#: ../camel/camel-folder.c:882
-msgid "Copying messages"
-msgstr "ààààààà ààà ààà ààààà ààà"
-
-#: ../camel/camel-folder.c:3251
-#, 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:657 ../camel/camel-gpg-context.c:662
+#: ../camel/camel-gpg-context.c:1288
 #, 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:662
+#: ../camel/providers/smtp/camel-smtp-transport.c:762
 msgid "Unknown"
 msgstr "àààààà"
 
-#: ../camel/camel-gpg-context.c:715
+#: ../camel/camel-gpg-context.c:727
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1993,17 +1990,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:732
+#: ../camel/camel-gpg-context.c:744
 #, 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:769 ../camel/camel-gpg-context.c:784
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "gpg àààààààà àààààà ààààààà ààààààà àààààà."
 
-#: ../camel/camel-gpg-context.c:793
+#: ../camel/camel-gpg-context.c:805
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -2012,7 +2009,7 @@ msgstr ""
 "ààààà ààààà àààààààààààààà ààààà ààààà ààààà àààà\n"
 "PIN àà àààà àà: \"%s\""
 
-#: ../camel/camel-gpg-context.c:797
+#: ../camel/camel-gpg-context.c:809
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2021,90 +2018,107 @@ msgstr ""
 "ààààà àààààààààààà ààààà àààà ààààà àààà àààààààà\n"
 "ààààà àà: \"%s\""
 
-#: ../camel/camel-gpg-context.c:803
+#: ../camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "GnuPG ààààà '%s' àààà ààààààààà àààààà"
 
-#: ../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:4894
-#: ../camel/providers/imapx/camel-imapx-server.c:4911
-#: ../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:844 ../camel/camel-net-utils.c:523
+#: ../camel/camel-tcp-stream-raw.c:260
+#: ../camel/providers/imapx/camel-imapx-server.c:5014
+#: ../camel/providers/imapx/camel-imapx-server.c:5031
+#: ../camel/providers/imapx/camel-imapx-store.c:161
+#: ../camel/providers/nntp/camel-nntp-summary.c:414
+#: ../libedataserver/e-client.c:134 ../libedataserverui/e-book-auth-util.c:227
+#, c-format
 msgid "Cancelled"
 msgstr "àà àà àààà"
 
-#: ../camel/camel-gpg-context.c:850
+#: ../camel/camel-gpg-context.c:862
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "ààààà ààààà àààà àààààààà àààààà: à àààà àààààààà àààà àà."
 
-#: ../camel/camel-gpg-context.c:862
+#: ../camel/camel-gpg-context.c:874
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG ààààà ààààààààà àààà ààààà: %s"
 
-#: ../camel/camel-gpg-context.c:993
+#: ../camel/camel-gpg-context.c:1005
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "ààààààààà ààààààà àààààà: ààà ààààà àààààààà àààààà àààà ààà."
 
-#: ../camel/camel-gpg-context.c:1539 ../camel/camel-smime-context.c:828
-#| msgid "Could not generate signing data: %s"
+#: ../camel/camel-gpg-context.c:1552 ../camel/camel-smime-context.c:827
 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:1601 ../camel/camel-gpg-context.c:1805
+#: ../camel/camel-gpg-context.c:1915 ../camel/camel-gpg-context.c:2062
+#: ../camel/camel-gpg-context.c:2162 ../camel/camel-gpg-context.c:2210
 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:952 ../camel/camel-smime-context.c:966
-#: ../camel/camel-smime-context.c:975
+#: ../camel/camel-gpg-context.c:1680 ../camel/camel-gpg-context.c:1688
+#: ../camel/camel-gpg-context.c:1696 ../camel/camel-gpg-context.c:1716
+#: ../camel/camel-smime-context.c:953 ../camel/camel-smime-context.c:967
+#: ../camel/camel-smime-context.c:976
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "àààààààà ààà ààààà àààà ààà: àààààà àààààà àààààà"
 
-#: ../camel/camel-gpg-context.c:1741
-#, fuzzy
+#: ../camel/camel-gpg-context.c:1758
 #| msgid "Cannot verify message signature: Incorrect message format"
 msgid "Cannot verify message signature: "
-msgstr "àààààààà ààà ààààà àààà ààà: àààààà àààààà àààààà"
+msgstr "àààààà ààààààààààà ààààà ààààà ààà:"
 
-#: ../camel/camel-gpg-context.c:1862
-#| msgid "Could not generate encrypting data: %s"
+#: ../camel/camel-gpg-context.c:1881
 msgid "Could not generate encrypting data: "
 msgstr "àààààààààà àààààà ààààà ààààà àààà: "
 
-#: ../camel/camel-gpg-context.c:1915
+#: ../camel/camel-gpg-context.c:1934
 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:1992 ../camel/camel-gpg-context.c:2001
+#: ../camel/camel-gpg-context.c:2024
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "àààààà ààààààààà ààà àààà ààà: àààààà àààààà àààààà"
 
-#: ../camel/camel-gpg-context.c:1993
+#: ../camel/camel-gpg-context.c:2012
+#, c-format
+msgid "Failed to decrypt MIME part: protocol error"
+msgstr "MIME ààà ààààààààà ààààààà ààà: ààààààààà ààà"
+
+#: ../camel/camel-gpg-context.c:2103 ../camel/camel-smime-context.c:1264
+msgid "Encrypted content"
+msgstr "ààààààààà àààà àààààààà"
+
+#: ../camel/camel-http-stream.c:546 ../camel/camel-stream-null.c:78
+msgid "Only reset to beginning is supported with CamelHttpStream"
+msgstr "CamelHttpStream àààà ààààà  ààààààà ààà:ààààààà àààà àààà ààààààà àà"
+
+#: ../camel/camel-lock.c:102
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "%s àààà àààà àààà ààààà ààààà àààà: %s"
+
+#: ../camel/camel-lock.c:145
+#, c-format
+#| msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Timed out trying to get lock file on %s.  Try again later."
+msgstr "%s àà àààààà àààà ààààà ààààààà àààà àààà ààà àààààà àà ààà. ààà ààààà ààààààà ààà."
+
+#: ../camel/camel-lock.c:205
 #, c-format
-msgid "Failed to decrypt MIME part: protocol error"
-msgstr "MIME ààà ààààààààà ààààààà ààà: ààààààààà ààà"
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "fcntl(2) àà ààààà àààà ààààààààà àààààà: %s"
 
-#: ../camel/camel-gpg-context.c:2082 ../camel/camel-smime-context.c:1259
-msgid "Encrypted content"
-msgstr "ààààààààà àààà àààààààà"
+#: ../camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "flock(2) àà ààààà àààà ààààààààà àààààà: %s"
 
 #: ../camel/camel-lock-client.c:106
 #, c-format
@@ -2126,27 +2140,6 @@ msgstr "'%s' àà àààà ààààà àààà ààà: àà
 msgid "Could not lock '%s'"
 msgstr "'%s' àà àààà ààààà àààà ààà"
 
-#: ../camel/camel-lock.c:102
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "%s àààà àààà àààà ààààà ààààà àààà: %s"
-
-#: ../camel/camel-lock.c:145
-#, fuzzy, 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 àà àààà àààà àààààààà ààààààà ààààà ààà àààààà àà ààà. ààà ààààà ààààààà ààà."
-
-#: ../camel/camel-lock.c:205
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "fcntl(2) àà ààààà àààà ààààààààà àààààà: %s"
-
-#: ../camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "flock(2) àà ààààà àààà ààààààààà àààààà: %s"
-
 #: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -2196,61 +2189,73 @@ 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-network-service.c:99
+#, c-format
+msgid "Could not connect to %s: %s"
+msgstr "%s àààà ààààà ààààà ààà: %s"
+
+#: ../camel/camel-network-service.c:100
+msgid "SSL unavailable"
+msgstr "SSL ààà-àààààà"
+
+#: ../camel/camel-network-service.c:123
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "%s àààà ààààà ààààà ààà: "
+
+#: ../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-offline-folder.c:202
 #, 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:147 ../camel/camel-offline-journal.c:177
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "àààààà '%s' àààà àààààà ààààà ààà àààà ààà: %s"
@@ -2263,22 +2268,22 @@ msgstr "ààààààààà àààààà à-àààà àà
 msgid "For reading mail as a query of another set of folders"
 msgstr "àààà ààààààààà àààààà àààààà ààààà àààà àààààà àààà"
 
-#: ../camel/camel-provider.c:188
+#: ../camel/camel-provider.c:192
 #, 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:201
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s àààà ààààà àààà: %s"
 
-#: ../camel/camel-provider.c:206
+#: ../camel/camel-provider.c:210
 #, 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:394 ../camel/camel-session.c:351
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "ààààààààà '%s' àààà ààà àààà àààààà àààààà ààà"
@@ -2323,65 +2328,67 @@ msgstr ""
 "àààààà ààààà ààààààà:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:45
+#: ../camel/camel-sasl-cram-md5.c:41
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:47
+#: ../camel/camel-sasl-cram-md5.c:43
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
-msgstr "à àààààà ààààà àààà àààààààà CRAM-MD5 ààààààààà àààààà, àà ààààààààà àààà àààà ààà àà."
+msgstr ""
+"à àààààà ààààà àààà àààààààà CRAM-MD5 ààààààààà àààààà, àà ààààààààà àààà àààà ààà àà."
 
-#: ../camel/camel-sasl-digest-md5.c:58
+#: ../camel/camel-sasl-digest-md5.c:54
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:60
+#: ../camel/camel-sasl-digest-md5.c:56
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
-msgstr "à àààààà ààààà àààà àààààààà DIGEST-MD5 ààààààààà àààààà, àà ààààààààà àààà àààà ààà àà."
+msgstr ""
+"à àààààà ààààà àààà àààààààà DIGEST-MD5 ààààààààà àààààà, àà ààààààààà àààà àààà ààà àà."
 
-#: ../camel/camel-sasl-digest-md5.c:821
+#: ../camel/camel-sasl-digest-md5.c:830
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "ààààààà ààà ààà ààààà àà (>2048 octets)"
 
-#: ../camel/camel-sasl-digest-md5.c:832
+#: ../camel/camel-sasl-digest-md5.c:841
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "ààààààà ààà àààà àà\n"
 
-#: ../camel/camel-sasl-digest-md5.c:840
+#: ../camel/camel-sasl-digest-md5.c:849
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "ààààààà ààà àààààà àààà \"ààààààààà àààààààà\" ààààà àà"
 
-#: ../camel/camel-sasl-digest-md5.c:875
+#: ../camel/camel-sasl-digest-md5.c:883
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "ààààààà àààà àààààààààà àààààà ààààààà ààà"
 
-#: ../camel/camel-sasl-digest-md5.c:896
+#: ../camel/camel-sasl-digest-md5.c:904
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "ààààààà àààà àààààà àààààààààà àààààà ààààà àà"
 
-#: ../camel/camel-sasl-digest-md5.c:909
+#: ../camel/camel-sasl-digest-md5.c:917
 #, c-format
 msgid "Server response does not match"
 msgstr "ààààààà àààà àààààààà ààà"
 
-#: ../camel/camel-sasl-gssapi.c:85
+#: ../camel/camel-sasl-gssapi.c:86
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:87
+#: ../camel/camel-sasl-gssapi.c:88
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "à àààààà ààààà àààà Kerberos 5 àààààààààààà ààààà àààààà."
 
-#: ../camel/camel-sasl-gssapi.c:128
+#: ../camel/camel-sasl-gssapi.c:129
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -2389,17 +2396,17 @@ msgstr ""
 "àààà ààààà àààààààààààà àààààà àààààà àààà àààààààà ààààààà ààà, àààààààààà àààààà ààààààà "
 "ààà."
 
-#: ../camel/camel-sasl-gssapi.c:133
+#: ../camel/camel-sasl-gssapi.c:134
 msgid "The provided target_name parameter was ill-formed."
 msgstr "àààà ààààà àààààà ààà àààààà à ààààààà àà."
 
-#: ../camel/camel-sasl-gssapi.c:136
+#: ../camel/camel-sasl-gssapi.c:137
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr "àààà ààààà àààààà ààà àààààà àààà àààààààààà ààààààààà ààà àààààà ààààà àà."
 
-#: ../camel/camel-sasl-gssapi.c:140
+#: ../camel/camel-sasl-gssapi.c:141
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -2407,13 +2414,13 @@ msgstr ""
 "ààààà àààà ààààà ààààà ààààààà àà àà ààààà àààààà ààààà àààààà àààààà àààààà ààààà ààà "
 "àà ààààà àà."
 
-#: ../camel/camel-sasl-gssapi.c:145
+#: ../camel/camel-sasl-gssapi.c:146
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr "ààààà àààà àààààà ààà ààààà àà, àààà ààà àà àà àààààà àààà àààà ààà."
 
-#: ../camel/camel-sasl-gssapi.c:149
+#: ../camel/camel-sasl-gssapi.c:150
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -2421,818 +2428,588 @@ msgstr ""
 "àààà ààààà ààààààààààà àààààààà ààààà àààà ààààà ààà, àààà àààààààà àààààààà ààà "
 "ààààààààààààà àààààà àààà ààà."
 
-#: ../camel/camel-sasl-gssapi.c:154
+#: ../camel/camel-sasl-gssapi.c:155
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "àààà ààààà àààààà àààààààà ààààà àààààà àà àààààààààà ààà."
 
-#: ../camel/camel-sasl-gssapi.c:157
+#: ../camel/camel-sasl-gssapi.c:158
 msgid "The consistency checks performed on the input_token failed."
 msgstr "ààààà àààààà àààààààà àà ààààààà àààààà ààààààà ààà àà."
 
-#: ../camel/camel-sasl-gssapi.c:160
+#: ../camel/camel-sasl-gssapi.c:161
 msgid "The consistency checks performed on the credential failed."
 msgstr "àààààààààà àààààààà àà ààààààà àààààà ààààààà ààà àà."
 
-#: ../camel/camel-sasl-gssapi.c:163
+#: ../camel/camel-sasl-gssapi.c:164
 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:170 ../camel/camel-sasl-gssapi.c:321
+#: ../camel/camel-sasl-gssapi.c:365 ../camel/camel-sasl-gssapi.c:382
+#: ../camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "ààààà ààààà àààà àààààààààà àààà àààà."
 
-#: ../camel/camel-sasl-gssapi.c:382
+#: ../camel/camel-sasl-gssapi.c:394
 #, c-format
 msgid "Unsupported security layer."
 msgstr "ààà-ààààààà ààààààà àààà."
 
-#: ../camel/camel-sasl-login.c:39
+#: ../camel/camel-sasl-login.c:35
 msgid "Login"
 msgstr "àààààà"
 
-#: ../camel/camel-sasl-login.c:41 ../camel/camel-sasl-plain.c:45
+#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
 msgid "This option will connect to the server using a simple password."
 msgstr "à àààààà ààààà àààà ààà ààààààà àààà àààààà."
 
-#: ../camel/camel-sasl-login.c:95
+#: ../camel/camel-sasl-login.c:92
 #, c-format
 msgid "Unknown authentication state."
 msgstr "àààààà àààààààààà àààààà."
 
-#: ../camel/camel-sasl-ntlm.c:41
+#: ../camel/camel-sasl-ntlm.c:42
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:43
+#: ../camel/camel-sasl-ntlm.c:44
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
 msgstr "à àààààà ààààààà àààààà àààààà àààà NTLM / àààààààà ààààààà àààààààààà àààà àààààà."
 
-#: ../camel/camel-sasl-plain.c:43
+#: ../camel/camel-sasl-plain.c:39
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:46
+#: ../camel/camel-sasl-popb4smtp.c:42
 msgid "POP before SMTP"
 msgstr "SMTP àààààà POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:48
+#: ../camel/camel-sasl-popb4smtp.c:44
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "à àààààà SMTP àà àààà ààààà ààà POP ààààààà àààààààààà àààà"
 
-#: ../camel/camel-sasl-popb4smtp.c:83
-msgid "POP Source URI"
-msgstr "POP ààààà URI"
+#: ../camel/camel-sasl-popb4smtp.c:80
+#| msgid "POP Source URI"
+msgid "POP Source UID"
+msgstr "POP ààààààà UID"
 
-#: ../camel/camel-sasl-popb4smtp.c:90
-#, fuzzy, c-format
+#: ../camel/camel-sasl-popb4smtp.c:92
+#, 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
-#, fuzzy, c-format
+#: ../camel/camel-sasl-popb4smtp.c:104 ../camel/camel-sasl-popb4smtp.c:114
+#, c-format
 #| msgid "POP Before SMTP auth using a non-pop source"
-msgid "POP Before SMTP authentication using a non-POP source"
-msgstr "pop ààààààà ààààààà ààààà SMTP ààà àààààààààà POP àààààà"
+msgid "POP Before SMTP authentication attempted with a %s service"
+msgstr "%s àààà àààà àààààà àààà SMTP àààààààààà àààààà POP"
 
 #: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "àààààà àààààààà ààààààà ààààààà àààààà: %s: %s"
 
-#: ../camel/camel-service.c:89
+#: ../camel/camel-service.c:524
 #, c-format
-msgid "URL '%s' needs a username component"
-msgstr "URL '%s' àà àààààààààà ààà ààà ààààà àà"
+#| msgid "URL '%s' needs a username component"
+msgid "URL '%s' needs a user component"
+msgstr "URL '%s' àà àààààààààà ààààà àààà àà"
 
-#: ../camel/camel-service.c:93
+#: ../camel/camel-service.c:535
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' àà ààààà ààà ààààà àà"
 
-#: ../camel/camel-service.c:97
+#: ../camel/camel-service.c:546
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' àà àà ààà ààààà àà"
 
-#: ../camel/camel-session.c:260
+#: ../camel/camel-session.c:361
 #, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"ààààààààà %s ààààà ààààà àààà:\n"
-"%s"
+#| msgid "No provider available for protocol '%s'"
+msgid "Invalid GType registered for protocol '%s'"
+msgstr "ààààààààà '%s' àààà àààààà ààààààà àààà GType"
 
-#: ../camel/camel-session.c:757
+#: ../camel/camel-session.c:941
 #, 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:1052
+#: ../camel/camel-smime-context.c:347 ../camel/camel-smime-context.c:1053
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "'%s' àààà àààààààààà àààà àààà ààà"
 
-#: ../camel/camel-smime-context.c:376
+#: ../camel/camel-smime-context.c:375
 msgid "Cannot create CMS message"
 msgstr "CMS àààààà ààààà àààà ààà"
 
-#: ../camel/camel-smime-context.c:381
+#: ../camel/camel-smime-context.c:380
 msgid "Cannot create CMS signed data"
 msgstr "CMS ààà àààà àààààà ààààà àààà ààà"
 
-#: ../camel/camel-smime-context.c:387
+#: ../camel/camel-smime-context.c:386
 msgid "Cannot attach CMS signed data"
 msgstr "CMS ààà àààà ààààà àààà àààà ààà"
 
-#: ../camel/camel-smime-context.c:394
+#: ../camel/camel-smime-context.c:393
 msgid "Cannot attach CMS data"
 msgstr "CMS àààààà àààà àààà ààà"
 
-#: ../camel/camel-smime-context.c:400
+#: ../camel/camel-smime-context.c:399
 msgid "Cannot create CMS Signer information"
 msgstr "CMS ààà ààààà ààààààà ààààà àààà ààà"
 
-#: ../camel/camel-smime-context.c:406
+#: ../camel/camel-smime-context.c:405
 msgid "Cannot find certificate chain"
 msgstr "àààààààààà ààààà àààà àààà ààà"
 
-#: ../camel/camel-smime-context.c:412
+#: ../camel/camel-smime-context.c:411
 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:435 ../camel/camel-smime-context.c:450
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' ààààààà àààààààààà àààààààààà ààààààààààà ààà"
 
-#: ../camel/camel-smime-context.c:458
+#: ../camel/camel-smime-context.c:457
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "SMIMEEncKeyPrefs ààààà ààààà àààà ààà"
 
-#: ../camel/camel-smime-context.c:463
+#: ../camel/camel-smime-context.c:462
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "MS SMIMEEncKeyPrefs ààààà ààààà àààà ààà"
 
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:467
 msgid "Cannot add encryption certificate"
 msgstr "àààààààààà àààààààààà ààààà àààà ààà"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:473
 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:506
 msgid "Unverified"
 msgstr "àààààààà ààà"
 
-#: ../camel/camel-smime-context.c:509
+#: ../camel/camel-smime-context.c:508
 msgid "Good signature"
 msgstr "àààà ààà"
 
-#: ../camel/camel-smime-context.c:511
+#: ../camel/camel-smime-context.c:510
 msgid "Bad signature"
 msgstr "àààà ààà"
 
-#: ../camel/camel-smime-context.c:513
+#: ../camel/camel-smime-context.c:512
 msgid "Content tampered with or altered in transit"
 msgstr "àààààà àààà ààààààààà àààààààà àà àààà ààààààà àà"
 
-#: ../camel/camel-smime-context.c:515
+#: ../camel/camel-smime-context.c:514
 msgid "Signing certificate not found"
 msgstr "ààà ààààààà àààààààààà àààààà ààà"
 
-#: ../camel/camel-smime-context.c:517
+#: ../camel/camel-smime-context.c:516
 msgid "Signing certificate not trusted"
 msgstr "ààà ààààààà àààààààààà àààààààààààà ààà"
 
-#: ../camel/camel-smime-context.c:519
+#: ../camel/camel-smime-context.c:518
 msgid "Signature algorithm unknown"
 msgstr "ààààà àààààààà àààààà àà"
 
-#: ../camel/camel-smime-context.c:521
+#: ../camel/camel-smime-context.c:520
 msgid "Signature algorithm unsupported"
 msgstr "ààààà àààààààà ààà-ààààààà àà"
 
-#: ../camel/camel-smime-context.c:523
+#: ../camel/camel-smime-context.c:522
 msgid "Malformed signature"
 msgstr "àààààà ààà"
 
-#: ../camel/camel-smime-context.c:525
+#: ../camel/camel-smime-context.c:524
 msgid "Processing error"
 msgstr "ààààààààà ààà"
 
-#: ../camel/camel-smime-context.c:570
+#: ../camel/camel-smime-context.c:569
 msgid "No signed data in signature"
 msgstr "àààààà ààà ààà àààà àààààà ààà"
 
-#: ../camel/camel-smime-context.c:575
+#: ../camel/camel-smime-context.c:574
 msgid "Digests missing from enveloped data"
 msgstr "ààààà ààààààààà ààààà ààààààà ààààààà àà"
 
-#: ../camel/camel-smime-context.c:588 ../camel/camel-smime-context.c:599
+#: ../camel/camel-smime-context.c:587 ../camel/camel-smime-context.c:598
 msgid "Cannot calculate digests"
 msgstr "ààààà ààààààà ààà ààààà ààà"
 
-#: ../camel/camel-smime-context.c:606 ../camel/camel-smime-context.c:610
+#: ../camel/camel-smime-context.c:605 ../camel/camel-smime-context.c:609
 msgid "Cannot set message digests"
 msgstr "àààààààà ààààà ààààààà ààààààà ààà ààààà àààà"
 
-#: ../camel/camel-smime-context.c:620 ../camel/camel-smime-context.c:625
+#: ../camel/camel-smime-context.c:619 ../camel/camel-smime-context.c:624
 msgid "Certificate import failed"
 msgstr "àààààààààà àààà ààààààà àààààà"
 
-#: ../camel/camel-smime-context.c:635
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "àààààààààà à ààààà àààààà àà, ààààààààààà ààààà àààà ààà"
 
-#: ../camel/camel-smime-context.c:638
+#: ../camel/camel-smime-context.c:637
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "àààààààààà à ààààà àààààà àà, ààààààààààà àààà àààà àà ààà àààààààà àà"
 
-#: ../camel/camel-smime-context.c:642
+#: ../camel/camel-smime-context.c:641
 msgid "Cannot find signature digests"
 msgstr "ààà àààà ààààààà àààà àààà ààà"
 
-#: ../camel/camel-smime-context.c:658
+#: ../camel/camel-smime-context.c:657
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ààà ààààà: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:839 ../camel/camel-smime-context.c:1125
+#: ../camel/camel-smime-context.c:838 ../camel/camel-smime-context.c:1126
 msgid "Cannot create encoder context"
 msgstr "àààààà àààààà ààààà àààà ààà"
 
-#: ../camel/camel-smime-context.c:845
+#: ../camel/camel-smime-context.c:844
 msgid "Failed to add data to CMS encoder"
 msgstr "CMS ààààààààà àààààà ààààààààà àààààà"
 
-#: ../camel/camel-smime-context.c:850 ../camel/camel-smime-context.c:1142
+#: ../camel/camel-smime-context.c:849 ../camel/camel-smime-context.c:1143
 msgid "Failed to encode data"
 msgstr "àààààààà ààààà ààààààà àààààà"
 
-#: ../camel/camel-smime-context.c:991 ../camel/camel-smime-context.c:1237
+#: ../camel/camel-smime-context.c:992 ../camel/camel-smime-context.c:1239
 msgid "Decoder failed"
 msgstr "àààààà àààààà"
 
-#: ../camel/camel-smime-context.c:1060
+#: ../camel/camel-smime-context.c:1061
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "ààààààà àààà àààààààààà àààààààà àààà àààà ààà"
 
-#: ../camel/camel-smime-context.c:1068
+#: ../camel/camel-smime-context.c:1069
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "àààààààààà àààà àà àààà ààààà ààààà ààà àààà ààà"
 
-#: ../camel/camel-smime-context.c:1079
+#: ../camel/camel-smime-context.c:1080
 msgid "Cannot create CMS Message"
 msgstr "CMS àààààà ààààà àààà ààà"
 
-#: ../camel/camel-smime-context.c:1085
+#: ../camel/camel-smime-context.c:1086
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS ààààà àààààà ààààà àààà ààà"
 
-#: ../camel/camel-smime-context.c:1091
+#: ../camel/camel-smime-context.c:1092
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS ààààà àààààà àààà àààà ààà"
 
-#: ../camel/camel-smime-context.c:1097
+#: ../camel/camel-smime-context.c:1098
 msgid "Cannot attach CMS data object"
 msgstr "CMS àààààà ààààààààà àààà àààà ààà"
 
-#: ../camel/camel-smime-context.c:1106
+#: ../camel/camel-smime-context.c:1107
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS ààààààà ààààààà ààààà àààà ààà"
 
-#: ../camel/camel-smime-context.c:1111
+#: ../camel/camel-smime-context.c:1112
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS ààààààà ààààààà ààààà àààà ààà"
 
-#: ../camel/camel-smime-context.c:1136
+#: ../camel/camel-smime-context.c:1137
 msgid "Failed to add data to encoder"
 msgstr "ààààààààà àààààà ààààààààà àààààà"
 
-#: ../camel/camel-smime-context.c:1244
+#: ../camel/camel-smime-context.c:1246
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME ààààààààà: ààà àààààààààà ààààààààà ààààà ààà"
 
-#: ../camel/camel-store.c:2184
+#: ../camel/camel-store.c:1815
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "'%s' ààààà àààà ààà: àààààà ààààààà à àààà àà"
 
+#: ../camel/camel-store.c:1858
+#, c-format
+#| msgid "Syncing folders"
+msgid "Opening folder '%s'"
+msgstr "àààààà '%s' àà àààà ààààà àà"
+
+#: ../camel/camel-store.c:2043
+#, 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:2055 ../camel/camel-store.c:2065
 #: ../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:2058 ../camel/camel-store.c:2069
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "ààààà"
 
-#: ../camel/camel-store.c:2832
+#: ../camel/camel-store.c:2520
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "àààààà ààààà àààà ààà: %s: àààààà ààààààà à àààà àà"
 
-#: ../camel/camel-store.c:2959 ../camel/camel-vee-store.c:367
+#: ../camel/camel-store.c:2534
+#, c-format
+#| msgid "Cannot get folder '%s': %s"
+msgid "Creating folder '%s'"
+msgstr "àààààà '%s' ààààà ààààà àà"
+
+#: ../camel/camel-store.c:2652 ../camel/camel-vee-store.c:352
 #: ../camel/providers/local/camel-maildir-store.c:272
 #, 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:668
+#: ../camel/camel-store.c:2795 ../camel/camel-vee-store.c:402
+#: ../camel/providers/local/camel-maildir-store.c:710
 #, 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:327
+msgid "Only reset to beginning is supported with CamelStreamFilter"
+msgstr "CamelStreamFilter àààà ààà ààààààà ààà:ààààààà àààà àààà ààààààà àà"
+
+#: ../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:756 ../camel/camel-tcp-stream-raw.c:767
 #, 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:778
 #, c-format
 msgid "The proxy host denied our request: code %d"
-msgstr ""
+msgstr "àààààààà ààààà ààààà àààààààà ààààààà ààà: ààà %d"
 
-#: ../camel/camel-tcp-stream-raw.c:867 ../camel/camel-tcp-stream-raw.c:873
+#: ../camel/camel-tcp-stream-raw.c:874 ../camel/camel-tcp-stream-raw.c:880
 #, c-format
 msgid "The proxy host does not support SOCKS5"
 msgstr "àààààààà ààààà SOCKS5 àà àààà àààà ààà"
 
-#: ../camel/camel-tcp-stream-raw.c:879
-#, fuzzy, c-format
+#: ../camel/camel-tcp-stream-raw.c:886
+#, c-format
 #| msgid "No support for authentication type %s"
 msgid "Could not find a suitable authentication type: code 0x%x"
-msgstr "àààààààààà àààààà %s àààà ààà àààà ààà"
+msgstr "àààààà àààààààààà àààààà àààà ààààà àààà: code 0x%x"
 
-#: ../camel/camel-tcp-stream-raw.c:891
+#: ../camel/camel-tcp-stream-raw.c:898
 msgid "General SOCKS server failure"
 msgstr "ààààààà SOCKS ààààà àààààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:892
+#: ../camel/camel-tcp-stream-raw.c:899
 msgid "SOCKS server's rules do not allow connection"
-msgstr ""
+msgstr "SOCKS àààààààà ààààà ààààààà ààààààà àààà ààà"
 
-#: ../camel/camel-tcp-stream-raw.c:893
+#: ../camel/camel-tcp-stream-raw.c:900
 msgid "Network is unreachable from SOCKS server"
-msgstr ""
+msgstr "ààààààà SOCKS àààààààààà ààààààà ààà"
 
-#: ../camel/camel-tcp-stream-raw.c:894
+#: ../camel/camel-tcp-stream-raw.c:901
 msgid "Host is unreachable from SOCKS server"
-msgstr ""
+msgstr "ààààà SOCKS àààààààààà ààààààà ààà"
 
-#: ../camel/camel-tcp-stream-raw.c:895
-#| msgid "Connection canceled"
+#: ../camel/camel-tcp-stream-raw.c:902
 msgid "Connection refused"
 msgstr "ààààà àà àà àààà"
 
-#: ../camel/camel-tcp-stream-raw.c:896
+#: ../camel/camel-tcp-stream-raw.c:903
 msgid "Time-to-live expired"
-msgstr ""
+msgstr "ààààà àààà ààà àààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:897
-#| msgid "STLS not supported by server"
+#: ../camel/camel-tcp-stream-raw.c:904
 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:905
 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:906
 msgid "Unknown error from SOCKS server"
 msgstr "SOCKS àààààààààà àààààà ààà"
 
-#: ../camel/camel-tcp-stream-raw.c:932
+#: ../camel/camel-tcp-stream-raw.c:939
 #, c-format
 msgid "Got unknown address type from SOCKS server"
-msgstr ""
+msgstr "SOCKS àààààààààà àààààà ààààààà àààààà àààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:950
+#: ../camel/camel-tcp-stream-raw.c:957
 #, c-format
-#| msgid "Invalid response from server"
 msgid "Incomplete reply from SOCKS server"
-msgstr "SOCKS àààààààààà àààààà àààà"
-
-#: ../camel/camel-tcp-stream-raw.c:970
-#, c-format
-msgid "Hostname is too long (maximum is 255 characters)"
-msgstr "àààààààà ààà ààààà àà (àààààà 255 àààààà àà)"
-
-#. SOCKS5
-#. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:1002 ../camel/camel-tcp-stream-raw.c:1012
-#, c-format
-#| msgid "Invalid response from server"
-msgid "Invalid reply from proxy server"
-msgstr "àààààààà àààààààààà àààààà àààà"
-
-#: ../camel/camel-tcp-stream-ssl.c:457
-#, c-format
-msgid ""
-"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
-msgid "GOOD"
-msgstr "ààà"
-
-#: ../camel/camel-tcp-stream-ssl.c:463
-msgid "BAD"
-msgstr "àààà"
-
-#. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:467
-#, c-format
-msgid ""
-"SSL Certificate check for %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept?"
-msgstr ""
-"SSL àààààààààà %s àààà ààààà àà:\n"
-"\n"
-"%s\n"
-"\n"
-"ààà ààà ààà ààààààààà ààààà àà?"
-
-#: ../camel/camel-tcp-stream-ssl.c:511
-#, c-format
-msgid ""
-"Certificate problem: %s\n"
-"Issuer: %s"
-msgstr ""
-"àààààààààà àààààà: %s\n"
-"ààà ààààà: %s"
-
-#: ../camel/camel-tcp-stream-ssl.c:563
-#, c-format
-msgid ""
-"Bad certificate domain: %s\n"
-"Issuer: %s"
-msgstr ""
-"àààà àààààààààà àààààà: %s\n"
-"ààà ààààà: %s"
-
-#: ../camel/camel-tcp-stream-ssl.c:581
-#, c-format
-msgid ""
-"Certificate expired: %s\n"
-"Issuer: %s"
-msgstr ""
-"àààààààààààà ààààààà àààà àà: %s\n"
-"ààà ààààà: %s"
-
-#: ../camel/camel-tcp-stream-ssl.c:598
-#, c-format
-msgid ""
-"Certificate revocation list expired: %s\n"
-"Issuer: %s"
-msgstr ""
-"àààààààààààà ààààààà àààààà ààààààà àààà àà: %s\n"
-"ààà ààààà: %s"
-
-#: ../camel/camel-url.c:316
-#, c-format
-msgid "Could not parse URL '%s'"
-msgstr "URL '%s' ààà ààààààà ààà ààààà àààà"
-
-#: ../camel/camel-vee-folder.c:1240 ../camel/camel-vee-folder.c:1403
-#, c-format
-msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "ààààààààà ààààààààà ààààààààà ààà ààà ààààà ààà àààà ààààà ààààà ààà"
-
-#: ../camel/camel-vee-folder.c:1276
-#, c-format
-msgid "No such message %s in %s"
-msgstr "%s ààà %s àààà ààà àààààà ààà"
-
-#: ../camel/camel-vee-folder.c:1344
-#, 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
-msgid "Unmatched"
-msgstr "àààààààà ààà"
-
-#: ../camel/camel-vee-store.c:393
-#, c-format
-msgid "Cannot delete folder: %s: No such folder"
-msgstr "àààààà àààà àààà ààà: %s: àààà ààà àààààà ààà"
-
-#: ../camel/camel-vee-store.c:427
-#, c-format
-msgid "Cannot rename folder: %s: No such folder"
-msgstr "ààààààààà ààà àààà àààà ààà: %s: àààà ààà àààààà ààà"
-
-#: ../camel/camel-vtrash-folder.c:49
-msgid "Cannot copy messages to the Trash folder"
-msgstr "àààààààà ààààààààà ààààààààà ààà ààà ààààà ààà"
-
-#: ../camel/camel-vtrash-folder.c:51
-msgid "Cannot copy messages to the Junk folder"
-msgstr "ààààà ààààààààà ààààààààà ààà ààà ààààà ààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:958
-#: ../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:1034
-#, c-format
-msgid "Checking for deleted messages %s"
-msgstr "àààà àààààà ààààààà %s àààà ààààà ààààà àà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1521
-#: ../camel/providers/groupwise/camel-groupwise-store.c:669
-#: ../camel/providers/groupwise/camel-groupwise-store.c:800
-#: ../camel/providers/imap/camel-imap-folder.c:3965
-#: ../camel/providers/imap/camel-imap-folder.c:4047
-#: ../camel/providers/imapx/camel-imapx-server.c:3871
-#: ../camel/providers/imapx/camel-imapx-server.c:4002
-#, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "%s ààà ààà ààààààà àààà ààààà ààààààà ààààà ààààà ààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1991
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2044
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2708
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2718
-#, c-format
-msgid "Could not get message"
-msgstr "àààààà ààààà ààààà ààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2428
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2478
-#, c-format
-msgid "Cannot append message to folder '%s': %s"
-msgstr "àààààà '%s' ààà àààààà ààààà àààà ààà: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2464
-#, c-format
-msgid "Cannot create message: %s"
-msgstr "àààààà ààààà àààà ààà: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2644
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"àààààà ààààà àààà ààà: %s\n"
-"  %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2644
-#: ../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:2663
-#: ../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:2681
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2691
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2894
-#, 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
-#, fuzzy
-#| msgid "Cannot append message in offline mode: %s"
-msgid "Cannot append message in offline mode: "
-msgstr "àààààà ààààààààà àààààà ààààà ààààà ààà: %s"
-
-#: ../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
-#: ../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/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 "ààààà IN_BOX ààààààààà ààààà ààààààà àààà ààààà"
-
-#: ../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 "ààààà àààà ààààà SOAP ààààà (_P):"
+msgstr "SOCKS àààààààààà àààààà àààà"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
-msgid "Novell GroupWise"
-msgstr "ààààà ààààààààà"
+#: ../camel/camel-tcp-stream-raw.c:977
+#, c-format
+msgid "Hostname is too long (maximum is 255 characters)"
+msgstr "àààààààà ààà ààààà àà (àààààà 255 àààààà àà)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
-msgid "For accessing Novell GroupWise servers"
-msgstr "Novell GroupWise àààààà àààààà àààà"
+#. SOCKS5
+#. reserved - must be 0
+#: ../camel/camel-tcp-stream-raw.c:1009 ../camel/camel-tcp-stream-raw.c:1019
+#, c-format
+msgid "Invalid reply from proxy server"
+msgstr "àààààààà àààààààààà àààààà àààà"
 
-#: ../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/camel-tcp-stream-ssl.c:462
+#, c-format
+msgid ""
+"Issuer:            %s\n"
+"Subject:           %s\n"
+"Fingerprint:       %s\n"
+"Signature:         %s"
+msgstr ""
+"ààà ààààà:            %s\n"
+"àààà:           %s\n"
+"àààààà ààà:       %s\n"
+"ààà:         %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:100
-msgid "This option will connect to the GroupWise server using a plaintext password."
-msgstr "à àààààà àààà àààààà ààààààààà ààààà àààààààààààà ààààà àààà àààààà."
+#: ../camel/camel-tcp-stream-ssl.c:468
+msgid "GOOD"
+msgstr "ààà"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:107
-#, c-format
-msgid "Host or user not available in url"
-msgstr "ààààà àààà àààààààààà url ààà àààààà ààà"
+#: ../camel/camel-tcp-stream-ssl.c:468
+msgid "BAD"
+msgstr "àààà"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:209
-#: ../camel/providers/imap/camel-imap-store.c:801
-#: ../camel/providers/imapx/camel-imapx-server.c:3085
+#. construct our user prompt
+#: ../camel/camel-tcp-stream-ssl.c:472
 #, 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 "ààààà ààààààà ààààà ààààààà àààà àààà àààààà ààààà àààà ààà àààà àààà"
+msgid ""
+"SSL Certificate check for %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept?"
+msgstr ""
+"SSL àààààààààà %s àààà ààààà àà:\n"
+"\n"
+"%s\n"
+"\n"
+"ààà ààà ààà ààààààààà ààààà àà?"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:560
-#: ../camel/providers/imap/camel-imap-store.c:1808
-#: ../camel/providers/imap/camel-imap-store.c:2005
-#: ../camel/providers/imapx/camel-imapx-store.c:342
+#: ../camel/camel-tcp-stream-ssl.c:516
 #, c-format
-msgid "No such folder %s"
-msgstr "àààà ààà àààààà %s ààà"
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+"àààààààààà àààààà: %s\n"
+"ààà ààààà: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1221
+#: ../camel/camel-tcp-stream-ssl.c:568
 #, c-format
-msgid "Cannot create GroupWise folders in offline mode."
-msgstr "àààààà ààààààààà àààààààààà àààààà ààààà àààà ààà."
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+"àààà àààààààààà àààààà: %s\n"
+"ààà ààààà: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1230
+#: ../camel/camel-tcp-stream-ssl.c:586
 #, c-format
-#| msgid "Cannot delete folder '%s': Special folder"
-msgid "Cannot create a special system folder"
-msgstr "ààààààà àààààà àààààààà ààààà ààààà ààà"
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr ""
+"àààààààààààà ààààààà àààà àà: %s\n"
+"ààà ààààà: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1240
-#: ../camel/providers/imap/camel-imap-store.c:1886
-#: ../camel/providers/imap/camel-imap-store.c:2323
-#: ../camel/providers/imapx/camel-imapx-store.c:1341
+#: ../camel/camel-tcp-stream-ssl.c:603
 #, c-format
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "àààà àààààààà ààààààààà àààààààà ààààààà ààà"
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr ""
+"àààààààààààà ààààààà àààààà ààààààà àààà àà: %s\n"
+"ààà ààààà: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1325
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1350
+#: ../camel/camel-url.c:333
 #, c-format
-msgid "Cannot rename GroupWise folder '%s' to '%s'"
-msgstr "àààààààààà àààààà àà '%s' àà '%s' ààà ààà àààà àààà ààà"
+msgid "Could not parse URL '%s'"
+msgstr "URL '%s' ààà ààààààà ààà ààààà àààà"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1384
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:47
+#: ../camel/camel-vee-folder.c:1310 ../camel/camel-vee-folder.c:1470
 #, c-format
-msgid "GroupWise server %s"
-msgstr "àààààààààà ààààà %s"
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "ààààààààà ààààààààà ààààààààà ààà ààà ààààà ààà àààà ààààà ààààà ààà"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1386
+#: ../camel/camel-vee-folder.c:1343
 #, c-format
-msgid "GroupWise service for %s on %s"
-msgstr "%s àààà %s àà àààààààààà àààà"
+msgid "No such message %s in %s"
+msgstr "%s ààà %s àààà ààà àààààà ààà"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:51
+#: ../camel/camel-vee-folder.c:1411
 #, c-format
-msgid "GroupWise mail delivery via %s"
-msgstr "%s àààààà àààààààààà àààà ààààààààà"
+msgid "Error storing '%s': "
+msgstr "'%s' àà ààààààààààà ààà: "
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:97
-msgid "Sending Message"
-msgstr "àààààà ààààà ààààà ààà"
+#. 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/providers/groupwise/camel-groupwise-transport.c:107
+#: ../camel/camel-vee-store.c:378
 #, c-format
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "àààààà ààààà ààààà ààà: à àààààà àà àààààà ààààààààà"
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "àààààà àààà àààà ààà: %s: àààà ààà àààààà ààà"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
+#: ../camel/camel-vee-store.c:412
 #, 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"
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "ààààààààà ààà àààà àààà ààà: %s: àààà ààà àààààà ààà"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:159
-#, c-format
-msgid "Could not send message: %s"
-msgstr "àààààà ààààà ààààà àààà: %s"
+#: ../camel/camel-vtrash-folder.c:49
+msgid "Cannot copy messages to the Trash folder"
+msgstr "àààààààà ààààààààà ààààààààà ààà ààà ààààà ààà"
 
-#: ../camel/providers/imap/camel-imap-command.c:197
-#: ../camel/providers/imap/camel-imap-command.c:301
+#: ../camel/camel-vtrash-folder.c:51
+msgid "Cannot copy messages to the Junk folder"
+msgstr "ààààà ààààààààà ààààààààà ààà ààà ààààà ààà"
+
+#: ../camel/providers/imap/camel-imap-command.c:198
+#: ../camel/providers/imap/camel-imap-command.c:293
 #, 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:206
+#: ../camel/providers/imap/camel-imap-command.c:301
 #, 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:365
 #, 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:395
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -3241,27 +3018,27 @@ msgstr ""
 "IMAP ààààà ààààà àààààà %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:468
+#: ../camel/providers/imap/camel-imap-command.c:471
 #, 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:483
 #, 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:563
 #, c-format
 msgid "Server response ended too soon."
 msgstr "ààààààà àààà ààà àààà ààà àà ààà."
 
-#: ../camel/providers/imap/camel-imap-command.c:771
+#: ../camel/providers/imap/camel-imap-command.c:775
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP ààààààà àààà %s ààààààà àààààà ààà"
 
-#: ../camel/providers/imap/camel-imap-command.c:809
+#: ../camel/providers/imap/camel-imap-command.c:813
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP àààààààààà ààààààààà ààààà àààà: %s"
@@ -3275,78 +3052,94 @@ msgstr "ààà àààà àààà àààààà à àààà
 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:3915
+#: ../camel/providers/imap/camel-imap-folder.c:395
+#, c-format
+msgid "Could not load summary for %s"
+msgstr "%s àààà ààà àààà ààààà àààà"
+
+#: ../camel/providers/imap/camel-imap-folder.c:1054
+#: ../camel/providers/imapx/camel-imapx-server.c:4065
 #, 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:3483
 msgid "Unable to retrieve message: "
 msgstr "àààààà ààààààà ààààààà àààààà: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:3407
-#: ../camel/providers/imapx/camel-imapx-server.c:5195
+#: ../camel/providers/imap/camel-imap-folder.c:3520
+#: ../camel/providers/imapx/camel-imapx-server.c:5344
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "àààààà ID %s àààà ààààààà ààààà àààà ààà: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3408
-#: ../camel/providers/imapx/camel-imapx-server.c:5196
+#: ../camel/providers/imap/camel-imap-folder.c:3521
+#: ../camel/providers/imapx/camel-imapx-server.c:5345
 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:3596
+#: ../camel/providers/imap/camel-imap-folder.c:4503
+#: ../camel/providers/nntp/camel-nntp-folder.c:438
 #, 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:4087
+#: ../camel/providers/imap/camel-imap-folder.c:4170
+#: ../camel/providers/imapx/camel-imapx-server.c:4023
+#: ../camel/providers/imapx/camel-imapx-server.c:4173
+#, c-format
+msgid "Fetching summary information for new messages in %s"
+msgstr "%s ààà ààà ààààààà àààà ààààà ààààààà ààààà ààààà ààà"
+
+#: ../camel/providers/imap/camel-imap-folder.c:4304
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "àààààà ààààààà àààà: àààààà %d àààà ààà ààààààà àààà ààààà ààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4189
+#: ../camel/providers/imap/camel-imap-folder.c:4314
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "ààààààà àààààà àààà: ààà UID àààààà %d àààà àààà ààààà ààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4418
+#: ../camel/providers/imap/camel-imap-folder.c:4543
 #, 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:253
-#| msgid "Could not open cache directory: %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:197
+#: ../camel/providers/imap/camel-imap-message-cache.c:257
 msgid "Could not open cache directory: "
 msgstr "ààà ààààààààà àààà àààà àààà: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:326
+#: ../camel/providers/imap/camel-imap-message-cache.c:335
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "àààààà %s àà ààà ààààààà àààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:391
-#, fuzzy, c-format
+#: ../camel/providers/imap/camel-imap-message-cache.c:401
+#, c-format
 #| msgid "Failed to cache message %s: %s"
 msgid "Failed to cache message %s: "
-msgstr "àààààà %s àà ààà ààààààà àààààà: %s"
+msgstr "àààààà %s àà ààà ààààààà àààààà: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:529
-#, fuzzy, c-format
+#: ../camel/providers/imap/camel-imap-message-cache.c:543
+#, c-format
 #| msgid "Failed to cache %s: %s"
 msgid "Failed to cache %s: "
-msgstr "%s àà ààà ààààààà àààààà: %s"
+msgstr "%s àà ààà ààààààà àààààààà: "
 
 #: ../camel/providers/imap/camel-imap-provider.c:40
 #: ../camel/providers/imapx/camel-imapx-provider.c:40
 msgid "Checking for New Mail"
 msgstr "ààà ààààà àààà ààààà ààààà ààà"
 
+#: ../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/imap/camel-imap-provider.c:44
 #: ../camel/providers/imapx/camel-imapx-provider.c:48
 msgid "Ch_eck for new messages in subscribed folders"
@@ -3363,7 +3156,6 @@ 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):"
 
@@ -3384,109 +3176,135 @@ 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
+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/imap/camel-imap-provider.c:68
 #: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "Check new messages for Jun_k contents"
 msgstr "ààààà ààààààààà àààà ààà ààààààà ààààà (_k)"
 
+#: ../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 "ààààà IN_BOX ààààààààà ààààà ààààààà àààà ààààà"
+
 #: ../camel/providers/imap/camel-imap-provider.c:72
 #: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "àààààà àààààà àààààààààà ààààà ààààà ààà (_z)"
 
+#: ../camel/providers/imap/camel-imap-provider.c:78
+msgid "IMAP default port"
+msgstr "IMAP àààààà ààààà"
+
 #: ../camel/providers/imap/camel-imap-provider.c:79
+#: ../camel/providers/imapx/camel-imapx-provider.c:87
+#| msgid "IMAP server %s"
+msgid "IMAP over SSL"
+msgstr "SSL àà IMAP"
+
+#: ../camel/providers/imap/camel-imap-provider.c:85
 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:87
+#: ../camel/providers/imapx/camel-imapx-provider.c:96
 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:105
+#: ../camel/providers/imapx/camel-imapx-provider.c:113
+#: ../camel/providers/nntp/camel-nntp-provider.c:80
+#: ../camel/providers/pop3/camel-pop3-provider.c:81
+msgid "Password"
+msgstr "ààààààà"
+
+#: ../camel/providers/imap/camel-imap-provider.c:107
+#: ../camel/providers/imapx/camel-imapx-provider.c:115
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "à àààààà ààà ààààààààà ààààà 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:224
+#: ../camel/providers/imap/camel-imap-store.c:2601
+#: ../camel/providers/imapx/camel-imapx-store.c:340
+#: ../camel/providers/imapx/camel-imapx-store.c:796
+#: ../camel/providers/local/camel-maildir-folder.c:464
+#: ../camel/providers/local/camel-maildir-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:619
+#: ../camel/providers/local/camel-maildir-store.c:625
+#: ../camel/providers/local/camel-maildir-store.c:711
+#: ../camel/providers/local/camel-spool-store.c:328
+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:2927
-#: ../camel/providers/imapx/camel-imapx-server.c:2967
+#: ../camel/providers/imap/camel-imap-store.c:356
+#: ../camel/providers/imap/camel-imap-store.c:383
+#: ../camel/providers/imap/camel-imap-store.c:410
+#: ../camel/providers/imapx/camel-imapx-server.c:3042
 #, 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:2928
-#: ../camel/providers/smtp/camel-smtp-transport.c:238
+#: ../camel/providers/imap/camel-imap-store.c:357
+#: ../camel/providers/imapx/camel-imapx-server.c:3043
+#: ../camel/providers/smtp/camel-smtp-transport.c:192
 msgid "STARTTLS not supported"
 msgstr "STARTTLS ààààààà ààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:391
-#: ../camel/providers/imapx/camel-imapx-server.c:2968
-msgid "SSL negotiations failed"
-msgstr "SSL ààà àààààà àààààà"
+#: ../camel/providers/imap/camel-imap-store.c:376
+#: ../camel/providers/imapx/camel-imapx-server.c:3081
+#, c-format
+#| msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgid "Failed to connect to IMAP server %s in secure mode: "
+msgstr "àààààààà ààààààààà IMAP ààààà %s àà àààààààà àààààààà: "
 
-#: ../camel/providers/imap/camel-imap-store.c:398
-#: ../camel/providers/smtp/camel-smtp-transport.c:285
+#: ../camel/providers/imap/camel-imap-store.c:384
+#: ../camel/providers/smtp/camel-smtp-transport.c:238
 msgid "SSL is not available in this build"
 msgstr "SSL à àààààààààà àààààà ààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:549
-#: ../camel/providers/imapx/camel-imapx-server.c:2755
-#, c-format
-msgid "Connection cancelled"
-msgstr "ààààà àààààà àààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:554
-#: ../camel/providers/imapx/camel-imapx-server.c:2760
-#, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "àààà \"%s\" àààà ààààà ààààà àààà: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:740
-#: ../camel/providers/imapx/camel-imapx-server.c:3041
+#: ../camel/providers/imap/camel-imap-store.c:709
+#: ../camel/providers/imapx/camel-imapx-server.c:3176
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ààààà %s àààààà àààà àààààààààààà àààààà %s àà àààà ààààà ààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:752
-#: ../camel/providers/imapx/camel-imapx-server.c:3053
-#: ../camel/providers/smtp/camel-smtp-transport.c:420
+#: ../camel/providers/imap/camel-imap-store.c:720
+#: ../camel/providers/imapx/camel-imapx-server.c:3189
+#: ../camel/providers/smtp/camel-smtp-transport.c:350
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "àààààààààà àààààà %s àààà ààà àààà ààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:836
-#: ../camel/providers/imapx/camel-imapx-server.c:3129
+#: ../camel/providers/imap/camel-imap-store.c:731
+#: ../camel/providers/smtp/camel-smtp-transport.c:363
+#, c-format
+msgid "Error creating SASL authentication object."
+msgstr "SASL àààààààààà àààààààà àààààà àààà ààà."
+
+#: ../camel/providers/imap/camel-imap-store.c:779
+#: ../camel/providers/imapx/camel-imapx-server.c:3234
+#, c-format
+msgid "You did not enter a password."
+msgstr "ààà ààààààà àààà àààà ààà."
+
+#: ../camel/providers/imap/camel-imap-store.c:820
+#: ../camel/providers/imapx/camel-imapx-server.c:3279
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3497,83 +3315,81 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:997
-#: ../camel/providers/imapx/camel-imapx-store.c:183
+#: ../camel/providers/imap/camel-imap-store.c:878
+#: ../camel/providers/imapx/camel-imapx-store.c:144
 #, 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
+#: ../camel/providers/imap/camel-imap-store.c:881
+#: ../camel/providers/imapx/camel-imapx-store.c:147
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s àààà %s àà IMAP àààà"
 
-#. 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:615
-#: ../camel/providers/local/camel-maildir-store.c:621
-#: ../camel/providers/local/camel-maildir-store.c:669
-#: ../camel/providers/local/camel-spool-store.c:289
-msgid "Inbox"
-msgstr "ààààààà"
+#: ../camel/providers/imap/camel-imap-store.c:1972
+#: ../camel/providers/imap/camel-imap-store.c:2176
+#: ../camel/providers/imapx/camel-imapx-store.c:315
+#, c-format
+msgid "No such folder %s"
+msgstr "àààà ààà àààààà %s ààà"
 
-#: ../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:1986
+#: ../camel/providers/imap/camel-imap-store.c:2445
+#: ../camel/providers/imapx/camel-imapx-store.c:1327
 #, c-format
 msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "àààààà ààà \"%s\" à àààààà àà àààà àà àà \"%c\" ààààà ààààà àà"
 
-#: ../camel/providers/imap/camel-imap-store.c:1939
+#: ../camel/providers/imap/camel-imap-store.c:2050
+#: ../camel/providers/imap/camel-imap-store.c:2509
+#: ../camel/providers/imapx/camel-imapx-store.c:1348
+#, c-format
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "àààà àààààààà ààààààààà àààààààà ààààààà ààà"
+
+#: ../camel/providers/imap/camel-imap-store.c:2103
 #: ../camel/providers/local/camel-maildir-store.c:244
-#: ../camel/providers/local/camel-mbox-store.c:407
-#: ../camel/providers/local/camel-mh-store.c:504
+#: ../camel/providers/local/camel-mbox-store.c:424
+#: ../camel/providers/local/camel-mh-store.c:550
 #, 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:2458
+#: ../camel/providers/imapx/camel-imapx-store.c:1338
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "àààààà àààà àààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3137
+#: ../camel/providers/imap/camel-imap-store.c:3235
 #, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "àààààààà ààààààààà àààà ààààà àààà àààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:3140
-#, fuzzy
+#: ../camel/providers/imap/camel-imap-store.c:3238
 #| msgid "Server unexpectedly disconnected: %s"
 msgid "Server unexpectedly disconnected: "
-msgstr "àààààààà ààààààààà àààà ààààà àààà àààà: %s"
+msgstr "àààààààà ààààààààà àààà ààààà àààà àààà: "
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:74
+#: ../camel/providers/imapx/camel-imapx-folder.c:91
 #, 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
-#, fuzzy, c-format
+#: ../camel/providers/imapx/camel-imapx-folder.c:99
+#, c-format
 #| msgid "Could not create cache file"
 msgid "Could not create cache for %s: "
-msgstr "ààà àààà ààààà àààà ààà"
+msgstr "%s àààà ààààà ààààà ààààà àààà: "
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:42
 msgid "Use _Quick Resync if the server supports it"
-msgstr ""
+msgstr "Quick Resync àà ààààà àà ààààà àààà àààà ààà àà (_Q)"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:44
 msgid "Use I_dle if the server supports it"
-msgstr ""
+msgstr "ààààààààà ààààà àà ààààà àààà àààà ààà àà (_d)"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:56
 msgid "Command:"
@@ -3581,48 +3397,42 @@ msgstr "àààà:"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:58
 msgid "Numbe_r of cached connections to use"
-msgstr ""
+msgstr "àààààà àààà ààà àààà àààààààà àààààà (_r )"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "Namespace:"
 msgstr "àààààààà:"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
+#: ../camel/providers/imapx/camel-imapx-provider.c:86
+msgid "Default IMAP port"
+msgstr "àààààà IMAP ààààà"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:94
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1404
-#, fuzzy
+#: ../camel/providers/imapx/camel-imapx-server.c:1504
 #| msgid "Error writing mail temp file: %s"
 msgid "Error writing to cache stream: "
-msgstr "àààà ààààààà àààà ààààààà ààà: %s"
+msgstr "ààà àààààààààà ààà ààààà ààà àààààà ààà: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2083
+#: ../camel/providers/imapx/camel-imapx-server.c:2214
 #, c-format
-#| msgid "Failed to authenticate.\n"
 msgid "Not authenticated"
 msgstr "àààààààààà àààà ààà"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2850
-#, fuzzy, c-format
-#| msgid "Could not connect to %s (port %s): %s"
-msgid "Could not connect to %s (port %s): "
-msgstr "%s (ààààà %s) àààà ààààà ààààà àààà: %s"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3311
-#, fuzzy
+#: ../camel/providers/imapx/camel-imapx-server.c:3452
 #| msgid "Posting failed: %s"
 msgid "Closing tmp stream failed: "
-msgstr "ààààà ààààààà àààààà: %s"
+msgstr "àààààà àààà tmp ààààààà ààà ààà ààààà àà: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5345
-#: ../camel/providers/imapx/camel-imapx-server.c:5360
-#| msgid "Cannot create message: %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:5490
+#: ../camel/providers/imapx/camel-imapx-server.c:5505
 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:1115
+#: ../camel/providers/nntp/camel-nntp-store.c:1713
 #, c-format
 msgid "No such folder: %s"
 msgstr "àààà ààà àààààà ààà: %s"
@@ -3630,36 +3440,35 @@ msgstr "àààà ààà àààààà ààà: %s"
 #: ../camel/providers/imapx/camel-imapx-stream.c:70
 #, c-format
 msgid "Source stream returned no data"
-msgstr ""
+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:178
 #, 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:188
+#: ../camel/providers/local/camel-local-folder.c:197
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "ààààààààà: %s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:210
+#: ../camel/providers/local/camel-local-folder.c:206
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:470
+#: ../camel/providers/local/camel-local-folder.c:473
 msgid "Index message body data"
 msgstr "ààààààà àààààààà àààààà"
 
-#: ../camel/providers/local/camel-local-folder.c:683
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-local-folder.c:704
+#, c-format
 #| msgid ""
 #| "Cannot get message: %s from folder %s\n"
 #| "  %s"
@@ -3667,8 +3476,8 @@ msgid ""
 "Cannot get message %s from folder %s\n"
 "%s"
 msgstr ""
-"àààààà ààààà àààà ààà: %s àà àààààà %s ààààà\n"
-"  %s"
+"àààààà %s ààààà àààààà %s àà ààààà ààààà ààà\n"
+"%s"
 
 #: ../camel/providers/local/camel-local-provider.c:44
 msgid "_Use the '.folders' folder summary file (exmh)"
@@ -3682,11 +3491,11 @@ 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."
@@ -3694,29 +3503,29 @@ msgstr ""
 "ààààààààà mbox-àààààààà àààààààààà ààààààà àààà ààààààààà àààààà ààààààààààà ààààààààà "
 "ààààààààààà àààà (àààààà) àààà."
 
-#: ../camel/providers/local/camel-local-provider.c:84
-#: ../camel/providers/local/camel-local-provider.c:103
+#: ../camel/providers/local/camel-local-provider.c:86
+#: ../camel/providers/local/camel-local-provider.c:107
 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 "àààà ààààààààà-àààààà àààà àààààààààà"
 
-#: ../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 "ààààààààààààà ààààààààààààà ààààààà àààà àààààààà àààà."
 
-#: ../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."
@@ -3724,124 +3533,128 @@ msgstr ""
 "ààààà ààààààààà mbox ààààà àààààààà ààààààà àààà àààààà ààà àààààààà àààà.\n"
 "àà àààà lm, 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-local-store.c:92
+#, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "àààààà %s àà %s ààà ààà àààà àààà ààà: %s"
+
+#: ../camel/providers/local/camel-local-store.c:204
+#, c-format
+msgid "Local mail file %s"
+msgstr "ààààààà àààà àààà %s"
+
+#: ../camel/providers/local/camel-local-store.c:235
+#: ../camel/providers/local/camel-local-store.c:377
 #: ../camel/providers/local/camel-maildir-store.c:92
-#: ../camel/providers/local/camel-mbox-store.c:526
-#: ../camel/providers/local/camel-spool-store.c:318
+#: ../camel/providers/local/camel-mbox-store.c:542
+#: ../camel/providers/local/camel-spool-store.c:574
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "ààà %s à àààààààà àààà ààà àààààà àà ààà"
 
-#: ../camel/providers/local/camel-local-store.c:183
+#: ../camel/providers/local/camel-local-store.c:244
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "ààà %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-local-store.c:255
+#: ../camel/providers/local/camel-local-store.c:265
+#: ../camel/providers/local/camel-local-store.c:390
 #: ../camel/providers/local/camel-maildir-store.c:124
 #, 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:297
 #, 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:695
+#: ../camel/providers/local/camel-local-store.c:435
+#: ../camel/providers/local/camel-mbox-store.c:716
 #, 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:724
+#: ../camel/providers/local/camel-local-store.c:463
+#: ../camel/providers/local/camel-mbox-store.c:746
 #, 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:549
+#, c-format
+msgid "Could not rename '%s': %s"
+msgstr "'%s' ààà ààà àààà ààààà àààà: %s"
+
+#: ../camel/providers/local/camel-local-summary.c:569
 #, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "àààààà àààààà àààààà àààà àààààà: àààààà àààà"
 
-#: ../camel/providers/local/camel-maildir-folder.c:198
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-maildir-folder.c:100
+#: ../camel/providers/local/camel-maildir-folder.c:333
+#: ../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/local/camel-maildir-folder.c:223
+#, c-format
 #| msgid "Cannot append message to maildir folder: %s: %s"
 msgid "Cannot append message to maildir folder: %s: "
-msgstr "Maildir ààààààààà àààààà ààààà àààà ààà: %s: %s"
+msgstr "maildir ààààààààà àààààààà àààà ààààà ààà: %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:246
-#: ../camel/providers/local/camel-maildir-folder.c:256
+#: ../camel/providers/local/camel-maildir-folder.c:271
+#: ../camel/providers/local/camel-maildir-folder.c:281
 #: ../camel/providers/local/camel-mbox-folder.c:386
 #: ../camel/providers/local/camel-mh-folder.c:168
 #: ../camel/providers/local/camel-mh-folder.c:178
 #, 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
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-maildir-folder.c:351
+#, c-format
 #| msgid "Cannot append message to maildir folder: %s: %s"
 msgid "Cannot transfer message to destination folder: %s"
-msgstr "Maildir ààààààààà àààààà ààààà àààà ààà: %s: %s"
+msgstr "àààààà ààààààààà àààààààà àààààà ààà ààààà ààà: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:100
-#, fuzzy, c-format
+#, c-format
 #| msgid "Cannot create folder: %s: folder exists"
 msgid "Cannot create folder: %s : Folder name cannot contain a dot"
-msgstr "àààààà ààààà àààà ààà: %s: àààààà ààààààà à àààà àà"
+msgstr "àààààààà ààààà ààààà ààà: %s : àààààà ààà ààààààà àààààà ààà"
 
 #: ../camel/providers/local/camel-maildir-store.c:109
-#: ../camel/providers/local/camel-maildir-store.c:686
+#: ../camel/providers/local/camel-maildir-store.c:728
 #, 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:375
-#: ../camel/providers/local/camel-mbox-store.c:389
+#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:406
 #, 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:341
-#: ../camel/providers/local/camel-mh-store.c:464
+#: ../camel/providers/local/camel-mbox-store.c:358
+#: ../camel/providers/local/camel-mh-store.c:505
 #, 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:351
-#: ../camel/providers/local/camel-mh-store.c:473
+#: ../camel/providers/local/camel-mbox-store.c:368
+#: ../camel/providers/local/camel-mh-store.c:514
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "àààààà '%s' ààààà àààà ààà: àààààà ààààààààààà ààà."
@@ -3853,7 +3666,7 @@ 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-mh-store.c:652
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "àààààà '%s' àààà ààààà àààà: %s"
@@ -3862,92 +3675,91 @@ msgstr "àààààà '%s' àààà ààààà àààà: %s"
 msgid "not a maildir directory"
 msgstr "maildir ààààààààà ààà"
 
-#: ../camel/providers/local/camel-maildir-store.c:508
-#: ../camel/providers/local/camel-maildir-store.c:825
-#: ../camel/providers/local/camel-spool-store.c:143
-#: ../camel/providers/local/camel-spool-store.c:159
+#: ../camel/providers/local/camel-maildir-store.c:510
+#: ../camel/providers/local/camel-maildir-store.c:885
+#: ../camel/providers/local/camel-spool-store.c:161
+#: ../camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "àààààà '%s' ààààà ààà ààààà àààà: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:677
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-maildir-store.c:719
+#, c-format
 #| msgid "Cannot create folder: %s: folder exists"
 msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
-msgstr "àààààà ààààà àààà ààà: %s: àààààà ààààààà à àààà àà"
+msgstr "ààààààààà ààà àààà ààààà ààà: %s : àààààà ààà ààààààà àààààà àààà ààà"
 
-#: ../camel/providers/local/camel-maildir-summary.c:435
-#: ../camel/providers/local/camel-maildir-summary.c:565
+#: ../camel/providers/local/camel-maildir-summary.c:439
+#: ../camel/providers/local/camel-maildir-summary.c:571
 #, 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:562
 msgid "Checking folder consistency"
 msgstr "àààààààà ààààà ààààà ààààà ààà"
 
-#: ../camel/providers/local/camel-maildir-summary.c:649
+#: ../camel/providers/local/camel-maildir-summary.c:655
 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-maildir-summary.c:748
+#: ../camel/providers/local/camel-mbox-summary.c:485
+#: ../camel/providers/local/camel-mbox-summary.c:717
+#: ../camel/providers/local/camel-mbox-summary.c:863
 #: ../camel/providers/local/camel-spool-summary.c:131
 msgid "Storing folder"
 msgstr "ààààààà ààààààà ààààà ààà"
 
 #: ../camel/providers/local/camel-mbox-folder.c:183
 #, c-format
-#| msgid "Cannot open mailbox: %s: %s\n"
 msgid "Cannot open mailbox: %s: "
 msgstr "ààààààààà àààà àààà ààà: %s: "
 
 #: ../camel/providers/local/camel-mbox-folder.c:249
-#, fuzzy, c-format
+#, c-format
 #| msgid "Cannot append message to mbox file: %s: %s"
 msgid "Cannot append message to mbox file: %s: "
-msgstr "mbox ààààààà àààààà ààààà ààààà ààà: %s: %s"
+msgstr "mbox ààààààà àààààààà àààà ààààà ààà: %s: "
 
 #: ../camel/providers/local/camel-mbox-folder.c:378
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "àààààà ààààà ààààà àààà àààà àà àààà àààà àààà àà."
 
 #: ../camel/providers/local/camel-mbox-folder.c:436
-#: ../camel/providers/local/camel-spool-folder.c:70
+#: ../camel/providers/local/camel-spool-folder.c:71
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s àà àààààà ààààà ààààà àààà ààà: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:363
-#: ../camel/providers/local/camel-mbox-store.c:534
+#: ../camel/providers/local/camel-mbox-store.c:380
+#: ../camel/providers/local/camel-mbox-store.c:550
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "à ààà àààààà àààààà ààààà àààà ààà."
 
-#: ../camel/providers/local/camel-mbox-store.c:400
+#: ../camel/providers/local/camel-mbox-store.c:417
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "àààààà '%s' ààààà àààà ààà: ààà àààààà àààà ààà."
 
-#: ../camel/providers/local/camel-mbox-store.c:550
+#: ../camel/providers/local/camel-mbox-store.c:566
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "ààààààààà '%s' ààààà àààà ààà: %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:566
+#: ../camel/providers/local/camel-mbox-store.c:582
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "àààààà ààààà àààà ààà: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:568
+#: ../camel/providers/local/camel-mbox-store.c:584
 msgid "Folder already exists"
 msgstr "àààààà ààààààà à àààà àà"
 
-#: ../camel/providers/local/camel-mbox-store.c:609
-#: ../camel/providers/local/camel-mbox-store.c:622
-#: ../camel/providers/local/camel-mbox-store.c:651
+#: ../camel/providers/local/camel-mbox-store.c:627
+#: ../camel/providers/local/camel-mbox-store.c:640
+#: ../camel/providers/local/camel-mbox-store.c:669
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3956,166 +3768,156 @@ msgstr ""
 "àààààà '%s' àààà ààààà àààà:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:632
+#: ../camel/providers/local/camel-mbox-store.c:650
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "'%s' à ààà àààààà àààà ààà."
 
-#: ../camel/providers/local/camel-mbox-store.c:641
+#: ../camel/providers/local/camel-mbox-store.c:659
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "àààààà '%s' à àààà ààà. àààà ààààààà ààà."
 
-#: ../camel/providers/local/camel-mbox-store.c:667
-#: ../camel/providers/local/camel-mbox-store.c:681
+#: ../camel/providers/local/camel-mbox-store.c:686
+#: ../camel/providers/local/camel-mbox-store.c:701
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "àààààà ààà àààà '%s' àààà ààààà àààà: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:761
+#: ../camel/providers/local/camel-mbox-store.c:783
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "ààà ààààààààà ààà àààààà àà."
 
-#: ../camel/providers/local/camel-mbox-store.c:776
+#: ../camel/providers/local/camel-mbox-store.c:799
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "'%s' ààà ààà àààà àààààà ààà: '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:859
+#: ../camel/providers/local/camel-mbox-store.c:882
 #, 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:495
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "àààààà àààà ààààà ààà: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:537
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-mbox-summary.c:556
+#, 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 "%ld àààààà àààààà %s ààà àààà àààà ààààààà ààà ààà"
+msgstr "%s àààààà àààààà %s ààà àààà àààà ààààààà ààà ààà"
 
-#: ../camel/providers/local/camel-mbox-summary.c:622
+#: ../camel/providers/local/camel-mbox-summary.c:645
 #, 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-mbox-summary.c:730
+#: ../camel/providers/local/camel-mbox-summary.c:872
 #: ../camel/providers/local/camel-spool-summary.c:138
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "àààà àààà ààààà àààà: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:711
+#: ../camel/providers/local/camel-mbox-summary.c:744
 #: ../camel/providers/local/camel-spool-summary.c:153
 #, 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:761
+#: ../camel/providers/local/camel-mbox-summary.c:988
 #, 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:772
 #, 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:789
 #, 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:886
+#: ../camel/providers/local/camel-mbox-summary.c:1153
 #, 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:925
+#: ../camel/providers/local/camel-mbox-summary.c:1184
 #, c-format
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
 "it.)"
 msgstr ""
+"MBOX àààà àààààà àà, àààààààà ààààà àààà àààààà (àààààà àààààààààà, ààààà àààà ààààà àààà)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:895
-#: ../camel/providers/local/camel-mbox-summary.c:1140
+#: ../camel/providers/local/camel-mbox-summary.c:934
+#: ../camel/providers/local/camel-mbox-summary.c:1193
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "ààà ààà àààààà àààààààà ààà, ààààà ààà àà"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1052
+#: ../camel/providers/local/camel-mbox-summary.c:1099
 #: ../camel/providers/local/camel-spool-summary.c:343
 #, 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:1263
+#: ../camel/providers/local/camel-mbox-summary.c:1293
 #, 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:1282
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "ààààààà àààààààààààà ààààààà àààààà: %s: %s"
 
 #: ../camel/providers/local/camel-mh-folder.c:115
 #, 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:525
 #, 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:542
 #, 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
-#, c-format
-msgid "Spool '%s' cannot be opened: %s"
-msgstr "ààààà '%s' àààà àààà ààà: %s"
-
-#: ../camel/providers/local/camel-spool-store.c:341
-#, 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:350
 #, c-format
 msgid "Spool mail file %s"
 msgstr "ààààà àààà àààà %s"
 
-#: ../camel/providers/local/camel-spool-store.c:357
+#: ../camel/providers/local/camel-spool-store.c:353
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "ààààà àààààà àààà %s"
 
-#: ../camel/providers/local/camel-spool-store.c:391
+#: ../camel/providers/local/camel-spool-store.c:394
 #, 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:408
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -4124,12 +3926,12 @@ msgstr ""
 "àààààà '%s' àà àààà ààààà àààà:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:409
+#: ../camel/providers/local/camel-spool-store.c:414
 #, 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:421
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -4138,44 +3940,52 @@ msgstr ""
 "àààààà '%s' ààààà ààààà àààà:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:426
+#: ../camel/providers/local/camel-spool-store.c:433
 #, 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:481
 #, 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:495
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "ààààà ààààààà àààà ààààà ààà"
 
-#: ../camel/providers/local/camel-spool-store.c:491
+#: ../camel/providers/local/camel-spool-store.c:510
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "ààààà ààààààààà ààà àààà ààààà ààà"
 
+#: ../camel/providers/local/camel-spool-store.c:583
+#, c-format
+msgid "Spool '%s' cannot be opened: %s"
+msgstr "ààààà '%s' àààà àààà ààà: %s"
+
+#: ../camel/providers/local/camel-spool-store.c:599
+#, c-format
+msgid "Spool '%s' is not a regular file or directory"
+msgstr "ààààà '%s' à ààà àààààà àààà àà ààààààààà ààà"
+
 #: ../camel/providers/local/camel-spool-summary.c:169
 #: ../camel/providers/local/camel-spool-summary.c:181
 #: ../camel/providers/local/camel-spool-summary.c:193
 #, c-format
-#| msgid "Could not sync temporary folder %s: %s"
 msgid "Could not synchronize temporary folder %s: %s"
 msgstr "ààààààà àààààà %s àà ààààà ààà ààààà àààà: %s"
 
 #: ../camel/providers/local/camel-spool-summary.c:211
 #, c-format
-#| msgid "Could not sync spool folder %s: %s"
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "ààààà àààààà %s àà ààààà ààà ààààà àààà: %s"
 
 #: ../camel/providers/local/camel-spool-summary.c:243
 #: ../camel/providers/local/camel-spool-summary.c:262
 #: ../camel/providers/local/camel-spool-summary.c:275
-#, fuzzy, c-format
+#, c-format
 #| msgid ""
 #| "Could not sync spool folder %s: %s\n"
 #| "Folder may be corrupt, copy saved in '%s'"
@@ -4186,41 +3996,47 @@ msgstr ""
 "ààààà àààààà %s àà ààààà ààà ààààà àààà: %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:213
+#: ../camel/providers/nntp/camel-nntp-folder.c:302
+#: ../camel/providers/nntp/camel-nntp-folder.c:424
 #, 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:263
+#: ../camel/providers/nntp/camel-nntp-folder.c:267
+#: ../camel/providers/pop3/camel-pop3-folder.c:431
+#: ../camel/providers/pop3/camel-pop3-folder.c:696
 #, 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:274
+#: ../camel/providers/nntp/camel-nntp-folder.c:449
+#: ../camel/providers/pop3/camel-pop3-folder.c:368
+#: ../camel/providers/pop3/camel-pop3-folder.c:420
+#: ../camel/providers/pop3/camel-pop3-folder.c:440
+#, c-format
+msgid "Cannot get message %s: "
+msgstr "àààààà %s àà ààààà ààààà ààà: "
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:508
+#: ../camel/providers/nntp/camel-nntp-folder.c:514
+#: ../camel/providers/nntp/camel-nntp-folder.c:561
 #, 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:556
 msgid "Posting failed: "
 msgstr "ààààà ààààààà àààààà: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:554
+#: ../camel/providers/nntp/camel-nntp-folder.c:585
 #, 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:605
 #, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "ààà NNTP ààààààààààà ààààààà ààà ààà àààà ààà!"
@@ -4233,47 +4049,54 @@ msgstr "ààààà ààààààààà ààààààà àà
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "àààààààààààà àààààààà, ààààààà ààààààààà ààà ààààà (_d)"
 
+#: ../camel/providers/nntp/camel-nntp-provider.c:52
+msgid "Default NNTP port"
+msgstr "àààààà NNTP ààààà"
+
 #: ../camel/providers/nntp/camel-nntp-provider.c:53
+msgid "NNTP over SSL"
+msgstr "SSL àà NNTP"
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:59
 msgid "USENET news"
 msgstr "USENET ààààààà"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:61
 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:82
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr "à àààààà àààà àààààààà ààààààààà ààààà NNTP àààààààà àààààààààà ààà àà."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:77
+#: ../camel/providers/nntp/camel-nntp-store.c:97
 #, c-format
 msgid "Authentication requested but no username provided"
 msgstr "àààààààààààà àààààà àààà àà ààààà ààà àààààààààà ààà àààà àààààààà àààà ààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:89
+#: ../camel/providers/nntp/camel-nntp-store.c:109
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "ààààà àààà àààààààààà ààà àààà ààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:346
+#: ../camel/providers/nntp/camel-nntp-store.c:357
 #, 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:370
 #, 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:528
 #, 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:1060
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4284,7 +4107,22 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1160
+#: ../camel/providers/nntp/camel-nntp-store.c:1153
+#, c-format
+msgid "You cannot create a folder in a News store: subscribe instead."
+msgstr "ààà àààààà àààààààà àààààà ààààà àààà ààà: ààà àààààà àààààààà ààà."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1169
+#, c-format
+msgid "You cannot rename a folder in a News store."
+msgstr "àààààà àààààààà ààà àààààààààà ààà àààà àààà ààà."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1192
+#, c-format
+msgid "You cannot remove a folder in a News store: unsubscribe instead."
+msgstr "ààà àààààà àààààààààà àààààà ààà ààà àààà ààà: ààà àààààà àààààààà ààà ààà."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1338
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4295,7 +4133,7 @@ msgstr ""
 "\n"
 "àààà ààà àààààà ààà ààà. àààà àààà ààààà à àààààà àà àà àààà àààààà àà."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1202
+#: ../camel/providers/nntp/camel-nntp-store.c:1389
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4306,86 +4144,71 @@ 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:1582
 msgid "NNTP Command failed: "
 msgstr "NNTP àààà àààààà: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1553
+#: ../camel/providers/nntp/camel-nntp-store.c:1656
 #, 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:240
+#: ../camel/providers/nntp/camel-nntp-summary.c:358
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: ààà ààààààà ààààà ààààà ààà"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:246
+#: ../camel/providers/nntp/camel-nntp-summary.c:256
 #, 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:374
 #, 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:419
 #, 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:285
+#: ../camel/providers/pop3/camel-pop3-folder.c:344
 #, 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:352
 #, 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:432
 msgid "Unknown reason"
 msgstr "àààààà àààà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:486
+#: ../camel/providers/pop3/camel-pop3-folder.c:472
 msgid "Retrieving POP summary"
 msgstr "POP ààà ààààà ààààà ààà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:509
-#, c-format
-msgid "Cannot get POP summary: %s"
-msgstr "POP ààà ààààà àààà ààà: %s"
+#: ../camel/providers/pop3/camel-pop3-folder.c:487
+#| msgid "Cannot get POP summary: %s"
+msgid "Cannot get POP summary: "
+msgstr "POP ààà ààààà àààà ààà: "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:561
+#: ../camel/providers/pop3/camel-pop3-folder.c:557
 msgid "Expunging old messages"
 msgstr "àààà ààààààà àààà ààààà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:575
+#: ../camel/providers/pop3/camel-pop3-folder.c:569
 msgid "Expunging deleted messages"
 msgstr "àààà ààààààà ààààààà àààààààààà ààà ààà ààààà ààà"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:39
-msgid "Message storage"
+#| msgid "Message storage"
+msgid "Message Storage"
 msgstr "àààààà ààààààààààà"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:41
@@ -4400,21 +4223,30 @@ msgstr "%s àààà(à) ààà àààà ààààà (_D)"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:46
 msgid "Delete _expunged from local Inbox"
-msgstr ""
+msgstr "ààààààà ààààààààà expunged àààà àààà (_e)"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:48
 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 "àààààà POP3 ààààà"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#| msgid "POP3 server %s"
+msgid "POP3 over SSL"
+msgstr "SSL àà POP3"
+
+#: ../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:83
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4422,7 +4254,7 @@ msgstr ""
 "à àààààà POP ààààà àààà àààà àààààààà ààààààààà àààààà. à ààààà àà à àààààà àà àà ààà "
 "POP àààààà àààà ààààààà àà."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:85
+#: ../camel/providers/pop3/camel-pop3-provider.c:93
 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 "
@@ -4432,43 +4264,44 @@ msgstr ""
 "àààà ààà ààààààààààà àààà àààà àààà àà ààà àààà àààà àààà ààààààà ààààà àà."
 
 #. 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:130
 #, 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:150
+#: ../camel/providers/pop3/camel-pop3-store.c:189
 #, 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:151
 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
-#, fuzzy, c-format
+#: ../camel/providers/pop3/camel-pop3-store.c:169
+#, 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"
+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:182
+#, 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 àààà àààààààà ààààààààà ààààààààà àààààà: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:238
+#: ../camel/providers/pop3/camel-pop3-store.c:190
 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
+#: ../camel/providers/pop3/camel-pop3-store.c:241
+#: ../camel/providers/pop3/camel-pop3-store.c:414
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -4476,24 +4309,24 @@ msgid ""
 msgstr "POP ààààà %s àààà àààààà àààà ààààà ààà: àààààà àààààà àààààààààà àààà ààà àààà ààà."
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:340
-#, fuzzy, c-format
+#: ../camel/providers/pop3/camel-pop3-store.c:269
+#, c-format
 #| msgid "SASL '%s' Login failed for POP server %s: %s"
 msgid "SASL '%s' Login failed for POP server %s%s"
-msgstr "POP ààààà %s àààà SASL '%s' àààààà àààààà: %s"
+msgstr "POP ààààà %s%s àààà SASL '%s' àààààà àààààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:357
+#: ../camel/providers/pop3/camel-pop3-store.c:286
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "POP ààààà %s ààà ààààààà àààà ààà: SASL ààààààààà ààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:374
-#, fuzzy, c-format
+#: ../camel/providers/pop3/camel-pop3-store.c:308
+#, c-format
 #| msgid "Failed to authenticate on POP server %s: %s"
 msgid "Failed to authenticate on POP server %s: "
-msgstr "POP ààààà %s àà àààààààààà ààààààà àààààà: %s"
+msgstr "POP ààààà %s àà àààààààààà ààààààà àààààà: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:439
+#: ../camel/providers/pop3/camel-pop3-store.c:380
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4502,18 +4335,21 @@ msgstr ""
 "POP ààààà %s àààà ààààààààà àààààà:\tàààààà APOP ID ààààà. àààààà ààààà ààààààà àà. "
 "àààààààà ààààà ààààà àààààààà àààààà ààà."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:492
+#: ../camel/providers/pop3/camel-pop3-store.c:427
 #, 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
-#, fuzzy, c-format
+#: ../camel/providers/pop3/camel-pop3-store.c:437
+#, c-format
 #| msgid ""
 #| "Unable to connect to POP server %s.\n"
 #| "Error sending username: %s"
@@ -4522,11 +4358,11 @@ msgid ""
 "Error sending username%s"
 msgstr ""
 "POP ààààà %s àààà àààààà ààààààà àààààà.\n"
-"àààààààààà ààà ààààààààà ààà: %s"
+"àààààààààà ààà %s ààààààààà ààà"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:518
-#, fuzzy, c-format
+#: ../camel/providers/pop3/camel-pop3-store.c:449
+#, c-format
 #| msgid ""
 #| "Unable to connect to POP server %s.\n"
 #| "Error sending password: %s"
@@ -4535,34 +4371,33 @@ msgid ""
 "Error sending password%s"
 msgstr ""
 "POP ààààà %s àààà àààààà ààààààà àààààà.\n"
-"ààààààà àààààà àààà ààà: %s"
+"ààààààà %s àààààà àààà ààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:558
+#: ../camel/providers/pop3/camel-pop3-store.c:492
 #, c-format
-#| msgid "IMAP server %s"
 msgid "POP3 server %s"
 msgstr "POP3 ààààà %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:562
-#, fuzzy, c-format
+#: ../camel/providers/pop3/camel-pop3-store.c:495
+#, c-format
 #| msgid "IMAP service for %s on %s"
 msgid "POP3 server for %s on %s"
-msgstr "%s àààà %s àà IMAP àààà"
+msgstr "%s àà %s àààà POP3 ààààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:693
+#: ../camel/providers/pop3/camel-pop3-store.c:626
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "POP ààààà %s àààà ààààà ààà ààààà àààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:720
+#: ../camel/providers/pop3/camel-pop3-store.c:653
 #, c-format
 msgid "No such folder '%s'."
 msgstr "ààà àààààà '%s' ààà."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:737
+#: ../camel/providers/pop3/camel-pop3-store.c:670
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
-msgstr ""
+msgstr "POP3 ààààààà àààà ààà àààààà ààààààà ààà"
 
 #: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "Sendmail"
@@ -4598,7 +4433,6 @@ msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "àààààààààà fork ààà ààààà àààà: %s: àààà ààààààà ààà"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:182
-#| msgid "Could not send message: %s"
 msgid "Could not send message: "
 msgstr "àààààà ààààà ààààà àààà: "
 
@@ -4617,51 +4451,67 @@ msgstr "%s ààààà ààààà ààà: àààà àààà
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "ààààààààà àààààà %d àà àààààààà àà ààà àà: àààà ààààààà ààà."
 
+#: ../camel/providers/smtp/camel-smtp-provider.c:42
+msgid "Default SMTP port"
+msgstr "àààààà SMTP ààààà"
+
 #: ../camel/providers/smtp/camel-smtp-provider.c:43
+#| msgid "SMTP server %s"
+msgid "SMTP over SSL"
+msgstr "SSL àà SMTP"
+
+#: ../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 "àààààà mailhub àààààà SMTP ààààààà ààààààà àààà àààààà àààà."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:193
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
-#, fuzzy
+#: ../camel/providers/smtp/camel-smtp-transport.c:149
+#: ../camel/providers/smtp/camel-smtp-transport.c:156
 #| msgid "Welcome response error"
 msgid "Welcome response error: "
-msgstr "àààààà àààààà ààààà àààààà àà"
+msgstr "àààààà àààààà ààààà àààààà àà: "
 
+#: ../camel/providers/smtp/camel-smtp-transport.c:191
 #: ../camel/providers/smtp/camel-smtp-transport.c:237
-#: ../camel/providers/smtp/camel-smtp-transport.c:277
-#: ../camel/providers/smtp/camel-smtp-transport.c:284
 #, 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:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/smtp/camel-smtp-transport.c:220
 msgid "STARTTLS command failed: "
 msgstr "STARTTLS àààà àààààà: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:357
+#: ../camel/providers/smtp/camel-smtp-transport.c:230
+#, 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 àààà àààààààà ààààààààà ààààààààà àààààà: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:283
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ààààà %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:361
+#: ../camel/providers/smtp/camel-smtp-transport.c:287
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP àààà %s àààààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:408
+#: ../camel/providers/smtp/camel-smtp-transport.c:338
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP ààààà %s àààààà àààààà àààààààààààà àààààààà àààà ààààà ààà %s."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:495
+#: ../camel/providers/smtp/camel-smtp-transport.c:440
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4672,659 +4522,932 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:613
+#: ../camel/providers/smtp/camel-smtp-transport.c:557
 #, 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:564
 #, 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:568
 msgid "Sending message"
 msgstr "àààààà ààààà ààààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:649
+#: ../camel/providers/smtp/camel-smtp-transport.c:593
 #, 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:606
 #, 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:709
 msgid "Syntax error, command unrecognized"
 msgstr "ààààààààà ààà, àààà àààààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:711
 msgid "Syntax error in parameters or arguments"
 msgstr "ààààààà àààà àààààààà ààààààààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:729
+#: ../camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Command not implemented"
 msgstr "àààà àààààààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:731
+#: ../camel/providers/smtp/camel-smtp-transport.c:715
 msgid "Command parameter not implemented"
 msgstr "àààà àààààà àààààààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:733
+#: ../camel/providers/smtp/camel-smtp-transport.c:717
 msgid "System status, or system help reply"
 msgstr "àààààààà àààààà, àààà àààààà ààààà àààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:735
+#: ../camel/providers/smtp/camel-smtp-transport.c:719
 msgid "Help message"
 msgstr "ààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:737
+#: ../camel/providers/smtp/camel-smtp-transport.c:721
 msgid "Service ready"
 msgstr "àààà ààààà àà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:739
+#: ../camel/providers/smtp/camel-smtp-transport.c:723
 msgid "Service closing transmission channel"
 msgstr "àààà ààà àààààà àààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:741
+#: ../camel/providers/smtp/camel-smtp-transport.c:725
 msgid "Service not available, closing transmission channel"
 msgstr "àààà àààààà ààà, àààààà àààà ààà ààà ààààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:743
+#: ../camel/providers/smtp/camel-smtp-transport.c:727
 msgid "Requested mail action okay, completed"
 msgstr "àààààà àààà àààà àààààà ààààà àà, ààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
+#: ../camel/providers/smtp/camel-smtp-transport.c:729
 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:731
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "àààààà àààà àààààà àààààà ààààà ààà: ààààààààà àààààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:749
+#: ../camel/providers/smtp/camel-smtp-transport.c:733
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "àààààà àààà àààààà ààààà ààà: ààààààààà àààààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:751
+#: ../camel/providers/smtp/camel-smtp-transport.c:735
 msgid "Requested action aborted: error in processing"
 msgstr "àààààà àààà àààààà àààààà ààà àà àà: ààààààààà ààààààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:753
+#: ../camel/providers/smtp/camel-smtp-transport.c:737
 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:739
 msgid "Requested action not taken: insufficient system storage"
 msgstr "àààààà àààà àààààà ààààà ààà: àààààà àààààààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:757
+#: ../camel/providers/smtp/camel-smtp-transport.c:741
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "àààààà àààà àààààà àààààà àààààà ààà àà àà: ààààààààààààà ààààààà ààà àà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:759
+#: ../camel/providers/smtp/camel-smtp-transport.c:743
 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:745
 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:747
 msgid "Transaction failed"
 msgstr "àààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:767
+#: ../camel/providers/smtp/camel-smtp-transport.c:751
 msgid "A password transition is needed"
 msgstr "àààààààààà àààààà ààààà àà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:769
+#: ../camel/providers/smtp/camel-smtp-transport.c:753
 msgid "Authentication mechanism is too weak"
 msgstr "àààààààààààà àààààà ààà àààà àà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:771
+#: ../camel/providers/smtp/camel-smtp-transport.c:755
 msgid "Encryption required for requested authentication mechanism"
 msgstr "ààààà àààà àààààààààà àààààà àààà àààààààààà ààààà àà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:773
+#: ../camel/providers/smtp/camel-smtp-transport.c:757
 msgid "Temporary authentication failure"
 msgstr "ààààààà àààààààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1030
+#: ../camel/providers/smtp/camel-smtp-transport.c:1008
 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:1035
+#: ../camel/providers/smtp/camel-smtp-transport.c:1052
+#: ../camel/providers/smtp/camel-smtp-transport.c:1060
 msgid "HELO command failed: "
 msgstr "HELO àààà àààààà: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1150
+#: ../camel/providers/smtp/camel-smtp-transport.c:1129
 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"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1148
+#: ../camel/providers/smtp/camel-smtp-transport.c:1159
+#: ../camel/providers/smtp/camel-smtp-transport.c:1172
 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:1280
+#: ../camel/providers/smtp/camel-smtp-transport.c:1294
+#: ../camel/providers/smtp/camel-smtp-transport.c:1303
 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:1330
 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:1346
+#: ../camel/providers/smtp/camel-smtp-transport.c:1355
 #, 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:1397
+#: ../camel/providers/smtp/camel-smtp-transport.c:1407
+#: ../camel/providers/smtp/camel-smtp-transport.c:1417
+#: ../camel/providers/smtp/camel-smtp-transport.c:1476
+#: ../camel/providers/smtp/camel-smtp-transport.c:1495
+#: ../camel/providers/smtp/camel-smtp-transport.c:1508
+#: ../camel/providers/smtp/camel-smtp-transport.c:1516
 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:1541
+#: ../camel/providers/smtp/camel-smtp-transport.c:1555
+#: ../camel/providers/smtp/camel-smtp-transport.c:1563
 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:1588
+#: ../camel/providers/smtp/camel-smtp-transport.c:1602
+#: ../camel/providers/smtp/camel-smtp-transport.c:1609
 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
-#, fuzzy
 #| 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:120
+#| msgid "URI not loaded"
+msgid "Source not loaded"
+msgstr "ààààààà ààààà ààà"
+
+#: ../libedataserver/e-client.c:122
+#| msgid "URI already loaded"
+msgid "Source already loaded"
+msgstr "ààààààà ààààààà ààààà àà"
+
+#: ../libedataserver/e-client.c:130
+#| msgid "SSL unavailable"
+msgid "Offline unavailable"
+msgstr "àààààà ààà-àààààà"
+
+#: ../libedataserver/e-client.c:152
+#| msgid "parse error"
+msgid "D-Bus error"
+msgstr "D-Bus ààà"
+
 #. 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
+#: ../libedataserverui/e-book-auth-util.c:96
+#: ../libedataserverui/e-book-auth-util.c:662
 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:221
+msgid "Currently _used categories:"
+msgstr "àààààà àààààà ààààà (_u):"
 
-#: ../libedataserverui/e-categories-dialog.c:142
-msgid "Category _Name"
-msgstr "àààà ààà (_N)"
+#: ../libedataserverui/e-categories-editor.c:230
+msgid "_Available Categories:"
+msgstr "àààààà ààààà (_A):"
 
-#: ../libedataserverui/e-categories-dialog.c:148
-msgid "Category _Icon"
-msgstr "àààà ààààà (_I)"
+#: ../libedataserverui/e-categories-selector.c:320
+msgid "Icon"
+msgstr "ààààà"
+
+#: ../libedataserverui/e-categories-selector.c:325
+msgid "Category"
+msgstr "àààà"
+
+#: ../libedataserverui/e-category-completion.c:294
+#, c-format
+msgid "Create category \"%s\""
+msgstr "àààà \"%s\" àà ààààà"
 
-#: ../libedataserverui/e-categories-dialog.c:189
+#: ../libedataserverui/e-category-editor.c:132
 msgid "Category Icon"
 msgstr "àààà ààààà"
 
-#: ../libedataserverui/e-categories-dialog.c:195
+#: ../libedataserverui/e-category-editor.c:136
 msgid "_No Image"
 msgstr "àààà ààà (_N)"
 
-#: ../libedataserverui/e-categories-dialog.c:406
+#: ../libedataserverui/e-category-editor.c:173
+msgid "Category _Name"
+msgstr "àààà ààà (_N)"
+
+#: ../libedataserverui/e-category-editor.c:181
+msgid "Category _Icon"
+msgstr "àààà ààààà (_I)"
+
+#: ../libedataserverui/e-category-editor.c:221
+msgid "Category Properties"
+msgstr "àààà àààààààà"
+
+#: ../libedataserverui/e-category-editor.c:282
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "ààààààààààààà ààààààà à àààà '%s' àà. àààààààà ààààà àààà ààà ààààà"
 
-#: ../libedataserverui/e-categories-dialog.c:661
-msgid "Currently _used categories:"
-msgstr "àààààà àààààà ààààà (_u):"
+#: ../libedataserverui/e-client-utils.c:856
+#, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid ""
+"Enter password for calendar %s (user %s)\n"
+"Reason: %s"
+msgstr ""
+"àààààààà %s àààà ààààààààà àààà ààà (àààààààààà %s)\n"
+"àààà: %s"
 
-#: ../libedataserverui/e-categories-dialog.c:668
-msgid "_Available Categories:"
-msgstr "àààààà ààààà (_A):"
+#: ../libedataserverui/e-client-utils.c:858
+#, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid "Enter password for calendar %s (user %s)"
+msgstr "àààààààà %s àààà ààààààààà àààà ààà (àààààààààà %s)"
 
-#: ../libedataserverui/e-categories-dialog.c:711
-msgid "_Edit"
-msgstr "àààààà ààà (_E)"
+#: ../libedataserverui/e-client-utils.c:862
+#, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid ""
+"Enter password for task list %s (user %s)\n"
+"Reason: %s"
+msgstr ""
+"ààààà àààà %s (àààààààààà %s) àààà ààààààà àààà ààà\n"
+"àààà: %s"
 
-#: ../libedataserverui/e-categories-dialog.c:767
-msgid "Icon"
-msgstr "ààààà"
+#: ../libedataserverui/e-client-utils.c:864
+#, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid "Enter password for task list %s (user %s)"
+msgstr "ààààà àààà %s (àààààààààà %s) àààà ààààààà àààà ààà"
 
-#: ../libedataserverui/e-categories-dialog.c:772
-msgid "Category"
-msgstr "àààà"
+#: ../libedataserverui/e-client-utils.c:868
+#, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid ""
+"Enter password for memo list %s (user %s)\n"
+"Reason: %s"
+msgstr ""
+"àààà àààà %s (àààààààààà %s) àààà ààààààà àààà ààà\n"
+"àààà: %s"
 
-#: ../libedataserverui/e-category-completion.c:292
+#: ../libedataserverui/e-client-utils.c:870
 #, c-format
-msgid "Create category \"%s\""
-msgstr "àààà \"%s\" àà ààààà"
+#| msgid "Enter password for %s (user %s)"
+msgid "Enter password for memo list %s (user %s)"
+msgstr "àààà àààà %s (àààààààààà %s) àààà ààààààà àààà ààà"
+
+#: ../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"
+
+#: ../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) àààà ààààààà àààà ààà"
+
+#: ../libedataserverui/e-client-utils.c:981
+msgid "Enter Passphrase"
+msgstr "àààààààà àààà ààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:169
-#| msgid "Hot Contacts"
+#: ../libedataserverui/e-client-utils.c:983
+#| msgid "Password"
+msgid "Enter Password"
+msgstr "ààààààà àààà ààà"
+
+#: ../libedataserverui/e-name-selector-dialog.c:184
 msgid "Show Contacts"
 msgstr "ààààààà ààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:191
+#: ../libedataserverui/e-name-selector-dialog.c:206
 msgid "Address B_ook:"
 msgstr "àààààà àààà (_o):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:199
+#: ../libedataserverui/e-name-selector-dialog.c:214
 msgid "Cate_gory:"
 msgstr "àààà (_g):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:217
+#: ../libedataserverui/e-name-selector-dialog.c:232
 msgid "_Search:"
 msgstr "àààà (_S):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:235
-#: ../libedataserverui/e-name-selector-dialog.c:970
+#: ../libedataserverui/e-name-selector-dialog.c:250
+#: ../libedataserverui/e-name-selector-dialog.c:1035
 msgid "Any Category"
 msgstr "ààààà àààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:237
-#| msgid "Contacts"
+#: ../libedataserverui/e-name-selector-dialog.c:252
 msgid "Co_ntacts"
 msgstr "ààààààà (_n)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:282
+#: ../libedataserverui/e-name-selector-dialog.c:307
 msgid "Search"
 msgstr "àààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:285
+#: ../libedataserverui/e-name-selector-dialog.c:310
 msgid "Address Book"
 msgstr "àààààà àààààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:288
+#: ../libedataserverui/e-name-selector-dialog.c:313
 msgid "Contacts"
 msgstr "ààààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:405
+#: ../libedataserverui/e-name-selector-dialog.c:430
 msgid "Select Contacts from Address Book"
 msgstr "àààààà ààààààààà ààààààà àààà ààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:740
+#: ../libedataserverui/e-name-selector-dialog.c:778
 msgid "_Add"
 msgstr "ààààà (_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:744
+#: ../libedataserverui/e-name-selector-dialog.c:782
 msgid "_Remove"
 msgstr "ààà ààà (_R)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:884
+#: ../libedataserverui/e-name-selector-dialog.c:954
 #, 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:2665
+#: ../libedataserverui/e-name-selector-entry.c:2816
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "%s ààààààà ààààààà ààà (_x)"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2680
+#: ../libedataserverui/e-name-selector-entry.c:2831
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s àà ààà ààà (_y)"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2690
+#: ../libedataserverui/e-name-selector-entry.c:2841
 #, c-format
 msgid "C_ut %s"
 msgstr "%s àààà (_u)"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2707
+#: ../libedataserverui/e-name-selector-entry.c:2858
 #, c-format
 msgid "_Edit %s"
 msgstr "%s ààà àààààà ààà (_E)"
 
-#: ../libedataserverui/e-name-selector-list.c:513
+#: ../libedataserverui/e-name-selector-list.c:520
 #, 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:100
+#: ../libedataserverui/e-source-selector-dialog.c:99
 msgid "Select destination"
 msgstr "ààààà ààààà àààà ààà"
 
-#: ../libedataserverui/e-source-selector-dialog.c:170
+#: ../libedataserverui/e-source-selector-dialog.c:174
 msgid "_Destination"
 msgstr "ààààà ààààà (_D)"
 
-#: ../servers/groupwise/e-gw-connection.c:227
-msgid "Invalid connection"
-msgstr "àààààà ààààà"
+#~ msgid "Updating contacts cache (%d)... "
+#~ msgstr "ààààààà ààà àààààà ààààà ààà (%d)... "
 
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "Invalid response from server"
-msgstr "àààààààààà àààà àààà àààà àààààà àà"
+#, fuzzy
+#~| msgid "Cannot get message %s: %s"
+#~ msgid "Cannot get supported fields: %s"
+#~ msgstr "àààààà %s ààààà àààà ààà: %s"
+
+#, fuzzy
+#~| msgid "Cannot get message %s: %s"
+#~ msgid "Cannot get required fields: %s"
+#~ msgstr "àààààà %s ààààà àààà ààà: %s"
 
-#: ../servers/groupwise/e-gw-connection.c:233
-msgid "No response from the server"
-msgstr "àààààààààà ààà ààààààààààà ààà"
+#, fuzzy
+#~| msgid "Unsupported authentication method"
+#~ msgid "Cannot get supported authentication methods: %s"
+#~ msgstr "àààààààààà àààààààààà àààààà"
 
-#: ../servers/groupwise/e-gw-connection.c:239
-msgid "Bad parameter"
-msgstr "àààà àààààà"
+#, fuzzy
+#~| msgid "Cannot get message %s: %s"
+#~ msgid "Cannot get changes: %s"
+#~ msgstr "àààààà %s ààààà àààà ààà: %s"
 
+#, fuzzy
+#~| msgid "Operation failed: %s"
+#~ msgid "Cancel operation failed: %s"
+#~ msgstr "ààààààààà àààààà: %s"
 
-#: ../calendar/libecal/e-cal.c:1049
-msgid "On This Computer"
-msgstr "à àààààààààààà"
+#~ msgid "Reply Requested: by "
+#~ msgstr "ààààààààààààà àààààà àààà àà: àààà àààààà "
+
+#~ msgid "Reply Requested: When convenient"
+#~ msgstr "ààààààààààààà àààààà àààà àà: àààààà ààààà ààà"
+
+#, fuzzy
+#~| msgid "Loading %s items"
+#~ msgid "Loading Appointment items"
+#~ msgstr "%s àààààà àààà ààààà ààà"
+
+#, fuzzy
+#~| msgid "Loading %s items"
+#~ msgid "Loading Task items"
+#~ msgstr "%s àààààà àààà ààààà ààà"
+
+#, fuzzy
+#~| msgid "Loading %s items"
+#~ msgid "Loading Note items"
+#~ msgstr "%s àààààà àààà ààààà ààà"
+
+#~| 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"
+
+#, fuzzy
+#~| msgid "Cannot save calendar data"
+#~ msgid "Cannot retrieve calendar's LDAP attribute: %s"
+#~ msgstr "àààààààà àààààà ààààààà àààà ààà"
+
+#, fuzzy
+#~| msgid "Cannot create CMS Recipient information"
+#~ msgid "Cannot retrieve calendar scheduling information: %s"
+#~ msgstr "CMS ààààààà ààààààà ààààà àààà ààà"
+
+#~| msgid "Cannot save calendar data"
+#~ msgid "Cannot discard calendar alarm: %s"
+#~ msgstr "àààààààà àààààààà àààà ààààà ààà: %s"
+
+#~ msgid "Cannot retrieve default calendar object path: %s"
+#~ msgstr "àààààà àààààààà àààààààà ààààà ààààà ààààà ààà: %s"
+
+#, fuzzy
+#~| 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 "No such message available."
+#~ msgid "No stream available"
+#~ msgstr "ààààààà àààààà ààà"
+
+#~ msgid ""
+#~ "Could not create directory %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "ààààààààà %s ààààà ààààà àààà:\n"
+#~ "%s"
+
+#~ 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 "àààààà ààààààààà àààààà ààààà ààààà ààà: ààà àààààà ààà"
+
+#, fuzzy
+#~| msgid "Cannot append message in offline mode: %s"
+#~ msgid "Cannot append message in offline mode: "
+#~ msgstr "àààààà ààààààààà àààààà ààààà ààààà ààà: %s"
+
+#~ msgid "Checking for new mail"
+#~ msgstr "ààà àààà àààà ààààà ààààà ààà"
+
+#~ msgid "Check new messages for J_unk contents"
+#~ msgstr "ààààà ààààààààà àààà ààà ààààààà ààààà (_u)"
+
+#~ msgid "Automatically synchroni_ze account locally"
+#~ msgstr "ààààà ààààààà àààà ààààà ààààà ààà (_z)"
+
+#~ msgid "SOAP Settings"
+#~ msgstr "SOAP ààààààà"
+
+#~ msgid "Post Office Agent SOAP _Port:"
+#~ msgstr "ààààà àààà ààààà SOAP ààààà (_P):"
+
+#~ msgid "Novell GroupWise"
+#~ msgstr "ààààà ààààààààà"
+
+#~ msgid "For accessing Novell GroupWise servers"
+#~ msgstr "Novell GroupWise àààààà àààààà àààà"
+
+#~ msgid ""
+#~ "This option will connect to the GroupWise server using a plaintext "
+#~ "password."
+#~ msgstr "à àààààà àààà àààààà ààààààààà ààààà àààààààààààà ààààà àààà àààààà."
+
+#~ msgid "Host or user not available in url"
+#~ msgstr "ààààà àààà àààààààààà url ààà àààààà ààà"
+
+#~ msgid ""
+#~ "Some features may not work correctly with your current server version"
+#~ msgstr "ààààà ààààààà ààààà ààààààà àààà àààà àààààà ààààà àààà ààà àààà àààà"
+
+#~ msgid "Cannot create GroupWise folders in offline mode."
+#~ msgstr "àààààà ààààààààà àààààààààà àààààà ààààà àààà ààà."
+
+#~| msgid "Cannot delete folder '%s': Special folder"
+#~ msgid "Cannot create a special system folder"
+#~ msgstr "ààààààà àààààà àààààààà ààààà ààààà ààà"
+
+#~ msgid "Cannot rename GroupWise folder '%s' to '%s'"
+#~ msgstr "àààààààààà àààààà àà '%s' àà '%s' ààà ààà àààà àààà ààà"
+
+#~ msgid "GroupWise server %s"
+#~ msgstr "àààààààààà ààààà %s"
+
+#~ msgid "GroupWise service for %s on %s"
+#~ msgstr "%s àààà %s àà àààààààààà àààà"
+
+#~ msgid "GroupWise mail delivery via %s"
+#~ msgstr "%s àààààà àààààààààà àààà ààààààààà"
+
+#~ 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 "SSL negotiations failed"
+#~ msgstr "SSL ààà àààààà àààààà"
+
+#, fuzzy
+#~| msgid "Could not connect to %s (port %s): %s"
+#~ msgid "Could not connect to %s (port %s): "
+#~ msgstr "%s (ààààà %s) àààà ààààà ààààà àààà: %s"
+
+#~ msgid "TLS negotiations failed"
+#~ msgstr "TLS ààà àààààà àààààà"
+
+#~ 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 "àààà àààààà"



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