[evolution-data-server] Updated Kannada Translation



commit 9e03af12780eee36e010484f5356b384234259b7
Author: Shankar Prasad <svenkate redhat com>
Date:   Mon Aug 29 18:02:10 2011 +0530

    Updated Kannada Translation

 po/kn.po | 4007 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 2075 insertions(+), 1932 deletions(-)
---
diff --git a/po/kn.po b/po/kn.po
index edd169e..1acffa4 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -6,153 +6,139 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server.gnome-2-28.kn\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.";
-"cgi?product=evolution-data-server&component=Misc.\n"
-"POT-Creation-Date: 2011-02-07 14:36+0000\n"
-"PO-Revision-Date: 2011-02-11 12:45+0530\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-08-24 15:15+0000\n"
+"PO-Revision-Date: 2011-08-29 18:02+0530\n"
 "Last-Translator: Shankar Prasad <svenkate redhat com>\n"
 "Language-Team: American English <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: Lokalize 1.1\n"
+"X-Generator: Lokalize 1.2\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Language: en_US\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:823
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
 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:826
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4708
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
 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:788
 msgid "Querying for updated contactsâ"
 msgstr "àààâàààà àààààà ààààààààààààààààà àààà àààààààààààààààà..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:624
+#: ../addressbook/backends/google/e-book-backend-google.c:839
+#: ../addressbook/libebook/e-book.c:3483 ../calendar/libecal/e-cal.c:1337
+#: ../libedataserver/e-client.c:1851
 msgid "Personal"
 msgstr "àààààààà"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:626
-#| msgid "Favorites"
+#: ../addressbook/backends/google/e-book-backend-google.c:841
 msgid "Friends"
 msgstr "ààààààà"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:628
-#| msgid "Family Name"
+#: ../addressbook/backends/google/e-book-backend-google.c:843
 msgid "Family"
 msgstr "àààààà"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:630
+#: ../addressbook/backends/google/e-book-backend-google.c:845
 msgid "Coworkers"
 msgstr "àààààààààààà"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:707
+#: ../addressbook/backends/google/e-book-backend-google.c:924
 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:1329
 msgid "Creating new contactâ"
 msgstr "ààà àààààààààààààààà ààààààààààààààâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:984
+#: ../addressbook/backends/google/e-book-backend-google.c:1433
 msgid "Deleting contactâ"
 msgstr "àààààààààààààààà ààààààààààààààâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1092
-#| msgid "Cannot modify contact"
+#. Update the contact on the server asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:1699
 msgid "Modifying contactâ"
 msgstr "àààààààààààààààà ààààààààààààààààà..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1199
-#| msgid "Loading..."
+#: ../addressbook/backends/google/e-book-backend-google.c:1892
 msgid "Loadingâ"
 msgstr "àààà ààààààààààààà..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1346
-#| msgid "Authentication required"
+#: ../addressbook/backends/google/e-book-backend-google.c:2047
 msgid "Authenticating with the serverâ"
 msgstr "àààààààààààààà ààààààààààààààààààà..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2699
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4665
-#, c-format
-msgid "Downloading contacts (%d)... "
-msgstr "àààààààààààà ààààâàààà ààààààààààààà (%d)... "
-
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2847
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3030
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3077
-#, c-format
-msgid "Updating contacts cache (%d)... "
-msgstr "àààààààà ààààààààààà ààààààà ààààààààààààà (%d)... "
-
 #. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
-#| msgid "Not connected."
 msgid "Not connected"
 msgstr "àààààààààààààààà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:764
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:776
 msgid "Using Distinguished Name (DN)"
 msgstr "Distinguished Name (DN) ààààà ààààààààààààà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:767
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:779
 msgid "Using Email Address"
 msgstr "ààààà àààààààààà ààààààààà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1033
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1048
 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:1173
 msgid "Invalid DN syntax"
 msgstr "ààààààààà DN àààààààààààâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1675
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1688
 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:1818
 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:2250
 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:4559
 msgid "Receiving LDAP search results..."
 msgstr "LDAP àààààà ààààààààààààà àààààààààààààà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4528
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4729
 msgid "Error performing search"
 msgstr "ààààààààà ààà àààààààà"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:273
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:881
-#: ../addressbook/libedata-book/e-data-book.c:441
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:523
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:552
-#: ../calendar/backends/http/e-cal-backend-http.c:435
-#: ../calendar/libecal/e-cal.c:4180
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:160
-#: ../camel/providers/imap/camel-imap-command.c:481
-#: ../camel/providers/imap/camel-imap-store.c:425
-#: ../camel/providers/pop3/camel-pop3-store.c:495
-#: ../camel/providers/smtp/camel-smtp-transport.c:497
-#: ../servers/groupwise/e-gw-connection.c:243
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4849
+#, c-format
+msgid "Downloading contacts (%d)... "
+msgstr "àààààààààààà ààààâàààà ààààààààààààà (%d)... "
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:274
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:880
+#: ../addressbook/libebook/e-book-client.c:96
+#: ../addressbook/libedata-book/e-data-book.c:442
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:520
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:549
+#: ../calendar/backends/http/e-cal-backend-http.c:422
+#: ../calendar/libecal/e-cal.c:4439 ../calendar/libecal/e-cal-client.c:140
+#: ../camel/providers/imap/camel-imap-command.c:484
+#: ../camel/providers/imap/camel-imap-store.c:409
+#: ../camel/providers/imapx/camel-imapx-server.c:2246
+#: ../camel/providers/smtp/camel-smtp-transport.c:439
+#: ../libedataserver/e-client.c:152
 msgid "Unknown error"
 msgstr "àààààà ààà"
 
@@ -161,28 +147,98 @@ msgstr "àààààà ààà"
 msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgstr "'%s' ààà ààààààààà ààààààààà HTTP ààààààààààààà ààààààààààà: %d (%s)"
 
-#: ../addressbook/libebook/e-book.c:3064
+#: ../addressbook/libebook/e-book.c:3158
 #, c-format
 msgid "%s: there was no source for UID '%s' stored in GConf."
 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:3466 ../calendar/libecal/e-cal.c:1317
+#: ../libedataserver/e-client.c:1846
+msgid "On This Computer"
+msgstr "à àààààààà"
+
+#: ../addressbook/libebook/e-book.c:3592
+#: ../addressbook/libebook/e-book-client.c:635
+#: ../addressbook/libedata-book/e-data-book.c:310
 msgid "Address book does not exist"
 msgstr "ààààà àààààà àààààààààààààààà"
 
+#: ../addressbook/libebook/e-book-client.c:85
+#| msgid "No such folder %s"
+msgid "No such book"
+msgstr "àààà àààààà ààààààààààà"
+
+#: ../addressbook/libebook/e-book-client.c:87
+#: ../addressbook/libedata-book/e-data-book.c:303
+msgid "Contact not found"
+msgstr "àààààààà àààà ààààààà"
+
+#: ../addressbook/libebook/e-book-client.c:89
+#: ../addressbook/libedata-book/e-data-book.c:304
+msgid "Contact ID already exists"
+msgstr "àààààà ààààà àààààà ààààààààààààààà"
+
+#: ../addressbook/libebook/e-book-client.c:91
+#| msgid "No such message"
+msgid "No such source"
+msgstr "àààà àààààà ààà àààà"
+
+#: ../addressbook/libebook/e-book-client.c:93
+#: ../addressbook/libedata-book/e-data-book.c:320
+msgid "No space"
+msgstr "àààààà ààààààààà"
+
+#: ../addressbook/libebook/e-book-client.c:449
+#| msgid "Failed to encode data"
+msgid "Failed to run book factory"
+msgstr "àààààà àààààààààààààà àààààààààààà ààààààààààà"
+
+#: ../addressbook/libebook/e-book-client.c:459
+#: ../addressbook/libedata-book/e-data-book-factory.c:375
+#: ../addressbook/libedata-book/e-data-book-factory.c:433
+#: ../calendar/libecal/e-cal-client.c:565
+#: ../calendar/libedata-cal/e-data-cal-factory.c:395
+#, c-format
+msgid "Invalid source"
+msgstr "ààààààààà ààà"
+
+#: ../addressbook/libebook/e-book-client.c:560
+#: ../calendar/libecal/e-cal-client.c:678
+#, c-format
+msgid "Incorrect uri '%s'"
+msgstr "ààààà uri '%s'"
+
+#: ../addressbook/libebook/e-book-client.c:598
+#| msgid "Failed on message %d"
+msgid "Failed to find system book"
+msgstr "ààààààààà ààààààààààà ààààà ààààààààà ààààààààààà"
+
+#: ../addressbook/libebook/e-book-client.c:705
+#: ../calendar/libecal/e-cal-client.c:826
+#, 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:2094
+#: ../calendar/libecal/e-cal-client.c:4092
+#| 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 "ààààààà ààà"
 
-#: ../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 "àààààà àààààà"
 
@@ -190,1155 +246,1191 @@ msgstr "àààààà àààààà"
 #. 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
+#: ../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:758
+#: ../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 "GroupWise ààà àààà ààààà à"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Home Screen Name 2"
 msgstr "GroupWise ààà àààà ààààà à"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Home Screen Name 3"
 msgstr "GroupWise ààà àààà ààààà à"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:203
 msgid "GroupWise Work Screen Name 1"
 msgstr "GroupWise àààà àààà ààààà à"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:204
 msgid "GroupWise Work Screen Name 2"
 msgstr "GroupWise àààà àààà ààààà à"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:205
 msgid "GroupWise Work Screen Name 3"
 msgstr "GroupWise àààà àààà ààààà à"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:206
 msgid "Jabber Home ID 1"
 msgstr "Jabber àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:207
 msgid "Jabber Home ID 2"
 msgstr "Jabber àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:208
 msgid "Jabber Home ID 3"
 msgstr "Jabber àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:209
 msgid "Jabber Work ID 1"
 msgstr "Jabber àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Jabber Work ID 2"
 msgstr "Jabber àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Jabber Work ID 3"
 msgstr "Jabber àààà ààà à"
 
-#: ../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
+#: ../addressbook/libebook/e-contact.c:224
 msgid "ICQ Home ID 1"
 msgstr "ICQ àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:225
 msgid "ICQ Home ID 2"
 msgstr "ICQ àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:226
 msgid "ICQ Home ID 3"
 msgstr "ICQ àà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:227
 msgid "ICQ Work ID 1"
 msgstr "ICQ ààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:225
+#: ../addressbook/libebook/e-contact.c:228
 msgid "ICQ Work ID 2"
 msgstr "ICQ ààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:226
+#: ../addressbook/libebook/e-contact.c:229
 msgid "ICQ Work ID 3"
 msgstr "ICQ ààààà ààà à"
 
 #. 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
+#: ../addressbook/libebook/e-contact.c:253
 msgid "GroupWise ID List"
 msgstr "GroupWise ààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:254
 msgid "Jabber ID List"
 msgstr "Jabber ààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:255
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo! àààà àààà ààààà"
 
-#: ../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
+#: ../addressbook/libebook/e-contact.c:257
 msgid "ICQ ID List"
 msgstr "ICQ ààà ààààà"
 
-#: ../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:721
 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
+#: ../addressbook/libebook/e-contact.c:270
 msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:268
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:269
+#: ../addressbook/libebook/e-contact.c:272
 msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:270
+#: ../addressbook/libebook/e-contact.c:273
 msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu ààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook/e-contact.c:274
 msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu ààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:272
+#: ../addressbook/libebook/e-contact.c:275
 msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu ààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:273
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Gadu-Gadu ID List"
 msgstr "Gadu-Gadu ààà ààààà"
 
 #. 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 "Skype ààà ààààà à"
 
-#: ../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:1515
-#: ../addressbook/libebook/e-destination.c:739
+#: ../addressbook/libebook/e-contact.c:293
+#| msgid "Skype Home Name 1"
+msgid "Google Talk Home Name 1"
+msgstr "ààààà àààà ààà ààààà 1"
+
+#: ../addressbook/libebook/e-contact.c:294
+#| msgid "Skype Home Name 2"
+msgid "Google Talk Home Name 2"
+msgstr "ààààà àààà ààà ààààà 2"
+
+#: ../addressbook/libebook/e-contact.c:295
+#| msgid "Skype Home Name 3"
+msgid "Google Talk Home Name 3"
+msgstr "ààààà àààà ààà ààààà 3"
+
+#: ../addressbook/libebook/e-contact.c:296
+#| msgid "Skype Work Name 1"
+msgid "Google Talk Work Name 1"
+msgstr "ààààà àààà ààààà ààààà 1"
+
+#: ../addressbook/libebook/e-contact.c:297
+#| msgid "Skype Work Name 2"
+msgid "Google Talk Work Name 2"
+msgstr "ààààà àààà ààààà ààààà 2"
+
+#: ../addressbook/libebook/e-contact.c:298
+#| msgid "Skype Work Name 3"
+msgid "Google Talk Work Name 3"
+msgstr "ààààà àààà ààààà ààààà 3"
+
+#: ../addressbook/libebook/e-contact.c:299
+#| msgid "Skype Name List"
+msgid "Google Talk Name List"
+msgstr "ààààà àààà àààààà ààààà"
+
+#: ../addressbook/libebook/e-contact.c:1550
+#: ../addressbook/libebook/e-destination.c:868
 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:92
 #, 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:104
 #, c-format
-msgid "Invalid source"
-msgstr "ààààààààà ààà"
+#| msgid "Cannot create folder '%s': %s"
+msgid "Cannot change value of book property '%s'"
+msgstr "ààààààà àààààààà '%s' ààààà ààààààààà àààààààààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:173
-#: ../calendar/libedata-cal/e-data-cal.c:110
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:463
+#: ../camel/camel-db.c:470
+#, c-format
+msgid "Insufficient memory"
+msgstr "ààààààà àààààà àààà"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:196
+#: ../addressbook/libedata-book/e-data-book.c:209
+#: ../addressbook/libedata-book/e-data-book.c:694
+#| msgid "Invalid query: %s"
+msgid "Invalid query: "
+msgstr "ààààààààà àààà: "
+
+#: ../addressbook/libedata-book/e-data-book.c:299
+#: ../calendar/libedata-cal/e-data-cal.c:414
 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:300
+#: ../calendar/libecal/e-cal.c:4407 ../calendar/libedata-cal/e-data-cal.c:415
+#: ../libedataserver/e-client.c:111
+msgid "Backend is busy"
+msgstr "ààààààààà ààààààààààààààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:301
+#: ../calendar/libedata-cal/e-data-cal.c:416 ../libedataserver/e-client.c:121
 msgid "Repository offline"
 msgstr "ààààààààààà àààâààààààààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:175
-#: ../calendar/libecal/e-cal.c:4162 ../calendar/libedata-cal/e-data-cal.c:112
+#: ../addressbook/libedata-book/e-data-book.c:302
+#: ../calendar/libecal/e-cal.c:4421 ../calendar/libedata-cal/e-data-cal.c:417
+#: ../libedataserver/e-client.c:125
 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 "àààààà ààààà àààààà ààààààààààààààà"
-
-#: ../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:305
+#: ../calendar/libedata-cal/e-data-cal.c:422
 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:306
+#: ../calendar/libedata-cal/e-data-cal.c:423
 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:307
+#: ../calendar/libedata-cal/e-data-cal.c:424
 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:308
+#: ../calendar/libedata-cal/e-data-cal.c:426 ../libedataserver/e-client.c:133
 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:309
+#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:135
 msgid "TLS not available"
 msgstr "TSL ààààààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:184
+#: ../addressbook/libedata-book/e-data-book.c:311
 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:312
+#: ../calendar/libedata-cal/e-data-cal.c:430
 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:313
+#: ../calendar/libedata-cal/e-data-cal.c:431 ../libedataserver/e-client.c:137
 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:314
+#: ../calendar/libedata-cal/e-data-cal.c:432 ../libedataserver/e-client.c:139
 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:315
+#: ../calendar/libedata-cal/e-data-cal.c:433 ../libedataserver/e-client.c:141
 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:316
+#: ../calendar/libedata-cal/e-data-cal.c:434 ../libedataserver/e-client.c:143
 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:317
+#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:129
 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:319
+#: ../calendar/libedata-cal/e-data-cal.c:437
 msgid "Invalid server version"
 msgstr "àààààà ààààààà ààààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:193
-#| msgid "Namespace"
-msgid "No space"
-msgstr "àààààà ààààààààà"
-
-#: ../addressbook/libedata-book/e-data-book.c:194
-#: ../calendar/libecal/e-cal.c:4146 ../calendar/libedata-cal/e-data-cal.c:133
+#: ../addressbook/libedata-book/e-data-book.c:321
+#: ../calendar/libecal/e-cal.c:4405 ../calendar/libedata-cal/e-data-cal.c:438
+#: ../libedataserver/e-client.c:109
 msgid "Invalid argument"
 msgstr "ààààààààà àààààààààààà"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:196
-#: ../calendar/libecal/e-cal.c:4185 ../calendar/libedata-cal/e-data-cal.c:135
-#| msgid "Protocol not supported"
+#: ../addressbook/libedata-book/e-data-book.c:323
+#: ../calendar/libecal/e-cal.c:4444 ../calendar/libedata-cal/e-data-cal.c:440
+#: ../libedataserver/e-client.c:131
 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:324
+#: ../calendar/libedata-cal/e-data-cal.c:441 ../libedataserver/e-client.c:149
+#| msgid "Backend is busy"
+msgid "Backend is not opened yet"
+msgstr "ààààààààà ààààà ààààà àà àààààààààààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:332
+#: ../calendar/libecal/e-cal-client.c:573
+#: ../calendar/libedata-cal/e-data-cal.c:449 ../libedataserver/e-client.c:147
 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 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 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 contact: %s"
-msgstr "àààààà àààààààààà ààààààààààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:402
-#, c-format
-msgid "Empty query: %s"
-msgstr "àààà àààà àààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:418
-#, c-format
-msgid "Cannot get contact list: %s"
-msgstr "àààààààààààà àààààààààà àààààà àààààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:457
-#, c-format
-msgid "Cannot authenticate 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 add contact"
-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 modify contact"
-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 remove contacts"
-msgid "Cannot remove contacts: %s"
-msgstr "àààààààààààààààà àààààà ààààà àààààààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:610
-#, c-format
-#| msgid "Cannot get message %s: %s"
-msgid "Cannot get supported fields: %s"
-msgstr "àààààààààà àààààààààà ààààààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:625
-#, c-format
-#| msgid "Cannot get message %s: %s"
-msgid "Cannot get required fields: %s"
-msgstr "àààààààààà àààààààààà ààààààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:640
-#, c-format
-#| msgid "Unsupported authentication method"
-msgid "Cannot get supported authentication methods: %s"
-msgstr "àààààààààà ààààààà ààààààààààà ààààààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:666
-#: ../addressbook/libedata-book/e-data-book.c:677
-#, c-format
-#| msgid "Invalid query"
-msgid "Invalid query: %s"
-msgstr "ààààààààà àààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:713
-#, c-format
-msgid "Cannot get changes: %s"
-msgstr "ààààààààààààà ààààààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:755
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:536
+#: ../addressbook/libedata-book/e-data-book.c:866
+#| 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:558
+#: ../addressbook/libedata-book/e-data-book.c:580
+#| msgid "Empty query: %s"
+msgid "Empty query: "
+msgstr "àààà àààà àààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:602
+#: ../addressbook/libedata-book/e-data-book.c:932
+#| 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:624
+#: ../addressbook/libedata-book/e-data-book.c:951
+#| 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:717
+#: ../calendar/libedata-cal/e-data-cal.c:824
+#| 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:779
+#| 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:793
+#| 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:818
+#| 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:834
+#| 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:850
+#: ../calendar/libedata-cal/e-data-cal.c:1001
+#| 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:881
+#| 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:905
+#| msgid "Cannot get contact list: %s"
+msgid "Cannot get contact list uids: "
+msgstr "àààààààààààà àààààà uid ààààà ààààààààààà:"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:969
+#| msgid "Cannot remove contacts: %s"
+msgid "Cannot remove contacts: "
+msgstr "ààààààààààààààààà àààààà ààààà àààààààààààà:"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:359
+#: ../addressbook/libedata-book/e-data-book-factory.c:392
+#: ../calendar/libedata-cal/e-data-cal-factory.c:410
 #, 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:518
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "àààààààààààà ààààààààààààààà (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:549
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:546
 #, c-format
-#| msgid ""
-#| "Unexpected GnuPG status message encountered:\n"
-#| "\n"
-#| "%s"
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "%d ààà ààààààààààààà HTTP àààààà àààààààààà ààààààààààà (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2090
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2495
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2133
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2481
 #, 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:4266
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4272
 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:723
 msgid "Birthday"
 msgstr "àààààààààà"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:754
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:752
 #, c-format
 msgid "Birthday: %s"
 msgstr "àààààààààà: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:778
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:776
 #, 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 "àààààààààà ààààààààààà ààààààààààà: àààààààààà àààààà."
 
-#: ../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:2109
-msgid "Reply Requested: by "
-msgstr "ààààààààààààààà àààà àààààààààààà:ààà "
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2114
-msgid "Reply Requested: When convenient"
-msgstr "ààààààààààààààà àààà àààààààààààà: ààààààààààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:330
-#| msgid "Loading %s items"
-msgid "Loading Appointment items"
-msgstr "ààààààààâàààààà ààààààààà àààà ààààààààààààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:332
-#| msgid "Loading %s items"
-msgid "Loading Task items"
-msgstr "àààààà ààààààààà àààà ààààààààààààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:334
-#| msgid "Loading %s items"
-msgid "Loading Note items"
-msgstr "ààààààà ààààààààà àààà ààààààààààààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:336
-#| msgid "Loading %s items"
-msgid "Loading items"
-msgstr "ààààààààà àààà ààààààààààààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:962
-msgid "Calendar"
-msgstr "àààààààààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1025
-msgid "Invalid server URI"
-msgstr "àààààà ààààààà URI"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1126
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1386
-#: ../calendar/backends/http/e-cal-backend-http.c:783
-#: ../calendar/backends/weather/e-cal-backend-weather.c:520
-msgid "Could not create cache file"
-msgstr "àààààà àààààààà ààààààààààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1138
-msgid "Could not create thread for populating cache"
-msgstr "ààààààààààà àààààààààààà àààààààà ààààààààààà"
-
-#: ../calendar/backends/http/e-cal-backend-http.c:423
+#: ../calendar/backends/http/e-cal-backend-http.c:405
 msgid "Redirected to Invalid URI"
 msgstr "ààààààààà àààààààà ààààààààààààààààààààà"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:456
+#: ../calendar/backends/http/e-cal-backend-http.c:443
 msgid "Bad file format."
 msgstr "àààààààà àààà ààààà."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:463
+#: ../calendar/backends/http/e-cal-backend-http.c:450
 msgid "Not a calendar."
 msgstr "àààà àààààààààà àààà."
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:186
+#: ../calendar/backends/http/e-cal-backend-http.c:764
+#: ../calendar/backends/http/e-cal-backend-http.c:765
+#: ../calendar/backends/weather/e-cal-backend-weather.c:513
+msgid "Could not create cache file"
+msgstr "àààààà àààààààà ààààààààààà"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:183
 msgid "Could not retrieve weather data"
 msgstr "àààààà àààààààààààà ààààààààà àààààààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:286
+#: ../calendar/backends/weather/e-cal-backend-weather.c:285
 msgid "Weather: Fog"
 msgstr "àààààà: àààà àààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:287
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
 msgid "Weather: Cloudy Night"
 msgstr "àààààà: ààààààà ààààà àààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
 msgid "Weather: Cloudy"
 msgstr "àààààà: ààààààà ààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:289
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
 msgid "Weather: Overcast"
 msgstr "àààààà: ààà àààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:290
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
 msgid "Weather: Showers"
 msgstr "àààààà: ààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:291
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
 msgid "Weather: Snow"
 msgstr "àààààà: àààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:292
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
 msgid "Weather: Clear Night"
 msgstr "àààààà: àààààà àààà àààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:293
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
 msgid "Weather: Sunny"
 msgstr "àààààà: àààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:294
+#: ../calendar/backends/weather/e-cal-backend-weather.c:293
 msgid "Weather: Thunderstorms"
 msgstr "àààààà: ààààààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:440
+#: ../calendar/backends/weather/e-cal-backend-weather.c:439
 msgid "Forecast"
 msgstr "ààààààààà"
 
-#: ../calendar/libecal/e-cal-component.c:1306
+#: ../calendar/libecal/e-cal.c:867 ../libedataserverui/e-book-auth-util.c:198
+#: ../libedataserverui/e-book-auth-util.c:417
+#: ../libedataserverui/e-client-utils.c:795
+#, 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:881
+#, c-format
+msgid "Enter password for %s to enable proxy for user %s"
+msgstr ""
+"%s àààà %s ààààààààààààà ààààààààààààà ààààààààààà àààààààààààà ààààààà"
+
+#: ../calendar/libecal/e-cal.c:4409
+msgid "Repository is offline"
+msgstr "ààààààààààà àààâààààààààààà"
+
+#: ../calendar/libecal/e-cal.c:4411 ../calendar/libecal/e-cal-client.c:127
+msgid "No such calendar"
+msgstr "àààààà àààààààààà àààà"
+
+#: ../calendar/libecal/e-cal.c:4413 ../calendar/libecal/e-cal-client.c:129
+#: ../calendar/libedata-cal/e-data-cal.c:419
+msgid "Object not found"
+msgstr "ààààààààà àààà ààààààà"
+
+#: ../calendar/libecal/e-cal.c:4415 ../calendar/libecal/e-cal-client.c:131
+#: ../calendar/libedata-cal/e-data-cal.c:420
+msgid "Invalid object"
+msgstr "àààààà ààààààààà"
+
+#: ../calendar/libecal/e-cal.c:4417
+msgid "URI not loaded"
+msgstr "URI àààà àààààà"
+
+#: ../calendar/libecal/e-cal.c:4419
+msgid "URI already loaded"
+msgstr "URI àààààà àààà ààààà"
+
+#: ../calendar/libecal/e-cal.c:4423
+msgid "Unknown User"
+msgstr "àààààààà ààààààà"
+
+#: ../calendar/libecal/e-cal.c:4425 ../calendar/libecal/e-cal-client.c:135
+#: ../calendar/libedata-cal/e-data-cal.c:421
+msgid "Object ID already exists"
+msgstr "àààààààààâ ààà àààààà ààààààààààààààà"
+
+#: ../calendar/libecal/e-cal.c:4427
+msgid "Protocol not supported"
+msgstr "àààààààààà àààààààààààààà"
+
+#: ../calendar/libecal/e-cal.c:4429
+msgid "Operation has been canceled"
+msgstr "ààààààà ààààà àààààààààààà"
+
+#: ../calendar/libecal/e-cal.c:4431
+msgid "Could not cancel operation"
+msgstr "àààààààààà ààààà àààààààààà"
+
+#: ../calendar/libecal/e-cal.c:4433 ../libedataserver/e-client.c:117
+msgid "Authentication failed"
+msgstr "ààààààààà ààààààààààà"
+
+#: ../calendar/libecal/e-cal.c:4435
+#: ../camel/providers/smtp/camel-smtp-transport.c:756
+#: ../libedataserver/e-client.c:119
+msgid "Authentication required"
+msgstr "àààààààà ààààààààà"
+
+#: ../calendar/libecal/e-cal.c:4437
+msgid "A D-Bus exception has occurred"
+msgstr "àààà D-Bus àààààààà ààààààààà"
+
+#: ../calendar/libecal/e-cal.c:4441
+msgid "No error"
+msgstr "àààààààà"
+
+#: ../calendar/libecal/e-cal-client.c:133
+#: ../calendar/libedata-cal/e-data-cal.c:429
+msgid "Unknown user"
+msgstr "àààààààà ààààààà"
+
+#: ../calendar/libecal/e-cal-client.c:137
+#: ../calendar/libedata-cal/e-data-cal.c:418
+msgid "Invalid range"
+msgstr "ààààààààà àààààààà"
+
+#: ../calendar/libecal/e-cal-client.c:555
+#| msgid "Failed to encode data"
+msgid "Failed to run calendar factory"
+msgstr "àààààààààà àààààààààààààà àààààààààààà ààààààààààà"
+
+#: ../calendar/libecal/e-cal-client.c:717
+#| msgid "Failed to encode data"
+msgid "Failed to find system calendar"
+msgstr "ààààààààà ààààààààààààà ààààà ààààààààà ààààààààààà"
+
+#: ../calendar/libecal/e-cal-client.c:755
+#: ../calendar/libedata-cal/e-data-cal.c:428
+msgid "Calendar does not exist"
+msgstr "àààààààààà àààààààààààààààà"
+
+#: ../calendar/libecal/e-cal-client.c:865
+#| msgid "Invalid source"
+msgid "Invalid source type"
+msgstr "ààààààààà àààà ààà"
+
+#: ../calendar/libecal/e-cal-component.c:1298
 msgid "Untitled appointment"
 msgstr "àààààààààààààà ààààààààâààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3979
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "1st"
 msgstr "àààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3980
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "2nd"
 msgstr "àààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "3rd"
 msgstr "àààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3982
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "4th"
 msgstr "àààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3983
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "5th"
 msgstr "àààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3984
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "6th"
 msgstr "àààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3985
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "7th"
 msgstr "àààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3986
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "8th"
 msgstr "àààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "9th"
 msgstr "àààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "10th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "11th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "12th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "13th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "14th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "15th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "16th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "17th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "18th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "19th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "20th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "21st"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "22nd"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "23rd"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "24th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "25th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "26th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "27th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "28th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "29th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "30th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4017
 msgid "31st"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-util.c:678 ../calendar/libecal/e-cal-util.c:705
+#: ../calendar/libecal/e-cal-util.c:677 ../calendar/libecal/e-cal-util.c:704
+#| 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:679 ../calendar/libecal/e-cal-util.c:706
+#| 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:681 ../calendar/libecal/e-cal-util.c:708
+#| 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:702
+#| 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)"
-
-#.
-#. 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
-#, c-format
-msgid "Enter password for %s to enable proxy for user %s"
-msgstr "%s àààà %s ààààààààààààà ààààààààààààà ààààààààààà àààààààààààà ààààààà"
-
-#: ../calendar/libecal/e-cal.c:4148
-msgid "Backend is busy"
-msgstr "ààààààààà ààààààààààààààà"
-
-#: ../calendar/libecal/e-cal.c:4150
-msgid "Repository is offline"
-msgstr "ààààààààààà àààâààààààààààà"
-
-#: ../calendar/libecal/e-cal.c:4152
-msgid "No such calendar"
-msgstr "àààààà àààààààààà àààà"
-
-#: ../calendar/libecal/e-cal.c:4154 ../calendar/libedata-cal/e-data-cal.c:114
-#: ../servers/groupwise/e-gw-connection.c:235
-msgid "Object not found"
-msgstr "ààààààààà àààà ààààààà"
-
-#: ../calendar/libecal/e-cal.c:4156 ../calendar/libedata-cal/e-data-cal.c:115
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid object"
-msgstr "àààààà ààààààààà"
-
-#: ../calendar/libecal/e-cal.c:4158
-msgid "URI not loaded"
-msgstr "URI àààà àààààà"
-
-#: ../calendar/libecal/e-cal.c:4160
-msgid "URI already loaded"
-msgstr "URI àààààà àààà ààààà"
-
-#: ../calendar/libecal/e-cal.c:4164 ../servers/groupwise/e-gw-connection.c:237
-msgid "Unknown User"
-msgstr "àààààààà ààààààà"
-
-#: ../calendar/libecal/e-cal.c:4166 ../calendar/libedata-cal/e-data-cal.c:116
-msgid "Object ID already exists"
-msgstr "àààààààààâ ààà àààààà ààààààààààààààà"
-
-#: ../calendar/libecal/e-cal.c:4168
-msgid "Protocol not supported"
-msgstr "àààààààààà àààààààààààààà"
-
-#: ../calendar/libecal/e-cal.c:4170
-msgid "Operation has been canceled"
-msgstr "ààààààà ààààà àààààààààààà"
-
-#: ../calendar/libecal/e-cal.c:4172
-msgid "Could not cancel operation"
-msgstr "àààààààààà ààààà àààààààààà"
+#: ../calendar/libedata-cal/e-cal-backend.c:34
+#| msgid "Cannot remove calendar object: %s"
+msgid "Cannot process, calendar backend is opening"
+msgstr "àààààààààà àààààààààà, àààààààààà ààààààààà ààààà ààààààààààààààà"
 
-#: ../calendar/libecal/e-cal.c:4174
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1311
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1329
-#: ../camel/providers/groupwise/camel-groupwise-store.c:635
-#: ../camel/providers/groupwise/camel-groupwise-store.c:817
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:87
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#: ../calendar/libedata-cal/e-cal-backend.c:207
 #, c-format
-msgid "Authentication failed"
-msgstr "ààààààààà ààààààààààà"
-
-#: ../calendar/libecal/e-cal.c:4176
-#: ../camel/providers/smtp/camel-smtp-transport.c:775
-msgid "Authentication required"
-msgstr "àààààààà ààààààààà"
-
-#: ../calendar/libecal/e-cal.c:4178
-#| msgid "A CORBA exception has occurred"
-msgid "A D-Bus exception has occurred"
-msgstr "àààà D-Bus àààààààà ààààààààà"
+#| msgid "Unknown error: %s"
+msgid "Unknown calendar property '%s'"
+msgstr "àààààààà àààààààààà àààààààà: '%s'"
 
-#: ../calendar/libecal/e-cal.c:4182
-msgid "No error"
-msgstr "àààààààà"
+#: ../calendar/libedata-cal/e-cal-backend.c:219
+#, fuzzy, c-format
+#| 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:674
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:693
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:802
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1021
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1048
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "\"%s\" àààààà ààààààààààààâàààààà ààààààààààààààààà"
@@ -1347,7 +1439,7 @@ msgstr "\"%s\" àààààà ààààààààààààâàà
 #: ../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:1086
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\" àààà ààààààààààààâàààà ààààààààààààààà"
@@ -1355,7 +1447,7 @@ 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:735
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "àààà ààààààààààààâ àààà ààààà ààààààààààà \"%s\" ààààààààààààààà"
@@ -1364,13 +1456,14 @@ msgstr "àààà ààààààààààààâ àààà àà
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr ""
-"àààà ààààààààààààâ àààà ISO 8601 àààààà/ààà ààààààààààààààààà \"%s\" ààààààààààààààà"
+"àààà ààààààààààààâ àààà ISO 8601 àààààà/ààà ààààààààààààààààà \"%s\" "
+"ààààààààààààààà"
 
 #: ../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:413
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "\"%s\" àààà ààààààààààààâàààààà ààààààààààààààà"
@@ -1379,9 +1472,9 @@ msgstr "\"%s\" àààà ààààààààààààâàààà
 #: ../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:419
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1092
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "\"%s\" àààà ààààààààààààâ time_t ààààààààààà ààààààààààààààà"
@@ -1392,18 +1485,18 @@ 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:428
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
 #, 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:743
 #, 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:773
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1414,254 +1507,203 @@ msgstr ""
 "ààà \"attendee\", ààà \"organizer\", ààà \"classification\" ààààààààààà \"%s"
 "\" ààààààààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:923
 #, 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:937
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
 "be a boolean false (#f)"
 msgstr ""
-"\"%s\" ààààà ààààààààààààààà ààààààààààààààà ààà àààà àààà àààààààààààà ààààààà àààààà "
+"\"%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:425
 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 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 retrieve calendar alarm e-mail address: %s"
-msgstr "àààààààààà ààààà à-àààà àààààààààà àààààààà ààààààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:660
-#, c-format
-msgid "Cannot retrieve calendar's LDAP attribute: %s"
-msgstr "àààààààààà LDAP ààààààààààààà àààààààà ààààààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:685
-#, c-format
-msgid "Cannot retrieve calendar scheduling information: %s"
-msgstr "àààààààààà àààààààààà ààààààààààà àààààààà ààààààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:709
-#, c-format
-msgid "Cannot 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 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 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 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 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 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 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 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 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 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 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 retrieve attachment list: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:909
+#| msgid "Cannot open calendar: %s"
+msgid "Cannot open calendar: "
+msgstr "àààààààààà àààààààààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:930
+#| msgid "Cannot remove calendar: %s"
+msgid "Cannot remove calendar: "
+msgstr "àààààààààà ààààà àààààà àààààààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:955
+#| 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:979
+#| 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:1025
+#| 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:1050
+#| 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:1075
+#| msgid "Cannot retrieve calendar free/busy list: %s"
+msgid "Cannot retrieve calendar free/busy list: "
+msgstr "àààààààààà ààààà/ààààààààà àààààààààà àààààààà ààààààààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1101
+#| 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:1128
+#| 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:1156
+#| 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:1179
+#| 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:1204
+#| 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:1231
+#, fuzzy
+#| msgid "Could not retrieve attachment list: %s"
+msgid "Could not retrieve attachment uris: "
 msgstr "ààààààà àààààààààà àààààààà ààààààààààà: %s"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1016
-#, c-format
-msgid "Could not complete calendar query: %s"
-msgstr "ààààààààààà ààààààààà ààààààààààààààààà: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1255
+#, fuzzy
+#| msgid "Could not store folder: %s"
+msgid "Could not discard reminder: "
+msgstr "àààààààààà àààààààààààààà: %s"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1041
-#, c-format
-msgid "Could not retrieve calendar time zone: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1279
+#, fuzzy
+#| msgid "Could not retrieve calendar time zone: %s"
+msgid "Could not get calendar view path: "
 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 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 set default calendar time zone: %s"
-msgstr "àààààààààààà ààà àààààààà àààààààà àààààààààààà: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1304
+#| msgid "Could not retrieve calendar time zone: %s"
+msgid "Could not retrieve calendar time zone: "
+msgstr "àààààààààà ààààààààààà ààààààààà àààààààààààà: "
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1108
-#, c-format
-msgid "Cannot retrieve calendar changes: %s"
-msgstr "àààààààààà ààààààààààààà àààààààà ààààààààààà: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1326
+#| msgid "Could not add calendar time zone: %s"
+msgid "Could not add calendar time zone: "
+msgstr "àààààààààà ààààààààààà ààààààà àààààààààààà: "
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1139
+#: ../calendar/libedata-cal/e-data-cal-factory.c:383
 #, c-format
-msgid "Cannot retrieve calendar free/busy list: %s"
-msgstr "àààààààààà ààààà/ààààààààà àààààààààà àààààààà ààààààààààà: %s"
+#| msgid "Invalid range"
+msgid "Invalid call"
+msgstr "ààààààààà ààà"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:374
+#: ../calendar/libedata-cal/e-data-cal-factory.c:424
 #, c-format
 msgid "Invalid URI"
 msgstr "àààààà URI"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:392
+#: ../calendar/libedata-cal/e-data-cal-factory.c:442
 #, c-format
 msgid "No backend factory for '%s' of '%s'"
 msgstr "'%s' àààà, ('%s' ààààà) àààààà ààààààààà ààààààààà àààà"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:442
+#: ../calendar/libedata-cal/e-data-cal-factory.c:485
 #, c-format
 msgid "Could not instantiate backend"
 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:495
 #, 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
 #, c-format
 msgid ""
@@ -1689,124 +1731,170 @@ msgstr ""
 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:1153
+#: ../camel/providers/imap/camel-imap-store.c:1925
+#: ../camel/providers/imap/camel-imap-store.c:2416
+#: ../camel/providers/imap/camel-imap-store.c:3171
+#: ../camel/providers/imapx/camel-imapx-folder.c:311
+#: ../camel/providers/imapx/camel-imapx-folder.c:344
+#: ../camel/providers/imapx/camel-imapx-folder.c:398
+#: ../camel/providers/imapx/camel-imapx-folder.c:444
+#: ../camel/providers/imapx/camel-imapx-folder.c:478
+#: ../camel/providers/imapx/camel-imapx-folder.c:518
+#: ../camel/providers/imapx/camel-imapx-folder.c:554
+#: ../camel/providers/imapx/camel-imapx-store.c:238
+#: ../camel/providers/imapx/camel-imapx-store.c:1278
+#: ../camel/providers/imapx/camel-imapx-store.c:1366
+#: ../camel/providers/imapx/camel-imapx-store.c:1412
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "à àààààààààà àààààààààààà àààà àààâààààâààààà àààà ààààààààààààà"
 
-#: ../camel/camel-file-utils.c:719
+#: ../camel/camel-file-utils.c:722
 #, c-format
 msgid "Canceled"
 msgstr "ààààà ààààààààà"
 
-#: ../camel/camel-filter-driver.c:839 ../camel/camel-filter-search.c:582
+#: ../camel/camel-filter-driver.c:818 ../camel/camel-filter-search.c:628
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "àà ààààààààà '%s' ààààà àààààààààà àààààà: %s"
 
-#: ../camel/camel-filter-driver.c:886
+#: ../camel/camel-filter-driver.c:866
 #, 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:1053 ../camel/camel-filter-driver.c:1062
 msgid "Syncing folders"
 msgstr "ààààààààààààà àààààààààààààààà"
 
-#: ../camel/camel-filter-driver.c:1170 ../camel/camel-filter-driver.c:1620
+#: ../camel/camel-filter-driver.c:1150 ../camel/camel-filter-driver.c:1594
 #, 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:1161 ../camel/camel-filter-driver.c:1605
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "àààààààààà àààààààààààààààààà ààà: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1278
+#: ../camel/camel-filter-driver.c:1258
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "àààààà àààààààààà ààààààà àààààààààààà"
 
-#: ../camel/camel-filter-driver.c:1289
+#: ../camel/camel-filter-driver.c:1269
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "àààààà àààààààààà àààààààààà àààààààààààà"
 
-#: ../camel/camel-filter-driver.c:1307
+#: ../camel/camel-filter-driver.c:1287
 #, 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:1294 ../camel/camel-filter-driver.c:1316
 #, 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:1331 ../camel/camel-filter-driver.c:1432
 msgid "Syncing folder"
 msgstr "àààààààààà àààààààààààààààà"
 
-#: ../camel/camel-filter-driver.c:1356 ../camel/camel-filter-driver.c:1462
+#: ../camel/camel-filter-driver.c:1336 ../camel/camel-filter-driver.c:1438
 msgid "Complete"
 msgstr "ààààààà"
 
-#: ../camel/camel-filter-driver.c:1420
+#: ../camel/camel-filter-driver.c:1396
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d (%d ààààà) ààààààààààà àààààààààààààààààààà"
 
-#: ../camel/camel-filter-driver.c:1438
+#: ../camel/camel-filter-driver.c:1414
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "ààààà %d ààààà (%d à) ààààààààààà"
 
-#: ../camel/camel-filter-search.c:135
+#: ../camel/camel-filter-search.c:137
 msgid "Failed to retrieve message"
 msgstr "àààààààààà àààà àààààààààà ààààààààààà"
 
-#: ../camel/camel-filter-search.c:401
+#: ../camel/camel-filter-search.c:403
 msgid "Invalid arguments to (system-flag)"
 msgstr "àààààààà (ààààààà -àààààààà) àààààà ààààààààààààâààà"
 
-#: ../camel/camel-filter-search.c:416
+#: ../camel/camel-filter-search.c:418
 msgid "Invalid arguments to (user-tag)"
 msgstr "àààààààà (ààààà- àààààà) àààààà ààààààààààààâààà"
 
-#: ../camel/camel-filter-search.c:744 ../camel/camel-filter-search.c:753
+#: ../camel/camel-filter-search.c:799 ../camel/camel-filter-search.c:808
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "ààààààà àààààààààààààààà àààààààààààààààààà ààà: %s: %s"
 
+#: ../camel/camel-folder.c:243
+#, c-format
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "%s ààààà ààà àààààààà ààààààààààà àààààààààààààààààààà"
+msgstr[1] "%s ààààà ààà àààààààà àààààààààà àààààààààààààààààààà"
+
+#: ../camel/camel-folder.c:283
+#, c-format
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "%s ààààà ààà ààààààâ àààààààààà àààààààààààààààààààà"
+msgstr[1] "%s ààààà ààà ààààààâ ààààààààààà àààààààààààààààààààà"
+
+#: ../camel/camel-folder.c:331
+#, c-format
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "%s ààààà ààà àààààààààà ààààààà ààààààààààààà"
+msgstr[1] "%s ààààà ààà ààààààààààà ààààààà ààààààààààààà"
+
+#: ../camel/camel-folder.c:898
+#: ../camel/providers/local/camel-maildir-folder.c:319
+msgid "Moving messages"
+msgstr "ààààààààààà àààààààààààààààààààà"
+
+#: ../camel/camel-folder.c:901
+msgid "Copying messages"
+msgstr "ààààààààààà àààà ààààààààààààà"
+
+#: ../camel/camel-folder.c:1156
+#, c-format
+msgid "Quota information not supported for folder '%s'"
+msgstr ""
+
+#: ../camel/camel-folder.c:3265
+#, c-format
+#| msgid "Retrieving message '%s'"
+msgid "Retrieving message '%s' in %s"
+msgstr "'%s' (%s ààààà) àààààààààà àààààààà àààààààààààààà"
+
+#: ../camel/camel-folder.c:3390
+#, fuzzy, c-format
+#| msgid "Fetching summary information for new messages in %s"
+msgid "Retrieving quota information for '%s'"
+msgstr "%s àààààà ààà àààààààààààà àààààààààààà àààààààààààààààààààà"
+
 #: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
 #: ../camel/camel-folder-search.c:627
 #, c-format
@@ -1827,80 +1915,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:844 ../camel/camel-folder-search.c:887
 #, 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:941
 #, 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:948 ../camel/camel-folder-search.c:956
 #, 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:984
 #, 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:994
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) àààààà àààààààà ààààâ àààààààà"
 
-#: ../camel/camel-folder.c:220
-#, c-format
-msgid "Learning new spam message in '%s'"
-msgid_plural "Learning new spam messages in '%s'"
-msgstr[0] "%s ààààà ààà àààààààà ààààààààààà àààààààààààààààààààà"
-msgstr[1] "%s ààààà ààà àààààààà àààààààààà àààààààààààààààààààà"
-
-#: ../camel/camel-folder.c:244
-#, c-format
-msgid "Learning new ham message in '%s'"
-msgid_plural "Learning new ham messages in '%s'"
-msgstr[0] "%s ààààà ààà ààààààâ àààààààààà àààààààààààààààààààà"
-msgstr[1] "%s ààààà ààà ààààààâ ààààààààààà àààààààààààààààààààà"
-
-#: ../camel/camel-folder.c:270
-#, c-format
-msgid "Filtering new message in '%s'"
-msgid_plural "Filtering new messages in '%s'"
-msgstr[0] "%s ààààà ààà àààààààààà ààààààà ààààààààààààà"
-msgstr[1] "%s ààààà ààà ààààààààààà ààààààà ààààààààààààà"
-
-#: ../camel/camel-folder.c:881
-#: ../camel/providers/local/camel-maildir-folder.c:293
-msgid "Moving messages"
-msgstr "ààààààààààà àààààààààààààààààààà"
-
-#: ../camel/camel-folder.c:884
-msgid "Copying messages"
-msgstr "ààààààààààà àààà ààààààààààààà"
-
-#: ../camel/camel-folder.c:3253
-#, c-format
-#| msgid "Retrieving POP message %d"
-msgid "Retrieving message '%s'"
-msgstr "'%s' àààààààààà àààààààà àààààààààààààà"
-
-#: ../camel/camel-gpg-context.c:646 ../camel/camel-gpg-context.c:651
-#: ../camel/camel-gpg-context.c:1276
+#: ../camel/camel-gpg-context.c:642 ../camel/camel-gpg-context.c:647
+#: ../camel/camel-gpg-context.c:1272
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "ààààààààààà àààààààààààààà ààààààààààà: %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:647
+#: ../camel/providers/smtp/camel-smtp-transport.c:759
 msgid "Unknown"
 msgstr "àààààààà"
 
-#: ../camel/camel-gpg-context.c:715
+#: ../camel/camel-gpg-context.c:711
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1911,17 +1967,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:732
+#: ../camel/camel-gpg-context.c:728
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "àààààà ààààààà ààà ààààààààà àààààà ààààààààà ààààààààààà."
 
-#: ../camel/camel-gpg-context.c:757 ../camel/camel-gpg-context.c:772
+#: ../camel/camel-gpg-context.c:753 ../camel/camel-gpg-context.c:768
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "àààààà ààààààà ààààààààà àààààà ààààààààà ààààààààààà."
 
-#: ../camel/camel-gpg-context.c:793
+#: ../camel/camel-gpg-context.c:789
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1930,7 +1986,7 @@ msgstr ""
 "ààààà à àààààààà-àààààààà ààààààààà àààâàààà ààààà ààààà àààà PIN à\n"
 "ààààààààà: \"%s\""
 
-#: ../camel/camel-gpg-context.c:797
+#: ../camel/camel-gpg-context.c:793
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1939,110 +1995,88 @@ msgstr ""
 "à ààààààààààààà ààààààààà àààâàààà ààààà ààààà àààà ààààààààààà\n"
 "ààààààààà: \"%s\""
 
-#: ../camel/camel-gpg-context.c:803
+#: ../camel/camel-gpg-context.c:799
 #, 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-gpg-context.c:828 ../camel/camel-net-utils.c:515
 #: ../camel/camel-tcp-stream-raw.c:255
-#: ../camel/providers/imapx/camel-imapx-server.c:4912
-#: ../camel/providers/imapx/camel-imapx-server.c:4929
-#: ../camel/providers/imapx/camel-imapx-store.c:199
-#: ../camel/providers/nntp/camel-nntp-summary.c:402
-#: ../camel/providers/pop3/camel-pop3-folder.c:364
-#: ../camel/providers/pop3/camel-pop3-folder.c:429
-#: ../camel/providers/pop3/camel-pop3-folder.c:504
-#: ../camel/providers/pop3/camel-pop3-store.c:487
-#: ../libedataserverui/e-book-auth-util.c:229
+#: ../camel/providers/imapx/camel-imapx-server.c:4954
+#: ../camel/providers/imapx/camel-imapx-server.c:4971
+#: ../camel/providers/imapx/camel-imapx-store.c:159
+#: ../camel/providers/nntp/camel-nntp-summary.c:409
+#: ../libedataserver/e-client.c:127 ../libedataserverui/e-book-auth-util.c:221
 #, c-format
-#| msgid "Canceled"
 msgid "Cancelled"
 msgstr "ààààà ààààààààà"
 
-#: ../camel/camel-gpg-context.c:850
+#: ../camel/camel-gpg-context.c:846
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
-"ààààà ààààààààà àààâàààà ààààà àààààààààààà: à àààà ààààà àààààààààààà ààààààààà."
+"ààààà ààààààààà àààâàààà ààààà àààààààààààà: à àààà ààààà àààààààààààà "
+"ààààààààà."
 
-#: ../camel/camel-gpg-context.c:862
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG àààà àààààààààà ààààààààààà: %s"
 
-#: ../camel/camel-gpg-context.c:993
+#: ../camel/camel-gpg-context.c:989
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
-msgstr "ààààààààààààà àààààààààààà: àààààà àààààààà àààààààààààààààà àààààààààààà."
+msgstr ""
+"ààààààààààààà àààààààààààà: àààààà àààààààà àààààààààààààààà àààààààààààà."
 
-#: ../camel/camel-gpg-context.c:1539 ../camel/camel-smime-context.c:824
-#| msgid "Could not generate signing data: %s"
+#: ../camel/camel-gpg-context.c:1535 ../camel/camel-smime-context.c:824
 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:1584 ../camel/camel-gpg-context.c:1788
+#: ../camel/camel-gpg-context.c:1898 ../camel/camel-gpg-context.c:2045
+#: ../camel/camel-gpg-context.c:2145 ../camel/camel-gpg-context.c:2193
 msgid "Failed to execute gpg."
 msgstr "ààààààààààà àààààààààààààà ààààààààààà."
 
-#: ../camel/camel-gpg-context.c:1666 ../camel/camel-gpg-context.c:1674
-#: ../camel/camel-gpg-context.c:1682 ../camel/camel-gpg-context.c:1701
-#: ../camel/camel-smime-context.c:948 ../camel/camel-smime-context.c:962
-#: ../camel/camel-smime-context.c:971
+#: ../camel/camel-gpg-context.c:1663 ../camel/camel-gpg-context.c:1671
+#: ../camel/camel-gpg-context.c:1679 ../camel/camel-gpg-context.c:1699
+#: ../camel/camel-smime-context.c:950 ../camel/camel-smime-context.c:964
+#: ../camel/camel-smime-context.c:973
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "àààààààààà àààààààààà àààààààààààà: àààààà ààààààààà àààààààààà"
 
 #: ../camel/camel-gpg-context.c:1741
-#| msgid "Cannot verify message signature: Incorrect message format"
 msgid "Cannot verify message signature: "
 msgstr "àààààà àààààààà àààààààààà àààààààààààà: "
 
-#: ../camel/camel-gpg-context.c:1862
-#| msgid "Could not generate encrypting data: %s"
+#: ../camel/camel-gpg-context.c:1864
 msgid "Could not generate encrypting data: "
 msgstr "àààààààààààààà ààààààààààà àààààààà ààààà àààààààààààà: "
 
-#: ../camel/camel-gpg-context.c:1915
+#: ../camel/camel-gpg-context.c:1917
 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:1975 ../camel/camel-gpg-context.c:1984
+#: ../camel/camel-gpg-context.c:2007
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "àààààààààà ààààààààààâ àààààààààà: ààààààà ààààààà ààààààààààà"
 
-#: ../camel/camel-gpg-context.c:1993
+#: ../camel/camel-gpg-context.c:1995
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME àààààààà ààààààààààâ ààààààààà ààààààààààà: àààààààààà ààà"
 
-#: ../camel/camel-gpg-context.c:2082 ../camel/camel-smime-context.c:1255
+#: ../camel/camel-gpg-context.c:2086 ../camel/camel-smime-context.c:1261
 msgid "Encrypted content"
 msgstr "àààààààààààààà àààà"
 
-#: ../camel/camel-lock-client.c:106
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "ààààààà ààààà ààààààà ààààààààà àààààààààààà: %s"
-
-#: ../camel/camel-lock-client.c:130
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "ààààààà àààààààààà àààààà ààààà àààààààààààà: %s"
-
-#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "'%s' ààààà àààà àààààààààà: àààà-ààààààààà àààààààààà ààà"
-
-#: ../camel/camel-lock-client.c:227
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "'%s' ààààà ààààâ ààààààààààà"
+#: ../camel/camel-http-stream.c:546 ../camel/camel-stream-null.c:78
+msgid "Only reset to beginning is supported with CamelHttpStream"
+msgstr ""
 
 #: ../camel/camel-lock.c:102
 #, c-format
@@ -2051,10 +2085,10 @@ msgstr "%s àààà ààààâ àààààààà ààààà
 
 #: ../camel/camel-lock.c:145
 #, c-format
-#| msgid "Timed out trying to get lock file on %s. Try again later."
 msgid "Timed out trying to get lock file on %s.  Try again later."
 msgstr ""
-"%s ààààà àààà àààààààà àààààà ààààààààààààà ààààààà àààààà. àààààà àààà àààà àààà "
+"%s ààààà àààà àààààààà àààààà ààààààààààààà ààààààà àààààà. àààààà àààà àààà "
+"àààà "
 "àààààààààà."
 
 #: ../camel/camel-lock.c:205
@@ -2067,6 +2101,26 @@ msgstr "fcntl(2) ààààà ààààààààà àààà àà
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2) ààààà ààààààààà àààà ààààà àààààààààààààààà ààààààààààà: %s"
 
+#: ../camel/camel-lock-client.c:106
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "ààààààà ààààà ààààààà ààààààààà àààààààààààà: %s"
+
+#: ../camel/camel-lock-client.c:130
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "ààààààà àààààààààà àààààà ààààà àààààààààààà: %s"
+
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "'%s' ààààà àààà àààààààààà: àààà-ààààààààà àààààààààà ààà"
+
+#: ../camel/camel-lock-client.c:227
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "'%s' ààààà ààààâ ààààààààààà"
+
 #: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -2121,23 +2175,35 @@ msgstr "ààààâà ààààààààà àààààààà
 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-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:695
 #, c-format
 msgid "Resolving: %s"
@@ -2165,7 +2231,7 @@ msgstr "ààààààààà ààààààààà ààààà
 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' àààààà àààààààààà àààààààà ààààààààààààààààà"
@@ -2183,23 +2249,24 @@ 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 ààààà àààà ààààà àààààààààààà: àààààààà àààà ààààà à ààààààààààààà àààààààààà."
+"%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:391 ../camel/camel-session.c:351
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "'%s' ààààààààààâàà àààààààààà ààààààààà"
@@ -2244,23 +2311,24 @@ 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 àààààààààààà ààààààààà àààààààààààààà "
+"à àààààààààààà àààà àààà àààààààà 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."
@@ -2268,46 +2336,48 @@ msgstr ""
 "à àààààààààààà àààà àààà àààààààà DIGEST-MD5 àààààààààààà ààààààààà "
 "àààààààààààààà ààààààààààààààààà (àààààààààààà àààààààààààààà)."
 
-#: ../camel/camel-sasl-digest-md5.c:821
+#: ../camel/camel-sasl-digest-md5.c:820
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "àààààààà ààààààà ààà àààààààààà (>àààà àààààààààà)"
 
-#: ../camel/camel-sasl-digest-md5.c:832
+#: ../camel/camel-sasl-digest-md5.c:831
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "àààààààà ààààààà àààààààààààà\n"
 
-#: ../camel/camel-sasl-digest-md5.c:840
+#: ../camel/camel-sasl-digest-md5.c:839
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
-msgstr "ààààààà ààààààà ààààààààà \"Quality of Protection\" ààààà ààààà ààààààà"
+msgstr ""
+"ààààààà ààààààà ààààààààà \"Quality of Protection\" ààààà ààààà ààààààà"
 
-#: ../camel/camel-sasl-digest-md5.c:875
+#: ../camel/camel-sasl-digest-md5.c:873
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "àààààààà ààààààààààààà àààààààà àààààà ààààààààààà àààààààà"
 
-#: ../camel/camel-sasl-digest-md5.c:896
+#: ../camel/camel-sasl-digest-md5.c:894
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "àààààààà ààààààààààààà ààààààààà ààààààà ààààààààààà ààààààà"
 
-#: ../camel/camel-sasl-digest-md5.c:909
+#: ../camel/camel-sasl-digest-md5.c:907
 #, 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 ""
-"à àààààààààààà àààààààà à àààààààààààà ààààààààà àààààààààààààà ààààààààààààààààà."
+"à àààààààààààà àààààààà à àààààààààààà ààààààààà àààààààààààààà "
+"ààààààààààààààààà."
 
-#: ../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."
@@ -2315,11 +2385,11 @@ msgstr ""
 "àààààààà àààààààààààààà ààààààààààà ààààààààààààà àààààààààààààà, ààà "
 "àààààààààààààààà ààà àààààààààààààà."
 
-#: ../camel/camel-sasl-gssapi.c:133
+#: ../camel/camel-sasl-gssapi.c:134
 msgid "The provided target_name parameter was ill-formed."
 msgstr "àààààààà target_name ààààààààà ààààààààààààà."
 
-#: ../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."
@@ -2327,15 +2397,16 @@ msgstr ""
 "àààààààà target_name ààààààààà àààà ààààààààà ààà ààààààààà àààààà àààààààà "
 "ààààààà."
 
-#: ../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."
 msgstr ""
-"input_chan_bindings àààààààà àààà ààààààààààààààà input_token ààààààààààà ààààà "
+"input_chan_bindings àààààààà àààà ààààààààààààààà input_token ààààààààààà "
+"ààààà "
 "ààààààààâàààààà ààààààà."
 
-#: ../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."
@@ -2343,62 +2414,65 @@ msgstr ""
 "input_token àààà àààààààààààà àààààààà, ààà àààààààààà àààààààààà ààààààà "
 "àààààààà ààààààà."
 
-#: ../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."
 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 "ààààààààà ààààààààà àààààààà àààà àààààààà ààààààààààààà ààààààààààààà."
+msgstr ""
+"ààààààààà ààààààààà àààààààà àààà àààààààà ààààààààààààà ààààààààààààà."
 
-#: ../camel/camel-sasl-gssapi.c:157
+#: ../camel/camel-sasl-gssapi.c:158
 msgid "The consistency checks performed on the input_token failed."
 msgstr "input_token à àààà àààààà àààààààà ààààààààà ààààààààààà."
 
-#: ../camel/camel-sasl-gssapi.c:160
+#: ../camel/camel-sasl-gssapi.c:161
 msgid "The consistency checks performed on the credential failed."
-msgstr "ààààà ààààà(àààààààààààààâà) àààà àààààà àààààààà ààààààààà ààààààààààà."
+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:312
+#: ../camel/camel-sasl-gssapi.c:356 ../camel/camel-sasl-gssapi.c:373
+#: ../camel/providers/smtp/camel-smtp-transport.c:1228
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "ààààààààààà àààààààà ààààààà ààààààààààà."
 
-#: ../camel/camel-sasl-gssapi.c:382
+#: ../camel/camel-sasl-gssapi.c:385
 #, 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."
@@ -2406,32 +2480,32 @@ 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
+#: ../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
-#, c-format
-#| msgid "POP Before SMTP auth using a non-pop source"
-msgid "POP Before SMTP authentication using a non-POP source"
+#: ../camel/camel-sasl-popb4smtp.c:104 ../camel/camel-sasl-popb4smtp.c:114
+#, fuzzy, c-format
+#| msgid "POP Before SMTP authentication using a non-POP source"
+msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "SMTP àààààààà ààààà POP àààà POP ààààà àààààààà àààààààààà"
 
 #: ../camel/camel-search-private.c:112
@@ -2439,171 +2513,170 @@ msgstr "SMTP àààààààà ààààà POP àààà POP à
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "ààààààà àààààâàààààààâ ààààà ààààààààààààà ààààààààààà: %s: %s"
 
-#: ../camel/camel-service.c:89
+#: ../camel/camel-service.c:526
 #, 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:537
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' àà àààà àààààà àààà ààààààààà"
 
-#: ../camel/camel-service.c:97
+#: ../camel/camel-service.c:548
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' àà àààà ààààà àààà ààààààààà"
 
-#: ../camel/camel-session.c:260
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"%s àààààààà ààààààààààà:\n"
-"%s"
+#: ../camel/camel-session.c:361
+#, fuzzy, c-format
+#| msgid "No provider available for protocol '%s'"
+msgid "Invalid GType registered for protocol '%s'"
+msgstr "'%s' ààààààààààâàà àààààààààà ààààààààà"
 
-#: ../camel/camel-session.c:757
+#: ../camel/camel-session.c:938
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "àààààààà %s à àààààààààààà %s àààà %s ààààààààààà ààààààà."
 
-#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1048
+#: ../camel/camel-smime-context.c:344 ../camel/camel-smime-context.c:1050
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "'%s' àà ààààààààààààààà ààààà àààààààààà"
 
-#: ../camel/camel-smime-context.c:376
+#: ../camel/camel-smime-context.c:372
 msgid "Cannot create CMS message"
 msgstr "CMS àààààààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:381
+#: ../camel/camel-smime-context.c:377
 msgid "Cannot create CMS signed data"
 msgstr "CMS àààà àààààà àààààààààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:387
+#: ../camel/camel-smime-context.c:383
 msgid "Cannot attach CMS signed data"
 msgstr "CMS àààà àààààà àààààààààààà àààààààààààààà"
 
-#: ../camel/camel-smime-context.c:394
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS data"
 msgstr "CMS àààààààààààà àààààààààààààà"
 
-#: ../camel/camel-smime-context.c:400
+#: ../camel/camel-smime-context.c:396
 msgid "Cannot create CMS Signer information"
 msgstr "CMS ààààà ààààààààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:406
+#: ../camel/camel-smime-context.c:402
 msgid "Cannot find certificate chain"
 msgstr "àààààààààà ààààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:412
+#: ../camel/camel-smime-context.c:408
 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:432 ../camel/camel-smime-context.c:447
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "ààààààààààààà àààààààààà '%s' àààààààààààààààà"
 
-#: ../camel/camel-smime-context.c:458
+#: ../camel/camel-smime-context.c:454
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "SMIMEEncKeyPrefs ààà ààààà ààààààà àààààààààààà"
 
-#: ../camel/camel-smime-context.c:463
+#: ../camel/camel-smime-context.c:459
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "MS SMIMEEncKeyPrefs ààà ààààà ààààààà àààààààààààà"
 
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot add encryption certificate"
 msgstr "àààààààààà ààààààààààààààà ààààààà àààààààààààà"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:470
 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:503
 msgid "Unverified"
 msgstr "àààààààààà ààààààà"
 
-#: ../camel/camel-smime-context.c:509
+#: ../camel/camel-smime-context.c:505
 msgid "Good signature"
 msgstr "àààààààà ààà"
 
-#: ../camel/camel-smime-context.c:511
+#: ../camel/camel-smime-context.c:507
 msgid "Bad signature"
 msgstr "àààààààà ààà"
 
-#: ../camel/camel-smime-context.c:513
+#: ../camel/camel-smime-context.c:509
 msgid "Content tampered with or altered in transit"
 msgstr "àààààà àààààààà àààààà àààà àààààààààààà ààà àààààààààààààààà"
 
-#: ../camel/camel-smime-context.c:515
+#: ../camel/camel-smime-context.c:511
 msgid "Signing certificate not found"
 msgstr "ààà àààààààà àààààààààààà àààà ààààààà"
 
-#: ../camel/camel-smime-context.c:517
+#: ../camel/camel-smime-context.c:513
 msgid "Signing certificate not trusted"
 msgstr "ààà àààààààà ààààààààààààààà àààààààààà"
 
-#: ../camel/camel-smime-context.c:519
+#: ../camel/camel-smime-context.c:515
 msgid "Signature algorithm unknown"
 msgstr "àààà àààààààààà ààààààààà"
 
-#: ../camel/camel-smime-context.c:521
+#: ../camel/camel-smime-context.c:517
 msgid "Signature algorithm unsupported"
 msgstr "àààà àààààààààà ààààà ààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:523
+#: ../camel/camel-smime-context.c:519
 msgid "Malformed signature"
 msgstr "àààààà ààà"
 
-#: ../camel/camel-smime-context.c:525
+#: ../camel/camel-smime-context.c:521
 msgid "Processing error"
 msgstr "ààààààààààààà ààà"
 
-#: ../camel/camel-smime-context.c:568
+#: ../camel/camel-smime-context.c:566
 msgid "No signed data in signature"
 msgstr "àààààààà ààà àààààà àààààà àààààà àààà"
 
-#: ../camel/camel-smime-context.c:573
+#: ../camel/camel-smime-context.c:571
 msgid "Digests missing from enveloped data"
 msgstr "àààààààààààà ààààààààààà ààààààààààà àààààààààà"
 
-#: ../camel/camel-smime-context.c:586 ../camel/camel-smime-context.c:597
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
 msgstr "ààààààààààà ààààà ààààà àààààà"
 
-#: ../camel/camel-smime-context.c:604 ../camel/camel-smime-context.c:608
+#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
 msgstr "ààààà àààààààààààààà ààààààààààààààà"
 
-#: ../camel/camel-smime-context.c:618 ../camel/camel-smime-context.c:623
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
 msgstr "ààààààààààà àààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:633
+#: ../camel/camel-smime-context.c:631
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "àààààààààààà àààà ààààààààààà, ààààààààààààààà ààààààààààààààà"
 
-#: ../camel/camel-smime-context.c:636
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr ""
-"àààààààààààà àààà ààààààààààà, àààààààààààààààà àààà ààààààààà àààà àààààààààààààà"
+"àààààààààààà àààà ààààààààààà, àààààààààààààààà àààà ààààààààà àààà "
+"àààààààààààààà"
 
-#: ../camel/camel-smime-context.c:640
+#: ../camel/camel-smime-context.c:638
 msgid "Cannot find signature digests"
 msgstr "ààààà àààààààà ààààààààààààà"
 
-#: ../camel/camel-smime-context.c:656
+#: ../camel/camel-smime-context.c:654
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ààààà: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1121
+#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1123
 msgid "Cannot create encoder context"
 msgstr "àààààààà ààààààààààààà ààààààààààà"
 
@@ -2611,88 +2684,120 @@ msgstr "àààààààà ààààààààààààà àà
 msgid "Failed to add data to CMS encoder"
 msgstr "ààààààààààà CMS àààààààààà ààààààààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1138
+#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1140
 msgid "Failed to encode data"
 msgstr "ààààààààààà ààààààà ààààààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:987 ../camel/camel-smime-context.c:1233
+#: ../camel/camel-smime-context.c:989 ../camel/camel-smime-context.c:1236
 msgid "Decoder failed"
 msgstr "ààààààà àààààààààà"
 
-#: ../camel/camel-smime-context.c:1056
+#: ../camel/camel-smime-context.c:1058
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "àààààààààà ààààà ààààààà àààààààààà àààààààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:1064
+#: ../camel/camel-smime-context.c:1066
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "ààààààààààà ààààà ààààààà àààààààà ààààààààà ààààààààà àààààààààààà"
 
-#: ../camel/camel-smime-context.c:1075
+#: ../camel/camel-smime-context.c:1077
 msgid "Cannot create CMS Message"
 msgstr "CMS àààààààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:1081
+#: ../camel/camel-smime-context.c:1083
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS àààà àààààààààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:1087
+#: ../camel/camel-smime-context.c:1089
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS àààààààààààà àààààààààààà àààààààààààà"
 
-#: ../camel/camel-smime-context.c:1093
+#: ../camel/camel-smime-context.c:1095
 msgid "Cannot attach CMS data object"
 msgstr "CMS ààààààà àààààààààà àààààààààààààà"
 
-#: ../camel/camel-smime-context.c:1102
+#: ../camel/camel-smime-context.c:1104
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS àààààààààààà ààààààààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:1107
+#: ../camel/camel-smime-context.c:1109
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS àààààààààààà ààààààààààà ààààààààààààà"
 
-#: ../camel/camel-smime-context.c:1132
+#: ../camel/camel-smime-context.c:1134
 msgid "Failed to add data to encoder"
 msgstr "àààààààààà ààààààààààà ààààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:1240
+#: ../camel/camel-smime-context.c:1243
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME ààààààààààâ: ààààààààààààààààà àààààà àààààààààà"
 
-#: ../camel/camel-store.c:2184
+#: ../camel/camel-store.c:1814
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "àààààààààà àààààààààààààà: '%s': ààààààà àààààà ààà"
 
+#: ../camel/camel-store.c:1857
+#, fuzzy, c-format
+#| msgid "Syncing folders"
+msgid "Opening folder '%s'"
+msgstr "ààààààààààààà àààààààààààààààà"
+
+#: ../camel/camel-store.c:2044
+#, fuzzy, c-format
+#| msgid "Scanning for changed messages in %s"
+msgid "Scanning folders in '%s'"
+msgstr "%s ààààà àààààààààà àààààààààààà àààààààà"
+
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2375 ../camel/camel-store.c:2385
+#: ../camel/camel-store.c:2056 ../camel/camel-store.c:2066
 #: ../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:2059 ../camel/camel-store.c:2070
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "ààààà"
 
-#: ../camel/camel-store.c:2832
+#: ../camel/camel-store.c:2521
 #, 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:2535
+#, fuzzy, c-format
+#| msgid "Cannot get folder '%s': %s"
+msgid "Creating folder '%s'"
+msgstr "'%s' àààààààààà ààààààààààà: %s"
+
+#: ../camel/camel-store.c:2653 ../camel/camel-vee-store.c:350
 #: ../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:662
+#: ../camel/camel-store.c:2796 ../camel/camel-vee-store.c:400
+#: ../camel/providers/local/camel-maildir-store.c:704
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "àààààààà àààààààà ààààààààààààààà : %s: àààààà ààààà"
 
+#: ../camel/camel-stream-filter.c:327
+msgid "Only reset to beginning is supported with CamelStreamFilter"
+msgstr ""
+
+#: ../camel/camel-stream-process.c:265
+#, c-format
+msgid "Connection cancelled"
+msgstr "àààààààà ààààà àààààààààààà"
+
+#: ../camel/camel-stream-process.c:270
+#, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "ààààà \"%s\" ààààà ààààààààà àààààà àààààà àààààààààààà: %s"
+
 #: ../camel/camel-tcp-stream-raw.c:749 ../camel/camel-tcp-stream-raw.c:760
 #, c-format
 msgid "The proxy host does not support SOCKS4"
@@ -2710,7 +2815,6 @@ msgstr "àààààààà àààààààà SOCKS5 ààààà
 
 #: ../camel/camel-tcp-stream-raw.c:879
 #, c-format
-#| msgid "No support for authentication type %s"
 msgid "Could not find a suitable authentication type: code 0x%x"
 msgstr "àààààààà àààà ààààààààà àààà ààààààà: àààà 0x%x"
 
@@ -2731,7 +2835,6 @@ msgid "Host is unreachable from SOCKS server"
 msgstr "SOCKS ààààààààààà ààààààààààà àààààà àààààààààààà"
 
 #: ../camel/camel-tcp-stream-raw.c:895
-#| msgid "Connection canceled"
 msgid "Connection refused"
 msgstr "àààààààà àààààààààààààà"
 
@@ -2740,17 +2843,14 @@ msgid "Time-to-live expired"
 msgstr "ààààààààààà ààààà àààààà"
 
 #: ../camel/camel-tcp-stream-raw.c:897
-#| msgid "STLS not supported by server"
 msgid "Command not supported by SOCKS server"
 msgstr "à ààààààà SOCKS ààààààààààà àààààààààààààà"
 
 #: ../camel/camel-tcp-stream-raw.c:898
-#| msgid "STLS not supported by server"
 msgid "Address type not supported by SOCKS server"
 msgstr "àààààà ààààà SOCKS ààààààààààà àààààààààààààà"
 
 #: ../camel/camel-tcp-stream-raw.c:899
-#| msgid "Unknown error: %s"
 msgid "Unknown error from SOCKS server"
 msgstr "SOCKS ààààààààààà àààààààà ààà"
 
@@ -2761,24 +2861,23 @@ msgstr "SOCKS ààààààààààà ààààààààà à
 
 #: ../camel/camel-tcp-stream-raw.c:950
 #, 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 ààààààààààà ààààààààààà)"
+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
+#: ../camel/camel-tcp-stream-ssl.c:453
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2791,16 +2890,16 @@ msgstr ""
 "ààààààâààààààà:       %s\n"
 "ààà:         %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:463
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "GOOD"
 msgstr "GOOD"
 
-#: ../camel/camel-tcp-stream-ssl.c:463
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "BAD"
 msgstr "BAD"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:467
+#: ../camel/camel-tcp-stream-ssl.c:463
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2815,7 +2914,7 @@ msgstr ""
 "\n"
 "àààààààà ààààààààààààààà?"
 
-#: ../camel/camel-tcp-stream-ssl.c:511
+#: ../camel/camel-tcp-stream-ssl.c:507
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2824,7 +2923,7 @@ msgstr ""
 "ààààààààààà ààà: %s\n"
 "àààààààààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:563
+#: ../camel/camel-tcp-stream-ssl.c:559
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2833,7 +2932,7 @@ msgstr ""
 "àààààààà ààààààààààà àààààà: %s\n"
 "àààààààààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:581
+#: ../camel/camel-tcp-stream-ssl.c:577
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2842,7 +2941,7 @@ msgstr ""
 "ààààààààààà àààààààà àààààà: %s\n"
 "àààààààààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:598
+#: ../camel/camel-tcp-stream-ssl.c:594
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2851,38 +2950,39 @@ msgstr ""
 "ààààààààààààààà àààààà àààààà ààààààààà àààààà: %s\n"
 "àààààààààà: %s"
 
-#: ../camel/camel-url.c:314
+#: ../camel/camel-url.c:330
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "'%s' URL ààààà àààààà àààààààààà"
 
-#: ../camel/camel-vee-folder.c:1251 ../camel/camel-vee-folder.c:1414
+#: ../camel/camel-vee-folder.c:1297 ../camel/camel-vee-folder.c:1457
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "àààààààà ààààààààà ààààààààààà àààà àààààààà ààà ààààààààààààààà àààààààààààà"
+msgstr ""
+"àààààààà ààààààààà ààààààààààà àààà àààààààà ààà ààààààààààààààà àààààààààààà"
 
-#: ../camel/camel-vee-folder.c:1287
+#: ../camel/camel-vee-folder.c:1330
 #, c-format
 msgid "No such message %s in %s"
 msgstr "à àààà àààààà ààààà %s àà %s ààààà àààà"
 
-#: ../camel/camel-vee-folder.c:1355
+#: ../camel/camel-vee-folder.c:1398
 #, c-format
-#| msgid "Error storing '%s': %s"
 msgid "Error storing '%s': "
 msgstr "'%s' ààààà àààààààààààààà ààà: "
 
-#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
-#: ../camel/camel-vee-store.c:322
+#. Translators: 'Unmatched' is a folder name under Search folders where are shown
+#. all messages not belonging into any other configured search folder
+#: ../camel/camel-vee-store.c:37
 msgid "Unmatched"
 msgstr "àààààààà"
 
-#: ../camel/camel-vee-store.c:393
+#: ../camel/camel-vee-store.c:376
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "àààààààààà àààààà àààààààààààà: %s: àààà àààààà ààààààà àààà"
 
-#: ../camel/camel-vee-store.c:427
+#: ../camel/camel-vee-store.c:410
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "àààààààà àààààààà àààààààààààààà: %s: àààà àààààà ààààààà àààà"
@@ -2895,279 +2995,24 @@ msgstr "àààààààà ààààààààà àààààà
 msgid "Cannot copy messages to the Junk folder"
 msgstr "ààààà ààààààààà àààààààààà àààà ààààà àààààààààààà"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:959
-#: ../camel/providers/imap/camel-imap-folder.c:395
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "%s àààà ààààààààààà àààà ààààà àààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1035
-#, c-format
-msgid "Checking for deleted messages %s"
-msgstr "ààààààà ààààà %s àààààà àààààààààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1522
-#: ../camel/providers/groupwise/camel-groupwise-store.c:672
-#: ../camel/providers/groupwise/camel-groupwise-store.c:803
-#: ../camel/providers/imap/camel-imap-folder.c:3965
-#: ../camel/providers/imap/camel-imap-folder.c:4047
-#: ../camel/providers/imapx/camel-imapx-server.c:3889
-#: ../camel/providers/imapx/camel-imapx-server.c:4020
-#, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "%s àààààà ààà àààààààààààà àààààààààààà àààààààààààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1994
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2048
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2712
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2722
-#, c-format
-msgid "Could not get message"
-msgstr "àààààààààà ààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2432
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2482
-#, c-format
-msgid "Cannot append message to folder '%s': %s"
-msgstr "'%s' ààààààààà àààààààààà ààààààà àààààààààà: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2468
-#, c-format
-msgid "Cannot create message: %s"
-msgstr "àààààààààà ààààààààààà: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2648
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"à àààààààààà ààààààààààà: %s\n"
-"  %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2648
-#: ../camel/providers/local/camel-maildir-folder.c:100
-#: ../camel/providers/local/camel-maildir-folder.c:307
-#: ../camel/providers/local/camel-mbox-folder.c:117
-#: ../camel/providers/local/camel-mbox-folder.c:325
-#: ../camel/providers/local/camel-mh-folder.c:156
-msgid "No such message"
-msgstr "à àààà àààààà ààààà àààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2667
-#: ../camel/providers/nntp/camel-nntp-folder.c:251
-#: ../camel/providers/nntp/camel-nntp-folder.c:418
-#: ../camel/providers/pop3/camel-pop3-folder.c:455
-#, c-format
-#| msgid "Cannot get message %s: %s"
-msgid "Cannot get message %s: "
-msgstr "%s àààààààààà ààààààààààà: "
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2685
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2695
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2899
-#, c-format
-msgid "This message is not available in offline mode."
-msgstr "à ààààààà àààâààààâ ààààààààà ààààààààààààààà."
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:248
-#, c-format
-msgid "Cannot get folder container %s"
-msgstr "ààààààà àààààààà %s ààààà àààààà àààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:318
-#, c-format
-msgid "Cannot append message in offline mode: cache unavailable"
-msgstr "àààâààààâ ààààààààààà àààààààààà ààààààà àààààààààà: àààààà ààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:335
-#| msgid "Cannot append message in offline mode: %s"
-msgid "Cannot append message in offline mode: "
-msgstr "àààâààààâ ààààààààààà àààààààààà ààààààà àààààààààà: "
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
-msgid "Checking for new mail"
-msgstr "ààà ààààâàààà ààààààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
-#: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
-msgid "C_heck for new messages in all folders"
-msgstr "ààà ààààààààààà ààààà àààààààààààà àààààà(_h)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imapx/camel-imapx-provider.c:72
-#: ../camel/providers/local/camel-local-provider.c:42
-#: ../camel/providers/local/camel-local-provider.c:82
-#: ../camel/providers/local/camel-local-provider.c:102
-msgid "Options"
-msgstr "àààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
-msgid "_Apply filters to new messages in Inbox on this server"
-msgstr "à ààààààààààààà INBOX àààààà ààà àààààààààà ààààààààààààà àààààààà(_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 "Post Office Agent SOAP àààààà ààààà(_P):"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
-msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
-msgid "For accessing Novell GroupWise servers"
-msgstr "Novell GroupWise ààààààààààààà ààààààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:98
-#: ../camel/providers/imap/camel-imap-provider.c:97
-#: ../camel/providers/imapx/camel-imapx-provider.c:104
-#: ../camel/providers/nntp/camel-nntp-provider.c:72
-#: ../camel/providers/pop3/camel-pop3-provider.c:73
-msgid "Password"
-msgstr "ààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:100
-msgid "This option will connect to the GroupWise server using a plaintext password."
-msgstr ""
-"à àààààààààààà ààààààà àààààààà àààà GroupWise àààààààààààààà ààààààààààààà "
-"ààààààààààààà."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:107
-#, c-format
-msgid "Host or user not available in url"
-msgstr "url ààààà àààààà ààà ààààààà ààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:209
-#: ../camel/providers/imap/camel-imap-store.c:801
-#: ../camel/providers/imapx/camel-imapx-server.c:3100
-#, c-format
-msgid "You did not enter a password."
-msgstr "àààà àààà àààààààààààà àààààààààà."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:332
-msgid "Some features may not work correctly with your current server version"
-msgstr ""
-"ààààààààààà àààààààà ààààààà àààààààààààà ààààà àààààààààà àààààààààà àààà ààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:563
-#: ../camel/providers/imap/camel-imap-store.c:1808
-#: ../camel/providers/imap/camel-imap-store.c:2005
-#: ../camel/providers/imapx/camel-imapx-store.c:342
-#, c-format
-msgid "No such folder %s"
-msgstr "%s àààà àààààà ààààààà àààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1224
-#, c-format
-msgid "Cannot create GroupWise folders in offline mode."
-msgstr "àààâààààâ ààààààààààà GroupWise ààààààààààààà àààààààààààà."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1233
-#, c-format
-#| msgid "Cannot delete folder '%s': Special folder"
-msgid "Cannot create a special system folder"
-msgstr "àààààààà ààààààààà ààààààà ààààà àààààà àààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1243
-#: ../camel/providers/imap/camel-imap-store.c:1886
-#: ../camel/providers/imap/camel-imap-store.c:2323
-#: ../camel/providers/imapx/camel-imapx-store.c:1341
-#, c-format
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "ààà àààààààààààà àààààààààààà àààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1328
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1353
-#, c-format
-msgid "Cannot rename GroupWise folder '%s' to '%s'"
-msgstr "GroupWise ààààààà '%s' à àààààààà %s àà ààààààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1387
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:47
-#, c-format
-msgid "GroupWise server %s"
-msgstr "GroupWise ààààààà %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1389
-#, c-format
-msgid "GroupWise service for %s on %s"
-msgstr "%s àààà %s ààààà GroupWise àààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:51
-#, c-format
-msgid "GroupWise mail delivery via %s"
-msgstr "%s àààà GroupWise àààà ààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:97
-msgid "Sending Message"
-msgstr "àààààààààà àààààààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:107
-#, c-format
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "àààààààààà ààààààààààà: à ààààààààààà ààààààààà ààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
-#, c-format
-msgid ""
-"You have exceeded this account's storage limit. Your messages are queued in "
-"your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
-"of your mail.\n"
-msgstr ""
-"ààààà àààààà ààààààààà àààà àààààààààà. ààààà ààààààà ààààà àààâààààààààààà "
-"àààààààààààààààà. ààààà ààààà ààààâàààààà àààààà/àààààààâ ààààà àààà ààààààà/ààààààààà "
-"ààààà àààààà àààà àààà àààààààà àààààààààà.\n"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:159
-#, c-format
-msgid "Could not send message: %s"
-msgstr "àààààààààà ààààààààààààà: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:197
-#: ../camel/providers/imap/camel-imap-command.c:301
+#: ../camel/providers/imap/camel-imap-command.c: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"
@@ -3176,27 +3021,27 @@ msgstr ""
 "%s %s IMAP ààààààààààà àààààààà àààààà:\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:774
 #, 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:812
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP ààààààààààà àààààààààà 'ààà' ààààà: %s"
@@ -3205,58 +3050,71 @@ msgstr "IMAP ààààààààààà àààààààààà '
 msgid "Always check for new mail in this folder"
 msgstr "ààààààà à àààààààààààà ààà àààààààà àààààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:372
+#: ../camel/providers/imap/camel-imap-folder.c:370
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "%s àààààààà ààààààààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:995
-#: ../camel/providers/imapx/camel-imapx-server.c:3933
+#: ../camel/providers/imap/camel-imap-folder.c:393
+#, c-format
+msgid "Could not load summary for %s"
+msgstr "%s àààà ààààààààààà àààà ààààà àààààààààààà"
+
+#: ../camel/providers/imap/camel-imap-folder.c:1049
+#: ../camel/providers/imapx/camel-imapx-server.c:4010
 #, 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:3462
 msgid "Unable to retrieve message: "
 msgstr "àààààààààà àààààààà ààààààààààà: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:3407
-#: ../camel/providers/imapx/camel-imapx-server.c:5213
+#: ../camel/providers/imap/camel-imap-folder.c:3497
+#: ../camel/providers/imapx/camel-imapx-server.c:5283
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "%s ààààà ààààààààààà àààààààààà ààààààààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3408
-#: ../camel/providers/imapx/camel-imapx-server.c:5214
+#: ../camel/providers/imap/camel-imap-folder.c:3498
+#: ../camel/providers/imapx/camel-imapx-server.c:5284
 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:3573
+#: ../camel/providers/imap/camel-imap-folder.c:4491
+#: ../camel/providers/nntp/camel-nntp-folder.c:424
 #, 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:4075
+#: ../camel/providers/imap/camel-imap-folder.c:4158
+#: ../camel/providers/imapx/camel-imapx-server.c:3968
+#: ../camel/providers/imapx/camel-imapx-server.c:4118
+#, c-format
+msgid "Fetching summary information for new messages in %s"
+msgstr "%s àààààà ààà àààààààààààà àààààààààààà àààààààààààààààààààà"
+
+#: ../camel/providers/imap/camel-imap-folder.c:4292
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
-msgstr "ààààààààà ààààààà ààààààààààà: ààààà %d àààààà àààààà ààààààààààà àààààààààààà"
+msgstr ""
+"ààààààààà ààààààà ààààààààààà: ààààà %d àààààà àààààà ààààààààààà àààààààààààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4189
+#: ../camel/providers/imap/camel-imap-folder.c:4302
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
-msgstr "ààààààààà ààààààà ààààààààààà: ààààà %d àààààà àààààà UID ààààà àààààààààààà"
+msgstr ""
+"ààààààààà ààààààà ààààààààààà: ààààà %d àààààà àààààà UID ààààà àààààààààààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4418
+#: ../camel/providers/imap/camel-imap-folder.c:4531
 #, 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"
 msgid "Could not open cache directory: "
 msgstr "àààààà àààààààà ààààààààààààà: "
 
@@ -3267,13 +3125,11 @@ msgstr "ààààà %s ààààà àààààà ààààà 
 
 #: ../camel/providers/imap/camel-imap-message-cache.c:391
 #, c-format
-#| msgid "Failed to cache message %s: %s"
 msgid "Failed to cache message %s: "
 msgstr "ààààà %s ààààà àààààà ààààà ààààààààààà: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:529
+#: ../camel/providers/imap/camel-imap-message-cache.c:531
 #, c-format
-#| msgid "Failed to cache %s: %s"
 msgid "Failed to cache %s: "
 msgstr "%s ààààà àààààà ààààà ààààààààààà: "
 
@@ -3282,6 +3138,11 @@ msgstr "%s ààààà àààààà ààààà àààààà
 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"
@@ -3321,9 +3182,17 @@ msgstr "ààààààààààà àààààà àààààà
 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"
+msgid "_Apply filters to new messages in Inbox on this server"
 msgstr "à ààààààààààààà INBOX àààààà ààà àààààààààà ààààààààààààà àààààààà(_A)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:68
@@ -3331,102 +3200,119 @@ msgstr "à ààààààààààààà INBOX àààààà à
 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:222
+#: ../camel/providers/imap/camel-imap-store.c:2587
+#: ../camel/providers/imapx/camel-imapx-store.c:333
+#: ../camel/providers/imapx/camel-imapx-store.c:771
+#: ../camel/providers/local/camel-maildir-folder.c:458
+#: ../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:705
+#: ../camel/providers/local/camel-spool-store.c:325
+msgid "Inbox"
+msgstr "àààâààààààâ"
 
-#: ../camel/providers/imap/camel-imap-store.c:370
-#: ../camel/providers/imap/camel-imap-store.c:390
-#: ../camel/providers/imap/camel-imap-store.c:397
-#: ../camel/providers/imap/camel-imap-store.c:424
-#: ../camel/providers/imapx/camel-imapx-server.c:2942
-#: ../camel/providers/imapx/camel-imapx-server.c:2982
+#: ../camel/providers/imap/camel-imap-store.c:354
+#: ../camel/providers/imap/camel-imap-store.c:381
+#: ../camel/providers/imap/camel-imap-store.c:408
+#: ../camel/providers/imapx/camel-imapx-server.c:2999
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "ààààààààà ààààààààà IMAP ààààààà %s ààààààà àààààà àààààààà àààààààààààà: %s"
+msgstr ""
+"ààààààààà ààààààààà IMAP ààààààà %s ààààààà àààààà àààààààà àààààààààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:371
-#: ../camel/providers/imapx/camel-imapx-server.c:2943
-#: ../camel/providers/smtp/camel-smtp-transport.c:238
+#: ../camel/providers/imap/camel-imap-store.c:355
+#: ../camel/providers/imapx/camel-imapx-server.c:3000
+#: ../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:2983
-msgid "SSL negotiations failed"
-msgstr "SSL ààààààà ààààààà àààààààààà"
+#: ../camel/providers/imap/camel-imap-store.c:374
+#: ../camel/providers/imapx/camel-imapx-server.c:3038
+#, 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:382
+#: ../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:2770
+#: ../camel/providers/imap/camel-imap-store.c:707
+#: ../camel/providers/imapx/camel-imapx-server.c:3133
 #, c-format
-msgid "Connection cancelled"
-msgstr "àààààààà ààààà àààààààààààà"
+msgid "IMAP server %s does not support requested authentication type %s"
+msgstr ""
+"IMAP ààààààà %s àààà ààààààààà àààààààà àààààà ààà %s ààààà ààààààààààààààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:554
-#: ../camel/providers/imapx/camel-imapx-server.c:2775
+#: ../camel/providers/imap/camel-imap-store.c:718
+#: ../camel/providers/imapx/camel-imapx-server.c:3146
+#: ../camel/providers/smtp/camel-smtp-transport.c:347
 #, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "ààààà \"%s\" ààààà ààààààààà àààààà àààààà àààààààààààà: %s"
+msgid "No support for authentication type %s"
+msgstr "%s àààà ààààààààààà àààààà àààààààààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:740
-#: ../camel/providers/imapx/camel-imapx-server.c:3056
+#: ../camel/providers/imap/camel-imap-store.c:729
+#: ../camel/providers/smtp/camel-smtp-transport.c:360
 #, c-format
-msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "IMAP ààààààà %s àààà ààààààààà àààààààà àààààà ààà %s ààààà ààààààààààààààà"
+msgid "Error creating SASL authentication object."
+msgstr "SASL ààààààà àààààààààà àààààààààà ààà àààààààà."
 
-#: ../camel/providers/imap/camel-imap-store.c:752
-#: ../camel/providers/imapx/camel-imapx-server.c:3068
-#: ../camel/providers/smtp/camel-smtp-transport.c:420
+#: ../camel/providers/imap/camel-imap-store.c:777
+#: ../camel/providers/imapx/camel-imapx-server.c:3191
 #, c-format
-msgid "No support for authentication type %s"
-msgstr "%s àààà ààààààààààà àààààà àààààààààà"
+msgid "You did not enter a password."
+msgstr "àààà àààà àààààààààààà àààààààààà."
 
-#: ../camel/providers/imap/camel-imap-store.c:836
-#: ../camel/providers/imapx/camel-imapx-server.c:3144
+#: ../camel/providers/imap/camel-imap-store.c:818
+#: ../camel/providers/imapx/camel-imapx-server.c:3236
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3437,71 +3323,71 @@ 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:874
+#: ../camel/providers/imapx/camel-imapx-store.c:142
 #, 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:877
+#: ../camel/providers/imapx/camel-imapx-store.c:145
 #, 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:609
-#: ../camel/providers/local/camel-maildir-store.c:615
-#: ../camel/providers/local/camel-maildir-store.c:663
-#: ../camel/providers/local/camel-spool-store.c:289
-msgid "Inbox"
-msgstr "àààâààààààâ"
+#: ../camel/providers/imap/camel-imap-store.c:1962
+#: ../camel/providers/imap/camel-imap-store.c:2164
+#: ../camel/providers/imapx/camel-imapx-store.c:309
+#, c-format
+msgid "No such folder %s"
+msgstr "%s àààà àààààà ààààààà àààà"
+
+#: ../camel/providers/imap/camel-imap-store.c:1976
+#: ../camel/providers/imap/camel-imap-store.c:2431
+#: ../camel/providers/imapx/camel-imapx-store.c:1299
+#, 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:1822
-#: ../camel/providers/imap/camel-imap-store.c:2259
+#: ../camel/providers/imap/camel-imap-store.c:2040
+#: ../camel/providers/imap/camel-imap-store.c:2495
 #: ../camel/providers/imapx/camel-imapx-store.c:1320
 #, c-format
-msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "àààààààà ààààà \"%s\" àààààààààààà ààààààà ààà ààààà \"%c\" ààààà ààààààà"
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "ààà àààààààààààà àààààààààààà àààààààààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:1939
+#: ../camel/providers/imap/camel-imap-store.c:2093
 #: ../camel/providers/local/camel-maildir-store.c:244
-#: ../camel/providers/local/camel-mbox-store.c:413
-#: ../camel/providers/local/camel-mh-store.c:504
+#: ../camel/providers/local/camel-mbox-store.c:416
+#: ../camel/providers/local/camel-mh-store.c:547
 #, 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:2444
+#: ../camel/providers/imapx/camel-imapx-store.c:1310
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "àààààààà ààà ààààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3137
+#: ../camel/providers/imap/camel-imap-store.c:3214
 #, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "ààààààààààà àààààààààààààà àààààà ààààà àààààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:3140
-#| msgid "Server unexpectedly disconnected: %s"
+#: ../camel/providers/imap/camel-imap-store.c:3217
 msgid "Server unexpectedly disconnected: "
 msgstr "ààààààààààà àààààààààààààà àààààà ààààà àààààà: "
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:74
+#: ../camel/providers/imapx/camel-imapx-folder.c:88
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr "%s àààà ààààààà ààààààààààà àààààà àààààààààààà"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:82
+#: ../camel/providers/imapx/camel-imapx-folder.c:96
 #, c-format
-#| msgid "Could not create cache for %s"
 msgid "Could not create cache for %s: "
 msgstr "%s àààà ààààààààààà ààààààààà àààààààààààà: "
 
@@ -3525,39 +3411,34 @@ msgstr "àààààààààà àààààà àààààà à
 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:1410
-#| msgid "Error writing mail temp file: %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:1476
 msgid "Error writing to cache stream: "
 msgstr "àààààà ààààààààâàà àààààààààà ààà àààààààà: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2092
+#: ../camel/providers/imapx/camel-imapx-server.c:2182
 #, c-format
 msgid "Not authenticated"
 msgstr "ààààààààààààààà"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2865
-#, c-format
-#| msgid "Could not connect to %s (port %s): %s"
-msgid "Could not connect to %s (port %s): "
-msgstr "%s ààààààà àààààà àààààààà àààààààààààà (àààààà ààààà %s): "
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3329
-#| msgid "Posting failed: %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:3408
 msgid "Closing tmp stream failed: "
 msgstr "tmp ààààààààâ ààààà ààààààààààààààààà àààààààààà: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5363
-#: ../camel/providers/imapx/camel-imapx-server.c:5378
-#| msgid "Cannot create message: %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:5429
+#: ../camel/providers/imapx/camel-imapx-server.c:5444
 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:1087
+#: ../camel/providers/nntp/camel-nntp-store.c:1704
 #, c-format
 msgid "No such folder: %s"
 msgstr "àààà ààààààààààààà: %s"
@@ -3569,31 +3450,30 @@ 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:469
+#: ../camel/providers/local/camel-local-folder.c:473
 msgid "Index message body data"
 msgstr "àààà àààààà ààààà àààà ààààààà"
 
-#: ../camel/providers/local/camel-local-folder.c:685
+#: ../camel/providers/local/camel-local-folder.c:700
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3614,11 +3494,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."
@@ -3626,29 +3506,29 @@ msgstr ""
 "ààààààà mbox-ààààààààà ààààààâààààà Evolution àààà ààààààààààààà àààààààààààà "
 "ààààààààààààààà (àààààààà)."
 
-#: ../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 "Maildir-àààààà àààà àààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:92
+#: ../camel/providers/local/camel-local-provider.c:94
 msgid "For storing local mail in maildir directories."
 msgstr "àààààà ààààààà maildir ààààààààà àààààààààà."
 
-#: ../camel/providers/local/camel-local-provider.c:104
+#: ../camel/providers/local/camel-local-provider.c:108
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "Elm/ Pine/ mutt ààààà àààààà àààààààà ààààààà(_S)"
 
-#: ../camel/providers/local/camel-local-provider.c:111
+#: ../camel/providers/local/camel-local-provider.c:115
 msgid "Standard Unix mbox spool file"
 msgstr "àààààà ààààààààâ 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."
@@ -3656,123 +3536,125 @@ msgstr ""
 "àààààà àààà mbox ààààààâ ààààààààà ààààâàààààà àààà àààà ààààààààà.\n"
 "Elm, Pine, or Mutt ààààà ààààààààààààà àà àààà àààààààààààà."
 
-#: ../camel/providers/local/camel-local-provider.c:122
+#: ../camel/providers/local/camel-local-provider.c:127
 msgid "Standard Unix mbox spool directory"
 msgstr "àààààà ààààààààâ 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:532
-#: ../camel/providers/local/camel-spool-store.c:318
+#: ../camel/providers/local/camel-mbox-store.c:534
+#: ../camel/providers/local/camel-spool-store.c:571
 #, 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:701
+#: ../camel/providers/local/camel-local-store.c:435
+#: ../camel/providers/local/camel-mbox-store.c:708
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "ààààààà àààà ààà '%s' ààààà ààààààààààà: %s"
 
-#: ../camel/providers/local/camel-local-store.c:526
-#: ../camel/providers/local/camel-mbox-store.c:730
+#: ../camel/providers/local/camel-local-store.c:463
+#: ../camel/providers/local/camel-mbox-store.c:738
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "'%s' ààààààà àààà àààààààà àààààà àààààààààààà: %s"
 
+#: ../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:548
 #, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "àààààààààà àààààààààà ààààààà àààààààààààà: àààà ààààààààà"
 
-#: ../camel/providers/local/camel-maildir-folder.c:198
+#: ../camel/providers/local/camel-maildir-folder.c:100
+#: ../camel/providers/local/camel-maildir-folder.c: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: "
 
-#: ../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
+#: ../camel/providers/local/camel-maildir-folder.c:351
 #, c-format
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "ààààààààà ààààààààà àààààààààà àààà ààààà àààààààààààà: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:100
 #, c-format
-#| msgid "Cannot create folder: %s: folder exists"
 msgid "Cannot create folder: %s : Folder name cannot contain a dot"
 msgstr "ààààààà àààààààààààààà: %s: ààààààà àààààààààà àààààààà àààààààààà"
 
 #: ../camel/providers/local/camel-maildir-store.c:109
-#: ../camel/providers/local/camel-maildir-store.c:680
+#: ../camel/providers/local/camel-maildir-store.c:722
 #, c-format
-#| msgid "Folder already exists"
 msgid "Folder %s already exists"
 msgstr "%s ààà ààààààà àààààà ààààààààààààààà"
 
 #: ../camel/providers/local/camel-maildir-store.c:191
 #: ../camel/providers/local/camel-maildir-store.c:222
-#: ../camel/providers/local/camel-mbox-store.c:381
-#: ../camel/providers/local/camel-mbox-store.c:395
+#: ../camel/providers/local/camel-mbox-store.c:384
+#: ../camel/providers/local/camel-mbox-store.c:398
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "'%s' àààààààààà àààààààààààààà: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:206
-#: ../camel/providers/local/camel-mbox-store.c:347
-#: ../camel/providers/local/camel-mh-store.c:464
+#: ../camel/providers/local/camel-mbox-store.c:350
+#: ../camel/providers/local/camel-mh-store.c:502
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "'%s' àààààààààà ààààààààààà: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:212
-#: ../camel/providers/local/camel-mbox-store.c:357
-#: ../camel/providers/local/camel-mh-store.c:473
+#: ../camel/providers/local/camel-mbox-store.c:360
+#: ../camel/providers/local/camel-mh-store.c:511
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "'%s' àààààààààà ààààààààààà: ààààààà àààààààààààààààà."
@@ -3784,7 +3666,7 @@ msgstr "'%s' àààààààààà ààààààààààà: 
 
 #: ../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:649
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "'%s' àààààààà ààààààààààà: %s"
@@ -3793,51 +3675,49 @@ 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:819
-#: ../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:874
+#: ../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:671
+#: ../camel/providers/local/camel-maildir-store.c:713
 #, 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:436
+#: ../camel/providers/local/camel-maildir-summary.c:566
 #, 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:557
 msgid "Checking folder consistency"
 msgstr "àààààààà ààààààààààà àààààààààààààààààà"
 
-#: ../camel/providers/local/camel-maildir-summary.c:649
+#: ../camel/providers/local/camel-maildir-summary.c:650
 msgid "Checking for new messages"
 msgstr "ààà ààààààààààà àààààààààààààààààà"
 
-#: ../camel/providers/local/camel-maildir-summary.c:742
+#: ../camel/providers/local/camel-maildir-summary.c:743
 #: ../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-mbox-summary.c:700
+#: ../camel/providers/local/camel-mbox-summary.c:844
 #: ../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
 #, c-format
-#| msgid "Cannot append message to mbox file: %s: %s"
 msgid "Cannot append message to mbox file: %s: "
 msgstr "mbox ààààààà àààààààààà àààààààààààà: %s: "
 
@@ -3846,39 +3726,39 @@ 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:369
-#: ../camel/providers/local/camel-mbox-store.c:540
+#: ../camel/providers/local/camel-mbox-store.c:372
+#: ../camel/providers/local/camel-mbox-store.c:542
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "à àààààà àààààààààà ààààààààààà."
 
-#: ../camel/providers/local/camel-mbox-store.c:406
+#: ../camel/providers/local/camel-mbox-store.c:409
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "ààààààà '%s' ààààà ààààààààààà: àààà ààààààà àààààààààà."
 
-#: ../camel/providers/local/camel-mbox-store.c:556
+#: ../camel/providers/local/camel-mbox-store.c:558
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "'%s' àààààààà ààààààààààà: %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:572
+#: ../camel/providers/local/camel-mbox-store.c:574
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "àààààààààà ààààààààààà: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:574
+#: ../camel/providers/local/camel-mbox-store.c:576
 msgid "Folder already exists"
 msgstr "ààààààà àààààà ààààààààààààààà"
 
-#: ../camel/providers/local/camel-mbox-store.c:615
-#: ../camel/providers/local/camel-mbox-store.c:628
-#: ../camel/providers/local/camel-mbox-store.c:657
+#: ../camel/providers/local/camel-mbox-store.c:619
+#: ../camel/providers/local/camel-mbox-store.c:632
+#: ../camel/providers/local/camel-mbox-store.c:661
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3887,158 +3767,147 @@ msgstr ""
 "ààààààà '%s' ààààà àààààà àààààààààààà:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:638
+#: ../camel/providers/local/camel-mbox-store.c:642
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "'%s' àà ààààààà ààààààà."
 
-#: ../camel/providers/local/camel-mbox-store.c:647
+#: ../camel/providers/local/camel-mbox-store.c:651
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "ààààààà '%s' àààààààààààà. ààààààààààà."
 
-#: ../camel/providers/local/camel-mbox-store.c:673
-#: ../camel/providers/local/camel-mbox-store.c:687
+#: ../camel/providers/local/camel-mbox-store.c:678
+#: ../camel/providers/local/camel-mbox-store.c:693
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "'%s' àààààà àààààààà àààààà àààààààààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:767
+#: ../camel/providers/local/camel-mbox-store.c:775
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "ààà àààààààà ààààà àààààààààààà."
 
-#: ../camel/providers/local/camel-mbox-store.c:782
+#: ../camel/providers/local/camel-mbox-store.c:791
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "'%s' àààààààà àààààààà àààààààààààààà: '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:865
+#: ../camel/providers/local/camel-mbox-store.c:874
 #, 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:478
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "ààààààà ààààà ààààààààààààà: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:537
+#: ../camel/providers/local/camel-mbox-summary.c:539
 #, c-format
-#| msgid "Fatal mail parser error near position %ld in folder %s"
 msgid "Fatal mail parser error near position %s in folder %s"
-msgstr "%s ààààà ààààààààà (%s àààààààààààà) àààà àààà àààà ààààààà ààà àààààààààà"
+msgstr ""
+"%s ààààà ààààààààà (%s àààààààààààà) àààà àààà àààà ààààààà ààà àààààààààà"
 
-#: ../camel/providers/local/camel-mbox-summary.c:622
+#: ../camel/providers/local/camel-mbox-summary.c:628
 #, 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:713
+#: ../camel/providers/local/camel-mbox-summary.c:853
 #: ../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:727
 #: ../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:744
+#: ../camel/providers/local/camel-mbox-summary.c:969
 #, 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:755
 #, 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:772
 #, 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:867
+#: ../camel/providers/local/camel-mbox-summary.c:1134
 #, 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:906
+#: ../camel/providers/local/camel-mbox-summary.c:1165
 #, c-format
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
 "it.)"
 msgstr ""
-"MBOX ààààà àààààààà, àààààààà àààààà àààààààà. (àààà \"ààà\" ààààààà ààààààààààààààààà "
-"àààà ààà ààààààààààààà.)"
+"MBOX ààààà àààààààà, àààààààà àààààà àààààààà. (àààà \"ààà\" ààààààà "
+"ààààààààààààààààà àààà ààà ààààààààààààà.)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:895
-#: ../camel/providers/local/camel-mbox-summary.c:1140
+#: ../camel/providers/local/camel-mbox-summary.c:915
+#: ../camel/providers/local/camel-mbox-summary.c:1174
 #, 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:1080
 #: ../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:1244
+#: ../camel/providers/local/camel-mbox-summary.c:1274
 #, 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:1263
 #, 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:522
 #, 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:539
 #, 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:347
 #, c-format
 msgid "Spool mail file %s"
 msgstr "àààààà àààà ààà %s"
 
-#: ../camel/providers/local/camel-spool-store.c:357
+#: ../camel/providers/local/camel-spool-store.c:350
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "àààààà ààààààà ààààà %s"
@@ -4048,7 +3917,7 @@ msgstr "àààààà ààààààà ààààà %s"
 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:405
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -4057,12 +3926,12 @@ msgstr ""
 "'%s' àààààààààà àààààààààààà:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:409
+#: ../camel/providers/local/camel-spool-store.c:411
 #, 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:418
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -4071,26 +3940,36 @@ msgstr ""
 "'%s' àààààààà ààààààààààà:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:426
+#: ../camel/providers/local/camel-spool-store.c:430
 #, 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:478
 #, 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:492
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "àààààà àààààààààà àààààà àààààààààà"
 
-#: ../camel/providers/local/camel-spool-store.c:491
+#: ../camel/providers/local/camel-spool-store.c:507
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "àààààà àààààààà àààààààà àààààààààààààà"
 
+#: ../camel/providers/local/camel-spool-store.c:580
+#, c-format
+msgid "Spool '%s' cannot be opened: %s"
+msgstr "àààààà %s ààààà ààààààà àààààààààà: %s"
+
+#: ../camel/providers/local/camel-spool-store.c:596
+#, 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
@@ -4114,66 +3993,83 @@ 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:207
+#: ../camel/providers/nntp/camel-nntp-folder.c:296
+#: ../camel/providers/nntp/camel-nntp-folder.c:410
 #, 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:257
+#: ../camel/providers/nntp/camel-nntp-folder.c:261
+#: ../camel/providers/pop3/camel-pop3-folder.c:429
+#: ../camel/providers/pop3/camel-pop3-folder.c:692
 #, 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:268
+#: ../camel/providers/nntp/camel-nntp-folder.c:435
+#: ../camel/providers/pop3/camel-pop3-folder.c:366
+#: ../camel/providers/pop3/camel-pop3-folder.c:418
+#: ../camel/providers/pop3/camel-pop3-folder.c:438
+#, c-format
+msgid "Cannot get message %s: "
+msgstr "%s àààààààààà ààààààààààà: "
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:494
+#: ../camel/providers/nntp/camel-nntp-folder.c:500
+#: ../camel/providers/nntp/camel-nntp-folder.c:547
 #, 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:542
 msgid "Posting failed: "
 msgstr "ààààààààà àààààààààà: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:554
+#: ../camel/providers/nntp/camel-nntp-folder.c:571
 #, 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:591
 #, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "NTTP ààààààààààà ààààààààààà àààà àààààààààà!"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgid ""
+"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr ""
-"àààààààà ààààààààààà ààààààààààààà àààààà (ààà. comp.os.linux àààààà c.o.linux "
+"àààààààà ààààààààààà ààààààààààààà àààààà (ààà. comp.os.linux àààààà c.o."
+"linux "
 "àààà)(_S)"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:46
 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 ààààààààààààààààà àààààààààààà ààààààà àààà ààààààà "
+"à àààààààààààà àààà 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."
@@ -4181,23 +4077,23 @@ 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 "ààààààààààààà àààà àààààààààààà àààà àààààà ààààààà àààààààà àààààààààààà"
+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"
@@ -4207,7 +4103,7 @@ msgstr "NNTP ààààààà %s àà ààà àààààà %d à
 msgid "USENET News via %s"
 msgstr "USENET àààààà %s àààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1045
+#: ../camel/providers/nntp/camel-nntp-store.c:1053
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4218,7 +4114,25 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1160
+#: ../camel/providers/nntp/camel-nntp-store.c:1146
+#, c-format
+msgid "You cannot create a folder in a News store: subscribe instead."
+msgstr ""
+"àààààà àààààààààà(News store) àààà àààààààààà àààààààààààà:àààààà ààààààààààà."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1162
+#, c-format
+msgid "You cannot rename a folder in a News store."
+msgstr "àààààà ààààààààààà(News store) àààà àààààààà àààààààà ààààààààààààààà."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1185
+#, c-format
+msgid "You cannot remove a folder in a News store: unsubscribe instead."
+msgstr ""
+"àààààà ààààààààà(News store) àààà àààààààààà àààààà ààààààààààà: àààààà "
+"ààààààààààààààà ààààààààààà."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1329
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4229,7 +4143,7 @@ msgstr ""
 "\n"
 "àààà ààààààààààà àààààààààààààààà. ààààààà ààààà ààààà àààà ààà ààààààà ààààà."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1202
+#: ../camel/providers/nntp/camel-nntp-store.c:1380
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4240,88 +4154,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 "àààààà àààààààààà(News store) àààà àààààààààà àààààààààààà:àààààà ààààààààààà."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1251
-#, c-format
-msgid "You cannot rename a folder in a News store."
-msgstr "àààààà ààààààààààà(News store) àààà àààààààà àààààààà ààààààààààààààà."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1268
-#, c-format
-msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr ""
-"àààààà ààààààààà(News store) àààà àààààààààà àààààà ààààààààààà: àààààà "
-"ààààààààààààààà ààààààààààà."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1479
-#| msgid "NNTP Command failed: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1573
 msgid "NNTP Command failed: "
 msgstr "NNTP ààààààà ààààààààààà: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1553
+#: ../camel/providers/nntp/camel-nntp-store.c:1647
 #, 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:235
+#: ../camel/providers/nntp/camel-nntp-summary.c:353
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: ààà àààààààààà ààààààààâ ààààààààààààà"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:246
+#: ../camel/providers/nntp/camel-nntp-summary.c:251
 #, 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:369
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "ààààâàààà àààààààààà ààààààà ààààààààààààà àààààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:407
+#: ../camel/providers/nntp/camel-nntp-summary.c:414
 #, 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:283
+#: ../camel/providers/pop3/camel-pop3-folder.c:342
 #, 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:350
 #, 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:430
 msgid "Unknown reason"
 msgstr "àààààààà àààà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:486
+#: ../camel/providers/pop3/camel-pop3-folder.c:470
 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:485
+#| 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:555
 msgid "Expunging old messages"
 msgstr "àààà ààààààààààà àààààààààààààààààà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:575
+#: ../camel/providers/pop3/camel-pop3-folder.c:567
 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
@@ -4342,23 +4239,33 @@ msgstr "àààààà àààâàààààààààà ààà
 msgid "Disable _support for all POP3 extensions"
 msgstr "ààààà POP3 àààààààààààààààà àààààààààààààà ààààààààààà (_s)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:56
+#: ../camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Default POP3 port"
+msgstr "àààààààààààà 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."
 msgstr ""
-"à àààààààààààà ààààààà àààààààà àààà  àààààààààààààà ààààààààààààà ààààààààààààà. "
+"à àààààààààààà ààààààà àààààààà àààà  àààààààààààààà ààààààààààààà "
+"ààààààààààààà. "
 "àààà ààà ààààà ààààààà ààààà 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 "
@@ -4369,42 +4276,46 @@ 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"
+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
+#: ../camel/providers/pop3/camel-pop3-store.c:169
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
-msgstr "ààààààààà ààààààààà POP ààààààà %s ààààààà àààààà àààààààà àààààààààààà: %s"
+msgstr ""
+"ààààààààà ààààààààà POP ààààààà %s ààààààà àààààà àààààààà àààààààààààà: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c: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 "
@@ -4414,23 +4325,22 @@ msgstr ""
 "àààààààààààààààà àààààà àààààààààà."
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:340
+#: ../camel/providers/pop3/camel-pop3-store.c:269
 #, c-format
 msgid "SASL '%s' Login failed for POP server %s%s"
 msgstr "SASL '%s' àààààààà ààààààààààà (POP ààààààà %s ààààààà): %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
+#: ../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 ààààà àààààààààà ààààààààààà: "
 
-#: ../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 "
@@ -4440,17 +4350,20 @@ msgstr ""
 "àààààààààààààà. àààààààà ààààààààààà àààààà ààààààààààààà. àààààààà ààààà "
 "ààààààààààààààà ààààààààà."
 
-#: ../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 ""
 "%s POP ààààààààààà àààààà àààààààà àààààààààààà.\n"
-"àààààààààààà àààààààààààà ààà: %s"
+"àààààààààààà àààààààààààà ààà: "
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:505
+#: ../camel/providers/pop3/camel-pop3-store.c:437
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4460,7 +4373,7 @@ msgstr ""
 "ààààààà àààààààà àààààààààààà ààà: %s"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:518
+#: ../camel/providers/pop3/camel-pop3-store.c:449
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4469,29 +4382,27 @@ msgstr ""
 "%s POP ààààààààààà àààààà àààààààà àààààààààààà.\n"
 "àààààààààààà àààààààààààà ààà: %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
+#: ../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 àààààà POP3 àààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:694
+#: ../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:721
+#: ../camel/providers/pop3/camel-pop3-store.c:653
 #, c-format
 msgid "No such folder '%s'."
 msgstr "'%s' àààà àààààà ààààààà àààà."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:738
+#: ../camel/providers/pop3/camel-pop3-store.c:670
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 àà àààààà ààààààà àààààà ààààààààààààà àààààààààààààà"
@@ -4505,7 +4416,8 @@ msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
-"àààààà àààààààà \"sendmail\" àààààààààààà àààààààààààààà ààààààà àààààààà ààààààà."
+"àààààà àààààààà \"sendmail\" àààààààààààà àààààààààààààà ààààààà àààààààà "
+"ààààààà."
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:49
 msgid "sendmail"
@@ -4523,7 +4435,8 @@ msgstr "àààààààààààà àààààààààà à
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:119
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "àààààâààààâàààà àààà ààààà ààààààààà àààààààààààà: %s: ààààààà àààààààààààààà"
+msgstr ""
+"àààààâààààâàààà àààà ààààà ààààààààà àààààààààààà: %s: ààààààà àààààààààààààà"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:141
 #, c-format
@@ -4531,7 +4444,6 @@ msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "àààààâààààààà àààààà àààààààààà: %s: àààà ààààààààààààà"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:182
-#| msgid "Could not send message: %s"
 msgid "Could not send message: "
 msgstr "àààààààààà ààààààààààààà: "
 
@@ -4550,50 +4462,69 @@ 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 "SMTP ààààà ààààààààà àààààà ààààâàààâàà àààààà ààààààà àààà ààààà àààààààà."
+msgstr ""
+"SMTP ààààà ààààààààà àààààà ààààâàààâàà àààààà ààààààà àààà ààààà àààààààà."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:193
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
-#| msgid "Welcome response error"
+#: ../camel/providers/smtp/camel-smtp-transport.c:149
+#: ../camel/providers/smtp/camel-smtp-transport.c:156
 msgid "Welcome response error: "
 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 "%s SMTP ààààààààààà àààààààà àààààààààà àààààà àààààààààààà ààààààààààà: %s"
+msgstr ""
+"%s SMTP ààààààààààà àààààààà àààààààààà àààààà àààààààààààà ààààààààààà: %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 ààààà ààààààààààà: %s: "
 
-#: ../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 ""
+"%s SMTP ààààààààààà àààààààà àààààààààà àààààà àààààààààààà ààààààààààà: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:280
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ààààààà %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:361
+#: ../camel/providers/smtp/camel-smtp-transport.c:284
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s àààà SMTP àààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:408
+#: ../camel/providers/smtp/camel-smtp-transport.c:335
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "%s SMTP ààààààààà àààà ààààààààà %s àààà àààààààààààà ààààààààààààààà."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:495
+#: ../camel/providers/smtp/camel-smtp-transport.c:437
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4604,337 +4535,335 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:613
+#: ../camel/providers/smtp/camel-smtp-transport.c:554
 #, 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:561
 #, 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:565
 msgid "Sending message"
 msgstr "àààààààààà àààààààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:649
+#: ../camel/providers/smtp/camel-smtp-transport.c:590
 #, 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:603
 #, 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:706
 msgid "Syntax error, command unrecognized"
 msgstr "àààààààààààâ ààà, àààààààààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:708
 msgid "Syntax error in parameters or arguments"
 msgstr "àààààààààààà ààà ààààààààààààààà àààààààààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:729
+#: ../camel/providers/smtp/camel-smtp-transport.c:710
 msgid "Command not implemented"
 msgstr "àààààààààà àààààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:731
+#: ../camel/providers/smtp/camel-smtp-transport.c:712
 msgid "Command parameter not implemented"
 msgstr "ààààà àààààààààààà àààààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:733
+#: ../camel/providers/smtp/camel-smtp-transport.c:714
 msgid "System status, or system help reply"
 msgstr "ààààààààà àààààà, ààà ààààààààà ààààà ààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:735
+#: ../camel/providers/smtp/camel-smtp-transport.c:716
 msgid "Help message"
 msgstr "àààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:737
+#: ../camel/providers/smtp/camel-smtp-transport.c:718
 msgid "Service ready"
 msgstr "àààààà ààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:739
+#: ../camel/providers/smtp/camel-smtp-transport.c:720
 msgid "Service closing transmission channel"
 msgstr "àààààà ààààà àààààààààà àààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:741
+#: ../camel/providers/smtp/camel-smtp-transport.c:722
 msgid "Service not available, closing transmission channel"
 msgstr "àààààà ààààààààà, ààààà àààààààààà ààààààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:743
+#: ../camel/providers/smtp/camel-smtp-transport.c:724
 msgid "Requested mail action okay, completed"
 msgstr "àààà ààààààààà àààà ààààààà ààààààààà: àààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
+#: ../camel/providers/smtp/camel-smtp-transport.c:726
 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:728
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "àààà ààààààààà àààà àààààààààà àààààààààààààààààà: ààààâààààààâ ààààààààà"
+msgstr ""
+"àààà ààààààààà àààà àààààààààà àààààààààààààààààà: ààààâààààààâ ààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:749
+#: ../camel/providers/smtp/camel-smtp-transport.c:730
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "àààà ààààààààà àààààààààà àààààààààààààààààà: ààààâààààààâ ààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:751
+#: ../camel/providers/smtp/camel-smtp-transport.c:732
 msgid "Requested action aborted: error in processing"
-msgstr "àààààà àààààà àààà ààààààààààà àààààààà àà ààààààààà, àààààààààààà ààà àààààààà"
+msgstr ""
+"àààààà àààààà àààà ààààààààààà àààààààà àà ààààààààà, àààààààààààà ààà "
+"àààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:753
+#: ../camel/providers/smtp/camel-smtp-transport.c:734
 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:736
 msgid "Requested action not taken: insufficient system storage"
-msgstr "àààà ààààààààà àààààààààà àààààààààààààààààà: àààààààà ààààààà àààààà ààààààààà"
+msgstr ""
+"àààà ààààààààà àààààààààà àààààààààààààààààà: àààààààà ààààààà àààààà "
+"ààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:757
+#: ../camel/providers/smtp/camel-smtp-transport.c:738
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
-"àààààà àààààà àààà ààààààààààà àààààààà àà ààààààààà: àààààà àààààà àààààààà àààààà"
+"àààààà àààààà àààà ààààààààààà àààààààà àà ààààààààà: àààààà àààààà àààààààà "
+"àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:759
+#: ../camel/providers/smtp/camel-smtp-transport.c:740
 msgid "Requested action not taken: mailbox name not allowed"
-msgstr "àààà ààààààààà àààààààààà àààààààààààààààààà: ààààâààààààà à ààààààà àààààà àààà"
+msgstr ""
+"àààà ààààààààà àààààààààà àààààààààààààààààà: ààààâààààààà à ààààààà àààààà "
+"àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:761
+#: ../camel/providers/smtp/camel-smtp-transport.c:742
 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:744
 msgid "Transaction failed"
 msgstr "ààààààà ààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:767
+#: ../camel/providers/smtp/camel-smtp-transport.c:748
 msgid "A password transition is needed"
 msgstr "àààà àààààààà àààààààà ààààààààà "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:769
+#: ../camel/providers/smtp/camel-smtp-transport.c:750
 msgid "Authentication mechanism is too weak"
 msgstr "ààààààà àààààààààà ààà àààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:771
+#: ../camel/providers/smtp/camel-smtp-transport.c:752
 msgid "Encryption required for requested authentication mechanism"
-msgstr "àààà ààààààààà  ààààààà àààààààààààààà ààààààààààà(àààâààààààààà) ààààààààà"
+msgstr ""
+"àààà ààààààààà  ààààààà àààààààààààààà ààààààààààà(àààâààààààààà) ààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:773
+#: ../camel/providers/smtp/camel-smtp-transport.c:754
 msgid "Temporary authentication failure"
 msgstr "ààààààààà ààààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1030
+#: ../camel/providers/smtp/camel-smtp-transport.c:1004
 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:1031
+#: ../camel/providers/smtp/camel-smtp-transport.c:1048
+#: ../camel/providers/smtp/camel-smtp-transport.c:1056
 msgid "HELO command failed: "
 msgstr "HELO ààààà ààààààààààà: %s: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1150
+#: ../camel/providers/smtp/camel-smtp-transport.c:1125
 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:1144
+#: ../camel/providers/smtp/camel-smtp-transport.c:1155
+#: ../camel/providers/smtp/camel-smtp-transport.c:1168
 msgid "AUTH command failed: "
 msgstr "AUTH ààààà ààààààààààà: %s: "
 
-#: ../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:1276
+#: ../camel/providers/smtp/camel-smtp-transport.c:1290
+#: ../camel/providers/smtp/camel-smtp-transport.c:1299
 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:1326
 msgid "RCPT TO command failed: "
 msgstr "RSET ààààà ààààààààààà: %s: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1370
-#: ../camel/providers/smtp/camel-smtp-transport.c:1379
+#: ../camel/providers/smtp/camel-smtp-transport.c:1342
+#: ../camel/providers/smtp/camel-smtp-transport.c:1351
 #, 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:1393
+#: ../camel/providers/smtp/camel-smtp-transport.c:1403
+#: ../camel/providers/smtp/camel-smtp-transport.c:1413
+#: ../camel/providers/smtp/camel-smtp-transport.c:1472
+#: ../camel/providers/smtp/camel-smtp-transport.c:1491
+#: ../camel/providers/smtp/camel-smtp-transport.c:1504
+#: ../camel/providers/smtp/camel-smtp-transport.c:1512
 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:1537
+#: ../camel/providers/smtp/camel-smtp-transport.c:1551
+#: ../camel/providers/smtp/camel-smtp-transport.c:1559
 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:1584
+#: ../camel/providers/smtp/camel-smtp-transport.c:1598
+#: ../camel/providers/smtp/camel-smtp-transport.c:1605
 msgid "QUIT command failed: "
 msgstr "QUIT ààààà ààààààààààà: "
 
 #: ../libedataserver/e-categories.c:47
-#| msgid "Anniversary"
 msgctxt "CategoryName"
 msgid "Anniversary"
 msgstr "àààààààààààà"
 
 #: ../libedataserver/e-categories.c:48
-#| msgid "Birthday"
 msgctxt "CategoryName"
 msgid "Birthday"
 msgstr "àààààààààà"
 
 #: ../libedataserver/e-categories.c:49
-#| msgid "Business"
 msgctxt "CategoryName"
 msgid "Business"
 msgstr "ààààààà"
 
 #: ../libedataserver/e-categories.c:50
-#| msgid "Competition"
 msgctxt "CategoryName"
 msgid "Competition"
 msgstr "ààààààà"
 
 #: ../libedataserver/e-categories.c:51
-#| msgid "Favorites"
 msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "ààààààààà"
 
 #: ../libedataserver/e-categories.c:52
-#| msgid "Gifts"
 msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "àààààààààà"
 
 #: ../libedataserver/e-categories.c:53
-#| msgid "Goals/Objectives"
 msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "ààààààà/ààààààààà"
 
 #: ../libedataserver/e-categories.c:54
-#| msgid "Holiday"
 msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "àààààà"
 
 #: ../libedataserver/e-categories.c:55
-#| msgid "Holiday Cards"
 msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "àààààà ààààààààà"
 
 #. important people (e.g. new business partners)
 #: ../libedataserver/e-categories.c:57
-#| msgid "Hot Contacts"
 msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "àààààà àààààààààààààà"
 
 #: ../libedataserver/e-categories.c:58
-#| msgid "Ideas"
 msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "àààààààà"
 
 #: ../libedataserver/e-categories.c:59
-#| msgid "International"
 msgctxt "CategoryName"
 msgid "International"
 msgstr "ààààààààààààà"
 
 #: ../libedataserver/e-categories.c:60
-#| msgid "Key Customer"
 msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "ààààà àààààà"
 
 #: ../libedataserver/e-categories.c:61
-#| msgid "Miscellaneous"
 msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "àààà"
 
 #: ../libedataserver/e-categories.c:62
-#| msgid "Personal"
 msgctxt "CategoryName"
 msgid "Personal"
 msgstr "àààààààà"
 
 #: ../libedataserver/e-categories.c:63
-#| msgid "Phone Calls"
 msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "ààààààà àààààà"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
 #: ../libedataserver/e-categories.c:65
-#| msgid "Status"
 msgctxt "CategoryName"
 msgid "Status"
 msgstr "àààààà"
 
 #: ../libedataserver/e-categories.c:66
-#| msgid "Strategies"
 msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "àààààààà"
 
 #: ../libedataserver/e-categories.c:67
-#| msgid "Suppliers"
 msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "àààààààààà"
 
 #: ../libedataserver/e-categories.c:68
-#| msgid "Time & Expenses"
 msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "ààà àààà àààààààà"
 
 #: ../libedataserver/e-categories.c:69
-#| msgid "VIP"
 msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
 #: ../libedataserver/e-categories.c:70
-#| msgid "Waiting"
 msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "ààààààààààààà"
 
+#: ../libedataserver/e-client.c:113
+#, fuzzy
+#| msgid "URI not loaded"
+msgid "Source not loaded"
+msgstr "URI àààà àààààà"
+
+#: ../libedataserver/e-client.c:115
+#, fuzzy
+#| msgid "URI already loaded"
+msgid "Source already loaded"
+msgstr "URI àààààà àààà ààààà"
+
+#: ../libedataserver/e-client.c:123
+#, fuzzy
+#| msgid "Offline mode unavailable"
+msgid "Offline unavailable"
+msgstr "àààâààààâ àààààààà ààààààààà"
+
+#: ../libedataserver/e-client.c:145
+#, fuzzy
+#| msgid "parse error"
+msgid "D-Bus error"
+msgstr "àààààà ààà"
+
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1902
+#: ../libedataserver/e-time-utils.c:1634 ../libedataserver/e-time-utils.c:1930
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
@@ -4942,7 +4871,7 @@ msgstr "%a %m/%d/%Y %I:%M:%S %p"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1893
+#: ../libedataserver/e-time-utils.c:1639 ../libedataserver/e-time-utils.c:1921
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
@@ -4950,7 +4879,7 @@ msgstr "%a %m/%d/%Y %H:%M:%S"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1898
+#: ../libedataserver/e-time-utils.c:1644 ../libedataserver/e-time-utils.c:1926
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
@@ -4958,78 +4887,78 @@ msgstr "%a %m/%d/%Y %I:%M %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1889
+#: ../libedataserver/e-time-utils.c:1649 ../libedataserver/e-time-utils.c:1917
 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
+#: ../libedataserver/e-time-utils.c:1654
 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
+#: ../libedataserver/e-time-utils.c:1659
 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:1662 ../libedataserver/e-time-utils.c:1782
+#: ../libedataserver/e-time-utils.c:1912
 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:1669
 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:1673
 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
+#: ../libedataserver/e-time-utils.c:1678
 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
+#: ../libedataserver/e-time-utils.c:1683
 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
+#: ../libedataserver/e-time-utils.c:1688
 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
+#: ../libedataserver/e-time-utils.c:1693
 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:1696 ../libedataserver/e-time-utils.c:1785
 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:1854 ../libedataserver/e-time-utils.c:1974
 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:1858 ../libedataserver/e-time-utils.c:1966
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -5037,224 +4966,448 @@ msgstr "%H:%M:%S"
 #. 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
+#: ../libedataserver/e-time-utils.c:1863 ../libedataserver/e-time-utils.c:1971
 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
+#: ../libedataserver/e-time-utils.c:1867 ../libedataserver/e-time-utils.c:1963
 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:1870
 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:1874
 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:94
+#: ../libedataserverui/e-book-auth-util.c:651
 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:191
+#: ../libedataserverui/e-book-auth-util.c:412
 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-dialog.c:189
+#: ../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-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:663
-msgid "Currently _used categories:"
-msgstr "ààààààà àààààààààààààà ààààààà (_u):"
-
-#: ../libedataserverui/e-categories-dialog.c:670
-msgid "_Available Categories:"
-msgstr "àààà ààààààà(_A):"
-
-#: ../libedataserverui/e-categories-dialog.c:713
-msgid "_Edit"
-msgstr "àààààààà(_E)"
-
-#: ../libedataserverui/e-categories-dialog.c:769
-msgid "Icon"
-msgstr "àààààà"
+#: ../libedataserverui/e-client-utils.c:793
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid ""
+"Enter password for %s (user %s)\n"
+"Reason: %s"
+msgstr "%s àààààà àààààààààààà ààààààà (ààààààà %s)"
 
-#: ../libedataserverui/e-categories-dialog.c:774
-msgid "Category"
-msgstr "àààà"
+#: ../libedataserverui/e-client-utils.c:887
+#| msgid "Enter password"
+msgid "Enter Passphrase"
+msgstr "àààààààààààààààààà ààààààà"
 
-#: ../libedataserverui/e-category-completion.c:292
-#, c-format
-msgid "Create category \"%s\""
-msgstr "àààà \"%s\" ààààà ààààà"
+#: ../libedataserverui/e-client-utils.c:889
+#| msgid "Enter password"
+msgid "Enter Password"
+msgstr "àààààààààààà ààààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:169
-#| msgid "Hot Contacts"
+#: ../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:974
+#: ../libedataserverui/e-name-selector-dialog.c:250
+#: ../libedataserverui/e-name-selector-dialog.c:1011
 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:744
+#: ../libedataserverui/e-name-selector-dialog.c:766
 msgid "_Add"
 msgstr "àààààà(_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:748
+#: ../libedataserverui/e-name-selector-dialog.c:770
 msgid "_Remove"
 msgstr "àààààà àààà(_R)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:888
+#: ../libedataserverui/e-name-selector-dialog.c:930
 #, c-format
-#| msgid "Error reading mail file: %s"
 msgid "Error loading address book: %s"
 msgstr "ààààà ààààààààààà àààààààà ààà: %s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2673
+#: ../libedataserverui/e-name-selector-entry.c:2741
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "%s ààààà ààààà àààààà ààààààààà(_x)"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2688
+#: ../libedataserverui/e-name-selector-entry.c:2756
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s ààààà àààà àààà(_y)"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2698
+#: ../libedataserverui/e-name-selector-entry.c:2766
 #, c-format
 msgid "C_ut %s"
 msgstr "%s ààààà àààààààà(_C)"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2715
+#: ../libedataserverui/e-name-selector-entry.c:2783
 #, c-format
 msgid "_Edit %s"
 msgstr "%s ààààà àààààààà(_E)"
 
-#: ../libedataserverui/e-name-selector-list.c:513
+#: ../libedataserverui/e-name-selector-list.c:509
 #, 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.c:699
+#: ../libedataserverui/e-passwords-win32.c:612
 msgid "You have the Caps Lock key on."
 msgstr "ààààààààà Caps Lock àààààà àààâ ààààà."
 
-#: ../libedataserverui/e-passwords.c:821
+#: ../libedataserverui/e-passwords.c:819
+#: ../libedataserverui/e-passwords-win32.c:735
 msgid "_Remember this passphrase"
 msgstr "à ààààààààààààààà ààààààààààà(_R)"
 
-#: ../libedataserverui/e-passwords.c:822
+#: ../libedataserverui/e-passwords.c:820
+#: ../libedataserverui/e-passwords-win32.c:736
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "àààààààà ààààààààà à ààààààààààààààà ààààààààààà(_R)"
 
-#: ../libedataserverui/e-passwords.c:827
+#: ../libedataserverui/e-passwords.c:825
+#: ../libedataserverui/e-passwords-win32.c:741
 msgid "_Remember this password"
 msgstr "à àààààààààààà ààààààààààà(_R)"
 
-#: ../libedataserverui/e-passwords.c:828
+#: ../libedataserverui/e-passwords.c:826
+#: ../libedataserverui/e-passwords-win32.c:742
 msgid "_Remember this password for the remainder of this session"
 msgstr "àààààààà ààààààààà à àààààààààààà ààààààààààà(_R)"
 
 #. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:101
+#: ../libedataserverui/e-source-selector-dialog.c:99
 msgid "Select destination"
 msgstr "ààààààààà ààààà"
 
-#: ../libedataserverui/e-source-selector-dialog.c:172
+#: ../libedataserverui/e-source-selector-dialog.c:169
 msgid "_Destination"
 msgstr "àààà(_D)"
 
-#: ../servers/groupwise/e-gw-connection.c:227
-msgid "Invalid connection"
-msgstr "àààààà àààààà"
+#~ msgid "Updating contacts cache (%d)... "
+#~ msgstr "àààààààà ààààààààààà ààààààà ààààààààààààà (%d)... "
+
+#~| msgid "Cannot get message %s: %s"
+#~ msgid "Cannot get supported fields: %s"
+#~ msgstr "àààààààààà àààààààààà ààààààààààà: %s"
+
+#~| msgid "Cannot get message %s: %s"
+#~ msgid "Cannot get required fields: %s"
+#~ msgstr "àààààààààà àààààààààà ààààààààààà: %s"
+
+#~| msgid "Unsupported authentication method"
+#~ msgid "Cannot get supported authentication methods: %s"
+#~ msgstr "àààààààààà ààààààà ààààààààààà ààààààààààà: %s"
+
+#~ msgid "Cannot get changes: %s"
+#~ msgstr "ààààààààààààà ààààààààààà: %s"
+
+#~| msgid "Operation failed: %s"
+#~ msgid "Cancel operation failed: %s"
+#~ msgstr "ààààààààààà ààààààà ààààààààààà: %s"
+
+#~ msgid "Reply Requested: by "
+#~ msgstr "ààààààààààààààà àààà àààààààààààà:ààà "
+
+#~ msgid "Reply Requested: When convenient"
+#~ msgstr "ààààààààààààààà àààà àààààààààààà: ààààààààààà"
+
+#~| msgid "Loading %s items"
+#~ msgid "Loading Appointment items"
+#~ msgstr "ààààààààâàààààà ààààààààà àààà ààààààààààààà"
+
+#~| msgid "Loading %s items"
+#~ msgid "Loading Task items"
+#~ msgstr "àààààà ààààààààà àààà ààààààààààààà"
+
+#~| msgid "Loading %s items"
+#~ msgid "Loading Note items"
+#~ msgstr "ààààààà ààààààààà àààà ààààààààààààà"
+
+#~| msgid "Loading %s items"
+#~ msgid "Loading items"
+#~ msgstr "ààààààààà àààà ààààààààààààà"
+
+#~ msgid "Calendar"
+#~ msgstr "àààààààààà"
+
+#~ msgid "Invalid server URI"
+#~ msgstr "àààààà ààààààà URI"
+
+#~ msgid "Could not create thread for populating cache"
+#~ msgstr "ààààààààààà àààààààààààà àààààààà ààààààààààà"
+
+#~ msgid "Cannot retrieve calendar alarm e-mail address: %s"
+#~ msgstr "àààààààààà ààààà à-àààà àààààààààà àààààààà ààààààààààà: %s"
 
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "Invalid response from server"
-msgstr "ààààààààààà ààààààààà ààààààà"
+#~ msgid "Cannot retrieve calendar's LDAP attribute: %s"
+#~ msgstr "àààààààààà LDAP ààààààààààààà àààààààà ààààààààààà: %s"
 
-#: ../servers/groupwise/e-gw-connection.c:233
-msgid "No response from the server"
-msgstr "ààààààààààà àààààà ààààààààààà àààà"
+#~ msgid "Cannot retrieve calendar scheduling information: %s"
+#~ msgstr "àààààààààà àààààààààà ààààààààààà àààààààà ààààààààààà: %s"
 
-#: ../servers/groupwise/e-gw-connection.c:239
-msgid "Bad parameter"
-msgstr "àààààààà ààààààà"
+#~ msgid "Cannot discard calendar alarm: %s"
+#~ msgstr "àààààààààà ààààà ààààà àààààààààààààà: %s"
+
+#~ msgid "Cannot retrieve default calendar object path: %s"
+#~ msgstr "àààààààààààà àààààààààà àààààààà àààààààààà àààààààà ààààààààààà: %s"
+
+#~ msgid "Could not complete calendar query: %s"
+#~ msgstr "ààààààààààà ààààààààà ààààààààààààààààà: %s"
+
+#~ msgid "Could not set default calendar time zone: %s"
+#~ msgstr "àààààààààààà ààà àààààààà àààààààà àààààààààààà: %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 "àààâààààâ ààààààààààà àààààààààà ààààààà àààààààààà: àààààà ààààààààà"
+
+#~| msgid "Cannot append message in offline mode: %s"
+#~ msgid "Cannot append message in offline mode: "
+#~ msgstr "àààâààààâ ààààààààààà àààààààààà ààààààà àààààààààà: "
+
+#~ msgid "Checking for new mail"
+#~ msgstr "ààà ààààâàààà ààààààààààààààà"
+
+#~ msgid "Check new messages for J_unk contents"
+#~ msgstr "ààààà ààààààààààà ààà ààààààààààà ààààààààà(_u)"
+
+#~ msgid "Automatically synchroni_ze account locally"
+#~ msgstr "àààààààààà ààààààààà àààààààààààààà àààààà(_z)"
+
+#~ msgid "SOAP Settings"
+#~ msgstr "SOAP àààààààààà"
+
+#~ msgid "Post Office Agent SOAP _Port:"
+#~ msgstr "Post Office Agent SOAP àààààà ààààà(_P):"
+
+#~ msgid "Novell GroupWise"
+#~ msgstr "Novell GroupWise"
+
+#~ msgid "For accessing Novell GroupWise servers"
+#~ msgstr "Novell GroupWise ààààààààààààà ààààààààààààààà"
+
+#~ msgid ""
+#~ "This option will connect to the GroupWise server using a plaintext "
+#~ "password."
+#~ msgstr ""
+#~ "à àààààààààààà ààààààà àààààààà àààà GroupWise àààààààààààààà ààààààààààààà "
+#~ "ààààààààààààà."
+
+#~ msgid "Host or user not available in url"
+#~ msgstr "url ààààà àààààà ààà ààààààà ààààààààà"
+
+#~ msgid ""
+#~ "Some features may not work correctly with your current server version"
+#~ msgstr ""
+#~ "ààààààààààà àààààààà ààààààà àààààààààààà ààààà àààààààààà àààààààààà àààà "
+#~ "ààààààààààà"
+
+#~ msgid "Cannot create GroupWise folders in offline mode."
+#~ msgstr "àààâààààâ ààààààààààà GroupWise ààààààààààààà àààààààààààà."
+
+#~| msgid "Cannot delete folder '%s': Special folder"
+#~ msgid "Cannot create a special system folder"
+#~ msgstr "àààààààà ààààààààà ààààààà ààààà àààààà àààààààààààà"
+
+#~ msgid "Cannot rename GroupWise folder '%s' to '%s'"
+#~ msgstr "GroupWise ààààààà '%s' à àààààààà %s àà ààààààààààààààà"
+
+#~ msgid "GroupWise server %s"
+#~ msgstr "GroupWise ààààààà %s"
+
+#~ msgid "GroupWise service for %s on %s"
+#~ msgstr "%s àààà %s ààààà GroupWise àààà"
+
+#~ msgid "GroupWise mail delivery via %s"
+#~ msgstr "%s àààà GroupWise àààà ààààà"
+
+#~ msgid "Sending Message"
+#~ msgstr "àààààààààà àààààààààààààààà"
+
+#~ msgid "Cannot get folder: Invalid operation on this store"
+#~ msgstr "àààààààààà ààààààààààà: à ààààààààààà ààààààààà ààààà"
+
+#~ msgid ""
+#~ "You have exceeded this account's storage limit. Your messages are queued "
+#~ "in your Outbox. Resend by pressing Send/Receive after deleting/archiving "
+#~ "some of your mail.\n"
+#~ msgstr ""
+#~ "ààààà àààààà ààààààààà àààà àààààààààà. ààààà ààààààà ààààà àààâààààààààààà "
+#~ "àààààààààààààààà. ààààà ààààà ààààâàààààà àààààà/àààààààâ ààààà àààà ààààààà/"
+#~ "ààààààààà ààààà àààààà àààà àààà àààààààà àààààààààà.\n"
+
+#~ msgid "Could not send message: %s"
+#~ msgstr "àààààààààà ààààààààààààà: %s"
+
+#~ msgid "Operation cancelled"
+#~ msgstr "ààààààà ààààà àààààààààààà"
+
+#~ msgid "_Apply filters to new messages in INBOX on this server"
+#~ msgstr "à ààààààààààààà INBOX àààààà ààà àààààààààà ààààààààààààà àààààààà(_A)"
+
+#~ msgid "SSL negotiations failed"
+#~ msgstr "SSL ààààààà ààààààà àààààààààà"
+
+#~| msgid "Could not connect to %s (port %s): %s"
+#~ msgid "Could not connect to %s (port %s): "
+#~ msgstr "%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 "àààààààà ààààààà"
 
 #, fuzzy
 #~ msgid "Cannot complete operation"
@@ -5263,9 +5416,6 @@ msgstr "àààààààà ààààààà"
 #~ msgid "Could not create thread for getting deltas"
 #~ msgstr "àààààààààààà àààààààààààà àààààààà ààààààààààà"
 
-#~ msgid "Offline mode unavailable"
-#~ msgstr "àààâààààâ àààààààà ààààààààà"
-
 #~ msgid "Verifying message"
 #~ msgstr "àààààààààà àààààààààààààààààà"
 
@@ -5784,9 +5934,6 @@ msgstr "àààààààà ààààààà"
 #~ msgid "Enter password for %s"
 #~ msgstr "%s àààààà àààààààààààà ààààààà"
 
-#~ msgid "Enter password"
-#~ msgstr "àààààààààààà ààààààà"
-
 #~ msgid "Owner"
 #~ msgstr "ààààà"
 
@@ -5903,7 +6050,3 @@ msgstr "àààààààà ààààààà"
 
 #~ msgid "Evolution Data Server logging service"
 #~ msgstr "ààààààààà ààààààà àààààààà ààààààà àààà"
-
-#: ../calendar/libecal/e-cal.c:1049
-msgid "On This Computer"
-msgstr "à àààààààà"



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