[evolution-data-server] Update Assamese translation



commit 823a6e1d99e3c0035c46f5e840d25217dcdaf7e0
Author: Nilamdyuti Goswami <ngoswami redhat com>
Date:   Thu Sep 22 12:03:37 2011 +0200

    Update Assamese translation

 po/as.po | 6216 +++++++++++++++++++++++++++++---------------------------------
 1 files changed, 2925 insertions(+), 3291 deletions(-)
---
diff --git a/po/as.po b/po/as.po
index fd10a3d..e990b4e 100644
--- a/po/as.po
+++ b/po/as.po
@@ -4,1182 +4,1454 @@
 #
 # Amitakhya Phukan <amitakhya svn gnome org>, 2007.
 # Amitakhya Phukan <aphukan fedoraproject org>, 2009.
+# Nilamdyuti Goswami <ngoswami redhat com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: as\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.";
-"cgi?product=evolution-data-server&component=general\n"
-"POT-Creation-Date: 2009-08-11 14:04+0000\n"
-"PO-Revision-Date: 2009-09-21 12:21+0530\n"
-"Last-Translator: \n"
-"Language-Team: Assamese <>\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-20 13:46+0000\n"
+"PO-Revision-Date: 2011-09-12 03:39+0530\n"
+"Last-Translator: Nilamdyuti Goswami <ngoswami redhat com>\n"
+"Language-Team: as_IN <kde-i18n-doc kde org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 0.2\n"
+"X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n!=1)\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:560
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2329
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
+#: ../addressbook/backends/file/e-book-backend-file.c:828
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:478
 msgid "Loading..."
-msgstr "àààà àààà..."
-
-#: ../addressbook/backends/file/e-book-backend-file.c:563
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2260
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2282
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2327
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4510
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
+msgstr "à'à ààà àà àààâ"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:831
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4807
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:480
 msgid "Searching..."
-msgstr "ààààààààà ààà àààà..."
+msgstr "àààààà ààà àààà..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2695
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4674
-#, c-format
-msgid "Downloading contacts (%d)... "
-msgstr "àààààààà àààààà àààààààà àààà àààà (%d)... "
+#. Query for new contacts asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:842
+msgid "Querying for updated contactsâ"
+msgstr "àààààààà àààààààààà àààà àààààà ààà àà ààà..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2844
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3028
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3072
-#, c-format
-msgid "Updating contacts cache (%d)... "
-msgstr "ààààààà ààààààà àààààà ààààààà ààà àààà (%d)... "
+#: ../addressbook/backends/google/e-book-backend-google.c:893
+#: ../addressbook/libebook/e-book.c:3549 ../calendar/libecal/e-cal.c:1381
+#: ../libedataserver/e-client.c:1951
+msgid "Personal"
+msgstr "ààààààààà"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:895
+msgid "Friends"
+msgstr "àààààààà"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:897
+msgid "Family"
+msgstr "àààààà"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:899
+msgid "Coworkers"
+msgstr "ààààààà"
+
+#. Run the query asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:983
+msgid "Querying for updated groupsâ"
+msgstr "àààààààà ààààààà àààà àààààà ààà àààà..."
+
+#. Insert the entry on the server asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:1402
+msgid "Creating new contactâ"
+msgstr "àààà ààààà àààààà ààà àà àààâ"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1512
+msgid "Deleting contactâ"
+msgstr "ààààà ààà àààààà àà àààâ"
+
+#. Update the contact on the server asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:1793
+msgid "Modifying contactâ"
+msgstr "ààààà àààà ààà àà àààâ"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:2000
+msgid "Loadingâ"
+msgstr "à'à ààà àà àààâ"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:2158
+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"
+msgstr "ààààààà àààà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:788
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:784
 msgid "Using Distinguished Name (DN)"
 msgstr "Distinguished Name (DN) ààààààà ààà àààà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:791
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:787
 msgid "Using Email Address"
-msgstr "à-àààà ààààà ààààààà ààà àààà"
+msgstr "à-àààà ààààà ààààààà ààà àààà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1067
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1058
 msgid "Reconnecting to LDAP server..."
-msgstr "LDAP ààààà àààà àààààà ààààà ààà àààà..."
+msgstr "LDAP àààààààà àààà àààààà ààààà ààà àààà..."
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1187
+msgid "Invalid DN syntax"
+msgstr "àààà DN àààààààààààà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1711
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1712
 msgid "Adding contact to LDAP server..."
-msgstr "LDAP ààààà ààààààà ààà ààà àààà..."
+msgstr "LDAP àààààààà ààààà ààà ààà àààà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1845
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1843
 msgid "Removing contact from LDAP server..."
-msgstr "LDAP ààààà ààà ààààààà ààààààà àààà..."
+msgstr "LDAP àààààààà ààà ààààà ààààààà àààà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2282
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2278
 msgid "Modifying contact from LDAP server..."
-msgstr "LDAP ààààà ààààààà àààààààà ààà àààà..."
+msgstr "LDAP àààààààà ààààà àààààààà ààà àààà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4371
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4658
 msgid "Receiving LDAP search results..."
-msgstr "LDAP'à àààààààààà ààààà ààààààà ààà àààà..."
+msgstr "LDAP'à ààààààà ààààà ààààààà ààà àààà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4532
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4828
 msgid "Error performing search"
-msgstr "àààààààààà àààà àààààà"
+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:287 ../addressbook/libebook/e-book.c:291
-#: ../addressbook/libebook/e-book.c:495 ../addressbook/libebook/e-book.c:499
-#: ../addressbook/libebook/e-book.c:637 ../addressbook/libebook/e-book.c:641
-#: ../addressbook/libebook/e-book.c:727 ../addressbook/libebook/e-book.c:731
-#: ../addressbook/libebook/e-book.c:1024 ../addressbook/libebook/e-book.c:1029
-#: ../addressbook/libebook/e-book.c:1206 ../addressbook/libebook/e-book.c:1210
-#: ../addressbook/libebook/e-book.c:1365 ../addressbook/libebook/e-book.c:1369
-#: ../addressbook/libebook/e-book.c:1570 ../addressbook/libebook/e-book.c:1574
-#: ../addressbook/libebook/e-book.c:1813 ../addressbook/libebook/e-book.c:1817
-#: ../addressbook/libebook/e-book.c:2050 ../addressbook/libebook/e-book.c:2054
-#: ../addressbook/libebook/e-book.c:2257 ../addressbook/libebook/e-book.c:2261
-#: ../addressbook/libebook/e-book.c:3445
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4949
 #, c-format
-msgid "\"%s\" on book before \"%s\""
-msgstr "àààà \"%s\", \"%s\"'à àààààààà ààààààà"
+msgid "Downloading contacts (%d)... "
+msgstr "àààààààààà àààààà ààààà'à ààà àààà (%d)... "
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:278
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:906
+#: ../addressbook/libebook/e-book-client.c:103
+#: ../addressbook/libedata-book/e-data-book.c:452
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:530
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:559
+#: ../calendar/backends/http/e-cal-backend-http.c:433
+#: ../calendar/libecal/e-cal.c:4595 ../calendar/libecal/e-cal-client.c:147
+#: ../camel/providers/imap/camel-imap-command.c:484
+#: ../camel/providers/imap/camel-imap-store.c:411
+#: ../camel/providers/imapx/camel-imapx-server.c:2280
+#: ../camel/providers/smtp/camel-smtp-transport.c:442
+#: ../libedataserver/e-client.c:159
+msgid "Unknown error"
+msgstr "âàààààà àààààà"
 
-#: ../addressbook/libebook/e-book.c:300 ../addressbook/libebook/e-book.c:508
-#: ../addressbook/libebook/e-book.c:650 ../addressbook/libebook/e-book.c:740
-#: ../addressbook/libebook/e-book.c:1039 ../addressbook/libebook/e-book.c:1220
-#: ../addressbook/libebook/e-book.c:1379 ../addressbook/libebook/e-book.c:1583
-#: ../addressbook/libebook/e-book.c:1826 ../addressbook/libebook/e-book.c:2064
-#: ../addressbook/libebook/e-book.c:2270 ../addressbook/libebook/e-book.c:2679
-#: ../addressbook/libebook/e-book.c:2877
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:343
 #, c-format
-msgid "book busy"
-msgstr "ààà àààààààà àààààà"
+msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgstr "ààààà '%s' -à àààààà HTTP àààààà: %d (%s) -à àààà àààààà àà"
 
-#: ../addressbook/libebook/e-book.c:331 ../addressbook/libebook/e-book.c:335
-#: ../addressbook/libebook/e-book.c:539 ../addressbook/libebook/e-book.c:543
-#: ../addressbook/libebook/e-book.c:677 ../addressbook/libebook/e-book.c:681
-#: ../addressbook/libebook/e-book.c:767 ../addressbook/libebook/e-book.c:771
-#: ../addressbook/libebook/e-book.c:1066 ../addressbook/libebook/e-book.c:1069
-#: ../addressbook/libebook/e-book.c:1250 ../addressbook/libebook/e-book.c:1253
-#: ../addressbook/libebook/e-book.c:1406 ../addressbook/libebook/e-book.c:1410
-#: ../addressbook/libebook/e-book.c:1619 ../addressbook/libebook/e-book.c:1623
-#: ../addressbook/libebook/e-book.c:1873 ../addressbook/libebook/e-book.c:1877
-#: ../addressbook/libebook/e-book.c:2094 ../addressbook/libebook/e-book.c:2098
-#: ../addressbook/libebook/e-book.c:2296 ../addressbook/libebook/e-book.c:2300
-#: ../addressbook/libebook/e-book.c:2531 ../addressbook/libebook/e-book.c:2705
-#: ../addressbook/libebook/e-book.c:2709 ../addressbook/libebook/e-book.c:2903
-#: ../addressbook/libebook/e-book.c:2907 ../addressbook/libebook/e-book.c:3454
+#: ../addressbook/libebook/e-book.c:3216
 #, c-format
-msgid "CORBA exception making \"%s\" call"
-msgstr "\"%s\" àà àààà àààà CORBA àààààààà"
+msgid "%s: there was no source for UID '%s' stored in GConf."
+msgstr "%s: UID`%s'-à àààà àààà ààà GConf  -à àààààààà àààààà"
 
-#: ../addressbook/libebook/e-book.c:2520
-#, c-format
-msgid "%s: there is no current operation"
-msgstr "%s: àààààààà àààà àààà ààà"
+#: ../addressbook/libebook/e-book.c:3532 ../calendar/libecal/e-cal.c:1361
+#: ../libedataserver/e-client.c:1946
+msgid "On This Computer"
+msgstr "ààààààà àààààààààà"
 
-#: ../addressbook/libebook/e-book.c:2549 ../addressbook/libebook/e-book.c:2594
-#: ../addressbook/libebook/e-book.c:2633
-#, c-format
-msgid "%s: could not cancel"
-msgstr "%s: ààààà ààà ààààà"
+#: ../addressbook/libebook/e-book.c:3658
+#: ../addressbook/libebook/e-book-client.c:678
+#: ../addressbook/libedata-book/e-data-book.c:315
+msgid "Address book does not exist"
+msgstr "ààààà ààà ààààààààààà ààà"
 
-#: ../addressbook/libebook/e-book.c:2665 ../addressbook/libebook/e-book.c:2669
-#, c-format
-msgid "\"%s\" on book after \"%s\""
-msgstr "àààà \"%s\", \"%s\"'à àààà"
+#: ../addressbook/libebook/e-book-client.c:92
+msgid "No such book"
+msgstr "ààà àààà ààààà ààà"
 
-#: ../addressbook/libebook/e-book.c:2733
-#, c-format
-msgid "%s: canceled"
-msgstr "%s: ààààà ààà àààà"
+#: ../addressbook/libebook/e-book-client.c:94
+#: ../addressbook/libedata-book/e-data-book.c:308
+msgid "Contact not found"
+msgstr "ààààà àààà ààà"
 
-#: ../addressbook/libebook/e-book.c:3310
-#, c-format
-msgid "%s: Invalid source."
-msgstr "%s: ààà ààà àààà"
+#: ../addressbook/libebook/e-book-client.c:96
+#: ../addressbook/libedata-book/e-data-book.c:309
+msgid "Contact ID already exists"
+msgstr "ààààà ID ààààààà ààààààà"
 
-#: ../addressbook/libebook/e-book.c:3318 ../addressbook/libebook/e-book.c:3383
-#, c-format
-msgid "%s: no factories available for URI `%s'"
-msgstr "%s: URI `%s'-à àààà àààà ààààààà ààà"
+#: ../addressbook/libebook/e-book-client.c:98
+msgid "No such source"
+msgstr "àà àààà ààà ààà"
 
-#: ../addressbook/libebook/e-book.c:3329
+#: ../addressbook/libebook/e-book-client.c:100
+#: ../addressbook/libedata-book/e-data-book.c:325
+msgid "No space"
+msgstr "àààà ààààà ààà"
+
+#: ../addressbook/libebook/e-book-client.c:491
+msgid "Failed to run book factory"
+msgstr "ààààà àààà àààààà àààààà"
+
+#: ../addressbook/libebook/e-book-client.c:501
+#: ../addressbook/libedata-book/e-data-book-factory.c:379
+#: ../addressbook/libedata-book/e-data-book-factory.c:437
+#: ../calendar/libecal/e-cal-client.c:610
+#: ../calendar/libedata-cal/e-data-cal-factory.c:399
 #, c-format
-msgid "%s: Could not create EBookListener"
-msgstr "%s: EBookListener ààààààà àààààà àààààà"
+msgid "Invalid source"
+msgstr "àààà ààà"
 
-#: ../addressbook/libebook/e-book.c:3595
+#: ../addressbook/libebook/e-book-client.c:603
+#: ../calendar/libecal/e-cal-client.c:725
 #, c-format
-msgid "%s: there was no self contact UID stored in gconf"
-msgstr "%s: gconf à àààààà àààààààà UID ààààààà ààà"
+msgid "Incorrect uri '%s'"
+msgstr "ààà uri '%s'"
 
-#: ../addressbook/libebook/e-book.c:3727
+#: ../addressbook/libebook/e-book-client.c:641
+msgid "Failed to find system book"
+msgstr "ààààààà ààààà àààààà ààààà àààààà"
+
+#: ../addressbook/libebook/e-book-client.c:750
+#: ../calendar/libecal/e-cal-client.c:878
 #, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
-msgstr "%s: UID `%s'-à àààà àààà ààà gconf à àààààààà àààà"
+msgid "There was no source for UID '%s' stored in a source list."
+msgstr "ààà ààà ààààààà àààààààà UID '%s' -à àààà àààà ààà àààààà"
+
+#: ../addressbook/libebook/e-book-client.c:2280
+#: ../calendar/libecal/e-cal-client.c:4482
+msgid "Cannot get 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"
+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 "ààààààà àààààà àààààààà ààà à'à"
+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"
 
 #. Name fields
 #. FN isn't really a structured field - we use a getter/setter
-#. so we can set the N property (since evo 1.4 works fine with
-#. vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:122
+#. * so we can set the N property (since evo 1.4 works fine with
+#. * vcards that don't even have a N attribute.  *sigh*)
+#: ../addressbook/libebook/e-contact.c:127
 msgid "Full Name"
 msgstr "àààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c: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 "àààààà"
+msgstr "ààààà"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 1"
-msgstr "à-àààà à"
+msgstr "à-àààà à"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Email 2"
-msgstr "à-àààà à"
+msgstr "à-àààà à"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Email 3"
-msgstr "à-àààà à"
+msgstr "à-àààà à"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:136
 msgid "Email 4"
-msgstr "à-àààà à"
+msgstr "à-àààà à"
 
-#: ../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 "àààààààà àààààà ààààà"
+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 "àààààààà ààààà"
+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 "àààààà"
+msgstr "ààààà"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Organizational Unit"
-msgstr "ààààààà ààààà"
+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 "ààààààà"
+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 "ààààà'à URL"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:609
+#: ../addressbook/libebook/e-contact.c:181
+#: ../libedataserverui/e-categories-dialog.c:85
 msgid "Categories"
-msgstr "ààààààààààà"
+msgstr "ààààà"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Calendar URI"
-msgstr "àààààààààà'à URI"
+msgstr "àààààààààà URI"
 
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Free/Busy URL"
 msgstr "ààààà/àààààà URL"
 
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:186
 msgid "ICS Calendar"
-msgstr "ICS ààààààààà"
+msgstr "ICS ààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:187
 msgid "Video Conferencing URL"
-msgstr "ààààà ààààààààààà 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
-msgid "AIM Home Screen Name 1"
-msgstr "AIM ààà àààààààà ààà à"
-
-#: ../addressbook/libebook/e-contact.c:190
-msgid "AIM Home Screen Name 2"
-msgstr "AIM ààà àààààààà ààà à"
-
-#: ../addressbook/libebook/e-contact.c:191
-msgid "AIM Home Screen Name 3"
-msgstr "AIM ààà àààààààà ààà à"
-
-#: ../addressbook/libebook/e-contact.c:192
-msgid "AIM Work Screen Name 1"
-msgstr "AIM ààààààààà àààààààà ààà à"
-
-#: ../addressbook/libebook/e-contact.c:193
-msgid "AIM Work Screen Name 2"
-msgstr "AIM ààààààààà àààààààà ààà à"
-
 #: ../addressbook/libebook/e-contact.c:194
-msgid "AIM Work Screen Name 3"
-msgstr "AIM ààààààààà àààààààà ààà à"
+msgid "AIM Home Screen Name 1"
+msgstr "AIM ààà àààààà ààà à"
 
 #: ../addressbook/libebook/e-contact.c:195
-msgid "GroupWise Home Screen Name 1"
-msgstr "GroupWise ààà àààààààà ààà à"
+msgid "AIM Home Screen Name 2"
+msgstr "AIM ààà àààààà ààà à"
 
 #: ../addressbook/libebook/e-contact.c:196
-msgid "GroupWise Home Screen Name 2"
-msgstr "GroupWise ààà àààààààà ààà à"
+msgid "AIM Home Screen Name 3"
+msgstr "AIM ààà àààààà ààà à"
 
 #: ../addressbook/libebook/e-contact.c:197
-msgid "GroupWise Home Screen Name 3"
-msgstr "GroupWise ààà àààààààà ààà à"
+msgid "AIM Work Screen Name 1"
+msgstr "AIM ààààààààà àààààà ààà à"
 
 #: ../addressbook/libebook/e-contact.c:198
-msgid "GroupWise Work Screen Name 1"
-msgstr "GroupWise ààààààààà àààààààà ààà à"
+msgid "AIM Work Screen Name 2"
+msgstr "AIM ààààààààà àààààà ààà à"
 
 #: ../addressbook/libebook/e-contact.c:199
-msgid "GroupWise Work Screen Name 2"
-msgstr "GroupWise ààààààààà àààààààà ààà à"
+msgid "AIM Work Screen Name 3"
+msgstr "AIM ààààààààà àààààà ààà à"
 
 #: ../addressbook/libebook/e-contact.c:200
-msgid "GroupWise Work Screen Name 3"
-msgstr "GroupWise ààààààààà àààààààà ààà à"
+msgid "GroupWise Home Screen Name 1"
+msgstr "àààààààà ààà àààààà ààà à"
 
 #: ../addressbook/libebook/e-contact.c:201
-msgid "Jabber Home Id 1"
-msgstr "Jabber ààà Id à"
+msgid "GroupWise Home Screen Name 2"
+msgstr "àààààààà ààà àààààà ààà à"
 
 #: ../addressbook/libebook/e-contact.c:202
-msgid "Jabber Home Id 2"
-msgstr "Jabber ààà Id à"
+msgid "GroupWise Home Screen Name 3"
+msgstr "àààààààà ààà àààààà ààà à"
 
 #: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 3"
-msgstr "Jabber ààà Id à"
+msgid "GroupWise Work Screen Name 1"
+msgstr "àààààààà ààààààààà àààààà ààà à"
 
 #: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Work Id 1"
-msgstr "Jabber ààààààààà Id à"
+msgid "GroupWise Work Screen Name 2"
+msgstr "àààààààà ààààààààà àààààà ààà à"
 
 #: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Work Id 2"
-msgstr "Jabber ààààààààà Id à"
+msgid "GroupWise Work Screen Name 3"
+msgstr "àààààààà ààààààààà àààààà ààà à"
 
 #: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 3"
-msgstr "Jabber ààààààààà Id à"
+msgid "Jabber Home ID 1"
+msgstr "Jabber àà ID à"
 
 #: ../addressbook/libebook/e-contact.c:207
-msgid "Yahoo! Home Screen Name 1"
-msgstr "Yahoo! ààà àààààààà ààà à"
+msgid "Jabber Home ID 2"
+msgstr "Jabber àà ID à"
 
 #: ../addressbook/libebook/e-contact.c:208
-msgid "Yahoo! Home Screen Name 2"
-msgstr "Yahoo! ààà àààààààà ààà à"
+msgid "Jabber Home ID 3"
+msgstr "Jabber àà ID à"
 
 #: ../addressbook/libebook/e-contact.c:209
-msgid "Yahoo! Home Screen Name 3"
-msgstr "Yahoo! ààà àààààààà ààà à"
+msgid "Jabber Work ID 1"
+msgstr "Jabber àààà ID à"
 
 #: ../addressbook/libebook/e-contact.c:210
-msgid "Yahoo! Work Screen Name 1"
-msgstr "Yahoo! ààààààààà àààààààà ààà à"
+msgid "Jabber Work ID 2"
+msgstr "Jabber àààà ID à"
 
 #: ../addressbook/libebook/e-contact.c:211
-msgid "Yahoo! Work Screen Name 2"
-msgstr "Yahoo! ààààààààà àààààààà ààà à"
+msgid "Jabber Work ID 3"
+msgstr "Jabber àààà ID à"
 
 #: ../addressbook/libebook/e-contact.c:212
-msgid "Yahoo! Work Screen Name 3"
-msgstr "Yahoo! ààààààààà àààààààà ààà à"
+msgid "Yahoo! Home Screen Name 1"
+msgstr "Yahoo! ààà àààààà ààà à"
 
 #: ../addressbook/libebook/e-contact.c:213
-msgid "MSN Home Screen Name 1"
-msgstr "MSN ààà àààààààà ààà à"
+msgid "Yahoo! Home Screen Name 2"
+msgstr "Yahoo! ààà àààààà ààà à"
 
 #: ../addressbook/libebook/e-contact.c:214
-msgid "MSN Home Screen Name 2"
-msgstr "MSN ààà àààààààà ààà à"
+msgid "Yahoo! Home Screen Name 3"
+msgstr "Yahoo! ààà àààààà ààà à"
 
 #: ../addressbook/libebook/e-contact.c:215
-msgid "MSN Home Screen Name 3"
-msgstr "MSN ààà àààààààà ààà à"
+msgid "Yahoo! Work Screen Name 1"
+msgstr "Yahoo! ààààààààà àààààà ààà à"
 
 #: ../addressbook/libebook/e-contact.c:216
-msgid "MSN Work Screen Name 1"
-msgstr "MSN ààààààààà àààààààà ààà à"
+msgid "Yahoo! Work Screen Name 2"
+msgstr "Yahoo! ààààààààà àààààà ààà à"
 
 #: ../addressbook/libebook/e-contact.c:217
-msgid "MSN Work Screen Name 2"
-msgstr "MSN ààààààààà àààààààà ààà à"
+msgid "Yahoo! Work Screen Name 3"
+msgstr "Yahoo! ààààààààà àààààà ààà à"
 
 #: ../addressbook/libebook/e-contact.c:218
-msgid "MSN Work Screen Name 3"
-msgstr "MSN ààààààààà àààààààà ààà à"
+msgid "MSN Home Screen Name 1"
+msgstr "MSN ààà àààààà ààà à"
 
 #: ../addressbook/libebook/e-contact.c:219
-msgid "ICQ Home Id 1"
-msgstr "ICQ ààà Id à"
+msgid "MSN Home Screen Name 2"
+msgstr "MSN ààà àààààà ààà à"
 
 #: ../addressbook/libebook/e-contact.c:220
-msgid "ICQ Home Id 2"
-msgstr "ICQ ààà Id à"
+msgid "MSN Home Screen Name 3"
+msgstr "MSN ààà àààààà ààà à"
 
 #: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 3"
-msgstr "ICQ ààà Id à"
+msgid "MSN Work Screen Name 1"
+msgstr "MSN ààààààààà àààààà ààà à"
 
 #: ../addressbook/libebook/e-contact.c:222
-msgid "ICQ Work Id 1"
-msgstr "ICQ ààààààààà Id à"
+msgid "MSN Work Screen Name 2"
+msgstr "MSN ààààààààà àààààà ààà à"
 
 #: ../addressbook/libebook/e-contact.c:223
-msgid "ICQ Work Id 2"
-msgstr "ICQ ààààààààà Id à"
+msgid "MSN Work Screen Name 3"
+msgstr "MSN ààààààààà àààààà ààà à"
 
 #: ../addressbook/libebook/e-contact.c:224
-msgid "ICQ Work Id 3"
-msgstr "ICQ ààààààààà Id à"
+msgid "ICQ Home ID 1"
+msgstr "ICQ àà ID à"
+
+#: ../addressbook/libebook/e-contact.c:225
+msgid "ICQ Home ID 2"
+msgstr "ICQ àà ID à"
+
+#: ../addressbook/libebook/e-contact.c:226
+msgid "ICQ Home ID 3"
+msgstr "ICQ àà ID à"
 
-#. Last modified time
 #: ../addressbook/libebook/e-contact.c:227
+msgid "ICQ Work ID 1"
+msgstr "ICQ àààà ID à"
+
+#: ../addressbook/libebook/e-contact.c:228
+msgid "ICQ Work ID 2"
+msgstr "ICQ àààà ID à"
+
+#: ../addressbook/libebook/e-contact.c:229
+msgid "ICQ Work ID 3"
+msgstr "ICQ àààà ID à"
+
+#. Last modified time
+#: ../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 "ààà àààà àààààà"
+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 "àààààààà ààààà"
+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 "à-àààà àààààà"
+msgstr "à-àààà àààààà"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook/e-contact.c:252
 msgid "AIM Screen Name List"
-msgstr "AIM ààààààà àààà àààààà"
+msgstr "AIM ààààà àààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:248
-msgid "GroupWise Id List"
-msgstr "GroupWise Id'à àààààà"
+#: ../addressbook/libebook/e-contact.c:253
+msgid "GroupWise ID List"
+msgstr "àààààààà ID àààààà"
 
-#: ../addressbook/libebook/e-contact.c:249
-msgid "Jabber Id List"
-msgstr "Jabber Id-à àààààà"
+#: ../addressbook/libebook/e-contact.c:254
+msgid "Jabber ID List"
+msgstr "Jabber ID àààààà"
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:255
 msgid "Yahoo! Screen Name List"
-msgstr "Yahoo! ààààààà àààà àààààà"
+msgstr "Yahoo! ààààà àààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:256
 msgid "MSN Screen Name List"
-msgstr "MSN ààààààà àààà àààààà"
+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"
+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:45
+#: ../addressbook/libebook/e-contact.c:265
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:756
 msgid "Anniversary"
 msgstr "àààààààà"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c: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 "Gadu-Gadu ààà Id à"
+#: ../addressbook/libebook/e-contact.c:270
+msgid "Gadu-Gadu Home ID 1"
+msgstr "Gadu-Gadu àà ID à"
 
-#: ../addressbook/libebook/e-contact.c:266
-msgid "Gadu-Gadu Home Id 2"
-msgstr "Gadu-Gadu ààà Id à"
+#: ../addressbook/libebook/e-contact.c:271
+msgid "Gadu-Gadu Home ID 2"
+msgstr "Gadu-Gadu àà ID à"
 
-#: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 3"
-msgstr "Gadu-Gadu ààà Id à"
+#: ../addressbook/libebook/e-contact.c:272
+msgid "Gadu-Gadu Home ID 3"
+msgstr "Gadu-Gadu àà ID à"
 
-#: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Work Id 1"
-msgstr "Gadu-Gadu ààààààààà Id à"
+#: ../addressbook/libebook/e-contact.c:273
+msgid "Gadu-Gadu Work ID 1"
+msgstr "Gadu-Gadu àààà ID à"
 
-#: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Work Id 2"
-msgstr "Gadu-Gadu ààààààààà Id à"
+#: ../addressbook/libebook/e-contact.c:274
+msgid "Gadu-Gadu Work ID 2"
+msgstr "Gadu-Gadu àààà ID à"
 
-#: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 3"
-msgstr "Gadu-Gadu ààààààààà Id à"
+#: ../addressbook/libebook/e-contact.c:275
+msgid "Gadu-Gadu Work ID 3"
+msgstr "Gadu-Gadu àààà ID à"
 
-#: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Id List"
-msgstr "Gadu-Gadu Id'à àààààà"
+#: ../addressbook/libebook/e-contact.c:276
+msgid "Gadu-Gadu ID List"
+msgstr "Gadu-Gadu 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
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Home Name 1"
-msgstr "Skype ààààà àààààààà ààà à"
+msgstr "Skype ààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Home Name 2"
-msgstr "Skype ààààà àààààààà ààà à"
+msgstr "Skype ààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Home Name 3"
-msgstr "Skype ààààà àààààààà ààà à"
+msgstr "Skype ààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Work Name 1"
-msgstr "Skype àààààààààà àààààààà ààà à"
+msgstr "Skype ààààààààà àààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:287
 msgid "Skype Work Name 2"
-msgstr "Skype àààààààààà àààààààà ààà à"
+msgstr "Skype ààààààààà àààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:288
 msgid "Skype Work Name 3"
-msgstr "Skype àààààààààà àààààààà ààà à"
+msgstr "Skype ààààààààà àààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:289
 msgid "Skype Name List"
-msgstr "Skype ààààààà ààààà àààààà"
+msgstr "Skype ààààààà àààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:291
 msgid "SIP address"
-msgstr "SIP àààààà"
+msgstr "SIP ààààà"
+
+#: ../addressbook/libebook/e-contact.c:293
+msgid "Google Talk Home Name 1"
+msgstr "Google Talk àà ààà à"
+
+#: ../addressbook/libebook/e-contact.c:294
+msgid "Google Talk Home Name 2"
+msgstr "Google Talk àà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:1535
-#: ../addressbook/libebook/e-destination.c:761
+#: ../addressbook/libebook/e-contact.c:295
+msgid "Google Talk Home Name 3"
+msgstr "Google Talk àà ààà à"
+
+#: ../addressbook/libebook/e-contact.c:296
+msgid "Google Talk Work Name 1"
+msgstr "Google Talk àààà ààà à"
+
+#: ../addressbook/libebook/e-contact.c:297
+msgid "Google Talk Work Name 2"
+msgstr "Google Talk àààà ààà à"
+
+#: ../addressbook/libebook/e-contact.c:298
+msgid "Google Talk Work Name 3"
+msgstr "Google Talk àààà ààà à"
+
+#: ../addressbook/libebook/e-contact.c:299
+msgid "Google Talk Name List"
+msgstr "Google Talk ààà àààààà"
+
+#: ../addressbook/libebook/e-contact.c:1580
+#: ../addressbook/libebook/e-destination.c:884
 msgid "Unnamed List"
 msgstr "àààààààà àààààà"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
-#: ../libedataserver/e-categories.c:46
-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
+#: ../addressbook/libedata-book/e-book-backend.c:96
 #, c-format
-msgid "Birthday: %s"
-msgstr "ààààààà: %s"
+msgid "Unknown book property '%s'"
+msgstr "âàààààà ààààà ààààààà '%s'"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
+#: ../addressbook/libedata-book/e-book-backend.c:113
 #, c-format
-msgid "Anniversary: %s"
-msgstr "ààààààà: %s"
+msgid "Cannot change value of book property '%s'"
+msgstr "ààààà ààààààà  '%s' -à ààà àààà àààà àààààà "
 
-#: ../calendar/backends/file/e-cal-backend-file.c:234
-msgid "Cannot save calendar data: Malformed URI."
-msgstr "àààààààààà àààà ààààààà àààààà àààààà: URI àààà àààààààà àààà"
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:470
+#: ../camel/camel-db.c:481
+#, c-format
+msgid "Insufficient memory"
+msgstr "ààààààààà ààààà"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:241
-#: ../calendar/backends/file/e-cal-backend-file.c:247
-msgid "Cannot save calendar data"
-msgstr "àààààààààà àààà ààààààà àààà àààààà"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:344
-msgid "Could not create thread for getting deltas"
-msgstr "delta ààààààà àààà àààà ààààà ààààààà ààà ààààà"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:376
-#: ../calendar/backends/google/e-cal-backend-google.c:1189
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1080
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1381
-#: ../calendar/backends/http/e-cal-backend-http.c:659
-#: ../calendar/backends/weather/e-cal-backend-weather.c:486
-msgid "Could not create cache file"
-msgstr "àààààà ààààààà ààààààà àààààà àààààà"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:389
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1093
-msgid "Could not create thread for populating cache"
-msgstr "ààààààà àààà ààààà àààà ààààà ààààààà àààààà àààààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2078
-msgid "Reply Requested: by "
-msgstr "àààààà àààààà ààààà àààà: ààààààà àààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2083
-msgid "Reply Requested: When convenient"
-msgstr "àààààà àààààà ààààà àààà: àààààààààààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:281
-#, c-format
-msgid "Loading %s items"
-msgstr "%s ààààà àààà àààà àààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:918
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
-msgid "Calendar"
-msgstr "ààààààààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:976
-msgid "Invalid server URI"
-msgstr "ààààà URI ààà ààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:995
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1004
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1098
-#: ../calendar/libecal/e-cal.c:5117
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1291
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1327
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1342
-#: ../camel/providers/groupwise/camel-groupwise-store.c:598
-#: ../camel/providers/groupwise/camel-groupwise-store.c:773
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:181
-msgid "Authentication failed"
-msgstr "ààààààà àààà àààà"
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:199
+#: ../addressbook/libedata-book/e-data-book.c:212
+#: ../addressbook/libedata-book/e-data-book.c:744
+msgid "Invalid query: "
+msgstr "àààà àààààà: "
+
+#: ../addressbook/libedata-book/e-data-book.c:304
+#: ../calendar/libedata-cal/e-data-cal.c:419
+msgid "Success"
+msgstr "ààààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:305
+#: ../calendar/libecal/e-cal.c:4563 ../calendar/libedata-cal/e-data-cal.c:420
+#: ../libedataserver/e-client.c:118
+msgid "Backend is busy"
+msgstr "ààààà-àààà àààààààà àààààà"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:316
-msgid "Redirected to Invalid URI"
-msgstr "àààà URI àà ààààààà ààà àààà"
+#: ../addressbook/libedata-book/e-data-book.c:306
+#: ../calendar/libedata-cal/e-data-cal.c:421 ../libedataserver/e-client.c:128
+msgid "Repository offline"
+msgstr "ààààà àààààà"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:339
-msgid "Bad file format."
-msgstr "àààààààà ààààààà àààà àààà"
+#: ../addressbook/libedata-book/e-data-book.c:307
+#: ../calendar/libecal/e-cal.c:4577 ../calendar/libedata-cal/e-data-cal.c:422
+#: ../libedataserver/e-client.c:132
+msgid "Permission denied"
+msgstr "àààààà àààà ààà àààà"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:346
-msgid "Not a calendar."
-msgstr "ààààààààà àààà"
+#: ../addressbook/libedata-book/e-data-book.c:310
+#: ../calendar/libedata-cal/e-data-cal.c:427
+msgid "Authentication Failed"
+msgstr "àààààààààà àààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:150
-msgid "Could not retrieve weather data"
-msgstr "ààà àààààààà àààà ààààààà àààààà àààààà"
+#: ../addressbook/libedata-book/e-data-book.c:311
+#: ../calendar/libedata-cal/e-data-cal.c:428
+msgid "Authentication Required"
+msgstr "ààààààààààà ààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
-msgid "Weather: Fog"
-msgstr "ààà: àààààà"
+#: ../addressbook/libedata-book/e-data-book.c:312
+#: ../calendar/libedata-cal/e-data-cal.c:429
+msgid "Unsupported field"
+msgstr "àààààààà ààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
-msgid "Weather: Cloudy"
-msgstr "ààà: àààààààààà"
+#: ../addressbook/libedata-book/e-data-book.c:313
+#: ../calendar/libedata-cal/e-data-cal.c:431 ../libedataserver/e-client.c:140
+msgid "Unsupported authentication method"
+msgstr "àààààààààà ààààààà ààààààà ààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
-msgid "Weather: Cloudy Night"
-msgstr "ààà: àààààààààà àààà"
+#: ../addressbook/libedata-book/e-data-book.c:314
+#: ../calendar/libedata-cal/e-data-cal.c:432 ../libedataserver/e-client.c:142
+msgid "TLS not available"
+msgstr "TLS àààààà ààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
-msgid "Weather: Overcast"
-msgstr "ààà: àààààààààà"
+#: ../addressbook/libedata-book/e-data-book.c:316
+msgid "Book removed"
+msgstr "ààààà àààààà àààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
-msgid "Weather: Showers"
-msgstr "ààà: àààààà"
+#: ../addressbook/libedata-book/e-data-book.c:317
+#: ../calendar/libedata-cal/e-data-cal.c:435
+msgid "Not available in offline mode"
+msgstr "àààààà ààààààà ààààààà ààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
-msgid "Weather: Snow"
-msgstr "ààà: ààà"
+#: ../addressbook/libedata-book/e-data-book.c:318
+#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:144
+msgid "Search size limit exceeded"
+msgstr "ààààààà àààà àààààààà ààààààà àààààààààà àààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
-msgid "Weather: Sunny"
-msgstr "ààà: à'ààààààà"
+#: ../addressbook/libedata-book/e-data-book.c:319
+#: ../calendar/libedata-cal/e-data-cal.c:437 ../libedataserver/e-client.c:146
+msgid "Search time limit exceeded"
+msgstr "ààààààà àààà àààà àààààààààà àààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:320
+#: ../calendar/libedata-cal/e-data-cal.c:438 ../libedataserver/e-client.c:148
+msgid "Invalid query"
+msgstr "àààà àààààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:321
+#: ../calendar/libedata-cal/e-data-cal.c:439 ../libedataserver/e-client.c:150
+msgid "Query refused"
+msgstr "àààààà àààààààààààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:322
+#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:136
+msgid "Could not cancel"
+msgstr "ààààà àààà àààààà"
+
+#. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
+#. { OtherError,			N_("Other error") },
+#: ../addressbook/libedata-book/e-data-book.c:324
+#: ../calendar/libedata-cal/e-data-cal.c:442
+msgid "Invalid server version"
+msgstr "àààààààà ààààààà ààà ààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:326
+#: ../calendar/libecal/e-cal.c:4561 ../calendar/libedata-cal/e-data-cal.c:443
+#: ../libedataserver/e-client.c:116
+msgid "Invalid argument"
+msgstr "àààà àààà"
+
+#. Translators: The string for NOT_SUPPORTED error
+#: ../addressbook/libedata-book/e-data-book.c:328
+#: ../calendar/libecal/e-cal.c:4600 ../calendar/libedata-cal/e-data-cal.c:445
+#: ../libedataserver/e-client.c:138
+msgid "Not supported"
+msgstr "ààààààà ààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:329
+#: ../calendar/libedata-cal/e-data-cal.c:446 ../libedataserver/e-client.c:156
+msgid "Backend is not opened yet"
+msgstr "ààààààààà àààààà àààà ààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:337
+#: ../calendar/libecal/e-cal-client.c:618
+#: ../calendar/libedata-cal/e-data-cal.c:454 ../libedataserver/e-client.c:154
+msgid "Other error"
+msgstr "àààà àààààà"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:562
+#: ../addressbook/libedata-book/e-data-book.c:954
+msgid "Cannot get contact: "
+msgstr "ààààà ààààààà àààà àààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:587
+#: ../addressbook/libedata-book/e-data-book.c:612
+msgid "Empty query: "
+msgstr "àààààà ààààà ààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:637
+#: ../addressbook/libedata-book/e-data-book.c:1036
+msgid "Cannot add contact: "
+msgstr "ààààà ààà àààà àààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:662
+#: ../addressbook/libedata-book/e-data-book.c:1058
+msgid "Cannot modify contact: "
+msgstr "ààààà àààà àààà àààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:770
+#: ../calendar/libedata-cal/e-data-cal.c:893
+msgid "Cannot authenticate user: "
+msgstr "ààààààààààà àààààààà àààà àààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:841
+msgid "Cannot open book: "
+msgstr "ààààà ààààà àààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:857
+msgid "Cannot remove book: "
+msgstr "ààààà ààààà àààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:884
+msgid "Cannot refresh address book: "
+msgstr "ààààà ààààà àààà àààà àààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:910
+msgid "Cannot get backend property: "
+msgstr "ààààààà ààààààà ààààààà àààà àààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:935
+#: ../calendar/libedata-cal/e-data-cal.c:1096
+msgid "Cannot set backend property: "
+msgstr "ààààààà ààààààà ààààà àààà àààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:972
+msgid "Cannot get contact list: "
+msgstr "ààààà àààààà ààààààà àààà àààààà:  "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:1006
+msgid "Cannot get contact list uids: "
+msgstr "ààààà àààààà uidàààà ààààààà àààà àààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:1079
+msgid "Cannot remove contacts: "
+msgstr "ààààààààà ààààà àààààà:  "
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:363
+#: ../addressbook/libedata-book/e-data-book-factory.c:396
+#: ../calendar/libedata-cal/e-data-cal-factory.c:414
+#, c-format
+msgid "Empty URI"
+msgstr "URI ààààà ààà"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:528
+#, c-format
+msgid "Server is unreachable (%s)"
+msgstr "ààààààà ààààààà àààà àààààà (%s)"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:556
+#, c-format
+msgid "Unexpected HTTP status code %d returned (%s)"
+msgstr "ààààààààààà HTTP àààààà ààà %d ààààà àààà àààà (%s)"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2183
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2540
+#, c-format
+msgid ""
+"Server is unreachable, calendar is opened in read-only mode.\n"
+"Error message: %s"
+msgstr ""
+"ààààààà ààààààà àààà àààààà, ààààààààà àààà-àààà àààà ààààààà àààà àààà\n"
+"àààààà àààààà: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4476
+msgid "Calendar doesn't support Free/Busy"
+msgstr "ààààààààà ààààà/àààààà àààààà àààà"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:758
+msgid "Birthday"
+msgstr "ààààààà"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:788
+#, c-format
+msgid "Birthday: %s"
+msgstr "ààààààà: %s"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:813
+#, 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:416
+msgid "Redirected to Invalid URI"
+msgstr "àààà URI àà ààààààà ààà àààà"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:454
+msgid "Bad file format."
+msgstr "àààààààà ààààààà àààà àààà"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:461
+msgid "Not a calendar."
+msgstr "ààààààààà àààà"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:780
+#: ../calendar/backends/http/e-cal-backend-http.c:781
+#: ../calendar/backends/weather/e-cal-backend-weather.c:527
+msgid "Could not create cache file"
+msgstr "ààààà ààààààà ààààààà àààààà àààààà"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:186
+msgid "Could not retrieve weather data"
+msgstr "ààà àààààààà àààà ààààààà àààààà àààààà"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+msgid "Weather: Fog"
+msgstr "ààà: àààààà"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
+msgid "Weather: Cloudy Night"
+msgstr "ààà: àààààààààà àààà"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
+msgid "Weather: Cloudy"
+msgstr "ààà: àààààààààà"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
+msgid "Weather: Overcast"
+msgstr "ààà: àààààààààà"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
+msgid "Weather: Showers"
+msgstr "ààà: àààààà"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:293
+msgid "Weather: Snow"
+msgstr "ààà: ààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:294
 msgid "Weather: Clear Night"
 msgstr "ààà: àààààààà àààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:295
+msgid "Weather: Sunny"
+msgstr "ààà: à'ààààààà"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:296
 msgid "Weather: Thunderstorms"
 msgstr "ààà: ààà ààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:400
+#: ../calendar/backends/weather/e-cal-backend-weather.c:444
 msgid "Forecast"
 msgstr "ààààààààà"
 
-#: ../calendar/libecal/e-cal-component.c:1320
+#: ../calendar/libecal/e-cal.c:892 ../libedataserverui/e-book-auth-util.c:204
+#: ../libedataserverui/e-book-auth-util.c:428
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "%s'à àààà àààààààà àààà (ààààààààààà %s)"
+
+#.
+#. * This password prompt will be prompted rarely. Since the key that is passed to
+#. * the auth_func corresponds to the parent user.
+#.
+#: ../calendar/libecal/e-cal.c:906
+#, c-format
+msgid "Enter password for %s to enable proxy for user %s"
+msgstr "%s'à àààà àààààààà àààààà ààà %s àààààààààààà àààà ààààààà àààà àààààà ààà"
+
+#: ../calendar/libecal/e-cal.c:4565
+msgid "Repository is offline"
+msgstr "ààààà àààààààà àà-àààà ààààààà ààà"
+
+#: ../calendar/libecal/e-cal.c:4567 ../calendar/libecal/e-cal-client.c:134
+msgid "No such calendar"
+msgstr "àà àààà ààààààààà ààààààà ààà"
+
+#: ../calendar/libecal/e-cal.c:4569 ../calendar/libecal/e-cal-client.c:136
+#: ../calendar/libedata-cal/e-data-cal.c:424
+msgid "Object not found"
+msgstr "ààààà àààà ààààà"
+
+#: ../calendar/libecal/e-cal.c:4571 ../calendar/libecal/e-cal-client.c:138
+#: ../calendar/libedata-cal/e-data-cal.c:425
+msgid "Invalid object"
+msgstr "àààà ààààà"
+
+#: ../calendar/libecal/e-cal.c:4573
+msgid "URI not loaded"
+msgstr "URI àààààààà à'à ààà ààà"
+
+#: ../calendar/libecal/e-cal.c:4575
+msgid "URI already loaded"
+msgstr "URI àààààà à'à ààà àààà"
+
+#: ../calendar/libecal/e-cal.c:4579
+msgid "Unknown User"
+msgstr "âàààààà ààààààààààà"
+
+#: ../calendar/libecal/e-cal.c:4581 ../calendar/libecal/e-cal-client.c:142
+#: ../calendar/libedata-cal/e-data-cal.c:426
+msgid "Object ID already exists"
+msgstr "ààààà ID àààààààà ààààààà"
+
+#: ../calendar/libecal/e-cal.c:4583
+msgid "Protocol not supported"
+msgstr "àààààààà ààààààà"
+
+#: ../calendar/libecal/e-cal.c:4585
+msgid "Operation has been canceled"
+msgstr "àààà ààààà ààà àààà"
+
+#: ../calendar/libecal/e-cal.c:4587
+msgid "Could not cancel operation"
+msgstr "àààà ààààà àààààà àààààà"
+
+#: ../calendar/libecal/e-cal.c:4589 ../libedataserver/e-client.c:124
+msgid "Authentication failed"
+msgstr "àààààààààà àààà"
+
+#: ../calendar/libecal/e-cal.c:4591
+#: ../camel/providers/smtp/camel-smtp-transport.c:759
+#: ../libedataserver/e-client.c:126
+msgid "Authentication required"
+msgstr "àààààààààà àààààà"
+
+#: ../calendar/libecal/e-cal.c:4593
+msgid "A D-Bus exception has occurred"
+msgstr "ààà D-Bus ààààààààà àààà àààà"
+
+#: ../calendar/libecal/e-cal.c:4597
+msgid "No error"
+msgstr "àààà àààààà àààà ààà"
+
+#: ../calendar/libecal/e-cal-client.c:140
+#: ../calendar/libedata-cal/e-data-cal.c:434
+msgid "Unknown user"
+msgstr "âàààààà ààààààààààà"
+
+#: ../calendar/libecal/e-cal-client.c:144
+#: ../calendar/libedata-cal/e-data-cal.c:423
+msgid "Invalid range"
+msgstr "àààà àààà"
+
+#: ../calendar/libecal/e-cal-client.c:600
+msgid "Failed to run calendar factory"
+msgstr "ààààààààà àààà àààààà àààààà"
+
+#: ../calendar/libecal/e-cal-client.c:765
+msgid "Failed to find system calendar"
+msgstr "ààààààà ààààààààà àààààà ààààà àààààà"
+
+#: ../calendar/libecal/e-cal-client.c:804
+#: ../calendar/libedata-cal/e-data-cal.c:433
+msgid "Calendar does not exist"
+msgstr "ààààààààà ààààààààààà ààà"
+
+#: ../calendar/libecal/e-cal-client.c:919
+msgid "Invalid source type"
+msgstr "àààà ààà ààà"
+
+#: ../calendar/libecal/e-cal-component.c:1326
 msgid "Untitled appointment"
-msgstr "àààààààààà àààààààààà"
+msgstr "ààààààààà àààààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3945
+#: ../calendar/libecal/e-cal-recur.c:3981
 msgid "1st"
 msgstr "à-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3946
+#: ../calendar/libecal/e-cal-recur.c:3982
 msgid "2nd"
 msgstr "à-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3947
+#: ../calendar/libecal/e-cal-recur.c:3983
 msgid "3rd"
 msgstr "à-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3948
+#: ../calendar/libecal/e-cal-recur.c:3984
 msgid "4th"
 msgstr "à-ààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3949
+#: ../calendar/libecal/e-cal-recur.c:3985
 msgid "5th"
 msgstr "à-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3950
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "6th"
-msgstr "à-à"
+msgstr "à-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3951
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "7th"
-msgstr "à-à"
+msgstr "à-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3952
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "8th"
-msgstr "à-à"
+msgstr "à-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3953
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "9th"
-msgstr "à-à"
+msgstr "à-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3954
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "10th"
-msgstr "àà-à"
+msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3955
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "11th"
-msgstr "àà-à"
+msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3956
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "12th"
-msgstr "àà-à"
+msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3957
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "13th"
-msgstr "àà-à"
+msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3958
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "14th"
-msgstr "àà-à"
+msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3959
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "15th"
-msgstr "àà-à"
+msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3960
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "16th"
-msgstr "àà-à"
+msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3961
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "17th"
-msgstr "àà-à"
+msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3962
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "18th"
-msgstr "àà-à"
+msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3963
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "19th"
-msgstr "àà-à"
+msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3964
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "20th"
-msgstr "àà-à"
+msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3965
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "21st"
-msgstr "àà-à"
+msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3966
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "22nd"
-msgstr "àà-à"
+msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3967
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "23rd"
-msgstr "àà-à"
+msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3968
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "24th"
-msgstr "àà-à"
+msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3969
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "25th"
-msgstr "àà-à"
+msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3970
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "26th"
-msgstr "àà-à"
+msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3971
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "27th"
-msgstr "àà-à"
+msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3972
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "28th"
-msgstr "àà-à"
+msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3973
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "29th"
-msgstr "àà-à"
+msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3974
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "30th"
-msgstr "àà-à"
+msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-recur.c:3975
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "31st"
-msgstr "àà-à"
+msgstr "àà-à"
 
-#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:712
+#: ../calendar/libecal/e-cal-util.c:691 ../calendar/libecal/e-cal-util.c:718
+msgctxt "Priority"
 msgid "High"
 msgstr "àààà"
 
-#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:714
+#: ../calendar/libecal/e-cal-util.c:693 ../calendar/libecal/e-cal-util.c:720
+msgctxt "Priority"
 msgid "Normal"
 msgstr "ààààààààà"
 
-#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:716
+#: ../calendar/libecal/e-cal-util.c:695 ../calendar/libecal/e-cal-util.c:722
+msgctxt "Priority"
 msgid "Low"
 msgstr "ààààà"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:710
+#: ../calendar/libecal/e-cal-util.c:716
+msgctxt "Priority"
 msgid "Undefined"
-msgstr "àààààààààà"
+msgstr "ààààààà"
 
-#: ../calendar/libecal/e-cal.c:1693 ../libedataserverui/e-book-auth-util.c:199
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "%s'à àààà ààààààààà àààà (àààààààààà %s)"
+#: ../calendar/libedata-cal/e-cal-backend.c:34
+msgid "Cannot process, calendar backend is opening"
+msgstr "ààààààààà àààà àààààà, ààààààààà ààààààà ààà ààà ààà"
 
-#.
-#. This password prompt will be prompted rarely. Since the key that is passed to
-#. the auth_func corresponds to the parent user.
-#.
-#: ../calendar/libecal/e-cal.c:1707
+#: ../calendar/libedata-cal/e-cal-backend.c:212
 #, c-format
-msgid "Enter password for %s to enable proxy for user %s"
-msgstr "%s'à àààà ààààààààà àààààà ààà %s ààààààààààà àààà ààààààà àààà àààààà ààà"
-
-#: ../calendar/libecal/e-cal.c:5089
-msgid "Invalid argument"
-msgstr "àààà àààà"
-
-#: ../calendar/libecal/e-cal.c:5091
-msgid "Backend is busy"
-msgstr "ààààà-àààà àààààààà àààààà"
-
-#: ../calendar/libecal/e-cal.c:5093
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
-msgid "Repository is offline"
-msgstr "ààààààààààà àààààààà àà-àààà ààààààà ààà"
-
-#: ../calendar/libecal/e-cal.c:5095
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
-msgid "No such calendar"
-msgstr "àà àààà ààààààààà ààààààà ààà"
-
-#: ../calendar/libecal/e-cal.c:5097
-#: ../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:5099
-#: ../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:5101
-msgid "URI not loaded"
-msgstr "URI àààààààà àààà àààà ààà"
-
-#: ../calendar/libecal/e-cal.c:5103
-msgid "URI already loaded"
-msgstr "URI àààààà àààà àààà àààà"
-
-#: ../calendar/libecal/e-cal.c:5105
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
-#: ../servers/exchange/storage/e-storage.c:573
-msgid "Permission denied"
-msgstr "àààààà àààà ààààà"
-
-#: ../calendar/libecal/e-cal.c:5107
-#: ../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:5109
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
-msgid "Object ID already exists"
-msgstr "ààààà ID àààààààà ààààààà"
-
-#: ../calendar/libecal/e-cal.c:5111
-msgid "Protocol not supported"
-msgstr "àààààààà àààà"
-
-#: ../calendar/libecal/e-cal.c:5113
-msgid "Operation has been canceled"
-msgstr "àààà ààààà ààà àààà"
-
-#: ../calendar/libecal/e-cal.c:5115
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
-msgid "Could not cancel operation"
-msgstr "àààà ààààà àààààà àààààà"
-
-#: ../calendar/libecal/e-cal.c:5119
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:217
-msgid "Authentication required"
-msgstr "ààààààà àààààà"
-
-#: ../calendar/libecal/e-cal.c:5121
-msgid "A CORBA exception has occurred"
-msgstr "CORBA àààààààà àààààà àààà"
-
-#: ../calendar/libecal/e-cal.c:5123
-#: ../calendar/libedata-cal/e-cal-backend-util.c:146
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
-#: ../camel/providers/imap/camel-imap-command.c:432
-#: ../camel/providers/imap/camel-imap-store.c:743
-#: ../camel/providers/imap4/camel-imap4-engine.c:1547
-#: ../camel/providers/imap4/camel-imap4-engine.c:1585
-#: ../camel/providers/imap4/camel-imap4-engine.c:1629
-#: ../camel/providers/imap4/camel-imap4-engine.c:1684
-#: ../camel/providers/imap4/camel-imap4-store.c:311
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-#: ../camel/providers/pop3/camel-pop3-store.c:552
-#: ../camel/providers/pop3/camel-pop3-store.c:559
-#: ../camel/providers/pop3/camel-pop3-store.c:565
-#: ../servers/exchange/storage/e-storage.c:587
-#: ../servers/groupwise/e-gw-connection.c:241
-msgid "Unknown error"
-msgstr "âàààààà àààààà"
+msgid "Unknown calendar property '%s'"
+msgstr "âàààààà ààààààààà ààààààà  '%s'"
 
-#: ../calendar/libecal/e-cal.c:5125
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
-#: ../servers/exchange/storage/e-storage.c:555
-msgid "No error"
-msgstr "àààà àààààà àààà"
+#: ../calendar/libedata-cal/e-cal-backend.c:229
+#, c-format
+msgid "Cannot change value of calendar property '%s'"
+msgstr "ààààààààà ààààààà '%s' -à ààà àààà àààà àààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:67
-#: ../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:72
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:714
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:736
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:851
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:882
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1082
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1112
 #, c-format
 msgid "\"%s\" expects no arguments"
-msgstr "\"%s\"-à àààà àààà àààààààààà ààà"
+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:108
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:224
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:269
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:308
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1153
 #, c-format
 msgid "\"%s\" expects one argument"
-msgstr "\"%s\" à ààà àààà àààààààààà"
+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:735
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:114
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:314
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:781
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
-msgstr "\"%s\"-à ààààà àààà àààààà (string) àààà àààààààààà"
+msgstr "\"%s\"-à ààààà àààà ààààààà àààà àààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:129
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
-msgstr "\"%s\"'à ààààà àààà ààà ISO 8601 date/time àààààà (string) àààà àààààààààà"
+msgstr "\"%s\"'à ààààà àààà ààà ISO 8601 ààààà/ààà ààààààà àààà àààààààààà"
 
-#: ../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:413
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:171
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:388
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:441
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:917
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "\"%s\" àà àààà àààà àààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c: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: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:177
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:230
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:275
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:394
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:447
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:923
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1159
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "\"%s\"-à ààààà àààà time_t àààà àààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:185
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "\"%s\"-à ààààààà àààà ààààààààààà àààà àààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:375
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:402
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:456
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:931
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "\"%s\"-à ààààààà àààà time_t àààà àààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:743
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:789
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
-msgstr "\"%s\"-à ààààààà àààà àààààà (string) àààà àààààààààà"
+msgstr "\"%s\"-à ààààààà àààà ààààààà àààà àààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:773
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:819
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1190,118 +1462,182 @@ msgstr ""
 "\"description\" àààà \"location\" àààà \"attendee\" àààà \"organizer\" àààà "
 "\"classification\""
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:925
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:981
 #, c-format
 msgid "\"%s\" expects at least one argument"
-msgstr "\"%s\"-à ààààà ààà àààà àààààààààà"
+msgstr "\"%s\"-à ààààà ààà àààà ààààààààà ààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:939
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:995
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
 "be a boolean false (#f)"
 msgstr ""
-"\"%s\"-à àààà àààà àààààà (string) àààà àààà ààà ààà àààà ààààààà false (#f) àààà "
-"àààààààààà"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
-msgid "Invalid range"
-msgstr "àààà àààà"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
-msgid "Unsupported field"
-msgstr "àààààààà ààààààà"
+"\"%s\"-à àààà àààà ààààààà àààà àààà ààà ààà àààà ààààààà false (#f) àààà ààààààààà "
+"ààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-data-cal.c:430
 msgid "Unsupported method"
 msgstr "àààààààà àààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
-msgid "Unsupported authentication method"
-msgstr "ààààààà ààààààà ààààààà ààà"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:989
+msgid "Cannot open calendar: "
+msgstr "ààààààààà ààààà àààààà: "
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-msgid "TLS not available"
-msgstr "TLS àààààà ààà"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1014
+msgid "Cannot remove calendar: "
+msgstr "ààààààààà ààààà àààààà: "
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-msgid "Offline mode unavailable"
-msgstr "àà-àààà ààà àààààà ààà"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1041
+msgid "Cannot refresh calendar: "
+msgstr "ààààààààà àààà àààà àààààà: "
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-msgid "Search size limit exceeded"
-msgstr "àààààààààà ààààà àààààààà ààààààà àààààààààà ààààà"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1070
+msgid "Cannot retrieve backend property: "
+msgstr "àààààààà ààààààà àààààà àààà àààààà: "
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-msgid "Search time limit exceeded"
-msgstr "ààààààààà ààààà àààà àààààààààà ààààà"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1125
+msgid "Cannot retrieve calendar object path: "
+msgstr "ààààààààà ààààààà àà àààààà àààà àààààà: "
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Invalid query"
-msgstr "àààà àààààà"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1155
+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:1184
+msgid "Cannot retrieve calendar free/busy list: "
+msgstr "ààààààààà ààààà/àààààà àààààà àààààà àààà àààààà: "
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
-msgid "Invalid server version"
-msgstr "ààààà ààààààà ààà ààà"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1215
+msgid "Cannot create calendar object: "
+msgstr "ààààààààà ààààààà àààààà àààà àààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1247
+msgid "Cannot modify calendar object: "
+msgstr "ààààààààà ààààààà àààà àààà àààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1281
+msgid "Cannot remove calendar object: "
+msgstr "ààààààààà ààààààà ààààà àààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1308
+msgid "Cannot receive calendar objects: "
+msgstr "ààààààààà ààààààààààà ààààà àààà àààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1339
+msgid "Cannot send calendar objects: "
+msgstr "ààààààààà ààààààààààà àààà àààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1371
+msgid "Could not retrieve attachment uris: "
+msgstr "ààààààààà uriàààà àààààà àààà àààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1399
+msgid "Could not discard reminder: "
+msgstr "àààààààààà ààààà àààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1428
+msgid "Could not get calendar view path: "
+msgstr "ààààààààà ààààà àà ààààààà àààà àààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1458
+msgid "Could not retrieve calendar time zone: "
+msgstr "àààààààààà ààà ààààà àààààà àààà ààà ààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1484
+msgid "Could not add calendar time zone: "
+msgstr "ààààààààà ààà ààààà ààà àààà àààààà: "
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:387
+#, c-format
+msgid "Invalid call"
+msgstr "àààà àà"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:428
+#, c-format
+msgid "Invalid URI"
+msgstr "àààà URl"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:446
+#, c-format
+msgid "No backend factory for '%s' of '%s'"
+msgstr " '%s'  -à  '%s' -à àààà àààà ààààààà àààààà ààà"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:489
+#, c-format
+msgid "Could not instantiate backend"
+msgstr "ààààààà ààààà àààà àààààà"
 
-#: ../camel/camel-cipher-context.c:102
+#: ../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 "àà àààààà àààààà àààà ààààààà ààà ààààà"
+msgstr "àà àààààà àààààà àààà ààààààààà ààà ààààà"
+
+#: ../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:136
+#: ../camel/camel-data-cache.c:178
+#, c-format
 msgid "Unable to create cache path"
-msgstr "àààààà àà ààààààà àààààà àààààà"
+msgstr "ààààà àà ààààààà àààààà àààààà"
 
-#: ../camel/camel-data-cache.c:402
+#: ../camel/camel-data-cache.c:504
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
-msgstr "àààààà ààààààà ààààààà ààààà: %s: %s"
-
-#: ../camel/camel-db.c:412
-msgid "Insufficient memory"
-msgstr "ààààààààà ààààà"
+msgstr "ààààà ààààààà ààààààà ààààà: %s: %s"
 
-#: ../camel/camel-disco-diary.c:197
+#: ../camel/camel-disco-diary.c:201
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1309,11 +1645,11 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 "ààà ààààààà ààààààà àààààà: %s\n"
-"àààààààà àààà ààààà àààà àààà àà ààààà ààà \n"
+"ààààààààà àààà ààààà àààà àààà àà àààààààà ààà \n"
 "àààààààà àààà àààààà ààà àà'à à"
 
-#: ../camel/camel-disco-diary.c:260
-#: ../camel/providers/imap/camel-imap-journal.c:320
+#: ../camel/camel-disco-diary.c:266
+#: ../camel/providers/imap/camel-imap-journal.c:309
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1322,206 +1658,236 @@ msgid ""
 msgstr ""
 "'%s' ààààà àààààà:\n"
 "%s\n"
-"àà àààààààà ààà àààààààà àààààà àààààà ààà ààà ààà"
+"àà àààààààà ààà àààààààà àààààà àààà ààààààà ààà àààà"
 
-#: ../camel/camel-disco-diary.c:296
+#: ../camel/camel-disco-diary.c:310
 msgid "Resynchronizing with server"
-msgstr "ààààà àààà àààààà ààà à'à"
+msgstr "àààààààà àààà àààà ààààààà ààà à'à"
 
-#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:51
-msgid "Copy folder content locally for offline operation"
-msgstr "àà-àààà ààààà àààà àààààààà ààààààààà ààààààààààà ààà ààà"
-
-#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:107
+#: ../camel/camel-disco-folder.c:72 ../camel/camel-offline-folder.c:89
 msgid "Downloading new messages for offline mode"
-msgstr "àà-àààà ààààààà àààààààà àààà àààà àààààà ààààà'à ààà àààà"
+msgstr "àà-àààà ààààààà àààààààà àààà àààà àààààà ààààà'à ààà àààà"
 
-#: ../camel/camel-disco-folder.c:466
+#: ../camel/camel-disco-folder.c:410
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "àà-àààà àààààààà àààà '%s' ààààààà àààààààà ààà àààà"
 
-#: ../camel/camel-disco-store.c:400
-#: ../camel/providers/groupwise/camel-groupwise-store.c:223
-#: ../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:3014
+#: ../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:1157
+#: ../camel/providers/imap/camel-imap-store.c:1935
+#: ../camel/providers/imap/camel-imap-store.c:2430
+#: ../camel/providers/imap/camel-imap-store.c:3192
+#: ../camel/providers/imapx/camel-imapx-folder.c:324
+#: ../camel/providers/imapx/camel-imapx-folder.c:357
+#: ../camel/providers/imapx/camel-imapx-folder.c:411
+#: ../camel/providers/imapx/camel-imapx-folder.c:457
+#: ../camel/providers/imapx/camel-imapx-folder.c:491
+#: ../camel/providers/imapx/camel-imapx-folder.c:531
+#: ../camel/providers/imapx/camel-imapx-folder.c:567
+#: ../camel/providers/imapx/camel-imapx-store.c:242
+#: ../camel/providers/imapx/camel-imapx-store.c:1306
+#: ../camel/providers/imapx/camel-imapx-store.c:1394
+#: ../camel/providers/imapx/camel-imapx-store.c:1440
+#, c-format
 msgid "You must be working online to complete this operation"
-msgstr "àà àààà àààààà àààà àààà àà-àààà ààààààà ààà àààààà"
+msgstr "àà àààà àààààà àààà àààà àà-àààà ààààààà ààà àààààà"
 
-#: ../camel/camel-exception.c:260
-msgid "No description available"
-msgstr "àààààà àààààà ààà"
+#: ../camel/camel-file-utils.c:732
+#, c-format
+msgid "Canceled"
+msgstr "ààààà ààà àààà"
 
-#: ../camel/camel-filter-driver.c:794 ../camel/camel-filter-search.c:579
+#: ../camel/camel-filter-driver.c:878 ../camel/camel-filter-search.c:697
 #, c-format
 msgid "Failed to create child process '%s': %s"
-msgstr "àààààà àààààà '%s' ààààààà àààààà àààààà: %s"
+msgstr "àààààà ààààààààà '%s' ààààààà àààààà àààààà: %s"
 
-#: ../camel/camel-filter-driver.c:836
+#: ../camel/camel-filter-driver.c:926
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "%sà ààà àààà àààààà ààààà ààààààà àààà: %s"
 
-#: ../camel/camel-filter-driver.c:1025 ../camel/camel-filter-driver.c:1034
+#: ../camel/camel-filter-driver.c:1131 ../camel/camel-filter-driver.c:1140
 msgid "Syncing folders"
-msgstr "ààààààà àààààà ààà àààà"
+msgstr "ààààààà àààà ààààààà ààà àààà"
 
-#: ../camel/camel-filter-driver.c:1121 ../camel/camel-filter-driver.c:1522
+#: ../camel/camel-filter-driver.c:1235 ../camel/camel-filter-driver.c:1681
 #, c-format
 msgid "Error parsing filter: %s: %s"
-msgstr "ààààààà àààààààà àààààà àààààà: %s: %s"
+msgstr "ààààààààà àààààààà àààààà àààààà: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1130 ../camel/camel-filter-driver.c:1531
+#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1692
 #, c-format
 msgid "Error executing filter: %s: %s"
-msgstr "ààààààà ààààààà àààààà àààààà: %s: %s"
+msgstr "ààààààààà ààààààà àààààà àààààà: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1216
+#: ../camel/camel-filter-driver.c:1344
+#, c-format
 msgid "Unable to open spool folder"
 msgstr "ààààà ààààààà ààààààà àààààà"
 
-#: ../camel/camel-filter-driver.c:1225
+#: ../camel/camel-filter-driver.c:1355
+#, c-format
 msgid "Unable to process spool folder"
 msgstr "ààààà ààààààà àààààààààààà àààààà"
 
-#: ../camel/camel-filter-driver.c:1241
+#: ../camel/camel-filter-driver.c:1373
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d àààààà ààààààà àààààà àààààà (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1245
-msgid "Cannot open message"
-msgstr "àààààà àààà ààààà"
-
-#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1264
+#: ../camel/camel-filter-driver.c:1380 ../camel/camel-filter-driver.c:1402
 #, c-format
 msgid "Failed on message %d"
 msgstr "àààààà %d à àààààà"
 
-#: ../camel/camel-filter-driver.c:1278 ../camel/camel-filter-driver.c:1368
+#: ../camel/camel-filter-driver.c:1417 ../camel/camel-filter-driver.c:1518
 msgid "Syncing folder"
-msgstr "ààààààà àààààà ààà àààà"
+msgstr "ààààààà àààà ààààààà ààà àààà"
 
-#: ../camel/camel-filter-driver.c:1282 ../camel/camel-filter-driver.c:1373
+#: ../camel/camel-filter-driver.c:1422 ../camel/camel-filter-driver.c:1524
 msgid "Complete"
 msgstr "àààààà"
 
-#: ../camel/camel-filter-driver.c:1338
+#: ../camel/camel-filter-driver.c:1482
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "àààààà %d ààààààà ààà àààà, ààà %d à"
 
-#: ../camel/camel-filter-driver.c:1353
+#: ../camel/camel-filter-driver.c:1500
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d àààààà àààààà, ààà %d à"
 
-#: ../camel/camel-filter-search.c:137
+#: ../camel/camel-filter-search.c:138
 msgid "Failed to retrieve message"
 msgstr "àààààà àààà àààààà àààààà"
 
-#: ../camel/camel-filter-search.c:399
+#: ../camel/camel-filter-search.c:447
 msgid "Invalid arguments to (system-flag)"
 msgstr "àààà àààà ààààààà àààà (system-flag)"
 
-#: ../camel/camel-filter-search.c:414
+#: ../camel/camel-filter-search.c:465
 msgid "Invalid arguments to (user-tag)"
 msgstr "àààà àààà ààààààà àààà (user-tag)"
 
-#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:735 ../camel/camel-filter-search.c:743
+#: ../camel/camel-filter-search.c:874 ../camel/camel-filter-search.c:883
 #, c-format
 msgid "Error executing filter search: %s: %s"
-msgstr "ààààààà àààààà ààààààààà àààààà àààààà: %s: %s"
+msgstr "ààààààààà àààààà àààààà àààààà àààààà: %s: %s"
+
+#: ../camel/camel-folder.c:243
+#, c-format
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "'%s'  -à àààà ààààà àààààà àààà àà ààà"
+msgstr[1] "'%s'  -à àààà ààààà àààààààààà àààà àà ààà"
 
-#: ../camel/camel-folder-search.c:351 ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:608
+#: ../camel/camel-folder.c:283
+#, c-format
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "'%s'  -à àààà ààà àààààà àààà àà ààà"
+msgstr[1] "'%s'  -à àààà ààà àààààààààà àààà àà ààà"
+
+#: ../camel/camel-folder.c:331
+#, c-format
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "'%s' ' -à àààà àààààà ààààààààà ààà àà ààà"
+msgstr[1] "'%s' -à àààà àààààààààà ààààààààà ààà àà ààà"
+
+#: ../camel/camel-folder.c:902
+#: ../camel/providers/local/camel-maildir-folder.c:319
+msgid "Moving messages"
+msgstr "àààààà ààààààààààà ààà àààà"
+
+#: ../camel/camel-folder.c:905
+msgid "Copying messages"
+msgstr "àààààà ààà ààà àààà"
+
+#: ../camel/camel-folder.c:1160
+#, c-format
+msgid "Quota information not supported for folder '%s'"
+msgstr "ààààààà '%s' -à àààà àààà àààà ààààààà ààà"
+
+#: ../camel/camel-folder.c:3271
+#, c-format
+msgid "Retrieving message '%s' in %s"
+msgstr "'%s' -à  '%s'  -à àààà àààààà àààààà ààà àà ààà"
+
+#: ../camel/camel-folder.c:3404
+#, c-format
+msgid "Retrieving quota information for '%s'"
+msgstr "'%s' -à àààà àààà àààà àààààà ààà àà ààà"
+
+#: ../camel/camel-folder-search.c:348 ../camel/camel-folder-search.c:459
+#: ../camel/camel-folder-search.c:630
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
-"àààààààààà àààà àààààààààà àààààààà àààààà àààààà: %s:\n"
+"ààààààà àààà àààààààààà àààààààà àààààà àààààà: %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:360 ../camel/camel-folder-search.c:471
+#: ../camel/camel-folder-search.c:642
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
-"àààààààààà àààààààààà ààààààà àààààà àààààà: %s:\n"
+"ààààààà àààààààààà ààààààà àààààà àààààà: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:852
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:856 ../camel/camel-folder-search.c:899
 #, c-format
 msgid "(%s) requires a single bool result"
-msgstr "(%s)-à àààààààà ààà ààààààà ààààà àààààà"
+msgstr "(%s)-à àààààààà ààà ààààààà ààààà àààààà"
 
-#: ../camel/camel-folder-search.c:905
+#. Translators: Each '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:960
 #, c-format
 msgid "(%s) not allowed inside %s"
-msgstr "(%s), %s-à ààààà ààààààà ààà àààà àà"
+msgstr "(%s), %s-à àààà ààààààà ààà ààààà"
 
-#: ../camel/camel-folder-search.c:911 ../camel/camel-folder-search.c:918
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:967 ../camel/camel-folder-search.c:975
 #, c-format
 msgid "(%s) requires a match type string"
-msgstr "(%s) ààà ààà àààààààà àààààà àààààà"
+msgstr "(%s) ààà ààà àààààààà ààààààà àààààà"
 
-#: ../camel/camel-folder-search.c:945
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:1003
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s)-à ààà àààààà ààààà àààààààààà"
 
-#: ../camel/camel-folder-search.c:954
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:1013
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) ààààààà ààààà àààààà"
 
-#: ../camel/camel-folder.c:683
+#: ../camel/camel-gpg-context.c:657 ../camel/camel-gpg-context.c:662
+#: ../camel/camel-gpg-context.c:1288
 #, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "àààààààà àààà: àààààà ààà ààà à'à: %s'à àààà"
-
-#: ../camel/camel-folder.c:1388
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "àààààààà àààà: àààààààààà ààààààà ààààààààà ààà à'à: %s'à àààà"
-
-#: ../camel/camel-folder.c:1429
-#, c-format
-msgid "Unsupported operation: count by expression: for %s"
-msgstr "àààààààà àààà: àààààààààà ààààààà àààà ààà ààà: %s-à àààà"
-
-#: ../camel/camel-folder.c:1468
-#, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "àààààààà àààà: UID ààààààà ààààààààà ààà à'à: %s'à àààà"
-
-#: ../camel/camel-folder.c:1581
-msgid "Moving messages"
-msgstr "àààààà ààààààààààà ààà àààà"
-
-#: ../camel/camel-folder.c:1581
-msgid "Copying messages"
-msgstr "àààààà ààà ààà àààà"
-
-#: ../camel/camel-folder.c:1922
-msgid "Learning junk"
-msgstr "àààààààà ààààààà ààààà"
-
-#: ../camel/camel-folder.c:1939
-msgid "Learning non-junk"
-msgstr "ààààààà ààààààà ààààà"
+msgid "Failed to execute gpg: %s"
+msgstr "gpg ààààààà àààààà àààààà: %s"
 
-#: ../camel/camel-folder.c:1958
-msgid "Filtering new message(s)"
-msgstr "àààà àààààà ààààààà ààà àààà"
+#: ../camel/camel-gpg-context.c:662
+#: ../camel/providers/smtp/camel-smtp-transport.c:762
+msgid "Unknown"
+msgstr "âàààààà"
 
-#: ../camel/camel-gpg-context.c:751
+#: ../camel/camel-gpg-context.c:727
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1532,15 +1898,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:766
+#: ../camel/camel-gpg-context.c:744
+#, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg userid'à ààààà àààààààà àààààà ààààààà"
 
-#: ../camel/camel-gpg-context.c:790 ../camel/camel-gpg-context.c:804
+#: ../camel/camel-gpg-context.c:769 ../camel/camel-gpg-context.c:784
+#, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "gpg passphrase'à àààààà àààààààà àààààà àààààà"
 
-#: ../camel/camel-gpg-context.c:824
+#: ../camel/camel-gpg-context.c:805
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1549,151 +1917,136 @@ msgstr ""
 "ààààà ààààààà-ààààà àà-àà àààà àààà ààà PIN\n"
 "àààààà: \"%s\""
 
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:809
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
-"ààààààà ààààààààààà àà àà-àà àààà àààà àààààààà\n"
+"ààààààà àààààààààààà àà àà-àà àààà àààà àààààààà\n"
 "àààààà ààà àààààà: \"%s\""
 
-#: ../camel/camel-gpg-context.c:833
+#: ../camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "'%s'-à àààà GnuPG àààà ààààààààààà àààààà"
 
-#: ../camel/camel-gpg-context.c:858 ../camel/camel-gpg-context.c:1067
-#: ../camel/providers/nntp/camel-nntp-store.c:1313
-msgid "Canceled."
-msgstr "ààààà ààà ààààà"
+#: ../camel/camel-gpg-context.c:844 ../camel/camel-net-utils.c:523
+#: ../camel/camel-tcp-stream-raw.c:260
+#: ../camel/providers/imapx/camel-imapx-server.c:5014
+#: ../camel/providers/imapx/camel-imapx-server.c:5031
+#: ../camel/providers/imapx/camel-imapx-store.c:161
+#: ../camel/providers/nntp/camel-nntp-summary.c:414
+#: ../libedataserver/e-client.c:134 ../libedataserverui/e-book-auth-util.c:227
+#, c-format
+msgid "Cancelled"
+msgstr "ààààà ààà àààà"
 
-#: ../camel/camel-gpg-context.c:872
+#: ../camel/camel-gpg-context.c:862
+#, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr "àààà-àà àà-àà àààààà àààààà: à-ààà ààà ààààààààà àààà ààààà"
+msgstr "àààà-àà àà-àà àààààà àààààà: à-ààà ààà àààààààà àààà ààààà"
 
-#: ../camel/camel-gpg-context.c:880
+#: ../camel/camel-gpg-context.c:874
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPGà ààà ààààààààààà ààààààààààà: %s"
 
-#: ../camel/camel-gpg-context.c:943
-msgid "Failed to encrypt: No valid recipients specified."
-msgstr "ààààààààà àààààà àààààà: ààà àààààà àààààà ààà ààààà"
-
-#. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1205 ../camel/camel-gpg-context.c:1330
-#: ../camel/camel-gpg-context.c:1852 ../camel/camel-gpg-context.c:1897
+#: ../camel/camel-gpg-context.c:1005
 #, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "gpg ààààààà àààààà àààààà: %s"
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "ààààààààà àààààà àààààà: ààà àààààà àààààà ààà àààà àààà"
 
-#: ../camel/camel-gpg-context.c:1298 ../camel/camel-smime-context.c:602
-#, c-format
-msgid "Could not generate signing data: %s"
-msgstr "àààààààà àààààà ààààààà àààà ààààààà àààààà àààààà: %s"
+#: ../camel/camel-gpg-context.c:1552 ../camel/camel-smime-context.c:827
+msgid "Could not generate signing data: "
+msgstr "ààààààààà àààà àààà àààà àààààà: "
 
-#: ../camel/camel-gpg-context.c:1345 ../camel/camel-gpg-context.c:1546
-#: ../camel/camel-gpg-context.c:1562 ../camel/camel-gpg-context.c:1642
-#: ../camel/camel-gpg-context.c:1657 ../camel/camel-gpg-context.c:1773
-#: ../camel/camel-gpg-context.c:1788 ../camel/camel-gpg-context.c:1868
-#: ../camel/camel-gpg-context.c:1913
+#: ../camel/camel-gpg-context.c:1601 ../camel/camel-gpg-context.c:1805
+#: ../camel/camel-gpg-context.c:1915 ../camel/camel-gpg-context.c:2062
+#: ../camel/camel-gpg-context.c:2162 ../camel/camel-gpg-context.c:2210
 msgid "Failed to execute gpg."
 msgstr "gpg ààààààà àààààà ààààààà"
 
-#: ../camel/camel-gpg-context.c:1364
-msgid "This is a digitally signed message part"
-msgstr "ààà ààààààà àààà àààààààààà ààààààà ààà"
-
-#: ../camel/camel-gpg-context.c:1450 ../camel/camel-gpg-context.c:1456
-#: ../camel/camel-gpg-context.c:1462 ../camel/camel-gpg-context.c:1477
-#: ../camel/camel-smime-context.c:910 ../camel/camel-smime-context.c:921
-#: ../camel/camel-smime-context.c:928
+#: ../camel/camel-gpg-context.c:1680 ../camel/camel-gpg-context.c:1688
+#: ../camel/camel-gpg-context.c:1696 ../camel/camel-gpg-context.c:1716
+#: ../camel/camel-smime-context.c:953 ../camel/camel-smime-context.c:967
+#: ../camel/camel-smime-context.c:976
+#, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "ààààààà àààààààà ààààààà àààààà àààààà: ààààààà ààààààà àààà ààà"
 
-#: ../camel/camel-gpg-context.c:1516
-#, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "ààààààà àààààààà ààààààà àààààà àààààà: ààààààà ààààààà ààààààà àààààà àààààà: %s"
+#: ../camel/camel-gpg-context.c:1758
+msgid "Cannot verify message signature: "
+msgstr "àààààà àààààààà ààà àààà àààààà àààà àààààà: "
 
-#: ../camel/camel-gpg-context.c:1625
-#, c-format
-msgid "Could not generate encrypting data: %s"
-msgstr "ààààààààà àààààà ààààààà àààà ààààààà àààààà àààààà: %s"
+#: ../camel/camel-gpg-context.c:1881
+msgid "Could not generate encrypting data: "
+msgstr "ààààààààààà àààà àààà àààà àààààà: "
 
-#: ../camel/camel-gpg-context.c:1675
+#: ../camel/camel-gpg-context.c:1934
 msgid "This is a digitally encrypted message part"
 msgstr "ààà ààààààà àààà ààààààààà ààà ààààààà ààà"
 
-#: ../camel/camel-gpg-context.c:1728 ../camel/camel-gpg-context.c:1736
-#: ../camel/camel-gpg-context.c:1755
+#: ../camel/camel-gpg-context.c:1992 ../camel/camel-gpg-context.c:2001
+#: ../camel/camel-gpg-context.c:2024
+#, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "àààààà ààààààààà àààààà àààààà: ààààààà ààààààà àààà ààà"
 
-#: ../camel/camel-gpg-context.c:1745
+#: ../camel/camel-gpg-context.c:2012
+#, c-format
 msgid "Failed to decrypt MIME part: protocol error"
-msgstr "MIME'à ààà ààààààààà àààààà àààààà: àààààààà àààà àààààà"
+msgstr "MIME'à ààà ààààààààà àààààà àààààà: àààààààà àààà àààààà"
 
-#: ../camel/camel-gpg-context.c:1810 ../camel/camel-smime-context.c:1186
+#: ../camel/camel-gpg-context.c:2103 ../camel/camel-smime-context.c:1264
 msgid "Encrypted content"
 msgstr "ààààààààà ààà ààààààààà"
 
-#: ../camel/camel-gpg-context.c:1829
-msgid "Unable to parse message content"
-msgstr "ààààààà àààà ààààà àààààààà àààààà àààààà"
-
-#: ../camel/camel-gpg-context.c:1853 ../camel/camel-gpg-context.c:1898
-#: ../camel/camel-tcp-stream-openssl.c:627
-#: ../camel/providers/imap4/camel-imap4-utils.c:614
-#: ../camel/providers/smtp/camel-smtp-transport.c:165
-#: ../camel/providers/smtp/camel-smtp-transport.c:220
-msgid "Unknown"
-msgstr "âàààààà"
+#: ../camel/camel-http-stream.c:546 ../camel/camel-stream-null.c:78
+msgid "Only reset to beginning is supported with CamelHttpStream"
+msgstr "CamelHttpStream -à àààà àààà ààààààààà ààààààààà àààààà ààà àà"
 
-#: ../camel/camel-lock-client.c:104
+#: ../camel/camel-lock.c:102
 #, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "àààà ààààààà àààà ààààààà àààààà àààààà: %s"
+msgid "Could not create lock file for %s: %s"
+msgstr "%s'à àààà àà ààààààà ààààààà àààààà àààààà: %s"
 
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock.c:145
 #, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "àààà ààààààà fork àààààà àààààà: %s"
+msgid "Timed out trying to get lock file on %s.  Try again later."
+msgstr "%s -à lock file ààààààà ààààà ààà àààà ààà àààà àààààà àààà"
 
-#: ../camel/camel-lock-client.c:203 ../camel/camel-lock-client.c:226
+#: ../camel/camel-lock.c:205
 #, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "'%s' àà àààààà àààààà: lock-helper'à àààààààà àààààààà àààà àààààà"
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "fcntl(2)'à àààààààà àà àààààà àààààà: %s"
 
-#: ../camel/camel-lock-client.c:216
+#: ../camel/camel-lock.c:272
 #, c-format
-msgid "Could not lock '%s'"
-msgstr "'%s' àà àààààà àààààà"
+msgid "Failed to get lock using flock(2): %s"
+msgstr "flock(2)'à àààààààà àà àààààà àààààà: %s"
 
-#: ../camel/camel-lock.c:103
+#: ../camel/camel-lock-client.c:106
 #, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "%s'à àààà àà ààààààà ààààààà àààààà àààààà: %s"
+msgid "Cannot build locking helper pipe: %s"
+msgstr "àààà ààààààà àààà ààààààà àààààà àààààà: %s"
 
-#: ../camel/camel-lock.c:144
+#: ../camel/camel-lock-client.c:130
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"%s'à ààà àà ààààààà ààààààà àààà ààààààà àààààààà ààààà àààààààà àààà àààààà àààààà "
-"àààà"
+msgid "Cannot fork locking helper: %s"
+msgstr "àààà ààààààà fork àààààà àààààà: %s"
 
-#: ../camel/camel-lock.c:199
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
 #, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "fcntl(2)'à àààààààà àà àààààà àààààà: %s"
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "'%s' àà àààààà àààààà: lock-helper'à àààààààà àààààààà àààà àààààà"
 
-#: ../camel/camel-lock.c:262
+#: ../camel/camel-lock-client.c:227
 #, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "flock(2)'à àààààààà àà àààààà àààààà: %s"
+msgid "Could not lock '%s'"
+msgstr "'%s' àà àààààà àààààà"
 
-#: ../camel/camel-movemail.c:106
+#: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "àààà ààààààà %s ààààààà àààààà àààààà: %s"
@@ -1703,152 +2056,167 @@ 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"
+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 "fork àààààà àààààà: %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 "(âàààààà àààààà)"
+msgstr "(âàààààà àààààà)"
 
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:273
 #, c-format
 msgid "Error reading mail file: %s"
-msgstr "àààà ààààààà àààà àààààà: %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:491 ../camel/camel-movemail.c:560
 #, c-format
 msgid "Error copying mail temp file: %s"
-msgstr "ààààààà àààà ààààààà ààà àààààà àààààà: %s"
+msgstr "ààààààà àààà ààààààà ààà àààààà àààààà: %s"
+
+#: ../camel/camel-multipart-signed.c:297
+#, c-format
+msgid "No content available"
+msgstr "àààà ààà àààààà ààà"
+
+#: ../camel/camel-multipart-signed.c:305
+#, c-format
+msgid "No signature available"
+msgstr "àààà àààààààà àààààà ààà"
 
-#: ../camel/camel-multipart-signed.c:592
+#: ../camel/camel-multipart-signed.c:689
+#, c-format
 msgid "parse error"
-msgstr "àààààààà àààààà àààààà"
+msgstr "àààààààà àààààà àààààà"
 
-#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:674
-#: ../camel/camel-net-utils.c:806
-#: ../camel/providers/pop3/camel-pop3-store.c:446
-#: ../camel/providers/pop3/camel-pop3-store.c:546
-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:522
-msgid "cannot create thread"
-msgstr "ààààà ààààààà àààààà àààààà"
+#: ../camel/camel-network-service.c:123
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "%s -àà ààààà àààà àààààà: "
 
-#: ../camel/camel-net-utils.c:678
+#: ../camel/camel-net-utils.c:703
 #, c-format
 msgid "Resolving: %s"
 msgstr "ààààààà ààà àààà: %s"
 
-#: ../camel/camel-net-utils.c:700
+#: ../camel/camel-net-utils.c:726
 msgid "Host lookup failed"
-msgstr "ààààà ààààààààà àààààà"
+msgstr "ààààà àààààà àààààà"
 
-#: ../camel/camel-net-utils.c:702
+#: ../camel/camel-net-utils.c:732
 #, c-format
 msgid "Host lookup failed: %s: %s"
-msgstr "ààààà ààààààààà àààààà: %s: %s"
+msgstr "ààààà àààààà àààààà: %s: %s"
 
-#: ../camel/camel-net-utils.c:810
+#: ../camel/camel-net-utils.c:853
 msgid "Resolving address"
 msgstr "ààààà ààààààà ààà àààà"
 
-#: ../camel/camel-net-utils.c:830
+#: ../camel/camel-net-utils.c:874
 msgid "Name lookup failed"
-msgstr "ààà ààààààààà àààààà àààààà"
+msgstr "ààà àààààà àààààà àààààà"
 
-#: ../camel/camel-net-utils.c:833
+#: ../camel/camel-net-utils.c:880
 #, c-format
 msgid "Name lookup failed: %s"
-msgstr "ààà ààààààààà àààààà àààààà: %s"
+msgstr "ààà àààààà àààààà àààààà: %s"
 
-#: ../camel/camel-offline-folder.c:249
+#: ../camel/camel-offline-folder.c:202
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
-msgstr "'%s' àààààààà àààààà ààààààà ààààà àààààà ààà àààà"
+msgstr "'%s' àààààààà àààààà ààààààà àààà àààà ààààààà ààà àààà"
 
-#: ../camel/camel-offline-journal.c:159 ../camel/camel-offline-journal.c:182
+#: ../camel/camel-offline-journal.c:147 ../camel/camel-offline-journal.c:177
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "'%s' àààààààà àààà àà-àààà ààààààà ààààà àààààà: %s"
 
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:58
 msgid "Virtual folder email provider"
-msgstr "ààààààààà àààààààà à-àààà àààààààààà"
+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"
+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 ààà àààààà àààààà: ààààààà ààààà àààààààààà ààà ààààààà àààà"
+msgstr "%s à'à àààààà àààààà: ààààààà àààà àààààààààà ààà ààààààà àààà"
 
-#: ../camel/camel-provider.c:379 ../camel/camel-session.c:182
+#: ../camel/camel-provider.c:394 ../camel/camel-session.c:351
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "'%s' àààààààààà àààà àààà àààààààààà ààààààà ààà"
 
-#: ../camel/camel-sasl-anonymous.c:36
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anonymous"
 
-#: ../camel/camel-sasl-anonymous.c:38
+#: ../camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
 msgstr "àà àààààààà àààààà anonymous àà-àà àààààà àààààà àààà ààààà ààà ààààà"
 
-#: ../camel/camel-sasl-anonymous.c:121 ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:70
+#, c-format
 msgid "Authentication failed."
 msgstr "ààààà àààààà àààààà ààààààà"
 
-#: ../camel/camel-sasl-anonymous.c:130
+#: ../camel/camel-sasl-anonymous.c:81
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
 "%s"
 msgstr ""
-"à-àààà àààààà àààààààà àààà trace àààà:\n"
+"à-àààà àààààà àààààààà àààà trace àààà:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:142
+#: ../camel/camel-sasl-anonymous.c:95
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1857,7 +2225,7 @@ msgstr ""
 "àààà opaque trace àààà:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:154
+#: ../camel/camel-sasl-anonymous.c:109
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1866,590 +2234,550 @@ msgstr ""
 "àààà trace àààà:\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:844
+#: ../camel/camel-sasl-digest-md5.c:830
+#, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "àààààà ààààààààà ààààà ààààà (>àààà ààààà)"
 
-#: ../camel/camel-sasl-digest-md5.c:853
+#: ../camel/camel-sasl-digest-md5.c:841
+#, c-format
 msgid "Server challenge invalid\n"
 msgstr "àààààà ààààààààà ààà ààà\n"
 
-#: ../camel/camel-sasl-digest-md5.c:859
+#: ../camel/camel-sasl-digest-md5.c:849
+#, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
-msgstr "àààààà ààààà àààà \"Quality of Protection\" ààààà ààààààà ààààà"
+msgstr "àààààà àààà àààà \"Quality of Protection\" ààààà ààààààà ààààà"
 
-#: ../camel/camel-sasl-digest-md5.c:889
+#: ../camel/camel-sasl-digest-md5.c:883
+#, c-format
 msgid "Server response did not contain authorization data"
-msgstr "ààààà ààà ààààààà àààààààààààà ààààà ààààà àààààà ààààààààà àààà ààààààààà"
+msgstr "àààààààà ààà ààààààà àààààààààààà àààà ààààà àààààà ààààààààà àààà ààààààààà"
 
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:904
+#, c-format
 msgid "Server response contained incomplete authorization data"
-msgstr "ààààà ààà ààààààà àààààààààààà ààààà ààààà àààààà ààààààààà àààà ààààààààà"
+msgstr "àààààààà ààà ààààààà àààààààààààà àààà ààààà àààààà ààààààààà àààà ààààààààà"
 
 #: ../camel/camel-sasl-digest-md5.c:917
+#, c-format
 msgid "Server response does not match"
 msgstr "àààààà àààààààààààà ààààà"
 
-#: ../camel/camel-sasl-gssapi.c:63
+#: ../camel/camel-sasl-gssapi.c:86
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:65
+#: ../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:159
+#: ../camel/camel-sasl-gssapi.c:129
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
-msgstr "àààààà ààààà àààààà àààààààà àààààààà ààààààà ààà àààà àààààààààà ààààààààà àààààààà"
+msgstr ""
+"àààààà ààààà àààààà àààààààà àààààààà ààààààà ààà àààà àààààààààà ààààààààà àààààààà"
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:134
 msgid "The provided target_name parameter was ill-formed."
 msgstr "àààààààà target_name ààààààà àààààààà àààà ààà"
 
-#: ../camel/camel-sasl-gssapi.c:167
+#: ../camel/camel-sasl-gssapi.c:137
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
-msgstr "àààààààà target_name àààààààà ààààà àààà àààà àààààààà àààà ààà àààààààà"
+msgstr "àààààààà target_name àààààààà àààà àààà àààà àààààààà àààà ààà àààààààà"
 
-#: ../camel/camel-sasl-gssapi.c:171
+#: ../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:176
+#: ../camel/camel-sasl-gssapi.c:146
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
-msgstr "input_token'à ààààà àààà àààààààà àààà àààààààà ààààààà ààà ààààà ààààà"
+msgstr "input_token'à àààà àààà àààààààà àààà àààààààà ààààààà ààà ààààà àààà àààà"
 
-#: ../camel/camel-sasl-gssapi.c:180
+#: ../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:185
+#: ../camel/camel-sasl-gssapi.c:155
 msgid "The supplied context handle did not refer to a valid context."
-msgstr "àààààààà àààààààà ààààààààà àààààà ààà àààààààà ààààààà ààà ààààà"
+msgstr "àààààààà àààààààà ààààààààà àààààà ààà àààààààà ààààààà ààà àààà àààà"
 
-#: ../camel/camel-sasl-gssapi.c:188
+#: ../camel/camel-sasl-gssapi.c:158
 msgid "The consistency checks performed on the input_token failed."
 msgstr "input_token-à ààààààà ààààà àààà ààààààààà ààààààààààà àààà ààààà"
 
-#: ../camel/camel-sasl-gssapi.c:191
+#: ../camel/camel-sasl-gssapi.c:161
 msgid "The consistency checks performed on the credential failed."
-msgstr "àààààààà ààààààà ààààà àààà ààààààààà ààààààààààà àààà ààààà"
+msgstr "àààààà ààààààà ààààà àààà ààààààààà ààààààààààà àààà ààààà"
 
-#: ../camel/camel-sasl-gssapi.c:194
+#: ../camel/camel-sasl-gssapi.c:164
 msgid "The referenced credentials have expired."
-msgstr "ààààààààà àààààààààààà ààààà àààààààà ààààà"
+msgstr "ààààààààà àààààààààà ààààà àààààààà ààààà"
 
-#: ../camel/camel-sasl-gssapi.c:200 ../camel/camel-sasl-gssapi.c:248
-#: ../camel/camel-sasl-gssapi.c:284 ../camel/camel-sasl-gssapi.c:299
-#: ../camel/camel-sasl-kerberos4.c:230
-#: ../camel/providers/imap/camel-imap-store.c:1274
+#: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:321
+#: ../camel/camel-sasl-gssapi.c:365 ../camel/camel-sasl-gssapi.c:382
+#: ../camel/providers/smtp/camel-smtp-transport.c:1232
+#, c-format
 msgid "Bad authentication response from server."
-msgstr "ààààà ààà ààààààà ààààààààà ààààààààààà àààà àààà"
+msgstr "àààààààà ààà àààààààààà ààààààààà ààààààààààà àààà àààà"
 
-#: ../camel/camel-sasl-gssapi.c:309
+#: ../camel/camel-sasl-gssapi.c:394
+#, 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:173
-#, 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 "àà àààààààà ààà ààà àààààà ààààààààà àààààà ààààà ààà à'àà"
+msgstr "àà àààààààà ààà ààà àààààà àààààààà àààààà ààààà ààà à'àà"
 
-#: ../camel/camel-sasl-login.c:134
+#: ../camel/camel-sasl-login.c:92
+#, c-format
 msgid "Unknown authentication state."
-msgstr "àààààààà àààààà âààààààà"
+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 / àààààà ààààààààà ààààààà (SPA) àààààà ààà Windows-ààààààà "
-"àààààà àààà ààààà ààà à'àà"
+"àà àààààààà ààà NTLM / àààààà àààààààà àààààààààà (SPA) àààààà ààà Windows-"
+"ààààààà àààààà àààà ààààà ààà à'àà"
 
-#: ../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 ààààà ààààààà ààà à'à"
+msgstr "àà àààààààà ààà SMTP ààààààà àààààà ààà POP ààààà àààààààààà ààà à'à"
 
-#: ../camel/camel-sasl-popb4smtp.c:106
-msgid "POP Source URI"
-msgstr "POP Source URI"
+#: ../camel/camel-sasl-popb4smtp.c:80
+msgid "POP Source UID"
+msgstr "POP ààà UID"
 
-#: ../camel/camel-sasl-popb4smtp.c:109
-msgid "POP Before SMTP auth using an unknown transport"
-msgstr "âàààààà àààààà àààààà SMTP àààààààà àààààà POP ààààààà"
+#: ../camel/camel-sasl-popb4smtp.c:92
+#, c-format
+msgid "POP Before SMTP authentication using an unknown transport"
+msgstr "ààà àààààà àààààà ààààààà ààà POP -à ààà SMTP àààààààààà"
 
-#: ../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 "ààà %s ààààà àààà POP -à ààà SMTP  ààààààààààà àààààà ààà àààà"
 
-#: ../camel/camel-search-private.c:149
+#: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
-msgstr "ààààààà àààààààààà ààààààà àààààà àààà: %s: %s"
+msgstr "ààààààà àààààààààà ààààààà àààààà àààà: %s: %s"
 
-#: ../camel/camel-service.c:265
+#: ../camel/camel-service.c:524
 #, c-format
-msgid "URL '%s' needs a username component"
-msgstr "URL '%s'-à àààà ààààààààààà ààà (username) àààààà ààà àààààà"
+msgid "URL '%s' needs a user component"
+msgstr "URL '%s' -à ààà ààààààààààà ààààààà ààààààà"
 
-#: ../camel/camel-service.c:269
+#: ../camel/camel-service.c:535
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s'-à àààà ààààà (host) àààààà ààà àààààà"
 
-#: ../camel/camel-service.c:273
+#: ../camel/camel-service.c:546
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s'-à àààà ààà (path) àààààà ààà àààààà"
 
-#: ../camel/camel-session.c:307
+#: ../camel/camel-session.c:361
 #, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"%s ààààààààà ààààààà àààààà àààààà:\n"
-"%s"
+msgid "Invalid GType registered for protocol '%s'"
+msgstr "ààààààà '%s' -à àààà àààà GType ààààààààà ààà àààà"
 
-#: ../camel/camel-session.c:479
+#: ../camel/camel-session.c:941
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "ààààààà ààà %s'à àààà %s ààààààà ààà %s ààààààààà àààààà"
 
-#: ../camel/camel-session.c:817
-msgid "Camel session doesn't support forwarding of a message."
-msgstr "Camel ààààà àààààà àààààà àààààààà àààààààà ààààààà àà ààà"
-
-#: ../camel/camel-smime-context.c:444 ../camel/camel-smime-context.c:993
+#: ../camel/camel-smime-context.c:347 ../camel/camel-smime-context.c:1053
 #, c-format
 msgid "Cannot find certificate for '%s'"
-msgstr "'%s'-à àààààààààà ààààààààà àààààà àààààà"
+msgstr "'%s'-à àààààààààà àààààà àààààà àààààà"
 
-#: ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:375
 msgid "Cannot create CMS message"
 msgstr "CMS àààààà ààààààà àààààà àààààà"
 
-#: ../camel/camel-smime-context.c:455
+#: ../camel/camel-smime-context.c:380
 msgid "Cannot create CMS signed data"
 msgstr "ààààààààà CMS àààà ààààààà àààààà àààààà"
 
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:386
 msgid "Cannot attach CMS signed data"
 msgstr "àààààààààà CMS àààà ààààààà àààààà àààààà"
 
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:393
 msgid "Cannot attach CMS data"
 msgstr "CMS àààà ààààààà àààààà àààààà"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:399
 msgid "Cannot create CMS Signer information"
 msgstr "CMS'à àààààààààààà àààà ààààààà àààààà àààààà"
 
-#: ../camel/camel-smime-context.c:480
+#: ../camel/camel-smime-context.c:405
 msgid "Cannot find certificate chain"
-msgstr "àààààààààà àààà ààààààààà àààààà àààààà"
+msgstr "àààààààààà àààà àààààà àààààà àààààà"
 
-#: ../camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:411
 msgid "Cannot add CMS Signing time"
 msgstr "CMS ààààààààà ààà ààà àààààà àààààà"
 
-#: ../camel/camel-smime-context.c:508 ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:435 ../camel/camel-smime-context.c:450
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s'-à ààààààààà àààààààààà ààààààààà"
 
-#: ../camel/camel-smime-context.c:527
+#: ../camel/camel-smime-context.c:457
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "SMIMEEncKeyPrefs ààààààààà ààà àààààà àààààà"
 
-#: ../camel/camel-smime-context.c:532
+#: ../camel/camel-smime-context.c:462
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "MS SMIMEEncKeyPrefs ààààààààà ààà àààààà àààààà"
 
-#: ../camel/camel-smime-context.c:537
+#: ../camel/camel-smime-context.c:467
 msgid "Cannot add encryption certificate"
 msgstr "ààààààààà àààààààààà ààà àààààà àààààà"
 
-#: ../camel/camel-smime-context.c:543
+#: ../camel/camel-smime-context.c:473
 msgid "Cannot add CMS Signer information"
 msgstr "CMS àààààààààààà àààà ààà àààààà àààààà"
 
-#: ../camel/camel-smime-context.c:613 ../camel/camel-smime-context.c:1065
-msgid "Cannot create encoder context"
-msgstr "ààààààà àààààà ààààààà àààààà àààààà"
-
-#: ../camel/camel-smime-context.c:619
-msgid "Failed to add data to CMS encoder"
-msgstr "CMS ààààààà'à àààà ààà àààààà àààààà"
-
-#: ../camel/camel-smime-context.c:624 ../camel/camel-smime-context.c:1082
-msgid "Failed to encode data"
-msgstr "àààà ààààà àààààà àààààà"
-
-#: ../camel/camel-smime-context.c:697
+#. Translators: A fallback message when couldn't verify an SMIME signature
+#: ../camel/camel-smime-context.c:506
 msgid "Unverified"
 msgstr "ààààààààà"
 
-#: ../camel/camel-smime-context.c:699
+#: ../camel/camel-smime-context.c:508
 msgid "Good signature"
 msgstr "àààà àààààààà"
 
-#: ../camel/camel-smime-context.c:701
+#: ../camel/camel-smime-context.c:510
 msgid "Bad signature"
 msgstr "ààà àààààààà"
 
-#: ../camel/camel-smime-context.c:703
+#: ../camel/camel-smime-context.c:512
 msgid "Content tampered with or altered in transit"
 msgstr "ààààààààà àààààààààà àààà ààààààà ààà àààà àààà ààààààààà àààà"
 
-#: ../camel/camel-smime-context.c:705
+#: ../camel/camel-smime-context.c:514
 msgid "Signing certificate not found"
 msgstr "àààààààààààà àààààààààà ààààà ààààà"
 
-#: ../camel/camel-smime-context.c:707
+#: ../camel/camel-smime-context.c:516
 msgid "Signing certificate not trusted"
 msgstr "àààààààààààà àààààààààà àààààààà ààà"
 
-#: ../camel/camel-smime-context.c:709
+#: ../camel/camel-smime-context.c:518
 msgid "Signature algorithm unknown"
 msgstr "àààààààààààà ààààààààààà àààààà"
 
-#: ../camel/camel-smime-context.c:711
+#: ../camel/camel-smime-context.c:520
 msgid "Signature algorithm unsupported"
 msgstr "àààààààààààà ààààààààààà ààààààà ààà"
 
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-smime-context.c:522
 msgid "Malformed signature"
 msgstr "ààà ààààà àààààààà"
 
-#: ../camel/camel-smime-context.c:715
+#: ../camel/camel-smime-context.c:524
 msgid "Processing error"
-msgstr "àààààààààààààà àààààà"
+msgstr "àààààààààààààà àààààà"
 
-#: ../camel/camel-smime-context.c:753
+#: ../camel/camel-smime-context.c:569
 msgid "No signed data in signature"
-msgstr "ààààààààà ààààà àààààààààà àààà ààààààààà"
+msgstr "ààààààààà àààà àààààààààà àààà ààààààààà"
 
-#: ../camel/camel-smime-context.c:758
+#: ../camel/camel-smime-context.c:574
 msgid "Digests missing from enveloped data"
 msgstr "ààààààà ààà ààààà ààà àààààààà àààààà ààà ààààà"
 
-#: ../camel/camel-smime-context.c:771 ../camel/camel-smime-context.c:781
+#: ../camel/camel-smime-context.c:587 ../camel/camel-smime-context.c:598
 msgid "Cannot calculate digests"
 msgstr "àààààààà àààà àààààà àààààà"
 
-#: ../camel/camel-smime-context.c:788 ../camel/camel-smime-context.c:792
+#: ../camel/camel-smime-context.c:605 ../camel/camel-smime-context.c:609
 msgid "Cannot set message digests"
 msgstr "ààààààà àààààà ààààààà ààààà àààààà àààààà"
 
-#: ../camel/camel-smime-context.c:802 ../camel/camel-smime-context.c:807
+#: ../camel/camel-smime-context.c:619 ../camel/camel-smime-context.c:624
 msgid "Certificate import failed"
 msgstr "àààààààààà àààààààà àààà àààà"
 
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
-msgstr "ààààààà ààààà ààà àààààààààà, àààààààààà ààààààà ààà àààà àà"
+msgstr "ààààààà àààà ààà àààààààààà, àààààààààà ààààààà ààà ààààà"
 
-#: ../camel/camel-smime-context.c:820
+#: ../camel/camel-smime-context.c:637
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
-msgstr "ààààààà ààààà ààà àààààààààà, àààààààààà àààààààà ààà ààààààà ààà àààà"
+msgstr "ààààààà àààà ààà àààààààààà, àààààààààà àààààààà ààà ààààààà ààà àààà"
 
-#: ../camel/camel-smime-context.c:824
+#: ../camel/camel-smime-context.c:641
 msgid "Cannot find signature digests"
 msgstr "ààààààààà àààààààà ààààà ààààà"
 
-#: ../camel/camel-smime-context.c:840
+#: ../camel/camel-smime-context.c:657
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "àààààààààààà: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:941 ../camel/camel-smime-context.c:1165
+#: ../camel/camel-smime-context.c:838 ../camel/camel-smime-context.c:1126
+msgid "Cannot create encoder context"
+msgstr "ààààààà àààààà ààààààà àààààà àààààà"
+
+#: ../camel/camel-smime-context.c:844
+msgid "Failed to add data to CMS encoder"
+msgstr "CMS ààààààà'à àààà ààà àààààà àààààà"
+
+#: ../camel/camel-smime-context.c:849 ../camel/camel-smime-context.c:1143
+msgid "Failed to encode data"
+msgstr "àààà ààààà àààààà àààààà"
+
+#: ../camel/camel-smime-context.c:992 ../camel/camel-smime-context.c:1239
 msgid "Decoder failed"
 msgstr "ààààààà àààààà"
 
-#: ../camel/camel-smime-context.c:1000
+#: ../camel/camel-smime-context.c:1061
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "àààààà ààààà ààààààààà ààààààààààà ààààà ààààà"
 
-#: ../camel/camel-smime-context.c:1008
+#: ../camel/camel-smime-context.c:1069
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "ààààààààà ààààà-àà'à àààà àààà àààààà ààà ààààà"
 
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1080
 msgid "Cannot create CMS Message"
 msgstr "CMS àààààà ààààààà àààààà àààààà"
 
-#: ../camel/camel-smime-context.c:1025
+#: ../camel/camel-smime-context.c:1086
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS Enveloped àààà ààààààà àààààà àààààà"
 
-#: ../camel/camel-smime-context.c:1031
+#: ../camel/camel-smime-context.c:1092
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS Enveloped àààà àààààà àààààà àààààà"
 
-#: ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:1098
 msgid "Cannot attach CMS data object"
 msgstr "CMS àààà ààààà ààààààà àààààà àààààà"
 
-#: ../camel/camel-smime-context.c:1046
+#: ../camel/camel-smime-context.c:1107
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS àààààà ààààààààà àààà ààààààà àààààà àààààà"
 
-#: ../camel/camel-smime-context.c:1051
+#: ../camel/camel-smime-context.c:1112
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS àààààà ààààààààà àààà ààà àààààà àààààà"
 
-#: ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:1137
 msgid "Failed to add data to encoder"
 msgstr "àààààààà àààà ààà àààààà àààààà"
 
-#: ../camel/camel-smime-context.c:1172
+#: ../camel/camel-smime-context.c:1246
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME Decrypt: ààààààààà ààà àààà àààà ààààà ààààà"
 
-#: ../camel/camel-smime-context.c:1200
-msgid "import keys: unimplemented"
-msgstr "àà àààààààà ààà à'à: àààààààààà àààà"
-
-#: ../camel/camel-smime-context.c:1208
-msgid "export keys: unimplemented"
-msgstr "àà ààààààà ààà à'à: àààààààààà àààà"
-
-#: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:171
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "ààààààà ààààààà àààààà àààààà: ààààààà àààààààààààà ààààà àààà ààà ààà"
-
-#: ../camel/camel-store.c:316
+#: ../camel/camel-store.c:1815
 #, c-format
 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:377
-#: ../camel/providers/local/camel-maildir-store.c:219
+#: ../camel/camel-store.c:1858
 #, c-format
-msgid "Cannot delete folder: %s: Invalid operation"
-msgstr "ààààààà àààà àààà ààààà: %s: àààà àààà"
+msgid "Opening folder '%s'"
+msgstr "ààààààà '%s' àààà àà ààà"
 
-#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:414
-#: ../camel/providers/local/camel-maildir-store.c:291
+#: ../camel/camel-store.c:2043
 #, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "àààààààà ààà àààààààà àààààà àààààà: %s: àààà àààà"
+msgid "Scanning folders in '%s'"
+msgstr "'%s' -à ààààààààààà ààààà ààà àà ààà"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:900 ../camel/camel-vtrash-folder.c:54
+#: ../camel/camel-store.c:2055 ../camel/camel-store.c:2065
+#: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "àààààààà ààààà"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:903 ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-store.c:2058 ../camel/camel-store.c:2069
+#: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "àààààààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:564
-msgid "Unable to get issuer's certificate"
-msgstr "ààààààààà àààààààààà ààààààà àààààà àààààà"
-
-#: ../camel/camel-tcp-stream-openssl.c:566
-msgid "Unable to get Certificate Revocation List"
-msgstr "àààààààààà àààààààààààà àààààà ààààààà àààààà àààààà"
-
-#: ../camel/camel-tcp-stream-openssl.c:568
-msgid "Unable to decrypt certificate signature"
-msgstr "ààààààààààà àààààààà àà-ààààààà àààààà àààààà"
-
-#: ../camel/camel-tcp-stream-openssl.c:570
-msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "ààààààààààà àààààààààààà ààààààà àààààààà ààààààààà àààààà àààààà"
-
-#: ../camel/camel-tcp-stream-openssl.c:572
-msgid "Unable to decode issuer's public key"
-msgstr "ààààààààà ààààààààà-àà ààààà àààààà àààààà"
-
-#: ../camel/camel-tcp-stream-openssl.c:574
-msgid "Certificate signature failure"
-msgstr "àààààààààà àààààààà àààààà àààààà"
+#: ../camel/camel-store.c:2520
+#, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "ààààààà ààààààà àààààà àààààà: %s: ààààààà àààààààà ààààààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:576
-msgid "Certificate Revocation List signature failure"
-msgstr "àààààààààà àààààààààààà ààààààà àààààààà àààààà"
+#: ../camel/camel-store.c:2534
+#, c-format
+msgid "Creating folder '%s'"
+msgstr "ààààààà '%s' àààààà ààà àà ààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:578
-msgid "Certificate not yet valid"
-msgstr "àààààààààà àà àààààààà ààà ààà"
+#: ../camel/camel-store.c:2652 ../camel/camel-vee-store.c:352
+#: ../camel/providers/local/camel-maildir-store.c:272
+#, c-format
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr "ààààààà àààà àààà ààààà: %s: àààà àààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:580
-msgid "Certificate has expired"
-msgstr "ààààààààààà ààààà àààààààà àààà"
+#: ../camel/camel-store.c:2795 ../camel/camel-vee-store.c:402
+#: ../camel/providers/local/camel-maildir-store.c:710
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "àààààààà ààà àààààààà àààààà àààààà: %s: àààà àààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:582
-#| msgid "Certificate Revocation List signature failure"
-msgid "Certificate Revocation List (CRL) not yet valid"
-msgstr "àààààààààà àààààààààààà àààààà (CRL)à àààààààà àààààà"
+#: ../camel/camel-stream-filter.c:327
+msgid "Only reset to beginning is supported with CamelStreamFilter"
+msgstr "CamelStreamFilter -à àààà àààà ààààààààà ààààààààà àààààà ààà àà"
 
-#: ../camel/camel-tcp-stream-openssl.c:584
-#| msgid "Certificate Revocation List signature failure"
-msgid "Certificate Revocation List (CRL) has expired"
-msgstr "àààààààààà àààààààààààà àààààà (CRL)à àààààààà àààààà"
+#: ../camel/camel-stream-process.c:267
+#, c-format
+msgid "Connection cancelled"
+msgstr "ààààà ààààà ààà àààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:589
-#| msgid "Unable to get Certificate Revocation List"
-msgid "Error in Certificate Revocation List (CRL)"
-msgstr "àààààààààà àààààààààààà àààààà (CRL) ààààààà àààààà àààààà"
+#: ../camel/camel-stream-process.c:272
+#, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "\"%s\" àààààà àààààà ààààà àààààà àààààà: %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:591
-msgid "Out of memory"
-msgstr "ààààà ààààààà ààà"
+#: ../camel/camel-tcp-stream-raw.c:756 ../camel/camel-tcp-stream-raw.c:767
+#, c-format
+msgid "The proxy host does not support SOCKS4"
+msgstr "ààààààà ààààà SOCKS4 àààààà àààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:593
-msgid "Zero-depth self-signed certificate"
-msgstr "àààà-ààààâà ààààà àààààààààà àààààààààà"
+#: ../camel/camel-tcp-stream-raw.c:778
+#, c-format
+msgid "The proxy host denied our request: code %d"
+msgstr "ààààààà ààààà àààà àààààà àààà ààààà: ààà %d"
 
-#: ../camel/camel-tcp-stream-openssl.c:595
-msgid "Self-signed certificate in chain"
-msgstr "ààààà ààààà ààààà-àààààààààà àààààààààà"
+#: ../camel/camel-tcp-stream-raw.c:874 ../camel/camel-tcp-stream-raw.c:880
+#, c-format
+msgid "The proxy host does not support SOCKS5"
+msgstr "ààààààà ààààà SOCKS5 àààààà àààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Unable to get issuer's certificate locally"
-msgstr "ààààààààà àààààààààà ààààààààààà ààààààà àààààà àààààà"
+#: ../camel/camel-tcp-stream-raw.c:886
+#, c-format
+msgid "Could not find a suitable authentication type: code 0x%x"
+msgstr "ààà ààààà àààààààààà ààà àààà ààà: ààà 0x%x"
 
-#: ../camel/camel-tcp-stream-openssl.c:599
-msgid "Unable to verify leaf signature"
-msgstr "ààà ààààààààà àààààààà ààààààà àààààà àààààà"
+#: ../camel/camel-tcp-stream-raw.c:898
+msgid "General SOCKS server failure"
+msgstr "àààààà SOCKS ààààààà àààààààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:601
-msgid "Certificate chain too long"
-msgstr "àààààààààà àààà àààààààà ààààà"
+#: ../camel/camel-tcp-stream-raw.c:899
+msgid "SOCKS server's rules do not allow connection"
+msgstr "SOCKS àààààààà ààààààààà àààààà àààààà àààààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:603
-msgid "Certificate Revoked"
-msgstr "àààààààààà àààààààààààà ààà àààà"
+#: ../camel/camel-tcp-stream-raw.c:900
+msgid "Network is unreachable from SOCKS server"
+msgstr "àààààààà SOCKS àààààààà ààà ààààààà àààà àààààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:605
-msgid "Invalid Certificate Authority (CA)"
-msgstr "àààà àààààààààà ààààààà (CA)"
+#: ../camel/camel-tcp-stream-raw.c:901
+msgid "Host is unreachable from SOCKS server"
+msgstr "àààà SOCKS àààààààà ààà ààààààà àààà àààààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:607
-msgid "Path length exceeded"
-msgstr "ààààà ààààààààà ààààààà àààààààààà àààà"
+#: ../camel/camel-tcp-stream-raw.c:902
+msgid "Connection refused"
+msgstr "ààààà àààà ààà àààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:609
-msgid "Invalid purpose"
-msgstr "àààà àààààààà"
+#: ../camel/camel-tcp-stream-raw.c:903
+msgid "Time-to-live expired"
+msgstr "ààààà-ààà-àààà ààààà ààààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:611
-msgid "Certificate untrusted"
-msgstr "àààààààààà àààààààààààà ààà"
+#: ../camel/camel-tcp-stream-raw.c:904
+msgid "Command not supported by SOCKS server"
+msgstr "àààààà SOCKS ààààààà àààààà ààààààà ààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:613
-msgid "Certificate rejected"
-msgstr "àààààààààà àààààààààà"
+#: ../camel/camel-tcp-stream-raw.c:905
+msgid "Address type not supported by SOCKS server"
+msgstr "ààààà ààà SOCKS ààààààà àààààà ààààààà ààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:616
-msgid "Subject/Issuer mismatch"
-msgstr "àààààà/ààààààààà ààààà ààààà"
+#: ../camel/camel-tcp-stream-raw.c:906
+msgid "Unknown error from SOCKS server"
+msgstr "SOCKS àààààààà ààà àààààà àààààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:618
-msgid "AKID/SKID mismatch"
-msgstr "AKID/SKID ààààà"
+#: ../camel/camel-tcp-stream-raw.c:939
+#, c-format
+msgid "Got unknown address type from SOCKS server"
+msgstr "SOCKS àààààààà ààà àààààà ààààà ààà àààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:620
-msgid "AKID/Issuer serial mismatch"
-msgstr "AKID/ààààààà ààààààà ààààà"
+#: ../camel/camel-tcp-stream-raw.c:957
+#, c-format
+msgid "Incomplete reply from SOCKS server"
+msgstr "SOCKS àààààààà ààà ààààààààà ààààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:622
-msgid "Key usage does not support certificate signing"
-msgstr "àà'à àààààà àààààààààà àààààààà àààà ààààààà ààà"
+#: ../camel/camel-tcp-stream-raw.c:977
+#, c-format
+msgid "Hostname is too long (maximum is 255 characters)"
+msgstr "ààààààà ààà àààà (àààààààà ààà ààààààà)"
 
-#: ../camel/camel-tcp-stream-openssl.c:625
-msgid "Error in application verification"
-msgstr "àààààààààààà àààààààà àààààà"
+#. SOCKS5
+#. reserved - must be 0
+#: ../camel/camel-tcp-stream-raw.c:1009 ../camel/camel-tcp-stream-raw.c:1019
+#, c-format
+msgid "Invalid reply from proxy server"
+msgstr "ààààààà àààààààà ààà àààà ààààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:692 ../camel/camel-tcp-stream-ssl.c:873
+#: ../camel/camel-tcp-stream-ssl.c:462
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2462,35 +2790,16 @@ msgstr ""
 "ààààààà-ààààààà:       %s\n"
 "àààààààà:         %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-ssl.c:468
 msgid "GOOD"
 msgstr "GOOD"
 
-#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-ssl.c:468
 msgid "BAD"
 msgstr "BAD"
 
-#: ../camel/camel-tcp-stream-openssl.c:700
-#, 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:883
+#: ../camel/camel-tcp-stream-ssl.c:472
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2505,16 +2814,16 @@ msgstr ""
 "\n"
 "ààààà ààààà ààà à'à àà?"
 
-#: ../camel/camel-tcp-stream-ssl.c:927
+#: ../camel/camel-tcp-stream-ssl.c:516
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
-"àààààààààà ààààààààà àààààà: %s\n"
+"àààààààààà ààààààààà àààààà: %s\n"
 "ààààààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:979
+#: ../camel/camel-tcp-stream-ssl.c:568
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2523,7 +2832,7 @@ msgstr ""
 "àààààààààààà àààààà àààà ààà: %s\n"
 "ààààààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:997
+#: ../camel/camel-tcp-stream-ssl.c:586
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2532,7 +2841,7 @@ msgstr ""
 "ààààààààààà ààààà àààààààà àààà: %s\n"
 "ààààààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1014
+#: ../camel/camel-tcp-stream-ssl.c:603
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2541,1071 +2850,565 @@ msgstr ""
 "àààààààààà àààààààààààà ààààààà ààààà àààààààà àààà: %s\n"
 "ààààààà: %s"
 
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:333
 #, c-format
 msgid "Could not parse URL '%s'"
-msgstr "URL '%s' ààààà àààà àààààà"
+msgstr "URL '%s' ààààà ààààà àààààà"
 
-#: ../camel/camel-vee-folder.c:580
+#: ../camel/camel-vee-folder.c:1310 ../camel/camel-vee-folder.c:1470
 #, c-format
-msgid "Error storing '%s': %s"
-msgstr "`%s' àààààà àààààà àààààà: %s"
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "ààààààààà àààààààà àààà àààààà ààà àààà àààààààààà ààà ààààà ààà"
 
-#: ../camel/camel-vee-folder.c:657
+#: ../camel/camel-vee-folder.c:1343
 #, c-format
 msgid "No such message %s in %s"
-msgstr "%s'à àààààà àààà àààààà %s'à ààààà ààà"
+msgstr "%s'à àààààà àààà àààààà %s'à àààà ààà"
 
-#: ../camel/camel-vee-folder.c:816 ../camel/camel-vee-folder.c:822
-msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "ààààààààà àààààààà ààààà àààààà ààà àààà àààààààààà ààà ààààà ààà"
+#: ../camel/camel-vee-folder.c:1411
+#, c-format
+msgid "Error storing '%s': "
+msgstr "'%s' ààààààà ààààà àààààà: "
 
-#: ../camel/camel-vee-store.c:113 ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:353
+#. 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:400
+#: ../camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
-msgstr "ààààààà àààà àààà ààààà: %s: àà àààà àààà ààààààà ààààààà ààà"
+msgstr "ààààààà àààà àààà ààààà: %s: àà àààà àààà ààààààà ààààààà ààà"
 
-#: ../camel/camel-vee-store.c:422
+#: ../camel/camel-vee-store.c:412
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
-msgstr "àààààààà ààà àààààààà ààà ààààà: %s: àà àààà àààà ààààààà ààààààà ààà"
+msgstr "àààààààà ààà àààààààà ààà ààààà: %s: àà àààà àààà ààààààà ààààààà ààà"
 
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
-msgstr "àààààààà àààààààà àààààà ààà àààààà àààààà"
+msgstr "àààààààà àààààààà àààààà ààà àààààà àààààà"
 
-#: ../camel/camel-vtrash-folder.c:57
+#: ../camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
-msgstr "àààààààà ààààààà àààààààà àààààà ààà àààààà àààààà"
+msgstr "àààààààà ààààààà àààààààà àààààà ààà àààààà àààààà"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
+#: ../camel/providers/imap/camel-imap-command.c:198
+#: ../camel/providers/imap/camel-imap-command.c:293
 #, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"àààààà ààààààà àààààà àààààà: %s\n"
-"  %s"
+msgid "No output stream"
+msgstr "àààààà ààààààà ààààààààà"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
-#: ../camel/providers/local/camel-maildir-folder.c:255
-#: ../camel/providers/local/camel-maildir-folder.c:281
-#: ../camel/providers/local/camel-mbox-folder.c:363
-#: ../camel/providers/local/camel-mbox-folder.c:414
-#: ../camel/providers/local/camel-mh-folder.c:216
-msgid "No such message"
-msgstr "àà àààà àààà àààààà ààààààà ààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:148
-#: ../camel/providers/imap4/camel-imap4-folder.c:814
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:250
-#: ../camel/providers/nntp/camel-nntp-folder.c:410
-#: ../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:819
-#: ../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:252
-#: ../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
+#: ../camel/providers/imap/camel-imap-command.c:206
+#: ../camel/providers/imap/camel-imap-command.c:301
 #, c-format
-msgid "Cannot get message %s: %s"
-msgstr "%s àààààà ààààààà àààààà àààààà: %s"
+msgid "No input stream"
+msgstr "ààààà ààààààà ààààààààà"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:180
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2463
-#: ../camel/providers/imap4/camel-imap4-folder.c:837
-msgid "This message is not available in offline mode."
-msgstr "àà-àààà ààààààà àà àààààààà àààààà àààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:194
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:201
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1966
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2017
-msgid "Could not get message"
-msgstr "àààààà ààààààà àààààà àààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:939
-#: ../camel/providers/imap/camel-imap-folder.c:296
+#: ../camel/providers/imap/camel-imap-command.c:365
 #, c-format
-msgid "Could not load summary for %s"
-msgstr "%s'à ààààààààà àààà ààà àààààà àààààà"
+msgid "Server unexpectedly disconnected: %s"
+msgstr "àààààà àààà ààààààààààà àààà ààààà ààààààààà ààà àààà: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1012
+#: ../camel/providers/imap/camel-imap-command.c:395
 #, c-format
-#| msgid "Checking for new messages"
-msgid "Checking for deleted messages %s"
-msgstr "ààààààà ààààààà àààààààà ààààààà ààà àààà %s "
+msgid ""
+"Alert from IMAP server %s %s:\n"
+"%s"
+msgstr ""
+"IMAP ààààààà %s %sà ààà ààààààà ààààààààààà:\n"
+"%s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1287
-msgid "Trash Folder Full. Please Empty."
-msgstr "àààààààà ààààà ààààà ààà ààààà ààààààà ààà àààà ààààà àààà"
+#: ../camel/providers/imap/camel-imap-command.c:471
+#, c-format
+msgid "Unexpected response from IMAP server: %s"
+msgstr "IMAP àààààààà ààà ààààààà ààààààààààà ààààààààààà: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1521
-#: ../camel/providers/groupwise/camel-groupwise-store.c:633
-#: ../camel/providers/groupwise/camel-groupwise-store.c:763
-#: ../camel/providers/imap/camel-imap-folder.c:3421
-#: ../camel/providers/imap/camel-imap-folder.c:3497
+#: ../camel/providers/imap/camel-imap-command.c:483
 #, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "%s'à ààààà ààààààà àààà ààààààà ààààààààà àààà ààààààà ààà àààà"
+msgid "IMAP command failed: %s"
+msgstr "IMAP àààààà àààà: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2317
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2360
+#: ../camel/providers/imap/camel-imap-command.c:563
 #, c-format
-msgid "Cannot append message to folder '%s': %s"
-msgstr "'%s' àààààààà àààà àààààà ààà ààà ààààà: %s"
+msgid "Server response ended too soon."
+msgstr "àààààààà ààà ààààààà àààààààààà ààà ààààà àààààà ààààà"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2348
+#: ../camel/providers/imap/camel-imap-command.c:775
 #, c-format
-msgid "Cannot create message: %s"
-msgstr "àààààà ààààààà àààààà àààààà: %s"
+msgid "IMAP server response did not contain %s information"
+msgstr "IMAP àààààààà ààà ààààààà àààààààààààà àààà %s ààààààààà àààà ààààààààà"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:281
+#: ../camel/providers/imap/camel-imap-command.c:813
 #, c-format
-msgid "Cannot get folder container %s"
-msgstr "ààààààà àààààààà %s ààààààà àààààà àààààà"
+msgid "Unexpected OK response from IMAP server: %s"
+msgstr "IMAP àààààààà ààà ààààààààààà OK ààààààààààà: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:343
-#: ../camel/providers/imap4/camel-imap4-journal.c:311
-msgid "Cannot append message in offline mode: cache unavailable"
-msgstr "àà-àààà ààààààà àààààà ààà àààààà àààààà: àààààà àààààà ààà"
+#: ../camel/providers/imap/camel-imap-folder.c:296
+msgid "Always check for new mail in this folder"
+msgstr "ààààààà àààààààà àààà àààààà àààà ààààààà àààààààà àààààà ààà ààà"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:359
-#: ../camel/providers/imap4/camel-imap4-journal.c:327
+#: ../camel/providers/imap/camel-imap-folder.c:372
 #, c-format
-msgid "Cannot append message in offline mode: %s"
-msgstr "àà-àààà ààààààà àààààà ààà àààààà àààààà: %s"
+msgid "Could not create directory %s: %s"
+msgstr "%s ààààààààà ààààààà àààààà àààààà: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:54
-#: ../camel/providers/imap4/camel-imap4-provider.c:38
-msgid "Checking for new mail"
-msgstr "àààà ààààààà àààààààà ààààààà ààà àààà"
+#: ../camel/providers/imap/camel-imap-folder.c:395
+#, c-format
+msgid "Could not load summary for %s"
+msgstr "%s'à ààààààààà àààà à'à àààààà àààààà"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:56
-#: ../camel/providers/hula/camel-hula-provider.c:50
-#: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:40
-msgid "C_heck for new messages in all folders"
-msgstr "ààà àààààààà ààààà àààà ààààààà àààààààà ààààààà ààà à'à (_h)"
+#: ../camel/providers/imap/camel-imap-folder.c:1054
+#: ../camel/providers/imapx/camel-imapx-server.c:4065
+#, c-format
+msgid "Scanning for changed messages in %s"
+msgstr "%s'à àààà ààààààààà àààààà ààààààà ààà àààà"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:51
-#: ../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/imap/camel-imap-folder.c:3483
+msgid "Unable to retrieve message: "
+msgstr "àààààà àààààà àààààà ààààà: "
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
-msgid "_Apply filters to new messages in Inbox on this server"
-msgstr "ààààààà àààààà àààààààà ààààà ààà àààà ààààààà àààààààà ààààààà àààààà ààà à'à (_A)"
+#: ../camel/providers/imap/camel-imap-folder.c:3520
+#: ../camel/providers/imapx/camel-imapx-server.c:5344
+#, c-format
+msgid "Cannot get message with message ID %s: %s"
+msgstr "%s ID àà àààààà ààààààà ààààà àààààà: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:63
-msgid "Check new messages for J_unk contents"
-msgstr "àààà ààààààà ààààà àààààààà àààààà ààààààà ààà à'à(_u)"
+#: ../camel/providers/imap/camel-imap-folder.c:3521
+#: ../camel/providers/imapx/camel-imapx-server.c:5345
+msgid "No such message available."
+msgstr "àà àààà àààà àààààà ààààààà àààà"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:74
-msgid "Only check for Junk messages in the IN_BOX folder"
-msgstr "INBOX (àààààà) àààààààà ààà àààààààà àààààà (Junk) ààààààà ààà à'à(_B)"
+#: ../camel/providers/imap/camel-imap-folder.c:3596
+#: ../camel/providers/imap/camel-imap-folder.c:4503
+#: ../camel/providers/nntp/camel-nntp-folder.c:438
+#, c-format
+msgid "This message is not currently available"
+msgstr "ààààààà àààààà àààààààà àààààà ààà"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:67
-msgid "Automatically synchroni_ze account locally"
-msgstr "àààààààààààààà ààààààààààà àààààààààà àààààà ààà à'à(_z)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
-msgid "SOAP Settings"
-msgstr "SOAP'à ààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:75
-msgid "Post Office Agent SOAP _Port:"
-msgstr "Post Office Agent SOAP ààààà: (_P)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
-msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
-msgid "For accessing Novell GroupWise servers"
-msgstr "Novell GroupWise àààà àààààààà ààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:104
-#: ../camel/providers/hula/camel-hula-provider.c:93
-#: ../camel/providers/imap/camel-imap-provider.c:100
-#: ../camel/providers/imap4/camel-imap4-provider.c:83
-#: ../camel/providers/imapp/camel-imapp-provider.c:67
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
-msgid "Password"
-msgstr "ààààààààà"
+#: ../camel/providers/imap/camel-imap-folder.c:4087
+#: ../camel/providers/imap/camel-imap-folder.c:4170
+#: ../camel/providers/imapx/camel-imapx-server.c:4023
+#: ../camel/providers/imapx/camel-imapx-server.c:4173
+#, c-format
+msgid "Fetching summary information for new messages in %s"
+msgstr "%s'à àààà ààààààà àààà ààààààà ààààààààà àààà ààààààà ààà àààà"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
-msgid "This option will connect to the GroupWise server using a plaintext password."
-msgstr ""
-"àà àààààààà ààà ààà àààààà-àààààà ààààààààà àààààà GroupWise àààààà àààà ààààà ààà "
-"à'àà"
+#: ../camel/providers/imap/camel-imap-folder.c:4304
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr "àààààààà ààà ààààààà ààààààààààà ààààààààà: àààààà %d ààààààààà àààà àààà ààààààà ààà"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:102
-msgid "Host or user not available in url"
-msgstr "url'à ààààà ààààà àààà àààààààààà àààààà ààà"
+#: ../camel/providers/imap/camel-imap-folder.c:4314
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr "àààààààà ààà ààààààà ààààààààààà ààààààààà: àààààà %d'à UID ààààààà ààà"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:204
-#: ../camel/providers/imap/camel-imap-store.c:1358
-msgid "You did not enter a password."
-msgstr "ààààààààà àààààà ààà ààààà"
+#: ../camel/providers/imap/camel-imap-folder.c:4543
+#, c-format
+msgid "Could not find message body in FETCH response."
+msgstr "FETCH àààààà àààààààààààà àààà ààààààà àààààà ààà àààààààààà"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:319
-msgid "Some features may not work correctly with your current server version"
-msgstr ""
-"àààààààà ààààààà àààààà ààààààààà àààà àààààà ààààààààà àààààààà àà àààà àààààààà "
-"ààààà"
+#: ../camel/providers/imap/camel-imap-message-cache.c:197
+#: ../camel/providers/imap/camel-imap-message-cache.c:257
+msgid "Could not open cache directory: "
+msgstr "ààààà ààààààààà ààààà àààààà: "
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:540
-#: ../camel/providers/imap/camel-imap-store.c:1849
-#: ../camel/providers/imap/camel-imap-store.c:2047
+#: ../camel/providers/imap/camel-imap-message-cache.c:335
 #, c-format
-msgid "No such folder %s"
-msgstr "%s'à àààààà àààà ààààààà ààààààà ààà"
+msgid "Failed to cache message %s: %s"
+msgstr "àààààà %s ààààà ààà ààààà: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1266
-msgid "Cannot create GroupWise folders in offline mode."
-msgstr "àà-àààà ààààààà GroupWise ààààààà ààààààà àààààà ààààààà"
+#: ../camel/providers/imap/camel-imap-message-cache.c:401
+#, c-format
+msgid "Failed to cache message %s: "
+msgstr "àààààà %s ààààà àààà àààààà: "
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1280
-#: ../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:1359
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
-#, c-format
-msgid "Cannot rename GroupWise folder '%s' to '%s'"
-msgstr "Groupwise àààààààà ààà '%s' àààà '%s'-à àààààààà ààà àààà àà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1414
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
-#, c-format
-msgid "GroupWise server %s"
-msgstr "GroupWise àààà %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1416
+#: ../camel/providers/imap/camel-imap-message-cache.c:543
 #, c-format
-msgid "GroupWise service for %s on %s"
-msgstr "%s'à àààà GroupWise ààààààà %s'à ààà"
+msgid "Failed to cache %s: "
+msgstr "%s ààààà àààààà àààààà: "
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:122
-#, c-format
-msgid "GroupWise mail delivery via %s"
-msgstr "%s'à ààààààà GroupWise àààà ààààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:164
-msgid "Sending Message"
-msgstr "àààààà ààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:212
-msgid ""
-"You have exceeded this account's storage limit. Your messages are queued in "
-"your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
-"of your mail.\n"
-msgstr ""
-"ààààààà ààààààààààà ààààààààà àààà ààààààààààà ààààà àààààààààà ààààààààà ààààà "
-"àààààààààà àààà àààààà ààààààà àààààààà ààà àààà àààà àààà, ààààà/àààààààà àààà àààà "
-"àààààààààà àààààà ààààààà ààààààààà àààà\n"
+#: ../camel/providers/imap/camel-imap-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
+msgid "Checking for New Mail"
+msgstr "àààà àààààà àààààààà ààààààà ààà àààà"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:207
-#, c-format
-msgid "Could not send message: %s"
-msgstr "àààààà ààààà àààààà àààààà: %s"
+#: ../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/hula/camel-hula-provider.c:48
 #: ../camel/providers/imap/camel-imap-provider.c:44
-msgid "Checking for New Mail"
-msgstr "àààà àààààà àààààààà ààààààà ààà àààà"
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
+msgid "Ch_eck for new messages in subscribed folders"
+msgstr "ààààààààààà ààà àààààààà àààà àààà ààààààà àààààààà ààààààà ààà ààà (_h)"
 
-#: ../camel/providers/hula/camel-hula-provider.c:53
-#: ../camel/providers/imap/camel-imap-provider.c:52
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:52
 msgid "Connection to Server"
 msgstr "àààààà àààà ààààà"
 
-#: ../camel/providers/hula/camel-hula-provider.c:55
-#: ../camel/providers/imap/camel-imap-provider.c:54
+#: ../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/hula/camel-hula-provider.c:57
-#: ../camel/providers/imap/camel-imap-provider.c:56
-msgid "Command:"
-msgstr "àààààà:"
+#: ../camel/providers/imap/camel-imap-provider.c:52
+msgid "Co_mmand:"
+msgstr "àààààà (_m):"
 
-#: ../camel/providers/hula/camel-hula-provider.c:60
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:43
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
+#: ../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/hula/camel-hula-provider.c:62
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:45
+#: ../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/hula/camel-hula-provider.c:64
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:47
+#: ../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/hula/camel-hula-provider.c:66
-msgid "Namespace"
-msgstr "ààà-ààààà"
-
-#: ../camel/providers/hula/camel-hula-provider.c:76
-msgid "Hula"
-msgstr "Hula"
+msgstr "ààààààà àààààà àààààà ààààààà ààà-ààààà àààààààà ààà à'à (_v)"
 
-#: ../camel/providers/hula/camel-hula-provider.c:78
-msgid "For accessing Hula servers"
-msgstr "Hula àààà àààààààà ààààààààà"
-
-#: ../camel/providers/hula/camel-hula-provider.c:95
-msgid "This option will connect to the Hula server using a plaintext password."
-msgstr "àà àààààààà ààà ààà àààààà-àààààà ààààààààà àààààà Hula àààààà àààà ààààà ààà à'àà"
-
-#: ../camel/providers/imap/camel-imap-command.c:181
-#: ../camel/providers/imap/camel-imap-command.c:265
-msgid "No output stream"
-msgstr "àààààà ààààààà ààààààààà"
-
-#: ../camel/providers/imap/camel-imap-command.c:186
-#: ../camel/providers/imap/camel-imap-command.c:270
-msgid "No input stream"
-msgstr "ààààà ààààààà ààààààààà"
-
-#: ../camel/providers/imap/camel-imap-command.c:229
-#: ../camel/providers/imap/camel-imap-command.c:278
-#: ../camel/providers/imap/camel-imap-command.c:492
-#: ../camel/providers/imap/camel-imap-store.c:3051
-msgid "Operation cancelled"
-msgstr "àààà ààààà ààà àààà"
+#: ../camel/providers/imap/camel-imap-provider.c:62
+msgid "Names_pace:"
+msgstr "ààà-àààààà (_p):"
 
-#: ../camel/providers/imap/camel-imap-command.c:331
-#: ../camel/providers/imap/camel-imap-store.c:3056
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "àààààà àààà ààààààààààà àààà ààààà ààààààààà ààà àààà: %s"
+#: ../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 "àààààà"
 
-#. 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:352
-#, c-format
-msgid ""
-"Alert from IMAP server %s %s:\n"
-"%s"
+#: ../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 ""
-"IMAP àààà %s %sà ààà ààààààà ààààààààààà:\n"
-"%s"
-
-#: ../camel/providers/imap/camel-imap-command.c:421
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "IMAP ààààà ààà ààààààà ààààààààààà ààààààààààà: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:431
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "IMAP àààààà àààà: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:506
-msgid "Server response ended too soon."
-msgstr "ààààà ààà ààààààà àààààààààà ààà ààààà àààààà ààààà"
-
-#: ../camel/providers/imap/camel-imap-command.c:712
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "IMAP ààààà ààà ààààààà àààààààààààà àààà %s ààààààààà àààà ààààààààà"
-
-#: ../camel/providers/imap/camel-imap-command.c:748
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "IMAP ààààà ààà ààààààààààà OK ààààààààààà: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:91
-msgid "Always check for new mail in this folder"
-msgstr "ààààààà àààààààà ààààà àààààà àààà ààààààà àààààààà ààààààààà ààà ààà"
-
-#: ../camel/providers/imap/camel-imap-folder.c:277
-#, 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:919
-#, c-format
-msgid "Scanning for changed messages in %s"
-msgstr "%s'à ààààà ààààààààà àààààà ààààààà ààà àààà"
-
-#: ../camel/providers/imap/camel-imap-folder.c:1987
-#, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr "APPEND àààààààà ààà ààààààààààà àààààààààààà àààààà '%s'"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2002
-msgid "No response on continuation after APPEND command"
-msgstr "APPEND àààààààà ààà àààà ààààààà ààààààààà àààà ààààààààààà ààààààà àààà"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2047
-msgid "Unknown error occurred during APPEND command!"
-msgstr "APPEND àààààà ààààààààààà ààààà àààààà àààà àààààà!"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2878
-#, c-format
-msgid "Unable to retrieve message: %s"
-msgstr "àààààà àààààà ààà ààààà: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2913
-#, c-format
-msgid "Cannot get message with message ID %s: %s"
-msgstr "%s ID àà àààààà ààààààà àààà àààààà: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2914
-msgid "No such message available."
-msgstr "àà àààà àààà àààààà ààààààà àààà"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2975
-#: ../camel/providers/imap/camel-imap-folder.c:3808
-#: ../camel/providers/nntp/camel-nntp-folder.c:238
-msgid "This message is not currently available"
-msgstr "ààààààà àààààà àààààààà àààààà ààà"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3624
-#, c-format
-msgid "Incomplete server response: no information provided for message %d"
-msgstr "ààààà ààà ààààààà ààààààààààà ààààààààà: àààààà %d ààààààààà àààà àààà ààààààà ààà"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3632
-#, c-format
-msgid "Incomplete server response: no UID provided for message %d"
-msgstr "ààààà ààà ààààààà ààààààààààà ààààààààà: àààààà %d'à UID ààààààà ààà"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3846
-msgid "Could not find message body in FETCH response."
-msgstr "FETCH àààààà àààààààààààà ààààà ààààààà àààààà ààà àààààààààà"
+"ààààààà àààààà àààààààà àààà ààà àààà ààààààà àààààààà ààààààààà àààààà ààà à'à (_A)"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:181
-#: ../camel/providers/imap/camel-imap-message-cache.c:244
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "àààààà ààààààààà àààà ààààà: %s"
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:330
-#: ../camel/providers/imap/camel-imap-message-cache.c:387
-#: ../camel/providers/imap/camel-imap-message-cache.c:418
-#: ../camel/providers/imap/camel-imap-message-cache.c:450
-#, c-format
-msgid "Failed to cache message %s: %s"
-msgstr "àààààà %s àààààà ààà ààààà: %s"
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:530
-#, c-format
-msgid "Failed to cache %s: %s"
-msgstr "%s àààààà àààààà àààààà: %s"
-
-#: ../camel/providers/imap/camel-imap-provider.c:48
-msgid "Ch_eck for new messages in subscribed folders"
-msgstr "ààààààààààà ààà àààààààà ààààà àààà ààààààà àààààààà ààààààà ààà ààà (_h)"
-
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:49
-msgid "Namespace:"
-msgstr "ààà-ààààà:"
+#: ../camel/providers/imap/camel-imap-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
+msgid "Check new messages for Jun_k contents"
+msgstr "àààà ààààààà àààà àààààààà àààààà ààààààà ààà à'à (_k)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:53
-msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "ààààààà àààààà àààààà àààààà àààà ààààààà ààààààà àààààà ààà à'à (_A)"
+#: ../camel/providers/imapx/camel-imapx-provider.c:78
+msgid "Only check for Junk messages in the IN_BOX folder"
+msgstr "INBOX (àààààà) àààààààà ààà àààààààà àààààà (Junk) ààààààà ààà à'à(_B)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:72
-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:59
+#: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Automatically synchroni_ze remote mail locally"
-msgstr "àààààààààààààà àààààààà àààààà ààààààààààà àààààà ààà à'à (_z)"
+msgstr "àààààààààààààà àààààààà àààààà ààààààààààà àààà ààààààà ààà à'à (_z)"
+
+#: ../camel/providers/imap/camel-imap-provider.c:78
+msgid "IMAP default port"
+msgstr "IMAP ààààààààà ààààà"
 
-#: ../camel/providers/imap/camel-imap-provider.c:83
+#: ../camel/providers/imap/camel-imap-provider.c:79
+#: ../camel/providers/imapx/camel-imapx-provider.c:87
+msgid "IMAP over SSL"
+msgstr "SSL -à àààà IMAP"
+
+#: ../camel/providers/imap/camel-imap-provider.c:85
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c: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
-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:210
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP àààà %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:439
-#: ../camel/providers/imap4/camel-imap4-store.c:212
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%s'à àààà IMAP ààààààà, %s'à ààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:568
-#: ../camel/providers/imap/camel-imap-store.c:583
-#: ../camel/providers/imap4/camel-imap4-store.c:247
-#: ../camel/providers/imap4/camel-imap4-store.c:262
-#: ../camel/providers/nntp/camel-nntp-store.c:182
-#: ../camel/providers/nntp/camel-nntp-store.c:197
-#: ../camel/providers/pop3/camel-pop3-store.c:170
-#: ../camel/providers/pop3/camel-pop3-store.c:184
-#: ../camel/providers/smtp/camel-smtp-transport.c:259
-#: ../camel/providers/smtp/camel-smtp-transport.c:274
-#, c-format
-msgid "Could not connect to %s: %s"
-msgstr "%s'à àààà ààààà àààààà àààààà: %s"
+#: ../camel/providers/imap/camel-imap-provider.c:105
+#: ../camel/providers/imapx/camel-imapx-provider.c:113
+#: ../camel/providers/nntp/camel-nntp-provider.c:80
+#: ../camel/providers/pop3/camel-pop3-provider.c:81
+msgid "Password"
+msgstr "àààààààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:569
-#: ../camel/providers/imap4/camel-imap4-store.c:248
-#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/pop3/camel-pop3-store.c:171
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
-msgid "SSL unavailable"
-msgstr "SSL àààààà ààà"
+#: ../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: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:224
+#: ../camel/providers/imap/camel-imap-store.c:2601
+#: ../camel/providers/imapx/camel-imapx-store.c:340
+#: ../camel/providers/imapx/camel-imapx-store.c:796
+#: ../camel/providers/local/camel-maildir-folder.c:464
+#: ../camel/providers/local/camel-maildir-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:619
+#: ../camel/providers/local/camel-maildir-store.c:625
+#: ../camel/providers/local/camel-maildir-store.c:711
+#: ../camel/providers/local/camel-spool-store.c:328
+msgid "Inbox"
+msgstr "àààààà"
 
-#: ../camel/providers/imap/camel-imap-store.c: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:310
-#: ../camel/providers/imap4/camel-imap4-store.c:325
-#: ../camel/providers/imap4/camel-imap4-store.c:334
+#: ../camel/providers/imap/camel-imap-store.c:356
+#: ../camel/providers/imap/camel-imap-store.c:383
+#: ../camel/providers/imap/camel-imap-store.c:410
+#: ../camel/providers/imapx/camel-imapx-server.c:3042
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "àààààà àààà IMAP àààà %s'à àààà ààààà àààààà àààààà: %s"
+msgstr "àààààà àààà IMAP ààààààà %s'à àààà ààààà àààààà àààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:692
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
+#: ../camel/providers/imap/camel-imap-store.c:357
+#: ../camel/providers/imapx/camel-imapx-server.c:3043
+#: ../camel/providers/smtp/camel-smtp-transport.c:192
 msgid "STARTTLS not supported"
 msgstr "STARTTLS ààààààà ààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:711
-msgid "SSL negotiations failed"
-msgstr "SSL ààààààà àààààà àààààà"
+#: ../camel/providers/imap/camel-imap-store.c:376
+#: ../camel/providers/imapx/camel-imapx-server.c:3081
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: "
+msgstr "IMAP ààààààà %s àà àààààààà ààààààà ààààà àààààà àààààà: "
 
-#: ../camel/providers/imap/camel-imap-store.c:717
-#: ../camel/providers/imap4/camel-imap4-store.c:335
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
+#: ../camel/providers/imap/camel-imap-store.c:384
+#: ../camel/providers/smtp/camel-smtp-transport.c:238
 msgid "SSL is not available in this build"
-msgstr "ààààààà ààààààà ààààà SSL àààààà ààà"
+msgstr "ààààààà ààààààà àààà SSL àààààà ààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:865
+#: ../camel/providers/imap/camel-imap-store.c:709
+#: ../camel/providers/imapx/camel-imapx-server.c:3176
 #, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "\"%s\" àààààà àààààà ààààà àààààà àààààà: %s"
+msgid "IMAP server %s does not support requested authentication type %s"
+msgstr "IMAP ààààààà %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:356
-#: ../camel/providers/imap4/camel-imap4-store.c:1403
-#: ../camel/providers/local/camel-maildir-folder.c:80
-#: ../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:463
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
-msgid "Inbox"
-msgstr "àààààà"
+#: ../camel/providers/imap/camel-imap-store.c:720
+#: ../camel/providers/imapx/camel-imapx-server.c:3189
+#: ../camel/providers/smtp/camel-smtp-transport.c:350
+#, c-format
+msgid "No support for authentication type %s"
+msgstr "àààààààààà àààààààà %s ààààààà ààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:1305
+#: ../camel/providers/imap/camel-imap-store.c:731
+#: ../camel/providers/smtp/camel-smtp-transport.c:363
 #, c-format
-msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "IMAP àààà %s'à àààààà àààààà ààà ààààààà ààààààà %s ààààààà ààà"
+msgid "Error creating SASL authentication object."
+msgstr "SASL ààààààààààà ààààà ààààààà àààààà ààààààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:1315
-#: ../camel/providers/smtp/camel-smtp-transport.c:506
+#: ../camel/providers/imap/camel-imap-store.c:779
+#: ../camel/providers/imapx/camel-imapx-server.c:3234
 #, c-format
-msgid "No support for authentication type %s"
-msgstr "ààààààà àààààààà %s ààààààà ààà"
+msgid "You did not enter a password."
+msgstr "àààààààà àààààà ààà àààà àààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:1389
+#: ../camel/providers/imap/camel-imap-store.c:820
+#: ../camel/providers/imapx/camel-imapx-server.c:3279
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
 "%s\n"
 "\n"
 msgstr ""
-"IMAP ààààà ààààààà àààààà ààààààà\n"
+"IMAP ààààà àààààààààà àààààà ààààààà\n"
 "%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:954
-#, 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
+#: ../camel/providers/imap/camel-imap-store.c:878
+#: ../camel/providers/imapx/camel-imapx-store.c:144
 #, c-format
-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/imap/camel-imap-store.c:3053
-#| msgid "Server unexpectedly disconnected: %s"
-msgid "Server unexpectedly disconnected"
-msgstr "àààààà àààà ààààààààààà àààà ààààà ààààààààà ààà àààà"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:572
-#: ../camel/providers/imap4/camel-imap4-command.c:579
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "IMAP àààà %s'à àààààà ààààà àààààà àààààà: %s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:681
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "IMAP4 àààà %sà ààà ààààààààààà ààààààààààà ààààààà àààà: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:215
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "IMAP àààà %sà ààà ààààààààààà ààààààà ààààààà ààààà"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:440
-#, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr "'%s' ààààààà àààààààà àààà àààààà: àààà-àààààà ààà ààà ààà"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:446
-#, c-format
-msgid "Cannot select folder '%s': Bad command"
-msgstr "'%s' ààààààà àààààààà àààà àààààà: àààààà àààà ààà"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1414
-#, c-format
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr "IMAP àààà %s'à àààààà ààààà àààà àààààà: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1416
-msgid "service unavailable"
-msgstr "ààààààà àààààà ààà"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1546
-#: ../camel/providers/imap4/camel-imap4-engine.c:1584
-#: ../camel/providers/imap4/camel-imap4-engine.c:1628
-#: ../camel/providers/imap4/camel-imap4-engine.c:1683
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "IMAP4 àààà %s'à àààà ààààààààààààààà ààààà ààààààààà àààà: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:87
-msgid ""
-"Enable extended Mailing-List detection required for some filter and vFolder "
-"rules"
-msgstr ""
-"àààààà ààààààà àààà vFolder àààààà àààà àààààà-ààààà ààààààààààà ààààà àààààààà "
-"àààààà àààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:88
-msgid "Expire cached messages that haven't been read in X seconds"
-msgstr "X ààààààààà ààààà ààà àà àààà ààààààà àààààààààààà ààààààààààààà àààà ààààà ààà ààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
-msgid "Expire cached messages older than X seconds"
-msgstr "X ààààààààà àààà àààààà ààààààà àààààààààààà ààààààààààààà àààà ààààà ààà ààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:427
-#, c-format
-msgid "Cannot access folder '%s': %s"
-msgstr "'%s' ààààààà ààààààà àààà àààààà: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:484
-#, c-format
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr "ààààààà '%s'-à àààà ààààààà àààààà (sync) àààà àààààà: ààààà àààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:490
-#, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr "ààààààà '%s'-à àààà ààààààà àààààà (sync) àààà àààààà: àààààà àààà ààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:630
-#, c-format
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "'%s' àààààààà ààààààààà àààààààààà ààààà àààà àààààà: ààààà àààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:635
-#, c-format
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "'%s' àààààààà ààààààààà àààààààààà ààààà àààà àààààà: àààààà àààà ààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:891
-#, c-format
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr "àààààà %s, ààààààà '%s' àààà ààààààà àààà àààààà: àà àààà àààààà ààààààààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:896
-#, c-format
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr "àààààà %s, ààààààà '%s' àààà ààààààà àààà àààààà: àààààà àààà ààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:940
-#, c-format
-msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr "ààààààà '%s'-à àààà àààààà ààà àààà àààààà: ààààààà ààààààààà àààààààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1033
-#, c-format
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "ààààààà '%s'-à àààà àààààà ààà àààà àààààà: ààààà àààààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1063
-#, c-format
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr "ààààààà '%s'-à àààà àààààà ààà àààà àààààà: àààààà àààà ààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1182
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-msgstr "ààààààà '%s' àààà '%s' àààààààà àààààà àààààààààà àààà àààààà: ààààà àààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1186
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-msgstr "ààààààà '%s' àààà '%s' àààààààà àààààà ààà àààà àààààà: ààààà àààà"
+msgid "IMAP server %s"
+msgstr "IMAP ààààààà %s"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1194
+#: ../camel/providers/imap/camel-imap-store.c:881
+#: ../camel/providers/imapx/camel-imapx-store.c:147
 #, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr "ààààààà `%s'à ààà `%s' àààààààà àààààà àààààààààà àààààà àààààà: àààààà àààà ààà"
+msgid "IMAP service for %s on %s"
+msgstr "%s'à àààà IMAP ààààààà, %s'à ààà"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1198
+#: ../camel/providers/imap/camel-imap-store.c:1972
+#: ../camel/providers/imap/camel-imap-store.c:2176
+#: ../camel/providers/imapx/camel-imapx-store.c:315
 #, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-msgstr "ààààààà `%s'à ààà `%s' àààààààà àààààà ààà àààààà àààààà: àààààà àààà ààà"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:55
-msgid "Check new messages for _Junk contents"
-msgstr "àààà ààààààà ààààà àààààààà àààààà ààààààà ààà à'à (_J)"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:57
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "àààààà àààààààà ààààà ààà àààààààà àààààà ààààààà ààà à'à (_g)"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:66
-msgid "IMAP4rev1"
-msgstr "IMAP4rev1"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:68
-msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr "IMAPv4rev1 ààààà àààààà àààà à ààààààààà àààààààààà"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:85
-msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"àà àààààààà ààà ààà àààààà-àààààà ààààààààà àààààà IMAPv4rev1 àààààà àààà ààààà "
-"ààà à'àà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:259
-#: ../camel/providers/imapp/camel-imapp-store.c:249
-#: ../camel/providers/nntp/camel-nntp-store.c:194
-#: ../camel/providers/nntp/camel-nntp-store.c:213
-#: ../camel/providers/pop3/camel-pop3-store.c:181
-#: ../camel/providers/smtp/camel-smtp-transport.c:271
-msgid "Connection canceled"
-msgstr "ààààà ààààà ààà àààà"
+msgid "No such folder %s"
+msgstr "%s'à àààààà àààà ààààààà ààààààà ààà"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:296
+#: ../camel/providers/imap/camel-imap-store.c:1986
+#: ../camel/providers/imap/camel-imap-store.c:2445
+#: ../camel/providers/imapx/camel-imapx-store.c:1327
 #, c-format
 msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"àààààà àààà IMAP àààà %s'à àààà ààààà àààààà àààààà: àààà àààààà STARTTLS àààààà "
-"ààà àà àà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:326
-#: ../camel/providers/pop3/camel-pop3-store.c:249
-msgid "TLS negotiations failed"
-msgstr "TLS ààààààà àààààà àààààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:411
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr "IMAP àààà %s'à ààààà %s ààààààà ààààààà àààààà ààààààà àààààà àààààà"
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "\"%s\" àààààààà àààà àààà àààà ààààà \"%c\" ààààààà ààààà ààà àà ààà ààà"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:534
+#: ../camel/providers/imap/camel-imap-store.c:2050
+#: ../camel/providers/imap/camel-imap-store.c:2509
+#: ../camel/providers/imapx/camel-imapx-store.c:1348
 #, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "IMAP àààà %s'à ààààà %s àààààà ààààààà àààààà àààààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:697
-#: ../camel/providers/imap4/camel-imap4-store.c:964
-msgid "Cannot create IMAP folders in offline mode."
-msgstr "àà-àààà ààààààà IMAP ààààààà ààààààà àààààà ààààààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:736
-#, c-format
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr "'%s' àààà ààààààààà IMAP àààà %s àààà ààààààà àààà àààààà: ààààà àààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:816
-#, c-format
-msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-msgstr "'%s'-à àààà IMAP àààà %s àààà LIST ààààààààà àààà ààààààà àààà àààààà: %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-msgid "Bad command"
-msgstr "àààààà àààà ààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:897
-#, c-format
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr "'%s' ààààààà ààààààà àààà àààààà: àààà-àààààà ààà ààà ààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:902
-#, c-format
-msgid "Cannot create folder '%s': Bad command"
-msgstr "'%s' ààààààà ààààààà àààà àààààà: àààààà àààà ààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1008
-#, c-format
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "'%s' ààààààà àààà ààààà àààààà: ààààà ààààààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1015
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr "àà-àààà ààààààà IMAP ààààààà àààà àààà àààà ààà"
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "ààààààààà àààààààààà àààà ààà-ààààààà ààààààà ààà ààààà"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1074
+#: ../camel/providers/imap/camel-imap-store.c:2103
+#: ../camel/providers/local/camel-maildir-store.c:244
+#: ../camel/providers/local/camel-mbox-store.c:424
+#: ../camel/providers/local/camel-mh-store.c:550
 #, c-format
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "'%s' ààààààà àààà ààààà àààààà: àààà-àààààà ààà ààà ààà"
+msgid "Cannot create folder '%s': folder exists."
+msgstr "`%s' ààààààà ààààààà àààààà àààààà: ààààààà àààààààà àààààààà"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
+#: ../camel/providers/imap/camel-imap-store.c:2458
+#: ../camel/providers/imapx/camel-imapx-store.c:1338
 #, c-format
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "'%s' ààààààà àààà ààààà àààààà: àààààà àààà ààà"
+msgid "Unknown parent folder: %s"
+msgstr "ààààààààà ààààààà âàààààà: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1099
+#: ../camel/providers/imap/camel-imap-store.c:3235
 #, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "àààààààà ààà '%s' àààà '%s'-à àààààààà ààà àààà àà: ààààà ààààààà"
+msgid "Server unexpectedly disconnected"
+msgstr "àààààà àààà ààààààààààà àààà ààààà ààààààààà ààà àààà"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1106
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "àà-àààà ààààààà IMAP àààààààà ààà àààààààà ààà àààà ààà"
+#: ../camel/providers/imap/camel-imap-store.c:3238
+msgid "Server unexpectedly disconnected: "
+msgstr "ààààààà ààààààààààààààà ààààààààà àà: "
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1137
+#: ../camel/providers/imapx/camel-imapx-folder.c:91
 #, c-format
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-msgstr "àààààààà ààà '%s' àààà '%s'-à àààààààà ààà àààà àà: àààà-àààààà ààà ààà ààà"
+msgid "Could not create folder summary for %s"
+msgstr "%s -à àààà ààààààà àààààà àààààà àààà àààààà"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
+#: ../camel/providers/imapx/camel-imapx-folder.c:99
 #, c-format
-msgid "Cannot rename folder '%s' to '%s': Bad command"
-msgstr "àààààààà ààà '%s' àààà '%s'-à àààààààà ààà àààà àà: àààààà àààà ààà"
+msgid "Could not create cache for %s: "
+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:1572
-#, c-format
-msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-msgstr "%s àààà, '%s' ààààààà ààààààààà IMAP àààà %s àààà ààààààà àààà àààààà: %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:1633
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "àà-àààà ààààààà IMAP àààààààà ààà-àààààààà ààà ààààà àààà"
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
+msgid "Use I_dle if the server supports it"
+msgstr "ààà ààààààà ààà ààà àààààààà àààà àààààà ààà (_d)"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1678
-#, c-format
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr "'%s' àààààààà ààà-àààààààà àààà àààààà: àààà-àààààà ààà ààà ààà"
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "Command:"
+msgstr "àààààà:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, c-format
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "'%s' àààààààà ààà-àààààààà àààà àààààà: àààààà àààà ààà"
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
+msgid "Numbe_r of cached connections to use"
+msgstr "ààààààà àààààà ààààà àààààààààà àààààà (_r)"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1705
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr "àà-àààà ààààààà IMAP àààààààà ààà àà-ààààààààààà ààà ààààà àààà"
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
+msgid "Namespace:"
+msgstr "ààà-ààààà:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1750
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr "'%s' àààààààà àà-ààààààààààà àààà àààààà: àààà-àààààà ààà ààà ààà"
+#: ../camel/providers/imapx/camel-imapx-provider.c:86
+msgid "Default IMAP port"
+msgstr "ààààààààà IMAP ààààà "
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr "'%s' àààààààà àà-ààààààààààà àààà àààààà: àààààà àààà ààà"
+#: ../camel/providers/imapx/camel-imapx-provider.c:94
+msgid "IMAP+"
+msgstr "IMAP+"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1590
-msgid "Scanning for changed messages"
-msgstr "ààààààààà àààààà ààààààà ààà àààà"
+#: ../camel/providers/imapx/camel-imapx-server.c:1504
+msgid "Error writing to cache stream: "
+msgstr "ààààà ààààààààà àààààà àààààà:"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1611
+#: ../camel/providers/imapx/camel-imapx-server.c:2214
 #, c-format
-msgid "IMAP server %s is in an inconsistent state."
-msgstr "IMAP àààà %s àààààà ààààààà àààààà"
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1638
-msgid "Fetching envelopes of new messages"
-msgstr "àààà ààààààà ààà ààààààà ààà àààà"
+msgid "Not authenticated"
+msgstr "àààààààà ààà"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:429
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "IMAP àààà %sà ààà ààààààà àààààààààààà ààààà ààààààààààà ààààà ààààààà: "
+#: ../camel/providers/imapx/camel-imapx-server.c:3452
+msgid "Closing tmp stream failed: "
+msgstr "tmp ààààààà àààà ààà àààààà àà: "
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:452
-msgid "No data"
-msgstr "ààààààààà"
+#: ../camel/providers/imapx/camel-imapx-server.c:5490
+#: ../camel/providers/imapx/camel-imapx-server.c:5505
+msgid "Cannot create spool file: "
+msgstr "ààààà ààààààà àààààà àààà àààààà: "
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:613
+#: ../camel/providers/imapx/camel-imapx-store.c:1115
+#: ../camel/providers/nntp/camel-nntp-store.c:1713
 #, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "IMAP àààà %s'à ààààà ààààààààààààààà ààààà ààààààààà àààà: %s"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
-msgid "Message storage"
-msgstr "àààààà àààààà"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:49
-msgid "IMAP+"
-msgstr "IMAP+"
-
-#: ../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"
+msgid "No such folder: %s"
+msgstr "àà àààà ààààààà ààààààà ààà: %s"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:252
+#: ../camel/providers/imapx/camel-imapx-stream.c:70
 #, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "%s'à (ààààà %s) àààà ààààà àààààà àààààà: %s"
+msgid "Source stream returned no data"
+msgstr "ààà àààààààà àààà àààà ààààà àààààà"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:348
+#: ../camel/providers/imapx/camel-imapx-stream.c:79
 #, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "%s'à ààà POP àààààà àààà ààààà àààààà àààààà"
+msgid "Source stream unavailable"
+msgstr "ààà ààààààà àààààà ààà"
 
 #: ../camel/providers/local/camel-local-folder.c:178
-msgid "Index message body data"
-msgstr "ààààààà ààààààà àààààà ààààà àààà"
-
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:399
-#: ../camel/providers/local/camel-local-folder.c:402
+#: ../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)"
 msgstr "àààà-àààà:%s (%s)"
 
-#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:406
+#: ../camel/providers/local/camel-local-folder.c:206
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-provider.c:48
+#: ../camel/providers/local/camel-local-folder.c:473
+msgid "Index message body data"
+msgstr "ààààààà ààààààà àààààà ààààà àààà"
+
+#: ../camel/providers/local/camel-local-folder.c:704
+#, c-format
+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-àààààà àààà àààààààààà ààààà ààààààà àààà ààààààààà àààààààààà"
+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-ààààààààà àààààà ààà Evolution àààààà àààààààà àààààààà ààààà ààààààà "
+"àààààà mbox-ààààààààà àààààà ààà Evolution àààààà àààààààà àààààààà àààà ààààààà "
 "àààà àààààà (àààààààà) àààààà àààààààà"
 
-#: ../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"
-msgstr "INBOX àààààààà ààà àààà ààààààà ààààààà àààààà ààà ààà (_A)"
+msgstr "INBOX àààààààà ààà àààà ààààààà ààààààààà àààààà ààà ààà (_A)"
 
-#: ../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 àààààààààà ààààà ààààààà àààà ààààààààà àààààààààà"
+msgstr "maildir àààààààààà àààà ààààààà àààà ààààààààà àààààààààà"
 
 #: ../camel/providers/local/camel-local-provider.c:108
 msgid "_Store status headers in Elm/Pine/Mutt format"
@@ -3616,215 +3419,236 @@ 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 ""
-"àààààààà àààààà mbox ààààà àààààààà ààààà ààààààà àààà ààààààà ààà à ààààààààà ààààà\n"
+"àààààààà àààààà mbox ààààà àààààààà àààà ààààààà àààà ààààààà ààà à ààààààààà ààààà\n"
 "Elm, Pine àààà Mutt ààààààààà àààààààà àààà àààà ààààà ààààààà ààà ààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../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:128
+#: ../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:542
+#: ../camel/providers/local/camel-spool-store.c:574
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "àààààààààààà root %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 "àààààààààààà root %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 "ààààààà àààààààààààà ààààà àààààà ààààààààà"
+msgstr "ààààààà àààààààààààà àààà àààààà ààààààààà"
 
-#: ../camel/providers/local/camel-local-store.c:247
+#: ../camel/providers/local/camel-local-store.c:435
+#: ../camel/providers/local/camel-mbox-store.c:716
 #, 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:746
 #, 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
+#: ../camel/providers/local/camel-local-summary.c:569
 #, c-format
-msgid "Could not delete folder index file '%s': %s"
-msgstr "ààààààà ààààààà àààà '%s' àààà ààààà àààààà: %s"
+msgid "Unable to add message to summary: unknown reason"
+msgstr "àààààà àààààà àààà àààààà ààà àààààà àààààà: âàààààà àààà"
 
-#: ../camel/providers/local/camel-local-store.c:458
-#: ../camel/providers/local/camel-mbox-store.c:324
+#: ../camel/providers/local/camel-maildir-folder.c:100
+#: ../camel/providers/local/camel-maildir-folder.c:333
+#: ../camel/providers/local/camel-mbox-folder.c:117
+#: ../camel/providers/local/camel-mbox-folder.c:325
+#: ../camel/providers/local/camel-mh-folder.c:156
+msgid "No such message"
+msgstr "àà àààà àààà àààààà ààààààà ààà"
+
+#: ../camel/providers/local/camel-maildir-folder.c:223
 #, c-format
-msgid "Could not delete folder meta file '%s': %s"
-msgstr "àààààààà àààà àààà '%s' àààà ààààà àààààà: %s"
+msgid "Cannot append message to maildir folder: %s: "
+msgstr "maildir ààààààà: %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:229
-msgid "Maildir append message canceled"
-msgstr "Maildir'à àààààà ààà àààà ààààà ààà àààà"
-
-#: ../camel/providers/local/camel-maildir-folder.c:232
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "maildir àààààààà àààààà ààà àààààà àààààà: %s: %s"
-
-#: ../camel/providers/local/camel-maildir-folder.c:254
-#: ../camel/providers/local/camel-maildir-folder.c:280
-#: ../camel/providers/local/camel-maildir-folder.c:294
-#: ../camel/providers/local/camel-maildir-folder.c:303
-#: ../camel/providers/local/camel-mbox-folder.c:362
-#: ../camel/providers/local/camel-mbox-folder.c:413
-#: ../camel/providers/local/camel-mbox-folder.c:434
-#: ../camel/providers/local/camel-mbox-folder.c:465
-#: ../camel/providers/local/camel-mbox-folder.c:473
-#: ../camel/providers/local/camel-mh-folder.c:215
-#: ../camel/providers/local/camel-mh-folder.c:226
-#: ../camel/providers/local/camel-mh-folder.c:235
+#: ../camel/providers/local/camel-maildir-folder.c:271
+#: ../camel/providers/local/camel-maildir-folder.c:281
+#: ../camel/providers/local/camel-mbox-folder.c:386
+#: ../camel/providers/local/camel-mh-folder.c:168
+#: ../camel/providers/local/camel-mh-folder.c:178
 #, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"àààààà ààààààà ààà ààààà: %s, %s àààààààà ààà\n"
-"  %s"
+msgid "Cannot get message %s from folder %s: "
+msgstr "ààààààà %s -à ààà àààààà %s ààààààà àààà àààààà: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:304
-msgid "Invalid message contents"
-msgstr "ààààààà ààààààààà ààà ààà"
+#: ../camel/providers/local/camel-maildir-folder.c:351
+#, c-format
+msgid "Cannot transfer message to destination folder: %s"
+msgstr "ààààààà ààààààà ààààààà: %s -àà àààààààààà àààà àààààà"
 
-#: ../camel/providers/local/camel-maildir-store.c: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:100
+#, c-format
+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:728
+#, c-format
+msgid "Folder %s already exists"
+msgstr "ààààààà %s ààààààà ààààààà"
+
+#: ../camel/providers/local/camel-maildir-store.c:191
+#: ../camel/providers/local/camel-maildir-store.c:222
+#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:406
 #, c-format
 msgid "Cannot create folder '%s': %s"
-msgstr "ààààààà '%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:358
+#: ../camel/providers/local/camel-mh-store.c:505
 #, c-format
 msgid "Cannot get folder '%s': %s"
-msgstr "ààààààà '%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:368
+#: ../camel/providers/local/camel-mh-store.c:514
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
-msgstr "ààààààà '%s' ààààààà àààà àààààà: ààààààà àààààààà ààààààààà"
+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."
-msgstr "ààààààà '%s' ààààààà àààà àààààà: maildir ààààààààà àààà"
+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:652
 #, c-format
 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:330
-#: ../camel/providers/local/camel-spool-store.c:344
+#: ../camel/providers/local/camel-maildir-store.c:510
+#: ../camel/providers/local/camel-maildir-store.c:885
+#: ../camel/providers/local/camel-spool-store.c:161
+#: ../camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "Could not scan folder '%s': %s"
-msgstr "'%s' ààààààà ààààààà àààà àààààà: %s"
+msgstr "'%s' ààààààà ààààààà ààààà àààààà: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:437
-#: ../camel/providers/local/camel-maildir-summary.c:556
+#: ../camel/providers/local/camel-maildir-store.c:719
+#, c-format
+msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
+msgstr "ààààààà: %s àààà ààààààà àààà àààààà: ààààààà àààà ààà àààààà ààààà ààààààà"
+
+#: ../camel/providers/local/camel-maildir-summary.c:439
+#: ../camel/providers/local/camel-maildir-summary.c:571
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "maildir àààààààààà ààà ààààààà àààààà: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:549
+#: ../camel/providers/local/camel-maildir-summary.c:562
 msgid "Checking folder consistency"
 msgstr "àààààààà ààààààà ààààààà àààààààà"
 
-#: ../camel/providers/local/camel-maildir-summary.c:658
+#: ../camel/providers/local/camel-maildir-summary.c:655
 msgid "Checking for new messages"
 msgstr "àààà ààààààà àààààààà ààààààà ààà àààà"
 
-#: ../camel/providers/local/camel-maildir-summary.c:744
-#: ../camel/providers/local/camel-mbox-summary.c:526
-#: ../camel/providers/local/camel-mbox-summary.c:722
-#: ../camel/providers/local/camel-mbox-summary.c:842
-#: ../camel/providers/local/camel-spool-summary.c:150
+#: ../camel/providers/local/camel-maildir-summary.c:748
+#: ../camel/providers/local/camel-mbox-summary.c:485
+#: ../camel/providers/local/camel-mbox-summary.c:717
+#: ../camel/providers/local/camel-mbox-summary.c:863
+#: ../camel/providers/local/camel-spool-summary.c:131
 msgid "Storing folder"
 msgstr "ààààààà ààààààà ààà àààà"
 
-#: ../camel/providers/local/camel-mbox-folder.c:167
-#: ../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:231
+#: ../camel/providers/local/camel-mbox-folder.c:183
 #, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "àààà-àààà ààààààà àààààà: %s: %s\n"
+msgid "Cannot open mailbox: %s: "
+msgstr "àààààààà: %s ààààà àààààà:"
 
-#: ../camel/providers/local/camel-mbox-folder.c:297
-msgid "Mail append canceled"
-msgstr "àààà àààààà ààààà ààà àààà"
-
-#: ../camel/providers/local/camel-mbox-folder.c:300
+#: ../camel/providers/local/camel-mbox-folder.c:249
 #, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "mbox àààààààà àààà àààààà ààà àààààà àààààà: %s: %s"
+msgid "Cannot append message to mbox file: %s: "
+msgstr "mbox ààààààà: %s -àà àààààà àààààà àààà àààààà: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:466
+#: ../camel/providers/local/camel-mbox-folder.c:378
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "ààààààààà àààààààààà ààààààààààà àààà ààà àààààààààà ààà ààààà àààà"
 
-#: ../camel/providers/local/camel-mbox-folder.c:474
-#: ../camel/providers/local/camel-mh-folder.c:236
-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:380
+#: ../camel/providers/local/camel-mbox-store.c:550
+#, c-format
 msgid "Cannot create a folder by this name."
 msgstr "ààààààà ààà àààààà ààààààà ààààààà àààààà ààààààà"
 
-#: ../camel/providers/local/camel-mbox-store.c:198
+#: ../camel/providers/local/camel-mbox-store.c:417
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "'%s' ààààààà ààààààà ààà ààààà: ààààààààà àààà àààà"
 
-#: ../camel/providers/local/camel-mbox-store.c:228
-#: ../camel/providers/local/camel-mbox-store.c:239
-#: ../camel/providers/local/camel-mbox-store.c:262
+#: ../camel/providers/local/camel-mbox-store.c:566
+#, c-format
+msgid "Cannot create directory '%s': %s."
+msgstr "'%s' ààààààààà ààààààà ààààà àààààà: %sà"
+
+#: ../camel/providers/local/camel-mbox-store.c:582
+#, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "ààààààà ààààààà àààààà àààààà: %s: %s"
+
+#: ../camel/providers/local/camel-mbox-store.c:584
+msgid "Folder already exists"
+msgstr "ààààààà àààààààà ààààààà"
+
+#: ../camel/providers/local/camel-mbox-store.c:627
+#: ../camel/providers/local/camel-mbox-store.c:640
+#: ../camel/providers/local/camel-mbox-store.c:669
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3833,164 +3657,156 @@ msgstr ""
 "ààààààà '%s' àààà àààà ààààà:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:247
+#: ../camel/providers/local/camel-mbox-store.c:650
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "'%s' ààààààààà àààà àààà"
 
-#: ../camel/providers/local/camel-mbox-store.c:254
+#: ../camel/providers/local/camel-mbox-store.c:659
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
-msgstr "ààààààà '%s' ààààà àààà àààà àààà ààààà"
+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:686
+#: ../camel/providers/local/camel-mbox-store.c:701
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "ààààààà àààààà àààà '%s' àààà ààààà àààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:378
-#, c-format
-msgid "Cannot create directory '%s': %s."
-msgstr "'%s' ààààààààà ààààààà àààà àààààà: %sà"
-
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:783
 #, 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:799
 #, c-format
 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:882
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "'%s'à ààà %s'à àààààààà àààààà àààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:532
+#: ../camel/providers/local/camel-mbox-summary.c:495
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "ààààààà ààààààà àààààà: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:582
+#: ../camel/providers/local/camel-mbox-summary.c:556
 #, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "%ld àààààààà, %s àààààààà ààààà àààà àààààààààà ààààààààà àààààà àààààà"
+msgid "Fatal mail parser error near position %s in folder %s"
+msgstr "ààààààà %s -à ààààààà %s -à àààà àààààààà àààà àààààààà àààààà"
 
-#: ../camel/providers/local/camel-mbox-summary.c:659
+#: ../camel/providers/local/camel-mbox-summary.c:645
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "ààààààà ààààààà ààà ààààà: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:727
-#: ../camel/providers/local/camel-mbox-summary.c:847
-#: ../camel/providers/local/camel-spool-summary.c:155
+#: ../camel/providers/local/camel-mbox-summary.c:730
+#: ../camel/providers/local/camel-mbox-summary.c:872
+#: ../camel/providers/local/camel-spool-summary.c:138
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "ààààààà ààààààà àààààà: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:739
-#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-mbox-summary.c:744
+#: ../camel/providers/local/camel-spool-summary.c:153
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "ààààààà àààà-àààà ààààààà àààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:752
-#: ../camel/providers/local/camel-mbox-summary.c:956
+#: ../camel/providers/local/camel-mbox-summary.c:761
+#: ../camel/providers/local/camel-mbox-summary.c:988
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "ààà ààààààà %s àààà àààààà àààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:761
+#: ../camel/providers/local/camel-mbox-summary.c:772
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "ààààààà ààààààà àààà àààààà àààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:776
+#: ../camel/providers/local/camel-mbox-summary.c:789
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "àààààààà ààà àààààààà àààààà àààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:858
-#: ../camel/providers/local/camel-mbox-summary.c:1083
+#: ../camel/providers/local/camel-mbox-summary.c:886
+#: ../camel/providers/local/camel-mbox-summary.c:1153
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "ààààààà ààààààà àààààà àààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:897
-#: ../camel/providers/local/camel-mbox-summary.c:905
-#: ../camel/providers/local/camel-mbox-summary.c:1113
-#: ../camel/providers/local/camel-mbox-summary.c:1121
+#: ../camel/providers/local/camel-mbox-summary.c:925
+#: ../camel/providers/local/camel-mbox-summary.c:1184
+#, c-format
+msgid ""
+"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
+"it.)"
+msgstr ""
+"MBOX ààààààà ààààààààààà, ààààààà ààà àààà ààà àààà (ààà ààà àààà ààà ààà ààààà, "
+"àààààà àààà àààà)"
+
+#: ../camel/providers/local/camel-mbox-summary.c:934
+#: ../camel/providers/local/camel-mbox-summary.c:1193
+#, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "ààààààààà àààà à àààààààà ààààà, àààààààà (sync) ààààà"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1046
-#: ../camel/providers/local/camel-spool-summary.c:334
+#: ../camel/providers/local/camel-mbox-summary.c:1099
+#: ../camel/providers/local/camel-spool-summary.c:343
 #, c-format
 msgid "Unknown error: %s"
-msgstr "âàààààà àààààà: %s"
+msgstr "âàààààà àààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1189
-#: ../camel/providers/local/camel-mbox-summary.c:1215
+#: ../camel/providers/local/camel-mbox-summary.c:1263
+#: ../camel/providers/local/camel-mbox-summary.c:1293
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "ààààààà àààà-ààààà ààààà àààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1206
+#: ../camel/providers/local/camel-mbox-summary.c:1282
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "ààààààà àààà-ààààà ààààà àààààà: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:181
-msgid "MH append message canceled"
-msgstr "MH'à àààààà ààà àààà ààààà ààà àààà"
-
-#: ../camel/providers/local/camel-mh-folder.c:184
+#: ../camel/providers/local/camel-mh-folder.c:115
 #, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "mh àààààààà àààà àààààà ààà àààààà àààààà: %s: %s"
+msgid "Cannot append message to mh folder: %s: "
+msgstr "mh ààààààà: %s -àà àààààà àààààà àààà àààààà: "
 
-#: ../camel/providers/local/camel-mh-store.c:232
+#: ../camel/providers/local/camel-mh-store.c:525
 #, c-format
 msgid "Could not create folder '%s': %s"
-msgstr "ààààààà '%s' ààààààà àààà àààààà: %s"
+msgstr "ààààààà '%s' ààààààà ààààà àààààà: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:244
+#: ../camel/providers/local/camel-mh-store.c:542
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
-msgstr "ààààààà '%s' ààààààà àààà àààààà: ààààààààà àààà"
+msgstr "ààààààà '%s' ààààààà ààààà àààààà: ààààààààà àààà"
 
-#: ../camel/providers/local/camel-mh-summary.c:240
+#: ../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:134
-#, c-format
-msgid "Spool '%s' cannot be opened: %s"
-msgstr "ààààà '%s' ààààà àààààà: %s"
+#: ../camel/providers/local/camel-spool-store.c:350
+#, c-format
+msgid "Spool mail file %s"
+msgstr "ààààà àààà ààààààà %s"
 
-#: ../camel/providers/local/camel-spool-store.c:146
+#: ../camel/providers/local/camel-spool-store.c:353
 #, c-format
-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:165
+#: ../camel/providers/local/camel-spool-store.c:394
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "ààààààà '%s/%s' àààààààà àààààààààà"
 
-#: ../camel/providers/local/camel-spool-store.c:175
+#: ../camel/providers/local/camel-spool-store.c:408
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3999,144 +3815,206 @@ msgstr ""
 "ààààààà '%s' ààààà àààààà:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:179
+#: ../camel/providers/local/camel-spool-store.c:414
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "ààààààà '%s' àààààààà àààààààààà"
 
-#: ../camel/providers/local/camel-spool-store.c:184
+#: ../camel/providers/local/camel-spool-store.c:421
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
 "%s"
 msgstr ""
-"ààààààà '%s' ààààààà àààà àààààà:\n"
+"ààààààà '%s' ààààààà ààààà àààààà:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:192
+#: ../camel/providers/local/camel-spool-store.c:433
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "'%s' àààà-àààà àààà àààà"
 
-#: ../camel/providers/local/camel-spool-store.c:209
+#: ../camel/providers/local/camel-spool-store.c:481
+#, c-format
 msgid "Store does not support an INBOX"
 msgstr "ààààààààààà INBOX'à àààààààà ààààààà ààà"
 
-#: ../camel/providers/local/camel-spool-store.c:221
+#: ../camel/providers/local/camel-spool-store.c:495
 #, c-format
-msgid "Spool mail file %s"
-msgstr "ààààà àààà ààààààà %s"
+msgid "Spool folders cannot be deleted"
+msgstr "ààààà ààààààà àààà àààà ààààà"
 
-#: ../camel/providers/local/camel-spool-store.c:221
+#: ../camel/providers/local/camel-spool-store.c:510
 #, c-format
-msgid "Spool folder tree %s"
-msgstr "ààààà ààààààà àààà %s"
-
-#: ../camel/providers/local/camel-spool-store.c:229
 msgid "Spool folders cannot be renamed"
 msgstr "ààààà àààààààà ààà àààààààà ààà ààààà ààà"
 
-#: ../camel/providers/local/camel-spool-store.c:237
-msgid "Spool folders cannot be deleted"
-msgstr "ààààà ààààààà àààà àààà àààà àà"
+#: ../camel/providers/local/camel-spool-store.c:583
+#, c-format
+msgid "Spool '%s' cannot be opened: %s"
+msgstr "ààààà '%s' ààààà àààààà: %s"
+
+#: ../camel/providers/local/camel-spool-store.c:599
+#, c-format
+msgid "Spool '%s' is not a regular file or directory"
+msgstr "ààààà '%s' ààààààààà àààà àààà ààààààààà ààà"
 
-#: ../camel/providers/local/camel-spool-summary.c:180
-#: ../camel/providers/local/camel-spool-summary.c:190
-#: ../camel/providers/local/camel-spool-summary.c:200
+#: ../camel/providers/local/camel-spool-summary.c:169
+#: ../camel/providers/local/camel-spool-summary.c:181
+#: ../camel/providers/local/camel-spool-summary.c:193
 #, c-format
-msgid "Could not sync temporary folder %s: %s"
-msgstr "ààààààà ààààààà %s àààààà (sync) àààààà àààààà: %s"
+msgid "Could not synchronize temporary folder %s: %s"
+msgstr "ààààààà ààààààà %s ààààààà àààà àààààà: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:216
+#: ../camel/providers/local/camel-spool-summary.c:211
 #, c-format
-msgid "Could not sync spool folder %s: %s"
-msgstr "ààààà ààààààà %s àààààà (sync) ààà ààààà: %s"
+msgid "Could not synchronize spool folder %s: %s"
+msgstr "ààààà ààààààà %s ààààààà àààà àààààà: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:246
-#: ../camel/providers/local/camel-spool-summary.c:263
-#: ../camel/providers/local/camel-spool-summary.c:274
+#: ../camel/providers/local/camel-spool-summary.c:243
+#: ../camel/providers/local/camel-spool-summary.c:262
+#: ../camel/providers/local/camel-spool-summary.c:275
 #, c-format
 msgid ""
-"Could not sync spool folder %s: %s\n"
+"Could not synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in '%s'"
 msgstr ""
-"ààààà ààààààà %s àààààà (sync) ààà ààààà: %s\n"
-"ààààààà àààààà ààààààààààà, '%s'-à ààà ààààààà ààà ààààà"
+"ààààà ààààààà %s ààààààà àààà àààààà: %s\n"
+"ààààààà ààààààààààà àà àààà, ààà '%s' -à ààààààà ààà àààà"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:137
-#: ../camel/providers/nntp/camel-nntp-folder.c:194
-#: ../camel/providers/nntp/camel-nntp-folder.c:226
+#: ../camel/providers/nntp/camel-nntp-folder.c:213
+#: ../camel/providers/nntp/camel-nntp-folder.c:302
+#: ../camel/providers/nntp/camel-nntp-folder.c:424
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
-msgstr "àààààààààà àààààà: UID'à ààààààà àààà ààà: %s"
+msgstr "àààààààààà àààààà: UID'à ààààààà àààà ààà: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:263
+#: ../camel/providers/nntp/camel-nntp-folder.c:267
+#: ../camel/providers/pop3/camel-pop3-folder.c:431
+#: ../camel/providers/pop3/camel-pop3-folder.c:696
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "%s àààààà ààààààà àààààà àààààà: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:274
+#: ../camel/providers/nntp/camel-nntp-folder.c:449
+#: ../camel/providers/pop3/camel-pop3-folder.c:368
+#: ../camel/providers/pop3/camel-pop3-folder.c:420
+#: ../camel/providers/pop3/camel-pop3-folder.c:440
+#, c-format
+msgid "Cannot get message %s: "
+msgstr "àààààà %s ààààààà ààààà àààààà: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:367
-#: ../camel/providers/nntp/camel-nntp-folder.c:370
-#: ../camel/providers/nntp/camel-nntp-folder.c:412
-#: ../camel/providers/nntp/camel-nntp-folder.c:414
+#: ../camel/providers/nntp/camel-nntp-folder.c:508
+#: ../camel/providers/nntp/camel-nntp-folder.c:514
+#: ../camel/providers/nntp/camel-nntp-folder.c:561
 #, c-format
 msgid "Posting failed: %s"
 msgstr "ààààà àààààà àààààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:432
+#: ../camel/providers/nntp/camel-nntp-folder.c:556
+msgid "Posting failed: "
+msgstr "ààààààà àààààà àà: "
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:585
+#, c-format
 msgid "You cannot post NNTP messages while working offline!"
-msgstr "àà-àààà ààààààà NNTP àààààà ààààà ààà ààààà ààà!"
+msgstr "àà-àààà ààààààà NNTP àààààà ààààà ààà ààààà ààà!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:443
+#: ../camel/providers/nntp/camel-nntp-folder.c:605
+#, c-format
 msgid "You cannot copy messages from a NNTP folder!"
-msgstr "NNTP àààààààà ààà àààààà ààà ààà ààààà ààà!"
+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)"
+#: ../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 ""
 "ààààààààà àààààààà ààààààà àààààààà ààà ààà (àààààà comp.os.linux'à àààààààà c.o."
 "linux) (_S)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:48
+#: ../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 "ààààààààà NNTP ààààà"
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:53
+msgid "NNTP over SSL"
+msgstr "SSL -à àààà NNTP"
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:59
 msgid "USENET news"
 msgstr "USENET àààà"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:61
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "USENET àààààààààà àààààà ààà à ààààà àààààà ààààààà àààààà ààààààààà"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c: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:109
+#, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "ààààà àààààààààà àààààà àààààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:216
+#: ../camel/providers/nntp/camel-nntp-store.c:357
 #, c-format
-msgid "Could not read greeting from %s: %s"
-msgstr "%sà ààà ààààààà ààààààà àààà àààà: %s"
+msgid "Could not read greeting from %s: "
+msgstr "%s -à ààà ààààààà àààà àààààà: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:228
+#: ../camel/providers/nntp/camel-nntp-store.c:370
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
-msgstr "NNTP àààà %s àààààà àààà ààà %d àààààà àààà: %s"
+msgstr "NNTP ààààààà %s àààààà àààà ààà %d àààààà àààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:410
+#: ../camel/providers/nntp/camel-nntp-store.c:528
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s'à ààààààà USENET àààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:819
+#: ../camel/providers/nntp/camel-nntp-store.c:1060
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
 "\n"
 "%s"
 msgstr ""
-"àààà-ààààà àààààà àààààà àààààà:\n"
+"àààà-ààààà àààààà àààààà àààààà:\n"
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:913
+#: ../camel/providers/nntp/camel-nntp-store.c:1153
+#, c-format
+msgid "You cannot create a folder in a News store: subscribe instead."
+msgstr "àààà àààààààààààà ààààààà ààààààà àààààà àààààà: àààààààà ààà-àààààààà àààà"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1169
+#, c-format
+msgid "You cannot rename a folder in a News store."
+msgstr "àààà àààààààààààà àààà àààààààà ààà àààààààà ààà ààààà àààà"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1192
+#, c-format
+msgid "You cannot remove a folder in a News store: unsubscribe instead."
+msgstr ""
+"àààà àààààààààààà àààà ààààààà àààà àààà ààààà ààà: àààààààà àà-ààààààààààà àààà"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1338
+#, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -4146,7 +4024,8 @@ msgstr ""
 "\n"
 "àà ààààààààà ààààààà àààà ààààààààà ààààààà àààààà ààà ààààààààà àààààààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:945
+#: ../camel/providers/nntp/camel-nntp-store.c:1389
+#, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -4156,1290 +4035,1045 @@ msgstr ""
 "\n"
 "àààà-ààààà ààààààà ààà!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:970
-msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr "àààà àààààààààààà ààààààà ààààààà àààààà àààààà: àààààààà ààà-àààààààà àààà"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:978
-msgid "You cannot rename a folder in a News store."
-msgstr "àààà àààààààààààà ààààà àààààààà ààà àààààààà ààà ààààà àààà"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:986
-msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr "àààà àààààààààààà ààààà ààààààà àààà àààà ààààà ààà: àààààààà àà-ààààààààààà àààà"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1180
-msgid "Authentication requested but no username provided"
-msgstr "àààààààà àààààà àààààà àààà àààààà ààààààààààà àà àààààààà àààà"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1192
-#, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "ààààà ààààààà àààààà àààààà: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1582
+msgid "NNTP Command failed: "
+msgstr "NNTP  àààààà àààààà àà: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1315
+#: ../camel/providers/nntp/camel-nntp-store.c:1656
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP àààààà àààààààà àààà: %s"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1369
 msgid "Not connected."
 msgstr "ààààààà àààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1422
-#, c-format
-msgid "No such folder: %s"
-msgstr "àà àààà ààààààà ààààààà ààà: %s"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:272
-#: ../camel/providers/nntp/camel-nntp-summary.c:370
+#: ../camel/providers/nntp/camel-nntp-summary.c:240
+#: ../camel/providers/nntp/camel-nntp-summary.c:358
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: àààà àààààà ààààààà ààà àààà"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:279
+#: ../camel/providers/nntp/camel-nntp-summary.c:256
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "xoverà ààà ààààààààààà àààààà ààààààààààà ààààààà àààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:384
+#: ../camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "headà ààà ààààààààààà àààààà ààààààààààà ààààààà àààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:420
-msgid "Use cancel"
-msgstr "ààààà ààààààà ààà"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:422
+#: ../camel/providers/nntp/camel-nntp-summary.c:419
 #, c-format
 msgid "Operation failed: %s"
 msgstr "àààà àààà: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
-msgid "Retrieving POP summary"
-msgstr "POP'à ààààààààà àààà ààààààà ààà àààà"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
-#, c-format
-msgid "Cannot get POP summary: %s"
-msgstr "POP ààààààààà ààààààààà àààà ààààààà àààààà àààààà: %s"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:314
-msgid "Expunging old messages"
-msgstr "àààààà àààààà àààààààààà ààààà ààà àààà"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
-msgid "Expunging deleted messages"
-msgstr "àààà àààà àààààà àààààààààà ààààà ààà àààà"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:530
-#: ../camel/providers/pop3/camel-pop3-folder.c:552
+#: ../camel/providers/pop3/camel-pop3-folder.c:285
+#: ../camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "No message with UID %s"
 msgstr "UID %s àà àààà àààààà ààààààà ààà"
 
-#. 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
+#: ../camel/providers/pop3/camel-pop3-folder.c:352
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "POP àààààà %d àààààà ààà àààà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
+#: ../camel/providers/pop3/camel-pop3-folder.c:432
 msgid "Unknown reason"
 msgstr "âàààààà àààà"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-folder.c:472
+msgid "Retrieving POP summary"
+msgstr "POP'à ààààààààà àààà ààààààà ààà àààà"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:487
+msgid "Cannot get POP summary: "
+msgstr "POP àààààà ààààààà àààà àààààà: "
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:557
+msgid "Expunging old messages"
+msgstr "àààààà àààààà àààààààààà ààààà ààà àààà"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:569
+msgid "Expunging deleted messages"
+msgstr "àààà àààà àààààà àààààààààà ààààà ààà àààà"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
+msgid "Message Storage"
+msgstr "àààààà ààààààà"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
-msgstr "àààà àààà àààààà àààà àààà ààà àà (_L)"
+msgstr "ààààààà àààà àààààà àààà àààà ààà (_L)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#. 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)"
 msgstr "%s ààà àààààààààà ààà àààà àààà ààà (_D)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:49
+#: ../camel/providers/pop3/camel-pop3-provider.c:46
+msgid "Delete _expunged from local Inbox"
+msgstr "ààààààà ààààààà ààà àààààààààà ààà àààààà (_e)"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:48
 msgid "Disable _support for all POP3 extensions"
-msgstr "àààààààà POP3 àààààààààà àààà àààààà ààààààààà ààà ààà (_s)"
+msgstr "àààààààà POP3 àààààààààà àààà àààààà ààààààààà ààà ààà (_s)"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Default POP3 port"
+msgstr "ààààààààà POP3 ààààà"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
+msgid "POP3 over SSL"
+msgstr "SSL -à àààà POP3"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:62
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:59
+#: ../camel/providers/pop3/camel-pop3-provider.c:64
 msgid "For connecting to and downloading mail from POP servers."
-msgstr "àààààààà POP àààààà àààà ààààà à àààà àààààààà ààààà àààààààààà"
+msgstr "àààààààà POP àààààà àààà ààààà à àààà ààààà'à ààààà àààààààààà"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:76
+#: ../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 àààààà àààààà ààà àà àààààààà ààààààà ààà"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:86
+#: ../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 "
 "àààààà àààà ààààà ààà à'àà àààà àààààà àààààà àà ààààààààà ààààààà àààà àà "
-"ààààààààààààà àààà ààà ààààààà ààà ààà ààààà ààà ààààà"
+"àààààààààààààà àààà ààà ààààààà ààà ààà ààààà ààà ààààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:207
+#. 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:130
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
-msgstr "POP àààà %sà ààà ààààààà ààààààà àààà àààààà"
+msgstr "POP ààààààà %sà ààà ààààààà ààààààà àààà àààààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:224
-#: ../camel/providers/pop3/camel-pop3-store.c:238
-#: ../camel/providers/pop3/camel-pop3-store.c:248
-#: ../camel/providers/pop3/camel-pop3-store.c:254
+#: ../camel/providers/pop3/camel-pop3-store.c:150
+#: ../camel/providers/pop3/camel-pop3-store.c:189
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr "àààààà àààà POP àààà %s'à àààà ààààà àààààà àààààà: %s"
+msgstr "àààààà àààà POP ààààààà %s'à àààà ààààà àààààà àààààà: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:225
+#: ../camel/providers/pop3/camel-pop3-store.c:151
 msgid "STLS not supported by server"
 msgstr "àààààà àààààà STLS ààààààà ààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:255
-msgid "TLS is not available in this build"
-msgstr "ààààààà àààààà TLS ààààààà ààà"
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:169
+#, c-format
+msgid "Failed to connect to POP server %s in secure mode%s"
+msgstr "àààààààà àààààà %s -à POP ààààààà %s àà ààààà àààà àààààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:361
+#: ../camel/providers/pop3/camel-pop3-store.c:182
 #, c-format
-msgid "Could not connect to POP server %s"
-msgstr "POP àààà %s'à àààà ààààà àààààà àààààà"
+msgid "Failed to connect to POP server %s in secure mode: "
+msgstr "àààààààà ààààààà POP ààààààà %s -àà ààààà àààà àààààà: "
+
+#: ../camel/providers/pop3/camel-pop3-store.c:190
+msgid "TLS is not available in this build"
+msgstr "ààààààà àààààà TLS ààààààà ààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:402
-#: ../camel/providers/pop3/camel-pop3-store.c:535
+#: ../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:418
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:269
 #, c-format
-msgid "SASL '%s' Login failed for POP server %s: %s"
-msgstr "SASL '%s' àà-àà, POP àààà %s'à àààààààà àààà: %s"
+msgid "SASL '%s' Login failed for POP server %s%s"
+msgstr "POP ààààààà %s%s -à àààà SASL '%s' àààà àààààà àà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:430
+#: ../camel/providers/pop3/camel-pop3-store.c:286
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
-msgstr "POP àààà %s'à àà-àà àààààà àààààà: SASL àààààààà ààààààààà àààààà"
+msgstr "POP ààààààà %s'à àà-àà àààààà àààààà: SASL àààààààà ààààààààà àààààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:449
+#: ../camel/providers/pop3/camel-pop3-store.c:308
 #, c-format
-msgid "Failed to authenticate on POP server %s: %s"
-msgstr "POP àààà %s'à ààààààà àààààà àààààà: %s"
+msgid "Failed to authenticate on POP server %s: "
+msgstr "POP ààààààà %s -à àààààààà àààà àààààà: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:508
+#: ../camel/providers/pop3/camel-pop3-store.c:380
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
 "attack suspected. Please contact your admin."
 msgstr ""
-"POP àààà %s-à àààà ààààà ààààààà àààààà:\tàààà APOP ID àààààààà àààààà àààà ààààà "
+"POP ààààààà %s-à àààà ààààà ààààààà àààààà:\tàààà APOP ID àààààààà àààààà àààà ààààà "
 "àààà ààà ààààààààààà ààààààààà ààà ààààà ààààààà ààà ààààààààààààààààààà àààà ààààààà "
 "àààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:549
-#: ../camel/providers/pop3/camel-pop3-store.c:562
+#: ../camel/providers/pop3/camel-pop3-store.c:427
+#, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending password: "
+msgstr ""
+"POP ààààààà %s -àà ààààà àààààà àààààà\n"
+"àààààààà àààààà àààààà: "
+
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:437
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending password: %s"
+"Error sending username%s"
 msgstr ""
-"POP àààà %s'à àààà ààààà àààà\n"
-"ààààààààà ààààà àààààà àààààà: %s"
+"POP ààààààà %s -àà ààààà àààààà àààààà\n"
+"àààààààààààààà%s àààààà àààààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:556
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:449
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending username: %s"
+"Error sending password%s"
 msgstr ""
-"POP àààà %s'à àààà ààààà àààà\n"
-"ààààààààààà ààà ààààà àààààà àààààà: %s"
+"POP ààààààà %s -à àààà ààààà àààààà àààààà\n"
+"àààààààà%s àààààà àààààà"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:492
+#, c-format
+msgid "POP3 server %s"
+msgstr "POP3 ààààààà %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:495
+#, c-format
+msgid "POP3 server for %s on %s"
+msgstr "%s -à %s -à àààà POP3 ààààààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:669
+#: ../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'."
 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 "POP3 àààààààààààà àààà ààààààà ààààààà ààà"
+
+#: ../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:113
+#: ../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 "sendmail ààààààààààà ààààààà àààà ààààà"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:86
+#, c-format
 msgid "Could not parse recipient list"
 msgstr "ààààààààà àààààà àààààààà àààààà àààààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:144
+#: ../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:165
+#: ../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:235
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
+msgid "Could not send message: "
+msgstr "àààààà àààà àààààà: "
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "àààààà %s àààààà ààà sendmail àààà àààà: àààà ààààà ààà àààààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:242
+#: ../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:247
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "%d ààààààà ààààà àààààà ààà sendmail àààà àààà: àààà ààààà ààà àààààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:261
-msgid "sendmail"
-msgstr "sendmail"
+#: ../camel/providers/smtp/camel-smtp-provider.c:42
+msgid "Default SMTP port"
+msgstr "ààààààààà SMTP ààààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
-msgid "Mail delivery via the sendmail program"
-msgstr "sendmail ààààààààààà ààààààà àààà ààààà"
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
+msgid "SMTP over SSL"
+msgstr "SSL -à àààà SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:44
+msgid "Message submission port"
+msgstr "àààààà ààà àààà ààààà"
+
+#: ../camel/providers/smtp/camel-smtp-provider.c:50
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:43
+#: ../camel/providers/smtp/camel-smtp-provider.c:52
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "SMTP àààààà àààààààà àààà-ààààà àààà ààààà ààà àààà àààààà àààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:167
-msgid "Syntax error, command unrecognized"
-msgstr "àààààààà àààà àààààà, âàààààà àààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:169
-msgid "Syntax error in parameters or arguments"
-msgstr "ààààààà àààà ààààà àààààààà àààà àààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:171
-msgid "Command not implemented"
-msgstr "àààààà àààààààà àààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:173
-msgid "Command parameter not implemented"
-msgstr "àààààààà ààààààà àààààààà àààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:175
-msgid "System status, or system help reply"
-msgstr "ààààààààà àààààà, àààà ààààààà ààààà ààààààààà ààà ààààààà ààààààààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:177
-msgid "Help message"
-msgstr "àààààà àààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:179
-msgid "Service ready"
-msgstr "ààààààà àààààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:181
-msgid "Service closing transmission channel"
-msgstr "àààààààà àààààà àààààà ààààààà àààà ààà àààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:183
-msgid "Service not available, closing transmission channel"
-msgstr "ààààààà àààààà ààà, àààààà ààààààà àààà ààà àààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:185
-msgid "Requested mail action okay, completed"
-msgstr "àààà ààààààààà àààààà ààà àààà àààà, ààààààà ààà àààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:187
-msgid "User not local; will forward to <forward-path>"
-msgstr "ààààààà àààààààààà ààà; <forward-path>'à àààààààà ààà à'à"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:189
-msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "àààà ààààààààà àààààà ààà àààà àààààààà àààà: àààà-àààà àààààà ààà"
+#: ../camel/providers/smtp/camel-smtp-transport.c:149
+#: ../camel/providers/smtp/camel-smtp-transport.c:156
+msgid "Welcome response error: "
+msgstr "ààààààà ààààààààààà àààààà: "
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:191
-msgid "Requested action not taken: mailbox unavailable"
-msgstr "àààààà ààà àààà àààààààà àààà: àààà-àààà àààààà ààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:193
-msgid "Requested action aborted: error in processing"
-msgstr "àààààà ààà àààà ààààà ààà àààà: ààààààààààààà àààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:195
-msgid "User not local; please try <forward-path>"
-msgstr "ààààààà àààààààààà ààà; ààààààà ààà <forward-path> ààààààààà ààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:197
-msgid "Requested action not taken: insufficient system storage"
-msgstr "àààààà ààà àààà àààààààà àààà: ààààààààààà àààààààà ààààà ààààààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:199
-msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "àààà ààààààààà àààààà ààà àààà ààààà ààà àààà: ààààààààààà àààààà ààààà àààààààààà àààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:201
-msgid "Requested action not taken: mailbox name not allowed"
-msgstr "àààààà ààà àààà àààààààà àààà: àààà-àààààà ààà àààààààààà ààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:203
-msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr "àààà ààààà ààààà ààà; ààààà ààààààà ààà <CRLF>.<CRLF>"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:205
-msgid "Transaction failed"
-msgstr "ààààààààààà àààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:209
-msgid "A password transition is needed"
-msgstr "ààààààààà àààààààà ààààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:211
-msgid "Authentication mechanism is too weak"
-msgstr "ààààààà ààààààà ààààà ààà"
+#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr "àààààà àààà SMTP ààààààà %s'à àààà ààààààà àààààà àààààà: %s"
 
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
 #: ../camel/providers/smtp/camel-smtp-transport.c:213
-msgid "Encryption required for requested authentication mechanism"
-msgstr "àààààà ààà ààààààà ààààààààà ààààààààà ààààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
-msgid "Temporary authentication failure"
-msgstr "ààààààà àààààà ààààààààà àààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:296
-msgid "Welcome response error"
-msgstr "ààààààà àààààà ààààààààà àààààà"
+#: ../camel/providers/smtp/camel-smtp-transport.c:220
+msgid "STARTTLS command failed: "
+msgstr "STARTTLS àààààà àààààà àà: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:331
-#: ../camel/providers/smtp/camel-smtp-transport.c:364
-#: ../camel/providers/smtp/camel-smtp-transport.c:370
+#: ../camel/providers/smtp/camel-smtp-transport.c:230
 #, c-format
-msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "àààààà àààà SMTP àààà %s'à àààà ààààààà àààààà àààààà: %s"
+msgid "Failed to connect to SMTP server %s in secure mode: "
+msgstr "SMTP ààààààà %s -à àààà àààààààà ààààààà ààààà àààààà àààààà: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:340
+#: ../camel/providers/smtp/camel-smtp-transport.c:283
 #, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "STARTTLS àààààà àààààààà àààààà: %s"
+msgid "SMTP server %s"
+msgstr "SMTP ààààààà %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:355
-msgid "STARTTLS command failed"
-msgstr "STARTTLS àààààà àààààààà àààààà"
+#: ../camel/providers/smtp/camel-smtp-transport.c:287
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "%s'à ààààààà SMTP àààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:496
+#: ../camel/providers/smtp/camel-smtp-transport.c:338
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "SMTP àààà %s àààààà àààààà ààà ààààààà ààààààà %s ààààààà àààà"
+msgstr "SMTP ààààààà %s àààààà àààààà ààà àààààààààà ààààààà %s ààààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:567
+#: ../camel/providers/smtp/camel-smtp-transport.c:440
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
 "%s\n"
 "\n"
 msgstr ""
-"SMTP ààààà ààààààà àààààà ààààààà\n"
+"SMTP ààààà àààààààààà àààààà ààààààà\n"
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:700
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP àààà %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:702
+#: ../camel/providers/smtp/camel-smtp-transport.c:557
 #, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "%s'à ààààààà SMTP àààà ààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:720
 msgid "Cannot send message: service not connected."
 msgstr "àààààà ààààà àààààà àààààà: ààààààà ààààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:726
+#: ../camel/providers/smtp/camel-smtp-transport.c:564
+#, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "àààààà ààààà àààààà àààààà: ààààààà ààààà ààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:730
+#: ../camel/providers/smtp/camel-smtp-transport.c:568
 msgid "Sending message"
 msgstr "àààààà ààààà ààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
+#: ../camel/providers/smtp/camel-smtp-transport.c:593
+#, c-format
 msgid "Cannot send message: no recipients defined."
-msgstr "àààààà ààààà àààààà àààààà: àààààà àààààààà ààààà"
+msgstr "àààààà ààààà àààààà àààààà: àààààà àààààààà àààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:756
+#: ../camel/providers/smtp/camel-smtp-transport.c:606
+#, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "àààààà ààààà àààààà àààààà: àà àààà àààà àààààà ààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:985
-msgid "SMTP Greeting"
-msgstr "SMTP'à ààààààà"
+#: ../camel/providers/smtp/camel-smtp-transport.c:709
+msgid "Syntax error, command unrecognized"
+msgstr "àààààààà àààà àààààà, âàààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1010
-#, c-format
-msgid "HELO command failed: %s"
-msgstr "HELO àààààà àààààà: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:711
+msgid "Syntax error in parameters or arguments"
+msgstr "ààààààà àààà ààààà àààààààà àààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1027
-msgid "HELO command failed"
-msgstr "HELO àààààà àààààà"
+#: ../camel/providers/smtp/camel-smtp-transport.c:713
+msgid "Command not implemented"
+msgstr "àààààà àààààààà àààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1093
-msgid "SMTP Authentication"
-msgstr "SMTP ààààààà àààààààà"
+#: ../camel/providers/smtp/camel-smtp-transport.c:715
+msgid "Command parameter not implemented"
+msgstr "àààààààà ààààààà àààààààà àààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1099
-msgid "Error creating SASL authentication object."
-msgstr "SASL àààààààà ààààà ààààààà àààààà ààààààà"
+#: ../camel/providers/smtp/camel-smtp-transport.c:717
+msgid "System status, or system help reply"
+msgstr "ààààààààà àààààà, àààà ààààààà ààààà ààààààààà ààà ààààààà ààààààààààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:719
+msgid "Help message"
+msgstr "àààààà àààààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:721
+msgid "Service ready"
+msgstr "ààààààà àààààààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:723
+msgid "Service closing transmission channel"
+msgstr "àààààààà àààààà àààààà ààààààà àààà ààà àààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:725
+msgid "Service not available, closing transmission channel"
+msgstr "ààààààà àààààà ààà, àààààà ààààààà àààà ààà àààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:727
+msgid "Requested mail action okay, completed"
+msgstr "àààà ààààààààà àààààà ààà àààà àààà, ààààààà ààà àààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:729
+msgid "User not local; will forward to <forward-path>"
+msgstr "ààààààà ààààààààààà ààà; <forward-path>'à àààààààà ààà à'à"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:731
+msgid "Requested mail action not taken: mailbox unavailable"
+msgstr "àààà ààààààààà àààààà ààà àààà àààààààà àààà ààà: àààà-àààà àààààà ààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:733
+msgid "Requested action not taken: mailbox unavailable"
+msgstr "àààààà ààà àààà àààààààà àààà ààà: àààà-àààà àààààà ààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:735
+msgid "Requested action aborted: error in processing"
+msgstr "àààààà ààà àààà ààààà ààà àààà: ààààààààààààà àààààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:737
+msgid "User not local; please try <forward-path>"
+msgstr "ààààààà ààààààààààà ààà; ààààààà ààà <forward-path> ààààààààà ààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:739
+msgid "Requested action not taken: insufficient system storage"
+msgstr "àààààà ààà àààà àààààààà àààà ààà: ààààààààààà àààààààà ààààà ààààààààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:741
+msgid "Requested mail action aborted: exceeded storage allocation"
+msgstr ""
+"àààà ààààààààà àààààà ààà àààà ààààà ààà àààà: ààààààààààà àààààà ààààà àààààààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1116
-#: ../camel/providers/smtp/camel-smtp-transport.c:1127
-#, c-format
-msgid "AUTH command failed: %s"
-msgstr "AUTH àààààà àààààà: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:743
+msgid "Requested action not taken: mailbox name not allowed"
+msgstr "àààààà ààà àààà àààààààà àààà ààà: àààà-àààààà ààà àààààààààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1133
-msgid "AUTH command failed"
-msgstr "AUTH àààààà àààààà"
+#: ../camel/providers/smtp/camel-smtp-transport.c:745
+msgid "Start mail input; end with <CRLF>.<CRLF>"
+msgstr "àààà ààààà ààààà ààà; ààààà ààààààà ààà <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1203
-msgid "Bad authentication response from server.\n"
-msgstr "ààààà ààà ààààààà ààààààààà ààààààà àààààààààà àààà àààà\n"
+#: ../camel/providers/smtp/camel-smtp-transport.c:747
+msgid "Transaction failed"
+msgstr "ààààààààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1230
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "MAIL FROM àààààà àààààà: %s: àààà àààààà àààà"
+#: ../camel/providers/smtp/camel-smtp-transport.c:751
+msgid "A password transition is needed"
+msgstr "àààààààà àààààààà ààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1247
-msgid "MAIL FROM command failed"
-msgstr "MAIL FROM àààààà àààààà"
+#: ../camel/providers/smtp/camel-smtp-transport.c:753
+msgid "Authentication mechanism is too weak"
+msgstr "àààààààààà ààààààà ààààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1271
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "RCPT TO àààààà àààààà: %s: àààà àààààà àààà"
+#: ../camel/providers/smtp/camel-smtp-transport.c:755
+msgid "Encryption required for requested authentication mechanism"
+msgstr "àààààà ààà àààààààààà ààààààààà ààààààààà ààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1290
-#, c-format
-msgid "RCPT TO <%s> failed"
-msgstr "RCPT TO <%s> àààààà"
+#: ../camel/providers/smtp/camel-smtp-transport.c:757
+msgid "Temporary authentication failure"
+msgstr "ààààààà àààààà ààààààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1330
-#: ../camel/providers/smtp/camel-smtp-transport.c:1399
-#: ../camel/providers/smtp/camel-smtp-transport.c:1418
-#, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "DATA àààààà àààààà: %s: àààà àààààà àààà"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1008
+msgid "SMTP Greeting"
+msgstr "SMTP'à ààààààà"
 
-#. 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:1347
-#: ../camel/providers/smtp/camel-smtp-transport.c:1434
-msgid "DATA command failed"
-msgstr "DATA àààààà àààààà"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1035
+#: ../camel/providers/smtp/camel-smtp-transport.c:1052
+#: ../camel/providers/smtp/camel-smtp-transport.c:1060
+msgid "HELO command failed: "
+msgstr "HELO àààààà àààààà àà: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1457
-#, c-format
-msgid "RSET command failed: %s"
-msgstr "RSET àààààà àààààà: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1129
+msgid "SMTP Authentication"
+msgstr "SMTP àààààààààà àààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1473
-msgid "RSET command failed"
-msgstr "RSET àààààà àààààà"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1148
+#: ../camel/providers/smtp/camel-smtp-transport.c:1159
+#: ../camel/providers/smtp/camel-smtp-transport.c:1172
+msgid "AUTH command failed: "
+msgstr "AUTH àààààà àààààà àà: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1496
-#, c-format
-msgid "QUIT command failed: %s"
-msgstr "QUIT àààààà àààààà: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1280
+#: ../camel/providers/smtp/camel-smtp-transport.c:1294
+#: ../camel/providers/smtp/camel-smtp-transport.c:1303
+msgid "MAIL FROM command failed: "
+msgstr "MAIL FROM àààààà àààààà àà: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1510
-msgid "QUIT command failed"
-msgstr "QUIT àààààà àààààà"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1330
+msgid "RCPT TO command failed: "
+msgstr "RCPT TO àààààà àààààà àà: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1346
+#: ../camel/providers/smtp/camel-smtp-transport.c:1355
+#, c-format
+msgid "RCPT TO <%s> failed: "
+msgstr "RCPT TO <%s> àààààà àà: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1397
+#: ../camel/providers/smtp/camel-smtp-transport.c:1407
+#: ../camel/providers/smtp/camel-smtp-transport.c:1417
+#: ../camel/providers/smtp/camel-smtp-transport.c:1476
+#: ../camel/providers/smtp/camel-smtp-transport.c:1495
+#: ../camel/providers/smtp/camel-smtp-transport.c:1508
+#: ../camel/providers/smtp/camel-smtp-transport.c:1516
+msgid "DATA command failed: "
+msgstr "DATA àààààà àààààà àà: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1541
+#: ../camel/providers/smtp/camel-smtp-transport.c:1555
+#: ../camel/providers/smtp/camel-smtp-transport.c:1563
+msgid "RSET command failed: "
+msgstr "RSET àààààà àààààà àà: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1588
+#: ../camel/providers/smtp/camel-smtp-transport.c:1602
+#: ../camel/providers/smtp/camel-smtp-transport.c:1609
+msgid "QUIT command failed: "
+msgstr "QUIT àààààà àààààà àà: "
 
 #: ../libedataserver/e-categories.c:47
-msgid "Business"
-msgstr "àààààà"
+msgctxt "CategoryName"
+msgid "Anniversary"
+msgstr "àààààààà"
 
 #: ../libedataserver/e-categories.c:48
+msgctxt "CategoryName"
+msgid "Birthday"
+msgstr "ààààààà"
+
+#: ../libedataserver/e-categories.c:49
+msgctxt "CategoryName"
+msgid "Business"
+msgstr "ààààààà"
+
+#: ../libedataserver/e-categories.c:50
+msgctxt "CategoryName"
 msgid "Competition"
 msgstr "àààààààààààààà"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:51
+msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "ààààà"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:52
+msgctxt "CategoryName"
 msgid "Gifts"
-msgstr "ààààà"
+msgstr "ààààààààà"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:53
+msgctxt "CategoryName"
 msgid "Goals/Objectives"
-msgstr "àààààààà"
+msgstr "àààààà/àààààààà"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:54
+msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "àààà"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:55
+msgctxt "CategoryName"
 msgid "Holiday Cards"
-msgstr "àààà ààààààà ààààà"
+msgstr "àààà ààààààà ààààààààà"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:57
+msgctxt "CategoryName"
 msgid "Hot Contacts"
-msgstr "àààààààààààà ààààààà"
+msgstr "àààààààààààà ààààààààà"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:58
+msgctxt "CategoryName"
 msgid "Ideas"
-msgstr "ààààà"
+msgstr "àààààààààà"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:59
+msgctxt "CategoryName"
 msgid "International"
-msgstr "ààààààààààà"
+msgstr "ààààààààààààà"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:60
+msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "àààààààààààà àààààà"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:61
+msgctxt "CategoryName"
 msgid "Miscellaneous"
-msgstr "ààààà"
+msgstr "ààààààà"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:62
+msgctxt "CategoryName"
 msgid "Personal"
 msgstr "ààààààààà"
 
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:63
+msgctxt "CategoryName"
 msgid "Phone Calls"
-msgstr "ààà àà"
+msgstr "ààà àààààà"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:65
+msgctxt "CategoryName"
 msgid "Status"
 msgstr "àààààà"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:66
+msgctxt "CategoryName"
 msgid "Strategies"
-msgstr "àààà"
+msgstr "àààààààà"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:67
+msgctxt "CategoryName"
 msgid "Suppliers"
-msgstr "àààààààààà"
+msgstr "àààààààààààààà"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:68
+msgctxt "CategoryName"
 msgid "Time & Expenses"
-msgstr "ààà à àààà"
+msgstr "ààà ààà àààààààà"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:69
+msgctxt "CategoryName"
 msgid "VIP"
-msgstr "àààààààààààà ààààààà (VIP)"
+msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:70
+msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "ààààààààà"
 
+#: ../libedataserver/e-client.c:120
+msgid "Source not loaded"
+msgstr "ààà à'à ààà àààà ààà"
+
+#: ../libedataserver/e-client.c:122
+msgid "Source already loaded"
+msgstr "ààà ààààààà à'à ààà àààà"
+
+#: ../libedataserver/e-client.c:130
+msgid "Offline unavailable"
+msgstr "àààààà àààààà ààà"
+
+#: ../libedataserver/e-client.c:152
+msgid "D-Bus error"
+msgstr "D-Bus àààààà"
+
 #. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
+#. * in 12-hour format.
 #. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1900
+#. * time, in 12-hour format.
+#: ../libedataserver/e-time-utils.c:1646 ../libedataserver/e-time-utils.c:1944
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
 #. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
+#. * in 24-hour format.
 #. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1891
+#. * time, in 24-hour format.
+#: ../libedataserver/e-time-utils.c:1651 ../libedataserver/e-time-utils.c:1935
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without seconds.
+#. * in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1896
+#. * time, in 12-hour format, without seconds.
+#: ../libedataserver/e-time-utils.c:1656 ../libedataserver/e-time-utils.c:1940
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without seconds.
+#. * in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1887
+#. * time, in 24-hour format, without seconds.
+#: ../libedataserver/e-time-utils.c:1661 ../libedataserver/e-time-utils.c:1931
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1655
+#. * in 12-hour format, without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1666
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %m/%d/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1660
+#. * in 24-hour format, without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1671
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %m/%d/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1763
-#: ../libedataserver/e-time-utils.c:1882
+#: ../libedataserver/e-time-utils.c:1674 ../libedataserver/e-time-utils.c:1794
+#: ../libedataserver/e-time-utils.c:1926
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1670
+#: ../libedataserver/e-time-utils.c:1681
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%m/%d/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1674
+#: ../libedataserver/e-time-utils.c:1685
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%m/%d/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1679
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1690
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%m/%d/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1684
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1695
 msgid "%m/%d/%Y %H:%M"
 msgstr "%m/%d/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
-#. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1689
+#. * without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1700
 msgid "%m/%d/%Y %I %p"
 msgstr "%m/%d/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
-#. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1694
+#. * without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1705
 msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1766
+#: ../libedataserver/e-time-utils.c:1708 ../libedataserver/e-time-utils.c:1797
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1824 ../libedataserver/e-time-utils.c:1944
+#: ../libedataserver/e-time-utils.c:1868 ../libedataserver/e-time-utils.c:1988
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1828 ../libedataserver/e-time-utils.c:1936
+#: ../libedataserver/e-time-utils.c:1872 ../libedataserver/e-time-utils.c:1980
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
-#. in 12-hour format.
+#. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1833 ../libedataserver/e-time-utils.c:1941
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1877 ../libedataserver/e-time-utils.c:1985
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1837 ../libedataserver/e-time-utils.c:1933
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1881 ../libedataserver/e-time-utils.c:1977
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1840
+#: ../libedataserver/e-time-utils.c:1884
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1844
+#: ../libedataserver/e-time-utils.c:1888
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-book-auth-util.c:90
+#: ../libedataserverui/e-book-auth-util.c:96
+#: ../libedataserverui/e-book-auth-util.c:662
 msgid "Accessing LDAP Server anonymously"
 msgstr "ààààààààààà àààà LDAP ààààààà"
 
-#: ../libedataserverui/e-book-auth-util.c:192
+#: ../libedataserverui/e-book-auth-util.c:197
+#: ../libedataserverui/e-book-auth-util.c:423
 msgid "Failed to authenticate.\n"
-msgstr "ààààààà àààààà ààààà\n"
+msgstr "àààààààààà àààààà ààààà\n"
 
-#: ../libedataserverui/e-categories-dialog.c:327
-#, 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 "àààààààà ààààààà àààààààà (_u):"
+
+#: ../libedataserverui/e-categories-editor.c:230
+msgid "_Available Categories:"
+msgstr "àààààà àààààà: (_A)"
 
-#: ../libedataserverui/e-categories-dialog.c:618
+#: ../libedataserverui/e-categories-selector.c:320
 msgid "Icon"
 msgstr "àààà"
 
-#: ../libedataserverui/e-categories-dialog.c:623
+#: ../libedataserverui/e-categories-selector.c:325
 msgid "Category"
-msgstr "ààààààààààà"
+msgstr "ààààà"
+
+#: ../libedataserverui/e-category-completion.c:294
+#, c-format
+msgid "Create category \"%s\""
+msgstr "\"%s\" ààààà ààààààà ààà ààà"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:1
+#: ../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 "àààà ààà ààà (_N)"
 
-#: ../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:856
+#, c-format
+msgid ""
+"Enter password for calendar %s (user %s)\n"
+"Reason: %s"
+msgstr ""
+"ààààààààà %s (ààààààààààà %s) -à àààà àààààààà àààààà\n"
+"àààà: %s"
 
-#: ../libedataserverui/e-category-completion.c:290
+#: ../libedataserverui/e-client-utils.c:858
 #, c-format
-msgid "Create category \"%s\""
-msgstr "\"%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:862
+#, c-format
+msgid ""
+"Enter password for task list %s (user %s)\n"
+"Reason: %s"
+msgstr ""
+"ààààààà àààààà %s (ààààààààààà %s) -à àààà àààààààà àààààà\n"
+"àààà: %s"
 
-#: ../libedataserverui/e-cell-renderer-color.c:223
-msgid "The color to render"
-msgstr "ààààààà àààà àààà ààààààà àà"
+#: ../libedataserverui/e-client-utils.c:864
+#, c-format
+msgid "Enter password for task list %s (user %s)"
+msgstr "ààààààà àààààà %s (ààààààààààà %s) -à àààà àààààààà àààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:276
-msgid "Select Contacts from Address Book"
-msgstr "ààààà àààà ààà ààààààà àààààààà ààà"
+#: ../libedataserverui/e-client-utils.c:868
+#, c-format
+msgid ""
+"Enter password for memo list %s (user %s)\n"
+"Reason: %s"
+msgstr ""
+"àààà àààààà %s (ààààààààààà %s) -à àààà àààààààà àààààà\n"
+"àààà: %s"
 
-#: ../libedataserverui/e-name-selector-dialog.c:563
-msgid "_Add"
-msgstr "ààà ààà (_A)"
+#: ../libedataserverui/e-client-utils.c:870
+#, c-format
+msgid "Enter password for memo list %s (user %s)"
+msgstr "àààà àààààà %s (ààààààààààà %s) -à àààà àààààààà àààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:588
-msgid "_Remove"
-msgstr "àààà ààààà (_R)"
+#: ../libedataserverui/e-client-utils.c:875
+#, c-format
+msgid ""
+"Enter password for address book %s (user %s)\n"
+"Reason: %s"
+msgstr ""
+"ààààà ààààà %s (ààààààààààà %s) -à àààà àààààààà àààààà\n"
+"àààà: %s"
 
-#: ../libedataserverui/e-name-selector-dialog.c:765
-#: ../libedataserverui/e-name-selector-dialog.glade.h:6
-msgid "Any Category"
-msgstr "àààààà àààààà"
+#: ../libedataserverui/e-client-utils.c:877
+#, c-format
+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:981
+msgid "Enter Passphrase"
+msgstr "Passphrase àààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:2
-msgid "<b>Co_ntacts</b>"
-msgstr "<b>ààààààà</b>(_n)"
+#: ../libedataserverui/e-client-utils.c:983
+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 "Show Contacts"
+msgstr "ààààààààà àààààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:4
+#: ../libedataserverui/e-name-selector-dialog.c:206
 msgid "Address B_ook:"
-msgstr "àààààà àà: (_o)"
+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"
-msgstr "ààààààà"
+#: ../libedataserverui/e-name-selector-dialog.c:232
+msgid "_Search:"
+msgstr "àààààà: (_S)"
+
+#: ../libedataserverui/e-name-selector-dialog.c:250
+#: ../libedataserverui/e-name-selector-dialog.c:1035
+msgid "Any Category"
+msgstr "àààààà àààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:9
+#: ../libedataserverui/e-name-selector-dialog.c:252
+msgid "Co_ntacts"
+msgstr "ààààààààà (_n)"
+
+#: ../libedataserverui/e-name-selector-dialog.c:307
 msgid "Search"
-msgstr "ààààààààà"
+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:778
+msgid "_Add"
+msgstr "ààà ààà (_A)"
+
+#: ../libedataserverui/e-name-selector-dialog.c:782
+msgid "_Remove"
+msgstr "àààà ààààà (_R)"
+
+#: ../libedataserverui/e-name-selector-dialog.c:954
+#, c-format
+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:2455
+#: ../libedataserverui/e-name-selector-entry.c:2816
 #, c-format
 msgid "E_xpand %s Inline"
-msgstr "àà-àààà ààààààà %s ààààààà ààà à'à (_x)"
+msgstr "àà-àààà ààààààà %s ààààààà ààà à'à (_x)"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2470
+#: ../libedataserverui/e-name-selector-entry.c:2831
 #, c-format
 msgid "Cop_y %s"
-msgstr "%s ààà ààà (_y)"
+msgstr "%s ààà ààà (_y)"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2480
+#: ../libedataserverui/e-name-selector-entry.c:2841
 #, c-format
 msgid "C_ut %s"
 msgstr "%s ààà ààà (_u)"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2497
+#: ../libedataserverui/e-name-selector-entry.c:2858
 #, c-format
 msgid "_Edit %s"
 msgstr "%s àààààààà (_E)"
 
-#: ../libedataserverui/e-name-selector-list.c:469
+#: ../libedataserverui/e-name-selector-list.c:520
 #, 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:1093
+#: ../libedataserverui/e-passwords.c:701
+#: ../libedataserverui/e-passwords-win32.c:614
 msgid "You have the Caps Lock key on."
 msgstr "àààààà-àà àààààà"
 
-#: ../libedataserverui/e-passwords.c:1215
+#: ../libedataserverui/e-passwords.c:821
+#: ../libedataserverui/e-passwords-win32.c:737
 msgid "_Remember this passphrase"
 msgstr "àààààààà ààà àààà à'à (_R)"
 
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:822
+#: ../libedataserverui/e-passwords-win32.c:738
 msgid "_Remember this passphrase for the remainder of this session"
-msgstr "àààààààà àààààà ààààààà ààààà àààà àààààààà ààà àààà à'à (_R)"
+msgstr "àààààààà àààààà ààààààà àààà àààà àààààààà ààà àààà à'à (_R)"
 
-#: ../libedataserverui/e-passwords.c:1221
+#: ../libedataserverui/e-passwords.c:827
+#: ../libedataserverui/e-passwords-win32.c:743
 msgid "_Remember this password"
-msgstr "ààààààààà ààà àààà à'à (_R)"
+msgstr "àààààààà ààà àààà à'à (_R)"
 
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:828
+#: ../libedataserverui/e-passwords-win32.c:744
 msgid "_Remember this password for the remainder of this session"
-msgstr "àààààààà àààààà ààààààà ààààà àààà ààààààààà ààà àààà à'à (_R)"
+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:174
 msgid "_Destination"
 msgstr "ààààààààààà (_D)"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1694
-#: ../servers/exchange/storage/exchange-account.c:955
-#, c-format
-msgid "Enter password for %s"
-msgstr "%s-à àààà ààààààààà àààà"
-
-#: ../servers/exchange/lib/e2k-autoconfig.c:1695
-#: ../servers/exchange/storage/exchange-account.c:960
-msgid "Enter password"
-msgstr "ààààààààà àààà"
-
-#. i18n: These are Outlook's words for the default roles in
-#. the folder permissions dialog.
-#: ../servers/exchange/lib/e2k-security-descriptor.c:844
-msgid "Owner"
-msgstr "ààààà"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:854
-msgid "Publishing Editor"
-msgstr "àààààààààààà ààààààà"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:862
-msgid "Editor"
-msgstr "ààààààà"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:869
-msgid "Publishing Author"
-msgstr "àààààààààààà àààà"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:875
-msgid "Author"
-msgstr "àààà"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:880
-msgid "Non-editing Author"
-msgstr "ààààààààààà ààà"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:884
-msgid "Reviewer"
-msgstr "àààààààà"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:886
-msgid "Contributor"
-msgstr "àààààààààààà"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:888
-msgid "None"
-msgstr "àààààà ààà"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:903
-msgid "Custom"
-msgstr "àààààà"
-
-#: ../servers/exchange/storage/e-storage.c:557
-msgid "Generic error"
-msgstr "àààààà àààààà"
-
-#: ../servers/exchange/storage/e-storage.c:559
-msgid "A folder with the same name already exists"
-msgstr "àà ààààà ààà ààààààà àààààààà ààààààà ààààà"
-
-#: ../servers/exchange/storage/e-storage.c:561
-msgid "The specified folder type is not valid"
-msgstr "àààààààà àààà ààààààà ààà ààà"
-
-#: ../servers/exchange/storage/e-storage.c:563
-msgid "I/O error"
-msgstr "I/O àààà àààààà"
-
-#: ../servers/exchange/storage/e-storage.c:565
-msgid "Not enough space to create the folder"
-msgstr "ààààààà ààààààààà àààà àààààààà ààààà ààà"
-
-#: ../servers/exchange/storage/e-storage.c:567
-msgid "The folder is not empty"
-msgstr "ààààààà ààààà ààà"
-
-#: ../servers/exchange/storage/e-storage.c:569
-msgid "The specified folder was not found"
-msgstr "àààààààà ààààààà ààààà ààààà"
-
-#: ../servers/exchange/storage/e-storage.c:571
-msgid "Function not implemented in this storage"
-msgstr "àààààààà ààààààààààà àààààààà àààà àààààààà àààà"
-
-#: ../servers/exchange/storage/e-storage.c:575
-msgid "Operation not supported"
-msgstr "àààà ààààààà ààà"
-
-#: ../servers/exchange/storage/e-storage.c:577
-msgid "The specified type is not supported in this storage"
-msgstr "àààààààà ààààààààààà àààààààà àààààààà ààà ààààààà ààà"
-
-#: ../servers/exchange/storage/e-storage.c:579
-msgid "The specified folder cannot be modified or removed"
-msgstr "àààààààà ààààààà àààààààà àààà àààààà ààà ààààà ààà"
-
-#: ../servers/exchange/storage/e-storage.c:581
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "àààà ààààààààà ààààà àààà ààààààà àààààààà àààààà "
-
-#: ../servers/exchange/storage/e-storage.c:583
-msgid "Cannot create a folder with that name"
-msgstr "àààààààà ààà àààààà ààààààà ààààààà ààà ààààà ààà"
-
-#: ../servers/exchange/storage/e-storage.c:585
-msgid "This operation cannot be performed in off-line mode"
-msgstr "àà-àààà ààààààà àà àààà ààààààà ààà ààààà ààà"
-
-#. i18n: This is the title of an "other user's folders"
-#. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:640
-#, c-format
-msgid "%s's Folders"
-msgstr "%s'à ààààààà"
-
-#: ../servers/exchange/storage/exchange-account.c:1260
-msgid "Personal Folders"
-msgstr "ààààààààà ààààààà"
-
-#: ../servers/exchange/storage/exchange-account.c:1275
-msgid "Favorite Public Folders"
-msgstr "ààààà ààààààààà ààààààà"
-
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1292
-msgid "All Public Folders"
-msgstr "ààààà ààààààààà ààààààà"
-
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1306
-msgid "Global Address List"
-msgstr "ààààààà ààààà àààààà"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
-msgid "Deleted Items"
-msgstr "àààà àààà ààààà"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
-msgid "Drafts"
-msgstr "àààà"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
-msgid "Journal"
-msgstr "ààààààà"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "ààà"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "ààààààà"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "àààààà ààààà"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "àààà"
-
-#: ../servers/groupwise/e-gw-connection.c:225
-msgid "Invalid connection"
-msgstr "àààà ààààà"
-
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid response from server"
-msgstr "ààààà ààà ààààààààààà ààààààààààà"
-
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "No response from the server"
-msgstr "ààààà ààà àààà ààààààààààà ààààààà àààà"
-
-#: ../servers/groupwise/e-gw-connection.c:237
-msgid "Bad parameter"
-msgstr "ààà ààààààà"
-
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
-msgid "Evolution Addressbook file backend"
-msgstr "Evolution ààààà-àààààà ààààààà ààààà-àààà"
-
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
-msgid "Evolution Calendar file and webcal backend"
-msgstr "Evolution Calendar ààààààà à webcal ààààà-àààà"
-
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:3
-msgid "Evolution Data Server interface check service"
-msgstr "Evolution Data Server àààààààààà ààààààà ààààààà"
-
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
-msgid "Evolution Data Server logging service"
-msgstr "Evolution Data Server àààà ààààààà"
-
-#~ msgid "CRL not yet valid"
-#~ msgstr "CRL àà àààààààà ààà ààà"
-
-#~ msgid "CRL has expired"
-#~ msgstr "CRL'à ààààà àààààààà àààà"
-
-#~ msgid "Error in CRL"
-#~ msgstr "CRL àààà àààààà"
-
-#~| msgid "Sleet"
-#~ msgid "Sent"
-#~ msgstr "ààààà ààà ààààà"
-
-#~ msgid "Templates"
-#~ msgstr "àààààààà"
-
-#~ msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
-#~ msgstr ""
-#~ "àààààà ààààààààààà àààà ààààà; àààààà àààà ààààà àààà àààààààà ààà ààààà ààà\n"
-
-#~ msgid "Fair"
-#~ msgstr "àààààà"
-
-#~ msgid "Snow showers"
-#~ msgstr "àààà ààààà"
-
-#~ msgid "Snow"
-#~ msgstr "ààà"
-
-#~ msgid "Partly cloudy"
-#~ msgstr "ààààà àààààààààà"
-
-#~ msgid "Smoke"
-#~ msgstr "ààààà"
-
-#~ msgid "Thunderstorms"
-#~ msgstr "ààà ààààààà"
-
-#~ msgid "Cloudy"
-#~ msgstr "àààààààààà"
-
-#~ msgid "Drizzle"
-#~ msgstr "ààààâàààà ààààà"
-
-#~ msgid "Sunny"
-#~ msgstr "à'ààààààà"
-
-#~ msgid "Dust"
-#~ msgstr "àààà"
-
-#~ msgid "Clear"
-#~ msgstr "àààààààà"
-
-#~ msgid "Mostly cloudy"
-#~ msgstr "ààààààà àààààààààà"
-
-#~ msgid "Windy"
-#~ msgstr "àààà"
-
-#~ msgid "Rain showers"
-#~ msgstr "ààààààààà"
-
-#~ msgid "Foggy"
-#~ msgstr "àààààà"
-
-#~ msgid "Rain/snow mixed"
-#~ msgstr "ààààà àààààà/ààà"
-
-#~ msgid "Very hot/humid"
-#~ msgstr "ààààààà ààà/àààààà"
-
-#~ msgid "Blizzard"
-#~ msgstr "ààà àààààà"
-
-#~ msgid "Freezing rain"
-#~ msgstr "ààààààà ààààà"
-
-#~ msgid "Haze"
-#~ msgstr "àààààà-àààààà"
-
-#~ msgid "Blowing snow"
-#~ msgstr "àààààààà ààà"
-
-#~ msgid "Freezing drizzle"
-#~ msgstr "ààààààà ààààâàààààà ààààà"
-
-#~ msgid "Very cold/wind chill"
-#~ msgstr "ààààààà/ààààà àààà"
-
-#~ msgid "Rain"
-#~ msgstr "ààààà"
-
-#~ msgid "Weather: Partly Cloudy"
-#~ msgstr "ààà: ààààà àààààààààà"
-
-#~ msgid "%.1fÂC - %s"
-#~ msgstr "%.1fÂC - %s"
-
-#~ msgid "%.1fÂF - %s"
-#~ msgstr "%.1fÂF - %s"
-
-#~ msgid "%.1f/%.1fÂC - %s"
-#~ msgstr "%.1f/%.1fÂC - %s"
-
-#~ msgid "%.1f/%.1fÂF - %s"
-#~ msgstr "%.1f/%.1fÂF - %s"
-
-#~ msgid "%d%% chance of precipitation\n"
-#~ msgstr "%d%% àààààà àààààà\n"
-
-#~ msgid "%.1fcm snow\n"
-#~ msgstr "%.1fcm ààà\n"
-
-#~ msgid "%.1fin snow\n"
-#~ msgstr "%.1fin ààà\n"
-
-#~ msgid "%.1f-%.1fcm snow\n"
-#~ msgstr "%.1f-%.1fcm ààà\n"
-
-#~ msgid "%.1f-%.1fin snow\n"
-#~ msgstr "%.1f-%.1fin ààà\n"
-
-#~ msgid "Failed to create create child process '%s': %s"
-#~ msgstr "àààààà àààààà ààààààà àààààà àààààà '%s': %s"
-
-#~ msgid "Performing query on unknown header: %s"
-#~ msgstr "âàààààà ààààààà ààààà àààààà ààà àààà: %s"
-
-#~ msgid "Cannot find certificate for `%s'"
-#~ msgstr "`%s'-à àààààààààà ààààà ààààà"
-
-#~ msgid "Decoder failed, error %d"
-#~ msgstr "ààààààà àààààà, àààààà %d"
-
-#~ msgid "%sPlease enter the GroupWise password for %s %s"
-#~ msgstr "%sààààààà ààà %s %s'à àààà GroupWise ààààààààà àààà"
-
-#~ msgid "Unable to authenticate to GroupWise server. "
-#~ msgstr "GroupWise ààààà ààààààà àààààà ààààààà "
-
-#~ msgid "Folder was destroyed and recreated on server."
-#~ msgstr "ààààà ààààààà ààààà ààà àààààà ààààààà ààààà"
-
-#~ msgid ""
-#~ "Unexpected server response: Identical UIDs provided for messages %d and %d"
-#~ msgstr ""
-#~ "ààààà ààà ààààààààààà ààààààààààà ààààààà: àààààà %d à %d'à àààà àààààà UID àààààààà"
-
-#~ msgid "%sPlease enter the IMAP password for %s %s"
-#~ msgstr "%sààààààà ààà %s %s'à àààà IMAP ààààààààà àààà"
-
-#~ msgid "%sPlease enter the IMAP password for %s on host %s"
-#~ msgstr "%sààààààà ààà %s'à àààà %s àààààà IMAP ààààààààà àààà"
-
-#~ msgid "Could not save summary: %s: %s"
-#~ msgstr "àààààà ààààààà àààààà àààààà: %s: %s"
-
-#~ msgid "Please enter the NNTP password for %s %s"
-#~ msgstr "ààààààà ààà  %s %s'à àààà NNTP ààààààààà àààà"
-
-#~ msgid "%sPlease enter the SMTP password for %s on host %s"
-#~ msgstr "%sààààààà ààà %s'à àààà %s ààààààà ààà SMTP ààààààààà àààààà ààà"
-
-#~ msgid "Category _Color"
-#~ msgstr "ààààààà àà (_C)"
-
-#~ msgid "Select User"
-#~ msgstr "àààààààààà àààààààà ààà"
-
-#~ msgid "Addressbook..."
-#~ msgstr "ààààà ààà..."
-
-
-#: ../calendar/libecal/e-cal.c:1049
-msgid "On This Computer"
-msgstr "ààààààà àààààààààà"



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