[evolution-data-server] Updated Tamil translation

From: Thirumurthi Vasudeven <vasudeven src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-data-server] Updated Tamil translation
Date: Wed, 4 Aug 2010 16:41:07 +0000 (UTC)
commit 9f6d987233412d52f2212abee35a237fa32e4a5d
Author: drtv <vasudeven git gnome org>
Date:   Wed Aug 4 22:10:00 2010 +0530

    Updated Tamil translation

 po/ta.po | 2869 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 1386 insertions(+), 1483 deletions(-)
---
diff --git a/po/ta.po b/po/ta.po
index ce2deb0..2fe1002 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -12,15 +12,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server.gnome-2-28\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 08:45+0530\n"
+"POT-Creation-Date: 2010-06-28 05:17+0530\n"
 "PO-Revision-Date: 2010-02-18 08:49+0530\n"
 "Last-Translator: Dr,T,Vasudevan <agnihot3 gmail com>\n"
 "Language-Team: Tamil <Ubuntu-l10n-tam lists ubuntu com>>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\\n"
-"\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\\n\n"
 "\n"
 "X-Generator: Lokalize 0.3\n"
 
@@ -34,13 +33,13 @@ msgstr "à®?à®±à¯?à®±à¯?à®?à®¿à®±à®¤à¯?..."
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4551
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4553
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
 msgid "Searching..."
 msgstr "à®¤à¯?à®?à®¿à®?à®¿à®±à®¤à¯?..."
 
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4715
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4717
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "à®¤à¯?à®?à®°à¯?à®ªà¯?à®?à®³à¯? à®ªà®¤à®¿à®µà®¿à®±à®?à¯?à®?à®®à¯? à®?à¯?à®¯à¯?à®?à®¿à®±à®¤à¯? (%d)... "
@@ -52,41 +51,41 @@ msgstr "à®¤à¯?à®?à®°à¯?à®ªà¯?à®?à®³à¯? à®ªà®¤à®¿à®µà®¿à®±à®?à¯?à®?à®®à¯? à®?à¯?
 msgid "Updating contacts cache (%d)... "
 msgstr "à®¤à¯?à®?à®°à¯?à®ªà¯?à®?à®³à¯? à®?à®?à®®à®¾à®±à¯?à®±à®¿à®©à¯? à®®à¯?à®®à¯?à®ªà®?à¯?à®¤à¯?à®¤à¯?à®?à®¿à®±à®¤à¯? (%d)... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:816
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:818
 msgid "Using Distinguished Name (DN)"
 msgstr "à®ªà¯?à®?à®´à¯?à®ªà¯?à®±à¯?à®± à®ªà¯?à®¯à®°à¯? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤à¯?à®?à®¿à®±à®¤à¯? (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:819
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:821
 msgid "Using Email Address"
 msgstr "à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®®à¯?à®?à®µà®°à®¿ à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤à®ªà¯?à®ªà®?à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1096
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1098
 msgid "Reconnecting to LDAP server..."
 msgstr "LDAP à®?à¯?à®µà¯?à®¯à®?à®¤à¯?à®¤à¯?à®?à®©à¯? à®®à¯?à®£à¯?à®?à¯?à®®à¯? à®?à®£à¯?à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®?à®¿à®±à®¤à¯?..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1738
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1740
 msgid "Adding contact to LDAP server..."
 msgstr "LDAP à®?à¯?à®µà¯?à®¯à®?à®¤à¯?à®¤à®¿à®©à¯? à®¤à¯?à®?à®°à¯?à®ªà¯? à®?à¯?à®°à¯?à®?à¯?à®?à®¿à®±à®¤à¯?..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1872
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1874
 msgid "Removing contact from LDAP server..."
 msgstr "LDAP  à®?à¯?à®µà¯?à®¯à®?à®¤à¯?à®¤à®¿à®²à¯?à®°à¯?à®¨à¯?à®¤à¯? à®¤à¯?à®?à®°à¯?à®ªà¯?  à®¨à¯?à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®?à®¿à®±à®¤à¯?..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2309
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2311
 msgid "Modifying contact from LDAP server..."
 msgstr "LDAP à®²à®¿à®©à¯? à®?à®³à¯?à®³ à®¤à¯?à®?à®°à¯?à®ªà®¿à®²à¯? à®®à®¾à®±à¯?à®±à®®à¯? à®?à¯?à®¯à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4412
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4414
 msgid "Receiving LDAP search results..."
 msgstr "LDAP à®?à®²à¯? à®¤à¯?à®?à®²à®¿à®©à¯? à®®à¯?à®?à®¿à®µà¯? à®ªà¯?à®±à¯?à®?à®¿à®±à®¤à¯?..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4573
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4575
 msgid "Error performing search"
 msgstr "à®ªà®¿à®´à¯?à®¯à®¾à®© à®?à¯?à®¯à®±à¯?à®ªà®¾à®?à¯?à®?à¯? à®?à¯?à®¤à®©à¯?à®¯à®¿à®?à¯?à®¤à®²à¯?"
 
-#: ../addressbook/libebook/e-book.c:2149
-#, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
+#: ../addressbook/libebook/e-book.c:2152
+#, fuzzy, c-format
+msgid "%s: there was no source for UID '%s' stored in GConf."
 msgstr "%s: uid à®?à¯?à®?à¯? à®®à¯?à®²à®®à¯? à®?à®¤à¯?à®µà¯?à®®à¯? à®?à®²à¯?à®²à¯?`%s' gconfà®²à¯? à®?à¯?à®®à®¿à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®?à¯?à®³à¯?à®³à®¤à¯?."
 
 #. Dummy row as EContactField starts from 1
@@ -355,27 +354,33 @@ msgid "GroupWise Work Screen Name 3"
 msgstr "à®?à¯?à®°à¯?à®ªà¯? à®µà¯?à®¸à¯? à®µà¯?à®²à¯? à®¤à®¿à®°à¯?à®¯à®¿à®©à¯? à®ªà¯?à®¯à®°à¯? 3"
 
 #: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 1"
+#, fuzzy
+msgid "Jabber Home ID 1"
 msgstr "à®?à®¾à®ªà®°à¯?(Jabber) à®µà¯?à®?à¯? à®®à¯?à®?à®µà®°à®¿ 1"
 
 #: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Home Id 2"
+#, fuzzy
+msgid "Jabber Home ID 2"
 msgstr "à®?à®¾à®ªà®°à¯?(Jabber) à®µà¯?à®?à¯? à®®à¯?à®?à®µà®°à®¿ 2"
 
 #: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Home Id 3"
+#, fuzzy
+msgid "Jabber Home ID 3"
 msgstr "à®?à®¾à®ªà®°à¯?(Jabber) à®µà¯?à®?à¯? à®®à¯?à®?à®µà®°à®¿ 3"
 
 #: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 1"
+#, fuzzy
+msgid "Jabber Work ID 1"
 msgstr "à®?à®¾à®ªà®°à¯?(Jabber) à®µà¯?à®²à¯? à®®à¯?à®?à®µà®°à®¿ 1"
 
 #: ../addressbook/libebook/e-contact.c:207
-msgid "Jabber Work Id 2"
+#, fuzzy
+msgid "Jabber Work ID 2"
 msgstr "à®?à®¾à®ªà®°à¯?(Jabber) à®µà¯?à®²à¯? à®®à¯?à®?à®µà®°à®¿ 2"
 
 #: ../addressbook/libebook/e-contact.c:208
-msgid "Jabber Work Id 3"
+#, fuzzy
+msgid "Jabber Work ID 3"
 msgstr "à®?à®¾à®ªà®°à¯?(Jabber) à®µà¯?à®²à¯? à®®à¯?à®?à®µà®°à®¿ 3"
 
 #: ../addressbook/libebook/e-contact.c:209
@@ -427,27 +432,33 @@ msgid "MSN Work Screen Name 3"
 msgstr "à®?à®®à¯?à®?à®¸à¯?à®?à®©à¯?(MSN) à®µà¯?à®²à¯? à®¤à®¿à®°à¯? à®ªà¯?à®¯à®°à¯? 3"
 
 #: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 1"
+#, fuzzy
+msgid "ICQ Home ID 1"
 msgstr "à®?à®?à¯?à®?à¯?à®¯à¯?(ICQ) à®µà¯?à®?à¯?à®?à¯? à®?à®?à®¿ 1"
 
 #: ../addressbook/libebook/e-contact.c:222
-msgid "ICQ Home Id 2"
+#, fuzzy
+msgid "ICQ Home ID 2"
 msgstr "à®?à®?à¯?à®?à¯?à®¯à¯?(ICQ) à®µà¯?à®?à¯?à®?à¯? à®?à®?à®¿ 2"
 
 #: ../addressbook/libebook/e-contact.c:223
-msgid "ICQ Home Id 3"
+#, fuzzy
+msgid "ICQ Home ID 3"
 msgstr "à®?à®?à¯?à®?à¯?à®¯à¯?(ICQ) à®µà¯?à®?à¯?à®?à¯? à®?à®?à®¿ 3"
 
 #: ../addressbook/libebook/e-contact.c:224
-msgid "ICQ Work Id 1"
+#, fuzzy
+msgid "ICQ Work ID 1"
 msgstr "à®?à®?à¯?à®?à¯?à®¯à¯?(ICQ) à®µà¯?à®²à¯? à®?à®?à®¿ 1"
 
 #: ../addressbook/libebook/e-contact.c:225
-msgid "ICQ Work Id 2"
+#, fuzzy
+msgid "ICQ Work ID 2"
 msgstr "à®?à®?à¯?à®?à¯?à®¯à¯?(ICQ) à®µà¯?à®²à¯? à®?à®?à®¿ 2"
 
 #: ../addressbook/libebook/e-contact.c:226
-msgid "ICQ Work Id 3"
+#, fuzzy
+msgid "ICQ Work ID 3"
 msgstr "à®?à®?à¯?à®?à¯?à®¯à¯?(ICQ) à®µà¯?à®²à¯? à®?à®?à®¿ 3"
 
 #. Last modified time
@@ -504,11 +515,13 @@ msgid "AIM Screen Name List"
 msgstr "AIM à®¤à®¿à®°à¯? à®ªà¯?à®¯à®°à¯? à®ªà®?à¯?à®?à®¿à®¯à®²à¯?"
 
 #: ../addressbook/libebook/e-contact.c:250
-msgid "GroupWise Id List"
+#, fuzzy
+msgid "GroupWise ID List"
 msgstr "à®?à¯?à®´à¯?à®µà®¾à®°à®¿à®¯à®¾à®? Id  à®ªà®?à¯?à®?à®¿à®¯à®²à¯?"
 
 #: ../addressbook/libebook/e-contact.c:251
-msgid "Jabber Id List"
+#, fuzzy
+msgid "Jabber ID List"
 msgstr "à®?à®ªà¯?à®ªà®¾à®°à¯? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®ªà®?à¯?à®?à®¿à®¯à®²à¯?"
 
 #: ../addressbook/libebook/e-contact.c:252
@@ -520,7 +533,8 @@ msgid "MSN Screen Name List"
 msgstr "à®?à®®à¯?à®?à®¸à¯?à®?à®©à¯?(MSN) à®¤à®¿à®°à¯? à®ªà¯?à®¯à®°à¯? à®ªà®?à¯?à®?à®¿à®¯à®²à¯?"
 
 #: ../addressbook/libebook/e-contact.c:254
-msgid "ICQ Id List"
+#, fuzzy
+msgid "ICQ ID List"
 msgstr "à®?à®?à¯?à®?à¯?à®¯à¯?(ICQ) à®®à¯?à®?à®µà®°à®¿ à®ªà®?à¯?à®?à®¿à®¯à®²à¯?"
 
 #: ../addressbook/libebook/e-contact.c:256
@@ -541,7 +555,7 @@ msgstr "à®ªà®¿à®±à®¨à¯?à®¤ à®¨à®¾à®³à¯?"
 
 #: ../addressbook/libebook/e-contact.c:262
 #: ../calendar/backends/contacts/e-cal-backend-contacts.c:715
-#: ../libedataserver/e-categories.c:45
+#: ../libedataserver/e-categories.c:42
 msgid "Anniversary"
 msgstr "à®?à®£à¯?à®?à¯?à®µà®¿à®´à®¾à®¾à®£à¯?à®?à¯?"
 
@@ -551,31 +565,38 @@ msgid "X.509 Certificate"
 msgstr "X.509 à®?à®¾à®©à¯?à®±à®¿à®¤à®´à¯?"
 
 #: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 1"
+#, fuzzy
+msgid "Gadu-Gadu Home ID 1"
 msgstr "à®?à®¾à®?à¯?-à®?à®¾à®?à¯?(IGadu-Gadu) à®µà¯?à®?à¯? Id 1"
 
 #: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Home Id 2"
+#, fuzzy
+msgid "Gadu-Gadu Home ID 2"
 msgstr "à®?à®¾à®?à¯?-à®?à®¾à®?à¯?(IGadu-Gadu)  à®µà¯?à®?à¯? Id 2"
 
 #: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Home Id 3"
+#, fuzzy
+msgid "Gadu-Gadu Home ID 3"
 msgstr "à®?à®¾à®?à¯?-à®?à®¾à®?à¯?(IGadu-Gadu) à®µà¯?à®?à¯? Id  3"
 
 #: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 1"
+#, fuzzy
+msgid "Gadu-Gadu Work ID 1"
 msgstr "à®?à®¾à®?à¯?-à®?à®¾à®?à¯?(IGadu-Gadu)  à®µà¯?à®²à¯? Id 1"
 
 #: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Work Id 2"
+#, fuzzy
+msgid "Gadu-Gadu Work ID 2"
 msgstr "à®?à®¾à®?à¯?-à®?à®¾à®?à¯?(IGadu-Gadu) à®µà¯?à®²à¯? Id  2"
 
 #: ../addressbook/libebook/e-contact.c:272
-msgid "Gadu-Gadu Work Id 3"
+#, fuzzy
+msgid "Gadu-Gadu Work ID 3"
 msgstr "à®?à®¾à®?à¯?-à®?à®¾à®?à¯?(IGadu-Gadu) à®µà¯?à®²à¯? à®®à¯?à®?à®µà®°à®¿ 3"
 
 #: ../addressbook/libebook/e-contact.c:273
-msgid "Gadu-Gadu Id List"
+#, fuzzy
+msgid "Gadu-Gadu ID List"
 msgstr "à®?à®¾à®?à¯?-à®?à®¾à®?à¯?(IGadu-Gadu) Id à®ªà®?à¯?à®?à®¿à®¯à®²à¯?"
 
 #. Geo information
@@ -619,20 +640,20 @@ msgstr "Skype à®ªà¯?à®¯à®°à¯? à®ªà®?à¯?à®?à®¿à®¯à®²à¯?"
 msgid "SIP address"
 msgstr "SIP à®®à¯?à®?à®µà®°à®¿"
 
-#: ../addressbook/libebook/e-contact.c:1513
+#: ../addressbook/libebook/e-contact.c:1517
 #: ../addressbook/libebook/e-destination.c:739
 msgid "Unnamed List"
 msgstr "à®ªà¯?à®¯à®°à®¿à®²à¯?à®²à®¾à®¤ à®ªà®?à¯?à®?à®¿à®¯à®²à¯?"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:290
+#: ../addressbook/libedata-book/e-data-book-factory.c:302
 #, c-format
 msgid "Empty URI"
 msgstr "à®µà¯?à®±à¯?à®±à¯? à®¯à¯?à®?à®°à¯?à®?"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:305
-#: ../addressbook/libedata-book/e-data-book-factory.c:332
-#: ../calendar/libedata-cal/e-data-cal-factory.c:323
-#: ../calendar/libedata-cal/e-data-cal-factory.c:332
+#: ../addressbook/libedata-book/e-data-book-factory.c:317
+#: ../addressbook/libedata-book/e-data-book-factory.c:348
+#: ../calendar/libedata-cal/e-data-cal-factory.c:324
+#: ../calendar/libedata-cal/e-data-cal-factory.c:333
 #, c-format
 msgid "Invalid source"
 msgstr "à®ªà®¯à®©à®±à¯?à®± à®®à¯?à®²à®®à¯?."
@@ -673,7 +694,7 @@ msgid "Cannot remove contacts"
 msgstr "à®¤à¯?à®?à®°à¯?à®ªà¯?à®?à®³à¯? à®¨à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
 #: ../addressbook/libedata-book/e-data-book.c:569
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
+#: ../calendar/libedata-cal/e-cal-backend-util.c:141
 msgid "Invalid query"
 msgstr "à®?à¯?à®²à¯?à®²à¯?à®ªà®?à®¿à®¯à®¾à®?à®¾à®¤ à®?à¯?à®³à¯?à®µà®¿"
 
@@ -686,7 +707,7 @@ msgid "Cannot complete operation"
 msgstr "à®?à¯?à®¯à®²à¯? à®®à¯?à®?à®¿à®?à¯?à®? à®?à®¯à®²à®µà®¿à®²à¯?à®²à¯?"
 
 #: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:43
 msgid "Birthday"
 msgstr "à®ªà®¿à®±à®¨à¯?à®¤à®¨à®¾à®³à¯?"
 
@@ -709,62 +730,55 @@ msgstr "à®¤à®µà®±à®¾à®© à®¯à¯?à®?à®°à¯?à®?(URI) à®¨à®¾à®³à¯?à®?à®¾à®?à¯?à®?à®¿ 
 msgid "Cannot save calendar data"
 msgstr "à®¨à®¾à®³à¯?à®?à®¾à®?à¯?à®?à®¿ à®¤à®°à®µà¯? à®?à¯?à®®à®¿à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:342
-msgid "Could not create thread for getting deltas"
-msgstr "à®?à¯?à®²à¯?à®?à®¾à®?à¯?à®?à®³à¯? à®ªà¯?à®± à®¤à¯?à®°à®?à¯?à®?à¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:374
-#: ../calendar/backends/google/e-cal-backend-google.c:1144
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1081
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1382
-#: ../calendar/backends/http/e-cal-backend-http.c:678
-#: ../calendar/backends/weather/e-cal-backend-weather.c:492
-msgid "Could not create cache file"
-msgstr "à®¤à®±à¯?à®?à®¾à®²à®¿à®? à®?à¯?à®ªà¯?à®ªà¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:387
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1094
-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:2122
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1118
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2246
 msgid "Reply Requested: by "
 msgstr "à®ªà®¤à®¿à®²à¯? à®?à¯?à®°à®ªà¯?à®ªà®?à¯?à®?à®¤à¯?:"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2127
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1123
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2251
 msgid "Reply Requested: When convenient"
 msgstr "à®ªà®¤à®¿à®²à¯? à®?à¯?à®°à®ªà¯?à®ªà®?à¯?à®?à®¤à¯?: à®?à®¾à®¤à®?à®®à®¾à®? à®?à®°à¯?à®?à¯?à®?à¯?à®®à¯? à®ªà¯?à®¤à¯?"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:283
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:292
 #, c-format
 msgid "Loading %s items"
 msgstr "à®ªà¯?à®±à¯?à®ªà¯?à®ªà®¾à®© à®µà®?à¯?à®?à®³à¯? (%s)"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:919
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:925
 msgid "Calendar"
 msgstr "à®¨à®¾à®³à¯?à®?à®¾à®?à¯?à®?à®¿"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:977
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:983
 msgid "Invalid server URI"
 msgstr "à®?à¯?à®²à¯?à®²à®¾à®¤ à®¯à¯?à®?à®°à¯?à®?(URI) à®?à¯?à®µà®?à®©à¯?"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:996
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1005
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1099
-#: ../calendar/libecal/e-cal.c:4020
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1335
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1371
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1386
-#: ../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
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1002
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1011
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1104
+#: ../calendar/libecal/e-cal.c:4025
+#: ../calendar/libedata-cal/e-cal-backend-util.c:119
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1423
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1461
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1476
+#: ../camel/providers/groupwise/camel-groupwise-store.c:603
+#: ../camel/providers/groupwise/camel-groupwise-store.c:789
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:84
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:115
 msgid "Authentication failed"
 msgstr "à®?à®©à¯?à®®à®¤à®¿à®¤à¯?à®¤à®²à¯? à®¤à¯?à®²à¯?à®µà®¿"
 
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1086
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1384
+#: ../calendar/backends/http/e-cal-backend-http.c:678
+#: ../calendar/backends/weather/e-cal-backend-weather.c:492
+msgid "Could not create cache file"
+msgstr "à®¤à®±à¯?à®?à®¾à®²à®¿à®? à®?à¯?à®ªà¯?à®ªà¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1099
+msgid "Could not create thread for populating cache"
+msgstr "à®?à®?à®®à®¾à®±à¯?à®±à®¿à®©à¯? à®ªà®°à®ªà¯?à®ª à®¤à¯?à®°à®?à¯?à®?à¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?"
+
 #: ../calendar/backends/http/e-cal-backend-http.c:335
 msgid "Redirected to Invalid URI"
 msgstr "à®?à¯?à®²à¯?à®²à®¾à®¤ à®¯à¯?à®?à®°à¯?à®?(URI) à®?à¯?à®?à¯? à®¤à®¿à®?à¯? à®®à®¾à®±à¯?à®±à®ªà¯?à®ªà®?à¯?à®?à®¤à¯?"
@@ -966,7 +980,7 @@ msgstr "à®?à¯?à®±à¯?à®µà®¾à®©à¯?"
 msgid "Undefined"
 msgstr "à®?à¯?à®±à®¿à®ªà¯?à®ªà®¿à®²à¯?à®²à®¾"
 
-#: ../calendar/libecal/e-cal.c:1173 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1178 ../libedataserverui/e-book-auth-util.c:198
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s à®?à¯?à®?à¯? à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯?à®²à¯? à®?à®³à¯?à®³à®¿à®?à®µà¯?à®®à¯? (à®ªà®¯à®©à®°à¯? %s)"
@@ -975,107 +989,101 @@ msgstr "%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:1187
+#: ../calendar/libecal/e-cal.c:1192
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "%s à®ªà®¯à®©à®°à¯?à®?à¯?à®?à¯? à®ªà®¤à®¿à®²à®¾à®³à¯? à®?à¯?à®¯à®²à¯?à®ªà®?à¯?à®¤à¯?à®¤ %sà®?à¯?à®?à¯? à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯?à®²à¯? à®?à®³à¯?à®³à®¿à®?à®µà¯?à®®à¯?"
 
-#: ../calendar/libecal/e-cal.c:3992
+#: ../calendar/libecal/e-cal.c:3997
 msgid "Invalid argument"
 msgstr "à®¤à®µà®°à®¾à®© à®?à®³à®µà¯?à®°à¯?"
 
-#: ../calendar/libecal/e-cal.c:3994
+#: ../calendar/libecal/e-cal.c:3999
 msgid "Backend is busy"
 msgstr "à®ªà®¿à®©à¯?à®¤à®°à®µà¯? à®¤à®³à®®à¯? à®µà¯?à®²à¯?à®¯à®¿à®²à¯? à®?à®³à¯?à®³à®¤à¯?"
 
-#: ../calendar/libecal/e-cal.c:3996
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:4001
+#: ../calendar/libedata-cal/e-cal-backend-util.c:107
 msgid "Repository is offline"
 msgstr "à®?à®¿à®?à®?à¯?à®?à¯? à®?à®£à¯?à®¯à®¤à¯?à®¤à¯?à®?à®°à¯?à®ªà®¿à®²à¯? à®?à®²à¯?à®²à¯?"
 
-#: ../calendar/libecal/e-cal.c:3998
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
+#: ../calendar/libecal/e-cal.c:4003
+#: ../calendar/libedata-cal/e-cal-backend-util.c:131
 msgid "No such calendar"
 msgstr "à®?à®ªà¯?à®ªà®?à®¿ à®?à®°à¯? à®¨à®¾à®³à¯?à®?à®¾à®?à¯?à®?à®¿ à®?à®²à¯?à®²à¯?"
 
-#: ../calendar/libecal/e-cal.c:4000
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
+#: ../calendar/libecal/e-cal.c:4005
+#: ../calendar/libedata-cal/e-cal-backend-util.c:113
 #: ../servers/groupwise/e-gw-connection.c:235
 msgid "Object not found"
 msgstr "à®ªà¯?à®°à¯?à®³à¯? à®?à®¾à®£à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../calendar/libecal/e-cal.c:4002
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
+#: ../calendar/libecal/e-cal.c:4007
+#: ../calendar/libedata-cal/e-cal-backend-util.c:115
 #: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "à®ªà®¯à®©à¯?à®±à®± à®¨à¯?à®?à¯?à®?à®®à¯?"
 
-#: ../calendar/libecal/e-cal.c:4004
+#: ../calendar/libecal/e-cal.c:4009
 msgid "URI not loaded"
 msgstr "à®¯à¯?à®?à®°à¯?à®?(URI) à®?à®±à¯?à®±à®ªà¯?à®ªà®?à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../calendar/libecal/e-cal.c:4006
+#: ../calendar/libecal/e-cal.c:4011
 msgid "URI already loaded"
 msgstr "à®¯à¯?à®?à®°à¯?à®?(URI) à®?à®±à¯?à®?à¯?à®©à®µà¯? à®?à®±à¯?à®±à®ªà¯?à®ªà®?à¯?à®?à®¤à¯?"
 
-#: ../calendar/libecal/e-cal.c:4008
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
+#: ../calendar/libecal/e-cal.c:4013
+#: ../calendar/libedata-cal/e-cal-backend-util.c:109
 msgid "Permission denied"
 msgstr "à®?à®©à¯?à®®à®¤à®¿ à®®à®±à¯?à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®?à®¤à¯?"
 
-#: ../calendar/libecal/e-cal.c:4010
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
+#: ../calendar/libecal/e-cal.c:4015
+#: ../calendar/libedata-cal/e-cal-backend-util.c:133
 #: ../servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "à®ªà®¯à®©à®ªà®?à¯?à®¤à¯?à®¤à¯?à®µà®¤à¯? à®?à®±à®¿à®¨à¯?à®¤à®¿à®°à®¾à®¤à®µà®°à¯? "
 
-#: ../calendar/libecal/e-cal.c:4012
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../calendar/libecal/e-cal.c:4017
+#: ../calendar/libedata-cal/e-cal-backend-util.c:117
 msgid "Object ID already exists"
 msgstr "à®¨à¯?à®?à¯?à®?à®®à¯? ID à®?à®±à¯?à®?à¯?à®©à®µà¯? à®¤à¯?à®±à¯?à®±à¯?à®µà®¿à®?à¯?à®?à®ªà¯? à®ªà®?à¯?à®?à¯?à®³à¯?à®³à®¤à¯?"
 
-#: ../calendar/libecal/e-cal.c:4014
+#: ../calendar/libecal/e-cal.c:4019
 msgid "Protocol not supported"
 msgstr "à®µà®¿à®¤à®¿à®®à¯?à®±à¯?à®?à¯?à®?à¯? à®?à®¤à®°à®µà¯? à®?à®²à¯?à®²à¯?"
 
-#: ../calendar/libecal/e-cal.c:4016
+#: ../calendar/libecal/e-cal.c:4021
 msgid "Operation has been canceled"
 msgstr "à®?à¯?à®¯à®²à¯?à®ªà®¾à®?à¯? à®°à®¤à¯?à®¤à¯? à®?à¯?à®¯à¯?à®¯à®ªà¯?à®ªà®?à¯?à®?à®¤à¯?"
 
-#: ../calendar/libecal/e-cal.c:4018
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
+#: ../calendar/libecal/e-cal.c:4023
+#: ../calendar/libedata-cal/e-cal-backend-util.c:145
 msgid "Could not cancel operation"
 msgstr "à®?à¯?à®¯à®²à¯?à®ªà®¾à®?à¯?à®?à¯? à®°à®¤à¯?à®¤à¯? à®?à¯?à®¯à¯?à®¯ à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../calendar/libecal/e-cal.c:4022
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:217
+#: ../calendar/libecal/e-cal.c:4027
+#: ../calendar/libedata-cal/e-cal-backend-util.c:121
+#: ../camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Authentication required"
 msgstr "à®?à®©à¯?à®®à®¤à®¿ à®¤à¯?à®µà¯?"
 
-#: ../calendar/libecal/e-cal.c:4024
+#: ../calendar/libecal/e-cal.c:4029
 msgid "A CORBA exception has occurred"
 msgstr "CORBA à®ªà®¿à®´à¯? à®¨à¯?à®°à¯?à®¨à¯?à®¤à®¤à¯?"
 
-#: ../calendar/libecal/e-cal.c:4026
-#: ../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:741
-#: ../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:582
+#: ../calendar/libecal/e-cal.c:4031
+#: ../calendar/libedata-cal/e-cal-backend-util.c:148
+#: ../camel/camel-net-utils.c:534
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:153
+#: ../camel/providers/imap/camel-imap-command.c:455
+#: ../camel/providers/imap/camel-imap-store.c:631
+#: ../camel/providers/pop3/camel-pop3-store.c:604
 #: ../servers/groupwise/e-gw-connection.c:243
 msgid "Unknown error"
 msgstr "à®¤à¯?à®°à®¿à®¯à®¾à®¤ à®ªà®¿à®´à¯?"
 
-#: ../calendar/libecal/e-cal.c:4028
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
+#: ../calendar/libecal/e-cal.c:4033
+#: ../calendar/libedata-cal/e-cal-backend-util.c:105
 msgid "No error"
 msgstr "à®ªà®¿à®´à¯? à®?à®²à¯?à®²à¯?"
 
@@ -1110,7 +1118,8 @@ msgstr "\"%s\" à®®à¯?à®¤à®²à¯? à®?à®³à®ªà¯?à®°à¯? à®?à®°à®®à®¾à®? à®?à®°à¯?à®?
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
-msgstr "\"%s\" à®®à¯?à®¤à®²à¯? à®?à®³à®ªà¯?à®°à¯? ISO 860 à®¤à¯?à®¤à®¿/à®¨à¯?à®° à®?à®°à®®à®¾à®? à®?à®°à¯?à®?à¯?à®? à®µà¯?à®£à¯?à®?à¯?à®®à¯? à®?à®© à®?à®¤à®¿à®°à¯?à®ªà®¾à®°à¯?à®?à¯?à®?à®¿à®±à®¤à¯?"
+msgstr ""
+"\"%s\" à®®à¯?à®¤à®²à¯? à®?à®³à®ªà¯?à®°à¯? ISO 860 à®¤à¯?à®¤à®¿/à®¨à¯?à®° à®?à®°à®®à®¾à®? à®?à®°à¯?à®?à¯?à®? à®µà¯?à®£à¯?à®?à¯?à®®à¯? à®?à®© à®?à®¤à®¿à®°à¯?à®ªà®¾à®°à¯?à®?à¯?à®?à®¿à®±à®¤à¯?"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:162
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:363
@@ -1174,229 +1183,230 @@ msgstr ""
 "\"%s\" à®?à®²à¯?à®²à®¾ à®?à®³à®ªà¯?à®°à¯?à®?à¯?à®?à®³à¯?à®®à¯? à®?à®°à®®à®¾à®?à®µà¯? à®?à®²à¯?à®²à®¤à¯? à®?à®°à¯? à®?à®°à¯? à®?à®³à®ªà¯?à®°à¯? à®®à®?à¯?à®?à¯?à®®à¯? à®ªà¯?à®²à®¿à®¯à®©à¯? à®®à®¤à®¿à®ªà¯?à®ªà¯? "
 "à®¤à®µà®±à®¾à®?à®µà¯?(#f) à®?à®°à¯?à®?à¯?à®? à®µà¯?à®£à¯?à®?à¯?à®®à¯? à®?à®© à®?à®¤à®¿à®°à¯?à®ªà®¾à®°à¯?à®?à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+#: ../calendar/libedata-cal/e-cal-backend-util.c:111
 msgid "Invalid range"
 msgstr "à®?à¯?à®²à¯?à®²à¯?à®ªà®?à®¿à®¯à®¾à®?à®¾à®¤ à®µà¯?à®?à¯?à®?à¯?"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
+#: ../calendar/libedata-cal/e-cal-backend-util.c:123
 msgid "Unsupported field"
 msgstr "à®?à®¤à®°à®µà®¿à®²à¯?à®²à®¾ à®ªà¯?à®²à®®à¯?"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-cal-backend-util.c:125
 msgid "Unsupported method"
 msgstr "à®?à®¤à®°à®µà¯? à®?à®²à¯?à®²à®¾à®¤ à®ªà®¾à®?à¯?à®?à¯?"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
+#: ../calendar/libedata-cal/e-cal-backend-util.c:127
 msgid "Unsupported authentication method"
 msgstr "à®¤à¯?à®£à¯?à®¯à®¿à®²à¯?à®²à®¾à®¤ à®?à®±à¯?à®¤à®¿ à®?à¯?à®¯à¯?à®¯à¯?à®®à¯? à®?à¯?à®¯à®²à¯?à®ªà®¾à®?à¯? "
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
+#: ../calendar/libedata-cal/e-cal-backend-util.c:129
 msgid "TLS not available"
 msgstr "à®?à®¿à®?à®²à¯?à®?à®¸à¯? (TLS) à®?à®¿à®?à¯?à®?à¯?à®?à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
+#: ../calendar/libedata-cal/e-cal-backend-util.c:135
 msgid "Offline mode unavailable"
 msgstr "à®?à®£à¯?à®ªà¯?à®ªà¯? à®µà®¿à®²à®?à®¿ à®?à®¿à®?à¯?à®?à¯?à®?à®µà®¿à®²à¯?à®²à¯? "
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
+#: ../calendar/libedata-cal/e-cal-backend-util.c:137
 msgid "Search size limit exceeded"
 msgstr "à®¤à¯?à®?à¯? à®?à®³à®µà¯? à®µà®°à¯?à®¯à®°à¯? à®®à¯?à®±à®ªà¯?à®ªà®?à¯?à®?à®¤à¯?"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
+#: ../calendar/libedata-cal/e-cal-backend-util.c:139
 msgid "Search time limit exceeded"
 msgstr "à®¤à¯?à®?à¯? à®¨à¯?à®°à®®à¯? à®µà®°à¯?à®¯à®°à¯? à®®à¯?à®±à®ªà¯?à®ªà®?à¯?à®?à®¤à¯?"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
+#: ../calendar/libedata-cal/e-cal-backend-util.c:143
 msgid "Query refused"
 msgstr "à®?à¯?à®³à¯?à®µà®¿ à®¨à®¿à®°à®¾à®?à®°à®¿à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®?à®¤à¯?"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
+#: ../calendar/libedata-cal/e-cal-backend-util.c:150
 msgid "Invalid server version"
 msgstr "à®¤à®µà®±à®¾à®© à®?à¯?à®µà¯?à®¯à®? à®ªà®¤à®¿à®ªà¯?à®ªà¯? "
 
-#: ../calendar/libedata-cal/e-data-cal.c:491
+#: ../calendar/libedata-cal/e-data-cal.c:501
 #, c-format
 msgid "Cannot retrieve calendar address"
 msgstr "à®¨à®¾à®³à¯?à®?à®¾à®?à¯?à®?à®¿ à®®à¯?à®?à®µà®°à®¿à®¯à¯? à®®à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:509
+#: ../calendar/libedata-cal/e-data-cal.c:519
 #, c-format
 msgid "Cannot retrieve calendar alarm e-mail address"
 msgstr "à®¨à®¾à®³à¯?à®?à®¾à®?à¯?à®?à®¿ à®?à®?à¯?à®?à®°à®¿à®?à¯?à®?à¯? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®®à¯?à®?à®µà®°à®¿à®¯à¯? à®®à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:527
+#: ../calendar/libedata-cal/e-data-cal.c:537
 #, c-format
 msgid "Cannot retrieve calendar's ldap attribute"
 msgstr "à®¨à®¾à®³à¯?à®?à®¾à®?à¯?à®?à®¿ à®?à®²à¯?à®?à¯?à®ªà¯? à®ªà®£à¯?à®ªà¯?à®?à¯?à®?à¯?à®±à¯?à®±à¯? à®®à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:545
+#: ../calendar/libedata-cal/e-data-cal.c:555
 #, c-format
 msgid "Cannot retrieve calendar scheduling information"
 msgstr "à®¨à®¾à®³à¯?à®?à®¾à®?à¯?à®?à®¿ à®¤à®¿à®?à¯?à®? à®?à®?à¯?à®?à®µà®£à¯? à®¤à®?à®µà®²à¯? à®®à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:562
+#: ../calendar/libedata-cal/e-data-cal.c:572
 #, c-format
 msgid "Cannot open calendar"
 msgstr "à®¨à®¾à®³à¯?à®?à®¾à®?à¯?à®?à®¿à®¯à¯? à®¤à®¿à®±à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:579
+#: ../calendar/libedata-cal/e-data-cal.c:591
 #, c-format
 msgid "Cannot refresh calendar"
 msgstr "à®¨à®¾à®³à¯?à®?à®¾à®?à¯?à®?à®¿à®¯à¯? xxx à®¨à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:596
+#: ../calendar/libedata-cal/e-data-cal.c:608
 #, c-format
 msgid "Cannot remove calendar"
 msgstr "à®¨à®¾à®³à¯?à®?à®¾à®?à¯?à®?à®¿à®¯à¯? à®¨à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:615
+#: ../calendar/libedata-cal/e-data-cal.c:627
 #, c-format
 msgid "Cannot create calendar object"
 msgstr "à®¨à®¾à®³à¯?à®?à®¾à®?à¯?à®?à®¿à®¯à¯? à®ªà¯?à®°à¯?à®³à¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? "
 
-#: ../calendar/libedata-cal/e-data-cal.c:637, c-format
+#: ../calendar/libedata-cal/e-data-cal.c:649
+#, c-format
 msgid "Cannot modify calendar object"
 msgstr "à®¨à®¾à®³à¯?à®?à®¾à®?à¯?à®?à®¿ à®ªà¯?à®°à¯?à®³à¯? à®®à®¾à®±à¯?à®± à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? "
 
-#: ../calendar/libedata-cal/e-data-cal.c:661
+#: ../calendar/libedata-cal/e-data-cal.c:673
 #, c-format
 msgid "Cannot remove calendar object"
 msgstr "à®¨à®¾à®³à¯?à®?à®¾à®?à¯?à®?à®¿à®¯à¯? à®ªà¯?à®°à¯?à®³à¯? à®¨à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? "
 
-#: ../calendar/libedata-cal/e-data-cal.c:680
+#: ../calendar/libedata-cal/e-data-cal.c:692
 #, c-format
 msgid "Cannot receive calendar objects"
 msgstr "à®¨à®¾à®³à¯?à®?à®¾à®?à¯?à®?à®¿à®¯à¯? à®ªà¯?à®°à¯?à®?à¯?à®?à®³à¯? à®ªà¯?à®± à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? "
 
-#: ../calendar/libedata-cal/e-data-cal.c:697
+#: ../calendar/libedata-cal/e-data-cal.c:709
 #, c-format
 msgid "Cannot discard calendar alarm"
 msgstr "à®¨à®¾à®³à¯?à®?à®¾à®?à¯?à®?à®¿ à®?à®?à¯?à®?à®°à®¿à®?à¯?à®?à¯?à®¯à¯? à®¨à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:716
+#: ../calendar/libedata-cal/e-data-cal.c:728
 #, c-format
 msgid "Cannot send calendar objects"
 msgstr "à®¨à®¾à®³à¯?à®?à®¾à®?à¯?à®?à®¿  à®ªà¯?à®°à¯?à®³à¯? à®?à®©à¯?à®ªà¯?à®ª à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:751
+#: ../calendar/libedata-cal/e-data-cal.c:763
 #, c-format
 msgid "Cannot retrieve default calendar object path"
 msgstr "à®®à¯?à®©à¯?à®©à®¿à®°à¯?à®ªà¯?à®ªà¯? à®¨à®¾à®³à¯?à®?à®¾à®?à¯?à®?à®¿ à®ªà¯?à®°à¯?à®³à¯? à®ªà®¾à®¤à¯?à®¯à¯? à®®à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:769
+#: ../calendar/libedata-cal/e-data-cal.c:781
 #, c-format
 msgid "Cannot retrieve calendar object path"
 msgstr "à®¨à®¾à®³à¯?à®?à®¾à®?à¯?à®?à®¿ à®ªà¯?à®°à¯?à®³à¯? à®ªà®¾à®¤à¯?à®¯à¯? à®®à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:787
+#: ../calendar/libedata-cal/e-data-cal.c:799
 #, c-format
 msgid "Cannot retrieve calendar object list"
 msgstr "à®¨à®¾à®³à¯?à®?à®¾à®?à¯?à®?à®¿ à®ªà¯?à®°à¯?à®³à¯? à®ªà®?à¯?à®?à®¿à®¯à®²à¯? à®®à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:825
+#: ../calendar/libedata-cal/e-data-cal.c:837
 #, c-format
 msgid "Could not retrieve attachment list"
 msgstr "à®?à®£à¯?à®ªà¯?à®ªà¯? à®ªà®?à¯?à®?à®¿à®¯à®²à¯? à®®à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:847
+#: ../calendar/libedata-cal/e-data-cal.c:859
 #, c-format
 msgid "Could not complete calendar query"
 msgstr "à®¨à®¾à®³à¯?à®?à®¾à®?à¯?à®?à®¿ à®?à®?à®¾à®µà®²à¯? à®®à¯?à®?à®¿à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:865
+#: ../calendar/libedata-cal/e-data-cal.c:877
 #, c-format
 msgid "Could not retrieve calendar time zone"
 msgstr "à®¨à®¾à®³à¯?à®?à®¾à®?à¯?à®?à®¿ à®¨à¯?à®° à®®à®£à¯?à®?à®²à®¤à¯?à®¤à¯? à®®à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:883
+#: ../calendar/libedata-cal/e-data-cal.c:895
 #, c-format
 msgid "Could not add calendar time zone"
 msgstr "à®¨à®¾à®³à¯?à®?à®¾à®?à¯?à®?à®¿ à®¨à¯?à®° à®®à®£à¯?à®?à®²à®¤à¯?à®¤à¯? à®?à¯?à®°à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:900
+#: ../calendar/libedata-cal/e-data-cal.c:912
 #, c-format
 msgid "Could not set default calendar time zone"
 msgstr "à®®à¯?à®©à¯?à®©à®¿à®°à¯?à®ªà¯?à®ªà¯? à®¨à®¾à®³à¯?à®?à®¾à®?à¯?à®?à®¿ à®¨à¯?à®° à®®à®£à¯?à®?à®²à®¤à¯?à®¤à¯? à®?à®®à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:921
+#: ../calendar/libedata-cal/e-data-cal.c:933
 #, c-format
 msgid "Cannot retrieve calendar changes"
 msgstr "à®¨à®¾à®³à¯?à®?à®¾à®?à¯?à®?à®¿ à®®à®¾à®±à¯?à®±à®?à¯?à®?à®³à¯? à®®à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:971
+#: ../calendar/libedata-cal/e-data-cal.c:983
 #, c-format
 msgid "Cannot retrieve calendar free/busy list"
 msgstr "à®¨à®¾à®³à¯?à®?à®¾à®?à¯?à®?à®¿ à®?à®¯à¯?à®µà¯?/à®µà¯?à®²à¯?à®¯à®¿à®²à¯? à®ªà®?à¯?à®?à®¿à®¯à®²à¯? à®®à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:339
+#: ../calendar/libedata-cal/e-data-cal-factory.c:340
 #, c-format
 msgid "Invalid URI"
 msgstr "à®?à¯?à®²à¯?à®²à®¾à®¤ à®¯à¯?à®?à®°à¯?à®?"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:350
+#: ../calendar/libedata-cal/e-data-cal-factory.c:351
 #, c-format
 msgid "No backend factory for '%s' of '%s'"
 msgstr " '%s' à®?à®²à¯? '%s' à®?à¯?à®?à¯? à®ªà®¿à®©à¯?à®?à®¯à®?à¯?à®?à®¿ à®¤à¯?à®´à®¿à®±à¯?à®?à®¾à®²à¯? à®?à®²à¯?à®²à¯?"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:390
+#: ../calendar/libedata-cal/e-data-cal-factory.c:391
 #, c-format
 msgid "Could not instantiate backend"
 msgstr "à®ªà®¿à®©à¯?  à®?à®¯à®?à¯?à®?à®¿à®¯à¯? à®¤à¯?à®µà®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-cipher-context.c:102
+#: ../camel/camel-cipher-context.c:74
 msgid "Signing is not supported by this cipher"
 msgstr "à®?à®¿à®ªà¯?à®ªà®°à®¿à®²à¯? à®?à®³à¯?à®¨à¯?à®´à¯?à®µà®¤à®±à¯?à®?à®¾à®© à®?à®¤à®°à®µà¯? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/camel-cipher-context.c:128
+#: ../camel/camel-cipher-context.c:109
 msgid "Signing message"
 msgstr "à®?à®³à¯?à®¨à¯?à®´à¯?à®¯ à®?à¯?à®¯à¯?à®¤à®¿"
 
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:129
 msgid "Verifying is not supported by this cipher"
 msgstr "à®?à®¿à®ªà¯?à®ªà®°à®¿à®²à¯? à®?à®°à®¿ à®ªà®¾à®°à¯?à®ªà¯?à®ªà®¤à®±à¯?à®?à®¾à®© à®?à®¤à®°à®µà¯? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/camel-cipher-context.c:171
+#: ../camel/camel-cipher-context.c:162
 msgid "Verifying message"
 msgstr "à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®?à®°à®¿à®ªà®¾à®°à¯?à®?à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../camel/camel-cipher-context.c:189
+#: ../camel/camel-cipher-context.c:185
 msgid "Encryption is not supported by this cipher"
 msgstr "à®?à®¿à®ªà¯?à®ªà®°à®¿à®²à¯? à®?à¯?à®±à®¿à®®à¯?à®±à¯?à®¯à®¾à®?à¯?à®?à®¤à¯?à®¤à®¿à®±à¯?à®?à®¾à®© à®?à®¤à®°à®µà¯? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/camel-cipher-context.c:215
+#: ../camel/camel-cipher-context.c:220
 msgid "Encrypting message"
 msgstr "à®?à¯?à®¯à¯?à®¤à®¿ à®?à¯?à®±à®¿à®®à¯?à®±à¯?à®¯à®¾à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../camel/camel-cipher-context.c:232
+#: ../camel/camel-cipher-context.c:242
 msgid "Decryption is not supported by this cipher"
 msgstr "à®?à®¿à®ªà¯?à®ªà®°à®¿à®²à¯? à®®à®±à¯?à®¯à¯?à®?à¯? à®¨à¯?à®?à¯?à®?à®¤à¯?à®¤à®¿à®±à¯?à®?à®¾à®© à®?à®¤à®°à®µà¯? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/camel-cipher-context.c:254
+#: ../camel/camel-cipher-context.c:272
 msgid "Decrypting message"
 msgstr "à®?à¯?à®¯à¯?à®¤à®¿ à®®à®±à¯?à®¯à¯?à®?à¯? à®¨à¯?à®?à¯?à®?à®®à¯? à®?à¯?à®¯à¯?à®¯à®ªà¯?à®ªà®?à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../camel/camel-cipher-context.c:271
+#: ../camel/camel-cipher-context.c:292
 msgid "You may not import keys with this cipher"
 msgstr "à®?à®¿à®ªà¯?à®ªà®°à®¾à®²à¯? à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯?à®²à¯? à®?à®³à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-cipher-context.c:301
+#: ../camel/camel-cipher-context.c:332
 msgid "You may not export keys with this cipher"
 msgstr "à®?à®¿à®ªà¯?à®ªà®°à®¾à®²à¯? à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯?à®²à¯? à®?à®©à¯?à®ªà¯?à®ª à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-data-cache.c:135
+#: ../camel/camel-data-cache.c:184
 msgid "Unable to create cache path"
 msgstr "à®¤à®±à¯?à®?à®¾à®²à®¿à®? à®¨à®¿à®©à¯?à®µà®¿à®? à®ªà®¾à®¤à¯?à®¯à¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-data-cache.c:401
+#: ../camel/camel-data-cache.c:494
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "à®¤à®±à¯?à®?à®¾à®²à®¿à®? à®¨à®¿à®©à¯?à®µà®¿à®? à®¤à®?à®µà®²à¯? à®¨à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s: %s"
 
-#: ../camel/camel-db.c:411
+#: ../camel/camel-db.c:458
 msgid "Insufficient memory"
 msgstr "à®¨à®¿à®©à¯?à®µà®?à®®à¯? à®ªà¯?à®¤à®µà®¿à®²à¯?à®²à¯? "
 
-#: ../camel/camel-disco-diary.c:197
+#: ../camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1407,8 +1417,8 @@ msgstr ""
 "à®?à®©à®¿ à®µà®°à¯?à®®à¯? à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à¯? à®?à¯?à®µà®?à®©à¯?à®?à®©à¯? à®®à¯?à®£à¯?à®?à¯?à®®à¯? à®?à®£à¯?à®¯à¯?à®®à¯? à®ªà¯?à®¤à¯? \n"
 "à®®à¯?à®£à¯?à®?à¯?à®®à¯? à®?à®¯à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?."
 
-#: ../camel/camel-disco-diary.c:260
-#: ../camel/providers/imap/camel-imap-journal.c:320
+#: ../camel/camel-disco-diary.c:259
+#: ../camel/providers/imap/camel-imap-journal.c:299
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1419,120 +1429,123 @@ msgstr ""
 "%s\n"
 "à®?à®¨à¯?à®¤ à®?à®?à¯?à®µà®¿à®²à¯? à®?à¯?à®¯à¯?à®¯à®ªà¯?à®ªà®?à¯?à®®à¯? à®®à®¾à®±à¯?à®¤à®²à¯?à®?à®³à¯? à®?à®¤à¯?à®¤à®¿à®?à¯?à®?à¯?à®?à®ªà¯?à®ªà®? à®®à®¾à®?à¯?à®?à®¾à®¤à¯?"
 
-#: ../camel/camel-disco-diary.c:296
+#: ../camel/camel-disco-diary.c:299
 msgid "Resynchronizing with server"
 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:68 ../camel/camel-offline-folder.c:65
 msgid "Downloading new messages for offline mode"
 msgstr "à®?à®£à¯?à®¯à®¤à¯?à®¤à®¿à®©à¯? à®?à®£à¯?à®¯à®¾à®®à®²à¯? à®µà¯?à®²à¯? à®?à¯?à®¯à¯?à®¯ à®ªà¯?à®¤à®¿à®¯ à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®ªà®¤à®¿à®µà®¿à®±à®?à¯?à®?à®®à¯? à®?à¯?à®¯à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../camel/camel-disco-folder.c:466
+#: ../camel/camel-disco-folder.c:346
 #, 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:1001
-#: ../camel/providers/imap/camel-imap-store.c:1843
-#: ../camel/providers/imap/camel-imap-store.c:2259
-#: ../camel/providers/imap/camel-imap-store.c:3068
+#: ../camel/camel-disco-folder.c:412 ../camel/camel-offline-folder.c:223
+msgid "Copy folder content locally for offline operation"
+msgstr "à®?à®£à¯?à®¯à®¤à¯?à®¤à®¿à®©à¯? à®?à®£à¯?à®¯à®¾à®®à®²à¯? à®µà¯?à®²à¯? à®?à¯?à®¯à¯?à®¯ à®?à®?à¯?à®µà¯? à®?à®?à¯?à®?à®³à¯? à®?à®£à®¿à®©à®¿à®¯à®¿à®²à¯? à®¨à®?à®²à¯?à®?à¯?à®?à¯?à®?à®µà¯?à®®à¯?"
+
+#: ../camel/camel-disco-store.c:376
+#: ../camel/providers/groupwise/camel-groupwise-store.c:228
+#: ../camel/providers/imap/camel-imap-store.c:894
+#: ../camel/providers/imap/camel-imap-store.c:1798
+#: ../camel/providers/imap/camel-imap-store.c:2256
+#: ../camel/providers/imap/camel-imap-store.c:3100
+#: ../camel/providers/imapx/camel-imapx-store.c:172
+#: ../camel/providers/imapx/camel-imapx-store.c:651
+#: ../camel/providers/imapx/camel-imapx-store.c:713
+#: ../camel/providers/imapx/camel-imapx-store.c:763
 msgid "You must be working online to complete this operation"
 msgstr "à®?à®¨à¯?à®¤ à®?à¯?à®¯à®²à¯? à®®à¯?à®?à®¿à®?à¯?à®? à®?à®£à¯?à®¯à®¤à¯?à®?à®°à¯?à®ªà¯? à®¤à¯?à®µà¯?"
 
-#: ../camel/camel-exception.c:260
+#: ../camel/camel-exception.c:281
 msgid "No description available"
 msgstr "à®®à¯?à®´à¯? à®µà®¿à®µà®°à®?à¯?à®?à®³à¯? à®?à®¾à®£à®ªà¯?à®ªà®?à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-filter-driver.c:794 ../camel/camel-filter-search.c:579
+#: ../camel/camel-filter-driver.c:803 ../camel/camel-filter-search.c:583
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "à®¤à¯?à®£à¯? à®?à¯?à®¯à®²à¯? à®?à®°à¯?à®µà®¾à®?à¯?à®?à¯?à®µà®¤à®¿à®²à¯? à®¤à¯?à®²à¯?à®µà®¿ '%s': %s"
 
-#: ../camel/camel-filter-driver.c:836
+#: ../camel/camel-filter-driver.c:846
 #, 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:1035 ../camel/camel-filter-driver.c:1044
 msgid "Syncing folders"
 msgstr "à®?à®?à¯?à®µà¯?à®?à®³à¯? à®?à®¤à¯?à®¤à®¿à®?à¯?à®?à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../camel/camel-filter-driver.c:1121 ../camel/camel-filter-driver.c:1522
+#: ../camel/camel-filter-driver.c:1132 ../camel/camel-filter-driver.c:1559
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "à®µà®?à®¿à®?à®?à¯?à®?à®¿à®¯à¯? à®ªà®?à¯?à®?à¯?à®?à¯?à®®à¯? à®ªà¯?à®¤à¯? à®ªà®¿à®´à¯? : %s: %s"
 
-#: ../camel/camel-filter-driver.c:1130 ../camel/camel-filter-driver.c:1531
+#: ../camel/camel-filter-driver.c:1142 ../camel/camel-filter-driver.c:1569
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "à®µà®?à®¿à®?à®?à¯?à®?à®¿à®¯à¯? à®?à®¯à®?à¯?à®?à¯?à®®à¯? à®ªà¯?à®¤à¯? à®ªà®¿à®´à¯?: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1216
+#: ../camel/camel-filter-driver.c:1234
 msgid "Unable to open spool folder"
 msgstr "à®¸à¯?à®ªà¯?à®²à¯? à®?à®?à¯?à®µà¯? à®¤à®¿à®±à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-filter-driver.c:1225
+#: ../camel/camel-filter-driver.c:1245
 msgid "Unable to process spool folder"
 msgstr "à®¸à¯?à®ªà¯?à®?à¯? à®?à®?à¯?à®µà¯? à®?à¯?à®¯à®²à¯?à®ªà®?à¯?à®¤à¯?à®¤ à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-filter-driver.c:1241
+#: ../camel/camel-filter-driver.c:1262
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%d%%) à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®ªà¯?à®±à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../camel/camel-filter-driver.c:1245
+#: ../camel/camel-filter-driver.c:1268
 msgid "Cannot open message"
 msgstr "à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®¤à®¿à®±à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1264
+#: ../camel/camel-filter-driver.c:1269 ../camel/camel-filter-driver.c:1290
 #, 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:1304 ../camel/camel-filter-driver.c:1401
 msgid "Syncing folder"
 msgstr "à®?à®?à¯?à®µà¯? à®?à®¤à¯?à®¤à®¿à®?à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../camel/camel-filter-driver.c:1282 ../camel/camel-filter-driver.c:1373
+#: ../camel/camel-filter-driver.c:1308 ../camel/camel-filter-driver.c:1406
 msgid "Complete"
 msgstr "à®®à¯?à®?à®¿à®¨à¯?à®¤à®¤à¯?"
 
-#: ../camel/camel-filter-driver.c:1338
+#: ../camel/camel-filter-driver.c:1368
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d à®¯à®¿à®²à¯? %d à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®ªà¯?à®±à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../camel/camel-filter-driver.c:1353
+#: ../camel/camel-filter-driver.c:1386
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d à®¯à®¿à®²à¯? %d à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®ªà¯?à®±à¯?à®®à¯?à®ªà¯?à®¤à¯? à®¤à¯?à®²à¯?à®µà®¿"
 
-#: ../camel/camel-filter-search.c:137
+#: ../camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®ªà¯?à®±à¯?à®®à¯?à®ªà¯?à®¤à¯? à®ªà®¿à®´à¯?"
 
-#: ../camel/camel-filter-search.c:399
+#: ../camel/camel-filter-search.c:402
 msgid "Invalid arguments to (system-flag)"
 msgstr "à®?à¯?à®²à¯?à®²à®¾à®¤ à®ªà®¯à®©à®¿à®²à¯? (system-flag)"
 
-#: ../camel/camel-filter-search.c:414
+#: ../camel/camel-filter-search.c:417
 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:742 ../camel/camel-filter-search.c:751
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "à®µà®?à®¿à®?à®?à¯?à®?à®¿ à®¤à¯?à®?à®²à¯? à®?à®¯à®?à¯?à®?à¯?à®®à¯? à®ªà¯?à®¤à¯? à®ªà®¿à®´à¯? : %s: %s"
 
-#: ../camel/camel-folder-search.c:351 ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:608
+#: ../camel/camel-folder-search.c:346 ../camel/camel-folder-search.c:458
+#: ../camel/camel-folder-search.c:628
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1541,8 +1554,8 @@ msgstr ""
 "à®?à®¤à¯? à®ªà¯?à®©à¯?à®± à®¤à¯?à®?à®°à¯?à®?à®³à¯? à®ªà®?à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:463
-#: ../camel/camel-folder-search.c:618
+#: ../camel/camel-folder-search.c:359 ../camel/camel-folder-search.c:471
+#: ../camel/camel-folder-search.c:641
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1551,73 +1564,62 @@ msgstr ""
 "à®¤à¯?à®?à®²à¯? à®¤à¯?à®?à®°à¯? à®?à®¯à®?à¯?à®?à¯?à®®à¯? à®ªà¯?à®¤à¯? à®ªà®¿à®´à¯?: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:852
+#: ../camel/camel-folder-search.c:841 ../camel/camel-folder-search.c:883
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) à®?à¯?à®?à¯? à®?à®°à¯? à®?à®°à¯? à®ªà¯?à®²à®¿à®¯à®©à¯? à®µà®¿à®?à¯? à®¤à¯?à®µà¯?à®ªà¯?à®ªà®?à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../camel/camel-folder-search.c:905
+#: ../camel/camel-folder-search.c:936
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) à®? %s à®?à®³à¯?à®³à¯? à®?à®©à¯?à®¤à¯?à®¤à¯?à®¯à¯?à®®à¯? à®ªà¯?à®°à¯?à®¤à¯?à®¤ à®?à®©à¯?à®®à®¤à®¿ à®?à®²à¯?à®²à¯?"
 
-#: ../camel/camel-folder-search.c:911 ../camel/camel-folder-search.c:918
+#: ../camel/camel-folder-search.c:942 ../camel/camel-folder-search.c:949
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) à®?à®°à®ªà¯?à®ªà¯?à®°à¯?à®¤à¯?à®¤à®®à¯? à®?à®µà®?à®¿à®¯à®®à¯?"
 
-#: ../camel/camel-folder-search.c:945
+#: ../camel/camel-folder-search.c:976
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) à®?à®£à®¿ à®µà®¿à®?à¯? à®¤à¯?à®µà¯?à®ªà¯?à®ªà®?à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../camel/camel-folder-search.c:954
+#: ../camel/camel-folder-search.c:985
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s)  à®?à®?à¯?à®µà¯? à®?à®®à¯?à®?à¯?à®? à®µà¯?à®£à¯?à®?à®¿à®¯à®¤à¯? à®?à®µà®?à®¿à®¯à®®à¯?"
 
-#: ../camel/camel-folder.c:676
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "à®?à®¤à®°à®µà®¿à®²à¯?à®²à®¾ à®?à¯?à®¯à®²à¯?:%s à®?à¯?à®?à®¾à®© à®?à¯?à®¯à¯?à®¤à®¿ à®ªà¯?à®¤à¯?à®ªà¯?à®ªà®¿à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®?à®¿à®±à®¤à¯?"
-
-#: ../camel/camel-folder.c:1381
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "à®?à®¤à®°à®µà®¿à®²à¯?à®²à®¾ à®?à¯?à®¯à®²à¯?: à®¤à¯?à®?à®°à¯?à®?à®³à®¾à®? à®¤à¯?à®?à¯?: %s"
-
-#: ../camel/camel-folder.c:1422
-#, c-format
-msgid "Unsupported operation: count by expression: for %s"
-msgstr "à®?à®¤à®°à®µà®¿à®²à¯?à®²à®¾ à®?à¯?à®¯à®²à¯?: à®¤à¯?à®?à®°à¯?à®?à®³à®¾à®? à®¤à¯?à®?à¯?: %sà®?à¯?à®?à¯?"
-
-#: ../camel/camel-folder.c:1461
-#, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "à®?à®¤à®°à®µà®¿à®²à¯?à®²à®¾ à®?à¯?à®¯à®²à¯?à®ªà®¾à®?à¯?: %s\"à®?à¯?à®?à¯? à®ªà®¤à®¿à®²à®¾à®? UIDs à®?à®²à¯? à®¤à¯?à®?à®µà¯?à®®à¯?: "
-
-#: ../camel/camel-folder.c:1574
-#: ../camel/providers/local/camel-maildir-folder.c:387
+#: ../camel/camel-folder.c:126
+#, fuzzy, c-format
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "à®®à®¾à®±à¯?à®±à®®à¯? à®?à¯?à®¯à¯?à®¯à®ªà¯?à®ªà®?à¯?à®? à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®?à®°à®¾à®¯à¯?à®¨à¯?à®¤à¯? à®ªà®¾à®°à¯?à®?à¯?à®?à®µà¯?à®®à¯? (%s)"
+msgstr[1] "à®®à®¾à®±à¯?à®±à®®à¯? à®?à¯?à®¯à¯?à®¯à®ªà¯?à®ªà®?à¯?à®? à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®?à®°à®¾à®¯à¯?à®¨à¯?à®¤à¯? à®ªà®¾à®°à¯?à®?à¯?à®?à®µà¯?à®®à¯? (%s)"
+
+#: ../camel/camel-folder.c:149
+#, fuzzy, 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:174
+#, fuzzy, c-format
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "à®ªà¯?à®¤à®¿à®¯ à®?à¯?à®¯à¯?à®¤à®¿(à®?à®³à¯?) à®µà®?à®¿à®?à®?à¯?à®?à¯?à®?à®¿à®±à®¤à¯?"
+msgstr[1] "à®ªà¯?à®¤à®¿à®¯ à®?à¯?à®¯à¯?à®¤à®¿(à®?à®³à¯?) à®µà®?à®¿à®?à®?à¯?à®?à¯?à®?à®¿à®±à®¤à¯?"
+
+#: ../camel/camel-folder.c:689
+#: ../camel/providers/local/camel-maildir-folder.c:375
 msgid "Moving messages"
 msgstr "à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à¯? à®¨à®?à®°à¯?à®¤à¯?à®¤à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../camel/camel-folder.c:1574
+#: ../camel/camel-folder.c:691
 msgid "Copying messages"
 msgstr "à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à¯? à®ªà®?à®¿à®¯à¯?à®?à¯?à®?à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../camel/camel-folder.c:1915
-msgid "Learning junk"
-msgstr "à®¤à¯?à®µà¯?à®¯à®±à¯?à®±à®µà¯?à®¯à¯? à®ªà®?à®¿à®?à¯?à®?à®¿à®±à®¤à¯?"
-
-#: ../camel/camel-folder.c:1933
-msgid "Learning non-junk"
-msgstr "à®¤à¯?à®¯à¯?à®¯à®¾à®©à®µà¯?à®¯à¯? à®ªà®?à®¿à®?à¯?à®?à®¿à®±à®¤à¯?"
-
-#: ../camel/camel-folder.c:1953
-msgid "Filtering new message(s)"
-msgstr "à®ªà¯?à®¤à®¿à®¯ à®?à¯?à®¯à¯?à®¤à®¿(à®?à®³à¯?) à®µà®?à®¿à®?à®?à¯?à®?à¯?à®?à®¿à®±à®¤à¯?"
-
-#: ../camel/camel-gpg-context.c:760
+#: ../camel/camel-gpg-context.c:758
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1632,11 +1634,11 @@ msgstr ""
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg à®ªà®¯à®©à¯?à®?à¯?à®?à®¾à®³à®°à¯? à®?à®?à¯?à®¯à®¾à®³ à®?à®£à¯? à®?à¯?à®±à®¿à®ªà¯?à®ªà¯? à®ªà®?à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-gpg-context.c:799 ../camel/camel-gpg-context.c:813
+#: ../camel/camel-gpg-context.c:800 ../camel/camel-gpg-context.c:815
 msgid "Failed to parse gpg passphrase request."
 msgstr "gpg à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯? à®?à¯?à®°à®¿à®?à¯?à®?à¯?à®¯à¯? à®ªà®?à¯?à®¤à¯?à®¤à®²à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à®?à¯?à®¨à¯?à®¤à®¤à¯?"
 
-#: ../camel/camel-gpg-context.c:833
+#: ../camel/camel-gpg-context.c:835
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1645,7 +1647,7 @@ msgstr ""
 "à®¨à¯?à®?à¯?à®?à®³à¯? à®¸à¯?à®®à®¾à®°à¯?à®?à¯?à®?à®¾à®°à¯?à®?à¯? à®ªà¯?à®?à¯?à®?à¯? \n"
 "à®¤à®¿à®±à®?à¯?à®? à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯? à®¤à¯?à®µà¯?: \"%s\""
 
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:839
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1654,281 +1656,279 @@ msgstr ""
 "à®?à®¨à¯?à®¤ à®ªà®¯à®©à®°à¯?à®?à¯?à®?à¯? à®ªà¯?à®?à¯?à®?à¯? à®¤à®¿à®±à®?à¯?à®? à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯? à®¤à¯?à®µà¯? \n"
 ": \"%s\""
 
-#: ../camel/camel-gpg-context.c:842
+#: ../camel/camel-gpg-context.c:845
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "'%s' à®?à¯?à®?à¯? à®?à¯?à®©à¯?à®ªà®¿à®?à®¿ à®?à®?à®®à®¿à®°à¯?à®¨à¯?à®¤à¯? à®?à®¤à®¿à®°à¯?à®ªà®¾à®°à®¾à®¤ à®µà®¿à®£à¯?à®£à®ªà¯?à®ªà®®à¯?"
 
-#: ../camel/camel-gpg-context.c:867 ../camel/camel-gpg-context.c:1113
-#: ../camel/providers/nntp/camel-nntp-store.c:1313
+#: ../camel/camel-gpg-context.c:873 ../camel/camel-gpg-context.c:1156
 msgid "Canceled."
 msgstr "à®¨à¯?à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®?à¯?à®³à¯?à®³à®¤à¯?."
 
-#: ../camel/camel-gpg-context.c:881
+#: ../camel/camel-gpg-context.c:888
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "à®°à®?à®?à®¿à®¯ à®ªà¯?à®?à¯?à®?à¯? à®¤à®¿à®±à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? 3 à®®à¯?à®±à¯? à®¤à®µà®±à®¾à®? à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯? à®¤à®°à®ªà¯?à®ªà®?à¯?à®?à®¤à¯?"
 
-#: ../camel/camel-gpg-context.c:889
+#: ../camel/camel-gpg-context.c:900
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG à®µà®¿à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? à®?à®¤à®¿à®°à¯?à®ªà®¾à®°à®¾à®¤ à®?à¯?à®°à®¿à®?à¯?à®?à¯? : %s"
 
-#: ../camel/camel-gpg-context.c:988
+#: ../camel/camel-gpg-context.c:1031
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "à®?à¯?à®±à®¿à®®à¯?à®±à¯?à®¯à®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®?à®°à®¿à®¯à®¾à®© à®ªà¯?à®±à¯?à®¨à®°à¯? à®?à¯?à®±à®¿à®ªà¯?à®ªà®¿à®?à®ªà¯?à®ªà®?à®µà®¿à®²à¯?à®²à¯?"
 
-#. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1262 ../camel/camel-gpg-context.c:1387
-#: ../camel/camel-gpg-context.c:1953 ../camel/camel-gpg-context.c:1998
+#: ../camel/camel-gpg-context.c:1310 ../camel/camel-gpg-context.c:1449
+#: ../camel/camel-gpg-context.c:2071 ../camel/camel-gpg-context.c:2123
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpgà®¯à¯? à®?à®¯à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
 
-#: ../camel/camel-gpg-context.c:1355 ../camel/camel-smime-context.c:605
+#: ../camel/camel-gpg-context.c:1415 ../camel/camel-smime-context.c:820
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "à®¤à®?à®µà®²à¯? à®?à¯?à®?à®ªà¯?à®ªà®¤à¯?à®¤à¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
 
-#: ../camel/camel-gpg-context.c:1402 ../camel/camel-gpg-context.c:1630
-#: ../camel/camel-gpg-context.c:1646 ../camel/camel-gpg-context.c:1728
-#: ../camel/camel-gpg-context.c:1743 ../camel/camel-gpg-context.c:1859
-#: ../camel/camel-gpg-context.c:1874 ../camel/camel-gpg-context.c:1969
-#: ../camel/camel-gpg-context.c:2014
+#: ../camel/camel-gpg-context.c:1468 ../camel/camel-gpg-context.c:1714
+#: ../camel/camel-gpg-context.c:1733 ../camel/camel-gpg-context.c:1826
+#: ../camel/camel-gpg-context.c:1845 ../camel/camel-gpg-context.c:1969
+#: ../camel/camel-gpg-context.c:1987 ../camel/camel-gpg-context.c:2090
+#: ../camel/camel-gpg-context.c:2142
 msgid "Failed to execute gpg."
 msgstr "gpg à®¯à¯? à®?à®¯à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-gpg-context.c:1534 ../camel/camel-gpg-context.c:1540
-#: ../camel/camel-gpg-context.c:1546 ../camel/camel-gpg-context.c:1561
-#: ../camel/camel-smime-context.c:929 ../camel/camel-smime-context.c:940
-#: ../camel/camel-smime-context.c:947
+#: ../camel/camel-gpg-context.c:1608 ../camel/camel-gpg-context.c:1616
+#: ../camel/camel-gpg-context.c:1624 ../camel/camel-gpg-context.c:1641
+#: ../camel/camel-smime-context.c:942 ../camel/camel-smime-context.c:955
+#: ../camel/camel-smime-context.c:963
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "à®?à¯?à®¯à¯?à®¤à®¿ à®?à¯?à®¯à¯?à®ªà¯?à®ªà®¤à¯?à®¤à¯? à®?à®°à®¿à®ªà®¾à®°à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®¤à®µà®±à®¾à®© à®µà®?à®¿à®µà®®à¯?"
 
-#: ../camel/camel-gpg-context.c:1600
+#: ../camel/camel-gpg-context.c:1682
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "à®?à¯?à®¯à¯?à®¤à®¿ à®?à¯?à®¯à¯?à®ªà¯?à®ªà®¤à¯?à®¤à¯? à®?à®°à®¿à®ªà®¾à®°à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®¤à®±à¯?à®?à®¾à®²à®¿à®? à®?à¯?à®ªà¯?à®ªà¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
+msgstr ""
+"à®?à¯?à®¯à¯?à®¤à®¿ à®?à¯?à®¯à¯?à®ªà¯?à®ªà®¤à¯?à®¤à¯? à®?à®°à®¿à®ªà®¾à®°à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®¤à®±à¯?à®?à®¾à®²à®¿à®? à®?à¯?à®ªà¯?à®ªà¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
 
-#: ../camel/camel-gpg-context.c:1711
+#: ../camel/camel-gpg-context.c:1807
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "à®?à¯?à®±à®¿à®¯à®¾à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®? à®¤à®?à®µà®²à¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
 
-#: ../camel/camel-gpg-context.c:1761
+#: ../camel/camel-gpg-context.c:1863
 msgid "This is a digitally encrypted message part"
 msgstr "à®?à®¤à¯? à®?à®¿à®?à®¿à®?à®²à¯? à®?à¯?à®±à®¿à®¯à®¾à®?à¯?à®?à®®à¯? à®?à¯?à®¯à¯?à®¯à®ªà¯?à®ªà®?à¯?à®? à®¤à®?à®µà®²à¯?"
 
-#: ../camel/camel-gpg-context.c:1814 ../camel/camel-gpg-context.c:1822
-#: ../camel/camel-gpg-context.c:1841
+#: ../camel/camel-gpg-context.c:1919 ../camel/camel-gpg-context.c:1928
+#: ../camel/camel-gpg-context.c:1950
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®?à¯?à®±à®¿à®®à¯?à®±à¯? à®¨à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?: à®¤à®µà®±à®¾à®© à®?à¯?à®¯à¯?à®¤à®¿ à®µà®?à®¿à®µà®®à¯?"
 
-#: ../camel/camel-gpg-context.c:1831
+#: ../camel/camel-gpg-context.c:1939
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME à®ªà®?à¯?à®¤à®¿à®¯à¯? à®®à®±à¯?à®¨à¯?à®?à¯?à®?à®®à¯? à®?à¯?à®¯à¯?à®µà®¤à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à¯?à®±à¯?à®±à®¤à¯?: à®µà®¿à®¤à®¿à®®à¯?à®±à¯? à®ªà®¿à®´à¯?"
 
-#: ../camel/camel-gpg-context.c:1909 ../camel/camel-smime-context.c:1205
+#: ../camel/camel-gpg-context.c:2023 ../camel/camel-smime-context.c:1235
 msgid "Encrypted content"
 msgstr "à®?à¯?à®±à®¿à®¯à®¾à®?à¯?à®?à®®à¯? à®?à¯?à®¯à¯?à®¯à®ªà¯?à®ªà®?à¯?à®? à®¤à®?à®µà®²à¯?"
 
-#: ../camel/camel-gpg-context.c:1930
+#: ../camel/camel-gpg-context.c:2045
 msgid "Unable to parse message content"
 msgstr "à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®ªà®?à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:1999
-#: ../camel/providers/imap4/camel-imap4-utils.c:614
-#: ../camel/providers/smtp/camel-smtp-transport.c:165
-#: ../camel/providers/smtp/camel-smtp-transport.c:220
+#: ../camel/camel-gpg-context.c:2072 ../camel/camel-gpg-context.c:2124
+#: ../camel/providers/smtp/camel-smtp-transport.c:115
+#: ../camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Unknown"
 msgstr "à®¤à¯?à®°à®¿à®¯à®¾à®¤à¯?"
 
-#: ../camel/camel-lock-client.c:104
+#: ../camel/camel-lock-client.c:105
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "à®ªà¯?à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®? à®?à®¤à®µà®¿à®?à¯?à®?à¯?à®´à®¾à®¯à¯?à®?à®³à¯? à®?à®®à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?: %s"
 
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock-client.c:128
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "à®ªà¯?à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®? à®?à®¤à®µà®¿à®¯à¯? à®ªà®¿à®³à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?: %s"
 
-#: ../camel/camel-lock-client.c:203 ../camel/camel-lock-client.c:226
+#: ../camel/camel-lock-client.c:208 ../camel/camel-lock-client.c:234
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "'%s' à®? à®ªà¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?. à®ªà¯?à®?à¯?à®?à¯?-à®?à®¤à®µà®¿à®¯à®¿à®²à¯? à®µà®¿à®¤à®¿à®®à¯?à®±à¯? à®ªà®¿à®´à¯?"
 
-#: ../camel/camel-lock-client.c:216
+#: ../camel/camel-lock-client.c:223
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "'%s' à®? à®ªà¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-lock.c:103
+#: ../camel/camel-lock.c:104
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "%s à®?à¯?à®?à®¾à®© à®ªà¯?à®?à¯?à®?à¯? à®?à¯?à®ªà¯?à®ªà¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
 
-#: ../camel/camel-lock.c:144
+#: ../camel/camel-lock.c:147
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "à®ªà¯?à®?à¯?à®?à¯? à®?à¯?à®ªà¯?à®ªà¯? à®ªà¯?à®±à¯?à®µà®¤à®±à¯?à®?à®¾à®© à®¨à¯?à®°à®®à¯? à®®à¯?à®?à®¿à®¨à¯?à®¤à®¤à¯? %s. à®®à¯?à®£à¯?à®?à¯?à®®à¯? à®®à¯?à®¯à®²à®µà¯?à®®à¯?"
 
-#: ../camel/camel-lock.c:199
+#: ../camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "fcntl(2) à®? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤à®¿ à®ªà¯?à®?à¯?à®?à¯? à®ªà¯?à®± à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?:  %s"
 
-#: ../camel/camel-lock.c:262
+#: ../camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2) à®? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤à®¿ à®ªà¯?à®?à¯?à®?à¯? à®ªà¯?à®± à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?:  %s"
 
-#: ../camel/camel-movemail.c:106
+#: ../camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à¯?à®ªà¯?à®ªà¯? %s à®? à®ªà®¾à®°à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? : %s"
 
-#: ../camel/camel-movemail.c:119
+#: ../camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à¯?à®ªà¯?à®ªà¯? %s à®? à®¤à®¿à®±à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
 
-#: ../camel/camel-movemail.c:127
+#: ../camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "à®¤à®±à¯?à®?à®¾à®²à®¿à®? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à¯?à®ªà¯?à®ªà¯?%s à®? à®¤à®¿à®±à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
 
-#: ../camel/camel-movemail.c:156
+#: ../camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "à®¤à®±à¯?à®?à®¾à®²à®¿à®? à®?à¯?à®ªà¯?à®ªà®¿ %s à®?à®²à¯? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à¯?à®®à®¿à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
 
-#: ../camel/camel-movemail.c:186
+#: ../camel/camel-movemail.c:192
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "à®?à¯?à®´à®¾à®¯à¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? %s"
 
-#: ../camel/camel-movemail.c:198
+#: ../camel/camel-movemail.c:205
 #, c-format
 msgid "Could not fork: %s"
 msgstr "à®ªà®¿à®³à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
 
-#: ../camel/camel-movemail.c:236
+#: ../camel/camel-movemail.c:243
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®¨à®?à®°à¯?à®¤à¯?à®¤à®²à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à¯?à®±à¯?à®±à®¤à¯?: %s"
 
-#: ../camel/camel-movemail.c:237
+#: ../camel/camel-movemail.c:244
 msgid "(Unknown error)"
 msgstr "(à®¤à¯?à®°à®¿à®¯à®¾à®¤ à®ªà®¿à®´à¯?)"
 
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:270
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à¯?à®ªà¯?à®ªà¯? à®ªà®?à®¿à®?à¯?à®?à¯?à®®à¯? à®ªà¯?à®¤à¯? à®ªà®¿à®´à¯?: %s"
 
-#: ../camel/camel-movemail.c:271
+#: ../camel/camel-movemail.c:282
 #, 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:478 ../camel/camel-movemail.c:546
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®¤à®±à¯?à®?à®¾à®²à®¿à®? à®?à¯?à®ªà¯?à®ªà®¿à®²à¯? à®¨à®?à®²à¯?à®?à¯?à®?à¯?à®?à¯?à®®à¯? à®ªà¯?à®¤à¯? à®ªà®¿à®´à¯?: %s"
 
-#: ../camel/camel-multipart-signed.c:592
+#: ../camel/camel-multipart-signed.c:593
 msgid "parse error"
 msgstr "à®?à¯?à®±à¯?à®±à¯?à®?à®°à¯? à®ªà®¿à®´à¯?"
 
-#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:674
-#: ../camel/camel-net-utils.c:805
-#: ../camel/providers/pop3/camel-pop3-store.c:476
-#: ../camel/providers/pop3/camel-pop3-store.c:576
+#: ../camel/camel-net-utils.c:511 ../camel/camel-net-utils.c:694
+#: ../camel/camel-net-utils.c:842
+#: ../camel/providers/pop3/camel-pop3-store.c:488
+#: ../camel/providers/pop3/camel-pop3-store.c:597
 msgid "Canceled"
 msgstr "à®¨à¯?à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®?à¯?à®³à¯?à®³à®¤à¯?"
 
-#: ../camel/camel-net-utils.c:521
+#: ../camel/camel-net-utils.c:533
 msgid "cannot create thread"
 msgstr "à®¨à¯?à®£à¯?à®£à®¿à®´à¯?à®¯à¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®?à®¯à®²à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-net-utils.c:678
+#: ../camel/camel-net-utils.c:698
 #, c-format
 msgid "Resolving: %s"
 msgstr "à®?à®£à¯?à®?à¯?à®ªà®¿à®?à®¿à®?à¯?à®?à®¿à®±à®¤à¯?: %s"
 
-#: ../camel/camel-net-utils.c:700
+#: ../camel/camel-net-utils.c:720
 msgid "Host lookup failed"
 msgstr "à®ªà¯?à®°à®µà®²à®©à¯? à®¤à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?''"
 
-#: ../camel/camel-net-utils.c:702
+#: ../camel/camel-net-utils.c:724
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "à®ªà¯?à®°à®µà®²à®©à¯? à®¤à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? (: %s: %s)''"
 
-#: ../camel/camel-net-utils.c:809
+#: ../camel/camel-net-utils.c:846
 msgid "Resolving address"
 msgstr "à®®à¯?à®?à®µà®°à®¿à®¯à¯? à®ªà¯?à®¯à®°à¯?à®?à®©à¯? à®ªà¯?à®°à¯?à®¤à¯?à®¤à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../camel/camel-net-utils.c:829
+#: ../camel/camel-net-utils.c:866
 msgid "Name lookup failed"
 msgstr "à®ªà¯?à®¯à®°à¯? à®¤à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-net-utils.c:832
+#: ../camel/camel-net-utils.c:871
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "''à®ªà¯?à®¯à®°à¯? à®¤à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? (: %s)''"
 
-#: ../camel/camel-offline-folder.c:249
+#: ../camel/camel-offline-folder.c:168
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "à®µà®?à¯?à®?à¯?à®?à¯?à®?à¯? '%s' à®?à®?à¯?à®µà®¿à®²à¯?à®³à¯?à®³ à®?à®°à¯?à®?à¯?à®?à®¿à®£à¯?à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®? à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à¯?"
 
-#: ../camel/camel-offline-journal.c:159 ../camel/camel-offline-journal.c:182
+#: ../camel/camel-offline-journal.c:143 ../camel/camel-offline-journal.c:168
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "à®?à®´à¯?à®¤à¯? à®¤à¯?à®?à®°à¯?à®ªà®¿à®²à¯?à®²à®¾à®¤ à®?à®?à¯?à®µà¯? %s' à®?à¯?à®?à¯? à®?à®£à¯?à®ªà¯?à®ªà®¿à®²à¯?à®²à®¾ à®ªà¯?à®¤à®¿à®µà¯?à®?à¯? à®?à®´à¯?à®¤ à®®à¯?à®?à®¿à®¯à®¾à®¤à¯? : %s"
 
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:59
 msgid "Virtual folder email provider"
 msgstr "à®®à¯?à®¯à¯?à®¨à®¿à®?à®°à¯? à®?à®?à¯?à®µà¯? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à¯?à®µà¯?"
 
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:61
 msgid "For reading mail as a query of another set of folders"
 msgstr "à®µà¯?à®±à¯? à®?à®?à¯?à®µà®¿à®²à¯? à®?à®³à¯?à®³ à®?à¯?à®³à¯?à®µà®¿à®?à®³à¯?à®?à¯?à®?à®¾à®© à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®ªà®?à®¿à®?à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../camel/camel-provider.c:184
+#: ../camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "%s à®?à®±à¯?à®± à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®ªà®?à¯?à®¤à®¿à®¯à¯? à®®à®?à¯?à®?à¯?à®®à¯? à®?à®±à¯?à®±à¯?à®µà®¤à®±à¯?à®?à¯? à®?à®?à¯?à®?à¯? à®?à®©à¯?à®®à®¤à®¿ à®?à®²à¯?à®²à¯?"
 
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:198
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "à®?à®±à¯?à®± à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? %s: %s"
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:207
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "à®?à®±à¯?à®± à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? %s: à®?à®¨à¯?à®¤ à®ªà®?à¯?à®¤à®¿à®¯à®¿à®²à¯? à®¤à¯?à®µà®?à¯?à®? à®?à®?à¯?à®¯à®¾à®³à®®à¯? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/camel-provider.c:379 ../camel/camel-session.c:180
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:206
 #, 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 "à®ªà¯?à®¯à®°à®¿à®²à¯?à®²à®¾à®¤"
 
-#: ../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 "à®?à®¨à¯?à®¤ à®¤à¯?à®°à¯?à®µà¯? à®ªà¯?à®¯à®°à®¿à®²à¯?à®²à®¾à®®à®²à¯? à®?à¯?à®µà®?à®©à®¿à®²à¯? à®?à®?à¯?à®?à®³à¯? à®?à®£à¯?à®?à¯?à®?à¯?à®®à¯?"
 
-#: ../camel/camel-sasl-anonymous.c:121 ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:68
 msgid "Authentication failed."
 msgstr "à®?à®©à¯?à®®à®¤à®¿ à®®à®±à¯?à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®?à®¤à¯?"
 
-#: ../camel/camel-sasl-anonymous.c:130
+#: ../camel/camel-sasl-anonymous.c:78
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -1937,7 +1937,7 @@ msgstr ""
 "à®?à¯?à®²à¯?à®²à®¾à®¤ à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®®à¯?à®?à®µà®°à®¿ à®?à¯?à®µà®?à¯? à®¤à®?à®µà®²à¯?:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:142
+#: ../camel/camel-sasl-anonymous.c:91
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1946,7 +1946,7 @@ msgstr ""
 "à®?à¯?à®²à¯?à®²à®¾à®¤ à®?à®ªà¯?à®?à¯? à®?à¯?à®µà®?à¯? à®¤à®?à®µà®²à¯?:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:154
+#: ../camel/camel-sasl-anonymous.c:104
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1955,11 +1955,11 @@ msgstr ""
 "à®?à¯?à®²à¯?à®²à®¾à®¤ à®?à¯?à®µà®?à¯? à®¤à®?à®µà®²à¯?:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:45
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:40
+#: ../camel/camel-sasl-cram-md5.c:47
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -1967,11 +1967,11 @@ msgstr ""
 "à®?à®¨à¯?à®¤ à®¤à¯?à®°à¯?à®µà¯? à®?à®?à¯?à®?à®³à¯? à®ªà®¾à®¤à¯?à®?à®¾à®?à¯?à®? CRAM-MD5 à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯?à®²à¯? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤à®¿ à®?à¯?à®?à®©à¯?à®?à®©à¯? à®?à®£à¯?à®?à¯?à®?à¯?à®®à¯?. "
 "à®?à®¤à®±à¯?à®?à¯? à®?à¯?à®µà®?à®©à¯? à®?à®¤à®°à®µà¯? à®¤à¯?à®µà¯?"
 
-#: ../camel/camel-sasl-digest-md5.c:48
+#: ../camel/camel-sasl-digest-md5.c:56
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:50
+#: ../camel/camel-sasl-digest-md5.c:58
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -1979,56 +1979,57 @@ msgstr ""
 "à®?à®¨à¯?à®¤ à®¤à¯?à®°à¯?à®µà¯? à®?à®?à¯?à®?à®³à¯? à®ªà®¾à®¤à¯?à®?à®¾à®?à¯?à®? DIGEST-MD5 à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯?à®²à¯? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤à®¿ à®?à¯?à®?à®©à¯?à®?à®©à¯? à®?à®£à¯?à®?à¯?à®?à¯?à®®à¯?. "
 "à®?à®¤à®±à¯?à®?à¯? à®?à¯?à®µà®?à®©à¯? à®?à®¤à®°à®µà¯? à®¤à¯?à®µà¯?"
 
-#: ../camel/camel-sasl-digest-md5.c:844
+#: ../camel/camel-sasl-digest-md5.c:817
 msgid "Server challenge too long (>2048 octets)"
 msgstr "à®?à¯?à®µà¯?à®¯à®?à®¤à¯?à®¤à®¿à®©à¯? à®?à®±à¯?à®?à¯?à®µà®²à¯?  à®®à®¿à®?à®ªà¯?à®ªà¯?à®°à®¿à®¯à®¾à®¤à¯? (>2048 octets)"
 
-#: ../camel/camel-sasl-digest-md5.c:853
+#: ../camel/camel-sasl-digest-md5.c:827
 msgid "Server challenge invalid\n"
 msgstr "à®?à¯?à®µà®?à®©à¯? à®?à®µà®¾à®²à¯? à®?à¯?à®²à¯?à®²à®¾à®¤à¯?\n"
 
-#: ../camel/camel-sasl-digest-md5.c:859
+#: ../camel/camel-sasl-digest-md5.c:834
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "à®?à¯?à®µà¯?à®¯à®? à®?à®±à¯?à®?à¯?à®µà®²à®¿à®©à¯? à®µà®²à®¿à®®à¯?à®¯à¯? à®?à®³à¯?à®³à®?à®?à¯?à®?à®¿à®¯à¯?à®³à¯?à®³à®¤à¯? \"à®¤à®°à®®à®¾à®© à®ªà®¾à®¤à¯?à®?à®¾à®ªà¯?à®ªà¯?\"à®?à®¾à®©à¯?à®±à¯?"
 
-#: ../camel/camel-sasl-digest-md5.c:889
+#: ../camel/camel-sasl-digest-md5.c:865
 msgid "Server response did not contain authorization data"
 msgstr "à®?à¯?à®µà®?à®©à¯? à®ªà®¤à®¿à®²à®¿à®²à¯? à®?à®©à¯?à®®à®¤à®¿ à®¤à®?à®µà®²à¯? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:885
 msgid "Server response contained incomplete authorization data"
 msgstr "à®?à¯?à®µà®?à®©à¯? à®ªà®¤à®¿à®²à®¿à®²à¯? à®®à¯?à®?à®¿à®¯à®¾à®¤ à®?à®©à¯?à®®à®¤à®¿ à®¤à®?à®µà®²à¯? à®?à®³à¯?à®³à®¤à¯?"
 
-#: ../camel/camel-sasl-digest-md5.c:917
+#: ../camel/camel-sasl-digest-md5.c:897
 msgid "Server response does not match"
 msgstr "à®?à¯?à®µà¯?à®¯à®?à®¤à¯?à®¤à®¿à®©à¯? à®ªà®¤à®¿à®²à¯? à®ªà¯?à®°à¯?à®¤à¯?à®¤à®®à®¾à®©à®¤à®¾à®? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/camel-sasl-gssapi.c:72
+#: ../camel/camel-sasl-gssapi.c:82
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:74
+#: ../camel/camel-sasl-gssapi.c:84
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "à®?à®¨à¯?à®¤ à®¤à¯?à®°à¯?à®µà¯? à®?à®°à¯?à®ªà¯?à®°à¯?à®¸à¯? à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯?à®²à¯? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤à®¿ à®?à®£à¯?à®?à¯?à®?à¯?à®®à¯?"
 
-#: ../camel/camel-sasl-gssapi.c:168
+#: ../camel/camel-sasl-gssapi.c:121
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
-msgstr "à®?à¯?à®±à®¿à®ªà¯?à®ªà®¿à®?à¯?à®? à®?à¯?à®¯à®²à¯?à®?à¯?à®?à¯? à®¤à¯?à®µà¯?à®¯à®¾à®© à®?à®¤à®°à®µà¯? à®?à®²à¯?à®²à¯? à®?à®²à¯?à®²à®¤à¯? à®?à¯?à®¯à®²à¯?à®ªà®¾à®?à¯?à®?à¯? à®ªà¯?à®°à®¿à®¨à¯?à®¤à¯?à®?à¯?à®³à¯?à®³ à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?."
+msgstr ""
+"à®?à¯?à®±à®¿à®ªà¯?à®ªà®¿à®?à¯?à®? à®?à¯?à®¯à®²à¯?à®?à¯?à®?à¯? à®¤à¯?à®µà¯?à®¯à®¾à®© à®?à®¤à®°à®µà¯? à®?à®²à¯?à®²à¯? à®?à®²à¯?à®²à®¤à¯? à®?à¯?à®¯à®²à¯?à®ªà®¾à®?à¯?à®?à¯? à®ªà¯?à®°à®¿à®¨à¯?à®¤à¯?à®?à¯?à®³à¯?à®³ à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?."
 
-#: ../camel/camel-sasl-gssapi.c:173
+#: ../camel/camel-sasl-gssapi.c:126
 msgid "The provided target_name parameter was ill-formed."
 msgstr "à®?à¯?à®?à¯?à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®? à®?à¯?à®°à¯?à®®à®¿à®?_n à®ªà¯?à®¯à®°à¯? à®ªà®¯à®©à®¿à®²à¯?à®?à®³à¯? à®?à®°à®¿à®¯à®¾à®© à®?à®®à¯?à®ªà¯?à®ªà®¿à®©à¯? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../camel/camel-sasl-gssapi.c:129
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr ""
 "à®?à¯?à®?à¯?à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®? à®?à¯?à®°à¯?à®®à®¿à®?_ n à®ªà¯?à®¯à®°à¯?à®?à®³à®¿à®©à¯? à®ªà®¯à®©à®¿à®²à¯?à®¯à®¿à®²à¯? à®?à¯?à®²à¯?à®²à®¾à®¤ à®?à®²à¯?à®²à®¤à¯? à®?à®¤à®°à®µà¯? à®?à®²à¯?à®²à®¾à®¤ à®ªà¯?à®¯à®°à¯? à®?à®³à¯?à®³à®¤à¯?."
 
-#: ../camel/camel-sasl-gssapi.c:180
+#: ../camel/camel-sasl-gssapi.c:133
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -2036,61 +2037,62 @@ msgstr ""
 "input_token à®?à®²à¯? à®µà¯?à®±à¯? à®?à®²à¯?à®µà®°à®¿à®?à¯? à®?à¯?à®±à®¿à®ªà¯?à®ªà®¿à®?à®ªà¯?à®ªà®?à¯?à®?à¯?à®³à¯?à®³à®¤à®¾à®²à¯? nput_chan_bindings à®ªà®¯à®©à®¿à®²à¯? "
 "à®µà®´à®¿à®¯à®¾à®? à®?à¯?à®±à®¿à®ªà¯?à®ªà®¿à®? à®µà¯?à®£à¯?à®?à¯?à®®à¯?."
 
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../camel/camel-sasl-gssapi.c:138
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr "input_token à®?à®²à¯? à®?à¯?à®²à¯?à®²à®¾à®¤ à®?à¯?à®¯à¯?à®ªà¯?à®ªà®®à¯? à®?à®³à¯?à®³à®¤à¯? à®?à®²à¯?à®²à®¤à¯? à®?à®°à®¿à®ªà®¾à®°à¯?à®?à¯?à®?à®¾à®¤ à®?à¯?à®¯à¯?à®ªà¯?à®ªà®®à¯? à®?à®³à¯?à®³à®¤à¯?."
 
-#: ../camel/camel-sasl-gssapi.c:189
+#: ../camel/camel-sasl-gssapi.c:142
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
-msgstr "à®¤à¯?à®?à®°à¯? à®¤à¯?à®µà®?à¯?à®? à®?à¯?à®?à¯?à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®? à®¤à®?à®µà®²à¯?à®?à®³à¯? à®ªà¯?à®¤à®¾à®¤à¯? à®?à®²à¯?à®²à®¤à¯? à®¤à®?à®µà®²à¯? à®?à¯?à®±à®¿à®ªà¯?à®ªà¯? à®?à®£à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
+msgstr ""
+"à®¤à¯?à®?à®°à¯? à®¤à¯?à®µà®?à¯?à®? à®?à¯?à®?à¯?à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®? à®¤à®?à®µà®²à¯?à®?à®³à¯? à®ªà¯?à®¤à®¾à®¤à¯? à®?à®²à¯?à®²à®¤à¯? à®¤à®?à®µà®²à¯? à®?à¯?à®±à®¿à®ªà¯?à®ªà¯? à®?à®£à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-sasl-gssapi.c:194
+#: ../camel/camel-sasl-gssapi.c:147
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "à®?à¯?à®?à¯?à®?à¯?à®?à®ªà¯?à®ªà®? à®¤à®?à®µà®²à¯? à®?à®°à®¿à®¯à®¾à®© à®¤à®?à®µà®²à¯? à®?à¯?à®±à®¿à®?à¯?à®?à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-sasl-gssapi.c:197
+#: ../camel/camel-sasl-gssapi.c:150
 msgid "The consistency checks performed on the input_token failed."
 msgstr "input_token à®?à¯?à®¯à¯?à®¯à®ªà¯?à®ªà®?à¯?à®? à®?à®¤à¯?à®¤à®¿à®?à¯?à®µà¯? à®?à¯?à®¤à®©à¯?à®¯à®¿à®²à¯? à®¤à¯?à®²à¯?à®µà®¿"
 
-#: ../camel/camel-sasl-gssapi.c:200
+#: ../camel/camel-sasl-gssapi.c:153
 msgid "The consistency checks performed on the credential failed."
 msgstr "à®¤à®?à®µà®²à¯?à®?à¯?à®?à®¾à®? à®?à¯?à®¯à¯?à®¯à®ªà¯?à®ªà®?à¯?à®? à®?à®¤à¯?à®¤à®¿à®?à¯?à®µà¯? à®?à¯?à®¤à®©à¯?à®¯à®¿à®²à¯? à®¤à¯?à®²à¯?à®µà®¿"
 
-#: ../camel/camel-sasl-gssapi.c:203
+#: ../camel/camel-sasl-gssapi.c:156
 msgid "The referenced credentials have expired."
 msgstr "à®?à¯?à®?à¯?à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®? à®¨à®®à¯?à®ªà®? à®¤à®?à®µà®²à®¿à®©à¯? à®?à®¾à®²à®®à¯? à®®à¯?à®?à®¿à®µà¯?à®±à¯?à®±à®¤à¯?"
 
-#: ../camel/camel-sasl-gssapi.c:209 ../camel/camel-sasl-gssapi.c:316
-#: ../camel/camel-sasl-gssapi.c:358 ../camel/camel-sasl-gssapi.c:373
-#: ../camel/providers/imap/camel-imap-store.c:1272
+#: ../camel/camel-sasl-gssapi.c:162 ../camel/camel-sasl-gssapi.c:296
+#: ../camel/camel-sasl-gssapi.c:339 ../camel/camel-sasl-gssapi.c:355
+#: ../camel/providers/imap/camel-imap-store.c:1169
 msgid "Bad authentication response from server."
 msgstr "à®?à¯?à®µà®?à®©à®¿à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? à®®à¯?à®?à®®à®¾à®© à®?à®©à¯?à®®à®¤à®¿ à®?à¯?à®¤à®©à¯? à®ªà®¤à®¿à®²à¯?"
 
-#: ../camel/camel-sasl-gssapi.c:383
+#: ../camel/camel-sasl-gssapi.c:366
 msgid "Unsupported security layer."
 msgstr "à®?à®¤à®°à®µà¯? à®?à®²à¯?à®²à®¾à®¤ à®ªà®¾à®¤à¯?à®?à®¾à®ªà¯?à®ªà¯? à®?à®?à¯?à®?à¯?à®?à¯?"
 
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:39
 msgid "Login"
 msgstr "à®?à®³à¯?à®¨à¯?à®´à¯?"
 
-#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:38
+#: ../camel/camel-sasl-login.c:41 ../camel/camel-sasl-plain.c:45
 msgid "This option will connect to the server using a simple password."
 msgstr "à®?à®¨à¯?à®¤ à®¤à¯?à®°à¯?à®µà¯? à®?à¯?à®²à®ªà®®à®¾à®© à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯?à®²à¯? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤à®¿ à®?à¯?à®µà®?à®©à¯?à®?à®©à¯? à®?à®£à¯?à®¯à¯?à®®à¯?."
 
-#: ../camel/camel-sasl-login.c:134
+#: ../camel/camel-sasl-login.c:94
 msgid "Unknown authentication state."
 msgstr "à®¤à¯?à®°à®¿à®¯à®¾à®¤ à®?à®©à¯?à®®à®¤à®¿ à®?à®°à®¿à®ªà®¾à®°à¯?à®¤à¯?à®¤à®²à¯? à®¨à®¿à®²à¯?."
 
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:41
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:36
+#: ../camel/camel-sasl-ntlm.c:43
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -2098,51 +2100,51 @@ msgstr ""
 "NTLM/ à®ªà®¾à®¤à¯?à®?à®¾à®ªà¯?à®ªà®¾à®© à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯? à®?à®©à¯?à®®à®¤à®¿ à®®à¯?à®±à¯?à®¯à¯? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤à®¿ à®µà®¿à®£à¯?à®?à¯?à®¸à¯? à®?à®¾à®°à¯?à®¨à¯?à®¤ à®?à¯?à®µà®?à®©à¯?à®?à®©à¯? à®?à®£à¯?à®¯ "
 "à®?à®¨à¯?à®¤ à®®à¯?à®±à¯? à®ªà®¯à®©à¯?à®ªà®?à¯?à®®à¯?."
 
-#: ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-plain.c:43
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:46
 msgid "POP before SMTP"
 msgstr "SMTP à®?à¯?à®?à¯? à®®à¯?à®©à¯? POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:41
+#: ../camel/camel-sasl-popb4smtp.c:48
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "à®?à®¨à¯?à®¤ à®¤à¯?à®°à¯?à®µà¯? SMTP à®?à®£à¯?à®ªà¯?à®ªà¯?à®?à¯?à®?à¯? à®®à¯?à®¯à®²à¯?à®µà®¤à®±à¯?à®?à¯? à®®à¯?à®©à¯? à®ªà®¾à®ªà¯? à®?à®£à¯?à®ªà¯?à®ªà¯? à®?à¯?à®¤à®¿à®?à¯?à®?à¯?à®®à¯?"
 
-#: ../camel/camel-sasl-popb4smtp.c:106
+#: ../camel/camel-sasl-popb4smtp.c:82
 msgid "POP Source URI"
 msgstr "POP à®®à¯?à®²à®®à¯? à®¯à¯?à®?à®°à¯?à®?(URI)"
 
-#: ../camel/camel-sasl-popb4smtp.c:109
+#: ../camel/camel-sasl-popb4smtp.c:88
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "SMTP à®?à®©à¯?à®®à®¤à®¿ à®¤à¯?à®°à®¿à®¯à®¾à®¤ à®¤à®?à®µà®²à¯? à®ªà®±à®¿à®®à®¾à®±à¯?à®±à®¤à¯?à®¤à¯?à®?à¯?à®?à¯? à®®à¯?à®©à¯? POP "
 
-#: ../camel/camel-sasl-popb4smtp.c:114
+#: ../camel/camel-sasl-popb4smtp.c:95
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "SMTP à®ªà®¾à®ªà¯? à®?à®²à¯?à®²à®¾à®¤ à®®à¯?à®²à®¤à¯?à®¤à¯? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤à¯?à®µà®¤à®±à¯?à®?à¯? à®®à¯?à®©à¯? POP "
 
-#: ../camel/camel-search-private.c:147
+#: ../camel/camel-search-private.c:113
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "à®?à®¯à®²à¯?à®ªà®¾à®© à®?à¯?à®±à¯?à®±à¯? à®®à¯?à®?à®¿à®¤à¯?à®¤à®²à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à¯?à®±à¯?à®±à®¤à¯?: %s: %s"
 
-#: ../camel/camel-service.c:265
+#: ../camel/camel-service.c:97
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' à®?à¯?à®?à¯? à®ªà®¯à®©à¯?à®?à¯?à®?à®¾à®³à®°à¯? à®ªà¯?à®¯à®°à¯? à®¤à¯?à®µà¯?"
 
-#: ../camel/camel-service.c:269
+#: ../camel/camel-service.c:101
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' à®ªà¯?à®°à®µà®²à®©à¯? à®ªà¯?à®¯à®°à¯? à®¤à¯?à®µà¯?"
 
-#: ../camel/camel-service.c:273
+#: ../camel/camel-service.c:105
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' à®?à¯?à®?à¯? à®ªà®¾à®¤à¯? à®¤à¯?à®µà¯?"
 
-#: ../camel/camel-session.c:305
+#: ../camel/camel-session.c:261
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2151,255 +2153,234 @@ msgstr ""
 "à®?à®?à¯?à®µà¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?%s:\n"
 "%s"
 
-#: ../camel/camel-session.c:477
+#: ../camel/camel-session.c:746
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "à®¤à®¯à®µà¯? à®?à¯?à®¯à¯?à®¤à¯? %s à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯?à®²à¯? %s à®?à¯?à®?à¯? (à®ªà¯?à®°à®µà®²à®©à¯? %s à®?à®²à¯? à®?à®³à¯?à®³) à®?à®³à¯?à®³à®¿à®?à¯?à®?"
 
-#: ../camel/camel-session.c:815
-msgid "Camel session doesn't support forwarding of a message."
-msgstr "à®?à®?à¯?à®?à®? à®?à®®à®°à¯?à®µà¯? à®?à®°à¯? à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®®à¯?à®©à¯?à®©à®©à¯?à®ªà¯?à®ª à®¤à¯?à®£à¯?à®ªà¯?à®°à®¿à®¯à®¾à®¤à¯?."
-
-#: ../camel/camel-smime-context.c:447 ../camel/camel-smime-context.c:1012
+#: ../camel/camel-smime-context.c:346 ../camel/camel-smime-context.c:1037
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "`%s' à®?à¯?à®?à®¾à®© à®?à®¾à®©à¯?à®±à®¿à®¤à®´à¯? à®?à®¾à®£à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:453
+#: ../camel/camel-smime-context.c:374
 msgid "Cannot create CMS message"
 msgstr "CMS à®?à¯?à®¯à¯?à®¤à®¿ à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:458
+#: ../camel/camel-smime-context.c:379
 msgid "Cannot create CMS signed data"
 msgstr "CMS à®?à¯?à®¯à®¯à¯?à®ªà¯?à®ªà®®à®¾à®© à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:464
+#: ../camel/camel-smime-context.c:385
 msgid "Cannot attach CMS signed data"
 msgstr "CMS à®?à¯?à®¯à®¯à¯?à®ªà¯?à®ªà®®à®¾à®© à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®?à®£à¯?à®?à¯?à®? à®?à®¯à®² à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:471
+#: ../camel/camel-smime-context.c:392
 msgid "Cannot attach CMS data"
 msgstr "CMS à®?à¯?à®¯à¯?à®¤à®¿ à®?à®£à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:477
+#: ../camel/camel-smime-context.c:398
 msgid "Cannot create CMS Signer information"
 msgstr "CMS à®?à¯?à®¯à®¯à¯?à®ªà¯?à®ªà®¤à®¿à®©à¯?à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:483
+#: ../camel/camel-smime-context.c:404
 msgid "Cannot find certificate chain"
 msgstr "à®?à®¾à®©à¯?à®±à®¿à®¤à®´à¯? à®¤à¯?à®?à®°à¯? à®?à®£à¯?à®?à¯?à®ªà®¿à®?à®¿à®?à¯?à®? à®?à®¯à®²à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:489
+#: ../camel/camel-smime-context.c:410
 msgid "Cannot add CMS Signing time"
 msgstr "CMS à®?à¯?à®¯à¯?à®ªà¯?à®ªà®¤à¯?à®¤à®¿à®©à¯? à®¨à¯?à®°à®¤à¯?à®¤à¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:511 ../camel/camel-smime-context.c:523
+#: ../camel/camel-smime-context.c:434 ../camel/camel-smime-context.c:449
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' à®?à¯?à®?à®¾à®© à®?à¯?à®±à®¿à®®à¯?à®±à¯?à®¯à®¾à®?à¯?à®? à®?à®¾à®©à¯?à®±à®¿à®¤à®´à¯? à®?à®°à¯?à®ªà¯?à®ªà®¿à®²à¯? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:530
+#: ../camel/camel-smime-context.c:456
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "SMIMEEncKeyPrefs à®ªà®£à¯?à®ªà¯? à®?à¯?à®°à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:535
+#: ../camel/camel-smime-context.c:461
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "MS SMIMEEncKeyPrefs à®ªà®£à¯?à®ªà¯? à®?à¯?à®°à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:540
+#: ../camel/camel-smime-context.c:466
 msgid "Cannot add encryption certificate"
 msgstr "à®?à¯?à®±à®¿à®®à¯?à®±à¯?à®¯à®¾à®?à¯?à®? à®?à®¾à®©à¯?à®±à®¿à®¤à®´à¯? à®?à¯?à®°à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:546
+#: ../camel/camel-smime-context.c:472
 msgid "Cannot add CMS Signer information"
 msgstr "CMS à®?à¯?à®¯à¯?à®ªà¯?à®ª à®¤à®?à®µà®²à¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:1084
-msgid "Cannot create encoder context"
-msgstr "à®?à¯?à®±à®¿à®¯à®¾à®?à¯?à®? à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
-
-#: ../camel/camel-smime-context.c:622
-msgid "Failed to add data to CMS encoder"
-msgstr "CMS à®?à¯?à®±à®¿à®¯à®¾à®?à¯?à®?à®¿à®¯à®¿à®²à¯? à®¤à®?à®µà®²à¯? à®?à¯?à®°à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
-
-#: ../camel/camel-smime-context.c:627 ../camel/camel-smime-context.c:1101
-msgid "Failed to encode data"
-msgstr "à®¤à®?à®µà®²à¯? à®?à¯?à®±à®¿à®¯à®¾à®?à¯?à®?à®²à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à¯?à®±à¯?à®±à®¤à¯?"
-
-#: ../camel/camel-smime-context.c:700
+#: ../camel/camel-smime-context.c:504
 msgid "Unverified"
 msgstr "à®?à®°à®¿à®ªà®¾à®°à¯?à®?à¯?à®?à®¾à®¤"
 
-#: ../camel/camel-smime-context.c:702
+#: ../camel/camel-smime-context.c:506
 msgid "Good signature"
 msgstr "à®?à®°à®¿à®¯à®¾à®© à®?à¯?à®¯à¯?à®ªà¯?à®ªà®®à¯?"
 
-#: ../camel/camel-smime-context.c:704
+#: ../camel/camel-smime-context.c:508
 msgid "Bad signature"
 msgstr "à®®à¯?à®?à®®à®¾à®© à®?à¯?à®¯à¯?à®ªà¯?à®ªà®®à¯?"
 
-#: ../camel/camel-smime-context.c:706
+#: ../camel/camel-smime-context.c:510
 msgid "Content tampered with or altered in transit"
 msgstr ""
 " à®ªà®°à®¿à®®à®¾à®±à¯?à®±à®¤à¯?à®¤à®¿à®©à¯? à®ªà¯?à®¤à¯? à®¤à®?à®µà®²à®¿à®²à¯? à®?à¯?à®±à¯?à®?à¯?à®?à¯?à®?à¯? à®¨à®¿à®?à®´à¯?à®¨à¯?à®¤à®¤à¯? à®?à®²à¯?à®²à®¤à¯? à®¤à®?à®µà®²à®¿à®²à¯? à®®à®¾à®±à¯?à®±à®®à¯? à®¨à®¿à®?à®´à¯?à®¨à¯?à®¤à¯?à®³à¯?à®³à®¤à¯?"
 
-#: ../camel/camel-smime-context.c:708
+#: ../camel/camel-smime-context.c:512
 msgid "Signing certificate not found"
 msgstr "à®?à¯?à®¯à¯?à®ªà¯?à®ª à®?à®¾à®©à¯?à®±à®¿à®¤à®´à¯? à®?à®¾à®£à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:710
+#: ../camel/camel-smime-context.c:514
 msgid "Signing certificate not trusted"
 msgstr "à®?à¯?à®¯à¯?à®ªà¯?à®ª à®?à®¾à®©à¯?à®±à®¿à®¤à®´à®¿à®²à¯? à®¨à®®à¯?à®ªà®?à®®à¯? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:712
+#: ../camel/camel-smime-context.c:516
 msgid "Signature algorithm unknown"
 msgstr "à®?à¯?à®¯à¯?à®ªà¯?à®ª à®®à¯?à®±à¯?à®®à¯? à®¤à¯?à®°à®¿à®¯à®¾à®¤ à®®à¯?à®±à¯?"
 
-#: ../camel/camel-smime-context.c:714
+#: ../camel/camel-smime-context.c:518
 msgid "Signature algorithm unsupported"
 msgstr "à®?à¯?à®¯à¯?à®ªà¯?à®ª à®®à¯?à®±à¯?à®®à¯?à®?à¯?à®?à¯? à®?à®¤à®°à®µà¯? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:716
+#: ../camel/camel-smime-context.c:520
 msgid "Malformed signature"
 msgstr "à®¤à®µà®±à®¾à®© à®?à¯?à®¯à¯?à®ªà¯?à®ªà®®à¯?"
 
-#: ../camel/camel-smime-context.c:718
+#: ../camel/camel-smime-context.c:522
 msgid "Processing error"
 msgstr "à®ªà®¿à®´à¯?à®¯à¯? à®?à®°à®¿à®?à¯?à®¯à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../camel/camel-smime-context.c:772
+#: ../camel/camel-smime-context.c:564
 msgid "No signed data in signature"
 msgstr "à®?à¯?à®¯à¯?à®ªà¯?à®ªà®¤à¯?à®¤à®¿à®²à¯? à®?à¯?à®¯à¯?à®¤à®¿à®?à¯? à®?à¯?à®±à®¿à®ªà¯?à®ªà¯? à®?à®±à®¿à®?à¯?à®±à®¿ à®?à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:777
+#: ../camel/camel-smime-context.c:569
 msgid "Digests missing from enveloped data"
 msgstr "à®?à®?à®¿à®¤ à®?à®±à¯?à®¯à®¿à®²à¯? à®?à¯?à®°à¯?à®?à¯?à®? à®¤à®?à®µà®²à¯? à®?à®¾à®£à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:790 ../camel/camel-smime-context.c:800
+#: ../camel/camel-smime-context.c:582 ../camel/camel-smime-context.c:593
 msgid "Cannot calculate digests"
 msgstr "à®?à¯?à®°à¯?à®?à¯?à®?à®¤à¯? à®¤à¯?à®?à¯?à®ªà¯?à®ªà¯? à®?à®£à®?à¯?à®?à®¿à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:807 ../camel/camel-smime-context.c:811
+#: ../camel/camel-smime-context.c:600 ../camel/camel-smime-context.c:604
 msgid "Cannot set message digests"
 msgstr "à®?à¯?à®°à¯?à®?à¯?à®?à®¤à¯? à®¤à¯?à®?à¯?à®ªà¯?à®ªà¯? à®?à®®à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:821 ../camel/camel-smime-context.c:826
+#: ../camel/camel-smime-context.c:614 ../camel/camel-smime-context.c:619
 msgid "Certificate import failed"
 msgstr "à®?à®¾à®©à¯?à®±à®¿à®¤à®´à¯? à®?à®³à¯?à®µà®¾à®?à¯?à®?à¯?à®¤à®²à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à¯?à®±à¯?à®±à®¤à¯?"
 
-#: ../camel/camel-smime-context.c:836
+#: ../camel/camel-smime-context.c:629
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "à®?à®¾à®©à¯?à®±à®¿à®¤à®´à¯? à®ªà®±à¯?à®±à®¿à®¯ à®?à¯?à®¯à¯?à®¤à®¿ à®®à®?à¯?à®?à¯?à®®à¯?à®³à¯?à®³à®¤à¯?, à®?à®¾à®©à¯?à®±à®¿à®¤à®´à¯?à®?à®³à¯? à®?à®°à®¿à®ªà®¾à®°à¯?à®?à¯?à®? à®?à®¯à®²à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:839
+#: ../camel/camel-smime-context.c:632
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "à®?à®¾à®©à¯?à®±à®¿à®¤à®´à®¿à®©à¯? à®?à¯?à®¯à¯?à®¤à®¿ à®®à®©à¯?à®©à¯?à®®à¯?à®³à¯?à®³à®¤à¯?, à®?à®¾à®©à¯?à®±à®¿à®¤à®´à®¿à®©à¯? à®?à®?à¯?à®?à®°à¯?à®¤à¯?à®¤à¯? à®?à®°à®¿à®ªà®¾à®°à¯?à®?à¯?à®? à®ªà®?à¯?à®?à®¤à¯?"
 
-#: ../camel/camel-smime-context.c:843
+#: ../camel/camel-smime-context.c:636
 msgid "Cannot find signature digests"
 msgstr "à®?à¯?à®¯à¯?à®ªà¯?à®ª à®?à¯?à®°à¯?à®?à¯?à®?à®¤à¯?à®¤à¯? à®?à®£à¯?à®?à¯?à®ªà®¿à®?à®¿à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:859
+#: ../camel/camel-smime-context.c:652
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "à®?à¯?à®¯à¯?à®ªà¯?à®ªà®®à®¿à®?à¯?à®?à®µà®°à¯?: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:960 ../camel/camel-smime-context.c:1184
+#: ../camel/camel-smime-context.c:831 ../camel/camel-smime-context.c:1109
+msgid "Cannot create encoder context"
+msgstr "à®?à¯?à®±à®¿à®¯à®¾à®?à¯?à®? à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
+
+#: ../camel/camel-smime-context.c:837
+msgid "Failed to add data to CMS encoder"
+msgstr "CMS à®?à¯?à®±à®¿à®¯à®¾à®?à¯?à®?à®¿à®¯à®¿à®²à¯? à®¤à®?à®µà®²à¯? à®?à¯?à®°à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
+
+#: ../camel/camel-smime-context.c:842 ../camel/camel-smime-context.c:1126
+msgid "Failed to encode data"
+msgstr "à®¤à®?à®µà®²à¯? à®?à¯?à®±à®¿à®¯à®¾à®?à¯?à®?à®²à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à¯?à®±à¯?à®±à®¤à¯?"
+
+#: ../camel/camel-smime-context.c:977 ../camel/camel-smime-context.c:1214
 msgid "Decoder failed"
 msgstr "à®®à®±à¯?à®¨à¯?à®?à¯?à®?à®®à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à¯?à®±à¯?à®±à®¤à¯?"
 
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1044
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "à®ªà¯?à®¤à¯?à®µà®¾à®© à®?à¯?à®±à®¿à®®à¯?à®±à®¯à®¾à®?à¯?à®? à®ªà®?à®¿à®®à¯?à®±à¯?à®¯à¯? à®?à®¾à®£à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:1027
+#: ../camel/camel-smime-context.c:1052
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "à®?à®?à¯?à®?à¯?à®¤à®?à¯?à®?à®³à¯? à®?à¯?à®±à®¿à®®à¯?à®±à¯?à®¯à®¾à®?à¯?à®?à®¤à¯?à®¤à®¿à®±à¯?à®?à®¾à®? à®®à¯?à®¤à¯?à®¤à®®à®¾à®? à®?à®¤à¯?à®?à¯?à®?à¯?à®µà®¤à®±à¯?à®?à®¾à®© à®µà®´à®¿ à®¤à¯?à®°à®¿à®¯à®µà®¿à®²à®²à¯?"
 
-#: ../camel/camel-smime-context.c:1038
+#: ../camel/camel-smime-context.c:1063
 msgid "Cannot create CMS Message"
 msgstr "CMS à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:1044
+#: ../camel/camel-smime-context.c:1069
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS à®?à®±à¯?à®¯à®¿à®©à¯? à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®?à®¯à®µà®²à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:1050
+#: ../camel/camel-smime-context.c:1075
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS à®?à®±à¯?à®¯à®¿à®©à¯? à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®?à®£à¯?à®?à¯?à®? à®?à®¯à®²à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:1056
+#: ../camel/camel-smime-context.c:1081
 msgid "Cannot attach CMS data object"
 msgstr "CMS à®¤à®?à®µà®²à¯? à®?à®£à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:1065
+#: ../camel/camel-smime-context.c:1090
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS  à®ªà¯?à®±à¯?à®ªà®µà®°à®¿à®©à¯? à®¤à®?à®µà®²à¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:1070
+#: ../camel/camel-smime-context.c:1095
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS à®ªà¯?à®±à¯?à®ªà®µà®°à®¿à®©à¯? à®¤à®?à®µà®²à¯?à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:1095
+#: ../camel/camel-smime-context.c:1120
 msgid "Failed to add data to encoder"
 msgstr "à®?à¯?à®±à®¿à®¯à®¾à®?à¯?à®?à®¿à®¯à¯? à®?à¯?à®°à¯?à®¤à¯?à®¤à®²à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à®¿à®²à¯? à®®à¯?à®?à®¿à®¨à¯?à®¤à®¤à¯?"
 
-#: ../camel/camel-smime-context.c:1191
+#: ../camel/camel-smime-context.c:1221
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME à®®à®±à¯?à®¨à¯?à®?à¯?à®?à®¿, à®?à¯?à®±à®¿à®®à¯?à®±à¯?à®¯à®¾à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®? à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à¯? à®?à®¤à¯?à®µà¯?à®®à¯? à®?à®¿à®?à¯?à®?à¯?à®? à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-smime-context.c:1219
-msgid "import keys: unimplemented"
-msgstr "à®µà®¿à®?à¯? à®?à®³à¯?à®µà®¾à®?à¯?à®?à®³à¯?: à®?à¯?à®¯à®²à¯?à®ªà®?à¯?à®¤à¯?à®¤à®ªà¯?à®ªà®?à®µà®¿à®²à¯?à®²à¯?"
-
-#: ../camel/camel-smime-context.c:1227
-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:426
 #, 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
+#: ../camel/camel-store.c:520
 #, 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:591 ../camel/camel-vee-store.c:261
+#: ../camel/providers/local/camel-maildir-store.c:218
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 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:655 ../camel/camel-vee-store.c:213
+#: ../camel/providers/local/camel-maildir-store.c:305
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 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:1086 ../camel/camel-vtrash-folder.c:49
 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:1089 ../camel/camel-vtrash-folder.c:51
 msgid "Junk"
 msgstr "à®¤à¯?à®µà¯?à®¯à®±à¯?à®±"
 
-#: ../camel/camel-tcp-stream-ssl.c:870
+#: ../camel/camel-tcp-stream-ssl.c:762
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2412,16 +2393,16 @@ msgstr ""
 "à®?à¯?à®°à¯?à®?à¯?:       %s\n"
 "à®?à¯?à®¯à¯?à®ªà¯?à®ªà®®à¯?:         %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:876
+#: ../camel/camel-tcp-stream-ssl.c:768
 msgid "GOOD"
 msgstr "à®¨à®©à¯?à®±à¯?"
 
-#: ../camel/camel-tcp-stream-ssl.c:876
+#: ../camel/camel-tcp-stream-ssl.c:768
 msgid "BAD"
 msgstr "à®¤à®µà®±à¯?"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-ssl.c:772
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2436,7 +2417,7 @@ msgstr ""
 "\n"
 "à®?à®±à¯?à®? à®µà®¿à®°à¯?à®ªà¯?à®ªà®®à®¾?"
 
-#: ../camel/camel-tcp-stream-ssl.c:924
+#: ../camel/camel-tcp-stream-ssl.c:816
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2445,7 +2426,7 @@ msgstr ""
 "à®?à®¾à®©à¯?à®±à®¿à®¤à®´à¯? à®ªà®¿à®°à®?à¯?à®?à®©à¯? %s\n"
 "à®µà®´à®?à¯?à®?à®¿à®¯à®µà®°à¯?: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:976
+#: ../camel/camel-tcp-stream-ssl.c:868
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2454,7 +2435,7 @@ msgstr ""
 "à®¤à®µà®±à®¾à®© à®?à®¾à®©à¯?à®±à®¿à®¤à®´à¯?: %s\n"
 "à®µà®´à®?à¯?à®?à®¿à®¯à®µà®°à¯?: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:994
+#: ../camel/camel-tcp-stream-ssl.c:886
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2463,7 +2444,7 @@ msgstr ""
 "à®?à®¾à®©à¯?à®±à®¿à®¤à®´à¯? à®?à®¾à®²à®¾à®µà®¤à®¿à®¯à®¾à®©à®¤à¯?: %s\n"
 "à®µà®´à®?à¯?à®?à®¿à®¯à®µà®°à¯?: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1011
+#: ../camel/camel-tcp-stream-ssl.c:903
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2472,49 +2453,49 @@ msgstr ""
 "à®?à®¾à®©à¯?à®±à®¿à®¤à®´à¯? à®®à¯?à®?à¯?à®?à®²à¯? à®ªà®?à¯?à®?à®¿à®¯à®²à¯? à®?à®¾à®²à®¾à®µà®¤à®¿à®¯à®¾à®©à®¤à¯?: %s\n"
 "à®µà®´à®?à¯?à®?à®¿à®¯à®µà®°à¯?: %s"
 
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:315
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "URL '%s'à®? à®?à®²à®?à®¿à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? "
 
-#: ../camel/camel-vee-folder.c:577
+#: ../camel/camel-vee-folder.c:1068
 #, c-format
 msgid "Error storing '%s': %s"
 msgstr "'%s' à®? à®?à¯?à®®à®¿à®ªà¯?à®ªà®¤à®¿à®²à¯? à®ªà®¿à®´à¯?: %s"
 
-#: ../camel/camel-vee-folder.c:654
+#: ../camel/camel-vee-folder.c:1141
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%s à®?à®²à¯? %s à®¤à®?à®µà®²à¯? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/camel-vee-folder.c:813 ../camel/camel-vee-folder.c:819
+#: ../camel/camel-vee-folder.c:1157 ../camel/camel-vee-folder.c:1172
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "à®®à¯?à®¯à¯?à®¨à®¿à®?à®°à¯? à®?à®?à¯?à®µà®¿à®²à¯? à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®¨à®?à®°à¯?à®¤à¯?à®¤ à®¨à®?à®²à¯?à®?à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-vee-store.c:113 ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:353
+#: ../camel/camel-vee-store.c:142 ../camel/camel-vee-store.c:144
+#: ../camel/camel-vee-store.c:414
 msgid "Unmatched"
 msgstr "à®ªà¯?à®°à¯?à®¨à¯?à®¤à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-vee-store.c:400
-#, c-format
-msgid "Cannot delete folder: %s: No such folder"
-msgstr "à®?à®?à¯?à®µà¯? à®¨à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s: à®?à®ªà¯?à®ªà®?à®¿ à®?à®°à¯? à®?à®?à¯?à®µà¯? à®?à®²à¯?à®²à¯?"
-
-#: ../camel/camel-vee-store.c:422
+#: ../camel/camel-vee-store.c:222
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "à®?à®?à¯?à®µà®¿à®©à¯? à®ªà¯?à®¯à®°à¯? à®®à®¾à®±à¯?à®± à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s: à®?à®ªà¯?à®ªà®?à®¿ à®?à®°à¯? à®?à®?à¯?à®µà¯? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-vee-store.c:286
+#, c-format
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "à®?à®?à¯?à®µà¯? à®¨à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s: à®?à®ªà¯?à®ªà®?à®¿ à®?à®°à¯? à®?à®?à¯?à®µà¯? à®?à®²à¯?à®²à¯?"
+
+#: ../camel/camel-vtrash-folder.c:50
 msgid "Cannot copy messages to the Trash folder"
 msgstr "à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®?à¯?à®ªà¯?à®ªà¯? à®¤à¯?à®?à¯?à®?à®¿ à®?à®?à¯?à®µà®¿à®±à¯?à®?à¯? à®¨à®?à®²à¯?à®?à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/camel-vtrash-folder.c:57
+#: ../camel/camel-vtrash-folder.c:52
 msgid "Cannot copy messages to the Junk folder"
 msgstr "à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®¤à¯?à®µà¯?à®¯à®±à¯?à®±à®µà¯? à®?à®?à¯?à®µà®¿à®±à¯?à®?à¯? à®¨à®?à®²à¯?à®?à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:138
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2523,241 +2504,234 @@ msgstr ""
 "à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®ªà¯?à®± à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s\n"
 "  %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
-#: ../camel/providers/local/camel-maildir-folder.c:264
-#: ../camel/providers/local/camel-maildir-folder.c:293
-#: ../camel/providers/local/camel-maildir-folder.c:401
-#: ../camel/providers/local/camel-mbox-folder.c:363
-#: ../camel/providers/local/camel-mbox-folder.c:414
-#: ../camel/providers/local/camel-mh-folder.c:226
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:138
+#: ../camel/providers/local/camel-maildir-folder.c:233
+#: ../camel/providers/local/camel-maildir-folder.c:268
+#: ../camel/providers/local/camel-maildir-folder.c:389
+#: ../camel/providers/local/camel-mbox-folder.c:334
+#: ../camel/providers/local/camel-mbox-folder.c:385
+#: ../camel/providers/local/camel-mh-folder.c:221
 msgid "No such message"
 msgstr "à®?à®¤à¯? à®ªà¯?à®©à¯?à®± à®?à¯?à®¯à¯?à®¤à®¿ à®?à®²à¯?à®²à¯?"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:149
-#: ../camel/providers/imap4/camel-imap4-folder.c:814
-#: ../camel/providers/nntp/camel-nntp-folder.c:173
-#: ../camel/providers/nntp/camel-nntp-folder.c:248
-#: ../camel/providers/nntp/camel-nntp-folder.c:408
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:152
 #: ../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
+#: ../camel/providers/pop3/camel-pop3-folder.c:620
+#: ../camel/providers/pop3/camel-pop3-folder.c:683
+#: ../camel/providers/pop3/camel-pop3-folder.c:705
 msgid "User canceled"
 msgstr "à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤à¯?à®ªà®µà®°à¯? à®¨à¯?à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®?à¯?à®³à¯?à®³à®¾à®°à¯?"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:156
-#: ../camel/providers/imap4/camel-imap4-folder.c:819
-#: ../camel/providers/nntp/camel-nntp-folder.c:164
-#: ../camel/providers/nntp/camel-nntp-folder.c:166
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:250
-#: ../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/groupwise/camel-groupwise-folder.c:161
+#: ../camel/providers/nntp/camel-nntp-folder.c:232
+#: ../camel/providers/nntp/camel-nntp-folder.c:236
+#: ../camel/providers/nntp/camel-nntp-folder.c:249
+#: ../camel/providers/nntp/camel-nntp-folder.c:349
+#: ../camel/providers/pop3/camel-pop3-folder.c:400
+#: ../camel/providers/pop3/camel-pop3-folder.c:624
+#: ../camel/providers/pop3/camel-pop3-folder.c:687
+#: ../camel/providers/pop3/camel-pop3-folder.c:695
+#: ../camel/providers/pop3/camel-pop3-folder.c:709
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "%s à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®ªà¯?à®± à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:173
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:181
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2507
-#: ../camel/providers/imap4/camel-imap4-folder.c:837
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:179
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:188
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2663
 msgid "This message is not available in offline mode."
 msgstr "à®?à®£à¯?à®¯à®¤à¯? à®¤à¯?à®?à®°à¯?à®ªà¯? à®®à¯?à®±à¯?à®¯à®¿à®²à¯? à®?à®¨à¯?à®¤ à®?à¯?à®¯à¯?à®¤à®¿ à®?à®¿à®?à¯?à®?à¯?à®?à®µà®¿à®²à¯?à®²à¯?."
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:195
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2010
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2061
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:204
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:213
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2132
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2185
 msgid "Could not get message"
 msgstr "à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®ªà¯?à®± à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:983
-#: ../camel/providers/imap/camel-imap-folder.c:295
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1044
+#: ../camel/providers/imap/camel-imap-folder.c:375
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s à®?à¯?à®?à®¾à®© à®?à¯?à®°à¯?à®?à¯?à®?à®¤à¯?à®¤à¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1056
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1119
 #, c-format
 msgid "Checking for deleted messages %s"
 msgstr "à®?à®´à®¿à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®? à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à¯? %sà®?à¯?à®?à¯? à®?à¯?à®¤à®¿à®?à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1331
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1419
 msgid "Trash Folder Full. Please Empty."
 msgstr "à®ªà®¯à®©à¯?à®±à®± à®?à®?à¯?à®µà¯?à®?à®³à¯? à®¨à®¿à®°à®®à¯?à®ªà®¿à®¯à¯?à®³à¯?à®³à®¤à¯?. à®µà¯?à®±à¯?à®®à¯?à®¯à®¾à®©à®¤à®¾à®? à®?à®°à¯?à®¤à®µà¯?à®®à¯?"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1565
-#: ../camel/providers/groupwise/camel-groupwise-store.c:633
-#: ../camel/providers/groupwise/camel-groupwise-store.c:763
-#: ../camel/providers/imap/camel-imap-folder.c:3429
-#: ../camel/providers/imap/camel-imap-folder.c:3505
-#: ../camel/providers/imapx/camel-imapx-server.c:2728
-#: ../camel/providers/imapx/camel-imapx-server.c:2813
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1661
+#: ../camel/providers/groupwise/camel-groupwise-store.c:639
+#: ../camel/providers/groupwise/camel-groupwise-store.c:776
+#: ../camel/providers/imap/camel-imap-folder.c:3807
+#: ../camel/providers/imap/camel-imap-folder.c:3885
+#: ../camel/providers/imapx/camel-imapx-server.c:3473
+#: ../camel/providers/imapx/camel-imapx-server.c:3573
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "à®?à¯?à®°à¯?à®?à¯?à®? à®¤à®?à®µà®²à¯?à®?à¯?à®?à®¾à®© à®ªà¯?à®¤à®¿à®¯ à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à¯? %s à®?à®³à¯?à®³à¯? à®?à®±à¯?à®±à®µà¯?à®®à¯?"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2361
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2404
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2496
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2545
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
 msgstr " à®?à®?à¯?à®µà¯?  %s' à®?à¯?à®?à¯? à®?à¯?à®¯à¯?à®¤à®¿ à®?à¯?à®°à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2392
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2531
 #, c-format
 msgid "Cannot create message: %s"
 msgstr " à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? (: %s)"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:281
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:241
 #, c-format
 msgid "Cannot get folder container %s"
 msgstr "à®?à¯?à®³à¯?à®?à®² à®?à®?à¯?à®µà¯? à®ªà¯?à®±à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? (%s)"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:343
-#: ../camel/providers/imap4/camel-imap4-journal.c:311
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:304
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr "à®?à®£à¯?à®¯à®¤à¯?à®¤à¯?à®?à®°à¯?à®ªà¯?  à®?à®²à¯?à®²à®¾à®¤ à®ªà¯?à®¤à¯? à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®?à¯?à®°à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?:à®?à®?à¯?à®®à®¾à®±à¯?à®±à®®à¯? à®?à®¿à®?à¯?à®?à¯?à®? à®µà®¿à®²à¯?à®²à¯?''"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:359
-#: ../camel/providers/imap4/camel-imap4-journal.c:327
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:321
 #, c-format
 msgid "Cannot append message in offline mode: %s"
 msgstr "à®?à®£à¯?à®¯à®¤à¯?à®¤à¯?à®?à®°à¯?à®ªà®¿à®²à¯? à®?à®²à¯?à®²à®¾à®¤ à®ªà¯?à®¤à¯? à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®?à¯?à®°à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?:%s"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:54
-#: ../camel/providers/imap4/camel-imap4-provider.c:38
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
 msgid "Checking for new mail"
 msgstr "à®ªà¯?à®¤à®¿à®¯ à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à®³à¯?à®³à®¤à®¾ à®?à®© à®ªà®¾à®°à¯?à®?à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../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
-#: ../camel/providers/imapx/camel-imapx-provider.c:48
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:45
 msgid "C_heck for new messages in all folders"
 msgstr "à®ªà¯?à®¤à®¿à®¯ à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à®³à¯?à®³à®¤à®¾ à®?à®© à®?à®©à¯?à®¤à¯?à®¤à¯? à®?à®?à¯?à®µà®¿à®²à¯?à®®à¯? à®ªà®¾à®°à¯?à®?à¯?à®?à®¿à®±à®¤à¯? (_h)"
 
-#: ../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/imapx/camel-imapx-provider.c:72
-#: ../camel/providers/local/camel-local-provider.c:46
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:106
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imapx/camel-imapx-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:42
+#: ../camel/providers/local/camel-local-provider.c:82
+#: ../camel/providers/local/camel-local-provider.c:102
 msgid "Options"
 msgstr "à®¤à¯?à®°à¯?à®µà¯?à®?à®³à¯?"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr ""
 "à®?à®¨à¯?à®¤ à®?à¯?à®µà®?à®©à®¿à®²à¯? à®?à®³à¯?à®³ à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯?à®ªà¯?à®?à¯?à®?à®¿à®¯à®¿à®²à¯? à®?à®³à¯?à®³ à®?à®©à¯?à®¤à¯?à®¤à¯? à®ªà¯?à®¤à®¿à®¯ à®?à®?à¯?à®?à®²à¯?à®?à®³à¯?à®?à¯?à®?à¯?à®®à¯? à®µà®?à®¿à®?à®?à¯?à®?à®¿à®¯à¯? "
 "à®ªà¯?à®°à¯?à®¤à¯?à®¤à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:63
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
 msgid "Check new messages for J_unk contents"
 msgstr "à®ªà¯?à®¤à®¿à®¯ à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à®¿à®²à¯? à®?à¯?à®ªà¯?à®ªà¯? à®?à®³à¯?à®³à®?à®?à¯?à®?à®®à¯? à®?à®³à¯?à®³à®¤à®¾ à®?à®© à®ªà®¾à®°à¯?à®?à¯?à®?à®µà¯?à®®à¯?"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:74
-#: ../camel/providers/imapx/camel-imapx-provider.c:78
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
+#: ../camel/providers/imap/camel-imap-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:79
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "à®?à¯?à®ªà¯?à®ªà¯? à®?à®³à¯?à®³à®?à®?à¯?à®?à®®à¯? à®?à®³à¯?à®³à®¤à®¾ à®?à®© à®?à®³à¯?à®ªà¯?à®?à¯?à®?à®¿ à®?à®?à¯?à®µà®¿à®²à¯? à®®à®?à¯?à®?à¯?à®®à¯? à®?à¯?à®¤à®¿à®?à¯?à®?à®µà¯?à®®à¯?"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:67
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
 msgid "Automatically synchroni_ze account locally"
 msgstr "à®¤à®¾à®©à®¿à®¯à®?à¯?à®?à®¿à®¯à®¾à®? à®?à®³à¯?à®³à®®à¯? à®?à®£à®?à¯?à®?à¯? à®?à®¤à¯?à®¤à®¿à®?à¯?à®?à¯?à®?à®µà¯?à®®à¯?"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
 msgid "SOAP Settings"
 msgstr "SOAP à®ªà®¤à®¿à®¤à¯?à®¤à®²à¯?"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:75
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "Post Office Agent SOAP _Port:"
 msgstr "à®ªà¯?à®¸à¯? à®?à®ªà¯?à®¸à¯? à®?à®?à¯?à®©à¯?à®?à¯?à®?à¯?à®?à®¾à®© SOAP à®¤à¯?à®±à¯? (_P)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
 msgid "Novell GroupWise"
 msgstr "à®¨à®¾à®µà®²à¯? à®?à¯?à®´à¯?à®µà®¾à®?"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "For accessing Novell GroupWise servers"
 msgstr "à®¨à®¾à®µà®²à¯? à®?à¯?à®´à¯?à®µà®¾à®¯à®¿à®²à®¾à®? à®?à¯?à®µà¯?à®¯à®?à®¤à¯?à®¤à¯? à®?à®£à¯?à®?à¯?à®¤à®²à¯?"
 
-#: ../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/imapx/camel-imapx-provider.c:104
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:98
+#: ../camel/providers/imap/camel-imap-provider.c:97
+#: ../camel/providers/imapx/camel-imapx-provider.c:105
+#: ../camel/providers/nntp/camel-nntp-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:70
 msgid "Password"
 msgstr "à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯?"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
-msgid "This option will connect to the GroupWise server using a plaintext password."
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:100
+msgid ""
+"This option will connect to the GroupWise server using a plaintext password."
 msgstr "à®?à®¨à¯?à®¤ à®¤à¯?à®°à¯?à®µà¯? à®?à¯?à®°à¯?à®ªà¯?à®µà¯?à®¸à¯? à®?à¯?à®µà®?à®©à¯? à®?à®¾à®¤à®¾à®°à®£ à®?à®°à¯? à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯?à®²à¯? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤à®¿ à®?à®£à¯?à®?à¯?à®?à¯?à®®à¯?"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:102
+#: ../camel/providers/groupwise/camel-groupwise-store.c:106
 msgid "Host or user not available in url"
 msgstr "à®ªà¯?à®°à®µà®²à®©à¯? à®?à®²à¯?à®²à®¤à¯? à®ªà®¯à®©à®°à¯? à®?à®£à¯?à®¯ à®®à¯?à®?à®µà®°à®¿à®¯à®¿à®²à¯? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:204
-#: ../camel/providers/imap/camel-imap-store.c:1356
+#: ../camel/providers/groupwise/camel-groupwise-store.c:205
+#: ../camel/providers/imap/camel-imap-store.c:1257
+#: ../camel/providers/imapx/camel-imapx-server.c:2755
 msgid "You did not enter a password."
 msgstr "à®¨à¯?à®?à¯?à®?à®³à¯? à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯?à®²à¯? à®ªà¯?à®?à¯?à®¤à¯?à®¤ à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:319
+#: ../camel/providers/groupwise/camel-groupwise-store.c:322
 msgid "Some features may not work correctly with your current server version"
 msgstr "à®¨à®?à®ªà¯?à®ªà¯? à®?à¯?à®µà¯?à®¯à®? à®ªà®¤à®¿à®ªà¯?à®ªà®¿à®²à¯? à®?à®¿à®² à®µà®?à®¤à®¿à®?à®³à¯? à®?à®°à®¿à®¯à®¾à®? à®µà¯?à®²à¯? à®?à¯?à®¯à¯?à®¯à®¾à®¤à¯?"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:540
-#: ../camel/providers/imap/camel-imap-store.c:1879
-#: ../camel/providers/imap/camel-imap-store.c:2077
-#: ../camel/providers/imapx/camel-imapx-store.c:297
+#: ../camel/providers/groupwise/camel-groupwise-store.c:543
+#: ../camel/providers/imap/camel-imap-store.c:1835
+#: ../camel/providers/imap/camel-imap-store.c:2031
+#: ../camel/providers/imapx/camel-imapx-store.c:354
 #, c-format
 msgid "No such folder %s"
 msgstr "à®?à®ªà¯?à®ªà®?à®¿ à®?à®°à¯? à®?à®?à¯?à®µà¯? à®?à®²à¯?à®²à¯? %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1266
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1228
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "à®?à®®à¯?à®®à¯?à®±à¯?à®¯à®¿à®²à¯? à®?à¯?à®´à¯?à®µà®¾à®°à®¿à®¯à®¾à®? à®?à®?à¯?à®µà®¿à®©à¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1280
-#: ../camel/providers/imap/camel-imap-store.c:1954
-#: ../camel/providers/imap/camel-imap-store.c:2334
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1246
+#: ../camel/providers/imap/camel-imap-store.c:1912
+#: ../camel/providers/imap/camel-imap-store.c:2331
+#: ../camel/providers/imapx/camel-imapx-store.c:796
 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
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1329
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1354
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
 msgstr "'%s' à®?à¯?à®°à¯?à®ªà¯?à®µà¯?à®¸à¯? à®?à®?à¯?à®µà¯? '%s' à®®à®±à¯?à®ªà¯?à®¯à®°à®¿à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯? "
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1414
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1388
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:54
 #, c-format
 msgid "GroupWise server %s"
 msgstr "à®?à¯?à®°à¯?à®ªà¯? à®µà¯?à®¸à¯? à®?à¯?à®µà¯?à®¯à®?à®®à¯? (%s)"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1416
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1390
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "à®?à¯?à®´à¯?à®µà®¾à®°à®¿à®¯à®¾à®? à®?à¯?à®µà¯? (%s on %s)"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:122
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:58
 #, c-format
 msgid "GroupWise mail delivery via %s"
 msgstr "à®?à¯?à®´à¯? à®µà®´à®¿à®¯à®¾à®? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à®©à¯?à®ªà¯?à®ªà¯?à®¤à®²à¯? (%s)"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:164
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:94
 msgid "Sending Message"
 msgstr " à®?à®©à¯?à®ªà¯?à®ªà®ªà¯?à®ªà®?à¯?à®®à¯? à®?à¯?à®¯à¯?à®¤à®¿"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:212
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:103
+msgid "Cannot get folder: Invalid operation on this store"
+msgstr "à®?à®?à¯?à®µà¯? à®ªà¯?à®± à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®?à®¨à¯?à®¤ à®?à®¿à®?à®?à¯?à®?à®¿à®²à¯? à®?à¯?à®²à¯?à®²à®¾à®¤ à®?à¯?à®¯à®²à¯?"
+
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:148
 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 "
@@ -2767,100 +2741,38 @@ msgstr ""
 "à®?à¯?à®¯à¯?à®µà®¿à®²à¯? à®?à®³à¯?à®³à®©. à®?à®?à¯?à®?à®³à¯? à®?à®?à¯?à®?à®²à®¿à®²à¯? à®?à®¿à®²à®µà®±à¯?à®±à¯? à®¨à¯?à®?à¯?à®?à®¿ à®?à®²à¯?à®²à®¤à¯? à®¨à®?à®°à¯?à®¤à¯?à®¤à®¿à®µà®¿à®?à¯?à®?à¯? à®?à®µà®±à¯?à®±à¯? à®®à¯?à®£à¯?à®?à¯?à®®à¯? "
 "à®?à®©à¯?à®ªà¯?à®ªà¯?à®?.\n"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:207
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:152
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not send message: %s"
 msgstr "à®?à¯?à®¯à¯?à®¤à®¿ à®?à®©à¯?à®ªà¯?à®ª à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
 
-#: ../camel/providers/hula/camel-hula-provider.c:48
-#: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
-msgid "Checking for New Mail"
-msgstr "à®ªà¯?à®¤à®¿à®¯ à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯?à®?à¯?à®?à®¾à®? à®?à¯?à®¤à®¿à®?à¯?à®?à®¿à®±à®¤à¯?"
-
-#: ../camel/providers/hula/camel-hula-provider.c:53
-#: ../camel/providers/imap/camel-imap-provider.c:52
-#: ../camel/providers/imapx/camel-imapx-provider.c:54
-msgid "Connection to Server"
-msgstr "à®?à¯?à®µà®?à®©à¯?à®?à®©à¯? à®?à®£à¯?à®ªà¯?à®ªà¯?"
-
-#: ../camel/providers/hula/camel-hula-provider.c:55
-#: ../camel/providers/imap/camel-imap-provider.c:54
-#: ../camel/providers/imapx/camel-imapx-provider.c:56
-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
-#: ../camel/providers/imapx/camel-imapx-provider.c:58
-msgid "Command:"
-msgstr "à®?à®?à¯?à®?à®³à¯?:"
-
-#: ../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/imapx/camel-imapx-provider.c:64
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
-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/imapx/camel-imapx-provider.c:66
-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/imapx/camel-imapx-provider.c:68
-msgid "O_verride server-supplied folder namespace"
-msgstr "à®?à¯?à®µà®?à®©à¯?-à®?à®¤à¯?à®?à¯?à®?à®¿à®¯ à®?à®?à¯?à®µà¯?à®?à¯?à®?à®¾à®© à®ªà¯?à®¯à®°à®¿à®?à®¤à¯?à®¤à¯? à®µà®£à¯?à®®à¯?à®±à¯?à®?"
-
-#: ../camel/providers/hula/camel-hula-provider.c:66
-msgid "Namespace"
-msgstr "à®ªà¯?à®¯à®°à®¿à®?à®®à¯?"
-
-#: ../camel/providers/hula/camel-hula-provider.c:76
-msgid "Hula"
-msgstr "Hula"
-
-#: ../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 "à®?à®¨à¯?à®¤ à®¤à¯?à®°à¯?à®µà¯? à®¹à¯?à®²à®¾ à®?à¯?à®µà®?à®©à¯? à®?à®¾à®¤à®¾à®°à®£ à®?à®°à¯? à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯?à®²à¯? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤à®¿ à®?à®£à¯?à®?à¯?à®?à¯?à®®à¯?"
-
-#: ../camel/providers/imap/camel-imap-command.c:181
-#: ../camel/providers/imap/camel-imap-command.c:265
+#: ../camel/providers/imap/camel-imap-command.c:189
+#: ../camel/providers/imap/camel-imap-command.c:282
 msgid "No output stream"
 msgstr " à®µà¯?à®³à®¿à®¯à¯?à®?à¯?à®?à¯? à®?à®?à®? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/providers/imap/camel-imap-command.c:186
-#: ../camel/providers/imap/camel-imap-command.c:270
+#: ../camel/providers/imap/camel-imap-command.c:196
+#: ../camel/providers/imap/camel-imap-command.c:289
 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:3105
+#: ../camel/providers/imap/camel-imap-command.c:241
+#: ../camel/providers/imap/camel-imap-command.c:298
+#: ../camel/providers/imap/camel-imap-command.c:520
+#: ../camel/providers/imap/camel-imap-store.c:3139
 msgid "Operation cancelled"
 msgstr "à®?à¯?à®¯à®²à¯?à®ªà®¾à®?à¯? à®°à®¤à¯?à®¤à¯? à®?à¯?à®¯à¯?à®¯à®ªà¯?à®ªà®?à¯?à®?à®¤à¯?"
 
-#: ../camel/providers/imap/camel-imap-command.c:331
-#: ../camel/providers/imap/camel-imap-store.c:3110
+#: ../camel/providers/imap/camel-imap-command.c:353
+#: ../camel/providers/imap/camel-imap-store.c:3147
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "à®?à®¤à®¿à®°à¯?à®ªà®¾à®°à®¾à®®à®²à¯? à®?à¯?à®µà®?à®©à¯? à®?à®£à¯?à®ªà¯?à®ªà¯? à®¤à¯?à®£à¯?à®?à®¿à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®?à®¤à¯?: %s"
 
 #. for imap ALERT codes, account user host
 #. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:352
+#: ../camel/providers/imap/camel-imap-command.c:373
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -2869,259 +2781,287 @@ msgstr ""
 "IMAP à®?à¯?à®µà®?à®©à®¿à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? à®®à®¾à®±à¯?à®±à¯? %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:421
+#: ../camel/providers/imap/camel-imap-command.c:443
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP à®?à¯?à®µà®?à®©à®¿à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? à®?à®¤à®¿à®°à¯?à®ªà®¾à®°à®¾à®¤ à®ªà®¤à®¿à®²à¯? : %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:431
+#: ../camel/providers/imap/camel-imap-command.c:454
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP à®?à®?à¯?à®?à®³à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à¯?à®±à¯?à®±à®¤à¯? : %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:506
+#: ../camel/providers/imap/camel-imap-command.c:536
 msgid "Server response ended too soon."
 msgstr "à®?à¯?à®µà®?à®©à¯? à®ªà®¤à®¿à®²à¯? à®?à®¤à®¿à®µà¯?à®?à®®à®¾à®? à®®à¯?à®?à®¿à®¨à¯?à®¤à®¤à¯?"
 
-#: ../camel/providers/imap/camel-imap-command.c:712
+#: ../camel/providers/imap/camel-imap-command.c:743
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP à®?à¯?à®µà®?à®©à®¿à®²à¯? %s à®¤à®?à®µà®²à¯?à®?à¯?à®?à®¾à®© à®ªà®¤à®¿à®²à¯? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/providers/imap/camel-imap-command.c:748
+#: ../camel/providers/imap/camel-imap-command.c:780
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP à®?à¯?à®µà®?à®©à®¿à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? à®?à®¤à®¿à®°à¯?à®ªà®¾à®°à®¾à®¤ à®?à®°à®¿ à®ªà®¤à®¿à®²à¯?: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:90
+#: ../camel/providers/imap/camel-imap-folder.c:281
 msgid "Always check for new mail in this folder"
 msgstr "à®?à®ªà¯?à®ªà¯?à®¤à¯?à®®à¯? à®?à®¨à¯?à®¤ à®?à®?à¯?à®µà®¿à®²à¯? à®ªà¯?à®¤à®¿à®¯ à®?à®?à¯?à®?à®²à¯?à®?à®³à¯?à®?à¯?à®?à¯? à®?à¯?à®¤à®¿à®?à¯?à®?à®µà¯?à®®à¯?"
 
-#: ../camel/providers/imap/camel-imap-folder.c:276
+#: ../camel/providers/imap/camel-imap-folder.c:352
 #, 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:918
-#: ../camel/providers/imapx/camel-imapx-server.c:2758
+#: ../camel/providers/imap/camel-imap-folder.c:953
+#: ../camel/providers/imapx/camel-imapx-server.c:3511
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "à®®à®¾à®±à¯?à®±à®®à¯? à®?à¯?à®¯à¯?à®¯à®ªà¯?à®ªà®?à¯?à®? à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®?à®°à®¾à®¯à¯?à®¨à¯?à®¤à¯? à®ªà®¾à®°à¯?à®?à¯?à®?à®µà¯?à®®à¯? (%s)"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1986
+#: ../camel/providers/imap/camel-imap-folder.c:2246
 #, c-format
 msgid "Unexpected response status '%s' after APPEND command"
 msgstr "APPEND à®?à®?à¯?à®?à®³à¯?à®?à¯?à®?à¯? à®ªà®¿à®©à¯? à®?à®¤à®¿à®°à¯?à®ªà®¾à®°à®¾à®¤  à®µà®¿à®³à¯?à®µà¯? à®?à®°à¯?à®ªà¯?à®ªà¯? à®¨à®¿à®²à¯? '%s'"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2001
+#: ../camel/providers/imap/camel-imap-folder.c:2264
 msgid "No response on continuation after APPEND command"
 msgstr "APPEND à®?à®?à¯?à®?à®³à¯?à®?à¯?à®?à¯?à®ªà¯?à®ªà®¿à®©à¯? à®?à®°à¯? à®¤à¯?à®?à®°à¯?à®®à¯? à®µà®¿à®³à¯?à®µà¯?à®®à¯? à®?à®²à¯?à®²à¯? "
 
-#: ../camel/providers/imap/camel-imap-folder.c:2046
+#: ../camel/providers/imap/camel-imap-folder.c:2317
 msgid "Unknown error occurred during APPEND command!"
 msgstr "APPEND à®?à®?à¯?à®?à®³à¯?à®?à¯?à®?à¯?à®ªà¯?à®ªà®¿à®©à¯?  à®¤à¯?à®°à®¿à®¯à®¾à®¤ à®¤à®µà®±à¯? à®¨à®¿à®?à®´à¯?à®¨à¯?à®¤à®¤à¯?!"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2877
+#: ../camel/providers/imap/camel-imap-folder.c:3234
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®ªà¯?à®± à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2912
+#: ../camel/providers/imap/camel-imap-folder.c:3269
+#: ../camel/providers/imapx/camel-imapx-server.c:4582
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à¯? à®?à®?à¯?à®¯à®¾à®³à®®à¯? ID %s à®?à®?à®©à¯? à®?à®°à¯? à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯?à®¯à¯?à®®à¯? à®ªà¯?à®±à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2913
+#: ../camel/providers/imap/camel-imap-folder.c:3270
+#: ../camel/providers/imapx/camel-imapx-server.c:4583
 msgid "No such message available."
 msgstr "à®?à®ªà¯?à®ªà®?à®¿à®ªà¯?à®ªà®?à¯?à®? à®?à¯?à®¯à¯?à®¤à®¿ à®?à®¤à¯?à®®à¯?. à®?à®²à¯?à®²à¯? "
 
-#: ../camel/providers/imap/camel-imap-folder.c:2974
-#: ../camel/providers/imap/camel-imap-folder.c:3819
-#: ../camel/providers/nntp/camel-nntp-folder.c:236
+#: ../camel/providers/imap/camel-imap-folder.c:3338
+#: ../camel/providers/imap/camel-imap-folder.c:4218
+#: ../camel/providers/nntp/camel-nntp-folder.c:331
 msgid "This message is not currently available"
 msgstr "à®?à®¨à¯?à®¤ à®?à¯?à®¯à¯?à®¤à®¿ à®¤à®±à¯?à®ªà¯?à®¤à¯? à®?à®¿à®?à¯?à®?à¯?à®?à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3632
+#: ../camel/providers/imap/camel-imap-folder.c:4014
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "à®®à¯?à®?à®¿à®¯à®¾à®¤ à®?à¯?à®µà®?à®©à¯? à®ªà®¤à®¿à®²à¯?:%d à®?à¯?à®?à®¾à®© à®¤à®?à®µà®²à¯? à®?à®¤à¯?à®µà¯?à®®à®¿à®²à¯?à®²à¯?"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3640
+#: ../camel/providers/imap/camel-imap-folder.c:4024
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "à®?à®±à¯?à®?à¯?à®±à¯?à®¯à®¾à®? à®?à¯?à®µà®?à®©à¯? à®ªà®¤à®¿à®²à¯? : %d à®?à¯?à®¯à¯?à®¤à®¿à®?à¯?à®?à®¾à®© UID à®?à¯?à®?à¯?à®?à¯?à®?à®ªà¯?à®ªà®?à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3857
+#: ../camel/providers/imap/camel-imap-folder.c:4258
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH à®ªà®¤à®¿à®²à®¿à®²à¯? à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®?à®¾à®£à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:181
-#: ../camel/providers/imap/camel-imap-message-cache.c:244
+#: ../camel/providers/imap/camel-imap-message-cache.c:196
+#: ../camel/providers/imap/camel-imap-message-cache.c:261
 #, 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
+#: ../camel/providers/imap/camel-imap-message-cache.c:335
+#: ../camel/providers/imap/camel-imap-message-cache.c:399
+#: ../camel/providers/imap/camel-imap-message-cache.c:433
+#: ../camel/providers/imap/camel-imap-message-cache.c:468
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "à®¤à®±à¯?à®?à®¾à®²à®¿à®?à®®à®¾à®? à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®?à¯?à®®à®¿à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?%s: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:530
+#: ../camel/providers/imap/camel-imap-message-cache.c:549
 #, c-format
 msgid "Failed to cache %s: %s"
 msgstr "à®¤à®±à¯?à®?à®¾à®²à®¿à®? à®¨à®¿à®©à¯?à®µà®¿à®?à®¤à¯?à®¤à®¿à®²à¯? à®?à¯?à®°à¯?à®ªà®¤à®¿à®²à¯? à®¤à¯?à®²à¯?à®µà®¿ %s: %s"
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:50
+#: ../camel/providers/imap/camel-imap-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:41
+msgid "Checking for New Mail"
+msgstr "à®ªà¯?à®¤à®¿à®¯ à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯?à®?à¯?à®?à®¾à®? à®?à¯?à®¤à®¿à®?à¯?à®?à®¿à®±à®¤à¯?"
+
+#: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:47
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "(_e) à®?à®¨à¯?à®¤à®¾ à®?à¯?à®²à¯?à®¤à¯?à®¤à®¿à®¯ à®?à®?à¯?à®µà¯?à®?à®³à®¿à®²à¯? à®ªà¯?à®¤à®¿à®¯ à®?à¯?à®¯à¯?à®¤à®¿à®?à¯?à®?à¯? à®?à¯?à®¤à®¿à®?à¯?à®?à®µà¯?à®®à¯?"
 
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:49
-#: ../camel/providers/imapx/camel-imapx-provider.c:70
-msgid "Namespace:"
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:51
+msgid "Connection to Server"
+msgstr "à®?à¯?à®µà®?à®©à¯?à®?à®©à¯? à®?à®£à¯?à®ªà¯?à®ªà¯?"
+
+#: ../camel/providers/imap/camel-imap-provider.c:50
+#: ../camel/providers/imapx/camel-imapx-provider.c:53
+msgid "_Use custom command to connect to server"
+msgstr "à®?à¯?à®µà¯?à®¯à®?à®¤à¯?à®¤à¯?à®?à®©à¯? à®?à®£à¯?à®¯ à®?à®?à¯?à®?à®³à¯?à®?à®³à¯? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤à®µà¯?à®®à¯? (_U)"
+
+#: ../camel/providers/imap/camel-imap-provider.c:52
+#, fuzzy
+msgid "Co_mmand:"
+msgstr "à®?à®?à¯?à®?à®³à¯?:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:63
+#: ../camel/providers/nntp/camel-nntp-provider.c:42
+msgid "Folders"
+msgstr "à®?à®?à¯?à®µà¯?à®?à®³à¯?"
+
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:65
+msgid "_Show only subscribed folders"
+msgstr "à®?à®ªà¯?à®ªà¯?à®¤à®²à¯? à®?à®?à¯?à®µà¯? à®®à®?à¯?à®?à¯?à®®à¯? à®¤à¯?à®³à®¿à®µà¯?à®ªà¯? à®ªà®?à¯?à®¤à¯?à®¤à¯?à®¤à®²à¯? (_S)"
+
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:68
+msgid "O_verride server-supplied folder namespace"
+msgstr "à®?à¯?à®µà®?à®©à¯?-à®?à®¤à¯?à®?à¯?à®?à®¿à®¯ à®?à®?à¯?à®µà¯?à®?à¯?à®?à®¾à®© à®ªà¯?à®¯à®°à®¿à®?à®¤à¯?à®¤à¯? à®µà®£à¯?à®®à¯?à®±à¯?à®?"
+
+#: ../camel/providers/imap/camel-imap-provider.c:62
+#, fuzzy
+msgid "Names_pace:"
 msgstr "à®ªà¯?à®¯à®°à¯? à®¨à®¿à®°à®ªà¯?à®ªà®¿à®?à®®à¯?:"
 
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:53
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
 msgid "_Apply filters to new messages in INBOX on this server"
 msgstr "à®?à¯?à®µà¯?à®¯à®?à®¤à¯?à®¤à®¿à®©à¯? à®?à®³à¯?à®ªà¯?à®?à¯?à®?à®¿à®¯à®¿à®²à¯? à®ªà¯?à®¤à®¿à®¯ à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à¯?à®?à¯?à®?à¯? à®µà®?à®¿à®ªà¯?à®ªà®¿à®¯à¯? à®?à¯?à®¯à®²à¯?à®ªà®?à¯?à®¤à¯?à®¤à®µà¯?à®®à¯?"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
-#: ../camel/providers/imapx/camel-imapx-provider.c:76
+#: ../camel/providers/imap/camel-imap-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:77
 msgid "Check new messages for Jun_k contents"
 msgstr "à®ªà¯?à®¤à®¿à®¯ à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à¯? à®?à¯?à®ªà¯?à®ªà¯? à®?à®³à¯?à®³à®?à®?à¯?à®?à®¤à¯?à®¤à¯?à®?à¯?à®?à¯? à®?à¯?à®¤à®¿à®?à¯?à®?à®µà¯?à®®à¯?"
 
-#: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:59
-#: ../camel/providers/imapx/camel-imapx-provider.c:80
+#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:81
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "à®?à®¤à¯?à®²à¯? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯?à®?à®³à¯? à®¤à®¾à®©à®¾à®? à®?à®¤à¯?à®¤à®¿à®?à¯?"
 
-#: ../camel/providers/imap/camel-imap-provider.c:83
+#: ../camel/providers/imap/camel-imap-provider.c:79
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:85
-#: ../camel/providers/imapx/camel-imapx-provider.c:90
+#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:91
 msgid "For reading and storing mail on IMAP servers."
 msgstr "à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯?à®?à®³à¯? à®ªà®?à®¿à®?à¯?à®?à®µà¯?à®®à¯? à®®à®±à¯?à®±à¯?à®®à¯? IMAP à®?à¯?à®µà¯?à®¯à®¤à¯?à®¤à®¿à®²à¯? à®?à¯?à®®à®¿à®?à¯?à®?à®µà¯?à®®à¯?"
 
-#: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapx/camel-imapx-provider.c:106
+#: ../camel/providers/imap/camel-imap-provider.c:99
+#: ../camel/providers/imapx/camel-imapx-provider.c:107
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "à®?à®¨à¯?à®¤ à®¤à¯?à®°à¯?à®µà¯? IMAP à®?à¯?à®µà®?à®©à¯? à®?à®¾à®¤à®¾à®°à®£ à®?à®°à¯? à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯?à®²à¯? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤à®¿ à®?à®£à¯?à®?à¯?à®?à®®à¯?à®µà¯?"
 
-#: ../camel/providers/imap/camel-imap-store.c:435
-#: ../camel/providers/imap4/camel-imap4-store.c:210
-#: ../camel/providers/imapx/camel-imapx-store.c:167
+#: ../camel/providers/imap/camel-imap-store.c:310
+#: ../camel/providers/imapx/camel-imapx-store.c:206
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP à®?à¯?à®µà¯?à®¯à®?à®®à¯? %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:212
-#: ../camel/providers/imapx/camel-imapx-store.c:169
+#: ../camel/providers/imap/camel-imap-store.c:312
+#: ../camel/providers/imapx/camel-imapx-store.c:208
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s à®?à®²à¯? %s à®?à¯?à®?à®¾à®© IMAP à®?à¯?à®µà¯?"
 
-#: ../camel/providers/imap/camel-imap-store.c:566
-#: ../camel/providers/imap/camel-imap-store.c:581
-#: ../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:192
-#: ../camel/providers/pop3/camel-pop3-store.c:206
-#: ../camel/providers/smtp/camel-smtp-transport.c:259
-#: ../camel/providers/smtp/camel-smtp-transport.c:274
+#: ../camel/providers/imap/camel-imap-store.c:445
+#: ../camel/providers/imap/camel-imap-store.c:470
+#: ../camel/providers/nntp/camel-nntp-store.c:233
+#: ../camel/providers/nntp/camel-nntp-store.c:257
+#: ../camel/providers/pop3/camel-pop3-store.c:173
+#: ../camel/providers/pop3/camel-pop3-store.c:197
+#: ../camel/providers/smtp/camel-smtp-transport.c:215
+#: ../camel/providers/smtp/camel-smtp-transport.c:238
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "à®?à®£à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? ( %s: %s)"
 
-#: ../camel/providers/imap/camel-imap-store.c:567
-#: ../camel/providers/imap4/camel-imap4-store.c:248
-#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/pop3/camel-pop3-store.c:193
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
+#: ../camel/providers/imap/camel-imap-store.c:446
+#: ../camel/providers/nntp/camel-nntp-store.c:234
+#: ../camel/providers/pop3/camel-pop3-store.c:174
+#: ../camel/providers/smtp/camel-smtp-transport.c:216
 msgid "SSL unavailable"
 msgstr "SSL à®?à®¿à®?à¯?à®?à¯?à®?à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/providers/imap/camel-imap-store.c:578
-#: ../camel/providers/imap/camel-imap-store.c:860
-#: ../camel/providers/imapx/camel-imapx-server.c:2017
+#: ../camel/providers/imap/camel-imap-store.c:466
+#: ../camel/providers/imap/camel-imap-store.c:751
+#: ../camel/providers/imapx/camel-imapx-server.c:2439
+#: ../camel/providers/imapx/camel-imapx-server.c:2546
 msgid "Connection cancelled"
 msgstr "à®?à®£à¯?à®ªà¯?à®ªà¯? à®°à®¤à¯?à®¤à¯? à®?à¯?à®¯à¯?à®¯à®ªà®ªà¯?à®?à¯?à®?à®¤à¯?"
 
-#: ../camel/providers/imap/camel-imap-store.c:689
-#: ../camel/providers/imap/camel-imap-store.c:708
-#: ../camel/providers/imap/camel-imap-store.c:714
-#: ../camel/providers/imap/camel-imap-store.c:740
-#: ../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/imapx/camel-imapx-server.c:2057
-#: ../camel/providers/imapx/camel-imapx-server.c:2071
+#: ../camel/providers/imap/camel-imap-store.c:576
+#: ../camel/providers/imap/camel-imap-store.c:596
+#: ../camel/providers/imap/camel-imap-store.c:603
+#: ../camel/providers/imap/camel-imap-store.c:630
+#: ../camel/providers/imapx/camel-imapx-server.c:2617
+#: ../camel/providers/imapx/camel-imapx-server.c:2648
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "IMAP à®?à¯?à®µà®?à®©à¯? %s à®?à®?à®©à¯? à®ªà®¾à®¤à¯?à®?à¯?à®?à®¾à®ªà¯?à®ªà®¾à®? %s à®? à®?à®£à¯?à®ªà¯?à®ªà®¤à®¿à®²à¯? à®¤à¯?à®²à¯?à®µà®¿"
 
-#: ../camel/providers/imap/camel-imap-store.c:690
-#: ../camel/providers/imapx/camel-imapx-server.c:2058
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
+#: ../camel/providers/imap/camel-imap-store.c:577
+#: ../camel/providers/imapx/camel-imapx-server.c:2618
+#: ../camel/providers/smtp/camel-smtp-transport.c:297
 msgid "STARTTLS not supported"
 msgstr "STARTTLS à®?à®¤à®°à®µà¯? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/providers/imap/camel-imap-store.c:709
-#: ../camel/providers/imapx/camel-imapx-server.c:2072
+#: ../camel/providers/imap/camel-imap-store.c:597
+#: ../camel/providers/imapx/camel-imapx-server.c:2649
 msgid "SSL negotiations failed"
 msgstr "SSL à®ªà¯?à®°à®®à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à¯?à®±à¯?à®±à®¤à¯?"
 
-#: ../camel/providers/imap/camel-imap-store.c:715
-#: ../camel/providers/imap4/camel-imap4-store.c:335
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
+#: ../camel/providers/imap/camel-imap-store.c:604
+#: ../camel/providers/smtp/camel-smtp-transport.c:338
 msgid "SSL is not available in this build"
 msgstr "SSL à®?à®°à¯?à®µà®¾à®?à¯?à®?à®®à¯? à®?à®¿à®?à¯?à®?à¯?à®?à®ªà¯? à®ªà¯?à®±à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/providers/imap/camel-imap-store.c:863
+#: ../camel/providers/imap/camel-imap-store.c:755
+#: ../camel/providers/imapx/camel-imapx-server.c:2442
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "\"%s\" à®?à®?à¯?à®?à®³à¯?à®¯à¯?à®?à®©à¯? à®?à®£à¯?à®¯ à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1051
-#: ../camel/providers/imap/camel-imap-store.c:2430
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:356
-#: ../camel/providers/imap4/camel-imap4-store.c:1403
-#: ../camel/providers/imapx/camel-imapx-store.c:349
-#: ../camel/providers/imapx/camel-imapx-store.c:578
-#: ../camel/providers/local/camel-maildir-folder.c:81
+#: ../camel/providers/imap/camel-imap-store.c:944
+#: ../camel/providers/imap/camel-imap-store.c:2424
+#: ../camel/providers/imapx/camel-imapx-store.c:406
+#: ../camel/providers/imapx/camel-imapx-store.c:963
+#: ../camel/providers/local/camel-maildir-folder.c:90
 #: ../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:461
+#: ../camel/providers/local/camel-maildir-store.c:306
+#: ../camel/providers/local/camel-maildir-store.c:552
+#: ../camel/providers/local/camel-maildir-store.c:565
+#: ../camel/providers/local/camel-spool-store.c:500
 msgid "Inbox"
 msgstr "à®?à®³à¯?à®ªà¯?à®?à¯?à®?à®¿"
 
-#: ../camel/providers/imap/camel-imap-store.c:1303
+#: ../camel/providers/imap/camel-imap-store.c:1202
+#: ../camel/providers/imapx/camel-imapx-server.c:2714
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP à®?à¯?à®µà®?à®©à¯? %s %s à®µà®?à¯? à®?à®©à¯?à®®à®¤à®¿à®?à¯?à®?à¯? à®?à®¤à®°à®µà¯? à®¤à®°à®¾à®¤à¯?"
 
-#: ../camel/providers/imap/camel-imap-store.c:1313
-#: ../camel/providers/smtp/camel-smtp-transport.c:506
+#: ../camel/providers/imap/camel-imap-store.c:1213
+#: ../camel/providers/imapx/camel-imapx-server.c:2725
+#: ../camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s à®µà®?à¯? à®?à®©à¯?à®®à®¤à®¿à®?à¯?à®?à¯? à®?à®¤à®°à®µà¯? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/providers/imap/camel-imap-store.c:1387
+#: ../camel/providers/imap/camel-imap-store.c:1288
+#: ../camel/providers/imapx/camel-imapx-server.c:2793
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3132,411 +3072,116 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1891
-#: ../camel/providers/imap/camel-imap-store.c:2272
-#: ../camel/providers/imap4/camel-imap4-store.c:954
+#: ../camel/providers/imap/camel-imap-store.c:1848
+#: ../camel/providers/imap/camel-imap-store.c:2270
+#: ../camel/providers/imapx/camel-imapx-store.c:781
 #, c-format
-msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "à®?à®?à¯?à®µà®¿à®©à¯? à®ªà¯?à®¯à®°à¯? \"%s\" à®?à¯?à®²à¯?à®²à®¾à®¤à¯? à®?à®¾à®°à®£à®®à¯? à®?à®´à¯?à®¤à¯?à®¤à¯? \"%c\" à®?à®³à¯?à®³à®¤à¯?"
 
-#: ../camel/providers/imap/camel-imap-store.c:2008
-#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:202
-#: ../camel/providers/local/camel-mh-store.c:249
+#: ../camel/providers/imap/camel-imap-store.c:1967
+#: ../camel/providers/local/camel-maildir-store.c:184
+#: ../camel/providers/local/camel-mbox-store.c:189
+#: ../camel/providers/local/camel-mh-store.c:250
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "à®?à®?à¯?à®µà¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? %s: à®?à®?à¯?à®µà¯? à®?à®±à¯?à®?à¯?à®©à®µà¯? à®?à®³à¯?à®³à®¤à¯?"
 
-#: ../camel/providers/imap/camel-imap-store.c:2283
+#: ../camel/providers/imap/camel-imap-store.c:2281
+#: ../camel/providers/imapx/camel-imapx-store.c:789
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "à®¤à¯?à®°à®¿à®¯à®¾à®¤ à®®à¯?à®¤à®©à¯?à®®à¯? à®?à®?à¯?à®µà¯?: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3107
+#: ../camel/providers/imap/camel-imap-store.c:3143
 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 "IMAP4 à®?à¯?à®µà®?à®©à®¿à®²à¯? à®?à®¤à®¿à®°à¯?à®ªà®¾à®°à®¾à®¤ à®?à®´à¯?à®ªà¯?à®ªà¯? %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 "à®?à®®à®¾à®ªà¯? à®?à¯?à®µà¯?à®¯à®?à®¤à¯?à®¤à¯?à®?à¯?à®?à¯? à®?à®?à¯?à®?à®³à¯? à®?à®©à¯?à®ªà¯?à®ª à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? %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 ""
-"à®µà®¿à®°à®¿à®µà®¾à®© à®?à®?à¯?à®?à®²à¯? à®ªà®?à¯?à®?à®¿à®¯à®²à¯? à®?à®£à¯?à®?à¯? à®ªà®¿à®?à®¿à®ªà¯?à®ªà¯? à®?à¯?à®¯à®²à¯?à®ªà®?à¯?à®¤à¯?à®¤à¯?à®µà®¤à¯? à®?à¯?à®?à®¿à®² à®µà®?à®¿à®ªà¯?à®ªà®¿à®?à®³à¯? à®®à®±à¯?à®±à¯?à®®à¯? à®µà®¿à®?à®?à¯?à®µà¯? "
-"à®µà®¿à®¤à®¿à®?à®³à¯?à®?à¯?à®?à¯? à®?à®µà®?à®¿à®¯à®®à¯?"
-
-#: ../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' à®?à®?à¯?à®µà¯? à®?à®¤à¯?à®¤à®¿à®?à¯?à®µà¯? à®?à¯?à®±à®¿ à®?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®¤à¯?à®°à®¿à®¯à®¾à®¤ à®ªà®¿à®´à¯?"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:490
-#, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr "'%s' à®?à®?à¯?à®µà¯? à®?à®¤à¯?à®¤à®¿à®?à¯?à®µà¯? à®?à¯?à®±à®¿ à®?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®¤à®µà®±à®¾à®© à®?à®?à¯?à®?à®³à¯?"
-
-#: ../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' à®?à¯?à®?à¯? à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à¯? à®¨à®?à®°à¯?à®¤à¯?à®¤ à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?:  à®¤à¯?à®°à®¿à®¯à®¾à®¤ à®¤à®µà®±à¯?"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1194
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr "à®?à®?à¯?à®µà¯? '%s' à®?à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? à®?à®?à¯?à®µà¯? '%s' à®?à¯?à®?à¯? à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à¯? à®¨à®?à®°à¯?à®¤à¯?à®¤ à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®¤à®µà®±à®¾à®© à®?à®?à¯?à®?à®³à¯?"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1198
-#, 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 "IMAPv4rev1"
-
-#: ../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/nntp/camel-nntp-store.c:194
-#: ../camel/providers/nntp/camel-nntp-store.c:213
-#: ../camel/providers/pop3/camel-pop3-store.c:203
-#: ../camel/providers/smtp/camel-smtp-transport.c:271
-msgid "Connection canceled"
-msgstr "à®?à®£à¯?à®ªà¯?à®ªà®¿à®©à¯? à®°à®¤à¯?à®¤à¯? à®?à¯?à®¯à¯?à®¯à®¤à®²à¯?"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:296
-#, 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:275
-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 à®?à®©à¯?à®®à®¤à®¿ à®®à¯?à®±à¯?à®¯à¯? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤à®¿ à®?à®©à¯?à®®à®¤à®¿à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:534
-#, 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 à®?à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? '%s' à®?à¯?à®?à¯? à®²à®¿à®¸à¯?à®?à¯? à®¤à®?à®µà®²à¯? à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?.: %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 à®?à®?à¯?à®µà¯? à®?à®£à¯?à®¯ à®®à¯?à®±à¯?à®¯à®¿à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? à®¨à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1074
-#, c-format
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "à®?à®?à¯?à®µà¯? '%s' à®? à®¨à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®?à¯?à®²à¯?à®²à¯?à®ªà®?à®¿à®¯à®¾à®?à®¾à®¤ à®?à®?à¯?à®?à®²à¯? à®ªà¯?à®?à¯?à®?à®¿ à®ªà¯?à®¯à®°à¯?"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
-#, c-format
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "à®?à®?à¯?à®µà¯? '%s' à®? à®¨à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®¤à®µà®±à®¾à®© à®?à®?à¯?à®?à®³à¯?"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1099
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "à®?à®?à¯?à®µà¯? '%s' à®?  '%s' à®?à®© à®®à®±à¯? à®ªà¯?à®¯à®°à¯? à®?à®?  à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®?à®¿à®±à®ªà¯?à®ªà¯? à®?à®?à¯?à®µà¯?"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1106
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr " IMAP à®?à®?à¯?à®µà¯? à®?à®£à¯?à®¯ à®®à¯?à®±à¯?à®¯à®¿à®²à¯? à®ªà¯?à®¤à¯?à®ªà¯?à®ªà¯?à®¯à®°à®¿à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1137
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-msgstr "à®?à®?à¯?à®µà¯? '%s' à®?  '%s' à®?à®© à®®à®±à¯? à®ªà¯?à®¯à®°à¯? à®?à®?  à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®?à¯?à®²à¯?à®²à¯?à®ªà®?à®¿à®¯à®¾à®?à®¾à®¤ à®?à®?à¯?à®?à®²à¯? à®ªà¯?à®?à¯?à®?à®¿ à®ªà¯?à®¯à®°à¯?"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Bad command"
-msgstr "à®?à®?à¯?à®µà¯? '%s' à®?  '%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/imap4/camel-imap4-store.c:1633
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "IMAP à®?à®?à¯?à®µà¯? à®?à®£à¯?à®¯ à®®à¯?à®±à¯?à®¯à®¿à®²à¯? à®?à®µà®£à®ªà®?à¯?à®¤à¯?à®¤ à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1678
-#, c-format
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr "à®?à®?à¯?à®µà¯?  '%s' à®?à¯?à®?à¯? à®?à®¨à¯?à®¤à®¾ à®?à¯?à®²à¯?à®¤à¯?à®¤ à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®?à¯?à®²à¯?à®²à¯?à®ªà®?à®¿à®¯à®¾à®?à®¾à®¤ à®?à®?à¯?à®?à®²à¯? à®ªà¯?à®?à¯?à®?à®¿ à®ªà¯?à®¯à®°à¯?"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, c-format
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "à®?à®?à¯?à®µà¯?  '%s' à®?à¯?à®?à¯? à®?à®¨à¯?à®¤à®¾ à®?à¯?à®²à¯?à®¤à¯?à®¤ à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®¤à®µà®±à®¾à®© à®?à®?à¯?à®?à®³à¯?"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1705
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr "à®µà®²à¯? à®µà®¿à®²à®?à®¿à®¯ à®¨à®¿à®²à¯?à®¯à®¿à®²à¯? à®?à®®à®¾à®ªà¯? à®?à®?à¯?à®µà¯?à®?à®³à¯?à®?à¯?à®?à¯? à®?à®¨à¯?à®¤à®¾ à®¨à¯?à®?à¯?à®?à®®à¯? à®?à¯?à®¯à¯?à®¯ à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1750
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr "à®?à®?à¯?à®µà¯?  '%s' à®?à¯?à®?à¯? à®?à®¨à¯?à®¤à®¾ à®¨à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®?à¯?à®²à¯?à®²à¯?à®ªà®?à®¿à®¯à®¾à®?à®¾à®¤ à®?à®?à¯?à®?à®²à¯? à®ªà¯?à®?à¯?à®?à®¿ à®ªà¯?à®¯à®°à¯?"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr "à®?à®?à¯?à®µà¯?  '%s' à®?à¯?à®?à¯? à®?à®¨à¯?à®¤à®¾ à®¨à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®¤à®µà®±à®¾à®© à®?à®?à¯?à®?à®³à¯?"
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1590
-msgid "Scanning for changed messages"
-msgstr "à®®à®¾à®±à¯?à®±à®ªà¯?à®ªà®?à¯?à®? à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®¤à¯?à®?à¯?à®?à®¿à®±à®¤à¯?"
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1611
-#, 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 "à®ªà¯?à®¤à®¿à®¯ à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à®¿à®©à¯? à®?à®±à¯?à®?à®³à¯? à®?à¯?à®£à¯?à®?à¯? à®µà®°à¯?à®?à®¿à®±à®¤à¯?."
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:429
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "IMAP à®?à¯?à®µà®?à®©à®¿à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? à®?à®¤à®¿à®°à¯?à®ªà®¾à®°à®¾à®¤ à®ªà®¤à®¿à®²à¯? %s: "
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:452
-msgid "No data"
-msgstr "à®¤à®?à®µà®²à¯? à®?à®²à¯?à®²à¯?"
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:613
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "MAP à®?à¯?à®µà®?à®©à¯? %s à®?à®¤à®¿à®°à¯?à®ªà®¾à®°à®¾à®®à®²à¯? à®¤à¯?à®£à¯?à®?à®¿à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®?à®¤à¯? : %s"
-
-#: ../camel/providers/imapx/camel-imapx-folder.c:84
+#: ../camel/providers/imapx/camel-imapx-folder.c:75
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr "%s à®?à¯?à®?à®¾à®© à®?à®?à¯?à®µà¯? à®?à¯?à®°à¯?à®?à¯?à®?à®¤à¯?à®¤à¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:92
+#: ../camel/providers/imapx/camel-imapx-folder.c:83
 #, c-format
 msgid "Could not create cache for %s"
 msgstr "%s à®?à¯?à®?à®¾à®© à®¤à®±à¯?à®?à®¾à®²à®¿à®? à®¨à®¿à®©à¯?à®µà®¿à®?à®¤à¯?à®¤à¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
+#: ../camel/providers/imapx/camel-imapx-provider.c:43
 msgid "Use I_dle if the server supports it"
 msgstr "_d à®?à¯?à®µà¯?à®¯à®?à®®à¯? à®?à®¤à®°à®µà¯? à®¤à®°à¯?à®®à®¾à®¯à®¿à®©à¯? à®?à¯?à®®à¯?à®®à®¾ à®?à®°à¯? à®?  à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤à¯?à®?."
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:55
+msgid "Command:"
+msgstr "à®?à®?à¯?à®?à®³à¯?:"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
 msgid "Numbe_r of cached connections to use"
 msgstr "_r à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤ à®?à®?à¯? à®¨à®¿à®©à¯?à®µà®? à®?à®£à¯?à®ªà¯?à®ªà¯?à®?à®³à®¿à®©à¯? à®?à®£à¯?à®£à®¿à®?à¯?à®?à¯? "
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
+#: ../camel/providers/imapx/camel-imapx-provider.c:70
+msgid "Namespace:"
+msgstr "à®ªà¯?à®¯à®°à¯? à®¨à®¿à®°à®ªà¯?à®ªà®¿à®?à®®à¯?:"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:89
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2020
+#: ../camel/providers/imapx/camel-imapx-server.c:2549
 #, c-format
 msgid "Could not connect to %s (port %s): %s"
 msgstr " %s (port %s): %s à®?à®£à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2100
-#, c-format
-msgid "%sPlease enter the IMAP password for %s %s"
-msgstr "%s %s %s à®?à¯?à®?à®¾à®© à®?à®®à®¾à®ªà¯? à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯?à®²à¯? à®?à®³à¯?à®³à®¿à®?à®µà¯?à®®à¯?"
-
-#: ../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
+#: ../camel/providers/local/camel-local-folder.c:199
 #, 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:209
+#: ../camel/providers/local/camel-local-folder.c:218
 #, c-format
 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:227
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-provider.c:48
+#: ../camel/providers/local/camel-local-folder.c:272
+msgid "Index message body data"
+msgstr "à®?à®?à¯?à®?à®µà®£à¯? à®?à¯?à®¯à¯?à®¤à®¿à®¯à®¿à®©à¯? à®?à®?à®±à¯?à®ªà®?à¯?à®¤à®¿à®¤à¯? à®¤à®?à®µà®²à¯?"
+
+#. Translators: The first %s is replaced with a message ID,
+#. the second %s is replaced with the folder path,
+#. the third %s is replaced with a detailed error string
+#: ../camel/providers/local/camel-local-folder.c:682
+#, fuzzy, 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 "(_U) '.folders' à®?à®?à¯?à®µà¯? à®?à¯?à®°à¯?à®?à¯?à®?à®®à¯? à®?à¯?à®ªà¯?à®ªà¯? (exmh) à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤à¯?à®?"
 
-#: ../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-like à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à®?à¯?à®µà®¿à®²à¯? à®ªà¯?à®¤à¯? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à¯?à®®à®¿à®?à¯?à®?"
 
-#: ../camel/providers/local/camel-local-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:69
 msgid "Local delivery"
 msgstr "à®?à®?à®¤à¯?à®¤à®¿à®²à¯? à®?à¯?à®°à¯?à®ªà®¿à®¤à¯?à®¤à®²à¯?"
 
-#: ../camel/providers/local/camel-local-provider.c:74
+#: ../camel/providers/local/camel-local-provider.c:70
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
@@ -3544,29 +3189,29 @@ msgstr ""
 "à®?à®?à¯?à®?à®³à¯? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯?à®?à®³à¯? mbox à®?à®®à¯?à®ªà¯?à®ªà®¿à®²à¯?à®³à¯?à®³ à®?à®µà®²à¯?à®¯à¯?à®·à®©à®¾à®²à¯? à®®à¯?à®²à®¾à®£à¯?à®®à¯? à®?à¯?à®¯à¯?à®¯à®ªà¯?à®ªà®?à¯?à®®à¯? à®?à®?à¯?à®µà®¿à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? "
 "à®ªà¯?à®±à¯?à®±à¯?à®?à¯?à®?à¯?à®³à¯?à®³ (à®¨à®?à®°à¯?à®¤à¯?à®¤)."
 
-#: ../camel/providers/local/camel-local-provider.c:88
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:103
 msgid "_Apply filters to new messages in INBOX"
 msgstr "(_A) à®?à®³à¯?à®ªà¯?à®?à¯?à®?à®¿à®¯à®¿à®²à¯? à®ªà¯?à®¤à®¿à®¯ à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à¯?à®?à¯?à®?à¯? à®µà®?à®¿à®ªà¯?à®ªà®¿à®¯à¯? à®?à¯?à®¯à®²à¯?à®ªà®?à¯?à®¤à¯?à®¤à¯? "
 
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:91
 msgid "Maildir-format mail directories"
 msgstr "Maildir-à®µà®?à®¿à®µà®®à¯?à®ªà¯?à®ªà¯? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à®?à¯?à®µà¯?"
 
-#: ../camel/providers/local/camel-local-provider.c:96
+#: ../camel/providers/local/camel-local-provider.c:92
 msgid "For storing local mail in maildir directories."
 msgstr "maildir à®?à®?à¯?à®µà®¿à®²à¯? à®?à®³à¯? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯?à®?à®³à¯? à®?à¯?à®®à®¿à®?à¯?à®?."
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:104
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr " à®?à®²à¯?à®®à¯? à®ªà¯?à®©à¯? à®®à®?à¯? à®ªà®¾à®?à¯?à®?à®¿à®²à¯? à®?à®°à¯?à®ªà¯?à®ªà¯? à®¨à®¿à®²à¯? à®¤à®²à¯?à®ªà¯?à®ªà¯?à®?à®³à¯?"
 
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:111
 msgid "Standard Unix mbox spool file"
 msgstr "à®?à¯?à®¨à¯?à®¤à®° Unix mbox spool à®?à®?à¯?à®µà¯?"
 
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:112
+#: ../camel/providers/local/camel-local-provider.c:123
 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."
@@ -3574,31 +3219,31 @@ msgstr ""
 "à®®à®±à¯?à®± à®¤à®°à®¤à¯?à®¤à®¿à®²à¯? mbox spool à®?à¯?à®ªà¯?à®ªà¯? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯?à®?à®³à¯? à®®à®±à¯?à®± à®¤à®°à®¤à¯?à®¤à®¿à®²à¯? à®©à¯?à®©à®¿à®?à¯?à®?à®²à¯?à®?à®³à¯? à®ªà®?à®¿à®?à¯?à®?à®µà¯?à®®à¯?à®ªà®¯à®©à¯?à®ªà®?à¯?à®®à¯?\n"
 "Elm, Pine, à®?à®²à¯?à®²à®¤à¯? Mutt à®ªà®¾à®£à®¿à®¯à®¿à®²à¯? à®?à®³à¯?à®³ à®?à®¿à®³à¯?à®?à®³à¯?à®¯à¯?à®®à¯? à®ªà®?à®¿à®?à¯?à®?à®²à®¾à®®à¯?. à®?à¯?à®®à®¿à®?à¯?à®?à®µà¯?à®®à¯? "
 
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:122
 msgid "Standard Unix mbox spool directory"
 msgstr "à®?à¯?à®¨à¯?à®¤à®° Unix mbox spool à®?à®?à¯?à®µà¯?"
 
-#: ../camel/providers/local/camel-local-store.c:163
-#: ../camel/providers/local/camel-local-store.c:274
-#: ../camel/providers/local/camel-mbox-store.c:357
-#: ../camel/providers/local/camel-spool-store.c:126
+#: ../camel/providers/local/camel-local-store.c:148
+#: ../camel/providers/local/camel-local-store.c:278
+#: ../camel/providers/local/camel-mbox-store.c:361
+#: ../camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "à®®à¯?à®²à®®à¯? %s à®?à®°à®¿à®¯à®¾à®© à®ªà®¾à®¤à¯? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/providers/local/camel-local-store.c:170
+#: ../camel/providers/local/camel-local-store.c:156
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "à®?à®¿à®?à®?à¯?à®?à¯? à®®à¯?à®²à®®à¯? %s à®?à®¯à®²à¯?à®ªà®¾à®© à®?à®?à¯?à®µà¯? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/providers/local/camel-local-store.c:179
-#: ../camel/providers/local/camel-local-store.c:187
-#: ../camel/providers/local/camel-local-store.c:285
+#: ../camel/providers/local/camel-local-store.c:166
+#: ../camel/providers/local/camel-local-store.c:175
+#: ../camel/providers/local/camel-local-store.c:290
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "à®?à®?à¯?à®µà¯? à®ªà¯?à®± à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:199
+#: ../camel/providers/local/camel-local-store.c:188
 msgid "Local stores do not have an inbox"
 msgstr "à®?à®³à¯? à®?à¯?à®®à®¿à®ªà¯?à®ªà¯?à®?à®³à¯?à®?à¯?à®?à¯? à®?à®³à¯?à®ªà¯?à®?à¯?à®?à®¿ à®?à®¿à®?à¯?à®¯à®¾à®¤à¯?"
 
@@ -3607,179 +3252,158 @@ msgstr "à®?à®³à¯? à®?à¯?à®®à®¿à®ªà¯?à®ªà¯?à®?à®³à¯?à®?à¯?à®?à¯? à®?à®³à¯?à®ªà¯?
 msgid "Local mail file %s"
 msgstr "à®?à®³à¯? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à¯?à®ªà¯?à®ªà¯? %s"
 
-#: ../camel/providers/local/camel-local-store.c:340
+#: ../camel/providers/local/camel-local-store.c:350
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "%s à®? %s à®?à®? à®ªà¯?à®¯à®°à¯? à®®à®¾à®±à¯?à®±à®®à¯? à®?à¯?à®¯à¯?à®¯ à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
 
-#: ../camel/providers/local/camel-local-store.c:408
+#: ../camel/providers/local/camel-local-store.c:422
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "à®ªà¯?à®¯à®°à¯? à®®à®¾à®±à¯?à®±à®¯à¯?à®¯ à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?'%s': %s"
 
-#: ../camel/providers/local/camel-local-store.c:433
-#: ../camel/providers/local/camel-mbox-store.c:298
+#: ../camel/providers/local/camel-local-store.c:452
+#: ../camel/providers/local/camel-mbox-store.c:293
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "à®?à®?à¯?à®µà¯? à®?à®?à¯?à®?à®µà®£à¯? à®?à¯?à®ªà¯?à®ªà¯? '%s' à®? à®¨à¯?à®?à¯?à®?à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
 
-#: ../camel/providers/local/camel-local-store.c:456
-#: ../camel/providers/local/camel-mbox-store.c:322
+#: ../camel/providers/local/camel-local-store.c:482
+#: ../camel/providers/local/camel-mbox-store.c:324
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "à®?à®?à¯?à®µà¯? à®®à¯?à®?à®¾ à®?à¯?à®ªà¯?à®ªà¯? '%s' à®? à®¨à¯?à®?à¯?à®?à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:515
+#: ../camel/providers/local/camel-local-summary.c:537
 msgid "Unable to add message to summary: unknown reason"
 msgstr "à®?à¯?à®°à¯?à®?à¯?à®?à®¤à¯?à®¤à®¿à®²à¯? à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®?à¯?à®°à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®?à®¾à®°à®£à®®à¯? à®¤à¯?à®°à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/providers/local/camel-maildir-folder.c:230
+#: ../camel/providers/local/camel-maildir-folder.c:191
 msgid "Maildir append message canceled"
 msgstr "Maildir à®?à®£à¯?à®ªà¯?à®ªà¯? à®?à¯?à®¯à¯?à®¤à®¿ à®°à®¤à¯?à®¤à¯?à®?à¯?à®¯à¯?à®¯à®ªà¯?à®ªà®?à¯?à®?à¯?à®³à¯?à®³à®¤à¯?"
 
-#: ../camel/providers/local/camel-maildir-folder.c:233
+#: ../camel/providers/local/camel-maildir-folder.c:195
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "maildir à®?à®?à¯?à®µà®¿à®²à¯? à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®ªà®¿à®©à¯?à®?à¯?à®°à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:263
-#: ../camel/providers/local/camel-maildir-folder.c:292
-#: ../camel/providers/local/camel-maildir-folder.c:306
-#: ../camel/providers/local/camel-maildir-folder.c:314
-#: ../camel/providers/local/camel-maildir-folder.c:400
-#: ../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:225
-#: ../camel/providers/local/camel-mh-folder.c:236
-#: ../camel/providers/local/camel-mh-folder.c:244
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"%s à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? %sà®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®ªà¯?à®± à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?\n"
-"  %s"
-
-#: ../camel/providers/local/camel-maildir-folder.c:315
+#: ../camel/providers/local/camel-maildir-folder.c:291
 msgid "Invalid message contents"
 msgstr "à®?à¯?à®²à¯?à®²à®¾à®¤ à®?à¯?à®¯à¯?à®¤à®¿"
 
-#: ../camel/providers/local/camel-maildir-folder.c:418
+#: ../camel/providers/local/camel-maildir-folder.c:407
 msgid "Cannot transfer message to destination folder"
 msgstr "à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®?à®²à®?à¯?à®?à¯? à®?à®?à¯?à®µà®¿à®±à¯?à®?à¯? à®¨à®?à®°à¯?à®¤à¯?à®¤ à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/providers/local/camel-maildir-store.c:148
-#: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:174
-#: ../camel/providers/local/camel-mbox-store.c:186
+#: ../camel/providers/local/camel-maildir-store.c:134
+#: ../camel/providers/local/camel-maildir-store.c:162
+#: ../camel/providers/local/camel-mbox-store.c:158
+#: ../camel/providers/local/camel-mbox-store.c:171
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "à®?à®?à¯?à®µà¯?   '%s' à®? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:145
-#: ../camel/providers/local/camel-mh-store.c:217
+#: ../camel/providers/local/camel-maildir-store.c:148
+#: ../camel/providers/local/camel-mbox-store.c:126
+#: ../camel/providers/local/camel-mh-store.c:213
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "à®?à®?à¯?à®µà¯? '%s' à®? à®ªà¯?à®± à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:153
-#: ../camel/providers/local/camel-mh-store.c:224
+#: ../camel/providers/local/camel-maildir-store.c:153
+#: ../camel/providers/local/camel-mbox-store.c:135
+#: ../camel/providers/local/camel-mh-store.c:221
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "à®?à®?à¯?à®µà¯? '%s' à®? à®ªà¯?à®± à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®?à®?à¯?à®µà¯? à®?à®°à¯?à®ªà¯?à®ªà®¿à®²à¯? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-maildir-store.c:179
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "à®?à®?à¯?à®µà¯? '%s' à®? à®ªà¯?à®± à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®®à¯?à®¯à¯?à®²à¯?à®?à®¿à®°à¯? à®?à®?à¯?à®µà¯? à®?à®²à¯?à®²"
 
-#: ../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:235
+#: ../camel/providers/local/camel-maildir-store.c:274
+#: ../camel/providers/local/camel-mh-store.c:281
 #, 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:237
 msgid "not a maildir directory"
 msgstr "maildir à®?à®?à¯?à®µà¯? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:328
-#: ../camel/providers/local/camel-spool-store.c:342
+#: ../camel/providers/local/camel-maildir-store.c:472
+#: ../camel/providers/local/camel-spool-store.c:357
+#: ../camel/providers/local/camel-spool-store.c:372
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "à®?à®?à¯?à®µà¯? '%s' à®? à®µà®°à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:432
-#: ../camel/providers/local/camel-maildir-summary.c:551
+#: ../camel/providers/local/camel-maildir-summary.c:433
+#: ../camel/providers/local/camel-maildir-summary.c:555
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "maildir à®?à®?à¯?à®µà®¿à®²à¯? à®ªà®¾à®¤à¯?à®¯à¯? à®¤à®¿à®±à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:544
+#: ../camel/providers/local/camel-maildir-summary.c:547
 msgid "Checking folder consistency"
 msgstr "à®?à®?à¯?à®µà®¿à®©à¯? à®¨à®¿à®²à¯?à®ªà¯?à®ªà¯?à®¤à¯?à®¤à®©à¯?à®®à¯?à®¯à¯? à®?à¯?à®¤à®¿à®?à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../camel/providers/local/camel-maildir-summary.c:637
+#: ../camel/providers/local/camel-maildir-summary.c:638
 msgid "Checking for new messages"
 msgstr "à®ªà¯?à®¤à®¿à®¯ à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à¯? à®?à¯?à®¤à®¿à®?à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../camel/providers/local/camel-maildir-summary.c:724
-#: ../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:729
+#: ../camel/providers/local/camel-mbox-summary.c:465
+#: ../camel/providers/local/camel-mbox-summary.c:667
+#: ../camel/providers/local/camel-mbox-summary.c:792
+#: ../camel/providers/local/camel-spool-summary.c:129
 msgid "Storing folder"
 msgstr "à®?à®?à¯?à®µà¯?à®?à®³à¯? à®?à¯?à®®à®¿à®?à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../camel/providers/local/camel-mbox-folder.c:167
-#: ../camel/providers/local/camel-spool-folder.c:150
+#: ../camel/providers/local/camel-mbox-folder.c:123
+#: ../camel/providers/local/camel-spool-folder.c:123
 #, 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:194
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®ªà¯?à®?à¯?à®?à®¿à®¯à¯? à®¤à®¿à®±à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s: %s\n"
 
-#: ../camel/providers/local/camel-mbox-folder.c:297
+#: ../camel/providers/local/camel-mbox-folder.c:261
 msgid "Mail append canceled"
 msgstr "à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à®¿à®©à¯? à®?à®£à¯?à®ªà¯?à®ªà¯?  à®°à®¤à¯?à®¤à¯? à®?à¯?à®¯à¯?à®¯à®ªà¯?à®ªà®?à¯?à®?à¯?à®³à¯?à®³à®¤à¯?"
 
-#: ../camel/providers/local/camel-mbox-folder.c:300
+#: ../camel/providers/local/camel-mbox-folder.c:265
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "mbox à®?à¯?à®ªà¯?à®ªà®¿à®²à¯? à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®ªà®¿à®©à¯?à®?à¯?à®°à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:466
+#: ../camel/providers/local/camel-mbox-folder.c:438
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "à®?à®¨à¯?à®¤ à®?à®?à¯?à®µà¯? à®®à¯?à®?à¯?à®?à®®à¯?à®?à®¿à®¯à®¾à®¤ à®¨à®¿à®²à¯?à®¯à®¿à®²à¯? à®?à¯?à®¤à®®à®?à¯?à®¨à¯?à®¤à¯?à®³à¯?à®³à®¤à¯?."
 
-#: ../camel/providers/local/camel-mbox-folder.c:474
-#: ../camel/providers/local/camel-mh-folder.c:245
+#: ../camel/providers/local/camel-mbox-folder.c:448
+#: ../camel/providers/local/camel-mh-folder.c:241
 msgid "Message construction failed."
 msgstr "à®?à¯?à®¯à¯?à®¤à®¿ à®?à®?à¯?à®?à¯?à®®à®¾à®©à®®à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à¯?à®±à¯?à®±à®¤à¯?"
 
-#: ../camel/providers/local/camel-mbox-store.c:164
-#: ../camel/providers/local/camel-mbox-store.c:363
+#: ../camel/providers/local/camel-mbox-store.c:147
+#: ../camel/providers/local/camel-mbox-store.c:369
 msgid "Cannot create a folder by this name."
 msgstr "à®?à®¨à¯?à®¤ à®ªà¯?à®¯à®°à®¿à®²à¯? à®?à®?à¯?à®µà¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?"
 
-#: ../camel/providers/local/camel-mbox-store.c:196
+#: ../camel/providers/local/camel-mbox-store.c:182
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "à®?à®?à¯?à®µà¯? '%s' à®? à®ªà¯?à®± à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®µà®´à®?à¯?à®?à®®à®¾à®© à®?à¯?à®ªà¯?à®ªà¯? à®?à®²à¯?à®²."
 
+#: ../camel/providers/local/camel-mbox-store.c:214
 #: ../camel/providers/local/camel-mbox-store.c:226
-#: ../camel/providers/local/camel-mbox-store.c:237
-#: ../camel/providers/local/camel-mbox-store.c:260
+#: ../camel/providers/local/camel-mbox-store.c:252
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3788,164 +3412,164 @@ msgstr ""
 "à®?à®?à¯?à®µà¯? '%s' à®? à®¨à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?':\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:245
+#: ../camel/providers/local/camel-mbox-store.c:235
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "'%s' à®µà®´à®?à¯?à®?à®®à®¾à®© à®?à¯?à®ªà¯?à®ªà¯? à®?à®²à¯?à®²"
 
-#: ../camel/providers/local/camel-mbox-store.c:252
+#: ../camel/providers/local/camel-mbox-store.c:243
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "à®?à®?à¯?à®µà¯? '%s' à®µà¯?à®±à¯?à®±à¯? à®?à®²à¯?à®²à¯? à®¨à¯?à®?à¯?à®?à®ªà¯?à®ªà®?à®µà®¿à®²à¯?à®²à¯?."
 
-#: ../camel/providers/local/camel-mbox-store.c:274
-#: ../camel/providers/local/camel-mbox-store.c:286
+#: ../camel/providers/local/camel-mbox-store.c:267
+#: ../camel/providers/local/camel-mbox-store.c:280
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "à®?à®?à¯?à®µà¯? à®?à¯?à®°à¯?à®?à¯?à®? à®?à¯?à®ªà¯?à®ªà¯? '%s' à®? à®¨à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:376
+#: ../camel/providers/local/camel-mbox-store.c:384
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "à®?à®?à¯?à®µà¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯? : %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:390
+#: ../camel/providers/local/camel-mbox-store.c:399
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "à®?à®?à¯?à®µà¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯? : %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:401
 msgid "Folder already exists"
 msgstr "à®?à®?à¯?à®µà¯? à®?à®±à¯?à®?à¯?à®©à®µà¯? à®?à®³à¯?à®³à®¤à¯?"
 
-#: ../camel/providers/local/camel-mbox-store.c:483
+#: ../camel/providers/local/camel-mbox-store.c:495
 msgid "The new folder name is illegal."
 msgstr "à®ªà¯?à®¤à®¿à®¯ à®?à®?à¯?à®µà®¿à®©à¯? à®ªà¯?à®¯à®°à¯? à®?à®±à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?"
 
-#: ../camel/providers/local/camel-mbox-store.c:496
+#: ../camel/providers/local/camel-mbox-store.c:509
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "à®?à®?à¯?à®µà¯? '%s' à®? à®® à®ªà¯?à®¯à®°à®¿à®?  à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:577
+#: ../camel/providers/local/camel-mbox-store.c:591
 #, 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:472
 #, 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:523
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr " %ld à®?à®²à¯? %sà®?à®?à¯?à®µà®¿à®²à¯? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®ªà®?à¯?à®¤à¯?à®¤à®²à¯? à®ªà®¿à®´à¯?"
 
-#: ../camel/providers/local/camel-mbox-summary.c:659
+#: ../camel/providers/local/camel-mbox-summary.c:603
 #, 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:673
+#: ../camel/providers/local/camel-mbox-summary.c:798
+#: ../camel/providers/local/camel-spool-summary.c:135
 #, 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:686
+#: ../camel/providers/local/camel-spool-summary.c:149
 #, 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:957
+#: ../camel/providers/local/camel-mbox-summary.c:700
+#: ../camel/providers/local/camel-mbox-summary.c:913
 #, 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:710
 #, 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:726
 #, 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:1084
+#: ../camel/providers/local/camel-mbox-summary.c:810
+#: ../camel/providers/local/camel-mbox-summary.c:1051
 #, 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:1114
-#: ../camel/providers/local/camel-mbox-summary.c:1122
+#: ../camel/providers/local/camel-mbox-summary.c:851
+#: ../camel/providers/local/camel-mbox-summary.c:860
+#: ../camel/providers/local/camel-mbox-summary.c:1084
+#: ../camel/providers/local/camel-mbox-summary.c:1093
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "à®?à®¤à¯?à®¤à®¿à®?à¯?à®¤à¯?à®¤ à®ªà®¿à®©à¯?à®©à¯?à®®à¯?, à®?à¯?à®°à¯?à®?à¯?à®?à®®à¯? à®®à®±à¯?à®±à¯?à®®à¯? à®?à®?à¯?à®µà®¿à®²à¯? à®ªà¯?à®°à¯?à®¤à¯?à®¤à®®à®¿à®²à¯?à®²à¯?"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1047
-#: ../camel/providers/local/camel-spool-summary.c:334
+#: ../camel/providers/local/camel-mbox-summary.c:1011
+#: ../camel/providers/local/camel-spool-summary.c:326
 #, c-format
 msgid "Unknown error: %s"
 msgstr "à®¤à¯?à®°à®¿à®¯à®¾à®¤ à®ªà®¿à®´à¯?: %s"
 
+#: ../camel/providers/local/camel-mbox-summary.c:1162
 #: ../camel/providers/local/camel-mbox-summary.c:1190
-#: ../camel/providers/local/camel-mbox-summary.c:1216
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "à®¤à®±à¯?à®?à®¾à®²à®¿à®? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®ªà¯?à®?à¯?à®?à®¿à®¯à®¿à®²à¯? à®?à®´à¯?à®¤à¯?à®®à¯? à®ªà¯?à®¤à¯? à®¤à¯?à®²à¯?à®µà®¿: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1207
+#: ../camel/providers/local/camel-mbox-summary.c:1180
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "à®¤à®±à¯?à®?à®¾à®²à®¿à®? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®ªà¯?à®?à¯?à®?à®¿à®¯à®¿à®²à¯? à®?à®´à¯?à®¤à¯?à®®à¯? à®ªà¯?à®¤à¯? à®¤à¯?à®²à¯?à®µà®¿: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:180
+#: ../camel/providers/local/camel-mh-folder.c:166
 msgid "MH append message canceled"
 msgstr "MH à®?à®£à¯?à®?à¯?à®¯à¯?à®¤à®¿ à®°à®¤à¯?à®¤à¯? à®?à¯?à®¯à¯?à®¯à®ªà¯?à®ªà®?à¯?à®?à¯?à®³à¯?à®³à®¤à¯?"
 
-#: ../camel/providers/local/camel-mh-folder.c:183
+#: ../camel/providers/local/camel-mh-folder.c:170
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "mh à®?à®?à¯?à®µà®¿à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®ªà®¿à®©à¯?à®?à¯?à®°à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? : %s: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:232
+#: ../camel/providers/local/camel-mh-store.c:230
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr " %s à®?à®?à¯?à®µà¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? : %s "
 
-#: ../camel/providers/local/camel-mh-store.c:244
+#: ../camel/providers/local/camel-mh-store.c:243
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 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:132
+#: ../camel/providers/local/camel-spool-store.c:119
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "' %s'  à®¸à¯?à®ªà¯?à®²à¯? à®?à®?à¯?à®µà¯? à®¤à®¿à®±à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯? : %s"
 
-#: ../camel/providers/local/camel-spool-store.c:144
+#: ../camel/providers/local/camel-spool-store.c:132
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "' %s'  à®¸à¯?à®ªà¯?à®²à¯? à®?à®?à¯?à®µà¯? à®µà®´à®?à¯?à®?à®®à®¾à®© à®?à¯?à®ªà¯?à®ªà¯? à®?à®²à¯?à®²à®¤à¯? à®?à®?à¯?à®µà¯? à®?à®²à¯?à®²"
 
-#: ../camel/providers/local/camel-spool-store.c:163
+#: ../camel/providers/local/camel-spool-store.c:157
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "à®?à®?à¯?à®µà¯? '%s/%s' à®?à®°à¯?à®ªà¯?à®ªà®¿à®²à¯? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/providers/local/camel-spool-store.c:173
+#: ../camel/providers/local/camel-spool-store.c:168
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3954,12 +3578,12 @@ msgstr ""
 "à®?à®¨à¯?à®¤ à®?à®?à¯?à®µà¯? à®¤à®¿à®±à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?'%s':\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:177
+#: ../camel/providers/local/camel-spool-store.c:173
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "à®?à®?à¯?à®µà¯? '%s' à®?à®°à¯?à®ªà¯?à®ªà®¿à®²à¯? à®?à®²à¯?à®²à¯?."
 
-#: ../camel/providers/local/camel-spool-store.c:182
+#: ../camel/providers/local/camel-spool-store.c:179
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -3968,7 +3592,7 @@ msgstr ""
 "'%s' à®?à®²à¯? à®?à®?à¯?à®µà¯? à®?à®°à¯?à®µà®¾à®?à¯?à®?à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:190
+#: ../camel/providers/local/camel-spool-store.c:188
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "'%s'à®?à®?à¯?à®?à®²à¯? à®ªà¯?à®?à¯?à®?à®¿ à®?à¯?à®ªà¯?à®ªà¯? à®?à®²à¯?à®²à¯?"
@@ -3977,39 +3601,39 @@ msgstr "'%s'à®?à®?à¯?à®?à®²à¯? à®ªà¯?à®?à¯?à®?à®¿ à®?à¯?à®ªà¯?à®ªà¯? à®?à®²à¯?
 msgid "Store does not support an INBOX"
 msgstr "à®?à®³à¯?à®ªà¯?à®?à¯?à®?à®¿à®?à¯?à®?à¯? à®?à¯?à®®à®¿à®ªà¯?à®ªà¯? à®?à®¿à®?à®?à¯?à®?à®¿à®©à¯? à®?à®¤à®°à®µà¯? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/providers/local/camel-spool-store.c:219
+#: ../camel/providers/local/camel-spool-store.c:220
 #, c-format
 msgid "Spool mail file %s"
 msgstr "à®?à¯?à®°à¯?à®³à¯? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à¯?à®ªà¯?à®ªà¯? %s"
 
-#: ../camel/providers/local/camel-spool-store.c:219
+#: ../camel/providers/local/camel-spool-store.c:220
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "à®?à¯?à®°à¯?à®³à¯? à®?à®?à¯?à®µà¯? à®?à®¿à®³à¯? %s"
 
-#: ../camel/providers/local/camel-spool-store.c:227
+#: ../camel/providers/local/camel-spool-store.c:232
 msgid "Spool folders cannot be renamed"
 msgstr "à®?à¯?à®°à¯?à®³à¯? à®?à®?à¯?à®µà®¿à®±à¯?à®?à¯? à®®à®±à¯?à®ªà¯?à®¯à®°à®¿à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?"
 
-#: ../camel/providers/local/camel-spool-store.c:235
+#: ../camel/providers/local/camel-spool-store.c:245
 msgid "Spool folders cannot be deleted"
 msgstr "à®?à¯?à®°à¯?à®³à¯? à®?à®?à¯?à®µà¯? à®¨à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?."
 
-#: ../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:162
+#: ../camel/providers/local/camel-spool-summary.c:173
+#: ../camel/providers/local/camel-spool-summary.c:184
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "à®¤à®±à¯?à®?à®¾à®²à®¿à®? à®?à®?à¯?à®µà¯? à®?à®¤à¯?à®¤à®¿à®?à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?%s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:216
+#: ../camel/providers/local/camel-spool-summary.c:201
 #, c-format
 msgid "Could not sync 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:232
+#: ../camel/providers/local/camel-spool-summary.c:250
+#: ../camel/providers/local/camel-spool-summary.c:262
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -4018,67 +3642,85 @@ msgstr ""
 "à®¸à¯?à®ªà¯?à®²à¯? à®?à®?à¯?à®µà¯? %sà®? à®?à®°à¯?à®?à¯?à®?à®¿à®£à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s\n"
 "à®?à®?à¯?à®µà¯? à®?à®´à®¿à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®?à®¿à®°à¯?à®?à¯?à®?à®²à®¾à®®à¯?, à®¨à®?à®²à¯? '%s'à®?à®²à¯? à®?à¯?à®®à®¿à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®?à¯?à®³à¯?à®³à®¤à¯?"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:135
-#: ../camel/providers/nntp/camel-nntp-folder.c:192
-#: ../camel/providers/nntp/camel-nntp-folder.c:224
+#: ../camel/providers/nntp/camel-nntp-folder.c:196
+#: ../camel/providers/nntp/camel-nntp-folder.c:277
+#: ../camel/providers/nntp/camel-nntp-folder.c:318
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "à®?à®³à¯?à®³à®¾à®°à¯?à®¨à¯?à®¤ à®ªà®¿à®´à¯?: UID à®¤à®µà®±à®¾à®© à®µà®?à®¿à®µà®¤à¯?à®¤à®¿à®²à¯? à®?à®³à¯?à®³à®¤à¯?: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:365
-#: ../camel/providers/nntp/camel-nntp-folder.c:368
-#: ../camel/providers/nntp/camel-nntp-folder.c:410
-#: ../camel/providers/nntp/camel-nntp-folder.c:412
+#: ../camel/providers/nntp/camel-nntp-folder.c:245
+#: ../camel/providers/nntp/camel-nntp-folder.c:345
+#: ../camel/providers/nntp/camel-nntp-folder.c:527
+#: ../camel/providers/nntp/camel-nntp-store.c:1437
+#: ../camel/providers/nntp/camel-nntp-summary.c:395
+#, fuzzy
+msgid "User cancelled the operation"
+msgstr "à®?à¯?à®¯à®²à¯? à®®à¯?à®?à®¿à®?à¯?à®? à®?à®¯à®²à®µà®¿à®²à¯?à®²à¯?"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:477
+#: ../camel/providers/nntp/camel-nntp-folder.c:482
+#: ../camel/providers/nntp/camel-nntp-folder.c:531
+#: ../camel/providers/nntp/camel-nntp-folder.c:536
 #, c-format
 msgid "Posting failed: %s"
 msgstr "à®?à®®à®°à¯?à®ªà¯?à®ªà®¿à®¤à®²à¯? à®¤à¯?à®²à¯?à®µà®¿: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:430
+#: ../camel/providers/nntp/camel-nntp-folder.c:558
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "NNTP à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®?à®£à¯?à®¯ à®?à®£à¯?à®ªà¯?à®ªà®¿à®²à¯? à®?à®²à¯?à®²à®¾à®¤ à®ªà¯?à®¤à¯? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤ à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:441
+#: ../camel/providers/nntp/camel-nntp-folder.c:576
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "NNTP à®?à®?à¯?à®µà¯? à®¨à®?à®²à¯?à®?à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
-msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr "(_S) à®?à®¿à®±à¯? à®?à¯?à®±à®¿à®ªà¯?à®ªà®¾à®? à®?à®?à¯?à®µà¯? à®?à®¾à®?à¯?à®?à¯? (à®?-à®?à¯? comp.os.linux à®?à¯?à®?à¯? à®ªà®¤à®¿à®²à¯? c.o.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 ""
+"(_S) à®?à®¿à®±à¯? à®?à¯?à®±à®¿à®ªà¯?à®ªà®¾à®? à®?à®?à¯?à®µà¯? à®?à®¾à®?à¯?à®?à¯? (à®?-à®?à¯? comp.os.linux à®?à¯?à®?à¯? à®ªà®¤à®¿à®²à¯? c.o.linux )"
 
-#: ../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:53
 msgid "USENET news"
 msgstr "USENET à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à¯?"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
 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:74
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr "à®?à®¨à¯?à®¤ à®¤à¯?à®°à¯?à®µà¯? NNTP à®?à¯?à®µà®?à®©à®¿à®²à¯? à®µà¯?à®±à¯?à®±à¯? à®?à®°à¯? à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯?à®²à¯? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤à®¿ à®?à®©à¯?à®®à®¤à®¿ à®ªà¯?à®±à¯?à®®à¯?"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:216
+#: ../camel/providers/nntp/camel-nntp-store.c:253
+#: ../camel/providers/nntp/camel-nntp-store.c:271
+#: ../camel/providers/pop3/camel-pop3-store.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:235
+msgid "Connection canceled"
+msgstr "à®?à®£à¯?à®ªà¯?à®ªà®¿à®©à¯? à®°à®¤à¯?à®¤à¯? à®?à¯?à®¯à¯?à®¯à®¤à®²à¯?"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:274
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "%s à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? à®?à®´à¯?à®ªà¯?à®ªà¯? à®ªà®?à®¿à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:228
+#: ../camel/providers/nntp/camel-nntp-store.c:286
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "%s à®?à¯?à®µà®?à®©à¯? %dà®ªà®¿à®´à¯? à®?à¯?à®¯à¯?à®¤à®¿ à®?à®¿à®?à¯?à®¤à¯?à®¤à¯?à®³à¯?à®³à®¤à¯?: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:410
+#: ../camel/providers/nntp/camel-nntp-store.c:474
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET à®?à¯?à®¯à¯?à®¤à®¿ %s à®µà®´à®¿à®¯à®¾à®?"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:819
+#: ../camel/providers/nntp/camel-nntp-store.c:974
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4089,7 +3731,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:913
+#: ../camel/providers/nntp/camel-nntp-store.c:1070
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -4099,7 +3741,7 @@ msgstr ""
 "\n"
 "à®?à®ªà¯?à®ªà®?à®¿ à®?à®°à¯? à®?à¯?à®¯à¯?à®¤à®¿à®?à¯?à®´à¯? à®?à®²à¯?à®²à¯?. à®¤à¯?à®°à¯?à®µà¯? à®?à¯?à®¯à¯?à®¯à®ªà¯?à®ªà®?à¯?à®? à®?à®?à¯?à®µà¯? à®®à¯?à®¤à®©à¯?à®®à¯? à®?à®?à¯?à®µà®¾à®? à®?à®°à¯?à®?à¯?à®?à®²à®¾à®®à¯?."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:945
+#: ../camel/providers/nntp/camel-nntp-store.c:1109
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -4109,126 +3751,122 @@ msgstr ""
 "\n"
 "à®?à®ªà¯?à®ªà®?à®¿ à®?à®°à¯? à®?à¯?à®¯à¯?à®¤à®¿ à®?à¯?à®´à¯? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:970
+#: ../camel/providers/nntp/camel-nntp-store.c:1138
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "à®?à¯?à®¯à¯?à®¤à®¿ à®?à®¿à®?à®?à¯?à®?à®¿à®²à¯? à®?à®?à¯?à®µà¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?: à®?à®¨à¯?à®¤à®¾à®¤à®¾à®°à®°à®¾à®?à®µà¯?à®®à¯?"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:978
+#: ../camel/providers/nntp/camel-nntp-store.c:1149
 msgid "You cannot rename a folder in a News store."
 msgstr "à®?à¯?à®¯à¯?à®¤à®¿ à®?à®¿à®?à®?à¯?à®?à®¿à®²à¯? à®?à®³à¯?à®³ à®?à®?à¯?à®µà®¿à®±à¯?à®?à¯? à®®à®±à¯?à®ªà¯?à®¯à®°à®¿à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:986
+#: ../camel/providers/nntp/camel-nntp-store.c:1161
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "à®?à®¨à¯?à®¤ à®?à¯?à®¯à¯?à®¤à®¿ à®?à®¿à®?à®?à¯?à®?à®¿à®²à¯? à®?à®³à¯?à®³ à®?à®?à¯?à®µà¯? à®¨à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?: à®?à®¨à¯?à®¤à®¾à®µà¯? à®°à®¤à¯?à®¤à¯? à®?à¯?à®¯à¯?à®¯à®²à®¾à®®à¯?"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1180
+#: ../camel/providers/nntp/camel-nntp-store.c:1298
 msgid "Authentication requested but no username provided"
 msgstr "à®?à®?à¯?à®?à¯?à®?à®¾à®°à®®à¯? à®?à¯?à®°à®ªà¯?à®ªà®?à¯?à®?à®¤à¯? à®?à®©à®¾à®²à¯? à®ªà®¯à®©à®°à®¿à®©à¯? à®ªà¯?à®¯à®°à¯? à®?à¯?à®?à¯?à®?à¯?à®?à®ªà¯?à®ªà®?à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1192
+#: ../camel/providers/nntp/camel-nntp-store.c:1310
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "à®?à¯?à®µà®?à®©à®¿à®²à¯? à®?à®©à¯?à®®à®¤à®¿ à®?à®²à¯?à®²à¯?: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1315
+#: ../camel/providers/nntp/camel-nntp-store.c:1441
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP à®?à®?à¯?à®?à®³à¯? à®¤à¯?à®²à¯?à®µà®¿: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1369
+#: ../camel/providers/nntp/camel-nntp-store.c:1497
 msgid "Not connected."
 msgstr "à®?à®£à¯?à®ªà¯?à®ªà¯? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1422
+#: ../camel/providers/nntp/camel-nntp-store.c:1554
 #, 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:238
+#: ../camel/providers/nntp/camel-nntp-summary.c:340
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à¯? à®?à¯?à®¤à®¿à®?à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:279
+#: ../camel/providers/nntp/camel-nntp-summary.c:249
 #, 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:356
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "à®¤à®²à¯?à®ªà¯?à®ªà®¿à®²à®¿à¯?à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? à®?à®¤à®¿à®°à¯?à®ªà®¾à®°à®¾à®¤ à®?à¯?à®µà®?à®©à¯? à®ªà®¤à®¿à®²à¯?: %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:399
 #, c-format
 msgid "Operation failed: %s"
 msgstr "à®?à¯?à®¯à®²à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à¯?à®±à¯?à®±à®¤à¯?: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
+#: ../camel/providers/pop3/camel-pop3-folder.c:251
 msgid "Retrieving POP summary"
 msgstr "à®ªà®¾à®ªà¯? à®?à¯?à®°à¯?à®?à¯?à®?à®¤à¯?à®¤à¯? à®ªà¯?à®±à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
+#: ../camel/providers/pop3/camel-pop3-folder.c:272
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "à®ªà®¾à®ªà¯? à®?à¯?à®°à¯?à®?à¯?à®?à®¤à¯?à®¤à¯? à®ªà¯?à®± à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:314
+#: ../camel/providers/pop3/camel-pop3-folder.c:322
 msgid "Expunging old messages"
 msgstr "à®ªà®´à¯?à®¯ à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à¯? Expunging à®?à¯?à®¯à¯?à®¯à®µà¯?à®®à¯?"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
+#: ../camel/providers/pop3/camel-pop3-folder.c:330
 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:563
+#: ../camel/providers/pop3/camel-pop3-folder.c:592
 #, 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:599
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "à®ªà®¾à®ªà¯? à®?à¯?à®¯à¯?à®¤à®¿ %d à®? à®ªà¯?à®±à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
+#: ../camel/providers/pop3/camel-pop3-folder.c:696
 msgid "Unknown reason"
 msgstr "à®¤à¯?à®°à®¿à®¯à®¾à®¤ à®?à®¾à®°à®£à®®à¯?"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
 msgid "Message storage"
 msgstr "à®?à¯?à®¯à¯?à®¤à®¿ à®?à¯?à®?à®°à®¿à®ªà¯?à®ªà¯?"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
 msgstr "(_L) à®?à¯?à®µà®¯à®?à®¤à¯?à®¤à®¿à®²à¯? à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à¯? à®µà®¿à®?à¯?à®?."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "(_D) %s à®¨à®¾à®³à¯?(à®?à¯?à®?à®³à¯?) à®?à¯?à®?à¯? à®ªà®¿à®©à¯? à®¨à¯?à®?à¯?à®?à¯?à®?"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:49
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
 msgid "Disable _support for all POP3 extensions"
 msgstr "(_s) à®?à®©à¯?à®¤à¯?à®¤à¯? à®ªà®¾à®ªà¯?3 (POP3) à®¨à¯?à®?à¯?à®?à®¿à®?à®³à¯?à®?à¯?à®?à¯?à®®à¯? à®?à®¤à®°à®µà¯? à®®à¯?à®?à®®à®¾à®?à¯?à®?à¯? "
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:53
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:59
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "à®?à®£à¯?à®?à¯?à®?à®µà¯?à®®à¯? à®ªà®¾à®ªà¯? à®?à¯?à®µà®?à®©à®¿à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®ªà¯?à®±à®µà¯?à®®à¯?"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:76
+#: ../camel/providers/pop3/camel-pop3-provider.c:72
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4236,7 +3874,7 @@ msgstr ""
 "à®?à®¨à¯?à®¤ à®¤à¯?à®°à¯?à®µà¯? à®ªà®¾à®ªà¯? à®?à¯?à®µà®?à®©à¯?à®?à®©à¯? à®µà¯?à®±à¯?à®±à¯? à®?à®°à¯? à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯?à®²à¯? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤à®¿ à®?à®£à¯?à®?à¯?à®?à¯?à®®à¯?. à®?à®¤à¯? à®ªà®¾à®ªà¯? à®?à¯?à®µà®?à®©à¯? "
 "à®?à®¤à®°à®µà¯? à®¤à®°à¯?à®®à¯? à®?à®°à¯? à®?à¯?à®µà¯?"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:86
+#: ../camel/providers/pop3/camel-pop3-provider.c:82
 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 "
@@ -4245,60 +3883,71 @@ msgstr ""
 "à®?à®¨à¯?à®¤ à®¤à¯?à®°à¯?à®µà¯? à®ªà®¾à®ªà¯? à®?à¯?à®µà®?à®©à¯? à®?à¯?à®±à®¿à®®à¯?à®±à¯?à®¯à®¾à®?à¯?à®?à®®à¯? à®?à¯?à®¯à¯?à®¯à®ªà¯?à®ªà®?à¯?à®? à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯?à®²à¯?à®µà®©à¯? APOP à®µà®¿à®¤à®¿à®®à¯?à®±à¯? "
 "à®µà®´à®¿à®¯à®¾à®? à®?à®£à¯?à®?à¯?à®?à¯?. à®?à®¤à¯? à®?à®²à¯?à®²à®¾ à®ªà®¯à®©à¯?à®?à¯?à®?à®¾à®³à®°à¯?à®?à®³à¯?à®?à¯?à®?à¯?à®®à¯? à®µà¯?à®²à¯? à®?à¯?à®¯à¯?à®¯à®¾à®¤à¯?"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:229
+#. Translators: This is the separator between an error and an explanation
+#: ../camel/providers/pop3/camel-pop3-store.c:140
+msgid ": "
+msgstr ""
+
+#: ../camel/providers/pop3/camel-pop3-store.c:220
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "POP à®?à¯?à®µà¯?à®¯à®?à®¤à¯?à®¤à®¿à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? à®µà®°à¯?à®®à¯? à®?à®£à¯?à®®à¯?à®¯à®¾à®© à®µà®°à®µà¯?à®±à¯?à®ªà¯? à®ªà®?à®¿à®?à¯?à®? à®?à®¯à®²à®µà®¿à®²à¯?à®²à¯? (%s) "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:246
-#: ../camel/providers/pop3/camel-pop3-store.c:274
-#: ../camel/providers/pop3/camel-pop3-store.c:280
+#: ../camel/providers/pop3/camel-pop3-store.c:238
+#: ../camel/providers/pop3/camel-pop3-store.c:269
+#: ../camel/providers/pop3/camel-pop3-store.c:275
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "à®ªà®¾à®ªà¯? à®?à¯?à®µà®?à®©à¯? %s à®? à®ªà®¾à®¤à¯?à®?à®¾à®ªà¯?à®ªà®¾à®? à®?à®£à¯?à®ªà¯?à®ªà®¤à®¿à®²à¯? à®¤à¯?à®²à¯?à®µà®¿: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:247
+#: ../camel/providers/pop3/camel-pop3-store.c:239
 msgid "STLS not supported by server"
 msgstr "STLS  à®?à¯?à®µà¯?à®¯à®?à®¤à¯?à®¤à®¾à®²à¯? à®?à®¤à®°à®µà¯? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:262
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:257
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr "à®ªà®¾à®ªà¯? à®?à¯?à®µà®?à®©à¯? %s à®? à®ªà®¾à®¤à¯?à®?à®¾à®ªà¯?à®ªà®¾à®? à®?à®£à¯?à®ªà¯?à®ªà®¤à®¿à®²à¯? à®¤à¯?à®²à¯?à®µà®¿ %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:281
+#: ../camel/providers/pop3/camel-pop3-store.c:270
+msgid "TLS negotiations failed"
+msgstr "TLS à®ªà¯?à®?à¯?à®?à¯? à®µà®¾à®°à¯?à®¤à¯?à®¤à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à¯?à®±à¯?à®±à®¤à¯?"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:276
 msgid "TLS is not available in this build"
 msgstr "TLS "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:387
+#: ../camel/providers/pop3/camel-pop3-store.c:389
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "à®ªà®¾à®ªà¯? à®?à¯?à®µà®?à®©à¯?à®?à®©à¯? à®?à®£à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:428
-#: ../camel/providers/pop3/camel-pop3-store.c:565
+#: ../camel/providers/pop3/camel-pop3-store.c:433
+#: ../camel/providers/pop3/camel-pop3-store.c:585
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr "à®ªà®¾à®ªà¯? à®?à¯?à®µà®?à®©à¯?à®?à®©à¯? à®?à®£à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? %s à®µà¯?à®£à¯?à®?à®ªà¯?à®ªà®?à¯?à®? à®?à®©à¯?à®®à®¤à®¿ à®®à¯?à®±à¯?à®?à¯?à®?à¯? à®?à®¤à®°à®µà¯? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:446
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:455
 #, c-format
 msgid "SASL '%s' Login failed for POP server %s%s"
 msgstr "SASL '%s' à®?à®³à¯?à®¨à¯?à®´à¯?à®µà¯? à®ªà®¾à®ªà¯? (POP) à®?à¯?à®µà¯?à®¯à®?à®¤à¯?à®¤à¯?à®?à¯?à®?à¯? à®¤à¯?à®²à¯?à®µà®¿ à®?à®?à¯?à®¨à¯?à®¤à®¤à¯? %s %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:460
+#: ../camel/providers/pop3/camel-pop3-store.c:471
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "à®ªà®¾à®ªà¯? à®?à¯?à®µà®?à®©à¯? %s à®?à®²à¯? à®¨à¯?à®´à¯?à®¯ à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?:SASL à®µà®¿à®¤à®¿à®®à¯?à®±à¯? à®ªà®¿à®´à¯?"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:479
+#: ../camel/providers/pop3/camel-pop3-store.c:492
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "à®ªà®¾à®ªà¯? à®?à¯?à®µà®?à®©à®¿à®²à¯? à®?à®©à¯?à®®à®¤à®¿ à®ªà¯?à®±à¯?à®¤à®²à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à®?à¯?à®¨à¯?à®¤à®¤à¯? %s: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:538
+#: ../camel/providers/pop3/camel-pop3-store.c:555
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4307,7 +3956,7 @@ msgstr ""
 "à®ªà®¾à®ªà¯? à®?à¯?à®µà®¯à®?à®®à¯? %s à®?à®?à®©à¯? à®?à®£à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?:\t à®?à¯?à®²à¯?à®²à¯?à®ªà®?à®¿à®¯à®¾à®?à®¾à®¤ APOP ID à®?à®¿à®?à¯?à®¤à¯?à®¤à®¤à¯?. à®?à®³à¯? "
 "à®®à®¾à®±à®¾à®?à¯?à®?à®®à¯? à®?à®¨à¯?à®¤à¯?à®?à®¿à®?à¯?à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®?à®¿à®±à®¤à¯?. à®?à®?à¯?à®?à®³à¯? à®®à¯?à®²à®¾à®³à®°à¯? à®¤à¯?à®?à®°à¯?à®ªà¯? à®?à¯?à®³à¯?à®?"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:579
+#: ../camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4316,7 +3965,8 @@ msgstr ""
 "à®ªà®¾à®ªà¯? à®?à¯?à®µà®?à®©à¯?à®?à®©à¯? à®?à®£à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? %s.\n"
 "à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯?à®²à¯? à®?à®©à¯?à®ªà¯?à®ªà¯?à®µà®¤à®¿à®²à¯? à®ªà®¿à®´à¯? : %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:588
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:612
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4325,7 +3975,8 @@ msgstr ""
 "à®ªà®¾à®ªà¯? à®?à¯?à®µà®?à®©à¯?à®?à®©à¯? à®?à®£à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? %s.\n"
 "à®ªà®¯à®©à¯?à®?à¯?à®?à®¾à®³à®°à¯? à®ªà¯?à®¯à®°à¯? à®?à®©à¯?à®ªà¯?à®ªà¯?à®µà®¤à®¿à®²à¯? à®ªà®¿à®´à¯?  %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:597
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:624
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4334,190 +3985,190 @@ msgstr ""
 "à®ªà®¾à®ªà¯? à®?à¯?à®µà®?à®©à¯?à®?à®©à¯? à®?à®£à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? %s.\n"
 "à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯?à®²à¯? à®?à®©à¯?à®ªà¯?à®ªà¯?à®µà®¤à®¿à®²à¯? à®ªà®¿à®´à¯? %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:703
+#: ../camel/providers/pop3/camel-pop3-store.c:740
 #, c-format
 msgid "No such folder '%s'."
 msgstr "'%s'. à®?à®©à¯?à®± à®?à®?à¯?à®µà¯? à®?à®¤à¯?à®®à¯? à®?à®²à¯?à®²à¯? "
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../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:98
 msgid "Could not parse recipient list"
 msgstr "à®ªà¯?à®±à¯?à®ªà®µà®°à¯? à®ªà®?à¯?à®?à®¿à®¯à®²à¯? à®ªà®?à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:144
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:130
 #, 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:151
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "sendmail: %s à®? à®ªà®¿à®³à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à®©à¯?à®ªà¯?à®ª à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:235
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "%s à®?à®¿à®?à®©à®²à¯?à®?à®©à¯? à®?à¯?à®©à¯?à®®à¯?à®¯à®¿à®²à¯? à®µà¯?à®³à®¿à®¯à¯?à®±à®¿à®¯à®¤à¯?: à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à®©à¯?à®ªà¯?à®ª à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:242
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
 #, 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:234
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "%d à®¨à®¿à®²à¯?à®¯à¯?à®?à®©à¯? à®?à¯?à®©à¯?à®?à¯?à®®à¯?à®¯à®¿à®²à¯? à®µà¯?à®³à®¿à®¯à¯?à®±à®¿à®¯à®¤à¯?: à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à®©à¯?à®ªà¯?à®ª à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:261
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:248
 msgid "sendmail"
 msgstr "à®?à¯?à®©à¯?à®?à¯?à®®à¯?à®¯à®¿à®²à¯?"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:250
 msgid "Mail delivery via the sendmail program"
 msgstr "à®?à¯?à®©à¯?à®?à¯?à®®à¯?à®¯à®¿à®²à¯? à®¨à®¿à®°à®²à¯? à®µà®´à®¿à®¯à®¾à®? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à®©à¯?à®ªà¯?à®ªà¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:43
+#: ../camel/providers/smtp/camel-smtp-provider.c:45
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 "à®¤à¯?à®²à¯? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®®à¯?à®¯à®¤à¯?à®¤à®¿à®©à¯? à®µà®´à®¿à®¯à®¾à®? SMTP à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤à®¿ à®?à®£à¯?à®¯à®¤à¯?à®¤à¯?à®?à®©à¯? à®?à®£à¯?à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®?à¯? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? "
 "à®?à®©à¯?à®ªà®ªà¯?à®ªà®?à¯?à®?à®¿à®±à®¤à¯?."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:167
+#: ../camel/providers/smtp/camel-smtp-transport.c:117
 msgid "Syntax error, command unrecognized"
 msgstr "à®¤à¯?à®?à®°à®¿à®¯à®²à¯? à®ªà®¿à®´à¯?, à®?à®?à¯?à®?à®³à¯?à®¯à¯? à®ªà¯?à®°à®¿à®¨à¯?à®¤à¯?à®?à¯?à®³à¯?à®³ à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?à®¿à®´à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:169
+#: ../camel/providers/smtp/camel-smtp-transport.c:119
 msgid "Syntax error in parameters or arguments"
 msgstr "à®?à®³à®µà¯?à®°à¯? à®?à®²à¯?à®²à®¤à¯? à®ªà®¯à®©à®¿à®²à¯?à®¯à®¿à®²à¯? à®¤à¯?à®?à®°à¯? à®ªà®¿à®´à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:171
+#: ../camel/providers/smtp/camel-smtp-transport.c:121
 msgid "Command not implemented"
 msgstr "à®?à®?à¯?à®?à®³à¯?à®¯à¯? à®?à¯?à®¯à®²à¯?à®ªà®?à¯?à®¤à¯?à®¤ à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:173
+#: ../camel/providers/smtp/camel-smtp-transport.c:123
 msgid "Command parameter not implemented"
 msgstr "à®?à®?à¯?à®?à®³à¯? à®?à®³à®µà¯?à®°à¯?à®µà¯? à®?à¯?à®¯à®²à¯?à®ªà®?à¯?à®¤à¯?à®¤ à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:175
+#: ../camel/providers/smtp/camel-smtp-transport.c:125
 msgid "System status, or system help reply"
 msgstr "à®?à®£à®¿à®©à®¿ à®¨à®¿à®²à¯?, à®?à®²à¯?à®²à®¤à¯? à®?à®£à®¿à®©à®¿ à®?à®¤à®µà®¿ à®ªà®¤à®¿à®²à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:177
+#: ../camel/providers/smtp/camel-smtp-transport.c:127
 msgid "Help message"
 msgstr "à®?à®¤à®µà®¿ à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:179
+#: ../camel/providers/smtp/camel-smtp-transport.c:129
 msgid "Service ready"
 msgstr "à®?à¯?à®µà¯? à®¤à®¯à®¾à®°à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:181
+#: ../camel/providers/smtp/camel-smtp-transport.c:131
 msgid "Service closing transmission channel"
 msgstr "à®?à¯?à®µà¯? à®?à®©à¯?à®ªà¯?à®ªà¯?à®®à¯? à®ªà®¾à®¤à¯? à®®à¯?à®?à®ªà¯?à®ªà®?à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:183
+#: ../camel/providers/smtp/camel-smtp-transport.c:133
 msgid "Service not available, closing transmission channel"
 msgstr "à®?à¯?à®µà¯? à®?à®²à¯?à®²à¯?, à®?à®©à¯?à®ªà¯?à®ªà¯?à®®à¯? à®ªà®¾à®¤à¯? à®®à¯?à®?à®ªà¯?à®ªà®?à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:185
+#: ../camel/providers/smtp/camel-smtp-transport.c:135
 msgid "Requested mail action okay, completed"
 msgstr "à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à¯?à®¯à®²à¯?à®ªà®¾à®?à¯?à®?à¯?à®?à¯?à®?à®¾à®© à®?à¯?à®°à®¿à®?à¯?à®?à¯? à®?à®±à¯?à®?à®ªà¯?à®ªà®?à¯?à®?à®¤à¯?, à®®à¯?à®?à®¿à®µà¯?à®±à¯?à®±à®¤à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:187
+#: ../camel/providers/smtp/camel-smtp-transport.c:137
 msgid "User not local; will forward to <forward-path>"
 msgstr "à®?à®³à¯? à®ªà®¯à®©à¯?à®?à®¾à®³à®°à¯? à®?à®²à¯?à®²à¯? à®?à®©à¯?à®±à®¾à®²à¯?, <forward-path> à®ªà®¾à®¤à¯?à®?à¯?à®?à¯? à®?à®©à¯?à®ªà¯?à®ªà®ªà¯?à®ªà®?à¯?à®®à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:189
+#: ../camel/providers/smtp/camel-smtp-transport.c:139
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "à®?à¯?à®°à®ªà¯?à®ªà®?à¯?à®? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à¯?à®¯à®²à¯? à®ªà¯?à®±à®µà®¿à®²à¯?à®²à¯? :à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®ªà¯?à®?à¯?à®?à®¿à®ªà¯?à®?à¯?à®?à®¿ à®?à®¿à®?à¯?à®?à¯?à®?à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:191
+#: ../camel/providers/smtp/camel-smtp-transport.c:141
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "à®?à¯?à®°à®ªà¯?à®ªà®?à¯?à®? à®?à¯?à®¯à®²à¯? à®ªà¯?à®±à®µà®¿à®²à¯?à®²à¯?: à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®ªà¯?à®?à¯?à®?à®¿ à®?à®¿à®?à¯?à®?à¯?à®?à®µà®¿à®²à¯?à®²à¯? "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:143
 msgid "Requested action aborted: error in processing"
 msgstr "à®?à¯?à®°à®ªà¯?à®ªà®?à¯?à®? à®?à¯?à®¯à®²à¯? à®¤à®?à¯? à®?à¯?à®¯à¯?à®¯à®ªà®ªà¯?à®?à¯?à®?à®¤à¯?: à®?à¯?à®¯à®²à¯? à®ªà®?à¯?à®¤à¯?à®¤à¯?à®?à¯?à®¯à®¿à®²à¯? à®ªà®¿à®´à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:195
+#: ../camel/providers/smtp/camel-smtp-transport.c:145
 msgid "User not local; please try <forward-path>"
 msgstr "à®ªà®¯à®©à¯?à®?à®¾à®³à®°à¯? à®?à®³à¯?à®³à¯?à®°à¯? à®?à®²à¯?à®²à¯? ; à®®à¯?à®¯à®±à¯?à®?à®¿à®?à¯?à®?à®µà¯?à®®à¯? <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:197
+#: ../camel/providers/smtp/camel-smtp-transport.c:147
 msgid "Requested action not taken: insufficient system storage"
 msgstr "à®?à¯?à®°à®ªà¯?à®ªà®?à¯?à®? à®?à¯?à®¯à®²à¯? à®¨à®?à¯?à®ªà¯?à®±à®µà®¿à®²à¯?à®²à¯? : à®?à®£à®¿à®©à®¿à®¯à®¿à®²à¯? à®?à®?à®®à¯? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:199
+#: ../camel/providers/smtp/camel-smtp-transport.c:149
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "à®?à¯?à®°à®ªà¯?à®ªà®?à¯?à®? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à¯?à®¯à®²à¯? à®¤à®?à¯? à®?à¯?à®¯à¯?à®¯à®ªà¯?à®ªà®?à¯?à®?à®¤à¯?: à®?à¯?à®®à®¿à®¤à¯?à®¤ à®?à®?à®®à¯? à®ªà¯?à®¤à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:201
+#: ../camel/providers/smtp/camel-smtp-transport.c:151
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "à®?à¯?à®°à®ªà¯?à®ªà®?à¯?à®? à®?à¯?à®¯à®²à¯? à®¨à®?à¯?à®ªà¯?à®±à®µà®¿à®²à¯?à®²à¯?: à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®ªà¯?à®?à¯?à®?à®¿à®¯à®¿à®²à¯? à®ªà¯?à®¯à®°à¯?à®?à¯?à®?à¯? à®?à®©à¯?à®®à®¤à®¿ à®?à®²à¯?à®²à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:203
+#: ../camel/providers/smtp/camel-smtp-transport.c:153
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à®³à¯?à®³à¯?à®?à¯? à®¤à¯?à®µà®?à¯?à®?à®¿à®¯à®¤à¯?; <CRLF>.<CRLF> à®?à®?à¯? à®®à¯?à®?à®¿à®¨à¯?à®¤à®¤à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:205
+#: ../camel/providers/smtp/camel-smtp-transport.c:155
 msgid "Transaction failed"
 msgstr "à®ªà®°à®¿à®®à®¾à®±à¯?à®±à®®à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à¯?à®±à¯?à®±à®¤à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:209
+#: ../camel/providers/smtp/camel-smtp-transport.c:159
 msgid "A password transition is needed"
 msgstr "à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯? à®®à®¾à®±à¯?à®±à®®à¯? à®¤à¯?à®µà¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:211
+#: ../camel/providers/smtp/camel-smtp-transport.c:161
 msgid "Authentication mechanism is too weak"
 msgstr "à®?à®©à¯?à®®à®¤à®¿ à®®à¯?à®±à¯? à®®à®¿à®?à®µà¯?à®®à¯? à®®à¯?à®?à®®à®¾à®? à®?à®³à¯?à®³à®¤à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/smtp/camel-smtp-transport.c:163
 msgid "Encryption required for requested authentication mechanism"
 msgstr "à®?à¯?à®°à®ªà¯?à®ªà®?à¯?à®? à®?à®©à¯?à®®à®¤à®¿ à®®à¯?à®±à¯?à®®à¯?à®?à¯?à®?à¯? à®?à¯?à®±à®¿à®®à¯?à®±à¯?à®¯à®¾à®?à¯?à®?à®®à¯? à®¤à¯?à®µà¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
+#: ../camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Temporary authentication failure"
 msgstr "à®¤à®±à¯?à®?à®¾à®²à®¿à®? à®?à®©à¯?à®®à®¤à®¿ à®®à¯?à®±à¯?à®®à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à¯?à®±à¯?à®±à®¤à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:296
+#: ../camel/providers/smtp/camel-smtp-transport.c:260
 msgid "Welcome response error"
 msgstr "à®ªà®¤à®¿à®²à¯? à®ªà®¿à®´à¯? à®µà®°à®µà¯?à®±à¯?à®ªà¯?"
 
-#: ../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:296
+#: ../camel/providers/smtp/camel-smtp-transport.c:330
+#: ../camel/providers/smtp/camel-smtp-transport.c:337
 #, 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:340
+#: ../camel/providers/smtp/camel-smtp-transport.c:306
 #, c-format
 msgid "STARTTLS command failed: %s"
 msgstr "STARTTLS à®?à®?à¯?à®?à®³à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à¯?à®±à¯?à®±à®¤à¯?: %s "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:355
+#: ../camel/providers/smtp/camel-smtp-transport.c:320
 msgid "STARTTLS command failed"
 msgstr "STARTTLS à®?à®?à¯?à®?à®³à¯? à®¤à¯?à®²à¯?à®µà¯?à®¯à¯?à®±à¯?à®±à®¤à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:496
+#: ../camel/providers/smtp/camel-smtp-transport.c:465
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP à®?à¯?à®µà®?à®©à¯? %s à®?à¯?à®±à®¿à®ªà¯?à®ªà®¿à®?à¯?à®? à®?à®©à¯?à®®à®¤à®¿ à®®à¯?à®±à¯?à®?à¯?à®?à¯? à®?à®¤à®°à®µà¯?à®¤à®°à®¾à®¤à¯? %s."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:567
+#: ../camel/providers/smtp/camel-smtp-transport.c:537
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4528,202 +4179,199 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:700
+#: ../camel/providers/smtp/camel-smtp-transport.c:675
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP à®?à¯?à®µà®?à®®à¯? %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:702
+#: ../camel/providers/smtp/camel-smtp-transport.c:677
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s SMTP à®µà®´à®¿à®¯à®¾à®? à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à®©à¯?à®ªà¯?à®ªà¯?à®¤à®²à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:720
+#: ../camel/providers/smtp/camel-smtp-transport.c:696
 msgid "Cannot send message: service not connected."
 msgstr "à®?à¯?à®¯à¯?à®¤à®¿ à®?à®©à¯?à®ªà¯?à®ª à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? : à®?à¯?à®µà¯? à®?à®£à¯?à®ªà¯?à®ªà®¿à®²à¯? à®?à®²à¯?à®²à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:726
+#: ../camel/providers/smtp/camel-smtp-transport.c:703
 msgid "Cannot send message: sender address not valid."
 msgstr "à®?à¯?à®¯à¯?à®¤à®¿ à®?à®©à¯?à®ªà¯?à®ª à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? : à®?à®©à¯?à®ªà¯?à®ªà®¿à®¯à®µà®°à¯? à®®à¯?à®?à®µà®°à®¿ à®?à¯?à®²à¯?à®²à®¾à®¤à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:730
+#: ../camel/providers/smtp/camel-smtp-transport.c:707
 msgid "Sending message"
 msgstr "à®?à¯?à®¯à¯?à®¤à®¿ à®?à®©à¯?à®ªà¯?à®ªà®ªà¯?à®ªà®?à¯?à®?à®¿à®±à®¤à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
+#: ../camel/providers/smtp/camel-smtp-transport.c:723
 msgid "Cannot send message: no recipients defined."
 msgstr "à®?à¯?à®¯à¯?à®¤à®¿ à®?à®©à¯?à®ªà¯?à®ª à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? : à®ªà¯?à®±à¯?à®ªà®µà®°à¯? à®®à¯?à®?à®µà®°à®¿ à®?à¯?à®±à®¿à®ªà¯?à®ªà®¿à®?à®ªà¯?à®ªà®?à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:756
+#: ../camel/providers/smtp/camel-smtp-transport.c:735
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "à®?à¯?à®¯à¯?à®¤à®¿ à®?à®©à¯?à®ªà¯?à®ª à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®?à®©à¯?à®±à¯?à®?à¯?à®?à¯?à®®à¯? à®®à¯?à®±à¯?à®ªà®?à¯?à®? à®?à¯?à®²à¯?à®²à®¾à®¤ à®ªà¯?à®±à¯?à®¨à®°à¯? à®®à¯?à®?à®µà®°à®¿à®?à®³à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:985
+#: ../camel/providers/smtp/camel-smtp-transport.c:972
 msgid "SMTP Greeting"
 msgstr "SMTP à®µà®°à®µà¯?à®±à¯?à®ªà¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1010
+#: ../camel/providers/smtp/camel-smtp-transport.c:997
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "HELO à®?à®?à¯?à®?à®³à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à¯?à®±à¯?à®±à®¤à¯?: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1027
+#: ../camel/providers/smtp/camel-smtp-transport.c:1014
 msgid "HELO command failed"
 msgstr "HELO à®?à®?à¯?à®?à®³à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à¯?à®±à¯?à®±à®¤à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1093
+#: ../camel/providers/smtp/camel-smtp-transport.c:1081
 msgid "SMTP Authentication"
 msgstr "SMTP à®?à®©à¯?à®®à®¤à®¿ à®®à¯?à®±à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1099
+#: ../camel/providers/smtp/camel-smtp-transport.c:1088
 msgid "Error creating SASL authentication object."
 msgstr "SASL à®?à®©à¯?à®®à®¤à®¿à®¯à¯? à®?à®°à¯?à®µà®¾à®?à¯?à®?à¯?à®µà®¤à®¿à®²à¯? à®ªà®¿à®´à¯?"
 
+#: ../camel/providers/smtp/camel-smtp-transport.c:1105
 #: ../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:1133
+#: ../camel/providers/smtp/camel-smtp-transport.c:1124
 msgid "AUTH command failed"
 msgstr "AUTH à®?à®?à¯?à®?à®³à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à¯?à®±à¯?à®±à®¤à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1203
+#: ../camel/providers/smtp/camel-smtp-transport.c:1195
 msgid "Bad authentication response from server.\n"
 msgstr "à®?à¯?à®µà®?à®©à®¿à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? à®®à¯?à®?à®®à®¾à®© à®?à®©à¯?à®®à®¤à®¿ à®ªà®¤à®¿à®²à¯?\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1230
+#: ../camel/providers/smtp/camel-smtp-transport.c:1222
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "MAIL FROM à®?à®?à¯?à®?à®³à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à¯?à®±à¯?à®±à®¤à¯?: %s: à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à®©à¯?à®ªà¯?à®ª à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1247
+#: ../camel/providers/smtp/camel-smtp-transport.c:1237
 msgid "MAIL FROM command failed"
 msgstr "MAIL FROM à®?à®?à¯?à®?à®³à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à¯?à®±à¯?à®±à®¤à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1271
+#: ../camel/providers/smtp/camel-smtp-transport.c:1261
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "RCPT TO à®?à®?à¯?à®?à®³à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à¯?à®±à¯?à®±à®¤à¯? : %s: à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à®©à¯?à®ªà¯?à®ª à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1290
+#: ../camel/providers/smtp/camel-smtp-transport.c:1280
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> à®¤à¯?à®²à¯?à®µà®¿à®¯à¯?à®±à¯?à®±à®¤à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1330
-#: ../camel/providers/smtp/camel-smtp-transport.c:1399
-#: ../camel/providers/smtp/camel-smtp-transport.c:1418
+#: ../camel/providers/smtp/camel-smtp-transport.c:1320
+#: ../camel/providers/smtp/camel-smtp-transport.c:1395
+#: ../camel/providers/smtp/camel-smtp-transport.c:1413
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "DATA à®?à®?à¯?à®?à®³à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à¯?à®±à¯?à®±à®¤à¯? : %s: à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯? à®?à®©à¯?à®ªà¯?à®ª à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?"
 
-#. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1347
-#: ../camel/providers/smtp/camel-smtp-transport.c:1434
+#: ../camel/providers/smtp/camel-smtp-transport.c:1337
+#: ../camel/providers/smtp/camel-smtp-transport.c:1426
 msgid "DATA command failed"
 msgstr "DATA à®?à®?à¯?à®?à®³à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à¯?à®±à¯?à®±à®¤à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1457
+#: ../camel/providers/smtp/camel-smtp-transport.c:1449
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "RSET à®?à®?à¯?à®?à®³à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à¯?à®±à¯?à®±à®¤à¯? : %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1473
+#: ../camel/providers/smtp/camel-smtp-transport.c:1464
 msgid "RSET command failed"
 msgstr "RSET à®?à®?à¯?à®?à®³à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à¯?à®±à¯?à®±à®¤à¯?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1496
+#: ../camel/providers/smtp/camel-smtp-transport.c:1487
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "QUIT à®?à®?à¯?à®?à®³à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à¯?à®±à¯?à®±à®¤à¯?: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1510
+#: ../camel/providers/smtp/camel-smtp-transport.c:1503
 msgid "QUIT command failed"
 msgstr "QUIT à®?à®?à¯?à®?à®³à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à¯?à®±à¯?à®±à®¤à¯?"
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:44
 msgid "Business"
 msgstr "à®µà®£à®¿à®?à®®à¯?"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:45
 msgid "Competition"
 msgstr "à®ªà¯?à®?à¯?à®?à®¿"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:46
 msgid "Favorites"
 msgstr "à®µà®¿à®°à¯?à®ªà¯?à®ªà®?à¯?à®?à®³à¯?"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:47
 msgid "Gifts"
 msgstr "à®?à®©à¯?à®ªà®³à®¿à®ªà¯?à®ªà¯?"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:48
 msgid "Goals/Objectives"
 msgstr "à®?à¯?à®±à®¿à®?à¯?à®?à¯?à®³à¯?/à®¨à¯?à®?à¯?à®?à®®à¯?"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:49
 msgid "Holiday"
 msgstr "à®µà®¿à®?à¯?à®®à¯?à®±à¯? à®¨à®¾à®³à¯?"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:50
 msgid "Holiday Cards"
 msgstr "à®µà®¿à®?à¯?à®®à¯?à®±à¯? à®?à®?à¯?à®?à¯?à®?à®³à¯?"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:52
 msgid "Hot Contacts"
 msgstr "à®?à¯?à®?à®¾à®© à®¤à¯?à®?à®°à¯?à®ªà¯?à®?à®³à¯?"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:53
 msgid "Ideas"
 msgstr "à®?à®¿à®¨à¯?à®¤à®©à¯?à®?à®³à¯?"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:54
 msgid "International"
 msgstr "à®?à®²à®?à®³à®¾à®µà®¿à®¯"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:55
 msgid "Key Customer"
 msgstr "à®®à¯?à®?à¯?à®?à®¿à®¯ à®µà®¾à®?à®¿à®?à¯?à®?à¯?à®¯à®¾à®³à®°à¯?"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:56
 msgid "Miscellaneous"
 msgstr "à®ªà®²à®µà®?à¯?à®ªà¯?à®ªà®?à¯?à®?"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:57
 msgid "Personal"
 msgstr "à®¤à®©à®¿à®ªà¯?à®ªà®?à¯?à®?"
 
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:58
 msgid "Phone Calls"
 msgstr "à®¤à¯?à®²à¯?à®ªà¯?à®?à®¿ à®?à®´à¯?à®ªà¯?à®ªà¯?à®?à®³à¯?"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:60
 msgid "Status"
 msgstr "à®¨à®¿à®²à¯?"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:61
 msgid "Strategies"
 msgstr "à®µà®?à¯?à®?à®³à¯?"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:62
 msgid "Suppliers"
 msgstr "à®¤à¯?à®µà¯?à®¯à®¿à®©à¯? à®¨à®¿à®°à®ªà¯?à®ªà¯?à®ªà®µà®°à¯?"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:63
 msgid "Time & Expenses"
 msgstr "à®¨à¯?à®°à®®à¯?&à®?à¯?à®²à®µà¯?"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:64
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:65
 msgid "Waiting"
 msgstr "à®?à®¾à®¤à¯?à®¤à®¿à®°à¯?à®¤à¯?à®¤à®²à¯?"
 
@@ -4731,7 +4379,7 @@ msgstr "à®?à®¾à®¤à¯?à®¤à®¿à®°à¯?à®¤à¯?à®¤à®²à¯?"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1633 ../libedataserver/e-time-utils.c:1898
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1902
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
@@ -4739,7 +4387,7 @@ msgstr "%a %m/%d/%Y %I:%M:%S %p"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1638 ../libedataserver/e-time-utils.c:1889
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1893
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
@@ -4747,7 +4395,7 @@ msgstr "%a %m/%d/%Y %H:%M:%S"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1643 ../libedataserver/e-time-utils.c:1894
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1898
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
@@ -4755,78 +4403,78 @@ msgstr "%a %m/%d/%Y %I:%M %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1648 ../libedataserver/e-time-utils.c:1885
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1889
 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:1653
+#: ../libedataserver/e-time-utils.c:1655
 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:1658
+#: ../libedataserver/e-time-utils.c:1660
 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:1661 ../libedataserver/e-time-utils.c:1761
-#: ../libedataserver/e-time-utils.c:1880
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1765
+#: ../libedataserver/e-time-utils.c:1884
 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:1668
+#: ../libedataserver/e-time-utils.c:1670
 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:1672
+#: ../libedataserver/e-time-utils.c:1674
 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:1677
+#: ../libedataserver/e-time-utils.c:1679
 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:1682
+#: ../libedataserver/e-time-utils.c:1684
 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:1687
+#: ../libedataserver/e-time-utils.c:1689
 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:1692
+#: ../libedataserver/e-time-utils.c:1694
 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:1695 ../libedataserver/e-time-utils.c:1764
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1768
 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:1822 ../libedataserver/e-time-utils.c:1942
+#: ../libedataserver/e-time-utils.c:1826 ../libedataserver/e-time-utils.c:1946
 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:1826 ../libedataserver/e-time-utils.c:1934
+#: ../libedataserver/e-time-utils.c:1830 ../libedataserver/e-time-utils.c:1938
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4834,24 +4482,24 @@ msgstr "%H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1831 ../libedataserver/e-time-utils.c:1939
+#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1943
 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:1835 ../libedataserver/e-time-utils.c:1931
+#: ../libedataserver/e-time-utils.c:1839 ../libedataserver/e-time-utils.c:1935
 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:1838
+#: ../libedataserver/e-time-utils.c:1842
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1842
+#: ../libedataserver/e-time-utils.c:1846
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -4859,7 +4507,7 @@ msgstr "%I %p"
 msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP à®?à¯?à®µà¯?à®¯à®?à®¤à¯?à®¤à¯? à®¯à®¾à®°à¯?à®µà¯?à®£à¯?à®?à¯?à®®à®¾à®²à¯?à®®à¯? à®?à®£à¯?à®? à®®à¯?à®?à®¿à®?à®¿à®±à®¤à¯?"
 
-#: ../libedataserverui/e-book-auth-util.c:192
+#: ../libedataserverui/e-book-auth-util.c:191
 msgid "Failed to authenticate.\n"
 msgstr "à®?à®±à¯?à®¤à®¿à®ªà¯?à®ªà®?à¯?à®¤à¯?à®¤ à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?.\n"
 
@@ -4899,8 +4547,8 @@ msgid "Category _Name"
 msgstr "à®µà®?à¯?à®¯à®¿à®©à¯? à®ªà¯?à®¯à®°à¯? (_N)"
 
 #: ../libedataserverui/e-categories-dialog.ui.h:4
-msgid "Item(s) _belong to these categories:"
-msgstr "à®?à®¨à¯?à®¤ à®µà®?à¯?à®?à®³à¯? à®?à®¾à®°à¯?à®¨à¯?à®¤ à®?à®°à¯?à®ªà¯?à®ªà®?à®¿(à®?à®³à¯?) (_b):"
+msgid "Currently _used categories:"
+msgstr ""
 
 #: ../libedataserverui/e-categories-dialog.ui.h:5
 msgid "_Available Categories:"
@@ -4919,27 +4567,19 @@ msgstr "à®µà®?à¯?à®?à®³à¯?"
 msgid "Create category \"%s\""
 msgstr "à®µà®?à¯?à®¯à¯? \"%s\"à®? à®?à®°à¯?à®µà®¾à®?à¯?à®?à¯?"
 
-#: ../libedataserverui/e-cell-renderer-color.c:222
-msgid "Color Info"
-msgstr "à®µà®£à¯?à®£ à®¤à®?à®µà®²à¯?"
-
-#: ../libedataserverui/e-cell-renderer-color.c:223
-msgid "The color to render"
-msgstr "à®µà®°à¯?à®µà®¤à®±à¯?à®?à¯? à®¨à®¿à®±à®®à¯?"
-
-#: ../libedataserverui/e-name-selector-dialog.c:292
+#: ../libedataserverui/e-name-selector-dialog.c:319
 msgid "Select Contacts from Address Book"
 msgstr "à®®à¯?à®?à®µà®°à®¿à®ªà¯?à®ªà¯?à®¤à¯?à®¤à®?à®¤à¯?à®¤à®¿à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? à®¤à¯?à®?à®°à¯?à®ªà¯?à®?à®³à¯? à®¤à¯?à®°à¯?à®µà¯?à®?à¯?à®¯à¯?"
 
-#: ../libedataserverui/e-name-selector-dialog.c:587
+#: ../libedataserverui/e-name-selector-dialog.c:658
 msgid "_Add"
 msgstr "à®?à¯?à®°à¯?(_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:612
+#: ../libedataserverui/e-name-selector-dialog.c:662
 msgid "_Remove"
 msgstr "à®¨à¯?à®?à¯?à®?à®µà¯?à®®à¯? (_R)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:789
+#: ../libedataserverui/e-name-selector-dialog.c:853
 #: ../libedataserverui/e-name-selector-dialog.ui.h:6
 msgid "Any Category"
 msgstr "à®?à®¨à¯?à®¤ à®?à®°à¯? à®µà®?à¯?à®¯à®¾à®©à®¾à®²à¯?à®®à¯?"
@@ -4981,56 +4621,56 @@ msgid "_Search:"
 msgstr "à®¤à¯?à®?à®²à¯?: (_S)"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2508
+#: ../libedataserverui/e-name-selector-entry.c:2559
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "à®µà®¿à®°à®¿à®µà®¾à®© à®µà®´à®¿à®®à¯?à®±à¯? (E_)%s"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2523
+#: ../libedataserverui/e-name-selector-entry.c:2574
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s à®? à®ªà®¿à®°à®¤à®¿ à®?à®?à¯? (_y)"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2533
+#: ../libedataserverui/e-name-selector-entry.c:2584
 #, c-format
 msgid "C_ut %s"
 msgstr "%s à®? à®µà¯?à®?à¯?à®?à¯?à®?"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2550
+#: ../libedataserverui/e-name-selector-entry.c:2601
 #, c-format
 msgid "_Edit %s"
 msgstr "%s à®? à®¤à®¿à®°à¯?à®¤à¯?à®¤à®¿à®¯à®®à¯? (_E)"
 
-#: ../libedataserverui/e-name-selector-list.c:469
+#: ../libedataserverui/e-name-selector-list.c:517
 #, c-format
 msgid "_Delete %s"
 msgstr "à®?à®´à®¿à®?à¯?à®?à®µà¯?à®®à¯? %s (_D)"
 
-#: ../libedataserverui/e-passwords.c:234
+#: ../libedataserverui/e-passwords.c:257
 #, c-format
 msgid "Keyring key is unusable: no user or host name"
 msgstr "à®µà®¿à®?à¯?à®µà®³à¯?à®¯ à®µà®¿à®?à¯? à®ªà®¯à®©à¯?à®ªà®¾à®?à¯? à®?à®´à®¨à¯?à®¤à®¤à¯?. à®ªà®¯à®©à®°à¯? à®?à®²à¯?à®²à®¤à¯? à®ªà¯?à®°à®µà®²à®©à¯? à®ªà¯?à®¯à®°à¯?  à®?à®²à¯?à®²à¯? "
 
-#: ../libedataserverui/e-passwords.c:1093
+#: ../libedataserverui/e-passwords.c:1116
 msgid "You have the Caps Lock key on."
 msgstr "à®¨à¯?à®?à¯?à®?à®³à¯? à®?à®¯à®°à¯? à®¨à®¿à®²à¯? à®?à®´à¯?à®¤à¯?à®¤à¯? à®ªà¯?à®?à¯?à®?à¯? à®µà®¿à®?à¯?à®¯à¯? à®?à¯?à®¯à®²à®¾à®?à¯?à®?à®¿ à®?à®³à¯?à®³à¯?à®°à¯?à®?à®³à¯?."
 
-#: ../libedataserverui/e-passwords.c:1215
+#: ../libedataserverui/e-passwords.c:1238
 msgid "_Remember this passphrase"
 msgstr "à®?à¯?à®±à¯?à®±à¯?à®?à®°à®¿à®©à¯? à®®à¯?à®²à®®à¯? à®¨à®¿à®©à¯?à®µà¯? à®?à¯?à®³à¯?à®³à®²à¯? (_R)"
 
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:1239
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "(_R) à®?à®¨à¯?à®¤ à®?à®®à¯?à®µà®¿à®©à¯? à®®à¯?à®¤à®¿ à®¨à¯?à®°à®¤à¯?à®¤à¯?à®?à¯?à®?à¯? à®?à®¨à¯?à®¤ à®?à®?à®µà¯? à®?à¯?à®²à¯?à®²à¯? à®¨à®¿à®©à¯?à®µà¯? à®?à¯?à®³à¯?à®?."
 
-#: ../libedataserverui/e-passwords.c:1221
+#: ../libedataserverui/e-passwords.c:1244
 msgid "_Remember this password"
 msgstr "à®?à®¨à¯?à®¤ à®?à®?à®µà¯?à®?à¯? à®?à¯?à®²à¯?à®²à¯? à®¨à®¿à®©à¯?à®µà®¿à®²à¯? à®?à¯?à®³à¯?à®³à®µà¯?à®®à¯? (_R)"
 
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:1245
 msgid "_Remember this password for the remainder of this session"
 msgstr "à®?à®¨à¯?à®¤ à®?à®®à®°à¯?à®µà®¿à®²à¯? à®?à®?à¯?à®?à®¿à®¯à¯?à®³à¯?à®³ à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯?à®²à¯? à®¨à®¿à®©à¯?à®µà¯? à®?à¯?à®³à¯?à®³à®µà¯?à®®à¯? (_R)"
 
@@ -5039,7 +4679,7 @@ msgstr "à®?à®¨à¯?à®¤ à®?à®®à®°à¯?à®µà®¿à®²à¯? à®?à®?à¯?à®?à®¿à®¯à¯?à®³à¯?à®³ à®?
 msgid "Select destination"
 msgstr "à®?à¯?à®°à¯?à®®à®¿à®?à®¤à¯?à®¤à¯? à®¤à¯?à®°à¯?à®µà¯? à®?à¯?à®¯à¯?"
 
-#: ../libedataserverui/e-source-selector-dialog.c:156
+#: ../libedataserverui/e-source-selector-dialog.c:172
 msgid "_Destination"
 msgstr "à®?à¯?à®°à¯?à®®à®¿à®?à®®à¯? (_D)"
 
@@ -5059,6 +4699,269 @@ msgstr "à®?à¯?à®µà¯?à®¯à®?à®¤à¯?à®¤à®¿à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? à®?à®¨à¯?à®¤ à®ª
 msgid "Bad parameter"
 msgstr "à®¤à®µà®±à®¾à®© à®¨à®¿à®²à¯?à®¯à®³à®µà¯?à®°à¯?"
 
+#~ msgid "Could not create thread for getting deltas"
+#~ msgstr "à®?à¯?à®²à¯?à®?à®¾à®?à¯?à®?à®³à¯? à®ªà¯?à®± à®¤à¯?à®°à®?à¯?à®?à¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?"
+
+#~ msgid "Unsupported operation: append message: for %s"
+#~ msgstr "à®?à®¤à®°à®µà®¿à®²à¯?à®²à®¾ à®?à¯?à®¯à®²à¯?:%s à®?à¯?à®?à®¾à®© à®?à¯?à®¯à¯?à®¤à®¿ à®ªà¯?à®¤à¯?à®ªà¯?à®ªà®¿à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®?à®¿à®±à®¤à¯?"
+
+#~ msgid "Unsupported operation: search by expression: for %s"
+#~ msgstr "à®?à®¤à®°à®µà®¿à®²à¯?à®²à®¾ à®?à¯?à®¯à®²à¯?: à®¤à¯?à®?à®°à¯?à®?à®³à®¾à®? à®¤à¯?à®?à¯?: %s"
+
+#~ msgid "Unsupported operation: count by expression: for %s"
+#~ msgstr "à®?à®¤à®°à®µà®¿à®²à¯?à®²à®¾ à®?à¯?à®¯à®²à¯?: à®¤à¯?à®?à®°à¯?à®?à®³à®¾à®? à®¤à¯?à®?à¯?: %sà®?à¯?à®?à¯?"
+
+#~ msgid "Unsupported operation: search by UIDs: for %s"
+#~ msgstr "à®?à®¤à®°à®µà®¿à®²à¯?à®²à®¾ à®?à¯?à®¯à®²à¯?à®ªà®¾à®?à¯?: %s\"à®?à¯?à®?à¯? à®ªà®¤à®¿à®²à®¾à®? UIDs à®?à®²à¯? à®¤à¯?à®?à®µà¯?à®®à¯?: "
+
+#~ msgid "Learning junk"
+#~ msgstr "à®¤à¯?à®µà¯?à®¯à®±à¯?à®±à®µà¯?à®¯à¯? à®ªà®?à®¿à®?à¯?à®?à®¿à®±à®¤à¯?"
+
+#~ msgid "Learning non-junk"
+#~ msgstr "à®¤à¯?à®¯à¯?à®¯à®¾à®©à®µà¯?à®¯à¯? à®ªà®?à®¿à®?à¯?à®?à®¿à®±à®¤à¯?"
+
+#~ msgid "Camel session doesn't support forwarding of a message."
+#~ msgstr "à®?à®?à¯?à®?à®? à®?à®®à®°à¯?à®µà¯? à®?à®°à¯? à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®®à¯?à®©à¯?à®©à®©à¯?à®ªà¯?à®ª à®¤à¯?à®£à¯?à®ªà¯?à®°à®¿à®¯à®¾à®¤à¯?."
+
+#~ msgid "import keys: unimplemented"
+#~ msgstr "à®µà®¿à®?à¯? à®?à®³à¯?à®µà®¾à®?à¯?à®?à®³à¯?: à®?à¯?à®¯à®²à¯?à®ªà®?à¯?à®¤à¯?à®¤à®ªà¯?à®ªà®?à®µà®¿à®²à¯?à®²à¯?"
+
+#~ msgid "export keys: unimplemented"
+#~ msgstr "à®µà®¿à®?à¯? à®®à¯?à®²à¯?à®±à¯?à®±à®®à¯?: à®?à¯?à®¯à®²à¯?à®ªà®?à¯?à®¤à¯?à®¤à®ªà¯?à®ªà®?à®µà®¿à®²à¯?à®²à¯?"
+
+#~ msgid "Cannot create folder: Invalid operation on this store"
+#~ msgstr "à®?à®?à¯?à®µà¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? : à®?à®¨à¯?à®¤ à®?à®¿à®?à®?à¯?à®?à®¿à®²à¯? à®?à¯?à®²à¯?à®²à®¾à®¤ à®?à¯?à®¯à®²à¯?"
+
+#~ msgid "Namespace"
+#~ msgstr "à®ªà¯?à®¯à®°à®¿à®?à®®à¯?"
+
+#~ msgid "Hula"
+#~ msgstr "Hula"
+
+#~ msgid "For accessing Hula servers"
+#~ msgstr "Hula à®?à¯?à®µà¯?à®¯à®?à®¤à¯?à®¤à¯? à®?à®£à¯?à®?à¯?à®¤à®²à¯?"
+
+#~ msgid ""
+#~ "This option will connect to the Hula server using a plaintext password."
+#~ msgstr "à®?à®¨à¯?à®¤ à®¤à¯?à®°à¯?à®µà¯? à®¹à¯?à®²à®¾ à®?à¯?à®µà®?à®©à¯? à®?à®¾à®¤à®¾à®°à®£ à®?à®°à¯? à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯?à®²à¯? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤à®¿ à®?à®£à¯?à®?à¯?à®?à¯?à®®à¯?"
+
+#~ msgid "Failed sending command to IMAP server %s: %s"
+#~ msgstr "à®?à®?à¯?à®?à®³à¯?à®¯à¯? IMAP à®?à¯?à®µà®?à®©à¯?à®?à¯?à®?à¯? à®?à®©à¯?à®ªà¯?à®ªà¯?à®µà®¤à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à®¿à®²à¯? à®®à¯?à®?à®¿à®¨à¯?à®¤à®¤à¯? %s: %s"
+
+#~ msgid "Unexpected response from IMAP4 server %s: %s"
+#~ msgstr "IMAP4 à®?à¯?à®µà¯?à®¯à®?à®¤à¯?à®¤à®¿à®²à¯? à®?à®¤à®¿à®°à¯?à®ªà®¾à®°à®¾à®¤ à®ªà®¤à®¿à®²à¯? %s: %s"
+
+#~ msgid "Unexpected greeting from IMAP server %s."
+#~ msgstr "IMAP4 à®?à¯?à®µà®?à®©à®¿à®²à¯? à®?à®¤à®¿à®°à¯?à®ªà®¾à®°à®¾à®¤ à®?à®´à¯?à®ªà¯?à®ªà¯? %s"
+
+#~ msgid "Cannot select folder '%s': Invalid mailbox name"
+#~ msgstr " %s à®?à®?à¯?à®µà¯? à®¤à¯?à®°à¯?à®¨à¯?à®¤à¯?à®?à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?  à®?à¯?à®²à¯?à®²à¯?à®ªà®?à®¿à®¯à®¾à®?à®¾à®¤ à®?à®?à¯?à®?à®²à¯? à®ªà¯?à®?à¯?à®?à®¿ à®ªà¯?à®¯à®°à¯?"
+
+#~ msgid "Cannot select folder '%s': Bad command"
+#~ msgstr "'%s' à®?à®?à¯?à®µà¯? à®¤à¯?à®°à¯?à®¨à¯?à®¤à¯?à®?à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®¤à®µà®±à®¾à®© à®?à®?à¯?à®?à®³à¯?"
+
+#~ msgid "Failed to send command to IMAP server %s: %s"
+#~ msgstr "à®?à®®à®¾à®ªà¯? à®?à¯?à®µà¯?à®¯à®?à®¤à¯?à®¤à¯?à®?à¯?à®?à¯? à®?à®?à¯?à®?à®³à¯? à®?à®©à¯?à®ªà¯?à®ª à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? %s: %s"
+
+#~ msgid "service unavailable"
+#~ msgstr "à®?à¯?à®µà¯? à®?à®¿à®?à¯?à®?à¯?à®?à®µà®¿à®²à¯?à®²à¯?"
+
+#~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
+#~ msgstr "IMAP4 à®?à¯?à®µà®?à®©à¯? %s à®?à®¤à®¿à®°à¯?à®ªà®¾à®°à®¾à®®à®²à¯? à®¤à¯?à®£à¯?à®?à®¿à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®?à®¤à¯?: %s"
+
+#~ msgid ""
+#~ "Enable extended Mailing-List detection required for some filter and "
+#~ "vFolder rules"
+#~ msgstr ""
+#~ "à®µà®¿à®°à®¿à®µà®¾à®© à®?à®?à¯?à®?à®²à¯? à®ªà®?à¯?à®?à®¿à®¯à®²à¯? à®?à®£à¯?à®?à¯? à®ªà®¿à®?à®¿à®ªà¯?à®ªà¯? à®?à¯?à®¯à®²à¯?à®ªà®?à¯?à®¤à¯?à®¤à¯?à®µà®¤à¯? à®?à¯?à®?à®¿à®² à®µà®?à®¿à®ªà¯?à®ªà®¿à®?à®³à¯? à®®à®±à¯?à®±à¯?à®®à¯? "
+#~ "à®µà®¿à®?à®?à¯?à®µà¯? à®µà®¿à®¤à®¿à®?à®³à¯?à®?à¯?à®?à¯? à®?à®µà®?à®¿à®¯à®®à¯?"
+
+#~ msgid "Expire cached messages that haven't been read in X seconds"
+#~ msgstr "X à®¨à¯?à®?à®¿à®?à®³à¯? à®?à®²à¯? à®ªà®?à®¿à®?à¯?à®?à®ªà¯?à®ªà®?à®¾à®¤ à®?à®?à¯?à®¯à®?à®¤à¯?à®¤à®¿à®²à¯? à®?à®³à¯?à®³ à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à¯? à®?à®¾à®²à®¾à®µà®¤à®¿ à®?à®?à¯?à®?à¯?"
+
+#~ msgid "Expire cached messages older than X seconds"
+#~ msgstr "X à®¨à¯?à®?à®¿à®?à®³à¯?à®?à¯?à®?à¯? à®®à¯?à®²à¯? à®ªà®´à¯?à®¯  à®?à®?à¯?à®¯à®?à®¤à¯?à®¤à®¿à®²à¯? à®?à®³à¯?à®³ à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à¯? à®?à®¾à®²à®¾à®µà®¤à®¿ à®?à®?à¯?à®?à¯?"
+
+#~ msgid "Cannot access folder '%s': %s"
+#~ msgstr "'%s' à®?à®?à¯?à®µà¯? à®?à®£à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
+
+#~ msgid "Cannot sync flags to folder '%s': Unknown error"
+#~ msgstr "'%s' à®?à®?à¯?à®µà¯? à®?à®¤à¯?à®¤à®¿à®?à¯?à®µà¯? à®?à¯?à®±à®¿ à®?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®¤à¯?à®°à®¿à®¯à®¾à®¤ à®ªà®¿à®´à¯?"
+
+#~ msgid "Cannot sync flags to folder '%s': Bad command"
+#~ msgstr "'%s' à®?à®?à¯?à®µà¯? à®?à®¤à¯?à®¤à®¿à®?à¯?à®µà¯? à®?à¯?à®±à®¿ à®?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®¤à®µà®±à®¾à®© à®?à®?à¯?à®?à®³à¯?"
+
+#~ msgid "Cannot expunge folder '%s': Unknown error"
+#~ msgstr "'%s' à®?à®?à¯?à®µà¯? à®¨à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®¤à¯?à®°à®¿à®¯à®¾à®¤ à®ªà®¿à®´à¯?"
+
+#~ msgid "Cannot expunge folder '%s': Bad command"
+#~ msgstr "'%s' à®?à®?à¯?à®µà¯? à®¨à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®¤à®µà®±à®¾à®© à®?à®?à¯?à®?à®³à¯?"
+
+#~ msgid "Cannot get message %s from folder '%s': No such message"
+#~ msgstr " %s à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? '%s' à®?à®?à¯?à®µà®¿à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? à®ªà¯?à®± à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®?à¯?à®¯à¯?à®¤à®¿ à®?à®¤à¯?à®®à¯? à®?à®²à¯?à®²à¯?"
+
+#~ msgid "Cannot get message %s from folder '%s': Bad command"
+#~ msgstr " %s à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? '%s' à®?à®?à¯?à®µà®¿à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? à®ªà¯?à®± à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®¤à®µà®±à®¾à®© à®?à®?à¯?à®?à®³à¯?"
+
+#~ msgid "Cannot append message to folder '%s': Folder is read-only"
+#~ msgstr " '%s' à®?à®?à¯?à®µà¯?à®?à¯?à®?à¯? à®?à¯?à®¯à¯?à®¤à®¿ à®?à¯?à®°à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®?à®?à¯?à®µà¯? à®ªà®?à®¿à®?à¯?à®? à®®à®?à¯?à®?à¯?à®®à¯?"
+
+#~ msgid "Cannot append message to folder '%s': Unknown error"
+#~ msgstr " '%s' à®?à®?à¯?à®µà¯?à®?à¯?à®?à¯? à®?à¯?à®¯à¯?à®¤à®¿ à®?à¯?à®°à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®¤à¯?à®°à®¿à®¯à®¾à®¤ à®¤à®µà®±à¯?"
+
+#~ msgid "Cannot append message to folder '%s': Bad command"
+#~ msgstr " '%s' à®?à®?à¯?à®µà¯?à®?à¯?à®?à¯? à®?à¯?à®¯à¯?à®¤à®¿ à®?à¯?à®°à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®¤à®µà®±à®¾à®© à®?à®?à¯?à®?à®³à¯?"
+
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr ""
+#~ "à®?à®?à¯?à®µà¯? '%s' à®?à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? à®?à®?à¯?à®µà¯? '%s' à®?à¯?à®?à¯? à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à¯? à®¨à®?à®°à¯?à®¤à¯?à®¤ à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®¤à¯?à®°à®¿à®¯à®¾à®¤ à®¤à®µà®±à¯?"
+
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr ""
+#~ "à®?à®?à¯?à®µà¯? '%s' à®?à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? à®?à®?à¯?à®µà¯? '%s' à®?à¯?à®?à¯? à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à¯? à®¨à®?à®°à¯?à®¤à¯?à®¤ à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?:  à®¤à¯?à®°à®¿à®¯à®¾à®¤ "
+#~ "à®¤à®µà®±à¯?"
+
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr ""
+#~ "à®?à®?à¯?à®µà¯? '%s' à®?à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? à®?à®?à¯?à®µà¯? '%s' à®?à¯?à®?à¯? à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à¯? à®¨à®?à®°à¯?à®¤à¯?à®¤ à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®¤à®µà®±à®¾à®© à®?à®?à¯?à®?à®³à¯?"
+
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr ""
+#~ "à®?à®?à¯?à®µà¯? '%s' à®?à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? à®?à®?à¯?à®µà¯? '%s' à®?à¯?à®?à¯? à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à¯? à®¨à®?à®²à¯?à®?à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®¤à®µà®±à®¾à®© "
+#~ "à®?à®?à¯?à®?à®³à¯?"
+
+#~ msgid "Check new messages for _Junk contents"
+#~ msgstr "à®¤à¯?à®µà¯?à®¯à®±à¯?à®± à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à¯? à®®à®?à¯?à®?à¯?à®®à¯? à®?à®³à¯?à®³à®¤à®¾ à®?à®±à®?à®°à®¿à®ªà®¾à®°à¯?à®?à¯?à®?à®µà¯?à®®à¯?\"(_J)"
+
+#~ msgid "Only check for Junk messa_ges in the INBOX folder"
+#~ msgstr "à®?à®³à¯?à®ªà¯?à®?à¯?à®?à®¿ à®?à®?à¯?à®µà®¿à®²à¯? à®¤à¯?à®µà¯?à®¯à®±à¯?à®± à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à¯? à®®à®?à¯?à®?à¯?à®®à¯? à®?à®°à®¿à®ªà®¾à®°à¯?à®?à¯?à®?à®µà¯?à®®à¯?\" (_g)"
+
+#~ msgid "IMAP4rev1"
+#~ msgstr "IMAPv4rev1"
+
+#~ msgid "For reading and storing mail on IMAPv4rev1 servers."
+#~ msgstr "à®®à®¿à®©à¯?à®©à®?à¯?à®?à®²à¯?à®?à®³à¯? à®ªà®?à®¿à®?à¯?à®? à®®à®±à¯?à®±à¯?à®®à¯? IMAPv4rev1 à®?à¯?à®µà¯?à®¯à®?à®¤à¯?à®¤à®¿à®²à¯? à®?à¯?à®®à®¿à®?à¯?à®?à®µà¯?à®®à¯?."
+
+#~ msgid ""
+#~ "This option will connect to the IMAPv4rev1 server using a plaintext "
+#~ "password."
+#~ msgstr ""
+#~ "à®?à®¨à¯?à®¤ à®¤à¯?à®°à¯?à®µà¯? IMAPv4rev1 à®?à¯?à®µà®?à®©à¯?à®?à®©à¯? à®?à®¾à®¤à®¾à®°à®£à®?à®°à¯? à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯?à®²à¯? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤à®¿ à®?à®£à¯?à®?à¯?à®?à¯?à®®à¯?"
+
+#~ msgid ""
+#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
+#~ "support STARTTLS"
+#~ msgstr ""
+#~ "IMAP à®?à¯?à®µà®?à®©à¯? %s à®?à®?à®©à¯? à®ªà®¾à®¤à¯?à®?à®¾à®ªà¯?à®ªà®¾à®? à®?à®£à¯?à®ªà¯?à®ªà®¤à®¿à®²à¯? à®¤à¯?à®²à¯?à®µà®¿. à®?à¯?à®µà¯?à®¯à®?à®®à¯? STARTTLS à®? "
+#~ "à®?à®¤à®°à®¿à®?à¯?à®?à®µà®¿à®²à¯?à®²à¯?."
+
+#~ msgid ""
+#~ "Cannot authenticate to IMAP server %s using the %s authentication "
+#~ "mechanism"
+#~ msgstr "IMAP à®?à¯?à®µà®?à®©à¯? %s à®? %s à®?à®©à¯?à®®à®¤à®¿ à®®à¯?à®±à¯?à®¯à¯? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤à®¿ à®?à®©à¯?à®®à®¤à®¿à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?"
+
+#~ msgid "Cannot authenticate to IMAP server %s using %s"
+#~ msgstr "IMAP à®?à¯?à®µà®?à®©à¯? %s à®? %s à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤à®¿ à®?à®©à¯?à®®à®¤à®¿à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?"
+
+#~ msgid "Cannot create IMAP folders in offline mode."
+#~ msgstr "à®?à®¨à¯?à®¤ à®?à®£à¯?à®¯ à®®à¯?à®±à¯?à®¯à®¿à®²à¯? IMAP  à®?à®?à¯?à®µà¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?"
+
+#~ msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
+#~ msgstr "à®?à®?à¯?à®µà¯? '%s' à®? IMAP à®?à¯?à®µà¯?à®¯à®?à®®à¯? %sà®?à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®¤à¯?à®°à®¿à®¯à®¾à®¤ à®ªà®¿à®´à¯?"
+
+#~ msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
+#~ msgstr "à®?à®®à®¾à®ªà¯? à®?à¯?à®µà¯?à®¯à®?à®®à¯? %s à®?à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? '%s' à®?à¯?à®?à¯? à®²à®¿à®¸à¯?à®?à¯? à®¤à®?à®µà®²à¯? à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?.: %s"
+
+#~ msgid "Bad command"
+#~ msgstr "à®¤à®µà®±à®¾à®© à®?à®?à¯?à®?à®³à¯?"
+
+#~ msgid "Cannot create folder '%s': Invalid mailbox name"
+#~ msgstr "à®?à®?à¯?à®µà¯? '%s' à®? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®?à¯?à®²à¯?à®²à¯?à®ªà®?à®¿à®¯à®¾à®?à®¾à®¤ à®ªà¯?à®¯à®°à¯?"
+
+#~ msgid "Cannot create folder '%s': Bad command"
+#~ msgstr "à®?à®?à¯?à®µà¯? '%s' à®? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?:à®¤à®µà®±à®¾à®© à®?à®?à¯?à®?à®³à¯?"
+
+#~ msgid "Cannot delete folder '%s': Special folder"
+#~ msgstr "à®?à®?à¯?à®µà¯? '%s' à®? à®¨à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®?à®¿à®±à®ªà¯?à®ªà¯? à®?à®?à¯?à®µà¯?"
+
+#~ msgid "Cannot delete IMAP folders in offline mode."
+#~ msgstr " IMAP à®?à®?à¯?à®µà¯? à®?à®£à¯?à®¯ à®®à¯?à®±à¯?à®¯à®¿à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? à®¨à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®¾à®¤à¯?."
+
+#~ msgid "Cannot delete folder '%s': Invalid mailbox name"
+#~ msgstr "à®?à®?à¯?à®µà¯? '%s' à®? à®¨à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®?à¯?à®²à¯?à®²à¯?à®ªà®?à®¿à®¯à®¾à®?à®¾à®¤ à®?à®?à¯?à®?à®²à¯? à®ªà¯?à®?à¯?à®?à®¿ à®ªà¯?à®¯à®°à¯?"
+
+#~ msgid "Cannot delete folder '%s': Bad command"
+#~ msgstr "à®?à®?à¯?à®µà¯? '%s' à®? à®¨à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®¤à®µà®±à®¾à®© à®?à®?à¯?à®?à®³à¯?"
+
+#~ msgid "Cannot rename folder '%s' to '%s': Special folder"
+#~ msgstr "à®?à®?à¯?à®µà¯? '%s' à®?  '%s' à®?à®© à®®à®±à¯? à®ªà¯?à®¯à®°à¯? à®?à®?  à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®?à®¿à®±à®ªà¯?à®ªà¯? à®?à®?à¯?à®µà¯?"
+
+#~ msgid "Cannot rename IMAP folders in offline mode."
+#~ msgstr " IMAP à®?à®?à¯?à®µà¯? à®?à®£à¯?à®¯ à®®à¯?à®±à¯?à®¯à®¿à®²à¯? à®ªà¯?à®¤à¯?à®ªà¯?à®ªà¯?à®¯à®°à®¿à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?."
+
+#~ msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
+#~ msgstr ""
+#~ "à®?à®?à¯?à®µà¯? '%s' à®?  '%s' à®?à®© à®®à®±à¯? à®ªà¯?à®¯à®°à¯? à®?à®?  à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®?à¯?à®²à¯?à®²à¯?à®ªà®?à®¿à®¯à®¾à®?à®¾à®¤ à®?à®?à¯?à®?à®²à¯? à®ªà¯?à®?à¯?à®?à®¿ "
+#~ "à®ªà¯?à®¯à®°à¯?"
+
+#~ msgid "Cannot rename folder '%s' to '%s': Bad command"
+#~ msgstr "à®?à®?à¯?à®µà¯? '%s' à®?  '%s' à®?à®© à®®à®±à¯? à®ªà¯?à®¯à®°à¯? à®?à®?  à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®¤à®µà®±à®¾à®© à®?à®?à¯?à®?à®³à¯?"
+
+#~ msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
+#~ msgstr "%s à®¤à®?à®µà®²à¯?  '%s'  à®¤à¯?à®°à®£à®¿à®?à¯?à®?à¯? ( IMAP à®?à¯?à®µà¯?à®¯à®?à®®à¯? %s à®?à®²à¯?) à®ªà¯?à®±à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯? : %s"
+
+#~ msgid "Cannot subscribe to IMAP folders in offline mode."
+#~ msgstr "IMAP à®?à®?à¯?à®µà¯? à®?à®£à¯?à®¯ à®®à¯?à®±à¯?à®¯à®¿à®²à¯? à®?à®µà®£à®ªà®?à¯?à®¤à¯?à®¤ à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?."
+
+#~ msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
+#~ msgstr ""
+#~ "à®?à®?à¯?à®µà¯?  '%s' à®?à¯?à®?à¯? à®?à®¨à¯?à®¤à®¾ à®?à¯?à®²à¯?à®¤à¯?à®¤ à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®?à¯?à®²à¯?à®²à¯?à®ªà®?à®¿à®¯à®¾à®?à®¾à®¤ à®?à®?à¯?à®?à®²à¯? à®ªà¯?à®?à¯?à®?à®¿ à®ªà¯?à®¯à®°à¯?"
+
+#~ msgid "Cannot subscribe to folder '%s': Bad command"
+#~ msgstr "à®?à®?à¯?à®µà¯?  '%s' à®?à¯?à®?à¯? à®?à®¨à¯?à®¤à®¾ à®?à¯?à®²à¯?à®¤à¯?à®¤ à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®¤à®µà®±à®¾à®© à®?à®?à¯?à®?à®³à¯?"
+
+#~ msgid "Cannot unsubscribe from IMAP folders in offline mode."
+#~ msgstr "à®µà®²à¯? à®µà®¿à®²à®?à®¿à®¯ à®¨à®¿à®²à¯?à®¯à®¿à®²à¯? à®?à®®à®¾à®ªà¯? à®?à®?à¯?à®µà¯?à®?à®³à¯?à®?à¯?à®?à¯? à®?à®¨à¯?à®¤à®¾ à®¨à¯?à®?à¯?à®?à®®à¯? à®?à¯?à®¯à¯?à®¯ à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?."
+
+#~ msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
+#~ msgstr "à®?à®?à¯?à®µà¯?  '%s' à®?à¯?à®?à¯? à®?à®¨à¯?à®¤à®¾ à®¨à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®?à¯?à®²à¯?à®²à¯?à®ªà®?à®¿à®¯à®¾à®?à®¾à®¤ à®?à®?à¯?à®?à®²à¯? à®ªà¯?à®?à¯?à®?à®¿ à®ªà¯?à®¯à®°à¯?"
+
+#~ msgid "Cannot unsubscribe from folder '%s': Bad command"
+#~ msgstr "à®?à®?à¯?à®µà¯?  '%s' à®?à¯?à®?à¯? à®?à®¨à¯?à®¤à®¾ à®¨à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: à®¤à®µà®±à®¾à®© à®?à®?à¯?à®?à®³à¯?"
+
+#~ msgid "Scanning for changed messages"
+#~ msgstr "à®®à®¾à®±à¯?à®±à®ªà¯?à®ªà®?à¯?à®? à®?à¯?à®¯à¯?à®¤à®¿à®¯à¯? à®¤à¯?à®?à¯?à®?à®¿à®±à®¤à¯?"
+
+#~ msgid "IMAP server %s is in an inconsistent state."
+#~ msgstr "IMAP à®?à¯?à®µà®¯à®?à®®à¯? %s à®¨à®¿à®²à¯? à®?à¯?à®²à¯?à®¨à¯?à®¤à¯? à®?à®³à¯?à®³à®¤à¯?."
+
+#~ msgid "Fetching envelopes of new messages"
+#~ msgstr "à®ªà¯?à®¤à®¿à®¯ à®?à¯?à®¯à¯?à®¤à®¿à®?à®³à®¿à®©à¯? à®?à®±à¯?à®?à®³à¯? à®?à¯?à®£à¯?à®?à¯? à®µà®°à¯?à®?à®¿à®±à®¤à¯?."
+
+#~ msgid "Unexpected token in response from IMAP server %s: "
+#~ msgstr "IMAP à®?à¯?à®µà®?à®©à®¿à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? à®?à®¤à®¿à®°à¯?à®ªà®¾à®°à®¾à®¤ à®ªà®¤à®¿à®²à¯? %s: "
+
+#~ msgid "No data"
+#~ msgstr "à®¤à®?à®µà®²à¯? à®?à®²à¯?à®²à¯?"
+
+#~ msgid "IMAP server %s unexpectedly disconnected: %s"
+#~ msgstr "MAP à®?à¯?à®µà®?à®©à¯? %s à®?à®¤à®¿à®°à¯?à®ªà®¾à®°à®¾à®®à®²à¯? à®¤à¯?à®£à¯?à®?à®¿à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®?à®¤à¯? : %s"
+
+#~ msgid "%sPlease enter the IMAP password for %s %s"
+#~ msgstr "%s %s %s à®?à¯?à®?à®¾à®© à®?à®®à®¾à®ªà¯? à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯?à®²à¯? à®?à®³à¯?à®³à®¿à®?à®µà¯?à®®à¯?"
+
+#~ msgid "Use cancel"
+#~ msgstr "à®°à®¤à¯?à®¤à¯?à®?à¯?à®¯à¯? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤à¯?"
+
+#~ msgid "Item(s) _belong to these categories:"
+#~ msgstr "à®?à®¨à¯?à®¤ à®µà®?à¯?à®?à®³à¯? à®?à®¾à®°à¯?à®¨à¯?à®¤ à®?à®°à¯?à®ªà¯?à®ªà®?à®¿(à®?à®³à¯?) (_b):"
+
+#~ msgid "Color Info"
+#~ msgstr "à®µà®£à¯?à®£ à®¤à®?à®µà®²à¯?"
+
+#~ msgid "The color to render"
+#~ msgstr "à®µà®°à¯?à®µà®¤à®±à¯?à®?à¯? à®¨à®¿à®±à®®à¯?"
+
 #~ msgid ""
 #~ "Experimental IMAP 4(.1) client\n"
 #~ "This is untested and unsupported code, you want to use plain imap "
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]