[evolution-data-server] Updated Telugu Translation



commit ae193201f09aa0039b6d925a8f1ee54a8f39ad37
Author: krishnababu k <kkrothap redhat ocm>
Date:   Mon Aug 29 21:28:40 2011 +0530

    Updated Telugu Translation

 po/te.po | 4173 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 2119 insertions(+), 2054 deletions(-)
---
diff --git a/po/te.po b/po/te.po
index 068a741..02d835c 100644
--- a/po/te.po
+++ b/po/te.po
@@ -9,153 +9,141 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server.gnome-2-28.te\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-03-15 18:01+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 21:02+0530\n"
 "Last-Translator: Krishnababu Krothapalli <kkrothap redhat com>\n"
 "Language-Team: Telugu <en li 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"
 "\n"
 "\n"
+"Language: te\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
+msgstr "ààààààààààààààà...."
+
+#: ../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 "ààààààààààà..."
+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
+#. 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 "àààààààà àààààààà ààààààààààààààà (DN)"
+msgstr "àààààààà àààààà ààààààààààààààà (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
+msgstr "ààààààààààààà àààà"
+
+#: ../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 "ààààààà ààààà"
 
@@ -164,29 +152,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."
 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 "àààààà ID ààààààà àààààààààààà"
+
+#: ../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 "àààààààà ID"
 
-#: ../addressbook/libebook/e-contact.c:116
+#. FILE_AS is not really a structured field - we use a getter/setter
+#. so we can generate its value if necessary in the getter
+#: ../addressbook/libebook/e-contact.c:119
 msgid "File Under"
 msgstr "àààà àààààà"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:118
+#: ../addressbook/libebook/e-contact.c:121
 msgid "Book URI"
 msgstr "àààààà  URL"
 
@@ -194,1183 +251,1189 @@ msgstr "àààààà  URL"
 #. 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 "à àààààà 1"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Email 2"
 msgstr "à àààààà 2 "
 
-#: ../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 "à àààààà 4"
 
-#: ../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 "ààààààà ààààààà àààà 2"
 
-#: ../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 "ààààà àààà 2"
 
-#: ../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"
+msgstr "àààààààààURL"
 
-#: ../addressbook/libebook/e-contact.c:175
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Weblog URL"
-msgstr "ààààà àààààà 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"
+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 àààààààààà"
+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 ààààà ààà àààà 1"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Home Screen Name 2"
 msgstr "AIM ààààà ààà àààà 2"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Home Screen Name 3"
 msgstr "AIM ààààà ààà àààà 3"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:197
 msgid "AIM Work Screen Name 1"
 msgstr "AIM ààààààààààààà ààà àààà 1"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:198
 msgid "AIM Work Screen Name 2"
 msgstr "AIM ààààààààààààà ààà àààà 2"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:199
 msgid "AIM Work Screen Name 3"
 msgstr "AIM ààààààààààààà ààà àààà 3"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:200
 msgid "GroupWise Home Screen Name 1"
 msgstr "àààààààà ààààà ààà àààà 1"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Home Screen Name 2"
 msgstr "àààààààà ààààà ààà àààà 2"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Home Screen Name 3"
 msgstr "àààààààà ààààà ààà àààà 3"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:203
 msgid "GroupWise Work Screen Name 1"
 msgstr "àààààààà ààààààààààààà ààà àààà 1"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:204
 msgid "GroupWise Work Screen Name 2"
 msgstr "àààààààà ààààààààààààà ààà àààà 2"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:205
 msgid "GroupWise Work Screen Name 3"
 msgstr "àààààààà ààààààààààààà ààà àààà 3"
 
-#: ../addressbook/libebook/e-contact.c:203
-#| msgid "Jabber Home Id 1"
+#: ../addressbook/libebook/e-contact.c:206
 msgid "Jabber Home ID 1"
 msgstr "àààààà ààààààà ID â1"
 
-#: ../addressbook/libebook/e-contact.c:204
-#| msgid "Jabber Home Id 2"
+#: ../addressbook/libebook/e-contact.c:207
 msgid "Jabber Home ID 2"
 msgstr "àààààà ààààààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:205
-#| msgid "Jabber Home Id 3"
+#: ../addressbook/libebook/e-contact.c:208
 msgid "Jabber Home ID 3"
 msgstr "àààààà ààààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:206
-#| msgid "Jabber Work Id 1"
+#: ../addressbook/libebook/e-contact.c:209
 msgid "Jabber Work ID 1"
 msgstr "àààààà ààààààààààààà ID 1 "
 
-#: ../addressbook/libebook/e-contact.c:207
-#| msgid "Jabber Work Id 2"
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Jabber Work ID 2"
 msgstr "àààààà ààààààààààààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:208
-#| msgid "Jabber Work Id 3"
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Jabber Work ID 3"
 msgstr "àààààà ààààààààààààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Home Screen Name 1"
 msgstr "àààà!  ààààà ààà àààà 1"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Home Screen Name 2"
 msgstr "àààà!  ààààà ààà àààà 2"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Home Screen Name 3"
 msgstr "àààà!  ààààà ààà àààà 3"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:215
 msgid "Yahoo! Work Screen Name 1"
 msgstr "àààà!  ààààà ààà àààà 1"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:216
 msgid "Yahoo! Work Screen Name 2"
 msgstr "àààà!  ààààà ààà àààà 2"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Yahoo! Work Screen Name 3"
 msgstr "àààà!  ààààà ààà àààà 3"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:218
 msgid "MSN Home Screen Name 1"
 msgstr "MSN ààààà ààà àààà 1"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Home Screen Name 2"
 msgstr "MSN ààààà ààà àààà 2"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Home Screen Name 3"
 msgstr "MSN ààààà ààà àààà 3"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:221
 msgid "MSN Work Screen Name 1"
 msgstr "MSN ààààà ààà àààà 1"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:222
 msgid "MSN Work Screen Name 2"
 msgstr "MSN ààààà ààà àààà 2"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:223
 msgid "MSN Work Screen Name 3"
 msgstr "MSN ààààà ààà àààà 3"
 
-#: ../addressbook/libebook/e-contact.c:221
-#| msgid "ICQ Home Id 1"
+#: ../addressbook/libebook/e-contact.c:224
 msgid "ICQ Home ID 1"
 msgstr "ICQ ààààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:222
-#| msgid "ICQ Home Id 2"
+#: ../addressbook/libebook/e-contact.c:225
 msgid "ICQ Home ID 2"
 msgstr "ICQ ààààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:223
-#| msgid "ICQ Home Id 3"
+#: ../addressbook/libebook/e-contact.c:226
 msgid "ICQ Home ID 3"
 msgstr "ICQ ààààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:224
-#| msgid "ICQ Work Id 1"
+#: ../addressbook/libebook/e-contact.c:227
 msgid "ICQ Work ID 1"
 msgstr "ICQ ààààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:225
-#| msgid "ICQ Work Id 2"
+#: ../addressbook/libebook/e-contact.c:228
 msgid "ICQ Work ID 2"
 msgstr "ICQ ààààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:226
-#| msgid "ICQ Work Id 3"
+#: ../addressbook/libebook/e-contact.c:229
 msgid "ICQ Work ID 3"
 msgstr "ICQ ààààà ID 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook/e-contact.c:232
 msgid "Last Revision"
 msgstr "ààààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:230
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Name or Org"
 msgstr "àààà àààà Org"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:236
 msgid "Address List"
 msgstr "àààààààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:237
 msgid "Home Address"
 msgstr "ààààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:235
+#: ../addressbook/libebook/e-contact.c:238
 msgid "Work Address"
 msgstr "ààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:236
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Other Address"
 msgstr "ààà àààààààà"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:239
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Category List"
 msgstr "ààààààà àààààà"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:242
+#: ../addressbook/libebook/e-contact.c:245
 msgid "Photo"
 msgstr "àààààà"
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Logo"
 msgstr "ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:245
+#: ../addressbook/libebook/e-contact.c:248
 msgid "Name"
 msgstr "àààà"
 
-#: ../addressbook/libebook/e-contact.c:246
+#: ../addressbook/libebook/e-contact.c:249
 msgid "Email List"
 msgstr "à-àààààà àààààà"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:252
 msgid "AIM Screen Name List"
 msgstr "AIM ààà ààààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:250
-#| msgid "GroupWise Id List"
+#: ../addressbook/libebook/e-contact.c:253
 msgid "GroupWise ID List"
 msgstr "àààààààà ID àààààà"
 
-#: ../addressbook/libebook/e-contact.c:251
-#| msgid "Jabber Id List"
+#: ../addressbook/libebook/e-contact.c:254
 msgid "Jabber ID List"
 msgstr "àààààà Id àààààà"
 
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:255
 msgid "Yahoo! Screen Name List"
 msgstr "àààà! ààà ààààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:253
+#: ../addressbook/libebook/e-contact.c:256
 msgid "MSN Screen Name List"
 msgstr "MSN  ààà ààààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:254
-#| msgid "ICQ Id List"
+#: ../addressbook/libebook/e-contact.c:257
 msgid "ICQ ID List"
 msgstr "ICQ ID àààààà"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:259
 msgid "Wants HTML Mail"
 msgstr "HTML ààààà ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:258
+#: ../addressbook/libebook/e-contact.c:261
 msgid "List"
 msgstr "àààààà"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:262
 msgid "List Show Addresses"
 msgstr "àààààà àààà àààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:261
+#: ../addressbook/libebook/e-contact.c:264
 msgid "Birth Date"
 msgstr "ààààààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:262
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
+#: ../addressbook/libebook/e-contact.c:265
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c: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
-#| msgid "Gadu-Gadu Home Id 1"
+#: ../addressbook/libebook/e-contact.c:270
 msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu ààààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:268
-#| msgid "Gadu-Gadu Home Id 2"
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu ààààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:269
-#| msgid "Gadu-Gadu Home Id 3"
+#: ../addressbook/libebook/e-contact.c:272
 msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu ààààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:270
-#| msgid "Gadu-Gadu Work Id 1"
+#: ../addressbook/libebook/e-contact.c:273
 msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu ààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:271
-#| msgid "Gadu-Gadu Work Id 2"
+#: ../addressbook/libebook/e-contact.c:274
 msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu ààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:272
-#| msgid "Gadu-Gadu Work Id 3"
+#: ../addressbook/libebook/e-contact.c:275
 msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu ààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:273
-#| msgid "Gadu-Gadu Id List"
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Gadu-Gadu ID List"
 msgstr "Gadu-Gadu ID àààààà"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:279
 msgid "Geographic Information"
 msgstr "ààààààà ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Telephone"
 msgstr "ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Home Name 1"
 msgstr "Skype ààààà àààà 1"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Home Name 2"
 msgstr "Skype ààààà àààà 2"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Home Name 3"
 msgstr "Skype ààààà àààà 3"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Work Name 1"
 msgstr "Skype ààà àààà 1"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:287
 msgid "Skype Work Name 2"
 msgstr "Skype ààà àààà 2"
 
-#: ../addressbook/libebook/e-contact.c:285
+#: ../addressbook/libebook/e-contact.c:288
 msgid "Skype Work Name 3"
 msgstr "Skype ààà àààà 3"
 
-#: ../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 "%s: Invalid source."
-msgid "Invalid source"
-msgstr "ààààààà àààààààà"
+#| msgid "Cannot create folder '%s': %s"
+msgid "Cannot change value of book property '%s'"
+msgstr "ààààààà àààààà '%s' ààààà ààààààà ààààààààà"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:463
+#: ../camel/camel-db.c:470
+#, c-format
+msgid "Insufficient memory"
+msgstr "ààààààà àààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:173
-#: ../calendar/libedata-cal/e-data-cal.c:110
+#. 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 "àààààà ID ààààààà àààààààààààà"
-
-#: ../addressbook/libedata-book/e-data-book.c:178
-#: ../calendar/libedata-cal/e-data-cal.c:117
-#| msgid "Authentication failed"
+#: ../addressbook/libedata-book/e-data-book.c: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 "TLS àààààààààà àààà"
 
-#: ../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 "àààà àààààààà ààààààà àààààààààààà"
+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 "àààà àààà ààààààà àààààààààààà"
+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
+#. 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 "Cannot open mailbox: %s: %s\n"
-msgid "Cannot open book: %s"
-msgstr "ààààààà ààààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:347
-#, c-format
-#| msgid "Cannot open mailbox: %s: %s\n"
-msgid "Cannot remove book: %s"
-msgstr "ààààààà ààààààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:364
-#: ../addressbook/libedata-book/e-data-book.c:383
-#, c-format
-#| msgid "Cannot get folder container %s"
-msgid "Cannot get contact: %s"
-msgstr "àààààà àààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:402
-#, c-format
-msgid "Empty query: %s"
-msgstr "àààà àààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:418
-#, c-format
-#| msgid "Cannot get folder container %s"
-msgid "Cannot get contact list: %s"
-msgstr "ààààà àààààà àààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:457
-#, c-format
-#| msgid "Cannot authenticate to server: %s"
-msgid "Cannot authenticate user: %s"
-msgstr "ààààààààààààà ààààààààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:472
-#: ../addressbook/libedata-book/e-data-book.c:491
-#, c-format
-#| msgid "Cannot get folder container %s"
-msgid "Cannot add contact: %s"
-msgstr "àààààà ààààà àààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:513
-#: ../addressbook/libedata-book/e-data-book.c:532
-#, c-format
-#| msgid "Cannot get folder container %s"
-msgid "Cannot modify contact: %s"
-msgstr "àààààà àààààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:571
-#, c-format
-#| msgid "Cannot get folder container %s"
-msgid "Cannot remove contacts: %s"
-msgstr "àààààààà ààààààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:610
-#, c-format
-#| msgid "Cannot get message %s: %s"
-msgid "Cannot get supported fields: %s"
-msgstr "àààààààààààààà àààààààààààà àààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:625
-#, c-format
-#| msgid "Cannot get message %s: %s"
-msgid "Cannot get required fields: %s"
-msgstr "ààààààà àààààààààààà àààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:640
-#, c-format
-#| msgid "Unsupported authentication method"
-msgid "Cannot get supported authentication methods: %s"
-msgstr "àààààààààààààà ààààààà ààààààààà ààààààà ààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:666
-#: ../addressbook/libedata-book/e-data-book.c:677
-#, c-format
-#| msgid "Invalid query"
-msgid "Invalid query: %s"
-msgstr "ààààààà àààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:713
-#, c-format
-#| msgid "Cannot get message %s: %s"
-msgid "Cannot get changes: %s"
-msgstr "ààààààààà àààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:755
-#, c-format
-#| msgid "Operation failed: %s"
-msgid "Cancel operation failed: %s"
-msgstr "ààààààààà ààààààà ààààààààà: %s"
+msgid "Empty URI"
+msgstr " àààà URI"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:521
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:518
 #, c-format
 msgid "Server is unreachable (%s)"
-msgstr "àààààà ààààààààààààà (%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 "ààààààà HTTP àààààà àààà %d  (%s) ààààààààà"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2090
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2495
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c: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"
+"ààààààà ààààààààààààà, ààààààààâ àààààààà-ààààààà àààààààà ààààààààààààà.\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 "àààààààààà àààà/ààààà ààààààààààààààààààà"
+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 "àààààààààà àààààààà ààààààà: àààààààà URI."
+msgstr "ààààààààâ àààààààà ààààààà: àààààààà URI."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:258
-#: ../calendar/backends/file/e-cal-backend-file.c:264
+#: ../calendar/backends/file/e-cal-backend-file.c:248
+#: ../calendar/backends/file/e-cal-backend-file.c:254
 msgid "Cannot save calendar data"
-msgstr "àààààààààà àààààà ààààààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
-#: ../camel/providers/groupwise/camel-groupwise-folder.c: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 "àààààààà àààààààààààààààààààà àààààà àààààààààààààààààà"
+msgstr "ààààààààâ àààààààààà ààààààà"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:423
+#: ../calendar/backends/http/e-cal-backend-http.c:405
 msgid "Redirected to Invalid URI"
 msgstr "àààààààààà URI àà àààààààààààààà"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:456
+#: ../calendar/backends/http/e-cal-backend-http.c: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 "àààààààààà àààà."
+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 (user %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 "ààààààààâ ID ààààààà àààààààààààà"
+
+#: ../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 "1st"
 
-#: ../calendar/libecal/e-cal-recur.c:3980
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "2nd"
 msgstr "2nd"
 
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "3rd"
 msgstr "3rd"
 
-#: ../calendar/libecal/e-cal-recur.c:3982
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "4th"
 msgstr "4th"
 
-#: ../calendar/libecal/e-cal-recur.c:3983
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "5th"
 msgstr "5th"
 
-#: ../calendar/libecal/e-cal-recur.c:3984
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "6th"
 msgstr "6th"
 
-#: ../calendar/libecal/e-cal-recur.c:3985
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "7th"
 msgstr "7th"
 
-#: ../calendar/libecal/e-cal-recur.c:3986
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "8th"
 msgstr "8th"
 
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "9th"
 msgstr "9th"
 
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "10th"
 msgstr "10th"
 
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "11th"
 msgstr "11th"
 
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "12th"
 msgstr "12th"
 
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "13th"
 msgstr "13th"
 
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "14th"
 msgstr "14th"
 
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "15th"
 msgstr "15th"
 
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "16th"
 msgstr "16th"
 
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "17th"
 msgstr "17th"
 
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "18th"
 msgstr "18th"
 
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "19th"
 msgstr "19th"
 
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "20th"
 msgstr "20th"
 
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "21st"
 msgstr "21st"
 
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "22nd"
 msgstr "22nd"
 
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "23rd"
 msgstr "23rd"
 
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "24th"
 msgstr "24th"
 
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "25th"
 msgstr "25th"
 
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "26th"
 msgstr "26th"
 
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "27th"
 msgstr "27th"
 
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "28th"
 msgstr "2th"
 
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "29th"
 msgstr "29th"
 
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "30th"
 msgstr "30th"
 
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4017
 msgid "31st"
 msgstr "31st"
 
-#: ../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 "àààààààà"
+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 "àààààààà"
+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 "ààààààààààààààà"
+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 (user %s) ààààà àààààààààààà ààààààààààààààà"
+#: ../calendar/libedata-cal/e-cal-backend.c:34
+#| msgid "Cannot remove calendar object: %s"
+msgid "Cannot process, calendar backend is opening"
+msgstr "àààààààà ààààààà, àààààààà ààààààà ààààààààààààà"
 
-#.
-#. This password prompt will be prompted rarely. Since the key that is passed to
-#. the auth_func corresponds to the parent user.
-#.
-#: ../calendar/libecal/e-cal.c:1250
+#: ../calendar/libedata-cal/e-cal-backend.c:207
 #, c-format
-msgid "Enter password for %s to enable proxy for user %s"
-msgstr "%s àààààààààààààààà àààààààààààà ààààà %s  àààààààààààà ààààààààààààààà"
-
-#: ../calendar/libecal/e-cal.c:4148
-msgid "Backend is busy"
-msgstr "àààààààààà ààààààà àààà"
-
-#: ../calendar/libecal/e-cal.c:4150
-msgid "Repository is offline"
-msgstr "àààààààààààààà àààâààààâàà àààà"
-
-#: ../calendar/libecal/e-cal.c:4152
-msgid "No such calendar"
-msgstr "à àààààààààà àààà"
-
-#: ../calendar/libecal/e-cal.c:4154 ../calendar/libedata-cal/e-data-cal.c:114
-#: ../servers/groupwise/e-gw-connection.c:235
-msgid "Object not found"
-msgstr "ààààààààà àààààààà"
-
-#: ../calendar/libecal/e-cal.c:4156 ../calendar/libedata-cal/e-data-cal.c:115
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid object"
-msgstr "àààààààààà ààààààààà"
-
-#: ../calendar/libecal/e-cal.c:4158
-msgid "URI not loaded"
-msgstr "URI àààààààààà"
-
-#: ../calendar/libecal/e-cal.c:4160
-msgid "URI already loaded"
-msgstr "URI ààààààààààà àààààààààà"
-
-#: ../calendar/libecal/e-cal.c:4164 ../servers/groupwise/e-gw-connection.c:237
-msgid "Unknown User"
-msgstr "ààààààà ààààààààààà"
-
-#: ../calendar/libecal/e-cal.c:4166 ../calendar/libedata-cal/e-data-cal.c:116
-msgid "Object ID already exists"
-msgstr "àààààààà ID ààààààà àààààààààààà"
-
-#: ../calendar/libecal/e-cal.c:4168
-msgid "Protocol not supported"
-msgstr "àààààààààà ààààà àààààà àààà"
-
-#: ../calendar/libecal/e-cal.c:4170
-msgid "Operation has been canceled"
-msgstr "ààààààà àààààààààààààààà"
-
-#: ../calendar/libecal/e-cal.c:4172
-msgid "Could not cancel operation"
-msgstr "àààààààààà àààààà"
+#| msgid "Unknown error: %s"
+msgid "Unknown calendar property '%s'"
+msgstr "ààààààà àààààààà àààààà '%s'"
 
-#: ../calendar/libecal/e-cal.c:4174
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1311
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1329
-#: ../camel/providers/groupwise/camel-groupwise-store.c:635
-#: ../camel/providers/groupwise/camel-groupwise-store.c:817
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:87
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#: ../calendar/libedata-cal/e-cal-backend.c:219
 #, 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 ààààààà ààààààààà"
-
-#: ../calendar/libecal/e-cal.c:4182
-msgid "No error"
-msgstr "ààààà àààà"
+#| msgid "Cannot create calendar object: %s"
+msgid "Cannot change value of calendar property '%s'"
+msgstr "àààààààà àààààà '%s' ààààà ààààààà ààààààààà"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:695
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:804
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1025
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1052
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c: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\" à ààààààààà ààààààààà àààààààààààààà"
@@ -1379,7 +1442,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\" àà ààààààààà àààààààààà ààààààààààààà"
@@ -1387,7 +1450,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\" àààààà ààààà ààààààààà àààààààà ààààààààààààà"
@@ -1395,13 +1458,14 @@ msgstr "\"%s\" àààààà ààààà ààààààààà 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
-msgstr "\"%s\" àààà/ààà àààààà ISO 8601 àà ààààà ààààààààà àààààààà ààààààààààààà"
+msgstr ""
+"\"%s\" àààà/ààà àààààà ISO 8601 àà ààààà ààààààààà àààààààà ààààààààààààà"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c: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\" ààààà ààààààààà ààààààààà ààààààààààààà"
@@ -1410,9 +1474,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 àà àààààààààà"
@@ -1423,298 +1487,222 @@ 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 "
 "\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
 "\"classification\""
 msgstr ""
-"\"%s\" ààààà àààààààààààà \"ààààà\" àààà, \"ààààààààà\" àààà, \"ààààà\" àààà, \"ààààààà\" àààà, "
+"\"%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\" ààààà ààààààààààààà àààààààààààâàà àààà àààà ààààà àààààààààààà ààààààà ààààààààà (#f) àààà "
+"\"%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 create folder: %s: %s"
-msgid "Cannot retrieve calendar address: %s"
-msgstr "àààààààààà àààààààààà àààààààààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:635
-#, c-format
-#| msgid "Cannot save calendar data: Malformed URI."
-msgid "Cannot retrieve calendar alarm e-mail address: %s"
-msgstr "àààààààààà àààààà à-àààààà àààààààààà àààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:660
-#, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot retrieve calendar's LDAP attribute: %s"
-msgstr "àààààààààà ààààà LDAP àààààààààà àààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:685
-#, c-format
-#| msgid "Cannot create CMS Recipient information"
-msgid "Cannot retrieve calendar scheduling information: %s"
-msgstr "àààààààààà àààààààà ààààààààààà àààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:709
-#, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot open calendar: %s"
-msgstr "àààààààààààà ààààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:730
-#, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot refresh calendar: %s"
-msgstr "àààààààààààà ààààààààààà ààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:749
+msgstr "ààààààààààààà àààààà"
+
+#. 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
+#| msgid "Could not retrieve attachment list: %s"
+msgid "Could not retrieve attachment uris: "
+msgstr "àààààààà uriààà ààààààààààààà ààààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1255
+#| msgid "Could not store folder: %s"
+msgid "Could not discard reminder: "
+msgstr "ààààààà àààààààààà àààààààààààààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1279
+#| msgid "Could not retrieve calendar time zone: %s"
+msgid "Could not get calendar view path: "
+msgstr "ààààààààâ ààààà ààààâàà ààààààà ààààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1304
+#| msgid "Could not retrieve calendar time zone: %s"
+msgid "Could not retrieve calendar time zone: "
+msgstr "ààààààààâ ààà àààààààààààà ààààààààààààà ààààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1326
+#| msgid "Could not add calendar time zone: %s"
+msgid "Could not add calendar time zone: "
+msgstr "ààààààààâ ààà àààààààà àààààààà ààààààà: "
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:383
+#, c-format
+#| msgid "Invalid range"
+msgid "Invalid call"
+msgstr "ààààààà àààà"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:424
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot remove calendar: %s"
-msgstr "ààààààààààâàà ààààààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:770
-#, c-format
-#| msgid "Cannot create message: %s"
-msgid "Cannot create calendar object: %s"
-msgstr "àààààààààà àààààààààà àààààààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:798
-#, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot modify calendar object: %s"
-msgstr "àààààààààà àààààààààà àààààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:824
-#, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot remove calendar object: %s"
-msgstr "àààààààààà àààààààààà ààààààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:845
-#, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot receive calendar objects: %s"
-msgstr "àààààààààà ààààààààààà ààààààààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:864
-#, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot discard calendar alarm: %s"
-msgstr "àààààààààà ààààààâàà ààààààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:885
-#, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot send calendar objects: %s"
-msgstr "àààààààààà ààààààààààà ààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:912
-#, c-format
-msgid "Cannot retrieve default calendar object path: %s"
-msgstr "ààààààà àààààààààà àààààààà ààààààààà ààààààà ààààààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:937
-#, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot retrieve calendar object path: %s"
-msgstr "àààààààààà àààààààà ààààâàà àààààààààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:962
-#, c-format
-#| msgid "Cannot create folder lock on %s: %s"
-msgid "Cannot retrieve calendar object list: %s"
-msgstr "àààààààààà àààààààà àààààààà àààààààààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:990
-#, c-format
-#| msgid "Could not remove cache entry: %s: %s"
-msgid "Could not retrieve attachment list: %s"
-msgstr "àààààààà àààààààà ààààààààààààà ààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1016
-#, c-format
-#| msgid "Could not open cache directory: %s"
-msgid "Could not complete calendar query: %s"
-msgstr "àààààààààà ààààààà àààààààààààà ààààààà:%s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1041
-#, c-format
-#| msgid "Could not rename folder: %s"
-msgid "Could not retrieve calendar time zone: %s"
-msgstr "àààààààààà ààà àààààààààààà ààààààààààààà ààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1066
-#, c-format
-#| msgid "Could not rename folder: %s"
-msgid "Could not add calendar time zone: %s"
-msgstr "àààààààààà ààà àààààààà àààààààà ààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1085
-#, c-format
-#| msgid "Could not send message: %s"
-msgid "Could not set default calendar time zone: %s"
-msgstr "ààààààà àààààààààà ààà àààààààààààà àààààààà ààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1108
-#, c-format
-#| msgid "Cannot create folder: %s: %s"
-msgid "Cannot retrieve calendar changes: %s"
-msgstr "àààààààààà ààààààààà ààààààààààààà ààààààà: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1139
-#, c-format
-msgid "Cannot retrieve calendar free/busy list: %s"
-msgstr "àààààààààà àààà/ààààà àààààààà ààààààà ààààààààààà: %s"
-
-#: ../calendar/libedata-cal/e-data-cal-factory.c:374
-#, c-format
-#| msgid "Invalid server URI"
 msgid "Invalid URI"
 msgstr "ààààààà URI"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:392
+#: ../calendar/libedata-cal/e-data-cal-factory.c:442
 #, c-format
 msgid "No backend factory for '%s' of '%s'"
 msgstr "'%2$s' ààààà '%1$s' ààààà àà ààààààààà ààààààààààà"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:442
+#: ../calendar/libedata-cal/e-data-cal-factory.c:485
 #, c-format
-#| msgid "Could not create cache file"
 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 ""
@@ -1742,124 +1730,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"
+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 "àààààà '%s' ààà àààà ààààààà àààààààààààà"
+
+#: ../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
+#, 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
@@ -1880,83 +1914,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 "Scanning for changed messages in %s"
-msgid "Learning new spam message in '%s'"
-msgid_plural "Learning new spam messages in '%s'"
-msgstr[0] "'%s' ààààà ààààà àààààà ààààààààà ààààààààààààààààà"
-msgstr[1] "%s àà ààààààààà ààààààààà àààààààààààààààà"
-
-#: ../camel/camel-folder.c:244
-#, c-format
-#| msgid "Scanning for changed messages in %s"
-msgid "Learning new ham message in '%s'"
-msgid_plural "Learning new ham messages in '%s'"
-msgstr[0] "'%s' ààààà ààààà àààà ààààààààà ààààààààààààààààà"
-msgstr[1] "%s àà ààààààààà ààààààààà àààààààààààààààà"
-
-#: ../camel/camel-folder.c:270
-#, c-format
-#| msgid "Filtering new message(s)"
-msgid "Filtering new message in '%s'"
-msgid_plural "Filtering new messages in '%s'"
-msgstr[0] "'%s' ààààà ààààà àààààààà ààààààààààààà"
-msgstr[1] "'%s' ààààà ààààà ààààààààà ààààààààààààà"
-
-#: ../camel/camel-folder.c:881
-#: ../camel/providers/local/camel-maildir-folder.c:293
-msgid "Moving messages"
-msgstr "ààààààààà àààààààààà ààààààààààà"
-
-#: ../camel/camel-folder.c:884
-msgid "Copying messages"
-msgstr "ààààààààà àààà ààààààààààà"
-
-#: ../camel/camel-folder.c:3253
-#, c-format
-#| msgid "Retrieving POP message %d"
-msgid "Retrieving message '%s'"
-msgstr "%s ààààààààà àààààààààààààààààà"
-
-#: ../camel/camel-gpg-context.c:646 ../camel/camel-gpg-context.c:651
-#: ../camel/camel-gpg-context.c:1276
+#: ../camel/camel-gpg-context.c:642 ../camel/camel-gpg-context.c:647
+#: ../camel/camel-gpg-context.c:1272
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "%s gpg ààààààààààààààà ààààààààà:"
 
-#: ../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"
@@ -1967,17 +1966,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 "gpg àààààààààààID àààà àààààà  ààààààà ààààà"
+msgstr "gpg àààààààID àààà àààààà  ààààààà ààààà"
 
-#: ../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 "gpg àààààààà àààààààààà àààààà ààààààà ààààà."
 
-#: ../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"
@@ -1986,139 +1985,136 @@ 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"
 "user: \"%s\""
 msgstr ""
 "àààà àààààààà ààààà àààà àààâàààà ààààààà\n"
-"àààààààààààààààà: \"%s\""
+"àààààààààààà: \"%s\""
 
-#: ../camel/camel-gpg-context.c:803
+#: ../camel/camel-gpg-context.c:799
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "'%s' ààààà GnuPG ààààà ààààààà àààà"
 
-#: ../camel/camel-gpg-context.c:832 ../camel/camel-net-utils.c:515
+#: ../camel/camel-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 "ààààà àààà àààâàààà ààààààà ààààààààà: 3 ààààààà àààààààààà àààààààààà."
+msgstr ""
+"ààààà àààà àààâàààà ààààààà ààààààààà: 3 ààààààà àààààààààà àààààààààà."
 
-#: ../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 "ààààààààààà ààààààà ààààààààà: à ààààààà ààààààààààààà ààààààààààà."
 
-#: ../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 "àààààà àààààà àààààààààààààà:"
+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 "àààààààààààààà àààààà ààààààààààààà ààààààà: "
+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
+#: ../camel/camel-http-stream.c:546 ../camel/camel-stream-null.c:78
+msgid "Only reset to beginning is supported with CamelHttpStream"
+msgstr "CamelHttpStream àà àààààààààààà àààààààààààà ààààààà àààààààààààààààà"
+
+#: ../camel/camel-lock.c:102
 #, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "ààààààà ààààà àààà àà àààààààààààà: %s"
+msgid "Could not create lock file for %s: %s"
+msgstr "àààà àààà àà %s ààààà àààààààààààààààààà: %s"
 
-#: ../camel/camel-lock-client.c:130
+#: ../camel/camel-lock.c:145
 #, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "ààààààà àààààààà ààààààààààààà: %s"
+msgid "Timed out trying to get lock file on %s.  Try again later."
+msgstr ""
+"%s ààà àààà àààà àààààààà àààààààààààààà ààààààààààààà. àààààà ààààààààààààà."
 
-#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
+#: ../camel/camel-lock.c:205
 #, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "'%s' àà àààà ààààààààààààà: àààà-àààààà àà ààààà àààà"
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "fcntl(2) ààààààààà àààà àààààààà ààààààààà: %s"
 
-#: ../camel/camel-lock-client.c:227
+#: ../camel/camel-lock.c:272
 #, c-format
-msgid "Could not lock '%s'"
-msgstr "'%s' àà àààà ààààààààààààà"
+msgid "Failed to get lock using flock(2): %s"
+msgstr "flock(2) ààààààààà àààà àààààààà ààààààààà: %s"
 
-#: ../camel/camel-lock.c:102
+#: ../camel/camel-lock-client.c:106
 #, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "àààà àààà àà %s ààààà àààààààààààààààààà: %s"
+msgid "Cannot build locking helper pipe: %s"
+msgstr "ààààààà ààààà àààà àà àààààààààààà: %s"
 
-#: ../camel/camel-lock.c:145
+#: ../camel/camel-lock-client.c:130
 #, 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 ààà àààà àààà àààààààà àààààààààààààà ààààààààààààà. àààààà ààààààààààààà."
+msgid "Cannot fork locking helper: %s"
+msgstr "ààààààà àààààààà ààààààààààààà: %s"
 
-#: ../camel/camel-lock.c:205
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
 #, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "fcntl(2) ààààààààà àààà àààààààà ààààààààà: %s"
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "'%s' àà àààà ààààààààààààà: àààà-àààààà àà ààààà àààà"
 
-#: ../camel/camel-lock.c:272
+#: ../camel/camel-lock-client.c:227
 #, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "flock(2) ààààààààà àààà àààààààà ààààààààà: %s"
+msgid "Could not lock '%s'"
+msgstr "'%s' àà àààà ààààààààààààà"
 
 #: ../camel/camel-movemail.c:105
 #, c-format
@@ -2174,23 +2170,35 @@ msgstr "%s ààààà ààààààààà àààà àààà
 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 "ààà ààà àà ààààààààà"
+
+#: ../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"
@@ -2218,7 +2226,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' ààààààààà ààààààààà àààààààà ààààà ààààààààà"
@@ -2236,22 +2244,22 @@ msgstr "à-ààààà àààààà àààààààà àà
 msgid "For reading mail as a query of another set of folders"
 msgstr "àààà ààààà ààààà àààààà ààààà ààààààà àààààà àà ààààààààààà"
 
-#: ../camel/camel-provider.c:188
+#: ../camel/camel-provider.c:192
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "%s àà àààààààààààààà: à àààààààâàààà ààààààà àààààà ààààààààààà."
 
-#: ../camel/camel-provider.c:197
+#: ../camel/camel-provider.c:201
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s: %s àààààààààààààà:"
 
-#: ../camel/camel-provider.c:206
+#: ../camel/camel-provider.c:210
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s àà àààààààààààààà: ààààà àààà à ààààààààà àààà àààà."
 
-#: ../camel/camel-provider.c:388 ../camel/camel-session.c:206
+#: ../camel/camel-provider.c:391 ../camel/camel-session.c:351
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "'%s' àààààààààà ààààà à àààààààà àààààààààà àààà"
@@ -2267,7 +2275,7 @@ msgstr "àààààààà àààààà ààààààààà
 #: ../camel/camel-sasl-anonymous.c:70
 #, c-format
 msgid "Authentication failed."
-msgstr "ààààààààààààààà ààààààààà."
+msgstr "ààààààààààà ààààààààà."
 
 #: ../camel/camel-sasl-anonymous.c:81
 #, c-format
@@ -2296,354 +2304,366 @@ 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."
 msgstr ""
-"à ààààààà ààààààà DIGEST-MD5 àààààààà àààààààààà ààààààà ààààààààààààààààààà, ààààà ààààà "
-"àààààààààààà."
+"à ààààààà ààààààà 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 "ààààà ààààààà àààà ààààà (>2048 octets"
 
-#: ../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 "ààààà ààààààà ààààààà \"ààààà ààààà àààààà\" àààààà ààààààààà"
 
-#: ../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 "ààààà ààààààààààà ààààààà àààààà ààààààààà"
+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 "ààààà ààààààààààà àààààààààà ààààààà àààààà ààààààààà"
+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 "à ààààààà àààààà ààààààààà 5 ààààààààà ààààààààà ààààààààààààààààààà."
 
-#: ../camel/camel-sasl-gssapi.c:128
+#: ../camel/camel-sasl-gssapi.c:129
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
-msgstr "àààààààà àààààààààà ààààààààà ààààààààà ààààààààààà, àààà àààààààààààà àààààà àààààààààààààààà."
+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."
-msgstr "àààààààà target_name àààààààà ààààààà àààà ààààààààà ààààà ààààààà ààààààààà."
+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_token àààààààà ààààààààààà ààààààà input_chan_bindings àààààààà àààààà ààààààààààààààà "
+"input_token àààààààà ààààààààààà ààààààà input_chan_bindings àààààààà àààààà "
+"ààààààààààààààà "
 "ààààààààààà."
 
-#: ../camel/camel-sasl-gssapi.c:145
+#: ../camel/camel-sasl-gssapi.c:146
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
-msgstr "input_token ààààààà ààààààààà ààààààààà, àààà àààààààààà àààààààà ààààà àà ààààààààà."
+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 "àààààààà àààààà ààààààà àààà ààààààààà ààààààààààààààà."
 
-#: ../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 "àààààààà ààà àààààààà àààààààà ààààààààà ààààààààà."
 
-#: ../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 "ààààà ààààà àààà ààààààààààà àààààà"
+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 "àààààààààà àààààààà ààààààààà à àààààààààààà ààààààà àààààààààààààààà."
+msgstr "àààààààààà àààààààà ààààààààà à àààààààààààà ààààààà àààààààààààààààà."
 
-#: ../camel/camel-sasl-login.c:95
+#: ../camel/camel-sasl-login.c:92
 #, c-format
 msgid "Unknown authentication state."
-msgstr "ààààààà ààààààààààà àààààà."
+msgstr "ààààààà ààààààà àààààà."
 
-#: ../camel/camel-sasl-ntlm.c:41
+#: ../camel/camel-sasl-ntlm.c:42
 msgid "NTLM / SPA"
 msgstr "NTLM/SPA"
 
-#: ../camel/camel-sasl-ntlm.c:43
+#: ../camel/camel-sasl-ntlm.c:44
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
-msgstr "à ààààààà ààààààà-àààààà ààààààà NTLM / àààààà ààààààà ààààààà àààààààààà àààààààààààààààà."
+msgstr ""
+"à ààààààà ààààààà-àààààà ààààààà NTLM / àààààà ààààààà ààààààà àààààààààà "
+"àààààààààààààààà."
 
-#: ../camel/camel-sasl-plain.c:43
+#: ../camel/camel-sasl-plain.c:39
 msgid "PLAIN"
 msgstr "àààààà"
 
-#: ../camel/camel-sasl-popb4smtp.c:46
+#: ../camel/camel-sasl-popb4smtp.c:42
 msgid "POP before SMTP"
 msgstr "POP ààààà SMPT"
 
-#: ../camel/camel-sasl-popb4smtp.c:48
+#: ../camel/camel-sasl-popb4smtp.c:44
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "à ààààààà POP ààààààààààà SMTP àà àààààààà àààààà àààààààààààààà"
 
-#: ../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 ààààà  URI"
 
-#: ../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
+#: ../camel/camel-sasl-popb4smtp.c:104 ../camel/camel-sasl-popb4smtp.c:114
 #, c-format
-#| msgid "POP Before SMTP auth using a non-pop source"
-msgid "POP Before SMTP authentication using a non-POP source"
-msgstr "àààà-àààà àààààà ààààààààà SMTP ààààà POP ààààààà"
+#| msgid "POP Before SMTP authentication using a non-POP source"
+msgid "POP Before SMTP authentication attempted with a %s service"
+msgstr "%s ààààà POP àààààà SMTP ààààààà àààààààààààààà"
 
 #: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "%s: %s ààààààààààà àààààààààà ààààààààààààà:"
 
-#: ../camel/camel-service.c:89
+#: ../camel/camel-service.c: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
+#: ../camel/camel-session.c:361
 #, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"ààààà %s àà àààààààààààààààààà:\n"
-"%s"
+#| msgid "No provider available for protocol '%s'"
+msgid "Invalid GType registered for protocol '%s'"
+msgstr "'%s' àààààààààà ààààà ààààààà GType àààààààà"
 
-#: ../camel/camel-session.c:757
+#: ../camel/camel-session.c: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 "àà àà ààà àààààààààà àààààààààààà"
 
-#: ../camel/camel-smime-context.c:381
+#: ../camel/camel-smime-context.c:377
 msgid "Cannot create CMS signed data"
 msgstr "àà àà ààà  âààààà ààààà àààààààààààà àààààààààààà"
 
-#: ../camel/camel-smime-context.c:387
+#: ../camel/camel-smime-context.c:383
 msgid "Cannot attach CMS signed data"
 msgstr "àà àà ààà  âààààà ààààà ààààààààààààààààààààààà"
 
-#: ../camel/camel-smime-context.c:394
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS data"
 msgstr "àà àà ààà  àààààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:400
+#: ../camel/camel-smime-context.c:396
 msgid "Cannot create CMS Signer information"
 msgstr "àà àà ààà ààààà àààààààà ààààààààààà àààààààààààà"
 
-#: ../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 "àà àà ààà ààààà ààààà àààààààà ààààààààà"
 
-#: ../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 "SMIMEEnc ààà àààààààà àààààààà ààààààààà"
 
-#: ../camel/camel-smime-context.c:463
+#: ../camel/camel-smime-context.c:459
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "MS SMIMEEnc ààà àààààààà àààààààà ààààààààà"
 
-#: ../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 "àà àà ààà ààààà àààààààà àààààààààààààààààààà"
 
 #. 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 "ààààà ààààààààààà ààààààààààà"
+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 "ààààà àààà à àààààààààà àààààààà"
+msgstr "ààààà àààà à àààààààààà àààààààààààà"
 
-#: ../camel/camel-smime-context.c:573
+#: ../camel/camel-smime-context.c:571
 msgid "Digests missing from enveloped data"
-msgstr "àààààààààà àààààààâàà ààààààààà ààààààààààààààà"
+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 "ààààààà ààààà àà àààààà ààààààà, ààààààà ààààààà ààààààà ààààààààà ààààà ààààààààààààààà"
+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 "àààààà àààààààààà àààààààààààà"
 
@@ -2651,88 +2671,121 @@ msgstr "àààààà àààààààààà ààààààà
 msgid "Failed to add data to CMS encoder"
 msgstr "àà àà ààà àààààààà àààààààààà àààààààààààà ààààààààà"
 
-#: ../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 "àà àà ààà àààààààààà àààààààààààà"
 
-#: ../camel/camel-smime-context.c:1081
+#: ../camel/camel-smime-context.c:1083
 msgid "Cannot create CMS Enveloped data"
 msgstr "àà àà ààà àààààààààààà àààààààààààà"
 
-#: ../camel/camel-smime-context.c:1087
+#: ../camel/camel-smime-context.c:1089
 msgid "Cannot attach CMS Enveloped data"
-msgstr "CMS àààààààâàà àààààà àààààààààààààà"
+msgstr "CMS àààààààâàà àààààààààà àààààààààààààà"
 
-#: ../camel/camel-smime-context.c:1093
+#: ../camel/camel-smime-context.c:1095
 msgid "Cannot attach CMS data object"
-msgstr "CMS àààààà ààààààààààààà ààààààààà"
+msgstr "CMS àààààà àààààààààà ààààààààà"
 
-#: ../camel/camel-smime-context.c:1102
+#: ../camel/camel-smime-context.c:1104
 msgid "Cannot create CMS Recipient information"
 msgstr "àà àà ààà  ààààà àààààà ààààààààààà ààààààà"
 
-#: ../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
+#, c-format
+#| msgid "Syncing folders"
+msgid "Opening folder '%s'"
+msgstr "ààààà '%s' ààààààààààà"
+
+#: ../camel/camel-store.c:2044
+#, 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
+#, c-format
+#| msgid "Cannot get folder '%s': %s"
+msgid "Creating folder '%s'"
+msgstr "'%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 ""
+"CamelStreamFilter àà àààààààààààà àààààààààààà ààààààà àààààààààààààààà"
+
+#: ../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"
@@ -2750,7 +2803,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 "àààààà ààààààà àààààà ààààààààà ààààààà: code 0x%x"
 
@@ -2771,7 +2823,6 @@ msgid "Host is unreachable from SOCKS server"
 msgstr "SOCKS àààààààààà àààààà ààààààààààà àààà"
 
 #: ../camel/camel-tcp-stream-raw.c:895
-#| msgid "Connection canceled"
 msgid "Connection refused"
 msgstr "ààààààààà ààààààààààààààà"
 
@@ -2780,17 +2831,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 ààààà ààààà ààààààà ààààà"
 
@@ -2801,7 +2849,6 @@ msgstr "SOCKS àààààààààà ààààààà àààà
 
 #: ../camel/camel-tcp-stream-raw.c:950
 #, c-format
-#| msgid "Invalid response from server"
 msgid "Incomplete reply from SOCKS server"
 msgstr "SOCKS ààààà ààààà àààààààà ààààààààààààà"
 
@@ -2814,11 +2861,10 @@ msgstr "àààààààààà ààà àààààààààà
 #. 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"
@@ -2831,16 +2877,16 @@ msgstr ""
 "ààààààààà:       %s\n"
 "ààààà:         %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:463
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "GOOD"
 msgstr "àààà"
 
-#: ../camel/camel-tcp-stream-ssl.c:463
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "BAD"
 msgstr "àààà"
 
 #. 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"
@@ -2855,7 +2901,7 @@ msgstr ""
 "\n"
 "àààà ààààààààààààà àààààààààààààà?"
 
-#: ../camel/camel-tcp-stream-ssl.c:511
+#: ../camel/camel-tcp-stream-ssl.c:507
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2864,7 +2910,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"
@@ -2873,7 +2919,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"
@@ -2882,7 +2928,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"
@@ -2891,38 +2937,39 @@ msgstr ""
 "àààààààààààà ààààààààà àààààà àààààààààààà: %s\n"
 "àààààààààà: %s"
 
-#: ../camel/camel-url.c:314
+#: ../camel/camel-url.c:330
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "URL '%s'àà àààààà ààààààà"
 
-#: ../camel/camel-vee-folder.c:1251 ../camel/camel-vee-folder.c:1414
+#: ../camel/camel-vee-folder.c: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: ààààà ààààà àààà"
@@ -2935,276 +2982,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"
-msgid "Cannot append message in offline mode: cache unavailable"
-msgstr "àààâàààà àààààààà ààààààààà àààààààà: àààààà àààààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:335
-#| msgid "Cannot append message in offline mode: %s"
-msgid "Cannot append message in offline mode: "
-msgstr "àààâàààà àààààààà ààààààààà àààààààà: "
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
-msgid "Checking for new mail"
-msgstr "ààààà ààààà ààààà àààààààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
-#: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
-msgid "C_heck for new messages in all folders"
-msgstr "ààààà àààààààà ààààà ààààààà ààààà ààààà àààààà(_h)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imapx/camel-imapx-provider.c:72
-#: ../camel/providers/local/camel-local-provider.c:42
-#: ../camel/providers/local/camel-local-provider.c:82
-#: ../camel/providers/local/camel-local-provider.c:102
-msgid "Options"
-msgstr "àààààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
-msgid "_Apply filters to new messages in Inbox on this server"
-msgstr "à ààààààà ààààà ààààààà ààààà ààààààà àààààààààà (_A)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
-msgid "Check new messages for J_unk contents"
-msgstr "ààààààà àààààà ààààà ààààà ààààààààà àààààààààààà(_u)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imapx/camel-imapx-provider.c:78
-msgid "Only check for Junk messages in the IN_BOX folder"
-msgstr "ààààààà àààààààà ààààà IN_BOX ààààààà ààààààà àààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
-msgid "Automatically synchroni_ze account locally"
-msgstr "àààààààààààà àààà àààààààààà àààààà ààààààààààà(_z)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
-msgid "SOAP Settings"
-msgstr "SOAP ààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
-msgid "Post Office Agent SOAP _Port:"
-msgstr "ààààà ààààààààà ààààààà SOAP àààààà (_P):"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
-msgid "Novell GroupWise"
-msgstr "àààààà àààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
-msgid "For accessing Novell GroupWise servers"
-msgstr "Novell àààààààà àààààààà ààààààààààà"
-
-#: ../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 "ààààààààààà àààààààààà ààààààààà à ààààààà àààààààà ààààààà ààààààààààààààààààà."
-
-#: ../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 "àààààààà àààààààà àààààààààà ààààààà àààààààààààà."
-
-#: ../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 "àààààààà ààààà '%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 "%s ààààààààààààà ààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1389
-#, c-format
-msgid "GroupWise service for %s on %s"
-msgstr "%s àà %s ààààààààààààà ààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:51
-#, c-format
-msgid "GroupWise mail delivery via %s"
-msgstr "%s àààààà ààààààààààààà ààààà àààààààà"
-
-#: ../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"
@@ -3213,27 +3008,27 @@ msgstr ""
 "ààààà àààààààààà àààààààà %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:468
+#: ../camel/providers/imap/camel-imap-command.c:471
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "ààààà àààààààààà ààààààà àààààà: %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 "%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 "%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 "%s ààààà ààààà ààààà ààààààà OK àààààà:"
@@ -3242,58 +3037,70 @@ msgstr "%s ààààà ààààà ààààà ààààààà
 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 "ààààààà ID %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 àààààà "
 
-#: ../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 "àààààà ààààààààààààààà ààààààààààà ààààààààà ààààààààààààà. "
 
 #: ../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 "àààààà ààààààààààà ààààààààààààààà: "
 
@@ -3304,13 +3111,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 àààààààà ààààààààààààà: "
 
@@ -3319,6 +3124,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"
@@ -3335,7 +3145,6 @@ msgid "_Use custom command to connect to server"
 msgstr "ààààààà àààà ààààà ààààààààà àààààà(_U)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:52
-#| msgid "Command:"
 msgid "Co_mmand:"
 msgstr "ààààà (_m):"
 
@@ -3356,114 +3165,136 @@ msgid "O_verride server-supplied folder namespace"
 msgstr "ààààà-àààààà àààà ààààâàààààà àà ààààààààààààà(_v)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:62
-#| msgid "Namespace:"
 msgid "Names_pace:"
 msgstr "ààààâàààààà (_p):"
 
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imapx/camel-imapx-provider.c:72
+#: ../camel/providers/local/camel-local-provider.c:42
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:105
+msgid "Options"
+msgstr "àààààààààààààà"
+
 #: ../camel/providers/imap/camel-imap-provider.c:66
 #: ../camel/providers/imapx/camel-imapx-provider.c:74
-msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "à ààààà àà INBOX àààà ààààà ààààààààà àààààààà àààààààààà(_A)"
+msgid "_Apply filters to new messages in Inbox on this server"
+msgstr "à ààààààà ààààà ààààààà ààààà ààààààà àààààààààà (_A)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:68
 #: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "Check new messages for Jun_k contents"
 msgstr "ààààà ààààààààà ààààààà àààààà ààààà àààààààààààà(_k)"
 
+#: ../camel/providers/imap/camel-imap-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:78
+msgid "Only check for Junk messages in the IN_BOX folder"
+msgstr "ààààààà àààààààà ààààà IN_BOX ààààààà ààààààà àààààààààààà"
+
 #: ../camel/providers/imap/camel-imap-provider.c:72
 #: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "ààààà ààààààà àààààààààà ààààààààà ààààààààààààààààà(_z)"
 
+#: ../camel/providers/imap/camel-imap-provider.c:78
+msgid "IMAP default port"
+msgstr "IMAP ààààààà àààààà"
+
 #: ../camel/providers/imap/camel-imap-provider.c:79
+#: ../camel/providers/imapx/camel-imapx-provider.c:87
+#| msgid "IMAP server %s"
+msgid "IMAP over SSL"
+msgstr "SSL àààà IMAP"
+
+#: ../camel/providers/imap/camel-imap-provider.c:85
 msgid "IMAP"
-msgstr "ààààà"
+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 "ààààà àààààààà àààààààà àààààààà ààààà àààààààààààà."
 
-#: ../camel/providers/imap/camel-imap-provider.c:99
-#: ../camel/providers/imapx/camel-imapx-provider.c:106
-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-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-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 "ààà ààà àà ààààààààà"
+#: ../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: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 "ààààà ààààààà àààààààààààààà ààààààààà %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 "ààà ààà àà ààààààààààààààààà àààààààààààààà"
+#: ../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 "ààà ààà àà à ààààààà ààààààààà"
 
-#: ../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 "ààààà ààààà %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 "ààààà ààààà %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"
@@ -3474,72 +3305,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 "%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 ààààà ààà"
 
-#. 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 load summary for %s"
 msgid "Could not create folder summary for %s"
 msgstr "%s ààààà ààààà ààààààààààà àààààààààààààààààà"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:82
+#: ../camel/providers/imapx/camel-imapx-folder.c:96
 #, c-format
-#| msgid "Could not create cache file"
 msgid "Could not create cache for %s: "
 msgstr "%s ààààà àààààààà ààààààààààà ààààààà: "
 
@@ -3563,40 +3393,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 "ààààà+"
 
-#: ../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 "Failed to authenticate.\n"
 msgid "Not authenticated"
 msgstr "ààààààààààààà"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2865
-#, c-format
-#| msgid "Could not connect to %s (port %s): %s"
-msgid "Could not connect to %s (port %s): "
-msgstr "%s (port %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"
@@ -3608,35 +3432,31 @@ 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"
-#| "  %s"
 msgid ""
 "Cannot get message %s from folder %s\n"
 "%s"
@@ -3656,166 +3476,169 @@ msgstr "MH-ààààààààà ààààà àààààààà"
 msgid "For storing local mail in MH-like mail directories."
 msgstr "MH-àààà ààààà ààààààààà ààààààà ààààààà ààààààà."
 
-#: ../camel/providers/local/camel-local-provider.c:69
+#: ../camel/providers/local/camel-local-provider.c:70
 msgid "Local delivery"
 msgstr "ààààààà àààààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:70
+#: ../camel/providers/local/camel-local-provider.c:71
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
 msgstr ""
-"ààààààààààâàà ààààààààààààààààà àààààààààà ààààààààà mbox-ààààààà àààààààà ààààà ààààààà ààààààâàà "
+"ààààààààààâàà ààààààààààààààààà àààààààààà ààààààààà mbox-ààààààà àààààààà "
+"ààààà ààààààà ààààààâàà "
 "àààààà (ààààààààà) ààààà."
 
-#: ../camel/providers/local/camel-local-provider.c:84
-#: ../camel/providers/local/camel-local-provider.c:103
+#: ../camel/providers/local/camel-local-provider.c:86
+#: ../camel/providers/local/camel-local-provider.c:107
 msgid "_Apply filters to new messages in INBOX"
 msgstr "àààâàààààà àààà ààààà ààààààà ààààà ààààààà àààààààà(_A)"
 
-#: ../camel/providers/local/camel-local-provider.c:91
+#: ../camel/providers/local/camel-local-provider.c:93
 msgid "Maildir-format mail directories"
 msgstr "Maildir-format àààààà ààààààà"
 
-#: ../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."
 msgstr ""
-"ààààààà àààààà àà ààààààà àààààààà mbox àààààà àààààààààà àààààààààààà ààààà àààààààà.\n"
+"ààààààà àààààà àà ààààààà àààààààà mbox àààààà àààààààààà àààààààààààà ààààà "
+"àààààààà.\n"
 "Elm, Pine, àààà Mutt àààà àààààà ààààà àààààà àààààààà ààààààààààààà."
 
-#: ../camel/providers/local/camel-local-provider.c:122
+#: ../camel/providers/local/camel-local-provider.c:127
 msgid "Standard Unix mbox spool directory"
 msgstr "ààààààààà àààààààà  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 append message to maildir folder: %s: %s"
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "àààààààà àààà ààààààà àààààààààààà: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:100
 #, c-format
-#| msgid "Cannot create folder: %s: folder exists"
 msgid "Cannot create folder: %s : Folder name cannot contain a dot"
 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' ààààààààà àààààààà: ààààà ààààààààà."
@@ -3827,7 +3650,7 @@ msgstr "'%s' ààààààààà àààààààà: maildir à
 
 #: ../camel/providers/local/camel-maildir-store.c:293
 #: ../camel/providers/local/camel-maildir-store.c:333
-#: ../camel/providers/local/camel-mh-store.c:584
+#: ../camel/providers/local/camel-mh-store.c:649
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "'%s' ààààààààà àààààààààà ààààààà: %s"
@@ -3836,51 +3659,48 @@ msgstr "'%s' ààààààààà àààààààààà àà
 msgid "not a maildir directory"
 msgstr "ààààà àààààà àààà"
 
-#: ../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: ààààà àààà ààààààà ààààààààààààà"
 
-#: ../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: "
 
@@ -3889,39 +3709,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"
@@ -3930,156 +3750,146 @@ 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 àààà àààààà ààààààà ààààà"
 
-#: ../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 àààà ààààààà, àààààà àààààà ààààààààààà. (From àààààààà àààààààààààà, ààààà àààààà àààààààà.)"
+msgstr ""
+"MBOX àààà ààààààà, àààààà àààààà ààààààààààà. (From àààààààà àààààààààààà, "
+"ààààà àààààà àààààààà.)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:895
-#: ../camel/providers/local/camel-mbox-summary.c:1140
+#: ../camel/providers/local/camel-mbox-summary.c: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 àààààà àààà àààà àààààà"
@@ -4089,7 +3899,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"
@@ -4098,12 +3908,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"
@@ -4112,37 +3922,45 @@ 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 "àààâàààààààà ààààà ààààààààà"
 
-#: ../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
 #, c-format
-#| msgid "Could not sync temporary folder %s: %s"
 msgid "Could not synchronize temporary folder %s: %s"
 msgstr "ààààààààà ààààà %s àà àààààâààààààààààààà: %s"
 
 #: ../camel/providers/local/camel-spool-summary.c:211
 #, c-format
-#| msgid "Could not sync spool folder %s: %s"
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "àààààà ààààà %s àà àààààâààààààààààààà: %s"
 
@@ -4150,9 +3968,6 @@ msgstr "àààààà ààààà %s àà àààààâààà
 #: ../camel/providers/local/camel-spool-summary.c:262
 #: ../camel/providers/local/camel-spool-summary.c:275
 #, c-format
-#| msgid ""
-#| "Could not sync spool folder %s: %s\n"
-#| "Folder may be corrupt, copy saved in '%s'"
 msgid ""
 "Could not synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in '%s'"
@@ -4160,84 +3975,102 @@ 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 "NNTP ààààà ààààà ààààààààà àààà ààààà!"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr "àààààààà ààààà àààààààààààà àààààà (e.g. c.o.linux àààà àààààà comp.os.linux)(_S)"
+msgid ""
+"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr ""
+"àààààààà ààààà àààààààààààà àààààà (e.g. c.o.linux àààà àààààà comp.os."
+"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 àààààà àààààààààà àààààà ààààà ààààà àààààààààà ààààà àààààààààààà."
+msgstr ""
+"USENET àààààà àààààààààà àààààà ààààà ààààà àààààààààà ààààà àààààààààààà."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
+#: ../camel/providers/nntp/camel-nntp-provider.c:82
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
-msgstr "à ààààààà ààààààààààà àààààààààà ààààààààààà NNTP ààààààà àààààààààààààààààà."
+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"
@@ -4247,7 +4080,7 @@ msgstr "NNTP ààààà %s ààà àààà %d àà ààààà
 msgid "USENET News via %s"
 msgstr "%s USENET àààààà àààààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1045
+#: ../camel/providers/nntp/camel-nntp-store.c:1053
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4258,7 +4091,23 @@ 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 "ààààààààààààààà àààà àààààà àààààààààààà: àààààà àààààààà àààà."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1162
+#, c-format
+msgid "You cannot rename a folder in a News store."
+msgstr "àààààà ààààààààà ààààààààà àààààààààà ààààààà."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1185
+#, c-format
+msgid "You cannot remove a folder in a News store: unsubscribe instead."
+msgstr ""
+"àààà ààààààààà àààààà ààààààààà ààààààààààà: ààààààà ààààààààààààààààà."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1329
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4269,7 +4118,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"
@@ -4280,87 +4129,72 @@ msgstr ""
 "\n"
 "ààààààààààà àààà!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1235
-#, c-format
-msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr "ààààààààààààààà àààà àààààà àààààààààààà: àààààà àààààààà àààà."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1251
-#, c-format
-msgid "You cannot rename a folder in a News store."
-msgstr "àààààà ààààààààà ààààààààà àààààààààà ààààààà."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1268
-#, c-format
-msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr "àààà ààààààààà àààààà ààààààààà ààààààààààà: ààààààà ààààààààààààààààà."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1479
-#| msgid "NNTP Command failed: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c: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"
-msgstr "àààààààààà ààààààààààààà"
+#| msgid "Message storage"
+msgid "Message Storage"
+msgstr "àààààà ààààà"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
@@ -4380,130 +4214,139 @@ 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 ààààààà à ààààààà ààààààààààààààààààà. àààà POP ààààààààà "
+"ààààààààààà àààààààààà ààààààààà POP ààààààà à ààààààà ààààààààààààààààààà. "
+"àààà POP ààààààààà "
 "àààààààààààà ààààààà ààà ààààààà."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:85
+#: ../camel/providers/pop3/camel-pop3-provider.c:93
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
-"à ààààààà APOP ààààà àààààà ààààààààààààà àààààààà àààààààààà POP ààààààà ààààààààààààààààààà. ààà "
+"à ààààààà APOP ààààà àààààà ààààààààààààà àààààààà àààààààààà POP ààààààà "
+"ààààààààààààààààààà. ààà "
 "ààààà àààààààààààààà àààààààààààààà àààààà àààààààààààààà àààààààààààà."
 
 #. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:98
+#: ../camel/providers/pop3/camel-pop3-store.c:83
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:181
+#: ../camel/providers/pop3/camel-pop3-store.c:130
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "POP ààààà %s ààààà àààà ààààààààà àààààààà ààààààààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/pop3/camel-pop3-store.c:230
-#: ../camel/providers/pop3/camel-pop3-store.c:237
+#: ../camel/providers/pop3/camel-pop3-store.c:150
+#: ../camel/providers/pop3/camel-pop3-store.c:189
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "POP ààààà %s àà àààààààààà àààà ààààààààààààààà ààààààààà: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:200
+#: ../camel/providers/pop3/camel-pop3-store.c:151
 msgid "STLS not supported by server"
 msgstr "STLS ààààà àààààà ààààààààààààààà"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:218
+#: ../camel/providers/pop3/camel-pop3-store.c:169
 #, c-format
-#| msgid "Failed to connect to POP server %s in secure mode: %s"
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr "POP ààààà %s àà àààààààààà %s àààà ààààààààààààààà ààààààààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:231
-msgid "TLS negotiations failed"
-msgstr "àààààààà ààààààààààààààààà àààààààààààààà"
+#: ../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 "
 "mechanism."
-msgstr "POP ààààà %s àà ààààààààààààààààààààààà: ààààààààà ààààààà àààààààààà à àààààààààà."
+msgstr ""
+"POP ààààà %s àà ààààààààààààààààààààààà: ààààààààà ààààààà àààààààààà à "
+"àààààààààà."
 
 #. 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"
 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 "
 "attack suspected. Please contact your admin."
 msgstr ""
-"POP ààààà %s àà àààààààààààààà ààààààà:\tààààààà APOP ID ààààààààààààààà. à àààààà àààà "
+"POP ààààà %s àà àààààààààààààà ààààààà:\tààààààà APOP ID ààààààààààààààà. à "
+"àààààà àààà "
 "ààààààààààààààà. àà àààààààààààààààà àààààààààààà."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:492
+#: ../camel/providers/pop3/camel-pop3-store.c:427
 #, c-format
+#| msgid ""
+#| "Unable to connect to POP server %s.\n"
+#| "Error sending password: %s"
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending password: %s"
+"Error sending password: "
 msgstr ""
 "POP ààààà %s àà ààààààààààààààààààààààà.\n"
-"àààààààà ààààààà àààà: %s"
+"àààààààà ààààààà àààà: "
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:505
+#: ../camel/providers/pop3/camel-pop3-store.c:437
 #, c-format
-#| msgid ""
-#| "Unable to connect to POP server %s.\n"
-#| "Error sending username: %s"
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending username%s"
 msgstr ""
 "POP ààààà %s àà àààààààààààààààà ààààààà.\n"
-"ààààààààààààààà ààààààà àààà %s"
+"ààààààààààà ààààààà àààà %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"
-#| "Error sending password: %s"
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password%s"
@@ -4511,29 +4354,27 @@ msgstr ""
 "POP ààààà %s àà ààààààààààààààààààààààà.\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 àààààààà àààààààà àààà ààààààààà ààààààààà"
@@ -4546,7 +4387,9 @@ msgstr "ààààààâàààà"
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
-msgstr "àààààà àààààààààà àààààà \"ààààààâàààà\" àààààààààà àààààà ààààààà ààààààà àààà àààààà."
+msgstr ""
+"àààààà àààààààààà àààààà \"ààààààâàààà\" àààààààààà àààààà ààààààà ààààààà "
+"àààà àààààà."
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:49
 msgid "sendmail"
@@ -4572,7 +4415,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 "àààààààààà àààààà ààààààà: "
 
@@ -4591,50 +4433,67 @@ msgstr "%s àà ààààààààààààààà: ààààà
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "ààààààâàààà àààààà %d àà ààààààààààààà: àààààà ààààààà."
 
+#: ../camel/providers/smtp/camel-smtp-provider.c:42
+msgid "Default SMTP port"
+msgstr "ààààààà SMTP àààààà"
+
 #: ../camel/providers/smtp/camel-smtp-provider.c:43
+#| msgid "SMTP server %s"
+msgid "SMTP over SSL"
+msgstr "SSL àààà SMTP"
+
+#: ../camel/providers/smtp/camel-smtp-provider.c:44
+msgid "Message submission port"
+msgstr "àààààà àààààààà àààààà"
+
+#: ../camel/providers/smtp/camel-smtp-provider.c:50
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:45
+#: ../camel/providers/smtp/camel-smtp-provider.c:52
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr "àààààà àààààààà ààààà 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 "àààààà àààààà SMTP ààààà %s àà ààààààààà ààààààà ààààà: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:246
-#: ../camel/providers/smtp/camel-smtp-transport.c:259
-#: ../camel/providers/smtp/camel-smtp-transport.c:266
-#| msgid "STARTTLS command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/smtp/camel-smtp-transport.c:220
 msgid "STARTTLS command failed: "
 msgstr "STARTTLS ààààà ààààààààà: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:357
+#: ../camel/providers/smtp/camel-smtp-transport.c:230
+#, c-format
+#| msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgid "Failed to connect to SMTP server %s in secure mode: "
+msgstr "àààààà àààààà  SMTP ààààà %s àà ààààààààà ààààààà ààààààààà: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c: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 "SMTP àààààà %s àààààà àààààààà"
 
-#: ../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 "SMTP ààààà %s ààààààààà ààààààà ààà %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"
@@ -4645,336 +4504,321 @@ 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> àà ààààààààààà"
+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 "àààààààààààà àààààà àààà ààààààààààà: àààààààààà àààààààààààààà"
 
-#: ../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 "àààààààààààà àààà àààààààààààààààà: ààààààààààààà àààà"
 
-#: ../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>"
+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 "àààààààààààà àààà àààààààààààà: ààààààà ààààààà ààààà"
 
-#: ../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 "àààààààààààà àààà àààààààààààà: ààààààààààààà àààà àààààààààààààà"
 
-#: ../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 "ààààààààà ààààààà àààààààààà àààààààààààà ààààààààà"
 
-#: ../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 ààààà ààààààààà: "
 
-#: ../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 ààààà ààààààààà: "
 
-#: ../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 TO ààààà ààààààààà: "
 
-#: ../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 "àà ààààààààààà"
+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
+#| msgid "URI not loaded"
+msgid "Source not loaded"
+msgstr "àààà àààààààà"
+
+#: ../libedataserver/e-client.c:115
+#| msgid "URI already loaded"
+msgid "Source already loaded"
+msgstr "àààà ààààààààà ààâààààà"
+
+#: ../libedataserver/e-client.c:123
+#| msgid "Offline mode unavailable"
+msgid "Offline unavailable"
+msgstr "àààâàààà àààààààààààààà"
+
+#: ../libedataserver/e-client.c:145
+#| msgid "parse error"
+msgid "D-Bus error"
+msgstr "D-Bus àààà"
+
 #. 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"
 
@@ -4982,7 +4826,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"
 
@@ -4990,7 +4834,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"
 
@@ -4998,78 +4842,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"
 
@@ -5077,224 +4921,455 @@ 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-selector.c:325
+msgid "Category"
+msgstr "àààààà"
+
+#: ../libedataserverui/e-category-completion.c:294
+#, c-format
+msgid "Create category \"%s\""
+msgstr "àààààà \"%s\"àà ààààààààààà"
 
-#: ../libedataserverui/e-categories-dialog.c:189
+#: ../libedataserverui/e-category-editor.c:132
 msgid "Category Icon"
 msgstr "àààààà àààààà"
 
-#: ../libedataserverui/e-categories-dialog.c:195
+#: ../libedataserverui/e-category-editor.c:136
 msgid "_No Image"
 msgstr "àààààààààà àààà (_N)"
 
-#: ../libedataserverui/e-categories-dialog.c:406
+#: ../libedataserverui/e-category-editor.c:173
+msgid "Category _Name"
+msgstr "àààààà àààà(_N)"
+
+#: ../libedataserverui/e-category-editor.c:181
+msgid "Category _Icon"
+msgstr "àààààà àààààà(_I)"
+
+#: ../libedataserverui/e-category-editor.c:221
+msgid "Category Properties"
+msgstr "àààààà àààààààà"
+
+#: ../libedataserverui/e-category-editor.c:282
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
-msgstr "ààààààààààà ààààà àààààààà àà àààààà '%s' àààà. àààààà àààà àààà ààààààààààà"
-
-#: ../libedataserverui/e-categories-dialog.c: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)"
+msgstr ""
+"ààààààààààà ààààà àààààààà àà àààààà '%s' àààà. àààààà àààà àààà ààààààààààà"
 
-#: ../libedataserverui/e-categories-dialog.c:769
-msgid "Icon"
-msgstr "àààààà"
+#: ../libedataserverui/e-client-utils.c:793
+#, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid ""
+"Enter password for %s (user %s)\n"
+"Reason: %s"
+msgstr ""
+"%s (ààààààà %s) ààààà àààààààà àààààààààààà\n"
+"ààààà: %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):"
+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 "àààà"
+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(_u)"
 
 #. 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 message %s: %s"
+#~ msgid "Cannot get changes: %s"
+#~ msgstr "ààààààààà àààààààà: %s"
+
+#~| msgid "Operation failed: %s"
+#~ msgid "Cancel operation failed: %s"
+#~ msgstr "ààààààààà ààààààà ààààààààà: %s"
+
+#~ msgid "Reply Requested: by "
+#~ msgstr "ààààààààààààà ààààààààà:"
+
+#~ msgid "Reply Requested: When convenient"
+#~ msgstr "ààààààààààààà ààààààààà: ààààààààààààààà"
+
+#~| msgid "Loading %s items"
+#~ msgid "Loading Appointment items"
+#~ msgstr "àààààà àààààààà àààààààààààà"
+
+#~| msgid "Loading %s items"
+#~ msgid "Loading Task items"
+#~ msgstr "ààààààà àààààààà àààààààààààà"
+
+#~| msgid "Loading %s items"
+#~ msgid "Loading Note items"
+#~ msgstr "àààà àààààààà àààààààààààà"
+
+#~| msgid "Loading %s items"
+#~ msgid "Loading items"
+#~ msgstr "àààààààà àààààààààààà"
+
+#~ msgid "Calendar"
+#~ msgstr "àààààààààà"
 
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "Invalid response from server"
-msgstr "àààààààààà ààààààà ààààààààààà"
+#~ msgid "Invalid server URI"
+#~ msgstr "ààààààà ààààà URI"
 
-#: ../servers/groupwise/e-gw-connection.c:233
-msgid "No response from the server"
-msgstr "àààààààààà à ààààààààààààààà"
+#~ msgid "Could not create thread for populating cache"
+#~ msgstr "àààààààà àààààààààààààààààààà àààààà àààààààààààààààààà"
 
-#: ../servers/groupwise/e-gw-connection.c:239
-msgid "Bad parameter"
-msgstr "ààààààà àààààààà"
+#~| msgid "Cannot save calendar data: Malformed URI."
+#~ msgid "Cannot retrieve calendar alarm e-mail address: %s"
+#~ msgstr "àààààààààà àààààà à-àààààà àààààààààà àààààààà: %s"
+
+#~| msgid "Cannot save calendar data"
+#~ msgid "Cannot retrieve calendar's LDAP attribute: %s"
+#~ msgstr "àààààààààà ààààà LDAP àààààààààà àààààààà: %s"
+
+#~| msgid "Cannot create CMS Recipient information"
+#~ msgid "Cannot retrieve calendar scheduling information: %s"
+#~ msgstr "àààààààààà àààààààà ààààààààààà àààààààà: %s"
+
+#~| msgid "Cannot save calendar data"
+#~ msgid "Cannot discard calendar alarm: %s"
+#~ msgstr "àààààààààà ààààààâàà ààààààààààà: %s"
+
+#~ msgid "Cannot retrieve default calendar object path: %s"
+#~ msgstr "ààààààà àààààààààà àààààààà ààààààààà ààààààà ààààààààààà: %s"
+
+#~| msgid "Could not open cache directory: %s"
+#~ msgid "Could not complete calendar query: %s"
+#~ msgstr "àààààààààà ààààààà àààààààààààà ààààààà:%s"
+
+#~| msgid "Could not send message: %s"
+#~ msgid "Could not set default calendar time zone: %s"
+#~ msgstr "ààààààà àààààààààà ààà àààààààààààà àààààààà ààààààà: %s"
+
+#~| msgid "Cannot create folder: %s: %s"
+#~ msgid "Cannot retrieve calendar changes: %s"
+#~ msgstr "àààààààààà ààààààààà ààààààààààààà ààààààà: %s"
+
+#~| msgid "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"
+#~ 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 "ààààà ààààààààà ààààààà SOAP àààààà (_P):"
+
+#~ msgid "Novell GroupWise"
+#~ msgstr "àààààà àààààààààà"
+
+#~ msgid "For accessing Novell GroupWise servers"
+#~ msgstr "Novell àààààààà àààààààà ààààààààààà"
+
+#~ msgid ""
+#~ "This option will connect to the GroupWise server using a plaintext "
+#~ "password."
+#~ msgstr "ààààààààààà àààààààààà ààààààààà à ààààààà àààààààà ààààààà ààààààààààààààààààà."
+
+#~ msgid "Host or user not available in url"
+#~ msgstr "ààààààà àààà ààààààààààà url àà ààààààààà"
+
+#~ msgid ""
+#~ "Some features may not work correctly with your current server version"
+#~ msgstr "àà àààààààà ààààà ààààààààà àààààà àààààààààà ààààà àààààààààààààààà"
+
+#~ msgid "Cannot create GroupWise folders in offline mode."
+#~ msgstr "àààààààà àààààààà àààààààààà ààààààà àààààààààààà."
+
+#~| msgid "Cannot delete folder '%s': Special folder"
+#~ msgid "Cannot create a special system folder"
+#~ msgstr "àààààààà ààààààà àààààâàà àààààààààààà"
+
+#~ msgid "Cannot rename GroupWise folder '%s' to '%s'"
+#~ msgstr "àààààààà ààààà '%s'àà '%s'àà àààààààààà ààààààà"
+
+#~ msgid "GroupWise server %s"
+#~ msgstr "%s ààààààààààààà ààààà"
+
+#~ msgid "GroupWise service for %s on %s"
+#~ msgstr "%s àà %s ààààààààààààà ààà"
+
+#~ msgid "GroupWise mail delivery via %s"
+#~ msgstr "%s àààààà ààààààààààààà ààààà àààààààà"
+
+#~ msgid "Sending Message"
+#~ msgstr "àààààààààà ààààààààààà"
+
+#~ msgid "Cannot get folder: Invalid operation on this store"
+#~ msgstr "ààààààààà àààààààààààà: ààààààààà àààààààààà àààààà"
+
+#~ msgid ""
+#~ "You have exceeded this account's storage limit. Your messages are queued "
+#~ "in your Outbox. Resend by pressing Send/Receive after deleting/archiving "
+#~ "some of your mail.\n"
+#~ msgstr ""
+#~ "àààà à ààààààààà ààààà ààààààààà ààààààààààà. àà ààààààààà àààààâàààààà àààààà ààààààà. àà àààààà àààà "
+#~ "ààààààààààà ààààààààà/àààààààààà àààà àààààà/àààààààààààà ààààààà àààààà àààààààààààà.\n"
+
+#~ msgid "Could not send message: %s"
+#~ msgstr "%s àààààààààà ààààààà:"
+
+#~ msgid "Operation cancelled"
+#~ msgstr "àààààà àààààààààààààà"
+
+#~ msgid "_Apply filters to new messages in INBOX on this server"
+#~ msgstr "à ààààà àà INBOX àààà ààààà ààààààààà àààààààà àààààààààà(_A)"
+
+#~ msgid "SSL negotiations failed"
+#~ msgstr "ààà ààà àà ààààààààààààààààà àààààààààààààà"
+
+#~| msgid "Could not connect to %s (port %s): %s"
+#~ msgid "Could not connect to %s (port %s): "
+#~ msgstr "%s (port %s)àà ààààààààà àààààààààààà: "
+
+#~ msgid "TLS negotiations failed"
+#~ msgstr "àààààààà ààààààààààààààààà àààààààààààààà"
+
+#~ msgid "_Edit"
+#~ msgstr "ààààààà(_E)"
+
+#~ msgid "Invalid connection"
+#~ msgstr "ààààààà ààààààààà"
+
+#~ msgid "Invalid response from server"
+#~ msgstr "àààààààààà ààààààà ààààààààààà"
+
+#~ msgid "No response from the server"
+#~ msgstr "àààààààààà à ààààààààààààààà"
+
+#~ msgid "Bad parameter"
+#~ msgstr "ààààààà àààààààà"
 
 #~ msgid "\"%s\" on book before \"%s\""
 #~ msgstr "\"%s\" àààààà ààààààààà \"%s\""
@@ -5326,9 +5401,6 @@ msgstr "ààààààà àààààààà"
 #~ msgid "Could not create thread for getting deltas"
 #~ msgstr "ààààààààà àààààààà àààààà ààààààààààà ààààààà"
 
-#~ msgid "Offline mode unavailable"
-#~ msgstr "àààâàààà àààà àààààààààààààà"
-
 #~ msgid "Verifying message"
 #~ msgstr "àààààààààà àààààààààààààààà"
 
@@ -5794,9 +5866,6 @@ msgstr "ààààààà àààààààà"
 #~ msgid "Enter password for %s"
 #~ msgstr "%s ààààà àààààààààààà àààààààààààààà"
 
-#~ msgid "Enter password"
-#~ msgstr "àààààààààààà àààààààààààààà"
-
 #~ msgid "Owner"
 #~ msgstr "ààààààààà"
 
@@ -5913,7 +5982,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]