[evolution-data-server] hindi update



commit e41c9f23cd43f84b9a93778f6fa507ce1166ed65
Author: Rajesh Ranjan <rranjan redhat com>
Date:   Wed Sep 14 14:47:09 2011 +0530

    hindi update

 po/hi.po | 6511 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 3635 insertions(+), 2876 deletions(-)
---
diff --git a/po/hi.po b/po/hi.po
index 96b75bf..85099ab 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -2,191 +2,264 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
-# Rajesh Ranjan <rranjan redhat com>, 2004, 2005, 2006, 2009.
+# Rajesh Ranjan <rranjan redhat com>, 2004, 2005, 2006, 2009, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server.HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-data-server&component=general\n";
-"POT-Creation-Date: 2009-02-25 12:08+0000\n"
-"PO-Revision-Date: 2009-03-12 17:08+0530\n"
-"Last-Translator: Rajesh Ranjan <rranjan redhat com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
+"POT-Creation-Date: 2011-09-03 11:37+0000\n"
+"PO-Revision-Date: 2011-09-14 14:41+0530\n"
+"Last-Translator: Rajesh <rranjan>\n"
 "Language-Team: Hindi <hindi.sf.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "\n"
 "\n"
 "\n"
 "\n"
-"X-Generator: KBabel 1.11.4\n"
+"\n"
+"X-Generator: Lokalize 1.2\n"
+"Language: hi\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:560
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2391
-#: ../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:563
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2322
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2344
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2389
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4288
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
+#: ../addressbook/backends/file/e-book-backend-file.c:826
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4708
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
 msgid "Searching..."
 msgstr "ààà ààà àà..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2759
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4452
-#, c-format
-msgid "Downloading contacts (%d)... "
-msgstr "àààààà ààààààà àà ààà àà (%d)... "
+#. Query for new contacts asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:788
+msgid "Querying for updated contactsâ"
+msgstr ""
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2908
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3093
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3137
-#, c-format
-msgid "Updating contacts cache (%d)... "
-msgstr "àààààà ààà àààààà àà ààà àà (%d)... "
+#: ../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:841
+#| msgid "Favorites"
+msgid "Friends"
+msgstr "ààààà"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:843
+#| msgid "Family Name"
+msgid "Family"
+msgstr "àààààà"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:845
+msgid "Coworkers"
+msgstr "ààààààà"
+
+#. Run the query asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:924
+msgid "Querying for updated groupsâ"
+msgstr ""
+
+#. 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:1433
+msgid "Deleting contactâ"
+msgstr ""
+
+#. 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:1892
+#| msgid "Loading..."
+msgid "Loadingâ"
+msgstr "ààà àà ààà àà..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:2047
+#, fuzzy
+#| msgid "Authentication required"
+msgid "Authenticating with the serverâ"
+msgstr "ààààààà àààààà"
+
+#. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
+#| msgid "Not connected."
+msgid "Not connected"
+msgstr "ààààààà àààà."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:751
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:776
 msgid "Using Distinguished Name (DN)"
 msgstr "ààààààà ààà àà ààààà àà ààà àà (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:754
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:779
 msgid "Using Email Address"
 msgstr "àààà ààà àà ààààà àà ààà àà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1019
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1048
 msgid "Reconnecting to LDAP server..."
 msgstr "LDAP ààààà àà àààà ààà àà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1617
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1173
+#| msgid "Invalid argument"
+msgid "Invalid DN syntax"
+msgstr "àààà DN ààààààààà"
+
+#: ../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:1752
+#: ../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:2064
+#: ../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:4148
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4559
 msgid "Receiving LDAP search results..."
 msgstr "LDAP ààà àààààà àà ààà àà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4310
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4729
 msgid "Error performing search"
 msgstr "ààààààà ààà àààààà"
 
-#. translators: the placeholders will be filled by
-#. * function names, e.g.
-#. * "e_book_add_contact" on book before
-#. * "e_book_open
-#: ../addressbook/libebook/e-book.c:288 ../addressbook/libebook/e-book.c:292
-#: ../addressbook/libebook/e-book.c:496 ../addressbook/libebook/e-book.c:500
-#: ../addressbook/libebook/e-book.c:639 ../addressbook/libebook/e-book.c:643
-#: ../addressbook/libebook/e-book.c:730 ../addressbook/libebook/e-book.c:734
-#: ../addressbook/libebook/e-book.c:1028 ../addressbook/libebook/e-book.c:1033
-#: ../addressbook/libebook/e-book.c:1211 ../addressbook/libebook/e-book.c:1215
-#: ../addressbook/libebook/e-book.c:1370 ../addressbook/libebook/e-book.c:1374
-#: ../addressbook/libebook/e-book.c:1575 ../addressbook/libebook/e-book.c:1579
-#: ../addressbook/libebook/e-book.c:1818 ../addressbook/libebook/e-book.c:1822
-#: ../addressbook/libebook/e-book.c:2055 ../addressbook/libebook/e-book.c:2059
-#: ../addressbook/libebook/e-book.c:2263 ../addressbook/libebook/e-book.c:2267
-#: ../addressbook/libebook/e-book.c:3454
-#, c-format
-msgid "\"%s\" on book before \"%s\""
-msgstr "\"%s\" àà \"%s\" àà àààà ààà"
-
-#: ../addressbook/libebook/e-book.c:301 ../addressbook/libebook/e-book.c:509
-#: ../addressbook/libebook/e-book.c:652 ../addressbook/libebook/e-book.c:743
-#: ../addressbook/libebook/e-book.c:1043 ../addressbook/libebook/e-book.c:1225
-#: ../addressbook/libebook/e-book.c:1384 ../addressbook/libebook/e-book.c:1588
-#: ../addressbook/libebook/e-book.c:1831 ../addressbook/libebook/e-book.c:2069
-#: ../addressbook/libebook/e-book.c:2276 ../addressbook/libebook/e-book.c:2685
-#: ../addressbook/libebook/e-book.c:2883
-#, c-format
-msgid "book busy"
-msgstr "àààààà àà ààà ààà ààààààà"
-
-#: ../addressbook/libebook/e-book.c:332 ../addressbook/libebook/e-book.c:336
-#: ../addressbook/libebook/e-book.c:540 ../addressbook/libebook/e-book.c:544
-#: ../addressbook/libebook/e-book.c:679 ../addressbook/libebook/e-book.c:683
-#: ../addressbook/libebook/e-book.c:770 ../addressbook/libebook/e-book.c:774
-#: ../addressbook/libebook/e-book.c:1070 ../addressbook/libebook/e-book.c:1073
-#: ../addressbook/libebook/e-book.c:1255 ../addressbook/libebook/e-book.c:1258
-#: ../addressbook/libebook/e-book.c:1411 ../addressbook/libebook/e-book.c:1415
-#: ../addressbook/libebook/e-book.c:1624 ../addressbook/libebook/e-book.c:1628
-#: ../addressbook/libebook/e-book.c:1878 ../addressbook/libebook/e-book.c:1882
-#: ../addressbook/libebook/e-book.c:2099 ../addressbook/libebook/e-book.c:2103
-#: ../addressbook/libebook/e-book.c:2302 ../addressbook/libebook/e-book.c:2306
-#: ../addressbook/libebook/e-book.c:2537 ../addressbook/libebook/e-book.c:2711
-#: ../addressbook/libebook/e-book.c:2715 ../addressbook/libebook/e-book.c:2909
-#: ../addressbook/libebook/e-book.c:2913 ../addressbook/libebook/e-book.c:3463
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4849
 #, c-format
-msgid "CORBA exception making \"%s\" call"
-msgstr "CORBA ààààà \"%s\" ààà àààààà"
+msgid "Downloading contacts (%d)... "
+msgstr "àààààà ààààààà àà ààà àà (%d)... "
 
-#: ../addressbook/libebook/e-book.c:2526
-#, c-format
-msgid "%s: there is no current operation"
-msgstr "%s: ààà àààààà àààààà àààà"
+#: ../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:2250
+#: ../camel/providers/smtp/camel-smtp-transport.c:439
+#: ../libedataserver/e-client.c:152
+msgid "Unknown error"
+msgstr "àààààà àààààà"
 
-#: ../addressbook/libebook/e-book.c:2555 ../addressbook/libebook/e-book.c:2600
-#: ../addressbook/libebook/e-book.c:2639
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:335
 #, c-format
-msgid "%s: could not cancel"
-msgstr "%s: àààà àààà àà ààà"
+msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgstr ""
 
-#: ../addressbook/libebook/e-book.c:2671 ../addressbook/libebook/e-book.c:2675
+#: ../addressbook/libebook/e-book.c:3158
 #, c-format
-msgid "\"%s\" on book after \"%s\""
-msgstr "\"%s\" àà \"%s\" ààà ààà àààà"
+#| msgid "%s: there was no source for uid `%s' stored in gconf."
+msgid "%s: there was no source for UID '%s' stored in GConf."
+msgstr "%s: ààà ààà àààààà UID `%s' àà àààà GConf ààà ààààààà àààà àà"
 
-#: ../addressbook/libebook/e-book.c:2739
-#, c-format
-msgid "%s: canceled"
-msgstr "%s: àààà"
+#: ../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:3318
-#, c-format
-msgid "%s: Invalid source."
-msgstr "%s: àààààà ààààà"
+#: ../addressbook/libebook/e-book.c:3592
+#: ../addressbook/libebook/e-book-client.c:635
+#: ../addressbook/libedata-book/e-data-book.c:310
+#| msgid "Folder '%s/%s' does not exist."
+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 "Object not found"
+msgid "Contact not found"
+msgstr "àààààà àààà àààà"
+
+#: ../addressbook/libebook/e-book-client.c:89
+#: ../addressbook/libedata-book/e-data-book.c:304
+#| msgid "Object ID already exists"
+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 "Namespace"
+msgid "No space"
+msgstr "ààà ààà ààààà àààà"
+
+#: ../addressbook/libebook/e-book-client.c:449
+#, fuzzy
+#| msgid "Failed to encode data"
+msgid "Failed to run book factory"
+msgstr "àààààà ààààà ààà àààà"
 
-#: ../addressbook/libebook/e-book.c:3326 ../addressbook/libebook/e-book.c:3392
+#: ../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 "%s: no factories available for URI `%s'"
-msgstr "%s: URI `%s' àà àààà ààà ààààààà àààààà àààà"
+#| msgid "%s: Invalid source."
+msgid "Invalid source"
+msgstr "àààààà ààààà"
 
-#: ../addressbook/libebook/e-book.c:3338
+#: ../addressbook/libebook/e-book-client.c:560
+#: ../calendar/libecal/e-cal-client.c:678
 #, c-format
-msgid "%s: Could not create EBookListener"
-msgstr "%s: EBookListener ààà àààà ààà"
+msgid "Incorrect uri '%s'"
+msgstr ""
 
-#: ../addressbook/libebook/e-book.c:3605
-#, c-format
-msgid "%s: there was no self contact UID stored in gconf"
-msgstr "%s: ààà ààà àààààà UID gconf ààà ààààààà àààà àà"
+#: ../addressbook/libebook/e-book-client.c:598
+#, fuzzy
+#| msgid "Failed on message %d"
+msgid "Failed to find system book"
+msgstr "%d ààààà àà àààà"
 
-#: ../addressbook/libebook/e-book.c:3738
-#, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
+#: ../addressbook/libebook/e-book-client.c:705
+#: ../calendar/libecal/e-cal-client.c:826
+#, fuzzy, 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 "%s: ààà ààà àààààà uid `%s' àà àààà gconf ààà ààààààà àààà àà"
 
+#: ../addressbook/libebook/e-book-client.c:2094
+#: ../calendar/libecal/e-cal-client.c:4132
+#, fuzzy
+#| msgid "Connection to Server"
+msgid "Cannot get connection to view"
+msgstr "ààààà àà ààààà"
+
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:113
+#: ../addressbook/libebook/e-contact.c:116
 msgid "Unique ID"
 msgstr "àààààààà ID"
 
-#: ../addressbook/libebook/e-contact.c:114
+#. 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:116
+#: ../addressbook/libebook/e-contact.c:121
 msgid "Book URI"
 msgstr "àààààà URI"
 
@@ -194,970 +267,1257 @@ msgstr "àààààà URI"
 #. 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:122
+#: ../addressbook/libebook/e-contact.c:127
 msgid "Full Name"
 msgstr "àààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook/e-contact.c:128
 msgid "Given Name"
 msgstr "àààà ààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:129
 msgid "Family Name"
 msgstr "àààààà àà ààà"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Nickname"
 msgstr "ààààà"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 1"
 msgstr "Email 1"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Email 2"
 msgstr "Email 2"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Email 3"
 msgstr "Email 3"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:136
 msgid "Email 4"
 msgstr "Email 4"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Mailer"
 msgstr "àààà"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:141
 msgid "Home Address Label"
 msgstr "àà ààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:142
 msgid "Work Address Label"
 msgstr "ààààà ààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Other Address Label"
 msgstr "àààà ààà àààà"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Assistant Phone"
 msgstr "ààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Business Phone"
 msgstr "ààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Business Phone 2"
 msgstr "ààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Business Fax"
 msgstr "ààààààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Callback Phone"
 msgstr "àààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Car Phone"
 msgstr "ààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Company Phone"
 msgstr "ààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Home Phone"
 msgstr "àààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Home Phone 2"
 msgstr "àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Home Fax"
 msgstr "ààààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:156
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Mobile Phone"
 msgstr "àààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Other Phone"
 msgstr "àààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Other Fax"
 msgstr "àààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Pager"
 msgstr "àààà"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:161
 msgid "Primary Phone"
 msgstr "ààààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:162
 msgid "Radio"
 msgstr "àààààà"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:163
 msgid "Telex"
 msgstr "ààààààà"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:165
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Organization"
 msgstr "ààààà"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Organizational Unit"
 msgstr "àààààààààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Office"
 msgstr "àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Title"
 msgstr "àààààà"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:172
 msgid "Role"
 msgstr "àààààà"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:173
 msgid "Manager"
 msgstr "ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Assistant"
 msgstr "ààààà"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:177
 msgid "Homepage URL"
 msgstr "àààààà URL"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Weblog URL"
 msgstr "ààààààà "
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:517
+#: ../addressbook/libebook/e-contact.c:181
+#: ../libedataserverui/e-categories-dialog.c:85
 msgid "Categories"
 msgstr "ààààààà"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Calendar URI"
 msgstr "àààààà URI"
 
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Free/Busy URL"
 msgstr "ààààà/àààààà URI"
 
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:186
 msgid "ICS Calendar"
 msgstr "ICS àààààà"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:187
 msgid "Video Conferencing URL"
 msgstr "àààààà ààààààà URL"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:190
 msgid "Spouse's Name"
 msgstr "ààà/ààààà àà àààà"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:191
 msgid "Note"
 msgstr "ààààààà"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:189
+#: ../addressbook/libebook/e-contact.c:194
 msgid "AIM Home Screen Name 1"
 msgstr "AIM ààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Home Screen Name 2"
 msgstr "AIM ààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Home Screen Name 3"
 msgstr "AIM ààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:197
 msgid "AIM Work Screen Name 1"
 msgstr "AIM ààààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:198
 msgid "AIM Work Screen Name 2"
 msgstr "AIM ààààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:199
 msgid "AIM Work Screen Name 3"
 msgstr "AIM ààààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:200
 msgid "GroupWise Home Screen Name 1"
 msgstr "àààà àààààà ààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Home Screen Name 2"
 msgstr "àààà àààààà ààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Home Screen Name 3"
 msgstr "àààà àààààà ààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:203
 msgid "GroupWise Work Screen Name 1"
 msgstr "àààà àààààà ààààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:204
 msgid "GroupWise Work Screen Name 2"
 msgstr "àààà àààààà ààààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:205
 msgid "GroupWise Work Screen Name 3"
 msgstr "àààà àààààà ààààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:201
-msgid "Jabber Home Id 1"
-msgstr "àààà ààà Id 1"
+#: ../addressbook/libebook/e-contact.c:206
+#| msgid "Jabber Home Id 1"
+msgid "Jabber Home ID 1"
+msgstr "àààà ààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:202
-msgid "Jabber Home Id 2"
-msgstr "àààà ààà Id 2"
+#: ../addressbook/libebook/e-contact.c:207
+#| msgid "Jabber Home Id 2"
+msgid "Jabber Home ID 2"
+msgstr "àààà ààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 3"
-msgstr "àààà ààà Id 3"
+#: ../addressbook/libebook/e-contact.c:208
+#| msgid "Jabber Home Id 3"
+msgid "Jabber Home ID 3"
+msgstr "àààà ààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Work Id 1"
-msgstr "àààà ààààà Id 1"
+#: ../addressbook/libebook/e-contact.c:209
+#| msgid "Jabber Work Id 1"
+msgid "Jabber Work ID 1"
+msgstr "àààà ààààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Work Id 2"
-msgstr "àààà ààààà Id 2"
+#: ../addressbook/libebook/e-contact.c:210
+#| msgid "Jabber Work Id 2"
+msgid "Jabber Work ID 2"
+msgstr "àààà ààààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 3"
-msgstr "àààà ààààà Id 3"
+#: ../addressbook/libebook/e-contact.c:211
+#| msgid "Jabber Work Id 3"
+msgid "Jabber Work ID 3"
+msgstr "àààà ààààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo! ààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo! ààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo! ààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:215
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo! ààààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:216
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo! ààààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo! ààààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:218
 msgid "MSN Home Screen Name 1"
 msgstr "MSN ààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Home Screen Name 2"
 msgstr "MSN ààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Home Screen Name 3"
 msgstr "MSN ààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:221
 msgid "MSN Work Screen Name 1"
 msgstr "MSN ààààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:222
 msgid "MSN Work Screen Name 2"
 msgstr "MSN ààààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:223
 msgid "MSN Work Screen Name 3"
 msgstr "MSN ààààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:219
-msgid "ICQ Home Id 1"
-msgstr "ICQ ààà Id 1"
+#: ../addressbook/libebook/e-contact.c:224
+#| msgid "ICQ Home Id 1"
+msgid "ICQ Home ID 1"
+msgstr "àààààààà ààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:220
-msgid "ICQ Home Id 2"
-msgstr "ICQ ààà Id 2"
+#: ../addressbook/libebook/e-contact.c:225
+#| msgid "ICQ Home Id 2"
+msgid "ICQ Home ID 2"
+msgstr "àààààààà ààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 3"
-msgstr "ICQ ààà Id 3"
+#: ../addressbook/libebook/e-contact.c:226
+#| msgid "ICQ Home Id 3"
+msgid "ICQ Home ID 3"
+msgstr "àààààààà ààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:222
-msgid "ICQ Work Id 1"
-msgstr "ICQ ààààà Id 1"
+#: ../addressbook/libebook/e-contact.c:227
+#| msgid "ICQ Work Id 1"
+msgid "ICQ Work ID 1"
+msgstr "àààààààà ààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:223
-msgid "ICQ Work Id 2"
-msgstr "ICQ ààààà Id 2"
+#: ../addressbook/libebook/e-contact.c:228
+#| msgid "ICQ Work Id 2"
+msgid "ICQ Work ID 2"
+msgstr "àààààààà ààààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:224
-msgid "ICQ Work Id 3"
-msgstr "ICQ ààààà Id 3"
+#: ../addressbook/libebook/e-contact.c:229
+#| msgid "ICQ Work Id 3"
+msgid "ICQ Work ID 3"
+msgstr "àààààààà ààààà ID 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:232
 msgid "Last Revision"
 msgstr "ààààà ààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Name or Org"
 msgstr "ààà àà ààààà"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook/e-contact.c:236
 msgid "Address List"
 msgstr "ààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:237
 msgid "Home Address"
 msgstr "àà àà ààà"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:238
 msgid "Work Address"
 msgstr "àààà àà ààà"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Other Address"
 msgstr "àààà ààà"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Category List"
 msgstr "àààààà àààà"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook/e-contact.c:245
 msgid "Photo"
 msgstr "àààà"
 
-#: ../addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Logo"
 msgstr "àààà"
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:248
 msgid "Name"
 msgstr "ààà"
 
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook/e-contact.c:249
 msgid "Email List"
 msgstr "àààà àààà"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook/e-contact.c:252
 msgid "AIM Screen Name List"
 msgstr "AIM ààààààà ààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:248
-msgid "GroupWise Id List"
-msgstr "àààà àààààà Id àààà"
+#: ../addressbook/libebook/e-contact.c:253
+#| msgid "GroupWise Id List"
+msgid "GroupWise ID List"
+msgstr "àààà àààààà ID àààà"
 
-#: ../addressbook/libebook/e-contact.c:249
-msgid "Jabber Id List"
-msgstr "àààà Id àààà"
+#: ../addressbook/libebook/e-contact.c:254
+#| msgid "Jabber Id List"
+msgid "Jabber ID List"
+msgstr "àààà ID àààà"
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:255
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo! ààààààà ààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:256
 msgid "MSN Screen Name List"
 msgstr "MSN ààààààà ààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:252
-msgid "ICQ Id List"
-msgstr "ICQ Id àààà"
+#: ../addressbook/libebook/e-contact.c:257
+#| msgid "ICQ Id List"
+msgid "ICQ ID List"
+msgstr "ICQ ID àààà"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:259
 msgid "Wants HTML Mail"
 msgstr "HTML ààà ààààà àà"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:261
 msgid "List"
 msgstr "àààà"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:262
 msgid "List Show Addresses"
 msgstr "ààààààà ààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:264
 msgid "Birth Date"
 msgstr "ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
-#: ../libedataserver/e-categories.c:43
+#: ../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:263
+#: ../addressbook/libebook/e-contact.c:268
 msgid "X.509 Certificate"
 msgstr "X.509 àààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:265
-msgid "Gadu-Gadu Home Id 1"
-msgstr "àààà-àààà ààà Id 1"
+#: ../addressbook/libebook/e-contact.c:270
+#| msgid "Gadu-Gadu Home Id 1"
+msgid "Gadu-Gadu Home ID 1"
+msgstr "àààà-àààà ààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:266
-msgid "Gadu-Gadu Home Id 2"
-msgstr "àààà-àààà ààà Id 2"
+#: ../addressbook/libebook/e-contact.c:271
+#| msgid "Gadu-Gadu Home Id 2"
+msgid "Gadu-Gadu Home ID 2"
+msgstr "àààà-àààà ààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 3"
-msgstr "àààà-àààà ààà Id 3"
+#: ../addressbook/libebook/e-contact.c:272
+#| msgid "Gadu-Gadu Home Id 3"
+msgid "Gadu-Gadu Home ID 3"
+msgstr "àààà-àààà ààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Work Id 1"
-msgstr "àààà-àààà ààààà Id 1"
+#: ../addressbook/libebook/e-contact.c:273
+#| msgid "Gadu-Gadu Work Id 1"
+msgid "Gadu-Gadu Work ID 1"
+msgstr "àààà-àààà ààààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Work Id 2"
-msgstr "àààà-àààà ààààà Id 2"
+#: ../addressbook/libebook/e-contact.c:274
+#| msgid "Gadu-Gadu Work Id 2"
+msgid "Gadu-Gadu Work ID 2"
+msgstr "àààà-àààà ààààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 3"
-msgstr "àààà-àààà ààààà Id 3"
+#: ../addressbook/libebook/e-contact.c:275
+#| msgid "Gadu-Gadu Work Id 3"
+msgid "Gadu-Gadu Work ID 3"
+msgstr "àààà-àààà ààààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Id List"
-msgstr "àààà-àààà Id àààà"
+#: ../addressbook/libebook/e-contact.c:276
+#| msgid "Gadu-Gadu Id List"
+msgid "Gadu-Gadu ID List"
+msgstr "àààà-àààà ID àààà"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:279
 msgid "Geographic Information"
 msgstr "ààààààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Telephone"
 msgstr "ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:278
-#| msgid "MSN Home Screen Name 1"
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Home Name 1"
 msgstr "àààààà ààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:279
-#| msgid "MSN Home Screen Name 2"
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Home Name 2"
 msgstr "àààààà ààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:280
-#| msgid "MSN Home Screen Name 3"
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Home Name 3"
 msgstr "àààààà ààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:281
-#| msgid "MSN Work Screen Name 1"
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Work Name 1"
 msgstr "àààààà ààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:282
-#| msgid "MSN Work Screen Name 2"
+#: ../addressbook/libebook/e-contact.c:287
 msgid "Skype Work Name 2"
 msgstr "àààààà ààààà ààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:283
-#| msgid "MSN Work Screen Name 3"
+#: ../addressbook/libebook/e-contact.c:288
 msgid "Skype Work Name 3"
 msgstr "àààààà ààààà ààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:284
-#| msgid "AIM Screen Name List"
+#: ../addressbook/libebook/e-contact.c:289
 msgid "Skype Name List"
 msgstr "àààààà ààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:286
-#| msgid "Home Address"
+#: ../addressbook/libebook/e-contact.c:291
 msgid "SIP address"
 msgstr "SIP ààà"
 
-#: ../addressbook/libebook/e-contact.c:1535
-#: ../addressbook/libebook/e-destination.c:761
+#: ../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 "àààààà àààà"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
-#: ../libedataserver/e-categories.c:44
-msgid "Birthday"
-msgstr "ààààààà"
+#: ../addressbook/libedata-book/e-book-backend.c:19
+msgid "Cannot process, book backend is opening"
+msgstr ""
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
-#, c-format
-msgid "Birthday: %s"
-msgstr "ààààààà: %s"
+#: ../addressbook/libedata-book/e-book-backend.c:92
+#, fuzzy, c-format
+#| msgid "Unknown error: %s"
+msgid "Unknown book property '%s'"
+msgstr "àààààà ààà:%s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
-#, c-format
-msgid "Anniversary: %s"
-msgstr "àààààààà: %s"
+#: ../addressbook/libedata-book/e-book-backend.c:104
+#, fuzzy, c-format
+#| msgid "Cannot create folder '%s': %s"
+msgid "Cannot change value of book property '%s'"
+msgstr "'%s' ààààààà àààà ààà àààà àà: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:212
-msgid "Cannot save calendar data: Malformed URI."
-msgstr "àààààà àààà àààà àààà ààà: ààààààà URI."
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:463
+#: ../camel/camel-db.c:470
+#, c-format
+msgid "Insufficient memory"
+msgstr "ààààààààà àààààà"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:219
-#: ../calendar/backends/file/e-cal-backend-file.c:225
-msgid "Cannot save calendar data"
-msgstr "àààààà àààà àààà àààà ààà"
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:196
+#: ../addressbook/libedata-book/e-data-book.c:209
+#: ../addressbook/libedata-book/e-data-book.c:694
+#| msgid "Invalid query"
+msgid "Invalid query: "
+msgstr "àààà àààààà"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:337
-msgid "Could not create thread for getting deltas"
-msgstr "àààààà àà àààà ààààà àààà ààà ààà"
+#: ../addressbook/libedata-book/e-data-book.c:299
+#: ../calendar/libedata-cal/e-data-cal.c:414
+msgid "Success"
+msgstr "ààààà"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:369
-#: ../calendar/backends/google/e-cal-backend-google.c:1192
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1053
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1352
-#: ../calendar/backends/http/e-cal-backend-http.c:561
-#: ../calendar/backends/weather/e-cal-backend-weather.c:484
-msgid "Could not create cache file"
-msgstr "ààà àààà àààà ààà ààà"
+#: ../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 "àààààààà àààààà"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:382
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065
-msgid "Could not create thread for populating cache"
-msgstr "ààà àààà àà àààà ààààà àààà ààà ààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1055
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1917
-msgid "Reply Requested: by "
-msgstr "àààà ààààààà: àààà àààààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1060
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1922
-msgid "Reply Requested: When convenient"
-msgstr "àààà ààààààà: àà àààààà àà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:277
-#, c-format
-msgid "Loading %s items"
-msgstr "%s àà ààà àà ààà àà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
-msgid "Calendar"
-msgstr "àààààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947
-msgid "Invalid server URI"
-msgstr "àààààà ààààà URI"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:966
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1071
-#: ../calendar/libecal/e-cal.c:5098
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1147
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1179
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1217
-#: ../camel/providers/groupwise/camel-groupwise-store.c:588
-#: ../camel/providers/groupwise/camel-groupwise-store.c:753
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:184
-msgid "Authentication failed"
-msgstr "ààààààà àààà"
+#: ../addressbook/libedata-book/e-data-book.c:301
+#: ../calendar/libedata-cal/e-data-cal.c:416 ../libedataserver/e-client.c:121
+#| msgid "Repository is offline"
+msgid "Repository offline"
+msgstr "àààààààààà àààààà"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:268
+#: ../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:305
+#: ../calendar/libedata-cal/e-data-cal.c:422
+#| msgid "Authentication failed"
+msgid "Authentication Failed"
+msgstr "ààààààà àààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:306
+#: ../calendar/libedata-cal/e-data-cal.c:423
+#| msgid "Authentication required"
+msgid "Authentication Required"
+msgstr "ààààààà àààààà"
+
+#: ../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: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: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:311
+msgid "Book removed"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-data-book.c:312
+#: ../calendar/libedata-cal/e-data-cal.c:430
+#| msgid "This message is not available in offline mode."
+msgid "Not available in offline mode"
+msgstr "ààààààà ààà àààààà àààà àà."
+
+#: ../addressbook/libedata-book/e-data-book.c:313
+#: ../calendar/libedata-cal/e-data-cal.c:431 ../libedataserver/e-client.c:137
+msgid "Search size limit exceeded"
+msgstr "ààà àààà àààà àààààà àà ààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:314
+#: ../calendar/libedata-cal/e-data-cal.c:432 ../libedataserver/e-client.c:139
+msgid "Search time limit exceeded"
+msgstr "ààà ààà àààà ààà àà"
+
+#: ../addressbook/libedata-book/e-data-book.c: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: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:317
+#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:129
+#| msgid "%s: could not cancel"
+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:319
+#: ../calendar/libedata-cal/e-data-cal.c:437
+msgid "Invalid server version"
+msgstr "àààà ààààà ààààààà"
+
+#: ../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:323
+#: ../calendar/libecal/e-cal.c:4444 ../calendar/libedata-cal/e-data-cal.c:440
+#: ../libedataserver/e-client.c:131
+#| msgid "Protocol not supported"
+msgid "Not supported"
+msgstr "ààààààà àààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:324
+#: ../calendar/libedata-cal/e-data-cal.c:441 ../libedataserver/e-client.c:149
+#, fuzzy
+#| 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 "I/O error"
+msgid "Other error"
+msgstr "àààà àààààà"
+
+#. 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 folder container %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: "
+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 encryption certificate"
+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
+#, fuzzy
+#| msgid "Cannot get folder container %s"
+msgid "Cannot modify contact: "
+msgstr "ààààààà àààààà àààà àà àààà àà: %s"
+
+#. 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
+#, fuzzy
+#| msgid "Cannot authenticate to server: %s"
+msgid "Cannot authenticate user: "
+msgstr "ààààà àà ààààààà àààà àà ààà: %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:779
+#| msgid "Cannot open mailbox: %s: %s\n"
+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: "
+msgstr "àààààà ààà àààà àààà àà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:818
+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 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 set backend property: "
+msgstr ""
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:881
+#, fuzzy
+#| msgid "Cannot get folder container %s"
+msgid "Cannot get contact list: "
+msgstr "ààààààà àààààà àààà àà àààà àà: %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:905
+#, fuzzy
+#| msgid "Cannot get folder container %s"
+msgid "Cannot get contact list uids: "
+msgstr "ààààààà àààààà àààà àà àààà àà: %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:969
+#, fuzzy
+#| msgid "Cannot create encoder context"
+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 "Empty URI"
+msgstr "ààààà URI"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:518
+#, c-format
+msgid "Server is unreachable (%s)"
+msgstr ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:546
+#, fuzzy, c-format
+#| msgid ""
+#| "Unexpected GnuPG status message encountered:\n"
+#| "\n"
+#| "%s"
+msgid "Unexpected HTTP status code %d returned (%s)"
+msgstr ""
+"ààààààààààà GnuPG àààààà ààààà encountered:\n"
+"\n"
+"%s"
+
+#: ../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 ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4272
+msgid "Calendar doesn't support Free/Busy"
+msgstr ""
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
+msgid "Birthday"
+msgstr "ààààààà"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:752
+#, c-format
+msgid "Birthday: %s"
+msgstr "ààààààà: %s"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:776
+#, c-format
+msgid "Anniversary: %s"
+msgstr "àààààààà: %s"
+
+#: ../calendar/backends/file/e-cal-backend-file.c:241
+msgid "Cannot save calendar data: Malformed URI."
+msgstr "àààààà àààà àààà àààà ààà: ààààààà URI."
+
+#: ../calendar/backends/file/e-cal-backend-file.c:248
+#: ../calendar/backends/file/e-cal-backend-file.c:254
+msgid "Cannot save calendar data"
+msgstr "àààààà àààà àààà àààà ààà"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:405
 msgid "Redirected to Invalid URI"
 msgstr "àààààà URI ààà àààààààààààà"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:289
+#: ../calendar/backends/http/e-cal-backend-http.c:443
 msgid "Bad file format."
 msgstr "ààà àààà ààààààà"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:295
+#: ../calendar/backends/http/e-cal-backend-http.c:450
 msgid "Not a calendar."
 msgstr "àààààà àààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:149
+#: ../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:246
+#: ../calendar/backends/weather/e-cal-backend-weather.c:285
 msgid "Weather: Fog"
 msgstr "àààà: ààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
-msgid "Weather: Cloudy"
-msgstr "àààà: àààà"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
-#| msgid "Weather: Cloudy"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
 msgid "Weather: Cloudy Night"
 msgstr "àààà: àààà ààààà ààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
-#| msgid "Weather: Thunderstorms"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
+msgid "Weather: Cloudy"
+msgstr "àààà: àààà"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
 msgid "Weather: Overcast"
 msgstr "àààà: àààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
-#| msgid "Weather: Snow"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
 msgid "Weather: Showers"
 msgstr "àààà: ààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
 msgid "Weather: Snow"
 msgstr "àààà: àààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
-msgid "Weather: Sunny"
-msgstr "àààà: ààà"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
-#| msgid "Weather: Rain"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
 msgid "Weather: Clear Night"
 msgstr "àààà: ààà ààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
+msgid "Weather: Sunny"
+msgstr "àààà: ààà"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:293
 msgid "Weather: Thunderstorms"
 msgstr "àààà: ààààààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:399
+#: ../calendar/backends/weather/e-cal-backend-weather.c:439
 msgid "Forecast"
 msgstr "ààààààààààà"
 
-#: ../calendar/libecal/e-cal-component.c:1322
+#: ../calendar/libecal/e-cal.c:867 ../libedataserverui/e-book-auth-util.c:198
+#: ../libedataserverui/e-book-auth-util.c:417
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "%s àà àààà ààààààà ààààà (àààààààà %s)"
+
+#.
+#. This password prompt will be prompted rarely. Since the key that is passed to
+#. the auth_func corresponds to the parent user.
+#.
+#: ../calendar/libecal/e-cal.c:881
+#, c-format
+msgid "Enter password for %s to enable proxy for user %s"
+msgstr ""
+"%s àà àààà ààààààà ààààà àààà àààààààà %s àà àààà àààààààà ààààà àààà àà àààà"
+
+#: ../calendar/libecal/e-cal.c:4409
+msgid "Repository is offline"
+msgstr "àààààààààà àààààà"
+
+#: ../calendar/libecal/e-cal.c:4411 ../calendar/libecal/e-cal-client.c:127
+msgid "No such calendar"
+msgstr "ààà ààà àààààà àààà"
+
+#: ../calendar/libecal/e-cal.c:4413 ../calendar/libecal/e-cal-client.c:129
+#: ../calendar/libedata-cal/e-data-cal.c:419
+msgid "Object not found"
+msgstr "ààààà àààà àààà"
+
+#: ../calendar/libecal/e-cal.c:4415 ../calendar/libecal/e-cal-client.c:131
+#: ../calendar/libedata-cal/e-data-cal.c:420
+msgid "Invalid object"
+msgstr "àààà ààààà"
+
+#: ../calendar/libecal/e-cal.c:4417
+msgid "URI not loaded"
+msgstr "URI ààààà àààà"
+
+#: ../calendar/libecal/e-cal.c:4419
+msgid "URI already loaded"
+msgstr "URI àààà àà ààà"
+
+#: ../calendar/libecal/e-cal.c:4423
+msgid "Unknown User"
+msgstr "àààààà àààààààà"
+
+#: ../calendar/libecal/e-cal.c:4425 ../calendar/libecal/e-cal-client.c:135
+#: ../calendar/libedata-cal/e-data-cal.c:421
+msgid "Object ID already exists"
+msgstr "ààààà 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
+#, fuzzy
+#| msgid "A CORBA exception has occurred"
+msgid "A D-Bus exception has occurred"
+msgstr "CORBA ààààà àààà ààà"
+
+#: ../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"
+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
+#, fuzzy
+#| msgid "Failed to encode data"
+msgid "Failed to run calendar factory"
+msgstr "àààààà ààààà ààà àààà"
+
+#: ../calendar/libecal/e-cal-client.c:717
+#, fuzzy
+#| 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
+#, fuzzy
+#| msgid "Folder '%s' does not exist."
+msgid "Calendar does not exist"
+msgstr "'%s' ààààààà ààààà àààà àà."
+
+#: ../calendar/libecal/e-cal-client.c:865
+#| msgid "%s: Invalid source."
+msgid "Invalid source type"
+msgstr "àààààà ààààà àààààà"
+
+#: ../calendar/libecal/e-cal-component.c:1298
 msgid "Untitled appointment"
 msgstr "àààààààà ààààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4041
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "1st"
 msgstr "àààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4042
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "2nd"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4043
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "3rd"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4044
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "4th"
 msgstr "àààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4045
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "5th"
 msgstr "àààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "6th"
 msgstr "ààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "7th"
 msgstr "àààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "8th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "9th"
 msgstr "àààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "10th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "11th"
 msgstr "ààààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "12th"
 msgstr "ààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "13th"
 msgstr "ààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "14th"
 msgstr "ààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "15th"
 msgstr "ààààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "16th"
 msgstr "ààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "17th"
 msgstr "àààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "18th"
 msgstr "àààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "19th"
 msgstr "ààààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "20th"
 msgstr "àààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "21st"
 msgstr "ààààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "22nd"
 msgstr "ààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "23rd"
 msgstr "ààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "24th"
 msgstr "àààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "25th"
 msgstr "ààààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "26th"
 msgstr "ààààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4067
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "27th"
 msgstr "àààààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4068
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "28th"
 msgstr "àààààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4069
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "29th"
 msgstr "àààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4070
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "30th"
 msgstr "àààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4071
+#: ../calendar/libecal/e-cal-recur.c:4017
 msgid "31st"
 msgstr "àààààààà"
 
-#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:713
+#: ../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:687 ../calendar/libecal/e-cal-util.c:715
+#: ../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:689 ../calendar/libecal/e-cal-util.c:717
+#: ../calendar/libecal/e-cal-util.c:681 ../calendar/libecal/e-cal-util.c:708
+#| msgid "Low"
+msgctxt "Priority"
 msgid "Low"
 msgstr "àà"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:711
+#: ../calendar/libecal/e-cal-util.c:702
+#| msgid "Undefined"
+msgctxt "Priority"
 msgid "Undefined"
 msgstr "ààààààààà"
 
-#: ../calendar/libecal/e-cal.c:1677 ../libedataserverui/e-book-auth-util.c:199
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "%s àà àààà ààààààà ààààà (àààààààà %s)"
-
-#.
-#. This password prompt will be prompted rarely. Since the key that is passed to
-#. the auth_func corresponds to the parent user.
-#.
-#: ../calendar/libecal/e-cal.c:1691
-#, c-format
-msgid "Enter password for %s to enable proxy for user %s"
-msgstr "%s àà àààà ààààààà ààààà àààà àààààààà %s àà àààà àààààààà ààààà àààà àà àààà"
-
-#: ../calendar/libecal/e-cal.c:5070
-msgid "Invalid argument"
-msgstr "àààà àààà"
-
-#: ../calendar/libecal/e-cal.c:5072
-msgid "Backend is busy"
-msgstr "àààààààà àààààà"
-
-#: ../calendar/libecal/e-cal.c:5074
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
-msgid "Repository is offline"
-msgstr "àààààààààà àààààà"
-
-#: ../calendar/libecal/e-cal.c:5076
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
-msgid "No such calendar"
-msgstr "ààà ààà àààààà àààà"
-
-#: ../calendar/libecal/e-cal.c:5078
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
-#: ../servers/groupwise/e-gw-connection.c:233
-msgid "Object not found"
-msgstr "ààààà àààà àààà"
-
-#: ../calendar/libecal/e-cal.c:5080
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
-#: ../servers/groupwise/e-gw-connection.c:227
-msgid "Invalid object"
-msgstr "àààà ààààà"
-
-#: ../calendar/libecal/e-cal.c:5082
-msgid "URI not loaded"
-msgstr "URI ààààà àààà"
-
-#: ../calendar/libecal/e-cal.c:5084
-msgid "URI already loaded"
-msgstr "URI àààà àà ààà"
-
-#: ../calendar/libecal/e-cal.c:5086
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
-#: ../servers/exchange/storage/e-storage.c:571
-msgid "Permission denied"
-msgstr "àààààà ààààààà"
-
-#: ../calendar/libecal/e-cal.c:5088
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
-#: ../servers/groupwise/e-gw-connection.c:235
-msgid "Unknown User"
-msgstr "àààààà àààààààà"
-
-#: ../calendar/libecal/e-cal.c:5090
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
-msgid "Object ID already exists"
-msgstr "ààààà ID àààà àà ààààà"
-
-#: ../calendar/libecal/e-cal.c:5092
-msgid "Protocol not supported"
-msgstr "ààààààààà ààààààà àààà"
-
-#: ../calendar/libecal/e-cal.c:5094
-msgid "Operation has been canceled"
-msgstr "àààààà àààà àààà ààà"
-
-#: ../calendar/libecal/e-cal.c:5096
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
-msgid "Could not cancel operation"
-msgstr "àààààà àààà àààà àà ààà"
-
-#: ../calendar/libecal/e-cal.c:5100
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:218
-msgid "Authentication required"
-msgstr "ààààààà àààààà"
-
-#: ../calendar/libecal/e-cal.c:5102
-msgid "A CORBA exception has occurred"
-msgstr "CORBA ààààà àààà ààà"
+#: ../calendar/libedata-cal/e-cal-backend.c:34
+msgid "Cannot process, calendar backend is opening"
+msgstr ""
 
-#: ../calendar/libecal/e-cal.c:5104
-#: ../calendar/libedata-cal/e-cal-backend-util.c:146
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/imap/camel-imap-command.c:434
-#: ../camel/providers/imap/camel-imap-store.c:743
-#: ../camel/providers/imap4/camel-imap4-engine.c:1570
-#: ../camel/providers/imap4/camel-imap4-engine.c:1609
-#: ../camel/providers/imap4/camel-imap4-engine.c:1654
-#: ../camel/providers/imap4/camel-imap4-engine.c:1710
-#: ../camel/providers/imap4/camel-imap4-store.c:315
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
-#: ../camel/providers/pop3/camel-pop3-store.c:554
-#: ../camel/providers/pop3/camel-pop3-store.c:561
-#: ../camel/providers/pop3/camel-pop3-store.c:567
-#: ../servers/exchange/storage/e-storage.c:585
-#: ../servers/groupwise/e-gw-connection.c:241
-msgid "Unknown error"
-msgstr "àààààà àààààà"
+#: ../calendar/libedata-cal/e-cal-backend.c:207
+#, fuzzy, c-format
+#| msgid "Unknown error: %s"
+msgid "Unknown calendar property '%s'"
+msgstr "àààààà ààà:%s"
 
-#: ../calendar/libecal/e-cal.c:5106
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
-#: ../servers/exchange/storage/e-storage.c:553
-msgid "No error"
-msgstr "ààà àààà àààà"
+#: ../calendar/libedata-cal/e-cal-backend.c:219
+#, fuzzy, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot change value of calendar property '%s'"
+msgstr "àààààà àààà àààà àààà ààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:67
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
 #: ../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:1023
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1050
+#: ../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\" àààà àààà àà ààà àààà àààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:100
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:210
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:252
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:288
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:102
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:212
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:290
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1086
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\" àà àààà àà ààà àààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:106
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:294
+#: ../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:735
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "\"%s\" àààà àààà àà àààààààà àààà àà ààà àààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
+#: ../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 date/time àààààààà àààà àà ààà àààà àà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:361
+#: ../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:413
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
@@ -1165,23 +1525,23 @@ msgstr "\"%s\" àààà àààà àà ISO 8601 date/time àààà
 msgid "\"%s\" expects two arguments"
 msgstr "\"%s\" àà àààà àà ààà àààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:216
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:258
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:367
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:168
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:218
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:260
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:369
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:419
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1094
+#: ../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 àààà àà ààà àààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "\"%s\" ààààà àààà àà àà àààààààà àà ààà àààà àà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:375
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:377
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
 #, c-format
@@ -1206,128 +1566,220 @@ msgstr ""
 "\"%s\" àààà àààà àà \"any\", \"summary\", or \"description\", àà \"location\" "
 "ààà àà àààà ààà ààà ààà àààà àà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:925
+#: ../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:939
+#: ../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-cal-backend-util.c:109
-#| msgid "Invalid argument"
-msgid "Invalid range"
-msgstr "àààà ààààà"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
-#| msgid "Unsupported security layer."
-msgid "Unsupported field"
-msgstr "àààààààà ààààààà"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
-#| msgid "Unsupported security layer."
+#: ../calendar/libedata-cal/e-data-cal.c:425
 msgid "Unsupported method"
 msgstr "àààààààà àààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
-#| msgid "No support for authentication type %s"
-msgid "Unsupported authentication method"
-msgstr "àààààààà ààààààà àààà"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:909
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot open calendar: "
+msgstr "àààààà àààà àààà àààà ààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-#| msgid "SSL unavailable"
-msgid "TLS not available"
-msgstr "TLS àààààààà"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:930
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot remove calendar: "
+msgstr "àààààà àààà àààà àààà ààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-#| msgid "SSL unavailable"
-msgid "Offline mode unavailable"
-msgstr "àààààà àààà àààààààà"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:955
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot refresh calendar: "
+msgstr "àààààà àààà àààà àààà ààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-#| msgid "Path length exceeded"
-msgid "Search size limit exceeded"
-msgstr "ààà àààà àààà àààààà àà ààà"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:979
+#, fuzzy
+#| msgid "Cannot create encoder context"
+msgid "Cannot retrieve backend property: "
+msgstr "àààààà àààààà àààà ààà àààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-#| msgid "Path length exceeded"
-msgid "Search time limit exceeded"
-msgstr "ààà ààà àààà ààà àà"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1025
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar object path: "
+msgstr "àààààà àààà àààà àààà ààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-#| msgid "Invalid purpose"
-msgid "Invalid query"
-msgstr "àààà àààààà"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1050
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar object list: "
+msgstr "àààààà àààà àààà àààà ààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
-msgid "Query refused"
-msgstr "àààààà àààààààà"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1075
+#, fuzzy
+#| msgid "Cannot save calendar data"
+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
+#, fuzzy
+#| msgid "Cannot create encoder context"
+msgid "Cannot create calendar object: "
+msgstr "àààààà àààààà àààà ààà àààà"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1128
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot modify calendar object: "
+msgstr "àààààà àààà àààà àààà ààà"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1156
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot remove calendar object: "
+msgstr "àààààà àààà àààà àààà ààà"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1179
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot receive calendar objects: "
+msgstr "àààààà àààà àààà àààà ààà"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1204
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot send calendar objects: "
+msgstr "àààààà àààà àààà àààà ààà"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1231
+#, fuzzy
+#| msgid "Could not retrieve weather data"
+msgid "Could not retrieve attachment uris: "
+msgstr "àààà àààà àààà àà ààà"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1255
+#, fuzzy
+#| msgid "Could not store folder: %s"
+msgid "Could not discard reminder: "
+msgstr "ààààààà ààààà àààà àà ààà: %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1279
+#, fuzzy
+#| msgid "Could not generate encrypting data: %s"
+msgid "Could not get calendar view path: "
+msgstr "àààà àààààà ààààààà àààà ààà: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1304
+#, fuzzy
+#| msgid "Could not retrieve weather data"
+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
+#, fuzzy
+#| msgid "Could not rename folder: %s"
+msgid "Could not add calendar time zone: "
+msgstr "ààààààà àà àààà àààààà àààà àà ààà: %s"
+
+#: ../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 "Invalid server URI"
-msgid "Invalid server version"
-msgstr "àààà ààààà ààààààà"
+msgid "Invalid URI"
+msgstr "àààààà URI"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:442
+#, c-format
+msgid "No backend factory for '%s' of '%s'"
+msgstr ""
 
-#: ../camel/camel-cipher-context.c:102
+#: ../calendar/libedata-cal/e-data-cal-factory.c:485
+#, fuzzy, c-format
+#| msgid "Could not create cache file"
+msgid "Could not instantiate backend"
+msgstr "ààà àààà àààà ààà ààà"
+
+#: ../camel/camel-cipher-context.c:200
+#, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "ààààààààà àà àààà àà àààààà ààààààà àààà àà"
 
-#: ../camel/camel-cipher-context.c:128
-msgid "Signing message"
-msgstr "ààààà àà ààààààààà àà ààà àà"
-
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:213
+#, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "àààà àà àààà àà àààààà ààààààà àààà àà"
 
-#: ../camel/camel-cipher-context.c:171
-msgid "Verifying message"
-msgstr "ààààà àà àààà àà ààà àà"
-
-#: ../camel/camel-cipher-context.c:189
+#: ../camel/camel-cipher-context.c:229
+#, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "àààà àà àààà àà àààààà ààààààà àààà àà"
 
-#: ../camel/camel-cipher-context.c:215
-msgid "Encrypting message"
-msgstr "ààààà àà àààà àà ààà àà"
-
-#: ../camel/camel-cipher-context.c:232
+#: ../camel/camel-cipher-context.c:243
+#, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "àààààà àà àààà àà àààààà ààààààà àààà àà"
 
-#: ../camel/camel-cipher-context.c:254
-msgid "Decrypting message"
-msgstr "ààààà àà àààààà àà ààà àà"
-
-#: ../camel/camel-cipher-context.c:271
+#: ../camel/camel-cipher-context.c:256
+#, c-format
 msgid "You may not import keys with this cipher"
 msgstr "àà àààà àà àà ààààà àààà àààà àà àààà ààà"
 
-#: ../camel/camel-cipher-context.c:301
+#: ../camel/camel-cipher-context.c:270
+#, c-format
 msgid "You may not export keys with this cipher"
 msgstr "àà àààà àà àà ààààà ààààààà àààà àà àààà ààà"
 
-#: ../camel/camel-data-cache.c:136
+#: ../camel/camel-cipher-context.c:812
+msgid "Signing message"
+msgstr "ààààà àà ààààààààà àà ààà àà"
+
+#: ../camel/camel-cipher-context.c:1053
+msgid "Encrypting message"
+msgstr "ààààà àà àààà àà ààà àà"
+
+#: ../camel/camel-cipher-context.c:1180
+msgid "Decrypting message"
+msgstr "ààààà àà àààààà àà ààà àà"
+
+#: ../camel/camel-data-cache.c:178
+#, c-format
 msgid "Unable to create cache path"
 msgstr "ààà àà ààààààà ààà ààààà"
 
-#: ../camel/camel-data-cache.c:403
+#: ../camel/camel-data-cache.c:495
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "ààà ààààààààà àààà ààà àààà: %s: %s"
 
-#: ../camel/camel-db.c:469
-msgid "Insufficient memory"
-msgstr "ààààààààà àààààà"
-
-#: ../camel/camel-disco-diary.c:198
+#: ../camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1338,13 +1790,9 @@ msgstr ""
 "àà ààààà àà ààà àà àààààààà àààà àààà ààààà àààààà àà àà\n"
 "ààààà àà àààààààààà àààààààà."
 
-#: ../camel/camel-disco-diary.c:261
-#: ../camel/providers/imap/camel-imap-journal.c:318
+#: ../camel/camel-disco-diary.c:260
+#: ../camel/providers/imap/camel-imap-journal.c:300
 #, c-format
-#| msgid ""
-#| "Could not open `%s':\n"
-#| "%s\n"
-#| "Changes made to this folder will not be resynchronized."
 msgid ""
 "Could not open '%s':\n"
 "%s\n"
@@ -1354,120 +1802,180 @@ msgstr ""
 "%s\n"
 "àà ààààààà ààà àààà ààà àààààààà ààààààààààààààà àààà àà àààààà."
 
-#: ../camel/camel-disco-diary.c:297
+#: ../camel/camel-disco-diary.c:304
 msgid "Resynchronizing with server"
 msgstr "ààààà àà àààààààààààààà"
 
-#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:52
-msgid "Copy folder content locally for offline operation"
-msgstr "àààààà àààààààà àà ààà ààààààà àààààààààà àà ààààààà ààà àà àààà àààà"
-
-#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:111
+#: ../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:469
+#: ../camel/camel-disco-folder.c:410
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "àààààà àà àààà '%s' ààààààà àà ààààà àà ààà àà"
 
-#: ../camel/camel-disco-store.c:403
-#: ../camel/providers/groupwise/camel-groupwise-store.c:226
-#: ../camel/providers/imap/camel-imap-store.c:1003
-#: ../camel/providers/imap/camel-imap-store.c:1813
-#: ../camel/providers/imap/camel-imap-store.c:2229
-#: ../camel/providers/imap/camel-imap-store.c:2997
+#: ../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: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 "àà àààààààà àà àààààà àààà àà ààà àààà ààààààà ààà àà àààààà ààà àààà àààààà"
+msgstr ""
+"àà àààààààà àà àààààà àààà àà ààà àààà ààààààà ààà àà àààààà ààà àààà àààààà"
 
-#: ../camel/camel-exception.c:262
-msgid "No description available"
-msgstr "ààà ààààà àààààà àààà"
+#: ../camel/camel-file-utils.c:722
+#, c-format
+msgid "Canceled"
+msgstr "àààà"
 
-#: ../camel/camel-filter-driver.c:795 ../camel/camel-filter-search.c:581
+#: ../camel/camel-filter-driver.c:818 ../camel/camel-filter-search.c:628
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "'%s' ààà ààààààààà ààààà ààà àààà: %s"
 
-#: ../camel/camel-filter-driver.c:837
+#: ../camel/camel-filter-driver.c:866
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "%s àà àààà ààààà àààà ààààààà: %s"
 
-#: ../camel/camel-filter-driver.c:1026 ../camel/camel-filter-driver.c:1035
+#: ../camel/camel-filter-driver.c:1053 ../camel/camel-filter-driver.c:1062
 msgid "Syncing folders"
 msgstr "ààààààà àà ààààààààà àà ààà àà"
 
-#: ../camel/camel-filter-driver.c:1124 ../camel/camel-filter-driver.c:1530
+#: ../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:1133 ../camel/camel-filter-driver.c:1539
+#: ../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:1221
+#: ../camel/camel-filter-driver.c:1258
+#, c-format
 msgid "Unable to open spool folder"
 msgstr "ààààà ààààààà àà ààààà ààà ààààà"
 
-#: ../camel/camel-filter-driver.c:1230
+#: ../camel/camel-filter-driver.c:1269
+#, c-format
 msgid "Unable to process spool folder"
 msgstr "ààààà ààààààà àà ààààààààà ààà ààààà"
 
-#: ../camel/camel-filter-driver.c:1246
+#: ../camel/camel-filter-driver.c:1287
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%d%%) ààààà ààààààà àà ààà àà"
 
-#: ../camel/camel-filter-driver.c:1250
-msgid "Cannot open message"
-msgstr "ààààà àààà ààà àààà àà"
-
-#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1269
+#: ../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:1283 ../camel/camel-filter-driver.c:1374
+#: ../camel/camel-filter-driver.c:1331 ../camel/camel-filter-driver.c:1432
 msgid "Syncing folder"
 msgstr "ààààààà àà ààààààààà àà ààà àà"
 
-#: ../camel/camel-filter-driver.c:1287 ../camel/camel-filter-driver.c:1379
+#: ../camel/camel-filter-driver.c:1336 ../camel/camel-filter-driver.c:1438
 msgid "Complete"
 msgstr "ààààà"
 
-#: ../camel/camel-filter-driver.c:1344
+#: ../camel/camel-filter-driver.c:1396
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d àà %d ààààà ààààààà àà ààà àà"
 
-#: ../camel/camel-filter-driver.c:1359
+#: ../camel/camel-filter-driver.c:1414
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d àà %d ààààà àà àààà"
 
-#: ../camel/camel-filter-search.c:138
+#: ../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 "àààà àààà àààà (àààààààà-ààà)"
 
-#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:737 ../camel/camel-filter-search.c:745
+#: ../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-search.c:351 ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:608
+#: ../camel/camel-folder.c:243
+#, fuzzy, c-format
+#| msgid "Scanning for changed messages in %s"
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "%s ààà ààààààààà ààààà àà àààà àààààààà"
+msgstr[1] "%s ààà ààààààààà ààààà àà àààà àààààààà"
+
+#: ../camel/camel-folder.c:283
+#, fuzzy, c-format
+#| msgid "Scanning for changed messages in %s"
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "%s ààà ààààààààà ààààà àà àààà àààààààà"
+msgstr[1] "%s ààà ààààààààà ààààà àà àààà àààààààà"
+
+#: ../camel/camel-folder.c:331
+#, fuzzy, c-format
+#| msgid "Filtering new message(s)"
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "àà ààààà(ààà) àà àààààààà àà ààà àà"
+msgstr[1] "àà ààààà(ààà) àà àààààààà àà ààà àà"
+
+#: ../camel/camel-folder.c:902
+#: ../camel/providers/local/camel-maildir-folder.c:319
+msgid "Moving messages"
+msgstr "ààààà àààààààààààà àà ààà àà"
+
+#: ../camel/camel-folder.c:905
+msgid "Copying messages"
+msgstr "ààààà àààà àà ààà àà"
+
+#: ../camel/camel-folder.c:1160
+#, c-format
+msgid "Quota information not supported for folder '%s'"
+msgstr ""
+
+#: ../camel/camel-folder.c:3269
+#, fuzzy, c-format
+#| msgid "Retrieving POP message %d"
+msgid "Retrieving message '%s' in %s"
+msgstr "%d POP àààààà àààààààààààà àà ààà àà"
+
+#: ../camel/camel-folder.c:3394
+#, fuzzy, c-format
+#| msgid "Fetching summary information for new messages in %s"
+msgid "Retrieving quota information for '%s'"
+msgstr "%s ààà àà ààààà àà àààà àààààà ààààà àà ààà àà"
+
+#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
+#: ../camel/camel-folder-search.c:627
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1476,8 +1984,8 @@ msgstr ""
 "ààà àààààààààà àà àààààààà àààà àà àààà: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:463
-#: ../camel/camel-folder-search.c:618
+#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:468
+#: ../camel/camel-folder-search.c:639
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1486,78 +1994,48 @@ msgstr ""
 "ààà àààààààààà àà ààààààààààà ààà ààà: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:853
+#. 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 "(match-all) requires a single bool result"
 msgid "(%s) requires a single bool result"
 msgstr "(%s) àà ààà ààà ààà àààààà ààààà àà"
 
-#: ../camel/camel-folder-search.c:906
+#. Translators: Each '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:941
 #, c-format
-#| msgid "(match-threads) not allowed inside match-all"
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) ààààààà àààà àà %s àà àààà"
 
-#: ../camel/camel-folder-search.c:912 ../camel/camel-folder-search.c:919
+#. 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 "(match-threads) requires a match type string"
 msgid "(%s) requires a match type string"
 msgstr "(%s) àà ààà ààààà àààààà àààààààà àà ààààà àà"
 
-#: ../camel/camel-folder-search.c:946
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:984
 #, c-format
-#| msgid "(match-threads) expects an array result"
 msgid "(%s) expects an array result"
 msgstr "(%s) àà àààà àààààà àà ààà àààà àà"
 
-#: ../camel/camel-folder-search.c:955
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:994
 #, c-format
-#| msgid "(match-threads) requires the folder set"
 msgid "(%s) requires the folder set"
 msgstr "(%s) àà ààà ààààààà ààà àà ààààà àà"
 
-#: ../camel/camel-folder.c:696
+#: ../camel/camel-gpg-context.c:642 ../camel/camel-gpg-context.c:647
+#: ../camel/camel-gpg-context.c:1272
 #, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "àààààààà àààààààà: ààààà àààààà: %s àà ààà"
-
-#: ../camel/camel-folder.c:1398
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "àààààààà àààààààà: ààà àà ààààà: %s àà ààà"
-
-#: ../camel/camel-folder.c:1440
-#, c-format
-#| msgid "Unsupported operation: search by expression: for %s"
-msgid "Unsupported operation: count by expression: for %s"
-msgstr "àààààààà àààààààà: àààààààààà àà àààà àààà: %s àà ààà"
-
-#: ../camel/camel-folder.c:1480
-#, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "àààààààà àààààààà: UID àà ààààà: %s àà ààà"
-
-#: ../camel/camel-folder.c:1596
-msgid "Moving messages"
-msgstr "ààààà àààààààààààà àà ààà àà"
-
-#: ../camel/camel-folder.c:1596
-msgid "Copying messages"
-msgstr "ààààà àààà àà ààà àà"
-
-#: ../camel/camel-folder.c:1942
-msgid "Learning junk"
-msgstr "ààà àà ààà ààà àà"
-
-#: ../camel/camel-folder.c:1959
-msgid "Learning non-junk"
-msgstr "ààà-ààà àà ààà ààà àà"
+msgid "Failed to execute gpg: %s"
+msgstr "gpg àà àààààààà ààà àààà: %s"
 
-#: ../camel/camel-folder.c:1978
-msgid "Filtering new message(s)"
-msgstr "àà ààààà(ààà) àà àààààààà àà ààà àà"
+#: ../camel/camel-gpg-context.c:647
+#: ../camel/providers/smtp/camel-smtp-transport.c:759
+msgid "Unknown"
+msgstr "àààààà"
 
-#: ../camel/camel-gpg-context.c:755
+#: ../camel/camel-gpg-context.c:711
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1568,15 +2046,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:770
+#: ../camel/camel-gpg-context.c:728
+#, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg userid ààààà àà àààààààà ààà àààà."
 
-#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:808
+#: ../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:828
+#: ../camel/camel-gpg-context.c:789
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1585,7 +2065,7 @@ msgstr ""
 "àààà àààà ààààààà ààààà àà ààààà àà ààà\n"
 "ààà àà ààààà àà: \"%s\""
 
-#: ../camel/camel-gpg-context.c:832
+#: ../camel/camel-gpg-context.c:793
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1594,139 +2074,135 @@ msgstr ""
 "àààà àààààààà àà ààà ààààà ààààà àà ààà\n"
 "ààààààà àà ààààà àà: \"%s\""
 
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:799
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "GnuPG àà '%s' àà ààà ààààààààààà ààààà"
 
-#: ../camel/camel-gpg-context.c:862 ../camel/camel-gpg-context.c:1071
-#: ../camel/providers/nntp/camel-nntp-store.c:1304
-msgid "Canceled."
+#: ../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:4962
+#: ../camel/providers/imapx/camel-imapx-server.c:4979
+#: ../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:876
+#: ../camel/camel-gpg-context.c:846
+#, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "ààààà ààààà ààààà ààà àààà:à ààà ààààààà àààà ààà."
 
-#: ../camel/camel-gpg-context.c:884
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG àà ààààààààààà ààààààààà: %s"
 
-#: ../camel/camel-gpg-context.c:947
+#: ../camel/camel-gpg-context.c:989
+#, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "àààà ààà àààà: ààà ààà àààààààààààà àààà."
 
-#. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1209 ../camel/camel-gpg-context.c:1337
-#: ../camel/camel-gpg-context.c:1850 ../camel/camel-gpg-context.c:1895
-#, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "gpg àà àààààààà ààà àààà: %s"
-
-#: ../camel/camel-gpg-context.c:1305 ../camel/camel-smime-context.c:598
-#, c-format
-msgid "Could not generate signing data: %s"
+#: ../camel/camel-gpg-context.c:1535 ../camel/camel-smime-context.c:824
+#, fuzzy
+#| msgid "Could not generate signing data: %s"
+msgid "Could not generate signing data: "
 msgstr "ààààààààà àààààà ààààààà àààà àà ààà: %s"
 
-#: ../camel/camel-gpg-context.c:1352 ../camel/camel-gpg-context.c:1554
-#: ../camel/camel-gpg-context.c:1640 ../camel/camel-gpg-context.c:1655
-#: ../camel/camel-gpg-context.c:1771 ../camel/camel-gpg-context.c:1786
-#: ../camel/camel-gpg-context.c:1866 ../camel/camel-gpg-context.c:1911
+#: ../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 "gpg àà àààààààà ààà àààà."
 
-#: ../camel/camel-gpg-context.c:1371
-msgid "This is a digitally signed message part"
-msgstr "àà àààààà ààà àà ààààààààààà ààààà àà àààààà àà"
-
-#: ../camel/camel-gpg-context.c:1458 ../camel/camel-gpg-context.c:1464
-#: ../camel/camel-gpg-context.c:1470 ../camel/camel-gpg-context.c:1485
-#: ../camel/camel-smime-context.c:901 ../camel/camel-smime-context.c:912
-#: ../camel/camel-smime-context.c:919
+#: ../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:1524
-#, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "ààààà ààààààààà àà àààà àààà àà àààà: ààààààà ààààà àààà ààààààà àà àààà: %s"
+#: ../camel/camel-gpg-context.c:1741
+#, fuzzy
+#| msgid "Cannot verify message signature: Incorrect message format"
+msgid "Cannot verify message signature: "
+msgstr "ààààà ààààààààà àà àààà àààà àà àààà: àààààà ààààà ààààààà"
 
-#: ../camel/camel-gpg-context.c:1623
-#, c-format
-msgid "Could not generate encrypting data: %s"
+#: ../camel/camel-gpg-context.c:1864
+#, fuzzy
+#| msgid "Could not generate encrypting data: %s"
+msgid "Could not generate encrypting data: "
 msgstr "àààà àààààà ààààààà àààà ààà: %s"
 
-#: ../camel/camel-gpg-context.c:1673
+#: ../camel/camel-gpg-context.c:1917
 msgid "This is a digitally encrypted message part"
 msgstr "àà àààààà ààà àà ààààà ààààà àà àààààà àà"
 
-#: ../camel/camel-gpg-context.c:1726 ../camel/camel-gpg-context.c:1734
-#: ../camel/camel-gpg-context.c:1753
+#: ../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:1743
+#: ../camel/camel-gpg-context.c:1995
+#, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME àààààà àà àààààà ààà àààà: ààààààààà àààààà"
 
-#: ../camel/camel-gpg-context.c:1808 ../camel/camel-smime-context.c:1176
+#: ../camel/camel-gpg-context.c:2086 ../camel/camel-smime-context.c:1261
 msgid "Encrypted content"
 msgstr "ààààà àààààààààà"
 
-#: ../camel/camel-gpg-context.c:1827
-msgid "Unable to parse message content"
-msgstr "ààààà àààààààààà àà àààààààà ààà ààààà"
+#: ../camel/camel-http-stream.c:546 ../camel/camel-stream-null.c:78
+msgid "Only reset to beginning is supported with CamelHttpStream"
+msgstr ""
 
-#: ../camel/camel-gpg-context.c:1851 ../camel/camel-gpg-context.c:1896
-#: ../camel/camel-tcp-stream-openssl.c:635
-#: ../camel/providers/imap4/camel-imap4-utils.c:624
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
-#: ../camel/providers/smtp/camel-smtp-transport.c:221
-msgid "Unknown"
-msgstr "àààààà"
+#: ../camel/camel-lock.c:102
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "%s àà ààà àààà ààààà àààà ààà ààà: %s"
+
+#: ../camel/camel-lock.c:145
+#, fuzzy, c-format
+#| msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Timed out trying to get lock file on %s.  Try again later."
+msgstr "%s àà ààà àààà àààà àà àààà ààààà ààà ààà àààààà. ààà ààààà àààà."
+
+#: ../camel/camel-lock.c:205
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "fcntl(2) àà àààààà àà àààà àààà ààà àààà: %s"
 
-#: ../camel/camel-lock-client.c:104
+#: ../camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "flock(2) àà àààààà àà àààà àààà ààà àààà: %s"
+
+#: ../camel/camel-lock-client.c:106
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "àààààà àààà àà àààààà ààààà àààà àà àààà: %s"
 
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock-client.c:130
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "ààààà àà ààà àààà ààààà àààà àà àààà: %s"
 
-#: ../camel/camel-lock-client.c:204 ../camel/camel-lock-client.c:227
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "'%s' àà àààà àààà ààà ààà: àààà ààààà àà ààà ààààààààà àààààà"
 
-#: ../camel/camel-lock-client.c:217
+#: ../camel/camel-lock-client.c:227
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "'%s' àà àààà àààà ààà ààà"
 
-#: ../camel/camel-lock.c:103
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "%s àà ààà àààà ààààà àààà ààà ààà: %s"
-
-#: ../camel/camel-lock.c:144
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "%s àà ààà àààà àààà àà àààà ààààà ààà ààà àààààà. ààà ààààà àààà."
-
-#: ../camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "fcntl(2) àà àààààà àà àààà àààà ààà àààà: %s"
-
-#: ../camel/camel-lock.c:262
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "flock(2) àà àààààà àà àààà àààà ààà àààà: %s"
-
-#: ../camel/camel-movemail.c:106
+#: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "%s ààà ààààà àà àààà àààà àà ààà: %s"
@@ -1736,145 +2212,162 @@ msgstr "%s ààà ààààà àà àààà àààà àà à
 msgid "Could not open mail file %s: %s"
 msgstr "%s ààà ààààà àà àààà ààà ààà: %s"
 
-#: ../camel/camel-movemail.c:127
+#: ../camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "%s ààààààà ààà ààààà àà àààà ààà ààà: %s"
 
-#: ../camel/camel-movemail.c:156
+#: ../camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "%s ààààààà ààààà ààà ààà ààààààà ààà àààà: %s"
 
-#: ../camel/camel-movemail.c:186
+#: ../camel/camel-movemail.c:193
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "àààà àààà ààà ààà: %s"
 
-#: ../camel/camel-movemail.c:198
+#: ../camel/camel-movemail.c:207
 #, c-format
 msgid "Could not fork: %s"
 msgstr "ààààà àààà àà ààà: %s"
 
-#: ../camel/camel-movemail.c:236
+#: ../camel/camel-movemail.c:245
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail ààààààààà àààà àà ààà: %s"
 
-#: ../camel/camel-movemail.c:237
+#: ../camel/camel-movemail.c:246
 msgid "(Unknown error)"
 msgstr "(àààààà àààààà)"
 
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:273
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "ààà ààààà ààààà ààà ààà: %s"
 
-#: ../camel/camel-movemail.c:271
+#: ../camel/camel-movemail.c:286
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "ààà ààààààà ààààà àà ààààà ààà ààà: %s"
 
-#: ../camel/camel-movemail.c:464 ../camel/camel-movemail.c:531
+#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "ààà ààààààà ààààà àà àààà àààà ààà ààà: %s"
 
-#: ../camel/camel-multipart-signed.c:593
+#: ../camel/camel-multipart-signed.c:297
+#, fuzzy, c-format
+#| msgid "No description available"
+msgid "No content available"
+msgstr "ààà ààààà àààààà àààà"
+
+#: ../camel/camel-multipart-signed.c:305
+#, fuzzy, c-format
+#| msgid "No description available"
+msgid "No signature available"
+msgstr "ààà ààààà àààààà àààà"
+
+#: ../camel/camel-multipart-signed.c:689
+#, c-format
 msgid "parse error"
 msgstr "àààààà àààààààà àààà"
 
-#: ../camel/camel-net-utils.c:505 ../camel/camel-net-utils.c:667
-#: ../camel/camel-net-utils.c:799
-#: ../camel/providers/pop3/camel-pop3-store.c:448
-#: ../camel/providers/pop3/camel-pop3-store.c:548
-msgid "Canceled"
-msgstr "àààà"
+#: ../camel/camel-network-service.c:99
+#, c-format
+msgid "Could not connect to %s: %s"
+msgstr "%s ààà àààà àààà ààà: %s"
+
+#: ../camel/camel-network-service.c:100
+msgid "SSL unavailable"
+msgstr "SSL àààààààà"
 
-#: ../camel/camel-net-utils.c:524
-msgid "cannot create thread"
-msgstr "ààààà àààà ààààààà àà àààà"
+#: ../camel/camel-network-service.c:123
+#, fuzzy, c-format
+#| msgid "Could not connect to %s: %s"
+msgid "Could not connect to %s: "
+msgstr "%s ààà àààà àààà ààà: %s"
 
-#: ../camel/camel-net-utils.c:671
+#: ../camel/camel-net-utils.c:695
 #, c-format
 msgid "Resolving: %s"
 msgstr "àà àà ààà àà: %s"
 
-#: ../camel/camel-net-utils.c:693
+#: ../camel/camel-net-utils.c:718
 msgid "Host lookup failed"
 msgstr "àààààà ààààà ààà àààààà"
 
-#: ../camel/camel-net-utils.c:695
+#: ../camel/camel-net-utils.c:724
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "àààààà ààààà ààà àààààà: %s: %s"
 
-#: ../camel/camel-net-utils.c:803
+#: ../camel/camel-net-utils.c:845
 msgid "Resolving address"
 msgstr "ààà àà àà ààà àà"
 
-#: ../camel/camel-net-utils.c:823
+#: ../camel/camel-net-utils.c:866
 msgid "Name lookup failed"
 msgstr "ààà ààààà àààà"
 
-#: ../camel/camel-net-utils.c:826
+#: ../camel/camel-net-utils.c:872
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "ààà ààààà àààà: %s"
 
-#: ../camel/camel-offline-folder.c:253
+#: ../camel/camel-offline-folder.c:202
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "%s ààààààà àà ààààà ààà ààààà àààààààààà àà ààà àà"
 
-#: ../camel/camel-offline-journal.c:164 ../camel/camel-offline-journal.c:187
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:174
 #, c-format
-#| msgid "Cannot write offline journal for folder `%s': %s"
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "'%s' ààààààà àà ààà àààààà ààààà ààà àààà àààà àà: %s"
 
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:58
 msgid "Virtual folder email provider"
 msgstr "ààààà ààààààà àààà ààààààààà"
 
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:60
 msgid "For reading mail as a query of another set of folders"
 msgstr "àààà ààààààà ààààààà àà àààààà àà ààà ààà ààà ààààà àà ààà"
 
-#: ../camel/camel-provider.c:184
+#: ../camel/camel-provider.c:192
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
-msgstr "%s àààààààà àààà àà ààà: àà àààààà àà ààààààà ààààààà àà àààààà àààà àà."
+msgstr ""
+"%s àààààààà àààà àà ààà: àà àààààà àà ààààààà ààààààà àà àààààà àààà àà."
 
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:201
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s àà àààààààà àààà àà ààà: %s"
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:210
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s àà àààààààà àààà àà ààà: ààààààà ààà ààà àààààààà ààà àààà àà."
 
-#: ../camel/camel-provider.c:373 ../camel/camel-session.c:182
+#: ../camel/camel-provider.c:391 ../camel/camel-session.c:351
 #, c-format
-#| msgid "No provider available for protocol `%s'"
 msgid "No provider available for protocol '%s'"
 msgstr "'%s' ààààààààà àà àààà ààà ààààààà àààààà àààà"
 
-#: ../camel/camel-sasl-anonymous.c:37
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "àààààà"
 
-#: ../camel/camel-sasl-anonymous.c:39
+#: ../camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
 msgstr "àààààà ààààà àà ààààà àà àà àààààà ààààà àà ààààààà."
 
-#: ../camel/camel-sasl-anonymous.c:124 ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:70
+#, c-format
 msgid "Authentication failed."
 msgstr "ààààààà àààà"
 
-#: ../camel/camel-sasl-anonymous.c:133
+#: ../camel/camel-sasl-anonymous.c:81
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -1883,7 +2376,7 @@ msgstr ""
 "àààà àààà ààà ààààààà ààààà:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:145
+#: ../camel/camel-sasl-anonymous.c:95
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1892,7 +2385,7 @@ msgstr ""
 "àààà ààààààààà ààà ààààààà ààààà:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:157
+#: ../camel/camel-sasl-anonymous.c:109
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1901,588 +2394,576 @@ msgstr ""
 "àààà ààààààà ààààà:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:41
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:40
+#: ../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:48
+#: ../camel/camel-sasl-digest-md5.c:54
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:50
+#: ../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:845
+#: ../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:854
+#: ../camel/camel-sasl-digest-md5.c:831
+#, c-format
 msgid "Server challenge invalid\n"
 msgstr "ààààà àààààà àààà àà\n"
 
-#: ../camel/camel-sasl-digest-md5.c:860
+#: ../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:890
+#: ../camel/camel-sasl-digest-md5.c:873
+#, c-format
 msgid "Server response did not contain authorization data"
 msgstr "ààààà ààààààààà àà ààà ààààààààà àààààà àààà àà"
 
-#: ../camel/camel-sasl-digest-md5.c:908
+#: ../camel/camel-sasl-digest-md5.c:894
+#, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "ààààà ààààààààà àà ààà àààààà ààààààààà àààààà àà"
 
-#: ../camel/camel-sasl-digest-md5.c:918
+#: ../camel/camel-sasl-digest-md5.c:907
+#, c-format
 msgid "Server response does not match"
 msgstr "ààààà ààààààààà ààà àààà àààà àà"
 
-#: ../camel/camel-sasl-gssapi.c:64
+#: ../camel/camel-sasl-gssapi.c:86
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:66
+#: ../camel/camel-sasl-gssapi.c:88
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "Kerberos 5 ààààààà àà ààààà àà àà àààààà ààààà àà ààààààà."
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:129
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
 msgstr ""
-"àààà ààà ààààà àà àààààà ààààààààà ààààààààà ààààààà àààà àà, àà ààààààààààà àà àààààà "
+"àààà ààà ààààà àà àààààà ààààààààà ààààààààà ààààààà àààà àà, àà ààààààààààà "
+"àà àààààà "
 "ààààààà àà."
 
-#: ../camel/camel-sasl-gssapi.c:169
+#: ../camel/camel-sasl-gssapi.c:134
 msgid "The provided target_name parameter was ill-formed."
 msgstr "àààà ààà ààààààààà àààààààà àà-ààà àà."
 
-#: ../camel/camel-sasl-gssapi.c:172
+#: ../camel/camel-sasl-gssapi.c:137
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
-msgstr "àààà ààà ààààààààà àààààààà àà àààà àà àààààààà ààà àà àààààà àà àààààà àààà àà."
+msgstr ""
+"àààà ààà ààààààààà àààààààà àà àààà àà àààààààà ààà àà àààààà àà àààààà àààà "
+"àà."
 
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../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:181
+#: ../camel/camel-sasl-gssapi.c:146
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
-msgstr "ààààààà àà ààà àà àààà ààààààààà àà, àà àà ààààààààà àà ààààà ààààà àààà àà ààà àà."
+msgstr ""
+"ààààààà àà ààà àà àààà ààààààààà àà, àà àà ààààààààà àà ààààà ààààà àààà àà "
+"ààà àà."
 
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../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:190
+#: ../camel/camel-sasl-gssapi.c:155
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "àà àà àààààà àààààààà ààààà àààààà àà ààààà àààà àààà."
 
-#: ../camel/camel-sasl-gssapi.c:193
+#: ../camel/camel-sasl-gssapi.c:158
 msgid "The consistency checks performed on the input_token failed."
 msgstr "àààààààà àààà input_token àà àààà ààà."
 
-#: ../camel/camel-sasl-gssapi.c:196
+#: ../camel/camel-sasl-gssapi.c:161
 msgid "The consistency checks performed on the credential failed."
 msgstr "ààààà àà àààà àààààààà àààà àààà ààà."
 
-#: ../camel/camel-sasl-gssapi.c:199
+#: ../camel/camel-sasl-gssapi.c:164
 msgid "The referenced credentials have expired."
 msgstr "ààààà ààààà àà ààà àààààà àà ààà."
 
-#: ../camel/camel-sasl-gssapi.c:205 ../camel/camel-sasl-gssapi.c:253
-#: ../camel/camel-sasl-gssapi.c:289 ../camel/camel-sasl-gssapi.c:304
-#: ../camel/camel-sasl-kerberos4.c:231
-#: ../camel/providers/imap/camel-imap-store.c:1273
+#: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:312
+#: ../camel/camel-sasl-gssapi.c:356 ../camel/camel-sasl-gssapi.c:373
+#: ../camel/providers/smtp/camel-smtp-transport.c:1228
+#, c-format
 msgid "Bad authentication response from server."
 msgstr "ààààà àà ààà ààààààà ààààààààà."
 
-#: ../camel/camel-sasl-gssapi.c:314
+#: ../camel/camel-sasl-gssapi.c:385
+#, c-format
 msgid "Unsupported security layer."
 msgstr "àààààààà ààààààà ààà."
 
-#: ../camel/camel-sasl-kerberos4.c:47
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: ../camel/camel-sasl-kerberos4.c:49
-msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "Kerberos 4 ààààààà àà ààààà àà àà àààààà ààààà àà ààààààà."
-
-#: ../camel/camel-sasl-kerberos4.c:174
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Kerberos àààà àààà àà ààà:\n"
-"%s"
-
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:35
 msgid "Login"
 msgstr "ààààà"
 
-#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:38
+#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
 msgid "This option will connect to the server using a simple password."
 msgstr "àààààà ààààààà àà ààààà àà àà àààààà ààààà àà ààààààà."
 
-#: ../camel/camel-sasl-login.c:135
+#: ../camel/camel-sasl-login.c:92
+#, c-format
 msgid "Unknown authentication state."
 msgstr "àààààà ààààààà àààààà."
 
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:42
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:36
+#: ../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:36
+#: ../camel/camel-sasl-plain.c:39
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:42
 msgid "POP before SMTP"
 msgstr "SMTP àà àààà POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:41
+#: ../camel/camel-sasl-popb4smtp.c:44
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "SMTP àà àààààà àà àààà àà àààààà àà POP ààààààà àà ààààààààà ààààà"
 
-#: ../camel/camel-sasl-popb4smtp.c:106
-msgid "POP Source URI"
+#: ../camel/camel-sasl-popb4smtp.c:80
+#, fuzzy
+#| msgid "POP Source URI"
+msgid "POP Source UID"
 msgstr "POP ààààà URI"
 
-#: ../camel/camel-sasl-popb4smtp.c:109
-msgid "POP Before SMTP auth using an unknown transport"
+#: ../camel/camel-sasl-popb4smtp.c:92
+#, fuzzy, 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:114
-msgid "POP Before SMTP auth using a non-pop source"
-msgstr "àà ààà pop ààààà àà àààààà àà SMTP ààààààààà àà ààààà POP"
+#: ../camel/camel-sasl-popb4smtp.c:104 ../camel/camel-sasl-popb4smtp.c:114
+#, c-format
+msgid "POP Before SMTP authentication attempted with a %s service"
+msgstr ""
 
-#: ../camel/camel-search-private.c:149
+#: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "àààààààà ààààààààà ààààààààà àààà: %s: %s"
 
-#: ../camel/camel-service.c:270
-#, c-format
-msgid "URL '%s' needs a username component"
+#: ../camel/camel-service.c:526
+#, fuzzy, c-format
+#| msgid "URL '%s' needs a username component"
+msgid "URL '%s' needs a user component"
 msgstr "'%s' URL àà àà ààààààààààà ààà àà ààààà àà"
 
-#: ../camel/camel-service.c:274
+#: ../camel/camel-service.c:537
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "'%s' URL àà àà àààààà ààà àà ààààà àà"
 
-#: ../camel/camel-service.c:278
+#: ../camel/camel-service.c:548
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URL àà àà àà ààà àà ààààà àà"
 
-#: ../camel/camel-session.c:308
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"%s àààààààààà àààà ààààààà àà ààà:\n"
-"%s"
+#: ../camel/camel-session.c:361
+#, fuzzy, c-format
+#| msgid "No provider available for protocol '%s'"
+msgid "Invalid GType registered for protocol '%s'"
+msgstr "'%s' ààààààààà àà àààà ààà ààààààà àààààà àààà"
 
-#: ../camel/camel-session.c:483
+#: ../camel/camel-session.c:938
 #, c-format
-#| msgid "%sPlease enter the POP password for %s on host %s"
 msgid "Please enter the %s password for %s on host %s."
 msgstr "ààààà %s ààààààà %s àà ààà %s àààààà àà ààààà àààà."
 
-#: ../camel/camel-session.c:822
-msgid "Camel session doesn't support forwarding of a message."
-msgstr ""
-
-#: ../camel/camel-smime-context.c:440 ../camel/camel-smime-context.c:984
+#: ../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:446
+#: ../camel/camel-smime-context.c:372
 msgid "Cannot create CMS message"
 msgstr "CMS ààààà àààà ààààààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:451
+#: ../camel/camel-smime-context.c:377
 msgid "Cannot create CMS signed data"
 msgstr "CMS ààààààààààà àààààà àààà ààààààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:457
+#: ../camel/camel-smime-context.c:383
 msgid "Cannot attach CMS signed data"
 msgstr "CMS ààààààààààà àààààà àààà àààààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:464
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS data"
 msgstr "CMS àààààà àààà àààààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:470
+#: ../camel/camel-smime-context.c:396
 msgid "Cannot create CMS Signer information"
 msgstr "CMS àààààààààààààà ààààà àààà ààààààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:476
+#: ../camel/camel-smime-context.c:402
 msgid "Cannot find certificate chain"
 msgstr "àààààààààà àààààààà àààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:482
+#: ../camel/camel-smime-context.c:408
 msgid "Cannot add CMS Signing time"
 msgstr "CMS ààààààààà ààà àààà àààà àààà"
 
-#: ../camel/camel-smime-context.c:504 ../camel/camel-smime-context.c:516
+#: ../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:523
+#: ../camel/camel-smime-context.c:454
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "SMIMEEncKeyPrefs ààà ààà àààà àààà àààà àà"
 
-#: ../camel/camel-smime-context.c:528
+#: ../camel/camel-smime-context.c:459
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "MS SMIMEEncKeyPrefs ààà ààà àààà àààà àààà àà"
 
-#: ../camel/camel-smime-context.c:533
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot add encryption certificate"
 msgstr "àààà àààààààààà àààà àààà àààà àà"
 
-#: ../camel/camel-smime-context.c:539
+#: ../camel/camel-smime-context.c:470
 msgid "Cannot add CMS Signer information"
 msgstr "CMS Signer ààààà àààà àààà àààà àà"
 
-#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:1056
-msgid "Cannot create encoder context"
-msgstr "àààààà àààààà àààà ààà àààà"
-
-#: ../camel/camel-smime-context.c:615
-msgid "Failed to add data to CMS encoder"
-msgstr "CMS àààààà ààà àààààà àààààà ààà àààà"
-
-#: ../camel/camel-smime-context.c:620 ../camel/camel-smime-context.c:1073
-msgid "Failed to encode data"
-msgstr "àààààà ààààà ààà àààà"
-
-#: ../camel/camel-smime-context.c:693
+#. Translators: A fallback message when couldn't verify an SMIME signature
+#: ../camel/camel-smime-context.c:503
 msgid "Unverified"
 msgstr "ààààààààà"
 
-#: ../camel/camel-smime-context.c:695
+#: ../camel/camel-smime-context.c:505
 msgid "Good signature"
 msgstr "ààààà ààààààààà"
 
-#: ../camel/camel-smime-context.c:697
+#: ../camel/camel-smime-context.c:507
 msgid "Bad signature"
 msgstr "ààà ààààààààà"
 
-#: ../camel/camel-smime-context.c:699
+#: ../camel/camel-smime-context.c:509
 msgid "Content tampered with or altered in transit"
 msgstr "àààààà ààà ààààà àààà ààààààà"
 
-#: ../camel/camel-smime-context.c:701
+#: ../camel/camel-smime-context.c:511
 msgid "Signing certificate not found"
 msgstr "àààààààààà àà ààààààààà àààà àààà"
 
-#: ../camel/camel-smime-context.c:703
+#: ../camel/camel-smime-context.c:513
 msgid "Signing certificate not trusted"
 msgstr "àààààààààà àà ààààààààà àààààààà àààà"
 
-#: ../camel/camel-smime-context.c:705
+#: ../camel/camel-smime-context.c:515
 msgid "Signature algorithm unknown"
 msgstr "ààààààààà àààààààà àààààà"
 
-#: ../camel/camel-smime-context.c:707
+#: ../camel/camel-smime-context.c:517
 msgid "Signature algorithm unsupported"
 msgstr "ààààààààà àààààààà àààààààà"
 
-#: ../camel/camel-smime-context.c:709
+#: ../camel/camel-smime-context.c:519
 msgid "Malformed signature"
 msgstr "ààààà ààààààààà "
 
-#: ../camel/camel-smime-context.c:711
+#: ../camel/camel-smime-context.c:521
 msgid "Processing error"
 msgstr "ààààààààà ààà"
 
-#: ../camel/camel-smime-context.c:748
+#: ../camel/camel-smime-context.c:566
 msgid "No signed data in signature"
 msgstr "ààààààààà ààà ààà ààààààààààà àààààà àààà"
 
-#: ../camel/camel-smime-context.c:755
+#: ../camel/camel-smime-context.c:571
 msgid "Digests missing from enveloped data"
 msgstr "ààààààààà ààààààà àà àààààààà àààà ààà ààà àà"
 
-#: ../camel/camel-smime-context.c:768 ../camel/camel-smime-context.c:778
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
 msgstr "àààààààà àà àààà àààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:783
+#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
 msgstr "ààààà àààààààà ààà àààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:793 ../camel/camel-smime-context.c:798
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
 msgstr "àààààààààà àààà àààà"
 
-#: ../camel/camel-smime-context.c:808
+#: ../camel/camel-smime-context.c:631
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "ààààà ààààà àà àààààààààà ààà, àààààààààààà àà àààà àààà àà àààà"
 
-#: ../camel/camel-smime-context.c:811
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "àààààààààà ààààà ààààà àà, àààààààààà àààààà àààà ààà àà àààà àààà ààà"
 
-#: ../camel/camel-smime-context.c:815
+#: ../camel/camel-smime-context.c:638
 msgid "Cannot find signature digests"
 msgstr "ààààààààà àààààààà ààààààà àààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:831
+#: ../camel/camel-smime-context.c:654
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "àààààààààààààà: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:932 ../camel/camel-smime-context.c:1156
+#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1123
+msgid "Cannot create encoder context"
+msgstr "àààààà àààààà àààà ààà àààà"
+
+#: ../camel/camel-smime-context.c:841
+msgid "Failed to add data to CMS encoder"
+msgstr "CMS àààààà ààà àààààà àààààà ààà àààà"
+
+#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1140
+msgid "Failed to encode data"
+msgstr "àààààà ààààà ààà àààà"
+
+#: ../camel/camel-smime-context.c:989 ../camel/camel-smime-context.c:1236
 msgid "Decoder failed"
 msgstr "àààààà àààà"
 
-#: ../camel/camel-smime-context.c:991
+#: ../camel/camel-smime-context.c:1058
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "àààà àààààà àààà àààààààà ààààààà àààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:999
+#: ../camel/camel-smime-context.c:1066
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "àààà àààà ààààà àà àààà ààààà àààààà àààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:1010
+#: ../camel/camel-smime-context.c:1077
 msgid "Cannot create CMS Message"
 msgstr "CMS ààààà àààà ààààààà àà àààà"
 
-#: ../camel/camel-smime-context.c:1016
+#: ../camel/camel-smime-context.c:1083
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS ààààààààà àààààà ààà àààà àààà àà"
 
-#: ../camel/camel-smime-context.c:1022
+#: ../camel/camel-smime-context.c:1089
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS ààààààààà àààààà àààààà àààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:1028
+#: ../camel/camel-smime-context.c:1095
 msgid "Cannot attach CMS data object"
 msgstr "CMS àààààà ààààà àààààà àààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:1104
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS àààààààààààà ààààà ààààààà àààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:1042
+#: ../camel/camel-smime-context.c:1109
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS àààààààààààà ààààà àààà àààà àààà àà"
 
-#: ../camel/camel-smime-context.c:1067
+#: ../camel/camel-smime-context.c:1134
 msgid "Failed to add data to encoder"
 msgstr "àààààà ààà àààààà àààààà ààà àààà"
 
-#: ../camel/camel-smime-context.c:1163
+#: ../camel/camel-smime-context.c:1243
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME àààààà àààà: ààà ààààà ààààààààà ààààààà àààà ààà"
 
-#: ../camel/camel-smime-context.c:1190
-msgid "import keys: unimplemented"
-msgstr "àààà ààààà: àààà àààà ààà"
-
-#: ../camel/camel-smime-context.c:1198
-msgid "export keys: unimplemented"
-msgstr "ààààààà ààààà: àààà àààà ààà"
-
-#: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:174
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "ààààààà ààààààà àààà àà àààà àà: àà ààààà àà àààà àààààààà"
-
-#: ../camel/camel-store.c:316
+#: ../camel/camel-store.c:1814
 #, c-format
-#| msgid "Cannot create folder `%s': folder exists"
 msgid "Cannot create folder '%s': folder exists"
 msgstr "'%s' ààààààà ààààààà àààà àà àààà àà: ààààààà ààààà àà"
 
-#: ../camel/camel-store.c:395
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr "ààààààà ààààààà àààà àà àààà àà: àà ààààà àà àààà àààààààà"
-
-#: ../camel/camel-store.c:423
-#, c-format
-msgid "Cannot create folder: %s: folder exists"
-msgstr "ààààààà ààààààà àààà àà àààà àà: %s: ààààààà ààààà àà"
-
-#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:384
-#: ../camel/providers/local/camel-maildir-store.c:219
-#, c-format
-msgid "Cannot delete folder: %s: Invalid operation"
-msgstr "ààààààà ààààààà àààà àà àààà àà: %s: àààà àààààààà"
+#: ../camel/camel-store.c:1857
+#, fuzzy, c-format
+#| msgid "Syncing folders"
+msgid "Opening folder '%s'"
+msgstr "ààààààà àà ààààààààà àà ààà àà"
 
-#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:421
-#: ../camel/providers/local/camel-maildir-store.c:291
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "ààààààà àà ààà àààà ààà àààà àà: %s: àààà àààààààà"
+#: ../camel/camel-store.c:2042
+#, fuzzy, c-format
+#| msgid "Scanning for changed messages in %s"
+msgid "Scanning folders in '%s'"
+msgstr "%s ààà ààààààààà ààààà àà àààà àààààààà"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:899 ../camel/camel-vtrash-folder.c:54
-#: ../camel/providers/imap/camel-imap-store.c:1061
+#: ../camel/camel-store.c:2054 ../camel/camel-store.c:2064
+#: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "ààààà"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:902 ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-store.c:2057 ../camel/camel-store.c:2068
+#: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "ààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:572
-msgid "Unable to get issuer's certificate"
-msgstr "ààààààà àà àààààààààà àà àààà ààà àààààà"
-
-#: ../camel/camel-tcp-stream-openssl.c:574
-msgid "Unable to get Certificate Revocation List"
-msgstr "àààààààààà ààààà àààà àààà ààà àààààà"
-
-#: ../camel/camel-tcp-stream-openssl.c:576
-msgid "Unable to decrypt certificate signature"
-msgstr "àààààààààà ààààààààà àà àààààà ààà àààààà"
-
-#: ../camel/camel-tcp-stream-openssl.c:578
-msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "àààààààààà ààààà àààà ààààààààà àà àààààà ààà àààààà"
-
-#: ../camel/camel-tcp-stream-openssl.c:580
-msgid "Unable to decode issuer's public key"
-msgstr "ààààààà ààààààààà ààààà ààààà àààà ààà àààààà"
-
-#: ../camel/camel-tcp-stream-openssl.c:582
-msgid "Certificate signature failure"
-msgstr "àààààààààà ààààààààà àààààà"
+#: ../camel/camel-store.c:2519
+#, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "ààààààà ààààààà àààà àà àààà àà: %s: ààààààà ààààà àà"
 
-#: ../camel/camel-tcp-stream-openssl.c:584
-msgid "Certificate Revocation List signature failure"
-msgstr "àààààààààà ààààà àààà ààààààààà àààààà"
+#: ../camel/camel-store.c:2533
+#, fuzzy, c-format
+#| msgid "Cannot get folder '%s': %s"
+msgid "Creating folder '%s'"
+msgstr "'%s' ààààààà àààà ààààààà àà àààà àà: %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:586
-msgid "Certificate not yet valid"
-msgstr "àààààààààà àà ààà àààà àà"
+#: ../camel/camel-store.c:2651 ../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-tcp-stream-openssl.c:588
-msgid "Certificate has expired"
-msgstr "àààààààààà àà ààà àààà àààààà àà àààà àà"
+#: ../camel/camel-store.c:2794 ../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-tcp-stream-openssl.c:590
-msgid "CRL not yet valid"
-msgstr "CRL àà ààà àààà àà"
+#: ../camel/camel-stream-filter.c:327
+msgid "Only reset to beginning is supported with CamelStreamFilter"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:592
-msgid "CRL has expired"
-msgstr "CRL àà ààà àààà àààààà àà àààà àà"
+#: ../camel/camel-stream-process.c:265
+#, c-format
+msgid "Connection cancelled"
+msgstr "ààààààà àààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Error in CRL"
-msgstr "CRL ààà ààà"
+#: ../camel/camel-stream-process.c:270
+#, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "\"%s\" ààààà àà àààà àààà ààà: %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:599
-msgid "Out of memory"
-msgstr "àààààà àà àààà"
+#: ../camel/camel-tcp-stream-raw.c:749 ../camel/camel-tcp-stream-raw.c:760
+#, c-format
+msgid "The proxy host does not support SOCKS4"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:601
-msgid "Zero-depth self-signed certificate"
-msgstr "ààààà-àààà ààà-ààààààààààà àààààààààà"
+#: ../camel/camel-tcp-stream-raw.c:771
+#, c-format
+msgid "The proxy host denied our request: code %d"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:603
-msgid "Self-signed certificate in chain"
-msgstr "àààààààà ààà ààà-ààààààààààà àààààààààà"
+#: ../camel/camel-tcp-stream-raw.c:867 ../camel/camel-tcp-stream-raw.c:873
+#, c-format
+msgid "The proxy host does not support SOCKS5"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:605
-msgid "Unable to get issuer's certificate locally"
-msgstr "ààààààà àà àààààààààà àà ààààààà àààà àà àààà ààà àààààà"
+#: ../camel/camel-tcp-stream-raw.c:879
+#, fuzzy, c-format
+#| msgid "No support for authentication type %s"
+msgid "Could not find a suitable authentication type: code 0x%x"
+msgstr "ààààààà àààààà %s àà àààà ààà àààààà àààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:607
-msgid "Unable to verify leaf signature"
-msgstr "ààà ààààààààà àà àààà ààà àààààà"
+#: ../camel/camel-tcp-stream-raw.c:891
+msgid "General SOCKS server failure"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:609
-msgid "Certificate chain too long"
-msgstr "àààààààààà àààààààà àààààà àààà àà"
+#: ../camel/camel-tcp-stream-raw.c:892
+msgid "SOCKS server's rules do not allow connection"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:611
-msgid "Certificate Revoked"
-msgstr "àààààààààà àààààà"
+#: ../camel/camel-tcp-stream-raw.c:893
+msgid "Network is unreachable from SOCKS server"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:613
-msgid "Invalid Certificate Authority (CA)"
-msgstr "àààà àààààààààà ààààààààà (CA)"
+#: ../camel/camel-tcp-stream-raw.c:894
+msgid "Host is unreachable from SOCKS server"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:615
-msgid "Path length exceeded"
-msgstr "àà ààààà àààààà àà ààà"
+#: ../camel/camel-tcp-stream-raw.c:895
+#| msgid "Connection canceled"
+msgid "Connection refused"
+msgstr "ààààààà àààààààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:617
-msgid "Invalid purpose"
-msgstr "àààà àààààààà"
+#: ../camel/camel-tcp-stream-raw.c:896
+msgid "Time-to-live expired"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:619
-msgid "Certificate untrusted"
-msgstr "àààààààààà àà ààààààà àààà àààà ààà"
+#: ../camel/camel-tcp-stream-raw.c:897
+#, fuzzy
+#| msgid "STLS not supported by server"
+msgid "Command not supported by SOCKS server"
+msgstr "SSLS ààààà àààààà ààààààà àààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:621
-msgid "Certificate rejected"
-msgstr "àààààààààà àààààààà"
+#: ../camel/camel-tcp-stream-raw.c:898
+#, fuzzy
+#| msgid "STLS not supported by server"
+msgid "Address type not supported by SOCKS server"
+msgstr "SSLS ààààà àààààà ààààààà àààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:624
-msgid "Subject/Issuer mismatch"
-msgstr "àààà/ààààààà ààààà"
+#: ../camel/camel-tcp-stream-raw.c:899
+#, fuzzy
+#| msgid "Unknown error: %s"
+msgid "Unknown error from SOCKS server"
+msgstr "àààààà ààà:%s"
 
-#: ../camel/camel-tcp-stream-openssl.c:626
-msgid "AKID/SKID mismatch"
-msgstr "AKID/SKID ààààà"
+#: ../camel/camel-tcp-stream-raw.c:932
+#, c-format
+msgid "Got unknown address type from SOCKS server"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:628
-msgid "AKID/Issuer serial mismatch"
-msgstr "AKID/ààààààà àààààààà ààààà"
+#: ../camel/camel-tcp-stream-raw.c:950
+#, fuzzy, c-format
+#| msgid "Invalid response from server"
+msgid "Incomplete reply from SOCKS server"
+msgstr "ààààà àà ààà ààààààààà."
 
-#: ../camel/camel-tcp-stream-openssl.c:630
-msgid "Key usage does not support certificate signing"
-msgstr "ààààà àààààà àààààààààà ààààààààà àà àààààà àààà àààà"
+#: ../camel/camel-tcp-stream-raw.c:970
+#, c-format
+msgid "Hostname is too long (maximum is 255 characters)"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:633
-msgid "Error in application verification"
-msgstr "ààààà àààà ààà ààà"
+#. SOCKS5
+#. reserved - must be 0
+#: ../camel/camel-tcp-stream-raw.c:1002 ../camel/camel-tcp-stream-raw.c:1012
+#, fuzzy, c-format
+#| msgid "Invalid response from server"
+msgid "Invalid reply from proxy server"
+msgstr "ààààà àà ààà ààààààààà."
 
-#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-ssl.c:453
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2495,35 +2976,16 @@ msgstr ""
 "ààààààààààà:       %s\n"
 "ààààààààà:         %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "GOOD"
 msgstr "ààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "BAD"
 msgstr "ààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:708
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
-msgstr ""
-"%s àà ààà àààààààààà:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"àààà àà àààà ààà ààààààà àààà ààààà ààà?"
-
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:890
+#: ../camel/camel-tcp-stream-ssl.c:463
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2538,7 +3000,7 @@ msgstr ""
 "\n"
 "àààà àà ààààààà àààà ààààà ààà?"
 
-#: ../camel/camel-tcp-stream-ssl.c:934
+#: ../camel/camel-tcp-stream-ssl.c:507
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2547,7 +3009,7 @@ msgstr ""
 "àààààààààà àààààà: %s\n"
 "ààààààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:986
+#: ../camel/camel-tcp-stream-ssl.c:559
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2556,7 +3018,7 @@ msgstr ""
 "ààà àààààààààà ààààà: %s\n"
 "ààààààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1004
+#: ../camel/camel-tcp-stream-ssl.c:577
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2565,7 +3027,7 @@ msgstr ""
 "àààààààààà àààààà àà ààà: %s\n"
 "ààààààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1021
+#: ../camel/camel-tcp-stream-ssl.c:594
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2574,380 +3036,69 @@ msgstr ""
 "àààààààààà ààààà àààà àà ààà àààà àààààà àà àààà àà: %s\n"
 "ààààààà: %s"
 
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:330
 #, c-format
-#| msgid "Could not parse URL `%s'"
 msgid "Could not parse URL '%s'"
 msgstr "'%s' URL àà àààààààà àààà àà ààà"
 
-#: ../camel/camel-vee-folder.c:582
+#: ../camel/camel-vee-folder.c:1297 ../camel/camel-vee-folder.c:1457
 #, c-format
-#| msgid "Error storing `%s': %s"
-msgid "Error storing '%s': %s"
-msgstr "'%s' àà ààààà àààà ààà àààààà: %s"
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "ààààà ààààààà ààà ààààààà àà àààà àà àààààààààààà àààà àà àààà àà"
 
-#: ../camel/camel-vee-folder.c:660
+#: ../camel/camel-vee-folder.c:1330
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%s ààà %s ààà ààà ààààà àààà"
 
-#: ../camel/camel-vee-folder.c:820 ../camel/camel-vee-folder.c:826
-msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "ààààà ààààààà ààà ààààààà àà àààà àà àààààààààààà àààà àà àààà àà"
+#: ../camel/camel-vee-folder.c:1398
+#, fuzzy, c-format
+#| msgid "Error storing '%s': %s"
+msgid "Error storing '%s': "
+msgstr "'%s' àà ààààà àààà ààà àààààà: %s"
 
-#: ../camel/camel-vee-store.c:114 ../camel/camel-vee-store.c:115
-#: ../camel/camel-vee-store.c:360
+#. 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:407
+#: ../camel/camel-vee-store.c:376
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "ààààààà ààààààà àààà àà àààà àà: %s:ààà ààà ààààààà àààà"
 
-#: ../camel/camel-vee-store.c:429
+#: ../camel/camel-vee-store.c:410
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "ààààààà àà ààà àààà ààà àààà àà: %s:ààà ààà ààààààà àààà"
 
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "ààààà ààààààà àà ààààààà àà àààà àààà àà àààà àà"
 
-#: ../camel/camel-vtrash-folder.c:57
+#: ../camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
 msgstr "ààà ààààààà àà ààààààà àà àààà àààà àà àààà àà"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"ààààà àààà àà àààà àà: %s\n"
-"  %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
-#: ../camel/providers/local/camel-maildir-folder.c:248
-#: ../camel/providers/local/camel-maildir-folder.c:275
-#: ../camel/providers/local/camel-mbox-folder.c:347
-#: ../camel/providers/local/camel-mbox-folder.c:399
-#: ../camel/providers/local/camel-mh-folder.c:214
-msgid "No such message"
-msgstr "ààà ààà ààààà àààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:148
-#: ../camel/providers/imap4/camel-imap4-folder.c:821
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:251
-#: ../camel/providers/nntp/camel-nntp-folder.c:411
-#: ../camel/providers/pop3/camel-pop3-folder.c:268
-#: ../camel/providers/pop3/camel-pop3-folder.c:578
-#: ../camel/providers/pop3/camel-pop3-folder.c:639
-#: ../camel/providers/pop3/camel-pop3-folder.c:657
-msgid "User canceled"
-msgstr "àààààààà àààà àà àààà ààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
-#: ../camel/providers/imap4/camel-imap4-folder.c:826
-#: ../camel/providers/nntp/camel-nntp-folder.c:166
-#: ../camel/providers/nntp/camel-nntp-folder.c:168
-#: ../camel/providers/nntp/camel-nntp-folder.c:177
-#: ../camel/providers/nntp/camel-nntp-folder.c:253
-#: ../camel/providers/pop3/camel-pop3-folder.c:388
-#: ../camel/providers/pop3/camel-pop3-folder.c:581
-#: ../camel/providers/pop3/camel-pop3-folder.c:642
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-#: ../camel/providers/pop3/camel-pop3-folder.c:660
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "%s ààààà ààààààà àààà àà àààà: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:180
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2303
-#: ../camel/providers/imap4/camel-imap4-folder.c:844
-msgid "This message is not available in offline mode."
-msgstr "ààààààà ààà ààààà àààààà àààà àà."
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:192
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:199
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1818
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1869
-msgid "Could not get message"
-msgstr "ààààà àààà ààà ààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:883
-#: ../camel/providers/imap/camel-imap-folder.c:265
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "%s àà àààà àààààà àààààààà àààà àà ààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1143
-msgid "Trash Folder Full. Please Empty."
-msgstr "ààààà ààààààà ààààà. ààààà àààà àààà."
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1352
-#: ../camel/providers/groupwise/camel-groupwise-store.c:617
-#: ../camel/providers/groupwise/camel-groupwise-store.c:743
-#: ../camel/providers/imap/camel-imap-folder.c:3362
-#: ../camel/providers/imap/camel-imap-folder.c:3438
-#, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "%s ààà àà ààààà àà àààà àààààà ààààà àà ààà àà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2157
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2200
-#, c-format
-#| msgid "Cannot append message to folder `%s': %s"
-msgid "Cannot append message to folder '%s': %s"
-msgstr "'%s' ààààààà ààà ààààà àààà àààà àààà àà: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2188
-#, c-format
-msgid "Cannot create message: %s"
-msgstr "ààààà ààà àààà àààà: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:285
-#, c-format
-msgid "Cannot get folder container %s"
-msgstr "ààààààà àààààà àààà àà àààà àà: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:349
-#: ../camel/providers/imap4/camel-imap4-journal.c:319
-msgid "Cannot append message in offline mode: cache unavailable"
-msgstr "àààààà ààà ààà ààààà àààà àààà àààà: ààà àààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:365
-#: ../camel/providers/imap4/camel-imap4-journal.c:335
-#, c-format
-msgid "Cannot append message in offline mode: %s"
-msgstr "àààààà ààà ààà ààààà àààà àààà àà àààà: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
-#: ../camel/providers/imap4/camel-imap4-provider.c:39
-msgid "Checking for new mail"
-msgstr "ààà ààà àà àààà àààà ààà àà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
-#: ../camel/providers/hula/camel-hula-provider.c:51
-#: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:41
-msgid "C_heck for new messages in all folders"
-msgstr "ààà ààààààà ààà ààà ààààà àà àààà àààààà (_h)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:52
-#: ../camel/providers/local/camel-local-provider.c:46
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:106
-msgid "Options"
-msgstr "àààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:62
-#| msgid "Apply filters to new messages in Inbox on this server"
-msgid "_Apply filters to new messages in Inbox on this server"
-msgstr "àà ààààà àà ààààààà ààà àà ààààà àà ààà àààààà ààààà (_A)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:64
-#| msgid "Check new messages for Junk contents"
-msgid "Check new messages for J_unk contents"
-msgstr "ààà ààààà àà ààà àààààààààà àà àààà àààààà (_u)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
-#: ../camel/providers/imap/camel-imap-provider.c:74
-#| msgid "Only check for Junk messages in the INBOX folder"
-msgid "Only check for Junk messages in the IN_BOX folder"
-msgstr "ààààààà ààààààà ààà ààààà ààà ààààà àà àààà àààààà (_B)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:68
-#| msgid "Automatically synchronize account locally"
-msgid "Automatically synchroni_ze account locally"
-msgstr "àààààààà ààààààààà àààà ààààààà ààà àà (_z)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:73
-msgid "SOAP Settings"
-msgstr "SOAP ààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:76
-#| msgid "Post Office Agent SOAP Port:"
-msgid "Post Office Agent SOAP _Port:"
-msgstr "ààà àà ààààà SOAP ààààà (_P):"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
-msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:91
-msgid "For accessing Novell GroupWise servers"
-msgstr "Novell Groupwise servers àà ààààà àà ààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
-#: ../camel/providers/hula/camel-hula-provider.c:95
-#: ../camel/providers/imap/camel-imap-provider.c:100
-#: ../camel/providers/imap4/camel-imap4-provider.c:84
-#: ../camel/providers/imapp/camel-imapp-provider.c:67
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:72
-msgid "Password"
-msgstr "ààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:108
-msgid "This option will connect to the GroupWise server using a plaintext password."
-msgstr "ààààààààààà ààààààà àà ààààà àà àà àààààà ààààààààà ààààà àà ààààààà."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:104
-msgid "Host or user not available in url"
-msgstr "url ààà àààààà àà àààààààà àààààà àààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:207
-#: ../camel/providers/imap/camel-imap-store.c:1357
-msgid "You did not enter a password."
-msgstr "àààà ààààààà àààà ààààà àààà."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:303
-msgid "Some features may not work correctly with your current server version"
-msgstr "àààà àààààà ààààà ààààààà àà àààà ààà àààà ààà àààà àààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:524
-#: ../camel/providers/imap/camel-imap-store.c:1849
-#: ../camel/providers/imap/camel-imap-store.c:2047
-#, c-format
-msgid "No such folder %s"
-msgstr "ààà ààà %s ààààààà àààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1241
-msgid "Cannot create GroupWise folders in offline mode."
-msgstr "ààààààà ààà ààà GroupWise ààààààà ààà àà àààà."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1255
-#: ../camel/providers/imap/camel-imap-store.c:1924
-#: ../camel/providers/imap/camel-imap-store.c:2304
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "àààà ààààààà àà ààààààààà àààà àà àààààà àààà àà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1333
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
-#, c-format
-#| msgid "Cannot rename Groupwise folder `%s' to `%s'"
-msgid "Cannot rename GroupWise folder '%s' to '%s'"
-msgstr "àààààààà ààààààà '%s' àà '%s' ààà ààà àààà ààà ààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1391
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:121
-#, c-format
-msgid "GroupWise server %s"
-msgstr "GroupWise ààààà %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1393
-#, c-format
-msgid "GroupWise service for %s on %s"
-msgstr "%s àà %s àà ààà àààà àà àààà àà àààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:123
-#, c-format
-msgid "GroupWise mail delivery via %s"
-msgstr "%s àà àààààà àààà àà àààà àà ààà àààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:167
-msgid "Sending Message"
-msgstr "ààààà ààà ààà àà"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:221
-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 ""
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:209
+#: ../camel/providers/imap/camel-imap-command.c:198
+#: ../camel/providers/imap/camel-imap-command.c:293
 #, c-format
-msgid "Could not send message: %s"
-msgstr "ààààà àààà ààà ààà: %s"
-
-#: ../camel/providers/hula/camel-hula-provider.c:49
-#: ../camel/providers/imap/camel-imap-provider.c:44
-msgid "Checking for New Mail"
-msgstr "ààà ààà àà àààà àààà"
-
-#: ../camel/providers/hula/camel-hula-provider.c:54
-#: ../camel/providers/imap/camel-imap-provider.c:52
-msgid "Connection to Server"
-msgstr "ààààà àà ààààà"
-
-#: ../camel/providers/hula/camel-hula-provider.c:56
-#: ../camel/providers/imap/camel-imap-provider.c:54
-msgid "_Use custom command to connect to server"
-msgstr "ààààà àà àààààà àà ààà ààààà ààààà àà àààààà àààà (_U)"
-
-#: ../camel/providers/hula/camel-hula-provider.c:58
-#: ../camel/providers/imap/camel-imap-provider.c:56
-msgid "Command:"
-msgstr "ààààà:"
-
-#: ../camel/providers/hula/camel-hula-provider.c:61
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:44
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid "Folders"
-msgstr "ààààààààà"
-
-#: ../camel/providers/hula/camel-hula-provider.c:63
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:46
-msgid "_Show only subscribed folders"
-msgstr "ààààààà ààà ààà ààààààààà àà àààààà (_S)"
-
-#: ../camel/providers/hula/camel-hula-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:48
-msgid "O_verride server-supplied folder namespace"
-msgstr "ààààà ààààààà ààààààà àààààààà àààààààààà àààà (_v)"
-
-#: ../camel/providers/hula/camel-hula-provider.c:67
-msgid "Namespace"
-msgstr "àààààààà"
-
-#: ../camel/providers/hula/camel-hula-provider.c:78
-msgid "Hula"
-msgstr "àààà"
-
-#: ../camel/providers/hula/camel-hula-provider.c:80
-msgid "For accessing Hula servers"
-msgstr "àààà ààààà àà ààààà àà ààà"
-
-#: ../camel/providers/hula/camel-hula-provider.c:97
-msgid "This option will connect to the Hula server using a plaintext password."
-msgstr "àààà ààà ààààààà àà ààààà àà àà àààààà IMAP ààààà àà ààààààà."
-
-#: ../camel/providers/imap/camel-imap-command.c:183
-#: ../camel/providers/imap/camel-imap-command.c:267
 msgid "No output stream"
 msgstr "ààà àààààà ààààààà àààà"
 
-#: ../camel/providers/imap/camel-imap-command.c:188
-#: ../camel/providers/imap/camel-imap-command.c:272
+#: ../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:231
-#: ../camel/providers/imap/camel-imap-command.c:280
-#: ../camel/providers/imap/camel-imap-command.c:494
-#: ../camel/providers/imap/camel-imap-store.c:3037
-msgid "Operation cancelled"
-msgstr "àààààà àààà"
-
-#: ../camel/providers/imap/camel-imap-command.c:333
-#: ../camel/providers/imap/camel-imap-store.c:3040
+#: ../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:354
+#: ../camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -2956,263 +3107,300 @@ msgstr ""
 "IMAP ààààà %s %s àà àààà àààà:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:423
+#: ../camel/providers/imap/camel-imap-command.c:471
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP ààààà àà ààààààààààà ààààààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:433
+#: ../camel/providers/imap/camel-imap-command.c:483
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ààààà àààà: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:508
+#: ../camel/providers/imap/camel-imap-command.c:563
+#, c-format
 msgid "Server response ended too soon."
 msgstr "ààààà ààààààààà àààà àààà àààààà àà àà."
 
-#: ../camel/providers/imap/camel-imap-command.c:715
+#: ../camel/providers/imap/camel-imap-command.c:774
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP ààààà ààààààààà àà ààà %s ààààà àààà àà"
 
-#: ../camel/providers/imap/camel-imap-command.c:751
+#: ../camel/providers/imap/camel-imap-command.c:812
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP ààààà àà ààààààààààà OK ààààààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:89
-#| msgid "Only check for Junk messages in the INBOX folder"
+#: ../camel/providers/imap/camel-imap-folder.c:296
 msgid "Always check for new mail in this folder"
 msgstr "àà ààààààà ààà ààààà àà ààààà àà àààà àààààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:246
+#: ../camel/providers/imap/camel-imap-folder.c:370
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "%s àààààààààà ààààààà àààà àà ààà: %s"
 
-#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:891
+#: ../camel/providers/imap/camel-imap-folder.c:393
 #, c-format
-msgid "Scanning for changed messages in %s"
-msgstr "%s ààà ààààààààà ààààà àà àààà àààààààà"
+msgid "Could not load summary for %s"
+msgstr "%s àà àààà àààààà àààààààà àààà àà ààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1950
+#: ../camel/providers/imap/camel-imap-folder.c:1049
+#: ../camel/providers/imapx/camel-imapx-server.c:4018
 #, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-folder.c:1965
-msgid "No response on continuation after APPEND command"
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-folder.c:2010
-msgid "Unknown error occurred during APPEND command!"
-msgstr ""
+msgid "Scanning for changed messages in %s"
+msgstr "%s ààà ààààààààà ààààà àà àààà àààààààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2842
-#, c-format
-msgid "Unable to retrieve message: %s"
+#: ../camel/providers/imap/camel-imap-folder.c:3462
+#, fuzzy
+#| msgid "Unable to retrieve message: %s"
+msgid "Unable to retrieve message: "
 msgstr "ààààà àààààààààààà àààà ààà àààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2877
+#: ../camel/providers/imap/camel-imap-folder.c:3497
+#: ../camel/providers/imapx/camel-imapx-server.c:5291
 #, c-format
-#| msgid "Cannot get message %s: %s"
 msgid "Cannot get message with message ID %s: %s"
 msgstr "%s ààààà àààà àà ààààà ààààààà àààà àà àààà: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2878
-#| msgid "No such message"
+#: ../camel/providers/imap/camel-imap-folder.c:3498
+#: ../camel/providers/imapx/camel-imapx-server.c:5292
 msgid "No such message available."
 msgstr "ààà ààà ààààà àààààà àààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2932
-#: ../camel/providers/imap/camel-imap-folder.c:3753
-#: ../camel/providers/nntp/camel-nntp-folder.c:239
+#: ../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:3567
+#: ../camel/providers/imap/camel-imap-folder.c:4075
+#: ../camel/providers/imap/camel-imap-folder.c:4158
+#: ../camel/providers/imapx/camel-imapx-server.c:3976
+#: ../camel/providers/imapx/camel-imapx-server.c:4126
+#, 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:3575
+#: ../camel/providers/imap/camel-imap-folder.c:4302
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "àààààà ààààà ààààààààà: %d ààààà àà àààà ààà UID àààà àààà ààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3791
+#: ../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:182
-#: ../camel/providers/imap/camel-imap-message-cache.c:246
-#, c-format
-msgid "Could not open cache directory: %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:193
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
+#, fuzzy
+#| msgid "Could not open cache directory: %s"
+msgid "Could not open cache directory: "
 msgstr "ààà àààààààààà ààà àààà ààà: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:333
-#: ../camel/providers/imap/camel-imap-message-cache.c:390
-#: ../camel/providers/imap/camel-imap-message-cache.c:421
-#: ../camel/providers/imap/camel-imap-message-cache.c:453
+#: ../camel/providers/imap/camel-imap-message-cache.c:326
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "%s ààààà ààà àààà ààà àààà: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:533
-#, c-format
-msgid "Failed to cache %s: %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:391
+#, fuzzy, c-format
+#| msgid "Failed to cache message %s: %s"
+msgid "Failed to cache message %s: "
+msgstr "%s ààààà ààà àààà ààà àààà: %s"
+
+#: ../camel/providers/imap/camel-imap-message-cache.c:531
+#, fuzzy, c-format
+#| msgid "Failed to cache %s: %s"
+msgid "Failed to cache %s: "
 msgstr "%s ààà àààà ààà àààà: %s"
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
-#| msgid "Check for new messages in all folders"
+#: ../camel/providers/imap/camel-imap-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
+msgid "Checking for New Mail"
+msgstr "ààà ààà àà àààà àààà"
+
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
+msgid "C_heck for new messages in all folders"
+msgstr "ààà ààààààà ààà ààà ààààà àà àààà àààààà (_h)"
+
+#: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "ààààààà àààà ààààààà ààà ààà ààààà àà àààà àààààà (_e)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:50
-msgid "Namespace:"
-msgstr "àààààààà:"
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:52
+msgid "Connection to Server"
+msgstr "ààààà àà ààààà"
 
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:54
-msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "àà ààààà àà INBOX ààà àà ààààà àà ààà àààààà ààààà (_A)"
+#: ../camel/providers/imap/camel-imap-provider.c:50
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
+msgid "_Use custom command to connect to server"
+msgstr "ààààà àà àààààà àà ààà ààààà ààààà àà àààààà àààà (_U)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
-#| msgid "Check new messages for Junk contents"
+#: ../camel/providers/imap/camel-imap-provider.c:52
+#| msgid "Command:"
+msgid "Co_mmand:"
+msgstr "ààààà:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:62
+#: ../camel/providers/nntp/camel-nntp-provider.c:42
+msgid "Folders"
+msgstr "ààààààààà"
+
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
+msgid "_Show only subscribed folders"
+msgstr "ààààààà ààà ààà ààààààààà àà àààààà (_S)"
+
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
+msgid "O_verride server-supplied folder namespace"
+msgstr "ààààà ààààààà ààààààà àààààààà àààààààààà àààà (_v)"
+
+#: ../camel/providers/imap/camel-imap-provider.c:62
+#| msgid "Namespace:"
+msgid "Names_pace:"
+msgstr "àààààààà:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imapx/camel-imapx-provider.c:72
+#: ../camel/providers/local/camel-local-provider.c:42
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:105
+msgid "Options"
+msgstr "àààààà"
+
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
+msgid "_Apply filters to new messages in Inbox on this server"
+msgstr "àà ààààà àà ààààààà ààà àà ààààà àà ààà àààààà ààààà (_A)"
+
+#: ../camel/providers/imap/camel-imap-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "Check new messages for Jun_k contents"
 msgstr "ààà ààààà àà ààà àààààààààà àà àààà àààààà (_k)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:60
+#: ../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 "ààààààà ààààààà ààà ààààà ààà ààààà àà àààà àààààà (_B)"
+
+#: ../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:83
+#: ../camel/providers/imap/camel-imap-provider.c:78
+msgid "IMAP default port"
+msgstr ""
+
+#: ../camel/providers/imap/camel-imap-provider.c:79
+#: ../camel/providers/imapx/camel-imapx-provider.c:87
+#, fuzzy
+#| msgid "IMAP server %s"
+msgid "IMAP over SSL"
+msgstr "IMAP ààààà %s"
+
+#: ../camel/providers/imap/camel-imap-provider.c:85
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imap/camel-imap-provider.c:87
+#: ../camel/providers/imapx/camel-imapx-provider.c:96
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP ààààà àà ààà ààààà àà ààààà àààà àà ààà"
 
-#: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapp/camel-imapp-provider.c:69
+#: ../camel/providers/imap/camel-imap-provider.c:105
+#: ../camel/providers/imapx/camel-imapx-provider.c:113
+#: ../camel/providers/nntp/camel-nntp-provider.c:80
+#: ../camel/providers/pop3/camel-pop3-provider.c:81
+msgid "Password"
+msgstr "ààààààà"
+
+#: ../camel/providers/imap/camel-imap-provider.c:107
+#: ../camel/providers/imapx/camel-imapx-provider.c:115
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "ààààààààààà ààààààà àà ààààà àà àà àààààà IMAP ààààà àà ààààààà."
 
-#: ../camel/providers/imap/camel-imap-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:214
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP ààààà %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:439
-#: ../camel/providers/imap4/camel-imap4-store.c:216
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%s àà %s àà ààà IMAP àààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:568
-#: ../camel/providers/imap/camel-imap-store.c:583
-#: ../camel/providers/imap4/camel-imap4-store.c:251
-#: ../camel/providers/imap4/camel-imap4-store.c:266
-#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/nntp/camel-nntp-store.c:198
-#: ../camel/providers/pop3/camel-pop3-store.c:172
-#: ../camel/providers/pop3/camel-pop3-store.c:186
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
-#: ../camel/providers/smtp/camel-smtp-transport.c:275
-#, c-format
-msgid "Could not connect to %s: %s"
-msgstr "%s ààà àààà àààà ààà: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:569
-#: ../camel/providers/imap4/camel-imap4-store.c:252
-#: ../camel/providers/nntp/camel-nntp-store.c:184
-#: ../camel/providers/pop3/camel-pop3-store.c:173
-#: ../camel/providers/smtp/camel-smtp-transport.c:261
-msgid "SSL unavailable"
-msgstr "SSL àààààààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:580
-#: ../camel/providers/imap/camel-imap-store.c:862
-msgid "Connection cancelled"
-msgstr "ààààààà àààà"
+#. 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:464
+#: ../camel/providers/local/camel-maildir-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:619
+#: ../camel/providers/local/camel-maildir-store.c:625
+#: ../camel/providers/local/camel-maildir-store.c:705
+#: ../camel/providers/local/camel-spool-store.c:325
+msgid "Inbox"
+msgstr "ààààààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:691
-#: ../camel/providers/imap/camel-imap-store.c:710
-#: ../camel/providers/imap/camel-imap-store.c:716
-#: ../camel/providers/imap/camel-imap-store.c:742
-#: ../camel/providers/imap4/camel-imap4-store.c:314
-#: ../camel/providers/imap4/camel-imap4-store.c:329
-#: ../camel/providers/imap4/camel-imap4-store.c:338
+#: ../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:3007
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "àààààààà ààà ààà %s IMAP ààààà àà àààààà ààà àààà: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:692
-#: ../camel/providers/smtp/camel-smtp-transport.c:333
+#: ../camel/providers/imap/camel-imap-store.c:355
+#: ../camel/providers/imapx/camel-imapx-server.c:3008
+#: ../camel/providers/smtp/camel-smtp-transport.c:192
 msgid "STARTTLS not supported"
 msgstr "STARTTLS ààààààà àààà."
 
-#: ../camel/providers/imap/camel-imap-store.c:711
-msgid "SSL negotiations failed"
-msgstr "SSL àààààà àààà"
+#: ../camel/providers/imap/camel-imap-store.c:374
+#: ../camel/providers/imapx/camel-imapx-server.c:3046
+#, fuzzy, c-format
+#| msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgid "Failed to connect to IMAP server %s in secure mode: "
+msgstr "àààààààà ààà ààà %s IMAP ààààà àà àààààà ààà àààà: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:717
-#: ../camel/providers/imap4/camel-imap4-store.c:339
-#: ../camel/providers/smtp/camel-smtp-transport.c:372
+#: ../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:865
-#, c-format
-msgid "Could not connect with command \"%s\": %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:1053
-#: ../camel/providers/imap/camel-imap-store.c:2400
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:368
-#: ../camel/providers/imap4/camel-imap4-store.c:1408
-#: ../camel/providers/local/camel-maildir-folder.c:78
-#: ../camel/providers/local/camel-maildir-store.c:219
-#: ../camel/providers/local/camel-maildir-store.c:291
-#: ../camel/providers/local/camel-maildir-store.c:517
-#: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:464
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
-msgid "Inbox"
-msgstr "ààààààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:1055
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
-msgid "Drafts"
-msgstr "ààààààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:1057
-#| msgid "Sleet"
-msgid "Sent"
-msgstr "àà ààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:1059
-msgid "Templates"
-msgstr "ààààààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:1304
+#: ../camel/providers/imap/camel-imap-store.c:707
+#: ../camel/providers/imapx/camel-imapx-server.c:3141
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "%s IMAP ààààà ààààààà ààààààà àààààà %s àà àààààà àààà àààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:1314
-#: ../camel/providers/smtp/camel-smtp-transport.c:507
+#: ../camel/providers/imap/camel-imap-store.c:718
+#: ../camel/providers/imapx/camel-imapx-server.c:3154
+#: ../camel/providers/smtp/camel-smtp-transport.c:347
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "ààààààà àààààà %s àà àààà ààà àààààà àààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:1388
+#: ../camel/providers/imap/camel-imap-store.c:729
+#: ../camel/providers/smtp/camel-smtp-transport.c:360
+#, c-format
+msgid "Error creating SASL authentication object."
+msgstr "SASL ààààààà ààààààààà ààààààà ààà ààà."
+
+#: ../camel/providers/imap/camel-imap-store.c:777
+#: ../camel/providers/imapx/camel-imapx-server.c:3199
+#, c-format
+msgid "You did not enter a password."
+msgstr "àààà ààààààà àààà ààààà àààà."
+
+#: ../camel/providers/imap/camel-imap-store.c:818
+#: ../camel/providers/imapx/camel-imapx-server.c:3244
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3223,698 +3411,472 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1861
-#: ../camel/providers/imap/camel-imap-store.c:2242
-#: ../camel/providers/imap4/camel-imap4-store.c:959
-#, 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:1978
-#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:204
-#: ../camel/providers/local/camel-mh-store.c:249
-#, c-format
-#| msgid "Cannot create folder `%s': folder exists."
-msgid "Cannot create folder '%s': folder exists."
-msgstr "'%s' ààààààà àààà ààààààà àà àààà àà: ààààààà ààààà àà."
-
-#: ../camel/providers/imap/camel-imap-store.c:2253
-#, c-format
-msgid "Unknown parent folder: %s"
-msgstr "àààààà àààà ààààààà: %s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:576
-#: ../camel/providers/imap4/camel-imap4-command.c:583
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "%s IMAP ààààà àà ààààà ààààà ààà àààà:%s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:686
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "IMAP4 ààààà %s àà ààààààààààà ààààààààà: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:221
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "IMAP ààààà %s àà ààààààààààà àààààààà."
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:450
+#: ../camel/providers/imap/camel-imap-store.c:874
+#: ../camel/providers/imapx/camel-imapx-store.c:142
 #, c-format
-#| msgid "Cannot select folder `%s': Invalid mailbox name"
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr "'%s' ààààààà àà ààà àààà àà àààà àà: àààà ààààààà ààà"
+msgid "IMAP server %s"
+msgstr "IMAP ààààà %s"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:456
+#: ../camel/providers/imap/camel-imap-store.c:877
+#: ../camel/providers/imapx/camel-imapx-store.c:145
 #, c-format
-#| msgid "Cannot select folder `%s': Bad command"
-msgid "Cannot select folder '%s': Bad command"
-msgstr "'%s' ààààààà àà ààà àààà àà àààà àà: ààà ààààà"
+msgid "IMAP service for %s on %s"
+msgstr "%s àà %s àà ààà IMAP àààà"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:1433
+#: ../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 "Failed sending command to IMAP server %s: %s"
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr "%s IMAP ààààà àà ààààà ààààà ààà àààà: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1435
-#| msgid "SSL unavailable"
-msgid "service unavailable"
-msgstr "àààà àààààààà"
+msgid "No such folder %s"
+msgstr "ààà ààà %s ààààààà àààà"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:1569
-#: ../camel/providers/imap4/camel-imap4-engine.c:1608
-#: ../camel/providers/imap4/camel-imap4-engine.c:1653
-#: ../camel/providers/imap4/camel-imap4-engine.c:1709
+#: ../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 "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "IMAP4 ààààà %s ààààààààààà ààà àà àààààààà àà ààà: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
-#| msgid ""
-#| "Enable Mailing-List detection required for some filter and vFolder rules"
 msgid ""
-"Enable extended Mailing-List detection required for some filter and vFolder "
-"rules"
-msgstr "ààà àààààà àà vFolder àààà àà àààà ààààààààà àààààà àààà àààà àààààà àààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:90
-msgid "Expire cached messages that haven't been read in X seconds"
-msgstr "X àààààà ààà ààà ààà ààààà àà ààà àààààà àààà àà àà àààà àààà ààà àà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:91
-msgid "Expire cached messages older than X seconds"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:432
-#, c-format
-#| msgid "Cannot access folder `%s': %s"
-msgid "Cannot access folder '%s': %s"
-msgstr "'%s' ààààààà ààà ààààà àààà àà àààà àà: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:491
-#, c-format
-#| msgid "Cannot sync flags to folder `%s': Unknown"
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr "'%s' ààààààà ààà ààààà àààààààààà àààà àà àààà àà: àààààà àààààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:497
-#, c-format
-#| msgid "Cannot sync flags to folder `%s': Bad command"
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr "'%s' ààààààà ààà ààààà ààààààààà àààà àà àààà àà: ààà ààààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:637
-#, c-format
-#| msgid "Cannot expunge folder `%s': Unknown"
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "'%s' ààààààà ààààà ààààààà àààà àà àààà: àààààà àààààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:642
-#, c-format
-#| msgid "Cannot expunge folder `%s': Bad command"
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "'%s' ààààààà ààààà ààààààà àààà àà àààà àà: ààà ààààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:898
-#, c-format
-#| msgid "Cannot get message %s from folder `%s': No such message"
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr "'%s' ààààààà àà %s ààààà àààà ààààààà àà àààà àà: ààà ààà ààààà àààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:903
-#, c-format
-#| msgid "Cannot get message %s from folder `%s': Bad command"
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr "'%s' ààààààà àà %s ààààà àààà ààààààà àà àààà àà: ààà ààààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:947
-#, c-format
-#| msgid "Cannot append message to folder `%s': Folder is read-only"
-msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr "'%s' ààààààà ààà ààààà àààà àààà àààà: ààààààà ààààà ààààà àà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1040
-#, c-format
-#| msgid "Cannot append message to folder `%s': Unknown error"
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "'%s' ààààààà ààà ààààà àààà àààà àààà àà: àààààà àààààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1070
-#, c-format
-#| msgid "Cannot append message to folder `%s': Bad command"
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr "'%s' ààààààà ààà ààààà àààà àààà àààà: ààà ààààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1190
-#, c-format
-#| msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-msgstr "'%s' ààààààà àà '%s' ààààààà ààà ààààà ààààà àààà àà àààà àà: àààààà àààààà"
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "ààààààà ààà \"%s\" àààà àà ààààààà àà \"%c\" àààààààà àààà àà"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1194
+#: ../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 "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-msgstr "'%s' ààààààà àà '%s' ààààààà ààà ààààà àààà àààà àà àààà àà: àààààà àààààà"
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "àààà ààààààà àà ààààààààà àààà àà àààààà àààà àà"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1202
+#: ../camel/providers/imap/camel-imap-store.c:2093
+#: ../camel/providers/local/camel-maildir-store.c:244
+#: ../camel/providers/local/camel-mbox-store.c:416
+#: ../camel/providers/local/camel-mh-store.c:547
 #, c-format
-#| msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr "'%s' ààààààà àà '%s' ààààààà ààà ààààà ààààààààà àààà àà àààà àà: ààà ààààà"
+msgid "Cannot create folder '%s': folder exists."
+msgstr "'%s' ààààààà àààà ààààààà àà àààà àà: ààààààà ààààà àà."
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1206
+#: ../camel/providers/imap/camel-imap-store.c:2444
+#: ../camel/providers/imapx/camel-imapx-store.c:1310
 #, c-format
-#| msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-msgstr "'%s' ààààààà àà '%s' ààààààà ààà ààààà àààà àààà àà àààà àà: ààà ààààà"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:56
-msgid "Check new messages for _Junk contents"
-msgstr "ààà ààààà àà ààà àààààààààà àà àààà àààààà (_J)"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:58
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "ààààààà ààààààà ààà ààààà ààà ààààà àà àààà àààààà (_g)"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:67
-msgid "IMAP4rev1"
-msgstr "IMAP4rev1"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:69
-msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr "IMAPv4rev1 ààààà àà ààà ààààà àà ààààà àààà àà ààà"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:86
-msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "ààààààààààà ààààààà àà ààààà àà àà àààààà IMAPv4rev1 ààààà àà ààààààà."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:263
-#: ../camel/providers/imapp/camel-imapp-store.c:249
-#: ../camel/providers/nntp/camel-nntp-store.c:195
-#: ../camel/providers/nntp/camel-nntp-store.c:214
-#: ../camel/providers/pop3/camel-pop3-store.c:183
-#: ../camel/providers/smtp/camel-smtp-transport.c:272
-msgid "Connection canceled"
-msgstr "ààààààà àààà"
+msgid "Unknown parent folder: %s"
+msgstr "àààààà àààà ààààààà: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:300
+#: ../camel/providers/imap/camel-imap-store.c:3214
 #, fuzzy, c-format
-#| msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "àààààààà ààà ààà %s IMAP ààààà àà àààààà ààà àààà: %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:330
-#: ../camel/providers/pop3/camel-pop3-store.c:251
-msgid "TLS negotiations failed"
-msgstr "TLS àààààà àààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:415
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr "%s ààààààà ààààààààà àà àààààà àà %s IMAP ààààà àà àààààààà àààà àà àààà àà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:538
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "%s àà àààààà àà %s IMAP ààààà àà àààààààà àààà àà àààà àà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:701
-#: ../camel/providers/imap4/camel-imap4-store.c:969
-msgid "Cannot create IMAP folders in offline mode."
-msgstr "àààààà ààà ààà IMAP ààààààà àààà ààà àààà."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:740
-#, c-format
-#| msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr "%s IMAP ààààà àà '%s' ààààààà àààà àà àààà àà: àààààà àààààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:821
-#, c-format
-msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-msgstr "Cannot get LIST information for '%s' on IMAP server %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
-msgid "Bad command"
-msgstr "ààà ààààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:902
-#, c-format
-#| msgid "Cannot create folder `%s': Invalid mailbox name"
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr "'%s' ààààààà àààà ààààààà àà àààà: àààà ààààààà ààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:907
-#, c-format
-#| msgid "Cannot create folder `%s': Bad command"
-msgid "Cannot create folder '%s': Bad command"
-msgstr "'%s' ààààààà àààà ààààààà àà àààà: ààà ààààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1013
-#, c-format
-#| msgid "Cannot delete folder `%s': Special folder"
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "'%s' ààààààà àààà ààààààà àà àààà: ààààà ààààààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1020
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr "àààààà ààà ààà IMA ààààààà àà àààààà àààà àà àààà ààà."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
-#, c-format
-#| msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "'%s' ààààààà àààà ààààààà àà àààà: àààà ààààààà ààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1084
-#, c-format
-#| msgid "Cannot delete folder `%s': Bad command"
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "'%s' ààààààà ààààààà àààà àà àààà: ààà ààààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1104
-#, c-format
-#| msgid "Cannot rename folder `%s' to `%s': Special folder"
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "ààààààà '%s' àà '%s' ààà ààà àààà ààà àààà: ààààà ààààààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1111
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "àààààà ààà ààà IMA ààààààà àà ààààààààààà àààà àà àààà ààà."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
-#, c-format
-#| msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-msgstr "ààààààà '%s' àà '%s' ààà ààà àààà ààà àààà: àààà ààààààà ààà"
+#| msgid "Server unexpectedly disconnected: %s"
+msgid "Server unexpectedly disconnected"
+msgstr "ààààà ààààààààààà ààà àà àààààààà àà ààà: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1147
-#, c-format
-#| msgid "Cannot rename folder `%s' to `%s': Bad command"
-msgid "Cannot rename folder '%s' to '%s': Bad command"
-msgstr "ààààààà'%s' àà '%s' ààà àààà ààà àààà: ààà ààààà"
+#: ../camel/providers/imap/camel-imap-store.c:3217
+#, fuzzy
+#| msgid "Server unexpectedly disconnected: %s"
+msgid "Server unexpectedly disconnected: "
+msgstr "ààààà ààààààààààà ààà àà àààààààà àà ààà: %s"
 
-#. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
-#. * The fourth one is an error message.
-#: ../camel/providers/imap4/camel-imap4-store.c:1577
+#: ../camel/providers/imapx/camel-imapx-folder.c:88
 #, fuzzy, c-format
-#| msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-msgstr "%s IMAP ààààà àà '%s' àààààà àà àààà '%s' ààààà àààà ààààààà àà àààà: %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1638
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "àààààà ààà ààà IMAP ààààààà àà ààààà àààà àà àààà àà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, c-format
-#| msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr "'%s' ààààààà àà ààààà àààà àà àààà àà: àààà ààààààà ààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1688
-#, c-format
-#| msgid "Cannot subscribe to folder `%s': Bad command"
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "'%s' ààààààà àà ààààà àààà àà àààà àà: ààà ààààà"
+#| msgid "Could not load summary for %s"
+msgid "Could not create folder summary for %s"
+msgstr "%s àà àààà àààààà àààààààà àààà àà ààà"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1710
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr "IMAP ààààààà àà àààààà ààà ààà ààààààà àààà àààà àà àààà àà"
+#: ../camel/providers/imapx/camel-imapx-folder.c:96
+#, fuzzy, c-format
+#| msgid "Could not create cache file"
+msgid "Could not create cache for %s: "
+msgstr "ààà àààà àààà ààà ààà"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
-#, c-format
-#| msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr "'%s' ààààààà àà ààààààà àààà àààà àà àààà àà:àààà ààààààà ààà"
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
+msgid "Use _Quick Resync if the server supports it"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1760
-#, c-format
-#| msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr "'%s' ààààààà àà ààààààà àààà àààà àà àààà àà:ààà ààààà"
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
+msgid "Use I_dle if the server supports it"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1596
-msgid "Scanning for changed messages"
-msgstr "ààààààààà ààààà àà àààà àààààààà"
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "Command:"
+msgstr "ààààà:"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1617
-#, c-format
-msgid "IMAP server %s is in an inconsistent state."
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
+msgid "Numbe_r of cached connections to use"
 msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1644
-#| msgid "Fetching envelopes for new messages"
-msgid "Fetching envelopes of new messages"
-msgstr "àà ààààà àà àààààà àà ààà àà"
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
+msgid "Namespace:"
+msgstr "àààààààà:"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:437
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "IMAP ààààà àà ààààààààà ààà ààààààààààà àààà %s: "
+#: ../camel/providers/imapx/camel-imapx-provider.c:86
+msgid "Default IMAP port"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:460
-msgid "No data"
-msgstr "ààà àààààà àààà"
+#: ../camel/providers/imapx/camel-imapx-provider.c:94
+msgid "IMAP+"
+msgstr "IMAP+"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:623
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "IMAP ààààà %s ààààààààààà ààà àà àààààààà àà ààà: %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:1480
+#, fuzzy
+#| msgid "Error writing mail temp file: %s"
+msgid "Error writing to cache stream: "
+msgstr "ààà ààààààà ààààà àà ààààà ààà ààà: %s"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:41
-msgid "Message storage"
-msgstr "ààààà àààààà"
+#: ../camel/providers/imapx/camel-imapx-server.c:2186
+#, fuzzy, c-format
+#| msgid "Failed to authenticate.\n"
+msgid "Not authenticated"
+msgstr "àààààààààà ààà àààà.\n"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:49
-msgid "IMAP+"
-msgstr "IMAP+"
+#: ../camel/providers/imapx/camel-imapx-server.c:3416
+#, fuzzy
+#| msgid "Posting failed: %s"
+msgid "Closing tmp stream failed: "
+msgstr "àààààà àààà: %s"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:51
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-"ààààààààà IMAP 4(.1) àààààà\n"
-"àà ààààààààà àà àààààààà ààà àà, àààà ààà àà ààààà imap àà àààààà àààà ààààà ààà.\n"
-"\n"
-" !!! ààààààà àààà àà ààà àààà àààààà àààà àààà  !!!\n"
+#: ../camel/providers/imapx/camel-imapx-server.c:5437
+#: ../camel/providers/imapx/camel-imapx-server.c:5452
+#, fuzzy
+#| msgid "Cannot create message: %s"
+msgid "Cannot create spool file: "
+msgstr "ààààà ààà àààà àààà: %s"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:252
+#: ../camel/providers/imapx/camel-imapx-store.c:1087
+#: ../camel/providers/nntp/camel-nntp-store.c:1704
 #, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "%s (ààààà %s) àà àààà àààà ààà : %s"
+msgid "No such folder: %s"
+msgstr "ààà ààà ààààààà àààà àà: %s"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:349
+#: ../camel/providers/imapx/camel-imapx-stream.c:70
 #, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "%s àà POP ààààà àà àààà àààà ààà"
+msgid "Source stream returned no data"
+msgstr ""
 
-#: ../camel/providers/local/camel-local-folder.c:176
-msgid "Index message body data"
-msgstr "àààà ààààà àààà ààà"
+#: ../camel/providers/imapx/camel-imapx-stream.c:79
+#, fuzzy, c-format
+#| msgid "service unavailable"
+msgid "Source stream unavailable"
+msgstr "àààà àààààààà"
 
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:392
+#: ../camel/providers/local/camel-local-folder.c:178
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:396
-#: ../camel/providers/local/camel-local-folder.c:399
+#: ../camel/providers/local/camel-local-folder.c:188
+#: ../camel/providers/local/camel-local-folder.c:197
 #, c-format
-msgid "mailbox:%s (%s)"
+#| msgid "mailbox:%s (%s)"
+msgid "mailbox: %s (%s)"
 msgstr "ààààààà:%s (%s)"
 
-#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:403
+#: ../camel/providers/local/camel-local-folder.c:206
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-provider.c:48
-#| msgid "Use the `.folders' folder summary file (exmh)"
+#: ../camel/providers/local/camel-local-folder.c:473
+msgid "Index message body data"
+msgstr "àààà ààààà àààà ààà"
+
+#: ../camel/providers/local/camel-local-folder.c:700
+#, fuzzy, c-format
+#| msgid ""
+#| "Cannot get message: %s from folder %s\n"
+#| "  %s"
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
+msgstr ""
+"ààààà àààà ààààààà àà àààà àà: %s ààààààà àà %s\n"
+"  %s"
+
+#: ../camel/providers/local/camel-local-provider.c:44
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr "ààààààà àààààà ààààà `.folders' (exmh) àà àààààà àààà (_U)"
 
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "MH-format mail directories"
 msgstr "MH-ààààààà ààà àààààààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:56
+#: ../camel/providers/local/camel-local-provider.c:52
 msgid "For storing local mail in MH-like mail directories."
 msgstr "MH-àààà ààà àààààààààà ààà ààààààà ààà àà ààààà àààà àà ààà."
 
-#: ../camel/providers/local/camel-local-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:70
 msgid "Local delivery"
 msgstr "ààààààà ààààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:74
+#: ../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:88
+#: ../camel/providers/local/camel-local-provider.c:86
 #: ../camel/providers/local/camel-local-provider.c:107
-#| msgid "Apply filters to new messages in INBOX"
 msgid "_Apply filters to new messages in INBOX"
 msgstr "INBOX ààà àà ààààà àà àààààà ààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:93
 msgid "Maildir-format mail directories"
 msgstr "Maildir- ààààààà ààà àààààààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:96
+#: ../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:108
-#| msgid "Store status headers in Elm/Pine/Mutt format"
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "Elm/Pine/Mutt ààààààà ààà àààààà ààààààà àà ààà àààà (_S)"
 
 #: ../camel/providers/local/camel-local-provider.c:115
-#| msgid "Standard Unix mbox spool or directory"
 msgid "Standard Unix mbox spool file"
 msgstr "àààà Unix mbox ààààà ààààà"
 
 #: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../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 ""
-"ààààà àààà Unix mbox ààààà ààààà ààà ààààààà ààà àà ààààà àààà àà ààààà àà ààà.\n"
+"ààààà àààà Unix mbox ààààà ààààà ààà ààààààà ààà àà ààààà àààà àà ààààà àà "
+"ààà.\n"
 "Elm, Pine, àà Mutt àààà ààààààààà àà ààà àà ààààà ààà àà àààààààà àà àààà àà."
 
-#: ../camel/providers/local/camel-local-provider.c:126
-#| msgid "Standard Unix mbox spool or directory"
+#: ../camel/providers/local/camel-local-provider.c:127
 msgid "Standard Unix mbox spool directory"
 msgstr "àààà Unix mbox ààààà àà àààààààààà"
 
-#: ../camel/providers/local/camel-local-store.c:165
-#: ../camel/providers/local/camel-local-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:359
-#: ../camel/providers/local/camel-spool-store.c:129
+#: ../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: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:172
+#: ../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:181
-#: ../camel/providers/local/camel-local-store.c:189
-#: ../camel/providers/local/camel-local-store.c:287
+#: ../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:201
+#: ../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:247
+#: ../camel/providers/local/camel-local-store.c:435
+#: ../camel/providers/local/camel-mbox-store.c:708
 #, c-format
-msgid "Local mail file %s"
-msgstr "ààààààà ààà ààààà %s"
+msgid "Could not delete folder index file '%s': %s"
+msgstr "'%s' ààààààà ààààààà ààààà ààààààà àààà àà ààà: %s"
 
-#: ../camel/providers/local/camel-local-store.c:342
+#: ../camel/providers/local/camel-local-store.c:463
+#: ../camel/providers/local/camel-mbox-store.c:738
 #, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "ààààààà `%s' àà `%s' ààà àààà àààààà àààà àà ààà: %s"
+msgid "Could not delete folder meta file '%s': %s"
+msgstr "'%s' ààààààà àààà ààààà ààààààà àààà àà ààà: %s"
 
-#: ../camel/providers/local/camel-local-store.c:410
+#: ../camel/providers/local/camel-local-store.c:549
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "'%s' àà àààà àààààà àààà àà ààà: %s"
 
-#: ../camel/providers/local/camel-local-store.c:435
-#: ../camel/providers/local/camel-mbox-store.c:300
-#, c-format
-#| msgid "Could not delete folder index file `%s': %s"
-msgid "Could not delete folder index file '%s': %s"
-msgstr "'%s' ààààààà ààààààà ààààà ààààààà àààà àà ààà: %s"
-
-#: ../camel/providers/local/camel-local-store.c:458
-#: ../camel/providers/local/camel-mbox-store.c:324
+#: ../camel/providers/local/camel-local-summary.c:548
 #, c-format
-#| msgid "Could not delete folder meta file `%s': %s"
-msgid "Could not delete folder meta file '%s': %s"
-msgstr "'%s' ààààààà àààà ààààà ààààààà àààà àà ààà: %s"
-
-#: ../camel/providers/local/camel-local-summary.c:515
 msgid "Unable to add message to summary: unknown reason"
 msgstr "àààààà ààà ààààà àààààà ààà ààààà:àààààà àààà"
 
-#: ../camel/providers/local/camel-maildir-folder.c:222
-msgid "Maildir append message canceled"
-msgstr "Maildir àààààà ààààà àààà"
+#: ../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:225
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
+#: ../camel/providers/local/camel-maildir-folder.c:223
+#, fuzzy, c-format
+#| msgid "Cannot append message to maildir folder: %s: %s"
+msgid "Cannot append message to maildir folder: %s: "
 msgstr "maildir ààààààà ààà ààààà àààà àààà àààà: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:247
-#: ../camel/providers/local/camel-maildir-folder.c:274
-#: ../camel/providers/local/camel-maildir-folder.c:288
-#: ../camel/providers/local/camel-maildir-folder.c:297
-#: ../camel/providers/local/camel-mbox-folder.c:346
-#: ../camel/providers/local/camel-mbox-folder.c:398
-#: ../camel/providers/local/camel-mbox-folder.c:419
-#: ../camel/providers/local/camel-mbox-folder.c:450
-#: ../camel/providers/local/camel-mbox-folder.c:458
-#: ../camel/providers/local/camel-mh-folder.c:213
-#: ../camel/providers/local/camel-mh-folder.c:224
-#: ../camel/providers/local/camel-mh-folder.c:233
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
+#: ../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
+#, fuzzy, c-format
+#| msgid ""
+#| "Cannot get message: %s from folder %s\n"
+#| "  %s"
+msgid "Cannot get message %s from folder %s: "
 msgstr ""
 "ààààà àààà ààààààà àà àààà àà: %s ààààààà àà %s\n"
 "  %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:298
-msgid "Invalid message contents"
-msgstr "àààà ààààà àààààààààà"
+#: ../camel/providers/local/camel-maildir-folder.c:351
+#, fuzzy, c-format
+#| msgid "Cannot append message to maildir folder: %s: %s"
+msgid "Cannot transfer message to destination folder: %s"
+msgstr "maildir ààààààà ààà ààààà àààà àààà àààà: %s: %s"
+
+#: ../camel/providers/local/camel-maildir-store.c:100
+#, fuzzy, 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:722
+#, c-format
+#| msgid "Folder already exists"
+msgid "Folder %s already exists"
+msgstr "ààààààà %s àààà àà ààààààà àà"
 
-#: ../camel/providers/local/camel-maildir-store.c:148
-#: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:176
-#: ../camel/providers/local/camel-mbox-store.c:188
+#: ../camel/providers/local/camel-maildir-store.c:191
+#: ../camel/providers/local/camel-maildir-store.c:222
+#: ../camel/providers/local/camel-mbox-store.c:384
+#: ../camel/providers/local/camel-mbox-store.c:398
 #, c-format
-#| msgid "Cannot create folder `%s': %s"
 msgid "Cannot create folder '%s': %s"
 msgstr "'%s' ààààààà àààà ààà àààà àà: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:147
-#: ../camel/providers/local/camel-mh-store.c:217
+#: ../camel/providers/local/camel-maildir-store.c:206
+#: ../camel/providers/local/camel-mbox-store.c:350
+#: ../camel/providers/local/camel-mh-store.c:502
 #, c-format
-#| msgid "Cannot get folder `%s': %s"
 msgid "Cannot get folder '%s': %s"
 msgstr "'%s' ààààààà àààà ààààààà àà àààà àà: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:155
-#: ../camel/providers/local/camel-mh-store.c:224
+#: ../camel/providers/local/camel-maildir-store.c:212
+#: ../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."
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "'%s' ààààààà àààà ààààààà àà àààà àà: ààààààà ààààààà àààà àà."
 
-#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-maildir-store.c:239
 #, c-format
-#| msgid "Cannot get folder `%s': not a maildir directory."
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "'%s' ààààààà àààà àà àààà àà: maildir àààààààààà àààà àà."
 
-#: ../camel/providers/local/camel-maildir-store.c:234
-#: ../camel/providers/local/camel-maildir-store.c:272
-#: ../camel/providers/local/camel-mh-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:293
+#: ../camel/providers/local/camel-maildir-store.c:333
+#: ../camel/providers/local/camel-mh-store.c:649
 #, c-format
-#| msgid "Could not delete folder `%s': %s"
 msgid "Could not delete folder '%s': %s"
 msgstr "'%s' ààààààà ààààààà àààà àà àààà àà: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:295
 msgid "not a maildir directory"
 msgstr "maildir àààààààààà àààà àà"
 
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:331
-#: ../camel/providers/local/camel-spool-store.c:345
+#: ../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"
 msgid "Could not scan folder '%s': %s"
 msgstr "'%s' ààààààà ààààà àààà àà àààà àà: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:439
-#: ../camel/providers/local/camel-maildir-summary.c:558
+#: ../camel/providers/local/camel-maildir-store.c:713
+#, fuzzy, 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: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:551
+#: ../camel/providers/local/camel-maildir-summary.c:557
 msgid "Checking folder consistency"
 msgstr "ààààààà àààààà àà àààà àà ààà àà"
 
-#: ../camel/providers/local/camel-maildir-summary.c:656
+#: ../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-mbox-summary.c:529
-#: ../camel/providers/local/camel-mbox-summary.c:711
-#: ../camel/providers/local/camel-mbox-summary.c:831
-#: ../camel/providers/local/camel-spool-summary.c:150
+#: ../camel/providers/local/camel-maildir-summary.c:743
+#: ../camel/providers/local/camel-mbox-summary.c:468
+#: ../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:159
-#: ../camel/providers/local/camel-spool-folder.c:150
-#, c-format
-msgid "Cannot create folder lock on %s: %s"
-msgstr "%s àà ààààààà àààà àààà ààààààà àà àààà: %s"
-
-#: ../camel/providers/local/camel-mbox-folder.c:220
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
+#: ../camel/providers/local/camel-mbox-folder.c:183
+#, fuzzy, c-format
+#| msgid "Cannot open mailbox: %s: %s\n"
+msgid "Cannot open mailbox: %s: "
 msgstr "ààààààà ààà àààà àààà àà: %s: %s\n"
 
-#: ../camel/providers/local/camel-mbox-folder.c:281
-msgid "Mail append canceled"
-msgstr "ààà àààààà àààà"
-
-#: ../camel/providers/local/camel-mbox-folder.c:284
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
+#: ../camel/providers/local/camel-mbox-folder.c:249
+#, fuzzy, c-format
+#| msgid "Cannot append message to mbox file: %s: %s"
+msgid "Cannot append message to mbox file: %s: "
 msgstr "mbox ààààà ààà ààààà àààà àààà àààà: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:451
+#: ../camel/providers/local/camel-mbox-folder.c:378
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "ààààààà àààààààààààà àààà ààà àà àààà àà àààààà ààà àààà àà àààà àà."
 
-#: ../camel/providers/local/camel-mbox-folder.c:459
-#: ../camel/providers/local/camel-mh-folder.c:234
-msgid "Message construction failed."
-msgstr "ààààà àààààà àààà."
+#: ../camel/providers/local/camel-mbox-folder.c:436
+#: ../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:166
-#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../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:198
+#: ../camel/providers/local/camel-mbox-store.c:409
 #, c-format
-#| msgid "Cannot get folder `%s': not a regular file."
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "'%s' ààààààà àààà ààààààà àà àààà àà: àààààà ààààà àààà àà."
 
-#: ../camel/providers/local/camel-mbox-store.c:228
-#: ../camel/providers/local/camel-mbox-store.c:239
-#: ../camel/providers/local/camel-mbox-store.c:262
+#: ../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:574
+#, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "`%s' ààààààà ààààààà àààà àà àààà àà: %s."
+
+#: ../camel/providers/local/camel-mbox-store.c:576
+msgid "Folder already exists"
+msgstr "ààààààà àààà àà ààààààà àà"
+
+#: ../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"
-#| "%s"
 msgid ""
 "Could not delete folder '%s':\n"
 "%s"
@@ -3922,181 +3884,157 @@ msgstr ""
 "'%s' ààààààà àààà àààà àààà:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:247
+#: ../camel/providers/local/camel-mbox-store.c:642
 #, c-format
-#| msgid "`%s' is not a regular file."
 msgid "'%s' is not a regular file."
 msgstr "'%s' àà àààààà ààààà àààà àà."
 
-#: ../camel/providers/local/camel-mbox-store.c:254
+#: ../camel/providers/local/camel-mbox-store.c:651
 #, c-format
-#| msgid "Folder `%s' is not empty. Not deleted."
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "'%s' ààààààà àààà àààà àà. àààààà àààà ààà àà."
 
-#: ../camel/providers/local/camel-mbox-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:288
+#: ../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"
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "'%s' ààààààà àààààà ààààà ààààààà àààà àà ààà: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:378
-#, c-format
-#| msgid "Cannot create directory `%s': %s."
-msgid "Cannot create directory '%s': %s."
-msgstr "'%s' àààààààààà ààààààà àààà àà àààà àà: %s."
-
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:775
 #, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "`%s' ààààààà ààààààà àààà àà àààà àà: %s."
-
-#: ../camel/providers/local/camel-mbox-store.c:394
-msgid "Folder already exists"
-msgstr "ààààààà àààà àà ààààààà àà"
-
-#: ../camel/providers/local/camel-mbox-store.c:485
 msgid "The new folder name is illegal."
 msgstr "àà ààààààà àà ààà àààà àà."
 
-#: ../camel/providers/local/camel-mbox-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:791
 #, c-format
-#| msgid "Could not rename `%s': `%s': %s"
 msgid "Could not rename '%s': '%s': %s"
 msgstr "'%s' àà ààà àààà ààà àààà àà: '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:579
+#: ../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:535
+#: ../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:585
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
+#: ../camel/providers/local/camel-mbox-summary.c:539
+#, fuzzy, c-format
+#| msgid "Fatal mail parser error near position %ld in folder %s"
+msgid "Fatal mail parser error near position %s in folder %s"
 msgstr "%ld àààààà ààà ààààà ààà àààààààà àààààà %s ààà"
 
-#: ../camel/providers/local/camel-mbox-summary.c:648
+#: ../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:716
-#: ../camel/providers/local/camel-mbox-summary.c:836
-#: ../camel/providers/local/camel-spool-summary.c:155
+#: ../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:728
-#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../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:741
-#: ../camel/providers/local/camel-mbox-summary.c:945
+#: ../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:750
+#: ../camel/providers/local/camel-mbox-summary.c:755
 #, c-format
-#| msgid "Could not close temp folder: %s"
 msgid "Could not close temporary folder: %s"
 msgstr "ààààààà ààààààà ààà àààà àà ààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:765
+#: ../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:847
-#: ../camel/providers/local/camel-mbox-summary.c:1075
+#: ../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:894
-#: ../camel/providers/local/camel-mbox-summary.c:1105
-#: ../camel/providers/local/camel-mbox-summary.c:1113
+#: ../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 ""
+
+#: ../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:1038
-#: ../camel/providers/local/camel-spool-summary.c:336
+#: ../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:1181
-#: ../camel/providers/local/camel-mbox-summary.c:1207
+#: ../camel/providers/local/camel-mbox-summary.c:1244
+#: ../camel/providers/local/camel-mbox-summary.c:1274
 #, c-format
-#| msgid "Writing to tmp mailbox failed: %s: %s"
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "àààààà ààààààà ààà ààààà ààà àààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1198
+#: ../camel/providers/local/camel-mbox-summary.c:1263
 #, c-format
-#| msgid "Writing to tmp mailbox failed: %s: %s"
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "àààààà ààààààà ààà ààààà ààà àààà: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:178
-msgid "MH append message canceled"
-msgstr "MH ààà ààààà àààà"
-
-#: ../camel/providers/local/camel-mh-folder.c:181
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
+#: ../camel/providers/local/camel-mh-folder.c:115
+#, fuzzy, c-format
+#| msgid "Cannot append message to mh folder: %s: %s"
+msgid "Cannot append message to mh folder: %s: "
 msgstr "mh ààààààà ààà ààààà àààà àààà àààà àà:  %s: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:232
+#: ../camel/providers/local/camel-mh-store.c:522
 #, c-format
-#| msgid "Could not create folder `%s': %s"
 msgid "Could not create folder '%s': %s"
 msgstr "ààààààà '%s' ààààààà àààà àà ààà: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:244
+#: ../camel/providers/local/camel-mh-store.c:539
 #, c-format
-#| msgid "Cannot get folder `%s': not a directory."
 msgid "Cannot get folder '%s': not a directory."
 msgstr "'%s' ààààààà àààà àà àààà àà:àààààààààà àààà àà."
 
-#: ../camel/providers/local/camel-mh-summary.c:264
+#: ../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:135
+#: ../camel/providers/local/camel-spool-store.c:347
 #, c-format
-#| msgid "Spool `%s' cannot be opened: %s"
-msgid "Spool '%s' cannot be opened: %s"
-msgstr "'%s' ààààà ààà àààà àààà àà: %s"
+msgid "Spool mail file %s"
+msgstr "%s ààààà ààà ààààà"
 
-#: ../camel/providers/local/camel-spool-store.c:147
+#: ../camel/providers/local/camel-spool-store.c:350
 #, c-format
-#| msgid "Spool `%s' is not a regular file or directory"
-msgid "Spool '%s' is not a regular file or directory"
-msgstr "'%s' ààààà àà àààààà ààààà àà àààààààààà àààà àà"
+msgid "Spool folder tree %s"
+msgstr "%s ààààà ààààààà ààà"
 
-#: ../camel/providers/local/camel-spool-store.c:166
+#: ../camel/providers/local/camel-spool-store.c:391
 #, c-format
-#| msgid "Folder `%s/%s' does not exist."
 msgid "Folder '%s/%s' does not exist."
 msgstr "'%s/%s' ààààààà ààààà àààà àà."
 
-#: ../camel/providers/local/camel-spool-store.c:176
+#: ../camel/providers/local/camel-spool-store.c:405
 #, c-format
-#| msgid ""
-#| "Could not open folder `%s':\n"
-#| "%s"
 msgid ""
 "Could not open folder '%s':\n"
 "%s"
@@ -4104,17 +4042,13 @@ msgstr ""
 "'%s' ààààààà ààà àààà ààà:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:180
+#: ../camel/providers/local/camel-spool-store.c:411
 #, c-format
-#| msgid "Folder `%s' does not exist."
 msgid "Folder '%s' does not exist."
 msgstr "'%s' ààààààà ààààà àààà àà."
 
-#: ../camel/providers/local/camel-spool-store.c:185
+#: ../camel/providers/local/camel-spool-store.c:418
 #, c-format
-#| msgid ""
-#| "Could not create folder `%s':\n"
-#| "%s"
 msgid ""
 "Could not create folder '%s':\n"
 "%s"
@@ -4122,124 +4056,174 @@ msgstr ""
 "'%s' ààààààà ààààààà àààà ààà:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:193
+#: ../camel/providers/local/camel-spool-store.c:430
 #, c-format
-#| msgid "`%s' is not a mailbox file."
 msgid "'%s' is not a mailbox file."
 msgstr "'%s' àà ààààààà ààààà àà."
 
-#: ../camel/providers/local/camel-spool-store.c:210
+#: ../camel/providers/local/camel-spool-store.c:478
+#, c-format
 msgid "Store does not support an INBOX"
 msgstr "àà INBOX àà ààààà àààààà àààà àààà àà"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:492
 #, c-format
-msgid "Spool mail file %s"
-msgstr "%s ààààà ààà ààààà"
+msgid "Spool folders cannot be deleted"
+msgstr "ààààà ààààààà ààààààà àààà àààà àà àààà àà"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:507
 #, c-format
-msgid "Spool folder tree %s"
-msgstr "%s ààààà ààààààà ààà"
-
-#: ../camel/providers/local/camel-spool-store.c:230
 msgid "Spool folders cannot be renamed"
 msgstr "ààààà ààààààà àà àààààààààà àààà àààà àà àààà àà"
 
-#: ../camel/providers/local/camel-spool-store.c:238
-msgid "Spool folders cannot be deleted"
-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-summary.c:181
-#: ../camel/providers/local/camel-spool-summary.c:191
-#: ../camel/providers/local/camel-spool-summary.c:201
+#: ../camel/providers/local/camel-spool-store.c:596
 #, c-format
-msgid "Could not sync temporary folder %s: %s"
+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
+#, fuzzy, 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:217
-#, c-format
-msgid "Could not sync spool folder %s: %s"
+#: ../camel/providers/local/camel-spool-summary.c:211
+#, fuzzy, c-format
+#| msgid "Could not sync spool folder %s: %s"
+msgid "Could not synchronize spool folder %s: %s"
 msgstr "%s ààààà ààààààà àà ààààààààà àààà àà ààà: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:248
-#: ../camel/providers/local/camel-spool-summary.c:265
-#: ../camel/providers/local/camel-spool-summary.c:276
-#, c-format
+#: ../camel/providers/local/camel-spool-summary.c:243
+#: ../camel/providers/local/camel-spool-summary.c:262
+#: ../camel/providers/local/camel-spool-summary.c:275
+#, fuzzy, c-format
 #| msgid ""
 #| "Could not sync spool folder %s: %s\n"
-#| "Folder may be corrupt, copy saved in `%s'"
+#| "Folder may be corrupt, copy saved in '%s'"
 msgid ""
-"Could not sync spool folder %s: %s\n"
+"Could not synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in '%s'"
 msgstr ""
 "%s ààààà ààààààà àà ààààààààà àààà àà ààà: %s\n"
 "ààààààà àààà àà àààà àà, `%s' ààà àààà àààààààà àà"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:137
-#: ../camel/providers/nntp/camel-nntp-folder.c:195
-#: ../camel/providers/nntp/camel-nntp-folder.c:227
+#: ../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:368
-#: ../camel/providers/nntp/camel-nntp-folder.c:371
-#: ../camel/providers/nntp/camel-nntp-folder.c:413
-#: ../camel/providers/nntp/camel-nntp-folder.c:415
+#: ../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: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
+#, fuzzy, c-format
+#| msgid "Cannot get message %s: %s"
+msgid "Cannot get message %s: "
+msgstr "%s ààààà ààààààà àààà àà àààà: %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:433
+#: ../camel/providers/nntp/camel-nntp-folder.c:542
+#, fuzzy
+#| msgid "Posting failed: %s"
+msgid "Posting failed: "
+msgstr "àààààà àààà: %s"
+
+#: ../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:444
+#: ../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:46
-#| msgid ""
-#| "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr "ààààààààà àààààà ààà ààààààà ààààààà (ààà. c.o.linux àààà comp.os.linux àà) (_S)"
+#: ../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 ""
+"ààààààààà àààààà ààà ààààààà ààààààà (ààà. c.o.linux àààà comp.os.linux àà) "
+"(_S)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:48
-#| msgid "In the subscription dialog, show relative folder names"
+#: ../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:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:52
+msgid "Default NNTP port"
+msgstr ""
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:53
+msgid "NNTP over SSL"
+msgstr ""
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:59
 msgid "USENET news"
 msgstr "USENET àààààà"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../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:76
+#: ../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:97
+#, c-format
+msgid "Authentication requested but no username provided"
+msgstr "ààààààà àààààà ààààà àààààààà ààà àààà àààà ààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:217
+#: ../camel/providers/nntp/camel-nntp-store.c:109
 #, c-format
-msgid "Could not read greeting from %s: %s"
+msgid "Cannot authenticate to server: %s"
+msgstr "ààààà àà ààààààà àààà àà ààà: %s"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:357
+#, fuzzy, c-format
+#| msgid "Could not read greeting from %s: %s"
+msgid "Could not read greeting from %s: "
 msgstr "%s àà ààààààà àààààààà àààà àààà ààà ààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:229
+#: ../camel/providers/nntp/camel-nntp-store.c:370
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "%s NNTP ààààà àà àààààà ààà àààà %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:406
+#: ../camel/providers/nntp/camel-nntp-store.c:527
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s àà àààààà USENET àààààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:815
+#: ../camel/providers/nntp/camel-nntp-store.c:1053
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4250,7 +4234,25 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:909
+#: ../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"
 "\n"
@@ -4260,7 +4262,8 @@ msgstr ""
 "\n"
 "ààà ààà àààààà àààà àààà àà. ààààà àà àààààà àààà ààààààà àà."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:941
+#: ../camel/providers/nntp/camel-nntp-store.c:1380
+#, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -4270,614 +4273,740 @@ msgstr ""
 "\n"
 "àààààà àààà ààààà àààà àà!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:966
-msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr "àààààà ààààà ààà àà àà ààààààà àààà ààà àààà ààà: àààà ààà ààààààà ààà."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:974
-msgid "You cannot rename a folder in a News store."
-msgstr "àààààà ààààà ààà àà àà ààààààà àà ààààààààààà àààà àà àààà ààà."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:982
-msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr "àààààà ààààà ààà àà àà ààààààà àààà ààà àààà ààà: àààà ààà ààààààà ààà."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1171
-msgid "Authentication requested but no username provided"
-msgstr "ààààààà àààààà ààààà àààààààà ààà àààà àààà ààà"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1183
-#, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "ààààà àà ààààààà àààà àà ààà: %s"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1306
-#, c-format
-msgid "NNTP Command failed: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1573
+#, fuzzy
+#| msgid "NNTP Command failed: %s"
+msgid "NNTP Command failed: "
 msgstr "NNTP ààààà àààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1360
+#: ../camel/providers/nntp/camel-nntp-store.c:1647
+#, c-format
 msgid "Not connected."
 msgstr "ààààààà àààà."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1413
-#, c-format
-msgid "No such folder: %s"
-msgstr "ààà ààà ààààààà àààà àà: %s"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:271
-#: ../camel/providers/nntp/camel-nntp-summary.c:364
+#: ../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:278
+#: ../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:378
+#: ../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:414
-msgid "Use cancel"
-msgstr "cancel àà àààààà àààà"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:416
 #, c-format
 msgid "Operation failed: %s"
 msgstr "àààààààà àààà: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
+#: ../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 "%s UID àà ààà ààààà àààà"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:350
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "%d POP àààààà àààààààààààà àà ààà àà"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:430
+msgid "Unknown reason"
+msgstr "àààààà àààà"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:470
 msgid "Retrieving POP summary"
 msgstr "POP àààààà àààààààààààà àà ààà àà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
-#, c-format
-msgid "Cannot get POP summary: %s"
+#: ../camel/providers/pop3/camel-pop3-folder.c:485
+#, fuzzy
+#| msgid "Cannot get POP summary: %s"
+msgid "Cannot get POP summary: "
 msgstr "POP àààààà àààà ààààààà àà àààà àà: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:314
+#: ../camel/providers/pop3/camel-pop3-folder.c:555
 msgid "Expunging old messages"
 msgstr "àààààà ààààààà àà àààà ààà àààààà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
+#: ../camel/providers/pop3/camel-pop3-folder.c:567
 msgid "Expunging deleted messages"
 msgstr "ààààààà ààààààà àà àààà àààà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:530
-#: ../camel/providers/pop3/camel-pop3-folder.c:552
-#, c-format
-msgid "No message with UID %s"
-msgstr "%s UID àà ààà ààààà àààà"
-
-#. Sigh, most of the crap in this function is so that the cancel button
-#. returns the proper exception code.  Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:559
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "%d POP àààààà àààààààààààà àà ààà àà"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-msgid "Unknown reason"
-msgstr "àààààà àààà"
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
+#| msgid "Message storage"
+msgid "Message Storage"
+msgstr "ààààà àààààà"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
-#| msgid "Leave messages on server"
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
 msgstr "ààààà àà ààààà àààààà (_L)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#. Translators: '%s' is replaced with a widget, where user can select how many days can be message left on the server
+#: ../camel/providers/pop3/camel-pop3-provider.c:44
 #, c-format
-#| msgid "Delete after %s day(s)"
 msgid "_Delete after %s day(s)"
 msgstr "%s ààà àà àààààà àààààà (_D)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
-#| msgid "Disable support for all POP3 extensions"
+#: ../camel/providers/pop3/camel-pop3-provider.c:46
+msgid "Delete _expunged from local Inbox"
+msgstr ""
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:48
 msgid "Disable _support for all POP3 extensions"
 msgstr "ààà POP3 ààààààà àà àààà àààààà àà ààààààààà àààà (_s)"
 
+#: ../camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Default POP3 port"
+msgstr ""
+
 #: ../camel/providers/pop3/camel-pop3-provider.c:55
+msgid "POP3 over SSL"
+msgstr ""
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:62
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../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:74
+#: ../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:84
+#: ../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:83
+msgid ": "
+msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:209
+#: ../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:226
-#: ../camel/providers/pop3/camel-pop3-store.c:240
-#: ../camel/providers/pop3/camel-pop3-store.c:250
-#: ../camel/providers/pop3/camel-pop3-store.c:256
+#: ../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:227
+#: ../camel/providers/pop3/camel-pop3-store.c:151
 msgid "STLS not supported by server"
 msgstr "SSLS ààààà àààààà ààààààà àààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:257
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:169
+#, fuzzy, c-format
+#| msgid "Failed to connect to POP server %s in secure mode: %s"
+msgid "Failed to connect to POP server %s in secure mode%s"
+msgstr "POP ààààà %s àà àààààààà ààà ààà àààààà ààà àààà: %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:182
+#, fuzzy, c-format
+#| msgid "Failed to connect to POP server %s in secure mode: %s"
+msgid "Failed to connect to POP server %s in secure mode: "
+msgstr "POP ààààà %s àà àààààààà ààà ààà àààààà ààà àààà: %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:190
 msgid "TLS is not available in this build"
 msgstr "àààààà àààà àààààà àà àà ààààà ààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:363
-#, c-format
-msgid "Could not connect to POP server %s"
-msgstr "POP ààààà %s àà àààà àààà ààà"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:404
-#: ../camel/providers/pop3/camel-pop3-store.c:537
+#: ../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 àà àààààà ààà àààà: ààààààà ààààààà ààààààààà àà ààà ààà àààààà "
+"àààà."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:420
-#, c-format
-#| msgid "SASL `%s' Login failed for POP server %s: %s"
-msgid "SASL '%s' Login failed for POP server %s: %s"
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:269
+#, fuzzy, 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:432
+#: ../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:451
-#, c-format
-msgid "Failed to authenticate on POP server %s: %s"
+#: ../camel/providers/pop3/camel-pop3-store.c:308
+#, fuzzy, c-format
+#| msgid "Failed to authenticate on POP server %s: %s"
+msgid "Failed to authenticate on POP server %s: "
 msgstr "%s POP ààààà àà ààààààà ààà àààà: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:510
+#: ../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 ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:551
-#: ../camel/providers/pop3/camel-pop3-store.c:564
-#, c-format
+#: ../camel/providers/pop3/camel-pop3-store.c:427
+#, fuzzy, c-format
+#| msgid ""
+#| "Unable to connect to POP server %s.\n"
+#| "Error sending password: %s"
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending password: %s"
+"Error sending password: "
 msgstr ""
 "%s POP ààààà àà àààààà ààà àààààà.\n"
 "ààààààà ààààà ààà àààààà: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:558
-#, c-format
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:437
+#, fuzzy, 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"
+"Error sending username%s"
 msgstr ""
 "%s POP ààààà àà àààààà ààà àààààà.\n"
 "àààààààà ààà ààààà ààà àààààà: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:671
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:449
+#, fuzzy, c-format
+#| msgid ""
+#| "Unable to connect to POP server %s.\n"
+#| "Error sending password: %s"
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending password%s"
+msgstr ""
+"%s POP ààààà àà àààààà ààà àààààà.\n"
+"ààààààà ààààà ààà àààààà: %s"
+
+#: ../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:495
+#, fuzzy, c-format
+#| msgid "IMAP service for %s on %s"
+msgid "POP3 server for %s on %s"
+msgstr "%s àà %s àà ààà IMAP àààà"
+
+#: ../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:653
 #, c-format
-#| msgid "No such folder `%s'."
 msgid "No such folder '%s'."
 msgstr "'%s' àààà ààà ààààààà àààà."
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/pop3/camel-pop3-store.c:670
+#, c-format
+msgid "POP3 stores have no folder hierarchy"
+msgstr ""
+
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:40
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr "ààààààà àààààà àà \"sendmail\" ààà ààààà ààà àààà àà àààà."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:115
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:49
+msgid "sendmail"
+msgstr "sendmail"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:51
+msgid "Mail delivery via the sendmail program"
+msgstr "ààà ààààà ààààààààà àà àààààà ààà ààààààà"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:86
+#, c-format
 msgid "Could not parse recipient list"
 msgstr "àààààààààààà àààà àà àààààààà àààà àà àààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:146
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:119
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "sendmail àà ààà àààà ààà àààà ààà: %s:ààà àààà àààà ààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:167
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:141
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "sendmail àà fork àààà àà ààà:%s:ààà àààà àààà ààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:237
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
+#, fuzzy
+#| msgid "Could not send message: %s"
+msgid "Could not send message: "
+msgstr "ààààà àààà ààà ààà: %s"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail %s ààààà àà àààààààà àà: ààà àààà àààà ààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:244
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:217
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "%s àà àààààààà àààà àà àààà: ààà àààà àààà ààà."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:249
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail àààààààà àà àààààààà %d: ààà àààà àààà ààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
-msgid "sendmail"
-msgstr "sendmail"
+#: ../camel/providers/smtp/camel-smtp-provider.c:42
+msgid "Default SMTP port"
+msgstr ""
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:265
-msgid "Mail delivery via the sendmail program"
-msgstr "ààà ààààà ààààààààà àà àààààà ààà ààààààà"
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
+#, fuzzy
+#| msgid "SMTP server %s"
+msgid "SMTP over SSL"
+msgstr "SMTP ààààà %s"
+
+#: ../camel/providers/smtp/camel-smtp-provider.c:44
+msgid "Message submission port"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:39
+#: ../camel/providers/smtp/camel-smtp-provider.c:50
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:52
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr "SMTP àà àààààà àààà ààà àààààà mailhub àà àààààà ààà ààà àààààààà àà ààà."
+msgstr ""
+"SMTP àà àààààà àààà ààà àààààà mailhub àà àààààà ààà ààà àààààààà àà ààà."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:149
+#: ../camel/providers/smtp/camel-smtp-transport.c:156
+#| msgid "Welcome response error"
+msgid "Welcome response error: "
+msgstr "ààààààààà àààààà àà àààààà àààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:191
+#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr "àààààààà àààà ààà %s SMTP ààààà àà àààààà ààà àààà: %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/smtp/camel-smtp-transport.c:220
+#| msgid "STARTTLS command failed: %s"
+msgid "STARTTLS command failed: "
+msgstr "STARTTLS ààààà àààà:"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:230
+#, fuzzy, c-format
+#| msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgid "Failed to connect to SMTP server %s in secure mode: "
+msgstr "àààààààà àààà ààà %s 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:284
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "%s àà àààààà SMTP ààà ............"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:335
+#, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
+msgstr "%s SMTP ààààà ààààà àà ààààààà àààààà %s àà àààààà àààà àààà àà."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:437
+#, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"SMTP ààààà ààààààà ààà àààà.\n"
+"%s\n"
+"\n"
+
+#: ../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:561
+#, c-format
+msgid "Cannot send message: sender address not valid."
+msgstr "ààààà àààà ààà àààà:àààààà àà ààà ààà àààà àà."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:565
+msgid "Sending message"
+msgstr "ààààà ààà ààà àà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:168
+#: ../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:603
+#, c-format
+msgid "Cannot send message: one or more invalid recipients"
+msgstr "ààààà àààà ààà àààà àà: àà àà àààà àààà àààààààààààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:706
 msgid "Syntax error, command unrecognized"
 msgstr "ààààà àààà àààààà, ààààà ààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:708
 msgid "Syntax error in parameters or arguments"
 msgstr "àààààààà àà àààà ààà ààààà àààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:172
+#: ../camel/providers/smtp/camel-smtp-transport.c:710
 msgid "Command not implemented"
 msgstr "ààààà àààà àààà àààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:174
+#: ../camel/providers/smtp/camel-smtp-transport.c:712
 msgid "Command parameter not implemented"
 msgstr "ààààà àààààààà àààà àààà àààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:176
+#: ../camel/providers/smtp/camel-smtp-transport.c:714
 msgid "System status, or system help reply"
 msgstr "àààààà àààààà, àààààà àààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:178
+#: ../camel/providers/smtp/camel-smtp-transport.c:716
 msgid "Help message"
 msgstr "àààààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:180
+#: ../camel/providers/smtp/camel-smtp-transport.c:718
 msgid "Service ready"
 msgstr "àààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:182
+#: ../camel/providers/smtp/camel-smtp-transport.c:720
 msgid "Service closing transmission channel"
 msgstr "àààà ààààààà àààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:722
 msgid "Service not available, closing transmission channel"
 msgstr "àààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:186
+#: ../camel/providers/smtp/camel-smtp-transport.c:724
 msgid "Requested mail action okay, completed"
 msgstr "ààààààà ààà àààààà ààà, àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:188
+#: ../camel/providers/smtp/camel-smtp-transport.c:726
 msgid "User not local; will forward to <forward-path>"
 msgstr "àààààààà ààààààà àààà;ààà ààààààààà àààà àààààà <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:190
+#: ../camel/providers/smtp/camel-smtp-transport.c:728
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "ààààààà ààà àààààààà àààà àà àà: àààààààà àààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
+#: ../camel/providers/smtp/camel-smtp-transport.c:730
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "ààààààà àààààààà àààà àà àà: àààààààà àààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:194
+#: ../camel/providers/smtp/camel-smtp-transport.c:732
 msgid "Requested action aborted: error in processing"
 msgstr "ààààààà àààààààà àààà àà àà: ààààààààà ààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
+#: ../camel/providers/smtp/camel-smtp-transport.c:734
 msgid "User not local; please try <forward-path>"
 msgstr "àààààààà ààààààà àààà; ààààà àààààà àààà <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:198
+#: ../camel/providers/smtp/camel-smtp-transport.c:736
 msgid "Requested action not taken: insufficient system storage"
 msgstr "ààààààà àààààààà àààà àà àà: ààààààààà àààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:738
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "ààààààà ààà àààààà àààà àà: àààààà àààààà àà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
+#: ../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:204
+#: ../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:206
+#: ../camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Transaction failed"
 msgstr "ààà ààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:210
+#: ../camel/providers/smtp/camel-smtp-transport.c:748
 msgid "A password transition is needed"
 msgstr "ààààààà ààààààà àà àààààààà àà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:212
+#: ../camel/providers/smtp/camel-smtp-transport.c:750
 msgid "Authentication mechanism is too weak"
 msgstr "ààààààà ààààààààà àààà ààààà àà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:214
+#: ../camel/providers/smtp/camel-smtp-transport.c:752
 msgid "Encryption required for requested authentication mechanism"
 msgstr "ààààààà ààààààà ààààààààà àà àààà àààà àà àààààààà àà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:216
+#: ../camel/providers/smtp/camel-smtp-transport.c:754
 msgid "Temporary authentication failure"
 msgstr "ààààààà ààààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:297
-msgid "Welcome response error"
-msgstr "ààààààààà àààààà àà àààààà àààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
-#: ../camel/providers/smtp/camel-smtp-transport.c:365
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
-#, c-format
-msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "àààààààà àààà ààà %s SMTP ààààà àà àààààà ààà àààà: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:341
-#, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "STARTTLS ààààà àààà: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:356
-msgid "STARTTLS command failed"
-msgstr "STARTTLS ààààà àààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:497
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "%s SMTP ààààà ààààà àà ààààààà àààààà %s àà àààààà àààà àààà àà."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:568
-#, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"SMTP ààààà ààààààà ààà àààà.\n"
-"%s\n"
-"\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:701
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP ààààà %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:703
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "%s àà àààààà SMTP ààà ............"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:721
-msgid "Cannot send message: service not connected."
-msgstr "ààààà àààà ààà àààà àà: àààà ààààà ààà àààà àà."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
-msgid "Cannot send message: sender address not valid."
-msgstr "ààààà àààà ààà àààà:àààààà àà ààà ààà àààà àà."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:731
-msgid "Sending message"
-msgstr "ààààà ààà ààà àà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:746
-msgid "Cannot send message: no recipients defined."
-msgstr "ààààà àààà ààà àààà àà: ààà àààààààààààà àààààààà àààà àà."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:757
-msgid "Cannot send message: one or more invalid recipients"
-msgstr "ààààà àààà ààà àààà àà: àà àà àààà àààà àààààààààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:986
+#: ../camel/providers/smtp/camel-smtp-transport.c:1004
 msgid "SMTP Greeting"
 msgstr "SMTP àààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1011
-#, c-format
-msgid "HELO command failed: %s"
-msgstr "HELO ààààà àààà: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1028
-msgid "HELO command failed"
-msgstr "HELO ààààà àààà"
+#: ../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: %s"
+msgid "HELO command failed: "
+msgstr "HELO ààààà àààà:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1094
+#: ../camel/providers/smtp/camel-smtp-transport.c:1125
 msgid "SMTP Authentication"
 msgstr "SMTP ààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1100
-msgid "Error creating SASL authentication object."
-msgstr "SASL ààààààà ààààààààà ààààààà ààà ààà."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1117
-#: ../camel/providers/smtp/camel-smtp-transport.c:1128
-#, c-format
-msgid "AUTH command failed: %s"
-msgstr "AUTH ààààà àààà: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1134
-msgid "AUTH command failed"
-msgstr "AUTH ààààà àààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1204
-msgid "Bad authentication response from server.\n"
-msgstr "ààààà àà ààà ààààààà ààààààààà.\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1231
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "MAIL FROM ààààà àààà:  %s: ààà àààà àààà ààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1248
-msgid "MAIL FROM command failed"
+#: ../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: %s"
+msgid "AUTH command failed: "
+msgstr "AUTH ààààà àààà:"
+
+#: ../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"
+msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM ààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1272
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "RCPT TO ààààà àààà: %s: ààà àààà àààà ààà"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1326
+#| msgid "RSET command failed: %s"
+msgid "RCPT TO command failed: "
+msgstr "RSET ààààà àààà:"
+
+#: ../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: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"
+msgid "DATA command failed: "
+msgstr "DATA ààààà àààà:"
+
+#: ../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: %s"
+msgid "RSET command failed: "
+msgstr "RSET ààààà àààà:"
+
+#: ../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: %s"
+msgid "QUIT command failed: "
+msgstr "QUIT ààààà àààà:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1291
-#, c-format
-msgid "RCPT TO <%s> failed"
-msgstr "RCPT TO <%s> àààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1331
-#: ../camel/providers/smtp/camel-smtp-transport.c:1400
-#: ../camel/providers/smtp/camel-smtp-transport.c:1419
-#, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "àààààà ààààà àààà: %s: ààà àààà àààà ààà"
-
-#. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1348
-#: ../camel/providers/smtp/camel-smtp-transport.c:1435
-msgid "DATA command failed"
-msgstr "àààààà ààààà àààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1458
-#, c-format
-msgid "RSET command failed: %s"
-msgstr "RSET ààààà àààà: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1474
-msgid "RSET command failed"
-msgstr "RSET ààààà àààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1497
-#, c-format
-msgid "QUIT command failed: %s"
-msgstr "QUIT ààààà àààà %s"
+#: ../libedataserver/e-categories.c:47
+#| msgid "Anniversary"
+msgctxt "CategoryName"
+msgid "Anniversary"
+msgstr "àààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1511
-msgid "QUIT command failed"
-msgstr "QUIT ààààà àààà"
+#: ../libedataserver/e-categories.c:48
+#| msgid "Birthday"
+msgctxt "CategoryName"
+msgid "Birthday"
+msgstr "ààààààà"
 
-#: ../libedataserver/e-categories.c:45
+#: ../libedataserver/e-categories.c:49
+#| msgid "Business"
+msgctxt "CategoryName"
 msgid "Business"
 msgstr "ààààààà"
 
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:50
+#| msgid "Competition"
+msgctxt "CategoryName"
 msgid "Competition"
 msgstr "ààààààààààà"
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:51
+#| msgid "Favorites"
+msgctxt "CategoryName"
 msgid "Favorites"
-msgstr "ààààà"
+msgstr "ààààààà"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:52
+#| msgid "Gifts"
+msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "ààààà"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:53
+#| msgid "Goals/Objectives"
+msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "àààààà / àààààààà"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:54
+#| msgid "Holiday"
+msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "ààààà"
 
-#: ../libedataserver/e-categories.c:51
+#: ../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:53
+#: ../libedataserver/e-categories.c:57
+#| msgid "Hot Contacts"
+msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "àààààààààà àààààà"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:58
+#| msgid "Ideas"
+msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "ààààà"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:59
+#| msgid "International"
+msgctxt "CategoryName"
 msgid "International"
 msgstr "àààààààààààààà"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:60
+#| msgid "Key Customer"
+msgctxt "CategoryName"
 msgid "Key Customer"
-msgstr "ààààà àààààà"
+msgstr "àààààà àààààà"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:61
+#| msgid "Miscellaneous"
+msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "ààààà"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:62
+#| msgid "Personal"
+msgctxt "CategoryName"
 msgid "Personal"
 msgstr "ààààààààà"
 
-#: ../libedataserver/e-categories.c:59
+#: ../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:61
+#: ../libedataserver/e-categories.c:65
+#| msgid "Status"
+msgctxt "CategoryName"
 msgid "Status"
 msgstr "àààà"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:66
+#| msgid "Strategies"
+msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "àààààà"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:67
+#| msgid "Suppliers"
+msgctxt "CategoryName"
 msgid "Suppliers"
-msgstr "ààààààààà"
+msgstr "àààààààààààà"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:68
+#| msgid "Time & Expenses"
+msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "ààà à àààà"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:69
+#| msgid "VIP"
+msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:66
+#: ../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:1644 ../libedataserver/e-time-utils.c:1911
+#: ../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"
 
@@ -4885,7 +5014,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:1649 ../libedataserver/e-time-utils.c:1902
+#: ../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"
 
@@ -4893,7 +5022,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:1654 ../libedataserver/e-time-utils.c:1907
+#: ../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"
 
@@ -4901,78 +5030,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:1659 ../libedataserver/e-time-utils.c:1898
+#: ../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:1664
+#: ../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:1669
+#: ../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:1672 ../libedataserver/e-time-utils.c:1773
-#: ../libedataserver/e-time-utils.c:1893
+#: ../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:1680
+#: ../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:1684
+#: ../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:1689
+#: ../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:1694
+#: ../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:1699
+#: ../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:1704
+#: ../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:1707 ../libedataserver/e-time-utils.c:1776
+#: ../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:1834 ../libedataserver/e-time-utils.c:1956
+#: ../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:1838 ../libedataserver/e-time-utils.c:1948
+#: ../libedataserver/e-time-utils.c:1858 ../libedataserver/e-time-utils.c:1966
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4980,415 +5109,1045 @@ msgstr "%H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1843 ../libedataserver/e-time-utils.c:1953
+#: ../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:1847 ../libedataserver/e-time-utils.c:1945
+#: ../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:1850
-#| msgid "%H:%M"
+#: ../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:1854
+#: ../libedataserver/e-time-utils.c:1874
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-book-auth-util.c:90
+#: ../libedataserverui/e-book-auth-util.c:94
+#: ../libedataserverui/e-book-auth-util.c:651
 msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP ààààà àà àààààà ààà àà Access àà ààà àà"
 
-#: ../libedataserverui/e-book-auth-util.c:192
+#: ../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:362
-#, c-format
-msgid ""
-"There is already a category '%s' in the configuration. Please use another "
-"name"
-msgstr "àààà àà àà '%s' àààààà àà ààààààà ààà. ààààà àààà ààà àààààà àà"
+#: ../libedataserverui/e-categories-editor.c:221
+msgid "Currently _used categories:"
+msgstr ""
 
-#: ../libedataserverui/e-categories-dialog.c:526
+#: ../libedataserverui/e-categories-editor.c:230
+msgid "_Available Categories:"
+msgstr "àààààà ààààààà (_A)"
+
+#: ../libedataserverui/e-categories-selector.c:320
 msgid "Icon"
 msgstr "àààààà"
 
-#: ../libedataserverui/e-categories-dialog.c:531
+#: ../libedataserverui/e-categories-selector.c:325
 msgid "Category"
 msgstr "àààà"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:1
+#: ../libedataserverui/e-category-completion.c:294
+#, c-format
+msgid "Create category \"%s\""
+msgstr "\"%s\" àààààà ààààà"
+
+#: ../libedataserverui/e-category-editor.c:132
 msgid "Category Icon"
 msgstr "àààààà àààà"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:2
-msgid "Category Properties"
-msgstr "àààààà ààà"
-
-#: ../libedataserverui/e-categories-dialog.glade.h:3
-msgid "Category _Icon"
-msgstr "àààààà ààà (_I)"
+#: ../libedataserverui/e-category-editor.c:136
+msgid "_No Image"
+msgstr ""
 
-#: ../libedataserverui/e-categories-dialog.glade.h:4
+#: ../libedataserverui/e-category-editor.c:173
 msgid "Category _Name"
 msgstr "àààààà ààà (_N)"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:5
-msgid "Item(s) belong to these _categories:"
-msgstr "àà(ààà) àà ààààààààà àà àà (_c):"
+#: ../libedataserverui/e-category-editor.c:181
+msgid "Category _Icon"
+msgstr "àààààà ààà (_I)"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:6
-msgid "_Available Categories:"
-msgstr "àààààà ààààààà (_A)"
+#: ../libedataserverui/e-category-editor.c:221
+msgid "Category Properties"
+msgstr "àààààà ààà"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:7
-msgid "_Edit"
-msgstr "àààààà (_E)"
+#: ../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.glade.h:8
-msgid "categories"
-msgstr "ààààààà"
+#: ../libedataserverui/e-client-utils.c:799
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid ""
+"Enter password for calendar %s (user %s)\n"
+"Reason: %s"
+msgstr "%s àà àààà ààààààà ààààà (àààààààà %s)"
 
-#: ../libedataserverui/e-category-completion.c:290
-#, c-format
-#| msgid "Category List"
-msgid "Create category \"%s\""
-msgstr "\"%s\" àààààà ààààà"
+#: ../libedataserverui/e-client-utils.c:801
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid "Enter password for calendar %s (user %s)"
+msgstr "%s àà àààà ààààààà ààààà (àààààààà %s)"
 
-#: ../libedataserverui/e-cell-renderer-color.c:222
-msgid "Color Info"
-msgstr "ààà ààààà"
+#: ../libedataserverui/e-client-utils.c:805
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid ""
+"Enter password for task list %s (user %s)\n"
+"Reason: %s"
+msgstr "%s àà àààà ààààààà ààààà (àààààààà %s)"
 
-#: ../libedataserverui/e-cell-renderer-color.c:223
-msgid "The color to render"
-msgstr "ààààà àà ààà"
+#: ../libedataserverui/e-client-utils.c:807
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid "Enter password for task list %s (user %s)"
+msgstr "%s àà àààà ààààààà ààààà (àààààààà %s)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:278
-msgid "Select Contacts from Address Book"
-msgstr "ààà àààààààà àà àààààààà àà ààààà"
+#: ../libedataserverui/e-client-utils.c:811
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid ""
+"Enter password for memo list %s (user %s)\n"
+"Reason: %s"
+msgstr "%s àà àààà ààààààà ààààà (àààààààà %s)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:565
-msgid "_Add"
-msgstr "àààààà (_A)"
+#: ../libedataserverui/e-client-utils.c:813
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid "Enter password for memo list %s (user %s)"
+msgstr "%s àà àààà ààààààà ààààà (àààààààà %s)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:590
-msgid "_Remove"
-msgstr "àààààà (_R)"
+#: ../libedataserverui/e-client-utils.c:818
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid ""
+"Enter password for address book %s (user %s)\n"
+"Reason: %s"
+msgstr "%s àà àààà ààààààà ààààà (àààààààà %s)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:767
-#: ../libedataserverui/e-name-selector-dialog.glade.h:6
-#| msgid "Category"
-msgid "Any Category"
-msgstr "ààà àààààà"
+#: ../libedataserverui/e-client-utils.c:820
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid "Enter password for address book %s (user %s)"
+msgstr "%s àà àààà ààààààà ààààà (àààààààà %s)"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:1
-msgid "*"
-msgstr "*"
+#: ../libedataserverui/e-client-utils.c:917
+#| msgid "Enter password"
+msgid "Enter Passphrase"
+msgstr "ààààààà ààààà àààà"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:2
-#| msgid "<b>_Contacts</b>"
-msgid "<b>Co_ntacts</b>"
-msgstr "<b>àààààà (_n)</b>"
+#: ../libedataserverui/e-client-utils.c:919
+#| msgid "Enter password"
+msgid "Enter Password"
+msgstr "ààààààà ààààà àààà"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:3
-msgid "<b>Show Contacts</b>"
-msgstr "<b>àààààààà àà àààààà</b>"
+#: ../libedataserverui/e-name-selector-dialog.c:184
+#| msgid "Hot Contacts"
+msgid "Show Contacts"
+msgstr "àààààà àààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:4
-#| msgid "Address _Book:"
+#: ../libedataserverui/e-name-selector-dialog.c:206
 msgid "Address B_ook:"
 msgstr "ààà àààààààà (_o):"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:5
-msgid "Address Book"
-msgstr "ààà àààààààà"
-
-#: ../libedataserverui/e-name-selector-dialog.glade.h:7
+#: ../libedataserverui/e-name-selector-dialog.c:214
 msgid "Cate_gory:"
 msgstr "àààààà (_g):"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:8
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:261
-msgid "Contacts"
+#: ../libedataserverui/e-name-selector-dialog.c:232
+msgid "_Search:"
+msgstr "àààààà (_S):"
+
+#: ../libedataserverui/e-name-selector-dialog.c:250
+#: ../libedataserverui/e-name-selector-dialog.c:1011
+msgid "Any Category"
+msgstr "ààà àààààà"
+
+#: ../libedataserverui/e-name-selector-dialog.c:252
+#| msgid "Contacts"
+msgid "Co_ntacts"
 msgstr "àààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:9
+#: ../libedataserverui/e-name-selector-dialog.c:307
 msgid "Search"
 msgstr "àààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:10
-msgid "_Search:"
-msgstr "àààààà (_S):"
+#: ../libedataserverui/e-name-selector-dialog.c:310
+msgid "Address Book"
+msgstr "ààà àààààààà"
+
+#: ../libedataserverui/e-name-selector-dialog.c:313
+msgid "Contacts"
+msgstr "àààààà"
+
+#: ../libedataserverui/e-name-selector-dialog.c:430
+msgid "Select Contacts from Address Book"
+msgstr "ààà àààààààà àà àààààààà àà ààààà"
+
+#: ../libedataserverui/e-name-selector-dialog.c:766
+msgid "_Add"
+msgstr "àààààà (_A)"
+
+#: ../libedataserverui/e-name-selector-dialog.c:770
+msgid "_Remove"
+msgstr "àààààà (_R)"
+
+#: ../libedataserverui/e-name-selector-dialog.c:930
+#, fuzzy, 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:2456
+#: ../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:2471
+#: ../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:2481
+#: ../libedataserverui/e-name-selector-entry.c:2766
 #, c-format
-#| msgid "_Edit %s"
 msgid "C_ut %s"
 msgstr "%s ààààà (_u)"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2498
+#: ../libedataserverui/e-name-selector-entry.c:2783
 #, c-format
 msgid "_Edit %s"
 msgstr "àààààà (_E) %s"
 
-#: ../libedataserverui/e-name-selector-list.c:472
+#: ../libedataserverui/e-name-selector-list.c:509
 #, c-format
 msgid "_Delete %s"
 msgstr "%s àààààà (_D)"
 
-#: ../libedataserverui/e-passwords.c:234
-#, c-format
+#: ../libedataserverui/e-passwords.c:126
 msgid "Keyring key is unusable: no user or host name"
 msgstr ""
 
-#: ../libedataserverui/e-passwords.c:1094
+#: ../libedataserverui/e-passwords.c:699
+#: ../libedataserverui/e-passwords-win32.c:612
 msgid "You have the Caps Lock key on."
 msgstr "àààà ààà ààààà ààà ààààà àààà àà."
 
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:819
+#: ../libedataserverui/e-passwords-win32.c:735
 msgid "_Remember this passphrase"
 msgstr "àà ààààààà àà ààà àààà (_R)"
 
-#: ../libedataserverui/e-passwords.c:1217
+#: ../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:1222
+#: ../libedataserverui/e-passwords.c:825
+#: ../libedataserverui/e-passwords-win32.c:741
 msgid "_Remember this password"
 msgstr "àà ààààààà àà ààà àààà (_R)"
 
-#: ../libedataserverui/e-passwords.c:1223
+#: ../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:100
+#: ../libedataserverui/e-source-selector-dialog.c:99
 msgid "Select destination"
 msgstr "àààààà ààààà"
 
-#: ../libedataserverui/e-source-selector-dialog.c:156
+#: ../libedataserverui/e-source-selector-dialog.c:169
 msgid "_Destination"
 msgstr "àààààà (_D)"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1698
-#: ../servers/exchange/storage/exchange-account.c:959
-#, c-format
-msgid "Enter password for %s"
-msgstr "%s àà àààà ààààààà ààààà"
+#~ msgid "Updating contacts cache (%d)... "
+#~ msgstr "àààààà ààà àààààà àà ààà àà (%d)... "
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1699
-#: ../servers/exchange/storage/exchange-account.c:964
-msgid "Enter password"
-msgstr "ààààààà ààààà àààà"
+#~ msgid "\"%s\" on book before \"%s\""
+#~ msgstr "\"%s\" àà \"%s\" àà àààà ààà"
 
-#. i18n: These are Outlook's words for the default roles in
-#. the folder permissions dialog.
-#: ../servers/exchange/lib/e2k-security-descriptor.c:847
-msgid "Owner"
-msgstr "ààààà"
+#~ msgid "book busy"
+#~ msgstr "àààààà àà ààà ààà ààààààà"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:857
-msgid "Publishing Editor"
-msgstr "ààààààà àààààà"
+#~ msgid "CORBA exception making \"%s\" call"
+#~ msgstr "CORBA ààààà \"%s\" ààà àààààà"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:865
-msgid "Editor"
-msgstr "àààààà"
+#~ msgid "%s: there is no current operation"
+#~ msgstr "%s: ààà àààààà àààààà àààà"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:872
-msgid "Publishing Author"
-msgstr "ààààààà àààà"
+#~ msgid "\"%s\" on book after \"%s\""
+#~ msgstr "\"%s\" àà \"%s\" ààà ààà àààà"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:878
-msgid "Author"
-msgstr "àààà"
+#~ msgid "%s: canceled"
+#~ msgstr "%s: àààà"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:883
-msgid "Non-editing Author"
-msgstr "ààà àààààà àààà"
+#~ msgid "%s: no factories available for URI `%s'"
+#~ msgstr "%s: URI `%s' àà àààà ààà ààààààà àààààà àààà"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:887
-msgid "Reviewer"
-msgstr "ààààààà"
+#~ msgid "%s: Could not create EBookListener"
+#~ msgstr "%s: EBookListener ààà àààà ààà"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:889
-msgid "Contributor"
-msgstr "àààààà"
+#~ msgid "%s: there was no self contact UID stored in gconf"
+#~ msgstr "%s: ààà ààà àààààà UID gconf ààà ààààààà àààà àà"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:891
-msgid "None"
-msgstr "ààà àààà"
+#~ msgid "Could not create thread for getting deltas"
+#~ msgstr "àààààà àà àààà ààààà àààà ààà ààà"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:906
-msgid "Custom"
-msgstr "àààààà"
+#~ msgid "Could not create thread for populating cache"
+#~ msgstr "ààà àààà àà àààà ààààà àààà ààà ààà"
 
-#: ../servers/exchange/storage/e-storage.c:555
-msgid "Generic error"
-msgstr "àààààààà àààààà"
+#~ msgid "Reply Requested: by "
+#~ msgstr "àààà ààààààà: àààà àààààà"
 
-#: ../servers/exchange/storage/e-storage.c:557
-msgid "A folder with the same name already exists"
-msgstr "àà ààààààà àààà ààà àà àààà ààààààà àà"
+#~ msgid "Reply Requested: When convenient"
+#~ msgstr "àààà ààààààà: àà àààààà àà"
 
-#: ../servers/exchange/storage/e-storage.c:559
-msgid "The specified folder type is not valid"
-msgstr "ààààààààà ààààààà àààààà àààààà àààà àà"
+#~ msgid "Loading %s items"
+#~ msgstr "%s àà ààà àà ààà àà"
 
-#: ../servers/exchange/storage/e-storage.c:561
-msgid "I/O error"
-msgstr "I/O àààààà"
+#~ msgid "Calendar"
+#~ msgstr "àààààà"
 
-#: ../servers/exchange/storage/e-storage.c:563
-msgid "Not enough space to create the folder"
-msgstr "ààààààà ààààà àà àààà àààààààà ààààà àààà"
+#~ msgid "Verifying message"
+#~ msgstr "ààààà àà àààà àà ààà àà"
 
-#: ../servers/exchange/storage/e-storage.c:565
-msgid "The folder is not empty"
-msgstr "ààààààà àààà àààà àà"
+#~ msgid "Cannot open message"
+#~ msgstr "ààààà àààà ààà àààà àà"
 
-#: ../servers/exchange/storage/e-storage.c:567
-msgid "The specified folder was not found"
-msgstr "ààààààààà ààààààà àààà àààà"
+#~ msgid "Unsupported operation: append message: for %s"
+#~ msgstr "àààààààà àààààààà: ààààà àààààà: %s àà ààà"
 
-#: ../servers/exchange/storage/e-storage.c:569
-msgid "Function not implemented in this storage"
-msgstr "àààààà àà àààààà ààà àààà àààà àà"
+#~ msgid "Unsupported operation: search by expression: for %s"
+#~ msgstr "àààààààà àààààààà: ààà àà ààààà: %s àà ààà"
 
-#: ../servers/exchange/storage/e-storage.c:573
-msgid "Operation not supported"
-msgstr "àààààà ààààààà àààà àà"
+#~| msgid "Unsupported operation: search by expression: for %s"
+#~ msgid "Unsupported operation: count by expression: for %s"
+#~ msgstr "àààààààà àààààààà: àààààààààà àà àààà àààà: %s àà ààà"
 
-#: ../servers/exchange/storage/e-storage.c:575
-msgid "The specified type is not supported in this storage"
-msgstr "ààààààààà àààààà àà àààààà ààà ààààààà àààà àà"
+#~ msgid "Unsupported operation: search by UIDs: for %s"
+#~ msgstr "àààààààà àààààààà: UID àà ààààà: %s àà ààà"
 
-#: ../servers/exchange/storage/e-storage.c:577
-msgid "The specified folder cannot be modified or removed"
-msgstr "ààààààààà ààààààà ààààààààà àà ààààà àààà àà àààà"
+#~ msgid "Learning junk"
+#~ msgstr "ààà àà ààà ààà àà"
 
-#: ../servers/exchange/storage/e-storage.c:579
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "àààà ààààà àà àààà àà ààààààà àààà ààà àààà"
+#~ msgid "Learning non-junk"
+#~ msgstr "ààà-ààà àà ààà ààà àà"
 
-#: ../servers/exchange/storage/e-storage.c:581
-msgid "Cannot create a folder with that name"
-msgstr "àà ààààààà àà ààà àà àààà ààà àààà"
+#~ msgid "Canceled."
+#~ msgstr "àààà"
 
-#: ../servers/exchange/storage/e-storage.c:583
-msgid "This operation cannot be performed in off-line mode"
-msgstr "àààààà ààà ààà àààààààà àààà àà àà àààà àà"
+#~ msgid "This is a digitally signed message part"
+#~ msgstr "àà àààààà ààà àà ààààààààààà ààààà àà àààààà àà"
 
-#. i18n: This is the title of an "other user's folders"
-#. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:642
-#, c-format
-msgid "%s's Folders"
-msgstr "%s' àà ààààààà"
+#~ msgid "Cannot verify message signature: could not create temp file: %s"
+#~ msgstr "ààààà ààààààààà àà àààà àààà àà àààà: ààààààà ààààà àààà ààààààà àà àààà: %s"
 
-#: ../servers/exchange/storage/exchange-account.c:1265
-msgid "Personal Folders"
-msgstr "ààààààààà ààààààà"
+#~ msgid "Unable to parse message content"
+#~ msgstr "ààààà àààààààààà àà àààààààà ààà ààààà"
 
-#: ../servers/exchange/storage/exchange-account.c:1280
-msgid "Favorite Public Folders"
-msgstr "ààààààà ààààààààà ààààààà"
+#~ msgid "cannot create thread"
+#~ msgstr "ààààà àààà ààààààà àà àààà"
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1297
-msgid "All Public Folders"
-msgstr "ààà ààààààààà ààààààà"
+#~ msgid "Kerberos 4"
+#~ msgstr "Kerberos 4"
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1311
-msgid "Global Address List"
-msgstr "ààààààà ààà àààà"
+#~ msgid ""
+#~ "This option will connect to the server using Kerberos 4 authentication."
+#~ msgstr "Kerberos 4 ààààààà àà ààààà àà àà àààààà ààààà àà ààààààà."
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
-msgid "Deleted Items"
-msgstr "ààààààà ààààààà"
+#~ msgid ""
+#~ "Could not get Kerberos ticket:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kerberos àààà àààà àà ààà:\n"
+#~ "%s"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
-msgid "Journal"
-msgstr "ààààà"
+#~ msgid "POP Before SMTP auth using a non-pop source"
+#~ msgstr "àà ààà pop ààààà àà àààààà àà SMTP ààààààààà àà ààààà POP"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "ààààààà"
+#~ msgid ""
+#~ "Could not create directory %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s àààààààààà àààà ààààààà àà ààà:\n"
+#~ "%s"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "àààààààà"
+#~ msgid "import keys: unimplemented"
+#~ msgstr "àààà ààààà: àààà àààà ààà"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "àààà-ààà ààààààà"
+#~ msgid "export keys: unimplemented"
+#~ msgstr "ààààààà ààààà: àààà àààà ààà"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "ààààà"
+#~ msgid "Cannot get folder: Invalid operation on this store"
+#~ msgstr "ààààààà ààààààà àààà àà àààà àà: àà ààààà àà àààà àààààààà"
 
-#: ../servers/groupwise/e-gw-connection.c:225
-msgid "Invalid connection"
-msgstr "àààà àààààà."
+#~ msgid "Cannot create folder: Invalid operation on this store"
+#~ msgstr "ààààààà ààààààà àààà àà àààà àà: àà ààààà àà àààà àààààààà"
 
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid response from server"
-msgstr "ààààà àà ààà ààààààààà."
+#~ msgid "Unable to get issuer's certificate"
+#~ msgstr "ààààààà àà àààààààààà àà àààà ààà àààààà"
 
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "No response from the server"
-msgstr "ààààà àà ààà ààààààààà àààà."
+#~ msgid "Unable to get Certificate Revocation List"
+#~ msgstr "àààààààààà ààààà àààà àààà ààà àààààà"
 
-#: ../servers/groupwise/e-gw-connection.c:237
-msgid "Bad parameter"
-msgstr "àààà àààààààà"
+#~ msgid "Unable to decrypt certificate signature"
+#~ msgstr "àààààààààà ààààààààà àà àààààà ààà àààààà"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
-msgid "Evolution Addressbook file backend"
-msgstr "ààààààààà ààà àààààààà àààà àààààà"
+#~ msgid "Unable to decrypt Certificate Revocation List signature"
+#~ msgstr "àààààààààà ààààà àààà ààààààààà àà àààààà ààà àààààà"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
-msgid "Evolution Calendar file and webcal backend"
-msgstr "ààààààààà àààààà àààà ààà àààààà àààààà"
+#~ msgid "Unable to decode issuer's public key"
+#~ msgstr "ààààààà ààààààààà ààààà ààààà àààà ààà àààààà"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:3
-msgid "Evolution Data Server interface check service"
-msgstr "ààààààààà àààààà ààààààà àààà àààà"
+#~ msgid "Certificate signature failure"
+#~ msgstr "àààààààààà ààààààààà àààààà"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
-msgid "Evolution Data Server logging service"
-msgstr "ààààààààà àààààà ààààà àààààà àààà"
+#~ msgid "Certificate Revocation List signature failure"
+#~ msgstr "àààààààààà ààààà àààà ààààààààà àààààà"
 
-#. dialog display isn't working out
-#: ../src/server.c:109
-#, c-format
-msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
-msgstr "ààààààà àààà àààààà ààààààà ààà, àààààà ààààà àààà àààà àààà\n"
+#~ msgid "Certificate not yet valid"
+#~ msgstr "àààààààààà àà ààà àààà àà"
 
+#~ msgid "Certificate has expired"
+#~ msgstr "àààààààààà àà ààà àààà àààààà àà àààà àà"
 
-#: ../calendar/libecal/e-cal.c:1049
-msgid "On This Computer"
-msgstr "àà ààààààààà àà"
+#~ msgid "CRL not yet valid"
+#~ msgstr "CRL àà ààà àààà àà"
+
+#~ msgid "CRL has expired"
+#~ msgstr "CRL àà ààà àààà àààààà àà àààà àà"
+
+#~ msgid "Error in CRL"
+#~ msgstr "CRL ààà ààà"
+
+#~ msgid "Out of memory"
+#~ msgstr "àààààà àà àààà"
+
+#~ msgid "Zero-depth self-signed certificate"
+#~ msgstr "ààààà-àààà ààà-ààààààààààà àààààààààà"
+
+#~ msgid "Self-signed certificate in chain"
+#~ msgstr "àààààààà ààà ààà-ààààààààààà àààààààààà"
+
+#~ msgid "Unable to get issuer's certificate locally"
+#~ msgstr "ààààààà àà àààààààààà àà ààààààà àààà àà àààà ààà àààààà"
+
+#~ msgid "Unable to verify leaf signature"
+#~ msgstr "ààà ààààààààà àà àààà ààà àààààà"
+
+#~ msgid "Certificate chain too long"
+#~ msgstr "àààààààààà àààààààà àààààà àààà àà"
+
+#~ msgid "Certificate Revoked"
+#~ msgstr "àààààààààà àààààà"
+
+#~ msgid "Invalid Certificate Authority (CA)"
+#~ msgstr "àààà àààààààààà ààààààààà (CA)"
+
+#~ msgid "Path length exceeded"
+#~ msgstr "àà ààààà àààààà àà ààà"
+
+#~ msgid "Invalid purpose"
+#~ msgstr "àààà àààààààà"
+
+#~ msgid "Certificate untrusted"
+#~ msgstr "àààààààààà àà ààààààà àààà àààà ààà"
+
+#~ msgid "Certificate rejected"
+#~ msgstr "àààààààààà àààààààà"
+
+#~ msgid "Subject/Issuer mismatch"
+#~ msgstr "àààà/ààààààà ààààà"
+
+#~ msgid "AKID/SKID mismatch"
+#~ msgstr "AKID/SKID ààààà"
+
+#~ msgid "AKID/Issuer serial mismatch"
+#~ msgstr "AKID/ààààààà àààààààà ààààà"
+
+#~ msgid "Key usage does not support certificate signing"
+#~ msgstr "ààààà àààààà àààààààààà ààààààààà àà àààààà àààà àààà"
+
+#~ msgid "Error in application verification"
+#~ msgstr "ààààà àààà ààà ààà"
+
+#~ msgid ""
+#~ "Bad certificate from %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you wish to accept anyway?"
+#~ msgstr ""
+#~ "%s àà ààà àààààààààà:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "àààà àà àààà ààà ààààààà àààà ààààà ààà?"
+
+#~ msgid ""
+#~ "Cannot get message: %s\n"
+#~ "  %s"
+#~ msgstr ""
+#~ "ààààà àààà àà àààà àà: %s\n"
+#~ "  %s"
+
+#~ msgid "User canceled"
+#~ msgstr "àààààààà àààà àà àààà ààà"
+
+#~ msgid "Could not get message"
+#~ msgstr "ààààà àààà ààà ààà"
+
+#~ msgid "Trash Folder Full. Please Empty."
+#~ msgstr "ààààà ààààààà ààààà. ààààà àààà àààà."
+
+#~| msgid "Cannot append message to folder `%s': %s"
+#~ msgid "Cannot append message to folder '%s': %s"
+#~ msgstr "'%s' ààààààà ààà ààààà àààà àààà àààà àà: %s"
+
+#~ msgid "Cannot append message in offline mode: cache unavailable"
+#~ msgstr "àààààà ààà ààà ààààà àààà àààà àààà: ààà àààààààà"
+
+#~ msgid "Cannot append message in offline mode: %s"
+#~ msgstr "àààààà ààà ààà ààààà àààà àààà àà àààà: %s"
+
+#~ msgid "Checking for new mail"
+#~ msgstr "ààà ààà àà àààà àààà ààà àà"
+
+#~| msgid "Check new messages for Junk contents"
+#~ msgid "Check new messages for J_unk contents"
+#~ msgstr "ààà ààààà àà ààà àààààààààà àà àààà àààààà (_u)"
+
+#~| msgid "Automatically synchronize account locally"
+#~ msgid "Automatically synchroni_ze account locally"
+#~ msgstr "àààààààà ààààààààà àààà ààààààà ààà àà (_z)"
+
+#~ msgid "SOAP Settings"
+#~ msgstr "SOAP ààààà"
+
+#~| msgid "Post Office Agent SOAP Port:"
+#~ msgid "Post Office Agent SOAP _Port:"
+#~ msgstr "ààà àà ààààà SOAP ààààà (_P):"
+
+#~ msgid "Novell GroupWise"
+#~ msgstr "Novell GroupWise"
+
+#~ msgid "For accessing Novell GroupWise servers"
+#~ msgstr "Novell Groupwise servers àà ààààà àà ààà"
+
+#~ 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 "ààààààà ààà ààà GroupWise ààààààà ààà àà àààà."
+
+#~| msgid "Cannot rename Groupwise folder `%s' to `%s'"
+#~ msgid "Cannot rename GroupWise folder '%s' to '%s'"
+#~ msgstr "àààààààà ààààààà '%s' àà '%s' ààà ààà àààà ààà ààà"
+
+#~ msgid "GroupWise server %s"
+#~ msgstr "GroupWise ààààà %s"
+
+#~ msgid "GroupWise service for %s on %s"
+#~ msgstr "%s àà %s àà ààà àààà àà àààà àà àààà"
+
+#~ msgid "GroupWise mail delivery via %s"
+#~ msgstr "%s àà àààààà àààà àà àààà àà ààà àààààà"
+
+#~ msgid "Sending Message"
+#~ msgstr "ààààà ààà ààà àà"
+
+#~ msgid "Hula"
+#~ msgstr "àààà"
+
+#~ msgid "For accessing Hula servers"
+#~ msgstr "àààà ààààà àà ààààà àà ààà"
+
+#~ msgid ""
+#~ "This option will connect to the Hula server using a plaintext password."
+#~ msgstr "àààà ààà ààààààà àà ààààà àà àà àààààà IMAP ààààà àà ààààààà."
+
+#~ msgid "Operation cancelled"
+#~ msgstr "àààààà àààà"
+
+#~ msgid "_Apply filters to new messages in INBOX on this server"
+#~ msgstr "àà ààààà àà INBOX ààà àà ààààà àà ààà àààààà ààààà (_A)"
+
+#~ msgid "SSL negotiations failed"
+#~ msgstr "SSL àààààà àààà"
+
+#~ msgid "Drafts"
+#~ msgstr "ààààààà"
+
+#~| msgid "Sleet"
+#~ msgid "Sent"
+#~ msgstr "àà ààà"
+
+#~ msgid "Templates"
+#~ msgstr "ààààààà"
+
+#~ msgid "Failed sending command to IMAP server %s: %s"
+#~ msgstr "%s IMAP ààààà àà ààààà ààààà ààà àààà:%s"
+
+#~ msgid "Unexpected response from IMAP4 server %s: %s"
+#~ msgstr "IMAP4 ààààà %s àà ààààààààààà ààààààààà: %s"
+
+#~ msgid "Unexpected greeting from IMAP server %s."
+#~ msgstr "IMAP ààààà %s àà ààààààààààà àààààààà."
+
+#~| msgid "Cannot select folder `%s': Invalid mailbox name"
+#~ msgid "Cannot select folder '%s': Invalid mailbox name"
+#~ msgstr "'%s' ààààààà àà ààà àààà àà àààà àà: àààà ààààààà ààà"
+
+#~| msgid "Cannot select folder `%s': Bad command"
+#~ msgid "Cannot select folder '%s': Bad command"
+#~ msgstr "'%s' ààààààà àà ààà àààà àà àààà àà: ààà ààààà"
+
+#~| msgid "Failed sending command to IMAP server %s: %s"
+#~ msgid "Failed to send command to IMAP server %s: %s"
+#~ msgstr "%s IMAP ààààà àà ààààà ààààà ààà àààà: %s"
+
+#~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
+#~ msgstr "IMAP4 ààààà %s ààààààààààà ààà àà àààààààà àà ààà: %s"
+
+#~| msgid ""
+#~| "Enable Mailing-List detection required for some filter and vFolder rules"
+#~ msgid ""
+#~ "Enable extended Mailing-List detection required for some filter and "
+#~ "vFolder rules"
+#~ msgstr "ààà àààààà àà vFolder àààà àà àààà ààààààààà àààààà àààà àààà àààààà àààà"
+
+#~ msgid "Expire cached messages that haven't been read in X seconds"
+#~ msgstr "X àààààà ààà ààà ààà ààààà àà ààà àààààà àààà àà àà àààà àààà ààà àà"
+
+#~| msgid "Cannot access folder `%s': %s"
+#~ msgid "Cannot access folder '%s': %s"
+#~ msgstr "'%s' ààààààà ààà ààààà àààà àà àààà àà: %s"
+
+#~| msgid "Cannot sync flags to folder `%s': Unknown"
+#~ msgid "Cannot sync flags to folder '%s': Unknown error"
+#~ msgstr "'%s' ààààààà ààà ààààà àààààààààà àààà àà àààà àà: àààààà àààààà"
+
+#~| msgid "Cannot sync flags to folder `%s': Bad command"
+#~ msgid "Cannot sync flags to folder '%s': Bad command"
+#~ msgstr "'%s' ààààààà ààà ààààà ààààààààà àààà àà àààà àà: ààà ààààà"
+
+#~| msgid "Cannot expunge folder `%s': Unknown"
+#~ msgid "Cannot expunge folder '%s': Unknown error"
+#~ msgstr "'%s' ààààààà ààààà ààààààà àààà àà àààà: àààààà àààààà"
+
+#~| msgid "Cannot expunge folder `%s': Bad command"
+#~ msgid "Cannot expunge folder '%s': Bad command"
+#~ msgstr "'%s' ààààààà ààààà ààààààà àààà àà àààà àà: ààà ààààà"
+
+#~| msgid "Cannot get message %s from folder `%s': No such message"
+#~ msgid "Cannot get message %s from folder '%s': No such message"
+#~ msgstr "'%s' ààààààà àà %s ààààà àààà ààààààà àà àààà àà: ààà ààà ààààà àààà"
+
+#~| msgid "Cannot get message %s from folder `%s': Bad command"
+#~ msgid "Cannot get message %s from folder '%s': Bad command"
+#~ msgstr "'%s' ààààààà àà %s ààààà àààà ààààààà àà àààà àà: ààà ààààà"
+
+#~| msgid "Cannot append message to folder `%s': Folder is read-only"
+#~ msgid "Cannot append message to folder '%s': Folder is read-only"
+#~ msgstr "'%s' ààààààà ààà ààààà àààà àààà àààà: ààààààà ààààà ààààà àà"
+
+#~| msgid "Cannot append message to folder `%s': Unknown error"
+#~ msgid "Cannot append message to folder '%s': Unknown error"
+#~ msgstr "'%s' ààààààà ààà ààààà àààà àààà àààà àà: àààààà àààààà"
+
+#~| msgid "Cannot append message to folder `%s': Bad command"
+#~ msgid "Cannot append message to folder '%s': Bad command"
+#~ msgstr "'%s' ààààààà ààà ààààà àààà àààà àààà: ààà ààààà"
+
+#~| msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr "'%s' ààààààà àà '%s' ààààààà ààà ààààà ààààà àààà àà àààà àà: àààààà àààààà"
+
+#~| msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr "'%s' ààààààà àà '%s' ààààààà ààà ààààà àààà àààà àà àààà àà: àààààà àààààà"
+
+#~| msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr "'%s' ààààààà àà '%s' ààààààà ààà ààààà ààààààààà àààà àà àààà àà: ààà ààààà"
+
+#~| msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr "'%s' ààààààà àà '%s' ààààààà ààà ààààà àààà àààà àà àààà àà: ààà ààààà"
+
+#~ msgid "Check new messages for _Junk contents"
+#~ msgstr "ààà ààààà àà ààà àààààààààà àà àààà àààààà (_J)"
+
+#~ msgid "Only check for Junk messa_ges in the INBOX folder"
+#~ msgstr "ààààààà ààààààà ààà ààààà ààà ààààà àà àààà àààààà (_g)"
+
+#~ msgid "IMAP4rev1"
+#~ msgstr "IMAP4rev1"
+
+#~ msgid "For reading and storing mail on IMAPv4rev1 servers."
+#~ msgstr "IMAPv4rev1 ààààà àà ààà ààààà àà ààààà àààà àà ààà"
+
+#~ msgid ""
+#~ "This option will connect to the IMAPv4rev1 server using a plaintext "
+#~ "password."
+#~ msgstr "ààààààààààà ààààààà àà ààààà àà àà àààààà IMAPv4rev1 ààààà àà ààààààà."
+
+#, fuzzy
+#~| msgid "Failed to connect to IMAP server %s in secure mode: %s"
+#~ msgid ""
+#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
+#~ "support STARTTLS"
+#~ msgstr "àààààààà ààà ààà %s IMAP ààààà àà àààààà ààà àààà: %s"
+
+#~ msgid "TLS negotiations failed"
+#~ msgstr "TLS àààààà àààà"
+
+#~ msgid ""
+#~ "Cannot authenticate to IMAP server %s using the %s authentication "
+#~ "mechanism"
+#~ msgstr "%s ààààààà ààààààààà àà àààààà àà %s IMAP ààààà àà àààààààà àààà àà àààà àà"
+
+#~ msgid "Cannot authenticate to IMAP server %s using %s"
+#~ msgstr "%s àà àààààà àà %s IMAP ààààà àà àààààààà àààà àà àààà àà"
+
+#~ msgid "Cannot create IMAP folders in offline mode."
+#~ msgstr "àààààà ààà ààà IMAP ààààààà àààà ààà àààà."
+
+#~| msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+#~ msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
+#~ msgstr "%s IMAP ààààà àà '%s' ààààààà àààà àà àààà àà: àààààà àààààà"
+
+#~ msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
+#~ msgstr "Cannot get LIST information for '%s' on IMAP server %s: %s"
+
+#~ msgid "Bad command"
+#~ msgstr "ààà ààààà"
+
+#~| msgid "Cannot create folder `%s': Invalid mailbox name"
+#~ msgid "Cannot create folder '%s': Invalid mailbox name"
+#~ msgstr "'%s' ààààààà àààà ààààààà àà àààà: àààà ààààààà ààà"
+
+#~| msgid "Cannot create folder `%s': Bad command"
+#~ msgid "Cannot create folder '%s': Bad command"
+#~ msgstr "'%s' ààààààà àààà ààààààà àà àààà: ààà ààààà"
+
+#~| msgid "Cannot delete folder `%s': Special folder"
+#~ msgid "Cannot delete folder '%s': Special folder"
+#~ msgstr "'%s' ààààààà àààà ààààààà àà àààà: ààààà ààààààà"
+
+#~ msgid "Cannot delete IMAP folders in offline mode."
+#~ msgstr "àààààà ààà ààà IMA ààààààà àà àààààà àààà àà àààà ààà."
+
+#~| msgid "Cannot delete folder `%s': Invalid mailbox name"
+#~ msgid "Cannot delete folder '%s': Invalid mailbox name"
+#~ msgstr "'%s' ààààààà àààà ààààààà àà àààà: àààà ààààààà ààà"
+
+#~| msgid "Cannot delete folder `%s': Bad command"
+#~ msgid "Cannot delete folder '%s': Bad command"
+#~ msgstr "'%s' ààààààà ààààààà àààà àà àààà: ààà ààààà"
+
+#~| msgid "Cannot rename folder `%s' to `%s': Special folder"
+#~ msgid "Cannot rename folder '%s' to '%s': Special folder"
+#~ msgstr "ààààààà '%s' àà '%s' ààà ààà àààà ààà àààà: ààààà ààààààà"
+
+#~ msgid "Cannot rename IMAP folders in offline mode."
+#~ msgstr "àààààà ààà ààà IMA ààààààà àà ààààààààààà àààà àà àààà ààà."
+
+#~| msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+#~ msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
+#~ msgstr "ààààààà '%s' àà '%s' ààà ààà àààà ààà àààà: àààà ààààààà ààà"
+
+#~| msgid "Cannot rename folder `%s' to `%s': Bad command"
+#~ msgid "Cannot rename folder '%s' to '%s': Bad command"
+#~ msgstr "ààààààà'%s' àà '%s' ààà àààà ààà àààà: ààà ààààà"
+
+#, fuzzy
+#~| msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+#~ msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
+#~ msgstr "%s IMAP ààààà àà '%s' àààààà àà àààà '%s' ààààà àààà ààààààà àà àààà: %s"
+
+#~ msgid "Cannot subscribe to IMAP folders in offline mode."
+#~ msgstr "àààààà ààà ààà IMAP ààààààà àà ààààà àààà àà àààà àà"
+
+#~| msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+#~ msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
+#~ msgstr "'%s' ààààààà àà ààààà àààà àà àààà àà: àààà ààààààà ààà"
+
+#~| msgid "Cannot subscribe to folder `%s': Bad command"
+#~ msgid "Cannot subscribe to folder '%s': Bad command"
+#~ msgstr "'%s' ààààààà àà ààààà àààà àà àààà àà: ààà ààààà"
+
+#~ msgid "Cannot unsubscribe from IMAP folders in offline mode."
+#~ msgstr "IMAP ààààààà àà àààààà ààà ààà ààààààà àààà àààà àà àààà àà"
+
+#~| msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+#~ msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
+#~ msgstr "'%s' ààààààà àà ààààààà àààà àààà àà àààà àà:àààà ààààààà ààà"
+
+#~| msgid "Cannot unsubscribe from folder `%s': Bad command"
+#~ msgid "Cannot unsubscribe from folder '%s': Bad command"
+#~ msgstr "'%s' ààààààà àà ààààààà àààà àààà àà àààà àà:ààà ààààà"
+
+#~ msgid "Scanning for changed messages"
+#~ msgstr "ààààààààà ààààà àà àààà àààààààà"
+
+#~| msgid "Fetching envelopes for new messages"
+#~ msgid "Fetching envelopes of new messages"
+#~ msgstr "àà ààààà àà àààààà àà ààà àà"
+
+#~ msgid "Unexpected token in response from IMAP server %s: "
+#~ msgstr "IMAP ààààà àà ààààààààà ààà ààààààààààà àààà %s: "
+
+#~ msgid "No data"
+#~ msgstr "ààà àààààà àààà"
+
+#~ msgid "IMAP server %s unexpectedly disconnected: %s"
+#~ msgstr "IMAP ààààà %s ààààààààààà ààà àà àààààààà àà ààà: %s"
+
+#~ msgid ""
+#~ "Experimental IMAP 4(.1) client\n"
+#~ "This is untested and unsupported code, you want to use plain imap "
+#~ "instead.\n"
+#~ "\n"
+#~ " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+#~ msgstr ""
+#~ "ààààààààà IMAP 4(.1) àààààà\n"
+#~ "àà ààààààààà àà àààààààà ààà àà, àààà ààà àà ààààà imap àà àààààà àààà ààààà ààà.\n"
+#~ "\n"
+#~ " !!! ààààààà àààà àà ààà àààà àààààà àààà àààà  !!!\n"
+
+#~ msgid "Could not connect to %s (port %s): %s"
+#~ msgstr "%s (ààààà %s) àà àààà àààà ààà : %s"
+
+#~ msgid "Could not connect to POP server on %s"
+#~ msgstr "%s àà POP ààààà àà àààà àààà ààà"
+
+#~ msgid "Maildir append message canceled"
+#~ msgstr "Maildir àààààà ààààà àààà"
+
+#~ msgid "Invalid message contents"
+#~ msgstr "àààà ààààà àààààààààà"
+
+#~ msgid "Mail append canceled"
+#~ msgstr "ààà àààààà àààà"
+
+#~ msgid "Message construction failed."
+#~ msgstr "ààààà àààààà àààà."
+
+#~ msgid "MH append message canceled"
+#~ msgstr "MH ààà ààààà àààà"
+
+#~ msgid "Use cancel"
+#~ msgstr "cancel àà àààààà àààà"
+
+#~ msgid "STARTTLS command failed"
+#~ msgstr "STARTTLS ààààà àààà"
+
+#~ msgid "HELO command failed"
+#~ msgstr "HELO ààààà àààà"
+
+#~ msgid "AUTH command failed"
+#~ msgstr "AUTH ààààà àààà"
+
+#~ msgid "Bad authentication response from server.\n"
+#~ msgstr "ààààà àà ààà ààààààà ààààààààà.\n"
+
+#~ msgid "MAIL FROM command failed: %s: mail not sent"
+#~ msgstr "MAIL FROM ààààà àààà:  %s: ààà àààà àààà ààà"
+
+#~ msgid "RCPT TO command failed: %s: mail not sent"
+#~ msgstr "RCPT TO ààààà àààà: %s: ààà àààà àààà ààà"
+
+#~ msgid "DATA command failed: %s: mail not sent"
+#~ msgstr "àààààà ààààà àààà: %s: ààà àààà àààà ààà"
+
+#~ msgid "RSET command failed"
+#~ msgstr "RSET ààààà àààà"
+
+#~ msgid "QUIT command failed"
+#~ msgstr "QUIT ààààà àààà"
+
+#~ msgid "Item(s) belong to these _categories:"
+#~ msgstr "àà(ààà) àà ààààààààà àà àà (_c):"
+
+#~ msgid "_Edit"
+#~ msgstr "àààààà (_E)"
+
+#~ msgid "categories"
+#~ msgstr "ààààààà"
+
+#~ msgid "Color Info"
+#~ msgstr "ààà ààààà"
+
+#~ msgid "The color to render"
+#~ msgstr "ààààà àà ààà"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~| msgid "<b>_Contacts</b>"
+#~ msgid "<b>Co_ntacts</b>"
+#~ msgstr "<b>àààààà (_n)</b>"
+
+#~ msgid "<b>Show Contacts</b>"
+#~ msgstr "<b>àààààààà àà àààààà</b>"
+
+#~ msgid "Enter password for %s"
+#~ msgstr "%s àà àààà ààààààà ààààà"
+
+#~ msgid "Owner"
+#~ msgstr "ààààà"
+
+#~ msgid "Publishing Editor"
+#~ msgstr "ààààààà àààààà"
+
+#~ msgid "Editor"
+#~ msgstr "àààààà"
+
+#~ msgid "Publishing Author"
+#~ msgstr "ààààààà àààà"
+
+#~ msgid "Author"
+#~ msgstr "àààà"
+
+#~ msgid "Non-editing Author"
+#~ msgstr "ààà àààààà àààà"
+
+#~ msgid "Reviewer"
+#~ msgstr "ààààààà"
+
+#~ msgid "Contributor"
+#~ msgstr "àààààà"
+
+#~ msgid "None"
+#~ msgstr "ààà àààà"
+
+#~ msgid "Custom"
+#~ msgstr "àààààà"
+
+#~ msgid "Generic error"
+#~ msgstr "àààààààà àààààà"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "àà ààààààà àààà ààà àà àààà ààààààà àà"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "ààààààààà ààààààà àààààà àààààà àààà àà"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "ààààààà ààààà àà àààà àààààààà ààààà àààà"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "ààààààà àààà àààà àà"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "ààààààààà ààààààà àààà àààà"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "àààààà àà àààààà ààà àààà àààà àà"
+
+#~ msgid "Operation not supported"
+#~ msgstr "àààààà ààààààà àààà àà"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "ààààààààà àààààà àà àààààà ààà ààààààà àààà àà"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "ààààààààà ààààààà ààààààààà àà ààààà àààà àà àààà"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "àààà ààààà àà àààà àà ààààààà àààà ààà àààà"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "àà ààààààà àà ààà àà àààà ààà àààà"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "àààààà ààà ààà àààààààà àààà àà àà àààà àà"
+
+#~ msgid "%s's Folders"
+#~ msgstr "%s' àà ààààààà"
+
+#~ msgid "Personal Folders"
+#~ msgstr "ààààààààà ààààààà"
+
+#~ msgid "Favorite Public Folders"
+#~ msgstr "ààààààà ààààààààà ààààààà"
+
+#~ msgid "All Public Folders"
+#~ msgstr "ààà ààààààààà ààààààà"
+
+#~ msgid "Global Address List"
+#~ msgstr "ààààààà ààà àààà"
+
+#~ msgid "Deleted Items"
+#~ msgstr "ààààààà ààààààà"
+
+#~ msgid "Journal"
+#~ msgstr "ààààà"
+
+#~ msgid "Notes"
+#~ msgstr "ààààààà"
+
+#~ msgid "Outbox"
+#~ msgstr "àààààààà"
+
+#~ msgid "Sent Items"
+#~ msgstr "àààà-ààà ààààààà"
+
+#~ msgid "Tasks"
+#~ msgstr "ààààà"
+
+#~ msgid "Invalid connection"
+#~ msgstr "àààà àààààà."
+
+#~ msgid "No response from the server"
+#~ msgstr "ààààà àà ààà ààààààààà àààà."
+
+#~ msgid "Bad parameter"
+#~ msgstr "àààà àààààààà"
+
+#~ msgid "Evolution Addressbook file backend"
+#~ msgstr "ààààààààà ààà àààààààà àààà àààààà"
+
+#~ msgid "Evolution Calendar file and webcal backend"
+#~ msgstr "ààààààààà àààààà àààà ààà àààààà àààààà"
+
+#~ msgid "Evolution Data Server interface check service"
+#~ msgstr "ààààààààà àààààà ààààààà àààà àààà"
+
+#~ msgid "Evolution Data Server logging service"
+#~ msgstr "ààààààààà àààààà ààààà àààààà àààà"
+
+#~ msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
+#~ msgstr "ààààààà àààà àààààà ààààààà ààà, àààààà ààààà àààà àààà àààà\n"



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