[evolution-data-server] Updated Bulgarian translation

From: Alexander Alexandrov Shopov <al_shopov src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-data-server] Updated Bulgarian translation
Date: Mon, 28 Mar 2011 04:38:57 +0000 (UTC)
commit e999785436881d295d33a3c5639694e1527fbf23
Author: Alexander Shopov <ash kambanaria org>
Date:   Mon Mar 28 06:16:06 2011 +0300

    Updated Bulgarian translation

 po/bg.po | 4771 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 2620 insertions(+), 2151 deletions(-)
---
diff --git a/po/bg.po b/po/bg.po
index d658933..4902fae 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,9 +1,9 @@
 # Bulgarian translation of evolution-data-server po-file.
 # Copyright (C) 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
-# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # Copyright (C) 2010 Krasimir Chonov <mk2616 abv bg>.
 # Nikolay Hristov <geroy stemo bg>
-# Alexander Shopov <ash kambanaria org>, 2001, 2005, 2006, 2007, 2008, 2009, 2010.
+# Alexander Shopov <ash kambanaria org>, 2001, 2005, 2006, 2007, 2008, 2009, 2010, 2011.
 # Yanko Kaneti <yaneti declera com>
 # Vladimir Petkov <vpetkov i-space org>, 2004, 2005.
 # Yavor Doganov <yavor gnu org>, 2007, 2008.
@@ -13,80 +13,161 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-23 08:32+0200\n"
-"PO-Revision-Date: 2010-02-23 08:32+0200\n"
-"Last-Translator: Krasimir Chonov <mk2616 abv bg>\n"
+"POT-Creation-Date: 2011-03-26 06:51+0200\n"
+"PO-Revision-Date: 2011-03-27 23:13+0300\n"
+"Last-Translator: Alexander Shopov <ash kambanaria org>\n"
 "Language-Team: Bulgarian <dict fsa-bg org>\n"
+"Language: bg\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"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:560
+#: ../addressbook/backends/file/e-book-backend-file.c:570
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
 msgid "Loading..."
 msgstr "Ð?Ð°Ñ?ÐµÐ¶Ð´Ð°Ð½Ðµâ?¦"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:563
+#: ../addressbook/backends/file/e-book-backend-file.c:573
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4551
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4506
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
 msgid "Searching..."
 msgstr "Ð¢Ñ?Ñ?Ñ?ÐµÐ½Ðµâ?¦"
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4715
+#. Query for new contacts asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:589
+msgid "Querying for updated contactsâ?¦"
+msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?ÐºÐ° Ð·Ð° Ð¿Ñ?Ð¾Ð¼ÐµÐ½ÐµÐ½Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð¸â?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:624
+msgid "Personal"
+msgstr "Ð?Ð¸Ñ?Ð½Ð¸"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:626
+msgid "Friends"
+msgstr "Ð?Ñ?Ð¸Ñ?Ñ?ÐµÐ»Ð¸"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:628
+msgid "Family"
+msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ?"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:630
+msgid "Coworkers"
+msgstr "Ð?Ð¾Ð»ÐµÐ³Ð¸"
+
+#. Run the query asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:707
+msgid "Querying for updated groupsâ?¦"
+msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?ÐºÐ° Ð·Ð° Ð¿Ñ?Ð¾Ð¼ÐµÐ½ÐµÐ½Ð¸ Ð³Ñ?Ñ?Ð¿Ð¸â?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:891
+msgid "Creating new contactâ?¦"
+msgstr "Ð¡Ñ?Ð·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð½Ð¾Ð² ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?â?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:984
+msgid "Deleting contactâ?¦"
+msgstr "Ð?Ð·Ñ?Ñ?Ð¸Ð²Ð°Ð½Ðµ Ð½Ð° ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?â?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1092
+msgid "Modifying contactâ?¦"
+msgstr "Ð?Ñ?Ð¾Ð¼Ñ?Ð½Ð° Ð½Ð° ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?â?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1199
+msgid "Loadingâ?¦"
+msgstr "Ð?Ð°Ñ?ÐµÐ¶Ð´Ð°Ð½Ðµâ?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1346
+msgid "Authenticating with the serverâ?¦"
+msgstr "Ð?Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð¿Ñ?ÐµÐ´ Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð°â?¦"
+
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2699
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4665
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "Ð?Ð·Ñ?ÐµÐ³Ð»Ñ?Ð½Ðµ Ð½Ð° ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð¸ (%d)â?¦"
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2845
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3029
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3073
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2849
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3030
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3077
 #, c-format
 msgid "Updating contacts cache (%d)... "
 msgstr "Ð?Ð¿Ñ?ÐµÑ?Ð½Ñ?Ð²Ð°Ð½Ðµ Ð½Ð° ÐºÐµÑ?Ð° Ñ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð¸ (%d)â?¦"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:816
+#. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
+msgid "Not connected"
+msgstr "Ð?Ñ?Ð¼Ð° Ð²Ñ?Ñ?Ð·ÐºÐ°"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:764
 msgid "Using Distinguished Name (DN)"
 msgstr "Ð§Ñ?ÐµÐ· Ð¾Ñ?Ð»Ð¸Ñ?Ð¸Ñ?ÐµÐ»Ð½Ð¾ Ð¸Ð¼Ðµ (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:819
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:767
 msgid "Using Email Address"
 msgstr "Ð§Ñ?ÐµÐ· Ðµ-Ð¿Ð¾Ñ?Ð°"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1096
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1033
 msgid "Reconnecting to LDAP server..."
 msgstr "Ð?Ð¾Ð²Ñ?Ð¾Ñ?Ð½Ð¾ Ñ?Ð²Ñ?Ñ?Ð·Ð²Ð°Ð½Ðµ Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð·Ð° LDAPâ?¦"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1738
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1158
+msgid "Invalid DN syntax"
+msgstr "Ð?Ñ?ÐµÑ?ÐµÐ½ Ñ?Ð¸Ð½Ñ?Ð°ÐºÑ?Ð¸Ñ? Ð·Ð° DN"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1675
 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:1807
 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:2243
 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:4356
 msgid "Receiving LDAP search results..."
 msgstr "Ð?Ð¾Ð»Ñ?Ñ?Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ñ?ÐµÐ·Ñ?Ð»Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ð¾Ñ? Ñ?Ñ?Ñ?Ñ?ÐµÐ½ÐµÑ?Ð¾ Ð² LDAPâ?¦"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4573
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4528
 msgid "Error performing search"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¸Ð·Ð¿Ñ?Ð»Ð½ÐµÐ½Ð¸ÐµÑ?Ð¾ Ð½Ð° Ñ?Ñ?Ñ?Ñ?ÐµÐ½ÐµÑ?Ð¾"
 
-#: ../addressbook/libebook/e-book.c:2149
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:273
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:881
+#: ../addressbook/libedata-book/e-data-book.c:441
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:523
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:552
+#: ../calendar/backends/http/e-cal-backend-http.c:435
+#: ../calendar/libecal/e-cal.c:4177
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:160
+#: ../camel/providers/imap/camel-imap-command.c:481
+#: ../camel/providers/imap/camel-imap-store.c:425
+#: ../camel/providers/pop3/camel-pop3-store.c:495
+#: ../camel/providers/smtp/camel-smtp-transport.c:497
+#: ../servers/groupwise/e-gw-connection.c:243
+msgid "Unknown error"
+msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ð° Ð³Ñ?ÐµÑ?ÐºÐ°"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:335
 #, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
-msgstr ""
-"%s: Ð½Ðµ Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?Ð²Ð° Ð¸Ð·Ñ?Ð¾Ñ?Ð½Ð¸Ðº Ð·Ð° Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð¸Ñ?ÐµÐ»Ñ?ÐºÐ¸ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? â??%sâ?? Ð² gconf."
+msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð¾ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ñ?ÐµÑ?Ñ?Ñ?Ñ? â??%sâ?? Ñ? ÐºÐ¾Ð´ Ð¾Ñ? HTTP: %d (%s)"
+
+#: ../addressbook/libebook/e-book.c:3160
+#, c-format
+msgid "%s: there was no source for UID '%s' stored in GConf."
+msgstr "%s: Ð½Ðµ Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?Ð²Ð° Ð¸Ð·Ñ?Ð¾Ñ?Ð½Ð¸Ðº Ð·Ð° Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð¸Ñ?ÐµÐ»Ñ?ÐºÐ¸ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? â??%sâ?? Ð² GConf."
+
+#: ../addressbook/libebook/e-book.c:3516
+#: ../addressbook/libedata-book/e-data-book.c:183
+msgid "Address book does not exist"
+msgstr "Ð?Ð´Ñ?ÐµÑ?Ð½Ð¸ÐºÑ?Ñ? Ð½Ðµ Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?Ð²Ð°."
 
 #. Dummy row as EContactField starts from 1
 #: ../addressbook/libebook/e-contact.c:115
@@ -274,7 +355,7 @@ msgstr "Ð?Ð´Ñ?ÐµÑ? Ð½Ð° Ð±Ð»Ð¾Ð³"
 
 #. Contact categories
 #: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:671
+#: ../libedataserverui/e-categories-dialog.c:757
 msgid "Categories"
 msgstr "Ð?Ð°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ð¸"
 
@@ -307,147 +388,147 @@ msgstr "Ð?ÐµÐ»ÐµÐ¶ÐºÐ°"
 #. Instant messaging fields
 #: ../addressbook/libebook/e-contact.c:191
 msgid "AIM Home Screen Name 1"
-msgstr "Ð?Ð¾Ð¼Ð°Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ AIM 1"
+msgstr "Ð?Ð¾Ð¼Ð°Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ AIM 1"
 
 #: ../addressbook/libebook/e-contact.c:192
 msgid "AIM Home Screen Name 2"
-msgstr "Ð?Ð¾Ð¼Ð°Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ AIM 2"
+msgstr "Ð?Ð¾Ð¼Ð°Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ AIM 2"
 
 #: ../addressbook/libebook/e-contact.c:193
 msgid "AIM Home Screen Name 3"
-msgstr "Ð?Ð¾Ð¼Ð°Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ AIM 3"
+msgstr "Ð?Ð¾Ð¼Ð°Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ AIM 3"
 
 #: ../addressbook/libebook/e-contact.c:194
 msgid "AIM Work Screen Name 1"
-msgstr "Ð Ð°Ð±Ð¾Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ AIM 1"
+msgstr "Ð Ð°Ð±Ð¾Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ AIM 1"
 
 #: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Work Screen Name 2"
-msgstr "Ð Ð°Ð±Ð¾Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ AIM 2"
+msgstr "Ð Ð°Ð±Ð¾Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ AIM 2"
 
 #: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Work Screen Name 3"
-msgstr "Ð Ð°Ð±Ð¾Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ AIM 3"
+msgstr "Ð Ð°Ð±Ð¾Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ AIM 3"
 
 #: ../addressbook/libebook/e-contact.c:197
 msgid "GroupWise Home Screen Name 1"
-msgstr "Ð?Ð¾Ð¼Ð°Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ GroupWise 1"
+msgstr "Ð?Ð¾Ð¼Ð°Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ GroupWise 1"
 
 #: ../addressbook/libebook/e-contact.c:198
 msgid "GroupWise Home Screen Name 2"
-msgstr "Ð?Ð¾Ð¼Ð°Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ GroupWise 2"
+msgstr "Ð?Ð¾Ð¼Ð°Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ GroupWise 2"
 
 #: ../addressbook/libebook/e-contact.c:199
 msgid "GroupWise Home Screen Name 3"
-msgstr "Ð?Ð¾Ð¼Ð°Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ GroupWise 3"
+msgstr "Ð?Ð¾Ð¼Ð°Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ GroupWise 3"
 
 #: ../addressbook/libebook/e-contact.c:200
 msgid "GroupWise Work Screen Name 1"
-msgstr "Ð Ð°Ð±Ð¾Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ GroupWise 1"
+msgstr "Ð Ð°Ð±Ð¾Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ GroupWise 1"
 
 #: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Work Screen Name 2"
-msgstr "Ð Ð°Ð±Ð¾Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ GroupWise 2"
+msgstr "Ð Ð°Ð±Ð¾Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ GroupWise 2"
 
 #: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Work Screen Name 3"
-msgstr "Ð Ð°Ð±Ð¾Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ GroupWise 3"
+msgstr "Ð Ð°Ð±Ð¾Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ GroupWise 3"
 
 #: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 1"
-msgstr "Ð?Ð¾Ð¼Ð°Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ Jabber 1"
+msgid "Jabber Home ID 1"
+msgstr "Ð?Ð¾Ð¼Ð°Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ Jabber 1"
 
 #: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Home Id 2"
-msgstr "Ð?Ð¾Ð¼Ð°Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ Jabber 2"
+msgid "Jabber Home ID 2"
+msgstr "Ð?Ð¾Ð¼Ð°Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ Jabber 2"
 
 #: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Home Id 3"
-msgstr "Ð?Ð¾Ð¼Ð°Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ Jabber 3"
+msgid "Jabber Home ID 3"
+msgstr "Ð?Ð¾Ð¼Ð°Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ Jabber 3"
 
 #: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 1"
-msgstr "Ð Ð°Ð±Ð¾Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ Jabber 1"
+msgid "Jabber Work ID 1"
+msgstr "Ð Ð°Ð±Ð¾Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ Jabber 1"
 
 #: ../addressbook/libebook/e-contact.c:207
-msgid "Jabber Work Id 2"
-msgstr "Ð Ð°Ð±Ð¾Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ Jabber 2"
+msgid "Jabber Work ID 2"
+msgstr "Ð Ð°Ð±Ð¾Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ Jabber 2"
 
 #: ../addressbook/libebook/e-contact.c:208
-msgid "Jabber Work Id 3"
-msgstr "Ð Ð°Ð±Ð¾Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ Jabber 3"
+msgid "Jabber Work ID 3"
+msgstr "Ð Ð°Ð±Ð¾Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ Jabber 3"
 
 #: ../addressbook/libebook/e-contact.c:209
 msgid "Yahoo! Home Screen Name 1"
-msgstr "Ð?Ð¾Ð¼Ð°Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ Yahoo! 1"
+msgstr "Ð?Ð¾Ð¼Ð°Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ Yahoo! 1"
 
 #: ../addressbook/libebook/e-contact.c:210
 msgid "Yahoo! Home Screen Name 2"
-msgstr "Ð?Ð¾Ð¼Ð°Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ Yahoo! 2"
+msgstr "Ð?Ð¾Ð¼Ð°Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ Yahoo! 2"
 
 #: ../addressbook/libebook/e-contact.c:211
 msgid "Yahoo! Home Screen Name 3"
-msgstr "Ð?Ð¾Ð¼Ð°Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ Yahoo! 3"
+msgstr "Ð?Ð¾Ð¼Ð°Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ Yahoo! 3"
 
 #: ../addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Work Screen Name 1"
-msgstr "Ð Ð°Ð±Ð¾Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ Yahoo! 1"
+msgstr "Ð Ð°Ð±Ð¾Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ Yahoo! 1"
 
 #: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Work Screen Name 2"
-msgstr "Ð Ð°Ð±Ð¾Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ Yahoo! 2"
+msgstr "Ð Ð°Ð±Ð¾Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ Yahoo! 2"
 
 #: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Work Screen Name 3"
-msgstr "Ð Ð°Ð±Ð¾Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ Yahoo! 3"
+msgstr "Ð Ð°Ð±Ð¾Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ Yahoo! 3"
 
 #: ../addressbook/libebook/e-contact.c:215
 msgid "MSN Home Screen Name 1"
-msgstr "Ð?Ð¾Ð¼Ð°Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ MSN 1"
+msgstr "Ð?Ð¾Ð¼Ð°Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ MSN 1"
 
 #: ../addressbook/libebook/e-contact.c:216
 msgid "MSN Home Screen Name 2"
-msgstr "Ð?Ð¾Ð¼Ð°Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ MSN 2"
+msgstr "Ð?Ð¾Ð¼Ð°Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ MSN 2"
 
 #: ../addressbook/libebook/e-contact.c:217
 msgid "MSN Home Screen Name 3"
-msgstr "Ð?Ð¾Ð¼Ð°Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ MSN 3"
+msgstr "Ð?Ð¾Ð¼Ð°Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ MSN 3"
 
 #: ../addressbook/libebook/e-contact.c:218
 msgid "MSN Work Screen Name 1"
-msgstr "Ð Ð°Ð±Ð¾Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ MSN 1"
+msgstr "Ð Ð°Ð±Ð¾Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ MSN 1"
 
 #: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Work Screen Name 2"
-msgstr "Ð Ð°Ð±Ð¾Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ MSN 2"
+msgstr "Ð Ð°Ð±Ð¾Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ MSN 2"
 
 #: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Work Screen Name 3"
-msgstr "Ð Ð°Ð±Ð¾Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ MSN 3"
+msgstr "Ð Ð°Ð±Ð¾Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ MSN 3"
 
 #: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 1"
-msgstr "Ð?Ð¾Ð¼Ð°Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ ICQ 1"
+msgid "ICQ Home ID 1"
+msgstr "Ð?Ð¾Ð¼Ð°Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ ICQ 1"
 
 #: ../addressbook/libebook/e-contact.c:222
-msgid "ICQ Home Id 2"
-msgstr "Ð?Ð¾Ð¼Ð°Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ ICQ 2"
+msgid "ICQ Home ID 2"
+msgstr "Ð?Ð¾Ð¼Ð°Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ ICQ 2"
 
 #: ../addressbook/libebook/e-contact.c:223
-msgid "ICQ Home Id 3"
-msgstr "Ð?Ð¾Ð¼Ð°Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ ICQ 3"
+msgid "ICQ Home ID 3"
+msgstr "Ð?Ð¾Ð¼Ð°Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ ICQ 3"
 
 #: ../addressbook/libebook/e-contact.c:224
-msgid "ICQ Work Id 1"
-msgstr "Ð Ð°Ð±Ð¾Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ ICQ 1"
+msgid "ICQ Work ID 1"
+msgstr "Ð Ð°Ð±Ð¾Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ ICQ 1"
 
 #: ../addressbook/libebook/e-contact.c:225
-msgid "ICQ Work Id 2"
-msgstr "Ð Ð°Ð±Ð¾Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ ICQ 2"
+msgid "ICQ Work ID 2"
+msgstr "Ð Ð°Ð±Ð¾Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ ICQ 2"
 
 #: ../addressbook/libebook/e-contact.c:226
-msgid "ICQ Work Id 3"
-msgstr "Ð Ð°Ð±Ð¾Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ ICQ 3"
+msgid "ICQ Work ID 3"
+msgstr "Ð Ð°Ð±Ð¾Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ ICQ 3"
 
 #. Last modified time
 #: ../addressbook/libebook/e-contact.c:229
@@ -500,27 +581,27 @@ msgstr "Ð¡Ð¿Ð¸Ñ?Ñ?Ðº Ñ? Ð°Ð´Ñ?ÐµÑ?Ð¸ Ð½Ð° Ðµ-Ð¿Ð¾Ñ?Ð°"
 #. Instant messaging fields
 #: ../addressbook/libebook/e-contact.c:249
 msgid "AIM Screen Name List"
-msgstr "Ð¡Ð¿Ð¸Ñ?Ñ?Ðº Ð½Ð° Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ?Ð¸Ñ?Ðµ ÐºÑ?Ð¼ AIM"
+msgstr "Ð¡Ð¿Ð¸Ñ?Ñ?Ðº Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ð¸Ñ?Ðµ ÐºÑ?Ð¼ AIM"
 
 #: ../addressbook/libebook/e-contact.c:250
-msgid "GroupWise Id List"
-msgstr "Ð¡Ð¿Ð¸Ñ?Ñ?Ðº Ð½Ð° Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ?Ð¸Ñ?Ðµ ÐºÑ?Ð¼ GroupWise"
+msgid "GroupWise ID List"
+msgstr "Ð¡Ð¿Ð¸Ñ?Ñ?Ðº Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ð¸Ñ?Ðµ ÐºÑ?Ð¼ GroupWise"
 
 #: ../addressbook/libebook/e-contact.c:251
-msgid "Jabber Id List"
-msgstr "Ð¡Ð¿Ð¸Ñ?Ñ?Ðº Ð½Ð° Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ?Ð¸Ñ?Ðµ ÐºÑ?Ð¼ Jabber"
+msgid "Jabber ID List"
+msgstr "Ð¡Ð¿Ð¸Ñ?Ñ?Ðº Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ð¸Ñ?Ðµ ÐºÑ?Ð¼ Jabber"
 
 #: ../addressbook/libebook/e-contact.c:252
 msgid "Yahoo! Screen Name List"
-msgstr "Ð¡Ð¿Ð¸Ñ?Ñ?Ðº Ð½Ð° Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ?Ð¸Ñ?Ðµ ÐºÑ?Ð¼ Yahoo!"
+msgstr "Ð¡Ð¿Ð¸Ñ?Ñ?Ðº Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ð¸Ñ?Ðµ ÐºÑ?Ð¼ Yahoo!"
 
 #: ../addressbook/libebook/e-contact.c:253
 msgid "MSN Screen Name List"
-msgstr "Ð¡Ð¿Ð¸Ñ?Ñ?Ðº Ð½Ð° Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ?Ð¸Ñ?Ðµ ÐºÑ?Ð¼ MSN"
+msgstr "Ð¡Ð¿Ð¸Ñ?Ñ?Ðº Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ð¸Ñ?Ðµ ÐºÑ?Ð¼ MSN"
 
 #: ../addressbook/libebook/e-contact.c:254
-msgid "ICQ Id List"
-msgstr "Ð¡Ð¿Ð¸Ñ?Ñ?Ðº Ð½Ð° Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ?Ð¸Ñ?Ðµ ÐºÑ?Ð¼ ICQ"
+msgid "ICQ ID List"
+msgstr "Ð¡Ð¿Ð¸Ñ?Ñ?Ðº Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ð¸Ñ?Ðµ ÐºÑ?Ð¼ ICQ"
 
 #: ../addressbook/libebook/e-contact.c:256
 msgid "Wants HTML Mail"
@@ -539,8 +620,7 @@ msgid "Birth Date"
 msgstr "Ð?Ð°Ñ?Ð° Ð½Ð° Ñ?Ð°Ð¶Ð´Ð°Ð½Ðµ"
 
 #: ../addressbook/libebook/e-contact.c:262
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:715
-#: ../libedataserver/e-categories.c:45
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
 msgid "Anniversary"
 msgstr "Ð?Ð¾Ð´Ð¸Ñ?Ð½Ð¸Ð½Ð°"
 
@@ -550,32 +630,32 @@ msgid "X.509 Certificate"
 msgstr "Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? X.509"
 
 #: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 1"
-msgstr "Ð?Ð¾Ð¼Ð°Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ Gadu-Gadu 1"
+msgid "Gadu-Gadu Home ID 1"
+msgstr "Ð?Ð¾Ð¼Ð°Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ Gadu-Gadu 1"
 
 #: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Home Id 2"
-msgstr "Ð?Ð¾Ð¼Ð°Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ Gadu-Gadu 2"
+msgid "Gadu-Gadu Home ID 2"
+msgstr "Ð?Ð¾Ð¼Ð°Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ Gadu-Gadu 2"
 
 #: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Home Id 3"
-msgstr "Ð?Ð¾Ð¼Ð°Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ Gadu-Gadu 3"
+msgid "Gadu-Gadu Home ID 3"
+msgstr "Ð?Ð¾Ð¼Ð°Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ Gadu-Gadu 3"
 
 #: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 1"
-msgstr "Ð Ð°Ð±Ð¾Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ Gadu-Gadu 1"
+msgid "Gadu-Gadu Work ID 1"
+msgstr "Ð Ð°Ð±Ð¾Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ Gadu-Gadu 1"
 
 #: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Work Id 2"
-msgstr "Ð Ð°Ð±Ð¾Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ Gadu-Gadu 2"
+msgid "Gadu-Gadu Work ID 2"
+msgstr "Ð Ð°Ð±Ð¾Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ Gadu-Gadu 2"
 
 #: ../addressbook/libebook/e-contact.c:272
-msgid "Gadu-Gadu Work Id 3"
-msgstr "Ð Ð°Ð±Ð¾Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ Gadu-Gadu 3"
+msgid "Gadu-Gadu Work ID 3"
+msgstr "Ð Ð°Ð±Ð¾Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ Gadu-Gadu 3"
 
 #: ../addressbook/libebook/e-contact.c:273
-msgid "Gadu-Gadu Id List"
-msgstr "Ð¡Ð¿Ð¸Ñ?Ñ?Ðº Ñ? Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ?Ð¸ ÐºÑ?Ð¼ Gadu-Gadu"
+msgid "Gadu-Gadu ID List"
+msgstr "Ð¡Ð¿Ð¸Ñ?Ñ?Ðº Ñ? Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ð¸ ÐºÑ?Ð¼ Gadu-Gadu"
 
 #. Geo information
 #: ../addressbook/libebook/e-contact.c:276
@@ -588,384 +668,558 @@ msgstr "Ð¢ÐµÐ»ÐµÑ?Ð¾Ð½"
 
 #: ../addressbook/libebook/e-contact.c:280
 msgid "Skype Home Name 1"
-msgstr "Ð?Ð¾Ð¼Ð°Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ Skype 1"
+msgstr "Ð?Ð¾Ð¼Ð°Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ Skype 1"
 
 #: ../addressbook/libebook/e-contact.c:281
 msgid "Skype Home Name 2"
-msgstr "Ð?Ð¾Ð¼Ð°Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ Skype 2"
+msgstr "Ð?Ð¾Ð¼Ð°Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ Skype 2"
 
 #: ../addressbook/libebook/e-contact.c:282
 msgid "Skype Home Name 3"
-msgstr "Ð?Ð¾Ð¼Ð°Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ Skype 3"
+msgstr "Ð?Ð¾Ð¼Ð°Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ Skype 3"
 
 #: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Work Name 1"
-msgstr "Ð Ð°Ð±Ð¾Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ Skype 1"
+msgstr "Ð Ð°Ð±Ð¾Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ Skype 1"
 
 #: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Work Name 2"
-msgstr "Ð Ð°Ð±Ð¾Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ Skype 2"
+msgstr "Ð Ð°Ð±Ð¾Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ Skype 2"
 
 #: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Work Name 3"
-msgstr "Ð Ð°Ð±Ð¾Ñ?ÐµÐ½ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ? ÐºÑ?Ð¼ Skype 3"
+msgstr "Ð Ð°Ð±Ð¾Ñ?Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? ÐºÑ?Ð¼ Skype 3"
 
 #: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Name List"
-msgstr "Ð¡Ð¿Ð¸Ñ?Ñ?Ðº Ð½Ð° Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ?Ð¸Ñ?Ðµ ÐºÑ?Ð¼ Skype"
+msgstr "Ð¡Ð¿Ð¸Ñ?Ñ?Ðº Ð½Ð° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ð¸Ñ?Ðµ ÐºÑ?Ð¼ Skype"
 
 #: ../addressbook/libebook/e-contact.c:288
 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:301
+#: ../addressbook/libedata-book/e-data-book-factory.c:334
+#: ../calendar/libedata-cal/e-data-cal-factory.c:362
 #, 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:320
+#: ../addressbook/libedata-book/e-data-book-factory.c:370
+#: ../calendar/libedata-cal/e-data-cal-factory.c:350
 #, c-format
 msgid "Invalid source"
 msgstr "Ð?ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»ÐµÐ½ Ð¸Ð·Ñ?Ð¾Ñ?Ð½Ð¸Ðº"
 
-#: ../addressbook/libedata-book/e-data-book.c:301
-msgid "Cannot open book"
-msgstr "Ð?Ð´Ñ?ÐµÑ?Ð½Ð¸ÐºÑ?Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¾Ñ?Ð²Ð¾Ñ?Ð¸"
+#: ../addressbook/libedata-book/e-data-book.c:173
+#: ../calendar/libedata-cal/e-data-cal.c:108
+msgid "Success"
+msgstr "Ð£Ñ?Ð¿ÐµÑ?"
 
-#: ../addressbook/libedata-book/e-data-book.c:319
-msgid "Cannot remove book"
-msgstr "Ð?Ð´Ñ?ÐµÑ?Ð½Ð¸ÐºÑ?Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð°Ñ?Ð½Ðµ"
+#: ../addressbook/libedata-book/e-data-book.c:174
+#: ../calendar/libedata-cal/e-data-cal.c:109
+msgid "Repository offline"
+msgstr "Ð¥Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?ÐµÑ?Ð¾ Ð½Ðµ Ðµ Ð½Ð°Ð»Ð¸Ñ?Ð½Ð¾"
+
+#: ../addressbook/libedata-book/e-data-book.c:175
+#: ../calendar/libecal/e-cal.c:4159 ../calendar/libedata-cal/e-data-cal.c:110
+msgid "Permission denied"
+msgstr "Ð?Ð¾Ñ?Ñ?Ñ?Ð¿Ñ?Ñ? Ðµ Ð¾Ñ?ÐºÐ°Ð·Ð°Ð½"
 
-#: ../addressbook/libedata-book/e-data-book.c:331
-#: ../addressbook/libedata-book/e-data-book.c:346
-msgid "Cannot get contact"
-msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?Ñ?Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð»Ñ?Ñ?Ð¸"
+#: ../addressbook/libedata-book/e-data-book.c:176
+msgid "Contact not found"
+msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?Ñ?Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±Ñ?Ð´Ðµ Ð½Ð°Ð¼ÐµÑ?ÐµÐ½"
 
-#: ../addressbook/libedata-book/e-data-book.c:358
-msgid "Empty query"
-msgstr "Ð?Ñ?Ð°Ð·Ð½Ð° Ð·Ð°Ñ?Ð²ÐºÐ°"
+#: ../addressbook/libedata-book/e-data-book.c:177
+msgid "Contact ID already exists"
+msgstr "Ð?Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ?Ñ?Ñ? Ð½Ð° ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð° Ð²ÐµÑ?Ðµ Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?Ð²Ð°"
 
-#: ../addressbook/libedata-book/e-data-book.c:402
-msgid "Cannot authenticate user"
-msgstr "Ð?Ð¾Ñ?Ñ?ÐµÐ±Ð¸Ñ?ÐµÐ»Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸Ñ?Ð¸Ñ?Ð°"
+#: ../addressbook/libedata-book/e-data-book.c:178
+#: ../calendar/libedata-cal/e-data-cal.c:115
+msgid "Authentication Failed"
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½ÐµÑ?Ð¾"
 
-#: ../addressbook/libedata-book/e-data-book.c:414
-#: ../addressbook/libedata-book/e-data-book.c:429
-msgid "Cannot add contact"
-msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?Ñ?Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð´Ð¾Ð±Ð°Ð²Ð¸"
+#: ../addressbook/libedata-book/e-data-book.c:179
+#: ../calendar/libedata-cal/e-data-cal.c:116
+msgid "Authentication Required"
+msgstr "Ð?Ð·Ð¸Ñ?ÐºÐ²Ð° Ñ?Ðµ Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½Ðµ"
+
+#: ../addressbook/libedata-book/e-data-book.c:180
+#: ../calendar/libedata-cal/e-data-cal.c:117
+msgid "Unsupported field"
+msgstr "Ð?ÐµÐ¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð°Ð½Ð¾ Ð¿Ð¾Ð»Ðµ"
+
+#: ../addressbook/libedata-book/e-data-book.c:181
+#: ../calendar/libedata-cal/e-data-cal.c:119
+msgid "Unsupported authentication method"
+msgstr "Ð?ÐµÐ¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð°Ð½ Ð¼ÐµÑ?Ð¾Ð´ Ð·Ð° Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½Ðµ"
+
+#: ../addressbook/libedata-book/e-data-book.c:182
+#: ../calendar/libedata-cal/e-data-cal.c:120
+msgid "TLS not available"
+msgstr "Ð?Ð¸Ð¿Ñ?Ð²Ð° TLS"
+
+#: ../addressbook/libedata-book/e-data-book.c:184
+msgid "Book removed"
+msgstr "Ð?Ð´Ñ?ÐµÑ?Ð½Ð¸ÐºÑ?Ñ? Ðµ Ð¸Ð·Ñ?Ñ?Ð¸Ñ?"
+
+#: ../addressbook/libedata-book/e-data-book.c:185
+#: ../calendar/libedata-cal/e-data-cal.c:123
+msgid "Not available in offline mode"
+msgstr "Ð?Ðµ Ðµ Ð½Ð°Ð»Ð¸Ñ?Ð½Ð¾ Ð² Ñ?ÐµÐ¶Ð¸Ð¼ â??Ð?Ð·ÐºÐ»Ñ?Ñ?ÐµÐ½â??."
 
-#: ../addressbook/libedata-book/e-data-book.c:444
-#: ../addressbook/libedata-book/e-data-book.c:459
-msgid "Cannot modify contact"
-msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?Ñ?Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ð¸"
+#: ../addressbook/libedata-book/e-data-book.c:186
+#: ../calendar/libedata-cal/e-data-cal.c:124
+msgid "Search size limit exceeded"
+msgstr "Ð?Ð°ÐºÑ?Ð¸Ð¼Ð°Ð»Ð½Ð¸Ñ?Ñ? Ñ?Ð°Ð·Ð¼ÐµÑ? Ð·Ð° Ñ?Ñ?Ñ?Ñ?ÐµÐ½Ðµ Ðµ Ð½Ð°Ð´Ð²Ð¸Ñ?ÐµÐ½"
 
-#: ../addressbook/libedata-book/e-data-book.c:494
-msgid "Cannot remove contacts"
-msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?Ð¸Ñ?Ðµ Ð½Ðµ Ð¼Ð¾Ð³Ð°Ñ? Ð´Ð° Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð°Ñ?Ð½Ð°Ñ?"
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libedata-cal/e-data-cal.c:125
+msgid "Search time limit exceeded"
+msgstr "Ð?Ð°ÐºÑ?Ð¸Ð¼Ð°Ð»Ð½Ð¾Ñ?Ð¾ Ð²Ñ?ÐµÐ¼Ðµ Ð·Ð° Ñ?Ñ?Ñ?Ñ?ÐµÐ½Ðµ Ðµ Ð½Ð°Ð´Ð²Ð¸Ñ?ÐµÐ½Ð¾"
 
-#: ../addressbook/libedata-book/e-data-book.c:569
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
+#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../calendar/libedata-cal/e-data-cal.c:126
 msgid "Invalid query"
 msgstr "Ð?ÐµÐ²Ð°Ð»Ð¸Ð´Ð½Ð° Ð·Ð°Ñ?Ð²ÐºÐ°"
 
-#: ../addressbook/libedata-book/e-data-book.c:598
-msgid "Cannot get changes"
-msgstr "Ð?Ñ?Ð¾Ð¼ÐµÐ½Ð¸Ñ?Ðµ Ð½Ðµ Ð¼Ð¾Ð³Ð°Ñ? Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ñ?"
+#: ../addressbook/libedata-book/e-data-book.c:189
+#: ../calendar/libedata-cal/e-data-cal.c:127
+msgid "Query refused"
+msgstr "Ð?Ð°Ñ?Ð²ÐºÐ°Ñ?Ð° Ðµ Ð¾Ñ?ÐºÐ°Ð·Ð°Ð½Ð°"
+
+#: ../addressbook/libedata-book/e-data-book.c:190
+#: ../calendar/libedata-cal/e-data-cal.c:128
+msgid "Could not cancel"
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ñ?ÐµÐºÑ?Ð°Ñ?Ñ?Ð²Ð°Ð½ÐµÑ?Ð¾"
+
+#. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
+#. { OtherError,			N_("Other error") },
+#: ../addressbook/libedata-book/e-data-book.c:192
+#: ../calendar/libedata-cal/e-data-cal.c:130
+msgid "Invalid server version"
+msgstr "Ð?ÐµÐ²Ð°Ð»Ð¸Ð´Ð½Ð° Ð²ÐµÑ?Ñ?Ð¸Ñ? Ð½Ð° Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð°"
+
+#: ../addressbook/libedata-book/e-data-book.c:193
+msgid "No space"
+msgstr "Ð?Ñ?Ñ?Ñ?Ð¾Ñ?Ð¾ Ñ?Ð²Ñ?Ñ?Ñ?Ð¸"
+
+#: ../addressbook/libedata-book/e-data-book.c:194
+#: ../calendar/libecal/e-cal.c:4143 ../calendar/libedata-cal/e-data-cal.c:131
+msgid "Invalid argument"
+msgstr "Ð?Ñ?ÐµÑ?ÐµÐ½ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ?"
+
+#. Translators: The string for NOT_SUPPORTED error
+#: ../addressbook/libedata-book/e-data-book.c:196
+#: ../calendar/libecal/e-cal.c:4182 ../calendar/libedata-cal/e-data-cal.c:133
+msgid "Not supported"
+msgstr "Ð?Ðµ Ñ?Ðµ Ð¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð°"
+
+#: ../addressbook/libedata-book/e-data-book.c:204
+#: ../calendar/libedata-cal/e-data-cal.c:141
+msgid "Other error"
+msgstr "Ð?Ñ?Ñ?Ð³Ð° Ð³Ñ?ÐµÑ?ÐºÐ°"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:325
+#, c-format
+msgid "Cannot open book: %s"
+msgstr "Ð?Ð´Ñ?ÐµÑ?Ð½Ð¸ÐºÑ?Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¾Ñ?Ð²Ð¾Ñ?Ð¸: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:347
+#, c-format
+msgid "Cannot remove book: %s"
+msgstr "Ð?Ð´Ñ?ÐµÑ?Ð½Ð¸ÐºÑ?Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð°Ñ?Ð½Ðµ: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:364
+#: ../addressbook/libedata-book/e-data-book.c:383
+#, c-format
+msgid "Cannot get contact: %s"
+msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?Ñ?Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð»Ñ?Ñ?Ð¸: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:402
+#, c-format
+msgid "Empty query: %s"
+msgstr "Ð?Ñ?Ð°Ð·Ð½Ð° Ð·Ð°Ñ?Ð²ÐºÐ°: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:418
+#, c-format
+msgid "Cannot get contact list: %s"
+msgstr "Ð¡Ð¿Ð¸Ñ?Ñ?ÐºÑ?Ñ? Ñ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð»Ñ?Ñ?Ð¸: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:457
+#, c-format
+msgid "Cannot authenticate user: %s"
+msgstr "Ð?Ð¾Ñ?Ñ?ÐµÐ±Ð¸Ñ?ÐµÐ»Ñ?Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸Ñ?Ð¸Ñ?Ð°: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:472
+#: ../addressbook/libedata-book/e-data-book.c:491
+#, c-format
+msgid "Cannot add contact: %s"
+msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?Ñ?Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð´Ð¾Ð±Ð°Ð²Ð¸: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:513
+#: ../addressbook/libedata-book/e-data-book.c:532
+#, c-format
+msgid "Cannot modify contact: %s"
+msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?Ñ?Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ð¸: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:571
+#, c-format
+msgid "Cannot remove contacts: %s"
+msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?Ð¸Ñ?Ðµ Ð½Ðµ Ð¼Ð¾Ð³Ð°Ñ? Ð´Ð° Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð°Ñ?Ð½Ð°Ñ?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:610
+#, c-format
+msgid "Cannot get supported fields: %s"
+msgstr "Ð?Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð°Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ð»ÐµÑ?Ð° Ð½Ðµ Ð¼Ð¾Ð³Ð°Ñ? Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ñ?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:625
+#, c-format
+msgid "Cannot get required fields: %s"
+msgstr "Ð?Ð°Ð´Ñ?Ð»Ð¶Ð¸Ñ?ÐµÐ»Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ð»ÐµÑ?Ð° Ð½Ðµ Ð¼Ð¾Ð³Ð°Ñ? Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ñ?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:640
+#, c-format
+msgid "Cannot get supported authentication methods: %s"
+msgstr "Ð?Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð°Ð½Ð¸Ñ?Ðµ Ð¼ÐµÑ?Ð¾Ð´Ð¸ Ð·Ð° Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½Ðµ Ð½Ðµ Ð¼Ð¾Ð³Ð°Ñ? Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ñ?: %s"
+
+# FIXME Ð½ÐµÐ²Ð°Ð»Ð¸Ð´ÐµÐ½, authentication
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:666
+#: ../addressbook/libedata-book/e-data-book.c:677
+#, c-format
+msgid "Invalid query: %s"
+msgstr "Ð?Ñ?ÐµÑ?Ð½Ð° Ð·Ð°Ñ?Ð²ÐºÐ°: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:713
+#, c-format
+msgid "Cannot get changes: %s"
+msgstr "Ð?Ñ?Ð¾Ð¼ÐµÐ½Ð¸Ñ?Ðµ Ð½Ðµ Ð¼Ð¾Ð³Ð°Ñ? Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ñ?: %s"
+
+# FIXME Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ? -> Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:755
+#, c-format
+msgid "Cancel operation failed: %s"
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð° Ð¾Ñ?Ð¼Ñ?Ð½Ð° Ð½Ð° Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸ÐµÑ?Ð¾: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:521
+#, c-format
+msgid "Server is unreachable (%s)"
+msgstr "Ð¡Ñ?Ñ?Ð²Ñ?Ñ?Ñ?Ñ? Ðµ Ð½ÐµÐ´Ð¾Ñ?Ñ?Ñ?Ð¿ÐµÐ½ (%s)"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:549
+#, fuzzy, c-format
+msgid "Unexpected HTTP status code %d returned (%s)"
+msgstr ""
+"Ð?ÐµÐ¾Ñ?Ð°ÐºÐ²Ð°Ð½Ð¾ Ñ?Ñ?Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ Ð¾Ñ? GnuPG:\n"
+"\n"
+"%s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2096
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2496
+#, c-format
+msgid ""
+"Server is unreachable, calendar is opened in read-only mode.\n"
+"Error message: %s"
+msgstr ""
+"Ð¡Ñ?Ñ?Ð²Ñ?Ñ?Ñ?Ñ? Ðµ Ð½ÐµÐ´Ð¾Ñ?Ñ?Ñ?Ð¿ÐµÐ½ Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?Ñ? Ðµ Ð¾Ñ?Ð²Ð¾Ñ?ÐµÐ½ Ð² Ñ?ÐµÐ¶Ð¸Ð¼ Ñ?Ð°Ð¼Ð¾ Ð·Ð° Ñ?ÐµÑ?ÐµÐ½Ðµ.\n"
+"Ð¡Ñ?Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ Ð·Ð° Ð³Ñ?ÐµÑ?ÐºÐ°: %s"
 
-#: ../addressbook/libedata-book/e-data-book.c:699
-msgid "Cannot complete operation"
-msgstr "Ð?Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?Ñ?Ð° Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð·Ð°Ð²Ñ?Ñ?Ñ?Ð¸"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247
+msgid "Calendar doesn't support Free/Busy"
+msgstr "Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?Ñ? Ð½Ðµ Ð¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð° Ñ?Ñ?Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ñ?Ñ?Ð° â??Ð¡Ð²Ð¾Ð±Ð¾Ð´ÐµÐ½â??/â??Ð?Ð°ÐµÑ?â??"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
-#: ../libedataserver/e-categories.c:46
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:725
 msgid "Birthday"
 msgstr "Ð?Ð°Ñ?Ð° Ð½Ð° Ñ?Ð°Ð¶Ð´Ð°Ð½Ðµ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:746
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:754
 #, c-format
 msgid "Birthday: %s"
 msgstr "Ð?Ð°Ñ?Ð° Ð½Ð° Ñ?Ð°Ð¶Ð´Ð°Ð½Ðµ: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:770
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:778
 #, c-format
 msgid "Anniversary: %s"
 msgstr "Ð?Ð¾Ð´Ð¸Ñ?Ð½Ð¸Ð½Ð°: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:236
+#: ../calendar/backends/file/e-cal-backend-file.c:251
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "Ð?Ð°Ð½Ð½Ð¸Ñ?Ðµ Ð·Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð½Ðµ Ð¼Ð¾Ð³Ð°Ñ? Ð´Ð° Ð±Ñ?Ð´Ð°Ñ? Ð·Ð°Ð¿Ð°Ð·ÐµÐ½Ð¸: Ð½ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»ÐµÐ½ Ð°Ð´Ñ?ÐµÑ?."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:243
-#: ../calendar/backends/file/e-cal-backend-file.c:249
+#: ../calendar/backends/file/e-cal-backend-file.c:258
+#: ../calendar/backends/file/e-cal-backend-file.c:264
 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:2121
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2101
 msgid "Reply Requested: by "
 msgstr "Ð?Ð·Ð¸Ñ?ÐºÐ²Ð° Ñ?Ðµ Ð¾Ñ?Ð³Ð¾Ð²Ð¾Ñ?: Ð´Ð¾ "
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2126
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2106
 msgid "Reply Requested: When convenient"
 msgstr "Ð?Ð·Ð¸Ñ?ÐºÐ²Ð° Ñ?Ðµ Ð¾Ñ?Ð³Ð¾Ð²Ð¾Ñ?: ÐºÐ¾Ð³Ð°Ñ?Ð¾ Ðµ Ñ?Ð´Ð¾Ð±Ð½Ð¾"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:283
-#, c-format
-msgid "Loading %s items"
-msgstr "Ð?Ð°Ñ?ÐµÐ¶Ð´Ð°Ð½Ðµ Ð½Ð° %s Ð¾Ð±ÐµÐºÑ?Ð°"
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:329
+msgid "Loading Appointment items"
+msgstr "Ð?Ð°Ñ?ÐµÐ¶Ð´Ð°Ð½Ðµ Ð½Ð° Ñ?Ñ?ÐµÑ?Ð¸Ñ?Ðµ"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:331
+msgid "Loading Task items"
+msgstr "Ð?Ð°Ñ?ÐµÐ¶Ð´Ð°Ð½Ðµ Ð½Ð° Ð·Ð°Ð´Ð°Ñ?Ð¸Ñ?Ðµ"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:333
+msgid "Loading Note items"
+msgstr "Ð?Ð°Ñ?ÐµÐ¶Ð´Ð°Ð½Ðµ Ð½Ð° Ð±ÐµÐ»ÐµÐ¶ÐºÐ¸Ñ?Ðµ"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:919
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:335
+msgid "Loading items"
+msgstr "Ð?Ð°Ñ?ÐµÐ¶Ð´Ð°Ð½Ðµ Ð½Ð° Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ð¾Ð½Ð½Ð¸ Ð¾Ð±ÐµÐºÑ?Ð¸"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:951
 msgid "Calendar"
 msgstr "Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ?"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:977
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1014
 msgid "Invalid server URI"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ñ?Ñ? Ð½Ð° Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ðµ Ð½ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»ÐµÐ½"
 
-#: ../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:1334
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1370
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1385
-#: ../camel/providers/groupwise/camel-groupwise-store.c:591
-#: ../camel/providers/groupwise/camel-groupwise-store.c:766
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:181
-msgid "Authentication failed"
-msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½ÐµÑ?Ð¾"
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1115
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1361
+#: ../calendar/backends/http/e-cal-backend-http.c:783
+#: ../calendar/backends/weather/e-cal-backend-weather.c:520
+msgid "Could not create cache file"
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ñ?Ð°Ð¹Ð» Ñ? ÐºÐµÑ?"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1127
+msgid "Could not create thread for populating cache"
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð½Ð¸Ñ?ÐºÐ° Ð·Ð° Ð¿Ñ?Ñ?Ð²Ð¾Ð½Ð°Ñ?Ð°Ð»Ð½Ð¾ Ð·Ð°Ð¿Ñ?Ð»Ð²Ð°Ð½Ðµ Ð½Ð° ÐºÐµÑ?Ð°"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:335
+#: ../calendar/backends/http/e-cal-backend-http.c:423
 msgid "Redirected to Invalid URI"
 msgstr "Ð?Ñ?ÐµÐ½Ð°Ñ?Ð¾Ñ?ÐµÐ½Ð¾ ÐºÑ?Ð¼ Ð½ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»ÐµÐ½ Ð°Ð´Ñ?ÐµÑ?"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:358
+#: ../calendar/backends/http/e-cal-backend-http.c:456
 msgid "Bad file format."
 msgstr "Ð¤Ð°Ð¹Ð» Ð² Ð½ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»ÐµÐ½ Ñ?Ð¾Ñ?Ð¼Ð°Ñ?."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:365
+#: ../calendar/backends/http/e-cal-backend-http.c:463
 msgid "Not a calendar."
 msgstr "Ð?Ðµ Ðµ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?."
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:152
+#: ../calendar/backends/weather/e-cal-backend-weather.c:186
 msgid "Could not retrieve weather data"
 msgstr "Ð?Ð°Ð½Ð½Ð¸Ñ?Ðµ Ð·Ð° Ð²Ñ?ÐµÐ¼ÐµÑ?Ð¾ Ð½Ðµ Ð¼Ð¾Ð³Ð°Ñ? Ð´Ð° Ð±Ñ?Ð´Ð°Ñ? Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
 msgid "Weather: Fog"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ: Ð¼Ñ?Ð³Ð»Ð°"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
 msgid "Weather: Cloudy Night"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ: Ð¾Ð±Ð»Ð°Ñ?Ð½Ð° Ð²ÐµÑ?ÐµÑ?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
 msgid "Weather: Cloudy"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ: Ð¾Ð±Ð»Ð°Ñ?Ð½Ð¾"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
 msgid "Weather: Overcast"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ: Ð¿Ð»Ñ?Ñ?Ð½Ð° Ð¾Ð±Ð»Ð°Ñ?Ð½Ð¾Ñ?Ñ?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
 msgid "Weather: Showers"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ: Ð²Ð°Ð»ÐµÐ¶Ð¸ Ñ? Ð¿Ñ?ÐµÐºÑ?Ñ?Ð²Ð°Ð½Ð¸Ñ?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:256
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
 msgid "Weather: Snow"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ: Ñ?Ð½Ñ?Ð³"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:257
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
 msgid "Weather: Clear Night"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ: Ñ?Ñ?Ð½Ð° Ð²ÐµÑ?ÐµÑ?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:258
+#: ../calendar/backends/weather/e-cal-backend-weather.c:293
 msgid "Weather: Sunny"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ: Ñ?Ð»Ñ?Ð½Ñ?ÐµÐ²Ð¾"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:259
+#: ../calendar/backends/weather/e-cal-backend-weather.c:294
 msgid "Weather: Thunderstorms"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ: Ð³Ñ?Ñ?Ð¼Ð¾Ñ?ÐµÐ²Ð¸Ñ?Ð½Ð¸ Ð±Ñ?Ñ?Ð¸"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:405
+#: ../calendar/backends/weather/e-cal-backend-weather.c:440
 msgid "Forecast"
 msgstr "Ð?Ñ?Ð¾Ð³Ð½Ð¾Ð·Ð°"
 
-#: ../calendar/libecal/e-cal-component.c:1286
+#: ../calendar/libecal/e-cal-component.c:1299
 msgid "Untitled appointment"
 msgstr "Ð¡Ñ?ÐµÑ?Ð° Ð±ÐµÐ· Ð·Ð°Ð³Ð»Ð°Ð²Ð¸Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:3951
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "1st"
 msgstr "1-Ð²Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3952
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "2nd"
 msgstr "2-Ñ?Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3953
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "3rd"
 msgstr "3-Ñ?Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3954
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "4th"
 msgstr "4-Ñ?Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3955
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "5th"
 msgstr "5-Ñ?Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3956
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "6th"
 msgstr "6-Ñ?Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3957
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "7th"
 msgstr "7-Ð¼Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3958
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "8th"
 msgstr "8-Ð¼Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3959
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "9th"
 msgstr "9-Ñ?Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3960
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "10th"
 msgstr "10-Ñ?Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3961
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "11th"
 msgstr "11-Ñ?Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3962
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "12th"
 msgstr "12-Ñ?Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3963
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "13th"
 msgstr "13-Ñ?Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3964
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "14th"
 msgstr "14-Ñ?Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3965
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "15th"
 msgstr "15-Ñ?Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3966
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "16th"
 msgstr "16-Ñ?Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3967
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "17th"
 msgstr "17-Ñ?Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3968
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "18th"
 msgstr "18-Ñ?Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3969
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "19th"
 msgstr "19-Ñ?Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3970
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "20th"
 msgstr "20-Ñ?Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3971
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "21st"
 msgstr "21-Ð²Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3972
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "22nd"
 msgstr "22-Ñ?Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3973
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "23rd"
 msgstr "23-Ñ?Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3974
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "24th"
 msgstr "24-Ñ?Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3975
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "25th"
 msgstr "25-Ñ?Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3976
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "26th"
 msgstr "26-Ñ?Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3977
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "27th"
 msgstr "27-Ð¼Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3978
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "28th"
 msgstr "28-Ð¼Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3979
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "29th"
 msgstr "29-Ñ?Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3980
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "30th"
 msgstr "30-Ñ?Ð¸"
 
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "31st"
 msgstr "31-Ð²Ð¸"
 
-#: ../calendar/libecal/e-cal-util.c:688 ../calendar/libecal/e-cal-util.c:715
+#: ../calendar/libecal/e-cal-util.c:678 ../calendar/libecal/e-cal-util.c:705
 msgid "High"
 msgstr "Ð?Ð¸Ñ?Ð¾Ðº"
 
-#: ../calendar/libecal/e-cal-util.c:690 ../calendar/libecal/e-cal-util.c:717
+#: ../calendar/libecal/e-cal-util.c:680 ../calendar/libecal/e-cal-util.c:707
 msgid "Normal"
 msgstr "Ð?Ð¾Ñ?Ð¼Ð°Ð»ÐµÐ½"
 
-#: ../calendar/libecal/e-cal-util.c:692 ../calendar/libecal/e-cal-util.c:719
+#: ../calendar/libecal/e-cal-util.c:682 ../calendar/libecal/e-cal-util.c:709
 msgid "Low"
 msgstr "Ð?Ð¸Ñ?Ñ?Ðº"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:713
+#: ../calendar/libecal/e-cal-util.c:703
 msgid "Undefined"
 msgstr "Ð?ÐµÐ¾Ð¿Ñ?ÐµÐ´ÐµÐ»ÐµÐ½"
 
-#: ../calendar/libecal/e-cal.c:1173 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1236 ../libedataserverui/e-book-auth-util.c:206
+#: ../libedataserverui/e-book-auth-util.c:440
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Ð?Ñ?Ð²ÐµÐ´ÐµÑ?Ðµ Ð¿Ð°Ñ?Ð¾Ð»Ð° Ð·Ð° %s (Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð¸Ñ?ÐµÐ» â??%sâ??)"
@@ -974,108 +1228,83 @@ msgstr "Ð?Ñ?Ð²ÐµÐ´ÐµÑ?Ðµ Ð¿Ð°Ñ?Ð¾Ð»Ð° Ð·Ð° %s (Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð¸Ñ?ÐµÐ» â??%sâ??)"
 #. This password prompt will be prompted rarely. Since the key that is passed to
 #. the auth_func corresponds to the parent user.
 #.
-#: ../calendar/libecal/e-cal.c:1187
+#: ../calendar/libecal/e-cal.c:1250
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr ""
 "Ð?Ñ?Ð²ÐµÐ´ÐµÑ?Ðµ Ð¿Ð°Ñ?Ð¾Ð»Ð° Ð·Ð° %s, Ð·Ð° Ð´Ð° Ð²ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ðµ Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð°-Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸Ðº Ð·Ð° Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð¸Ñ?ÐµÐ»Ñ? â??%sâ??"
 
-#: ../calendar/libecal/e-cal.c:3992
-msgid "Invalid argument"
-msgstr "Ð?Ñ?ÐµÑ?ÐµÐ½ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ?"
-
-#: ../calendar/libecal/e-cal.c:3994
+#: ../calendar/libecal/e-cal.c:4145
 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:4147
 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:4149
 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:4151 ../calendar/libedata-cal/e-data-cal.c:112
 #: ../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:4153 ../calendar/libedata-cal/e-data-cal.c:113
 #: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "Ð?ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»ÐµÐ½ Ð¾Ð±ÐµÐºÑ?"
 
-#: ../calendar/libecal/e-cal.c:4004
+#: ../calendar/libecal/e-cal.c:4155
 msgid "URI not loaded"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ñ?Ñ? Ð½Ðµ Ðµ Ð·Ð°Ñ?ÐµÐ´ÐµÐ½"
 
-#: ../calendar/libecal/e-cal.c:4006
+#: ../calendar/libecal/e-cal.c:4157
 msgid "URI already loaded"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ñ?Ñ? Ð²ÐµÑ?Ðµ Ðµ Ð·Ð°Ñ?ÐµÐ´ÐµÐ½"
 
-#: ../calendar/libecal/e-cal.c:4008
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
-msgid "Permission denied"
-msgstr "Ð?Ð¾Ñ?Ñ?Ñ?Ð¿Ñ?Ñ? Ðµ Ð¾Ñ?ÐºÐ°Ð·Ð°Ð½"
-
-#: ../calendar/libecal/e-cal.c:4010
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
-#: ../servers/groupwise/e-gw-connection.c:237
+#: ../calendar/libecal/e-cal.c:4161 ../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:4163 ../calendar/libedata-cal/e-data-cal.c:114
 msgid "Object ID already exists"
 msgstr "Ð?Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ?Ñ?Ñ? Ð½Ð° Ð¾Ð±ÐµÐºÑ?Ð° Ð²ÐµÑ?Ðµ Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?Ð²Ð°"
 
-#: ../calendar/libecal/e-cal.c:4014
+#: ../calendar/libecal/e-cal.c:4165
 msgid "Protocol not supported"
 msgstr "Ð?Ñ?Ð¾Ñ?Ð¾ÐºÐ¾Ð»Ñ?Ñ? Ð½Ðµ Ñ?Ðµ Ð¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð°"
 
-#: ../calendar/libecal/e-cal.c:4016
+#: ../calendar/libecal/e-cal.c:4167
 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:4169
 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:4171
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1306
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1324
+#: ../camel/providers/groupwise/camel-groupwise-store.c:628
+#: ../camel/providers/groupwise/camel-groupwise-store.c:810
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:87
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#, c-format
+msgid "Authentication failed"
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½ÐµÑ?Ð¾"
+
+#: ../calendar/libecal/e-cal.c:4173
+#: ../camel/providers/smtp/camel-smtp-transport.c:775
 msgid "Authentication required"
 msgstr "Ð?Ð·Ð¸Ñ?ÐºÐ²Ð° Ñ?Ðµ Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½Ðµ"
 
-#: ../calendar/libecal/e-cal.c:4024
-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
-#: ../servers/groupwise/e-gw-connection.c:243
-msgid "Unknown error"
-msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ð° Ð³Ñ?ÐµÑ?ÐºÐ°"
+#: ../calendar/libecal/e-cal.c:4175
+msgid "A D-Bus exception has occurred"
+msgstr "Ð?Ñ?Ð·Ð½Ð¸ÐºÐ½Ð° Ð¸Ð·ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ðµ Ð½Ð° D-Bus"
 
-#: ../calendar/libecal/e-cal.c:4028
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
+#: ../calendar/libecal/e-cal.c:4179
 msgid "No error"
 msgstr "Ð?Ñ?Ð¼Ð° Ð³Ñ?ÐµÑ?ÐºÐ°"
 
@@ -1173,230 +1402,238 @@ msgstr ""
 "â??%sâ?? Ð¾Ñ?Ð°ÐºÐ²Ð° Ð²Ñ?Ð¸Ñ?ÐºÐ¸ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ?Ð¸ Ð´Ð° Ñ?Ð° Ð½Ð¸Ð·Ð¾Ð²Ðµ Ð¸Ð»Ð¸ Ñ?Ð¾Ñ?Ð½Ð¾ ÐµÐ´Ð¸Ð½ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ? Ð´Ð° Ð±Ñ?Ð´Ðµ "
 "Ð±Ñ?Ð»ÐµÐ²Ð°Ñ?Ð° Ñ?Ñ?Ð¾Ð¹Ð½Ð¾Ñ?Ñ? â??Ð»Ñ?Ð¶Ð°â?? (#f)"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+#: ../calendar/libedata-cal/e-data-cal.c:111
 msgid "Invalid range"
 msgstr "Ð?ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»ÐµÐ½ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
-msgid "Unsupported field"
-msgstr "Ð?ÐµÐ¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð°Ð½Ð¾ Ð¿Ð¾Ð»Ðµ"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-data-cal.c:118
 msgid "Unsupported method"
 msgstr "Ð?ÐµÐ¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð°Ð½ Ð¼ÐµÑ?Ð¾Ð´"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
-msgid "Unsupported authentication method"
-msgstr "Ð?ÐµÐ¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð°Ð½ Ð¼ÐµÑ?Ð¾Ð´ Ð·Ð° Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½Ðµ"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-msgid "TLS not available"
-msgstr "Ð?Ð¸Ð¿Ñ?Ð²Ð° TLS"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-msgid "Offline mode unavailable"
-msgstr "Ð?Ð¸Ð¿Ñ?Ð²Ð° Ñ?ÐµÐ¶Ð¸Ð¼ â??Ð?Ð·ÐºÐ»Ñ?Ñ?ÐµÐ½â??"
+#: ../calendar/libedata-cal/e-data-cal.c:121
+msgid "Calendar does not exist"
+msgstr "Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?Ñ? Ð½Ðµ Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?Ð²Ð°"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-msgid "Search size limit exceeded"
-msgstr "Ð?Ð°ÐºÑ?Ð¸Ð¼Ð°Ð»Ð½Ð¸Ñ?Ñ? Ñ?Ð°Ð·Ð¼ÐµÑ? Ð·Ð° Ñ?Ñ?Ñ?Ñ?ÐµÐ½Ðµ Ðµ Ð½Ð°Ð´Ð²Ð¸Ñ?ÐµÐ½"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-msgid "Search time limit exceeded"
-msgstr "Ð?Ð°ÐºÑ?Ð¸Ð¼Ð°Ð»Ð½Ð¾Ñ?Ð¾ Ð²Ñ?ÐµÐ¼Ðµ Ð·Ð° Ñ?Ñ?Ñ?Ñ?ÐµÐ½Ðµ Ðµ Ð½Ð°Ð´Ð²Ð¸Ñ?ÐµÐ½Ð¾"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
-msgid "Query refused"
-msgstr "Ð?Ð°Ñ?Ð²ÐºÐ°Ñ?Ð° Ðµ Ð¾Ñ?ÐºÐ°Ð·Ð°Ð½Ð°"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
-msgid "Invalid server version"
-msgstr "Ð?ÐµÐ²Ð°Ð»Ð¸Ð´Ð½Ð° Ð²ÐµÑ?Ñ?Ð¸Ñ? Ð½Ð° Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð°"
+#: ../calendar/libedata-cal/e-data-cal.c:122
+msgid "Unknown user"
+msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?ÐµÐ½ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð¸Ñ?ÐµÐ»"
 
-#: ../calendar/libedata-cal/e-data-cal.c:491
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:608
 #, c-format
-msgid "Cannot retrieve calendar address"
-msgstr "Ð?Ð´Ñ?ÐµÑ?Ñ?Ñ? Ð½Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð»Ñ?Ñ?Ð¸"
+msgid "Cannot retrieve calendar address: %s"
+msgstr "Ð?Ð´Ñ?ÐµÑ?Ñ?Ñ? Ð½Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð»Ñ?Ñ?Ð¸: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:509
-#, c-format
-msgid "Cannot retrieve calendar alarm e-mail address"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:633
+#, fuzzy, c-format
+msgid "Cannot retrieve calendar alarm e-mail address: %s"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ñ?Ñ? Ð½Ð° Ðµ-Ð¿Ð¾Ñ?Ð° Ð·Ð° Ð°Ð»Ð°Ñ?Ð¼Ð° Ð½Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð»Ñ?Ñ?Ð¸"
 
-#: ../calendar/libedata-cal/e-data-cal.c:527
-#, c-format
-msgid "Cannot retrieve calendar's ldap attribute"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:658
+#, fuzzy, c-format
+msgid "Cannot retrieve calendar's LDAP attribute: %s"
 msgstr "Ð?Ñ?Ñ?Ð¸Ð±Ñ?Ñ?Ñ?Ñ? Ð½Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð·Ð° ldap Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð»Ñ?Ñ?Ð¸"
 
-#: ../calendar/libedata-cal/e-data-cal.c:545
-#, c-format
-msgid "Cannot retrieve calendar scheduling information"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:683
+#, fuzzy, c-format
+msgid "Cannot retrieve calendar scheduling information: %s"
 msgstr "Ð?Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?Ñ?Ð° Ð·Ð° Ð¿Ð»Ð°Ð½Ð¸Ñ?Ð°Ð½Ð¸Ñ?Ðµ Ñ?Ñ?Ð±Ð¸Ñ?Ð¸Ñ? Ð² ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð»Ñ?Ñ?Ð¸"
 
-#: ../calendar/libedata-cal/e-data-cal.c:562
-#, c-format
-msgid "Cannot open calendar"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:707
+#, fuzzy, c-format
+msgid "Cannot open calendar: %s"
 msgstr "Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¾Ñ?Ð²Ð¾Ñ?Ð¸"
 
-#: ../calendar/libedata-cal/e-data-cal.c:579
-#, c-format
-msgid "Cannot refresh calendar"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:728
+#, fuzzy, c-format
+msgid "Cannot refresh calendar: %s"
 msgstr "Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¾Ð±Ð½Ð¾Ð²Ð¸"
 
-#: ../calendar/libedata-cal/e-data-cal.c:596
-#, c-format
-msgid "Cannot remove calendar"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:747
+#, fuzzy, c-format
+msgid "Cannot remove calendar: %s"
 msgstr "Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð°Ñ?Ð½Ðµ"
 
-#: ../calendar/libedata-cal/e-data-cal.c:615
-#, c-format
-msgid "Cannot create calendar object"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:768
+#, fuzzy, c-format
+msgid "Cannot create calendar object: %s"
 msgstr "Ð?Ð±ÐµÐºÑ?Ñ?Ñ? Ð½Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ñ?Ñ?Ð·Ð´Ð°Ð´Ðµ"
 
-#: ../calendar/libedata-cal/e-data-cal.c:637
-#, c-format
-msgid "Cannot modify calendar object"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:796
+#, fuzzy, c-format
+msgid "Cannot modify calendar object: %s"
 msgstr "Ð?Ð±ÐµÐºÑ?Ñ?Ñ? Ð½Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ð¸"
 
-#: ../calendar/libedata-cal/e-data-cal.c:661
-#, c-format
-msgid "Cannot remove calendar object"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:822
+#, fuzzy, c-format
+msgid "Cannot remove calendar object: %s"
 msgstr "Ð?Ð±ÐµÐºÑ?Ñ?Ñ? Ð½Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ñ?ÐµÐ¼Ð°Ñ?Ð½Ðµ"
 
-#: ../calendar/libedata-cal/e-data-cal.c:680
-#, c-format
-msgid "Cannot receive calendar objects"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:843
+#, fuzzy, c-format
+msgid "Cannot receive calendar objects: %s"
 msgstr "Ð?Ð±ÐµÐºÑ?Ð¸Ñ?Ðµ Ð½Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð½Ðµ Ð¼Ð¾Ð³Ð°Ñ? Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ñ?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:697
-#, c-format
-msgid "Cannot discard calendar alarm"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:862
+#, fuzzy, c-format
+msgid "Cannot discard calendar alarm: %s"
 msgstr "Ð?Ð»Ð°Ñ?Ð¼Ð°Ñ?Ð° Ð½Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¾Ñ?ÐºÐ°Ð¶Ðµ"
 
-#: ../calendar/libedata-cal/e-data-cal.c:716
-#, c-format
-msgid "Cannot send calendar objects"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:883
+#, fuzzy, c-format
+msgid "Cannot send calendar objects: %s"
 msgstr "Ð?Ð±ÐµÐºÑ?Ð¸Ñ?Ðµ Ð½Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ð½Ðµ Ð¼Ð¾Ð³Ð°Ñ? Ð´Ð° Ñ?Ðµ Ð¸Ð·Ð¿Ñ?Ð°Ñ?Ñ?Ñ?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:751
-#, c-format
-msgid "Cannot retrieve default calendar object path"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:910
+#, fuzzy, c-format
+msgid "Cannot retrieve default calendar object path: %s"
 msgstr "Ð¡Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?Ð½Ð¸Ñ?Ñ? Ð¿Ñ?Ñ? Ð´Ð¾ Ð¾Ð±ÐµÐºÑ?Ð¸Ñ?Ðµ Ð½Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð»Ñ?Ñ?Ð¸"
 
-#: ../calendar/libedata-cal/e-data-cal.c:769
-#, c-format
-msgid "Cannot retrieve calendar object path"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:935
+#, fuzzy, c-format
+msgid "Cannot retrieve calendar object path: %s"
 msgstr "Ð?Ñ?Ñ?Ñ?Ñ? Ð´Ð¾ Ð¾Ð±ÐµÐºÑ?Ð¸Ñ?Ðµ Ð½Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð»Ñ?Ñ?Ð¸"
 
-#: ../calendar/libedata-cal/e-data-cal.c:787
-#, c-format
-msgid "Cannot retrieve calendar object list"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:960
+#, fuzzy, c-format
+msgid "Cannot retrieve calendar object list: %s"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ñ?ÐºÑ?Ñ? Ð½Ð° Ð¾Ð±ÐµÐºÑ?Ð¸Ñ?Ðµ Ð½Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð»Ñ?Ñ?Ð¸"
 
-#: ../calendar/libedata-cal/e-data-cal.c:825
-#, c-format
-msgid "Could not retrieve attachment list"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:988
+#, fuzzy, c-format
+msgid "Could not retrieve attachment list: %s"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ñ?ÐºÑ?Ñ? Ñ? Ð¿Ñ?Ð¸ÐºÐ°Ñ?ÐµÐ½Ð¸ Ñ?Ð°Ð¹Ð»Ð¾Ð²Ðµ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð»Ñ?Ñ?Ð¸"
 
-#: ../calendar/libedata-cal/e-data-cal.c:847
-#, c-format
-msgid "Could not complete calendar query"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1014
+#, fuzzy, c-format
+msgid "Could not complete calendar query: %s"
 msgstr "Ð?Ð°Ñ?Ð²ÐºÐ°Ñ?Ð° ÐºÑ?Ð¼ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð·Ð°Ð²Ñ?Ñ?Ñ?Ð¸"
 
-#: ../calendar/libedata-cal/e-data-cal.c:865
-#, c-format
-msgid "Could not retrieve calendar time zone"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1039
+#, fuzzy, c-format
+msgid "Could not retrieve calendar time zone: %s"
 msgstr "Ð§Ð°Ñ?Ð¾Ð²Ð¸Ñ?Ñ? Ð¿Ð¾Ñ?Ñ? Ð½Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð»Ñ?Ñ?Ð¸"
 
-#: ../calendar/libedata-cal/e-data-cal.c:883
-#, c-format
-msgid "Could not add calendar time zone"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1064
+#, fuzzy, c-format
+msgid "Could not add calendar time zone: %s"
 msgstr "Ð§Ð°Ñ?Ð¾Ð²Ð¸Ñ?Ñ? Ð¿Ð¾Ñ?Ñ? Ð½Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð´Ð¾Ð±Ð°Ð²Ð¸"
 
-#: ../calendar/libedata-cal/e-data-cal.c:900
-#, c-format
-msgid "Could not set default calendar time zone"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1083
+#, fuzzy, c-format
+msgid "Could not set default calendar time zone: %s"
 msgstr "Ð¡Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?Ð½Ð¸Ñ?Ñ? Ñ?Ð°Ñ?Ð¾Ð²Ð¸ Ð¿Ð¾Ñ?Ñ? Ð·Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð·Ð°Ð´Ð°Ð´Ðµ"
 
-#: ../calendar/libedata-cal/e-data-cal.c:921
-#, c-format
-msgid "Cannot retrieve calendar changes"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1106
+#, fuzzy, c-format
+msgid "Cannot retrieve calendar changes: %s"
 msgstr "Ð?Ñ?Ð¾Ð¼ÐµÐ½Ð¸Ñ?Ðµ Ð² ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð½Ðµ Ð¼Ð¾Ð³Ð°Ñ? Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ñ?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:971
-#, c-format
-msgid "Cannot retrieve calendar free/busy list"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1137
+#, fuzzy, c-format
+msgid "Cannot retrieve calendar free/busy list: %s"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ñ?ÐºÑ?Ñ? Ð½Ð° Ð·Ð°ÐµÑ?Ð¾Ñ?Ñ?Ñ?Ð° Ñ?Ð¿Ð¾Ñ?ÐµÐ´ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð»Ñ?Ñ?Ð¸"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:339
+#: ../calendar/libedata-cal/e-data-cal-factory.c:375
 #, c-format
 msgid "Invalid URI"
 msgstr "Ð?ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»ÐµÐ½ Ð°Ð´Ñ?ÐµÑ?"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:350
+#: ../calendar/libedata-cal/e-data-cal-factory.c:393
 #, 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:443
 #, c-format
 msgid "Could not instantiate backend"
 msgstr "Ð?Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±Ñ?Ð´Ðµ Ñ?Ñ?Ð·Ð´Ð°Ð´ÐµÐ½ ÐµÐºÐ·ÐµÐ¼Ð¿Ð»Ñ?Ñ? Ð½Ð° Ñ?Ð´Ñ?Ð¾Ñ?Ð¾ Ð·Ð° Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?ÐºÐ°"
 
-#: ../camel/camel-cipher-context.c:102
+#: ../camel/camel-cipher-context.c:200
+#, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "Ð¢Ð¾Ð·Ð¸ Ñ?Ð¸Ñ?Ñ?Ñ? Ð½Ðµ Ð¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð° Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð²Ð°Ð½Ðµ "
 
-#: ../camel/camel-cipher-context.c:128
-msgid "Signing message"
-msgstr "Ð?Ð¾Ð´Ð¿Ð¸Ñ?Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾"
-
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:213
+#, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "Ð¢Ð¾Ð·Ð¸ Ñ?Ð¸Ñ?Ñ?Ñ? Ð½Ðµ Ð¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð° Ð¿Ñ?Ð¾Ð²ÐµÑ?ÐºÐ° Ð½Ð° Ð¿Ð¾Ð´Ð¿Ð¸Ñ?"
 
-#: ../camel/camel-cipher-context.c:171
-msgid "Verifying message"
-msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?ÐºÐ° Ð½Ð° Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð° Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾"
-
-#: ../camel/camel-cipher-context.c:189
+#: ../camel/camel-cipher-context.c:229
+#, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "Ð¢Ð¾Ð·Ð¸ Ñ?Ð¸Ñ?Ñ?Ñ? Ð½Ðµ Ð¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð° Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ðµ"
 
-#: ../camel/camel-cipher-context.c:215
-msgid "Encrypting message"
-msgstr "Ð¨Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾"
-
-#: ../camel/camel-cipher-context.c:232
+#: ../camel/camel-cipher-context.c:243
+#, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "Ð¢Ð¾Ð·Ð¸ Ñ?Ð¸Ñ?Ñ?Ñ? Ð½Ð° Ð¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð° Ð´ÐµÑ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ðµ"
 
-#: ../camel/camel-cipher-context.c:254
-msgid "Decrypting message"
-msgstr "Ð?ÐµÑ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾"
-
-#: ../camel/camel-cipher-context.c:271
+#: ../camel/camel-cipher-context.c:256
+#, c-format
 msgid "You may not import keys with this cipher"
 msgstr "Ð?Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð´Ð° Ð²Ð½Ð°Ñ?Ñ?Ñ?Ðµ ÐºÐ»Ñ?Ñ?Ð¾Ð²Ðµ Ñ? Ñ?Ð¾Ð·Ð¸ Ñ?Ð¸Ñ?Ñ?Ñ?"
 
-#: ../camel/camel-cipher-context.c:301
+#: ../camel/camel-cipher-context.c:270
+#, c-format
 msgid "You may not export keys with this cipher"
 msgstr "Ð?Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð´Ð° Ð¸Ð·Ð½Ð°Ñ?Ñ?Ñ?Ðµ ÐºÐ»Ñ?Ñ?Ð¾Ð²Ðµ Ñ? Ñ?Ð¾Ð·Ð¸ Ñ?Ð¸Ñ?Ñ?Ñ?"
 
-#: ../camel/camel-data-cache.c:135
+#: ../camel/camel-cipher-context.c:812
+msgid "Signing message"
+msgstr "Ð?Ð¾Ð´Ð¿Ð¸Ñ?Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾"
+
+#: ../camel/camel-cipher-context.c:1053
+msgid "Encrypting message"
+msgstr "Ð¨Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾"
+
+#: ../camel/camel-cipher-context.c:1180
+msgid "Decrypting message"
+msgstr "Ð?ÐµÑ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾"
+
+#: ../camel/camel-data-cache.c:178
+#, c-format
 msgid "Unable to create cache path"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ñ?Ñ? Ð·Ð° ÐºÐµÑ?Ð°"
 
-#: ../camel/camel-data-cache.c:401
+#: ../camel/camel-data-cache.c:496
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Ð?Ð°Ð¿Ð¸Ñ?Ñ?Ñ? Ð² ÐºÐµÑ?Ð° %s Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±Ñ?Ð´Ðµ Ð¸Ð·Ñ?Ñ?Ð¸Ñ?: %s"
 
-#: ../camel/camel-db.c:411
+#: ../camel/camel-data-wrapper.c:143
+#, c-format
+msgid "No stream available"
+msgstr "Ð?Ð¸Ð¿Ñ?Ð²Ð° Ð¿Ð¾Ñ?Ð¾Ðº"
+
+#: ../camel/camel-db.c:455
+#, c-format
 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"
@@ -1408,7 +1645,7 @@ msgstr ""
 "Ð²Ñ?Ð·Ð¾Ð±Ð½Ð¾Ð²ÐµÐ½Ð¸, ÐºÐ¾Ð³Ð°Ñ?Ð¾ Ñ?Ðµ Ð²ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ðµ Ð½Ð°Ð½Ð¾Ð²Ð¾ Ð² Ð¼Ñ?ÐµÐ¶Ð°Ñ?Ð°."
 
 #: ../camel/camel-disco-diary.c:260
-#: ../camel/providers/imap/camel-imap-journal.c:320
+#: ../camel/providers/imap/camel-imap-journal.c:300
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1419,120 +1656,130 @@ msgstr ""
 "%s\n"
 "Ð?Ð°Ð¿Ñ?Ð°Ð²ÐµÐ½Ð¸Ñ?Ðµ Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ð¸ Ð² Ñ?Ð°Ð·Ð¸ Ð¿Ð°Ð¿ÐºÐ° Ð½Ñ?Ð¼Ð° Ð´Ð° Ð±Ñ?Ð´Ð°Ñ? Ñ?Ð¸Ð½Ñ?Ñ?Ð¾Ð½Ð¸Ð·Ð¸Ñ?Ð°Ð½Ð¸."
 
-#: ../camel/camel-disco-diary.c:296
+#: ../camel/camel-disco-diary.c:304
 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:63 ../camel/camel-offline-folder.c:79
 msgid "Downloading new messages for offline mode"
 msgstr "Ð?Ð·Ñ?ÐµÐ³Ð»Ñ?Ð½Ðµ Ð½Ð° Ð½Ð¾Ð²Ð¸ Ñ?Ñ?Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ? Ð·Ð° Ñ?ÐµÐ¶Ð¸Ð¼ â??Ð?Ð·ÐºÐ»Ñ?Ñ?ÐµÐ½â??"
 
-#: ../camel/camel-disco-folder.c:466
+#: ../camel/camel-disco-folder.c:398
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Ð?Ð¾Ð´Ð³Ð¾Ñ?Ð²Ñ?Ð½Ðµ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°Ñ?Ð° â??%sâ?? Ð·Ð° Ñ?ÐµÐ¶Ð¸Ð¼ â??Ð?Ð·ÐºÐ»Ñ?Ñ?ÐµÐ½â??"
 
-#: ../camel/camel-disco-store.c:400
-#: ../camel/providers/groupwise/camel-groupwise-store.c:216
-#: ../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:464 ../camel/camel-offline-folder.c:312
+msgid "Copy folder content locally for offline operation"
+msgstr "Ð?Ð¾Ð¿Ð¸Ñ?Ð°Ð½Ðµ Ñ?Ñ?Ð´Ñ?Ñ?Ð¶Ð°Ð½Ð¸ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°Ñ?Ð° Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾ Ð·Ð° Ñ?Ð°Ð±Ð¾Ñ?Ð° Ð² Ñ?ÐµÐ¶Ð¸Ð¼ â??Ð?Ð·ÐºÐ»Ñ?Ñ?ÐµÐ½â??"
+
+#: ../camel/camel-disco-store.c:420
+#: ../camel/providers/groupwise/camel-groupwise-store.c:228
+#: ../camel/providers/imap/camel-imap-store.c:1250
+#: ../camel/providers/imap/camel-imap-store.c:1771
+#: ../camel/providers/imap/camel-imap-store.c:2244
+#: ../camel/providers/imap/camel-imap-store.c:3094
+#: ../camel/providers/imapx/camel-imapx-folder.c:298
+#: ../camel/providers/imapx/camel-imapx-folder.c:331
+#: ../camel/providers/imapx/camel-imapx-folder.c:385
+#: ../camel/providers/imapx/camel-imapx-folder.c:431
+#: ../camel/providers/imapx/camel-imapx-folder.c:465
+#: ../camel/providers/imapx/camel-imapx-folder.c:505
+#: ../camel/providers/imapx/camel-imapx-folder.c:541
+#: ../camel/providers/imapx/camel-imapx-store.c:276
+#: ../camel/providers/imapx/camel-imapx-store.c:1298
+#: ../camel/providers/imapx/camel-imapx-store.c:1386
+#: ../camel/providers/imapx/camel-imapx-store.c:1421
+#, c-format
 msgid "You must be working online to complete this operation"
 msgstr "Ð¢Ñ?Ñ?Ð±Ð²Ð° Ð´Ð° Ñ?Ñ?Ðµ Ð² Ñ?ÐµÐ¶Ð¸Ð¼ â??Ð?ÐºÐ»Ñ?Ñ?ÐµÐ½â??, Ð·Ð° Ð´Ð° Ð·Ð°Ð²Ñ?Ñ?Ñ?Ð¸Ñ?Ðµ Ñ?Ð°Ð·Ð¸ Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?"
 
-#: ../camel/camel-exception.c:260
-msgid "No description available"
-msgstr "Ð?Ð¸Ð¿Ñ?Ð²Ð° Ð¾Ð¿Ð¸Ñ?Ð°Ð½Ð¸Ðµ"
+#: ../camel/camel-file-utils.c:722
+#, c-format
+msgid "Canceled"
+msgstr "Ð?Ñ?ÐµÐºÑ?Ð°Ñ?ÐµÐ½Ð¾"
 
-#: ../camel/camel-filter-driver.c:794 ../camel/camel-filter-search.c:579
+#: ../camel/camel-filter-driver.c:817 ../camel/camel-filter-search.c:582
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð´Ñ?Ñ?ÐµÑ?ÐµÐ½ Ð¿Ñ?Ð¾Ñ?ÐµÑ? â??%sâ??: %s"
 
-#: ../camel/camel-filter-driver.c:836
+#: ../camel/camel-filter-driver.c:864
 #, 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:1051 ../camel/camel-filter-driver.c:1060
 msgid "Syncing folders"
 msgstr "Ð¡Ð¸Ð½Ñ?Ñ?Ð¾Ð½Ð¸Ð·Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ¸"
 
-#: ../camel/camel-filter-driver.c:1121 ../camel/camel-filter-driver.c:1522
+#: ../camel/camel-filter-driver.c:1148 ../camel/camel-filter-driver.c:1598
 #, 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:1159 ../camel/camel-filter-driver.c:1609
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¸Ð·Ð¿Ñ?Ð»Ð½ÐµÐ½Ð¸Ðµ Ð½Ð° Ñ?Ð¸Ð»Ñ?Ñ?Ñ?: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1216
+#: ../camel/camel-filter-driver.c:1256
+#, c-format
 msgid "Unable to open spool folder"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¾Ñ?Ð²Ð°Ñ?Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°Ñ?Ð°-Ñ?Ð¿Ñ?Ð»ÐµÑ?"
 
-#: ../camel/camel-filter-driver.c:1225
+#: ../camel/camel-filter-driver.c:1267
+#, c-format
 msgid "Unable to process spool folder"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?ÐºÐ°Ñ?Ð° Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°Ñ?Ð°-Ñ?Ð¿Ñ?Ð»ÐµÑ?"
 
-#: ../camel/camel-filter-driver.c:1241
+#: ../camel/camel-filter-driver.c:1285
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Ð?Ð¾Ð»Ñ?Ñ?Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾ %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1245
-msgid "Cannot open message"
-msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¾Ñ?Ð²Ð°Ñ?Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾"
-
-#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1264
+#: ../camel/camel-filter-driver.c:1292 ../camel/camel-filter-driver.c:1314
 #, 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:1329 ../camel/camel-filter-driver.c:1434
 msgid "Syncing folder"
 msgstr "Ð¡Ð¸Ð½Ñ?Ñ?Ð¾Ð½Ð¸Ð·Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°"
 
-#: ../camel/camel-filter-driver.c:1282 ../camel/camel-filter-driver.c:1373
+#: ../camel/camel-filter-driver.c:1334 ../camel/camel-filter-driver.c:1440
 msgid "Complete"
 msgstr "Ð?Ð°Ð²Ñ?Ñ?Ñ?ÐµÐ½Ð¾"
 
-#: ../camel/camel-filter-driver.c:1338
+#: ../camel/camel-filter-driver.c:1398
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Ð?Ð¾Ð»Ñ?Ñ?Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾ %d Ð¾Ñ? %d"
 
-#: ../camel/camel-filter-driver.c:1353
+#: ../camel/camel-filter-driver.c:1416
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¿Ð¸Ñ?Ð¼Ð¾ %d Ð¾Ñ? %d"
 
-#: ../camel/camel-filter-search.c:137
+#: ../camel/camel-filter-search.c:135
 msgid "Failed to retrieve message"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¸Ð·Ð²Ð»Ð¸Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾"
 
-#: ../camel/camel-filter-search.c:399
+#: ../camel/camel-filter-search.c:401
 msgid "Invalid arguments to (system-flag)"
 msgstr "Ð?ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»Ð½Ð¸ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ?Ð¸ ÐºÑ?Ð¼ (system-flag)"
 
-#: ../camel/camel-filter-search.c:414
+#: ../camel/camel-filter-search.c:416
 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:744 ../camel/camel-filter-search.c:753
 #, 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:342 ../camel/camel-folder-search.c:453
+#: ../camel/camel-folder-search.c:624
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1541,8 +1788,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:354 ../camel/camel-folder-search.c:465
+#: ../camel/camel-folder-search.c:636
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1551,73 +1798,79 @@ msgstr ""
 "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¸Ð·Ð¿Ñ?Ð»Ð½ÐµÐ½Ð¸Ðµ Ð½Ð° Ð¸Ð·Ñ?Ð°Ð·a Ð·Ð° Ñ?Ñ?Ñ?Ñ?ÐµÐ½Ðµ: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:852
+#: ../camel/camel-folder-search.c:840 ../camel/camel-folder-search.c:882
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) Ð¸Ð·Ð¸Ñ?ÐºÐ²Ð° ÐµÐ´Ð¸Ð½Ð¸Ñ?ÐµÐ½ Ð±Ñ?Ð»ÐµÐ² Ñ?ÐµÐ·Ñ?Ð»Ñ?Ð°Ñ?"
 
-#: ../camel/camel-folder-search.c:905
+#: ../camel/camel-folder-search.c:935
 #, 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:941 ../camel/camel-folder-search.c:948
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) Ð¸Ð·Ð¸Ñ?ÐºÐ²Ð° Ð½Ð¸Ð· Ð·Ð° Ñ?Ñ?Ð²Ð¿Ð°Ð´Ð°Ð½Ðµ"
 
-#: ../camel/camel-folder-search.c:945
+#: ../camel/camel-folder-search.c:975
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) Ð¾Ñ?Ð°ÐºÐ²Ð° Ñ?ÐµÐ·Ñ?Ð»Ñ?Ð°Ñ?-Ð¼Ð°Ñ?Ð¸Ð²"
 
-#: ../camel/camel-folder-search.c:954
+#: ../camel/camel-folder-search.c:984
 #, 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"
-
-#: ../camel/camel-folder.c:1574
-#: ../camel/providers/local/camel-maildir-folder.c:387
+#: ../camel/camel-folder.c:216
+#, 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:240
+#, 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:266
+#, fuzzy, c-format
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "Ð¤Ð¸Ð»Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Ð½Ð¾Ð²Ð¾(Ð¸) Ð¿Ð¸Ñ?Ð¼Ð¾(Ð°)"
+msgstr[1] "Ð¤Ð¸Ð»Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Ð½Ð¾Ð²Ð¾(Ð¸) Ð¿Ð¸Ñ?Ð¼Ð¾(Ð°)"
+
+#: ../camel/camel-folder.c:875
+#: ../camel/providers/local/camel-maildir-folder.c:293
 msgid "Moving messages"
 msgstr "Ð?Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð°"
 
-#: ../camel/camel-folder.c:1574
+#: ../camel/camel-folder.c:878
 msgid "Copying messages"
 msgstr "Ð?Ð¾Ð¿Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð°"
 
-#: ../camel/camel-folder.c:1915
-msgid "Learning junk"
-msgstr "Ð?Ð±Ñ?Ñ?Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ñ?Ð¿Ð°Ð¼-Ñ?Ð¸Ð»Ñ?Ñ?Ñ?Ð° Ñ? Ð¿Ð¸Ñ?Ð¼Ð° Ñ?Ð¸Ð¿ Ñ?Ð¿Ð°Ð¼"
+#: ../camel/camel-folder.c:3247
+#, c-format
+msgid "Retrieving message '%s'"
+msgstr "Ð?Ð¾Ð»Ñ?Ñ?Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾ â??sâ??"
 
-#: ../camel/camel-folder.c:1933
-msgid "Learning non-junk"
-msgstr "Ð?Ð±Ñ?Ñ?Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ñ?Ð¿Ð°Ð¼-Ñ?Ð¸Ð»Ñ?Ñ?Ñ?Ð° Ñ? Ð¿Ð¸Ñ?Ð¼Ð°, ÐºÐ¾Ð¸Ñ?Ð¾ Ð½Ðµ Ñ?Ð° Ñ?Ð¿Ð°Ð¼"
+#: ../camel/camel-gpg-context.c:642 ../camel/camel-gpg-context.c:647
+#: ../camel/camel-gpg-context.c:1272
+#, c-format
+msgid "Failed to execute gpg: %s"
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¸Ð·Ð¿Ñ?Ð»Ð½ÐµÐ½Ð¸ÐµÑ?Ð¾ Ð½Ð° gpg: %s"
 
-#: ../camel/camel-folder.c:1953
-msgid "Filtering new message(s)"
-msgstr "Ð¤Ð¸Ð»Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Ð½Ð¾Ð²Ð¾(Ð¸) Ð¿Ð¸Ñ?Ð¼Ð¾(Ð°)"
+#: ../camel/camel-gpg-context.c:647
+#: ../camel/providers/smtp/camel-smtp-transport.c:723
+#: ../camel/providers/smtp/camel-smtp-transport.c:778
+msgid "Unknown"
+msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ð¾"
 
-#: ../camel/camel-gpg-context.c:760
+#: ../camel/camel-gpg-context.c:711
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1628,16 +1881,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:775
+#: ../camel/camel-gpg-context.c:728
+#, c-format
 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:753 ../camel/camel-gpg-context.c:768
+#, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð°Ð½Ð°Ð»Ð¸Ð·Ð° Ð½Ð° Ð·Ð°Ñ?Ð²ÐºÐ°Ñ?Ð° Ð·Ð° Ñ?Ð°Ð¹Ð½Ð° Ñ?Ñ?Ð°Ð·Ð° Ð½Ð° gpg."
 
-#: ../camel/camel-gpg-context.c:833
+#: ../camel/camel-gpg-context.c:789
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1646,7 +1901,7 @@ msgstr ""
 "Ð?Ñ?Ð¶Ð´Ð°ÐµÑ?Ðµ Ñ?Ðµ Ð¾Ñ? Ð?Ð?Ð?, Ð·Ð° Ð´Ð° Ð¾Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ðµ ÐºÐ»Ñ?Ñ?Ð° Ð·Ð°\n"
 "Ñ?Ð²Ð¾Ñ?Ñ?Ð° Ñ?Ð¼Ð°Ñ?Ñ? ÐºÐ°Ñ?Ñ?Ð°: â??%sâ??"
 
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:793
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1655,140 +1910,134 @@ msgstr ""
 "Ð?Ñ?Ð¶Ð´Ð°ÐµÑ?Ðµ Ñ?Ðµ Ð¾Ñ? Ñ?Ð°Ð¹Ð½Ð° Ñ?Ñ?Ð°Ð·Ð°, Ð·Ð° Ð´Ð° Ð¾Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ðµ ÐºÐ»Ñ?Ñ?Ð°\n"
 "Ð·Ð° Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð¸Ñ?ÐµÐ»Ñ?: â??%sâ??"
 
-#: ../camel/camel-gpg-context.c:842
+#: ../camel/camel-gpg-context.c:799
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "Ð?ÐµÐ¾Ñ?Ð°ÐºÐ²Ð°Ð½Ð° Ð·Ð°Ñ?Ð²ÐºÐ° Ð¾Ñ? GnuPG Ð·Ð° â??%sâ??"
 
-#: ../camel/camel-gpg-context.c:867 ../camel/camel-gpg-context.c:1113
-#: ../camel/providers/nntp/camel-nntp-store.c:1313
-msgid "Canceled."
-msgstr "Ð?Ñ?ÐµÐºÑ?Ð°Ñ?ÐµÐ½Ð¾."
+#: ../camel/camel-gpg-context.c:828 ../camel/camel-net-utils.c:515
+#: ../camel/camel-tcp-stream-raw.c:255
+#: ../camel/providers/imapx/camel-imapx-server.c:4892
+#: ../camel/providers/imapx/camel-imapx-server.c:4909
+#: ../camel/providers/imapx/camel-imapx-store.c:198
+#: ../camel/providers/nntp/camel-nntp-summary.c:405
+#: ../camel/providers/pop3/camel-pop3-folder.c:366
+#: ../camel/providers/pop3/camel-pop3-folder.c:431
+#: ../camel/providers/pop3/camel-pop3-folder.c:506
+#: ../camel/providers/pop3/camel-pop3-store.c:487
+#: ../libedataserverui/e-book-auth-util.c:229
+#, fuzzy, c-format
+msgid "Cancelled"
+msgstr "Ð?Ñ?ÐµÐºÑ?Ð°Ñ?ÐµÐ½Ð¾"
 
-#: ../camel/camel-gpg-context.c:881
+#: ../camel/camel-gpg-context.c:846
+#, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¾Ñ?ÐºÐ»Ñ?Ñ?Ð²Ð°Ð½Ðµ Ð½Ð° Ñ?Ð°ÐµÐ½ ÐºÐ»Ñ?Ñ?: Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸ 3 Ð³Ñ?ÐµÑ?Ð½Ð¸ Ñ?Ñ?Ð°Ð·Ð¸."
 
-#: ../camel/camel-gpg-context.c:889
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Ð?ÐµÐ¾Ñ?Ð°ÐºÐ²Ð°Ð½ Ð¾Ñ?Ð³Ð¾Ð²Ð¾Ñ? Ð¾Ñ? GnuPG: %s"
 
-#: ../camel/camel-gpg-context.c:988
+#: ../camel/camel-gpg-context.c:989
+#, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ð½ÐµÑ?Ð¾: Ð½Ñ?Ð¼Ð° Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸ Ð²Ð°Ð»Ð¸Ð´Ð½Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ñ?ÐµÐ»Ð¸."
 
-#. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1262 ../camel/camel-gpg-context.c:1387
-#: ../camel/camel-gpg-context.c:1953 ../camel/camel-gpg-context.c:1998
-#, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¸Ð·Ð¿Ñ?Ð»Ð½ÐµÐ½Ð¸ÐµÑ?Ð¾ Ð½Ð° gpg: %s"
-
-#: ../camel/camel-gpg-context.c:1355 ../camel/camel-smime-context.c:605
-#, c-format
-msgid "Could not generate signing data: %s"
+#: ../camel/camel-gpg-context.c:1535 ../camel/camel-smime-context.c:824
+#, fuzzy
+msgid "Could not generate signing data: "
 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:1582 ../camel/camel-gpg-context.c:1782
+#: ../camel/camel-gpg-context.c:1892 ../camel/camel-gpg-context.c:2038
+#: ../camel/camel-gpg-context.c:2137 ../camel/camel-gpg-context.c:2185
 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:1662 ../camel/camel-gpg-context.c:1670
+#: ../camel/camel-gpg-context.c:1678 ../camel/camel-gpg-context.c:1697
+#: ../camel/camel-smime-context.c:948 ../camel/camel-smime-context.c:962
+#: ../camel/camel-smime-context.c:971
+#, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ñ?Ð¾Ð²ÐµÑ?ÐºÐ°Ñ?Ð° Ð½Ð° Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð° Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾: Ð½ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»ÐµÐ½ Ñ?Ð¾Ñ?Ð¼Ð°Ñ? Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾"
 
-#: ../camel/camel-gpg-context.c:1600
-#, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
+#: ../camel/camel-gpg-context.c:1737
+#, fuzzy
+msgid "Cannot verify message signature: "
 msgstr ""
-"Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ñ?Ð¾Ð²ÐµÑ?ÐºÐ°Ñ?Ð° Ð½Ð° Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð° Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾: Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ñ?Ñ?Ð·Ð´Ð°Ð´Ðµ Ð²Ñ?ÐµÐ¼ÐµÐ½ÐµÐ½ "
-"Ñ?Ð°Ð¹Ð»: %s"
+"Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ñ?Ð¾Ð²ÐµÑ?ÐºÐ°Ñ?Ð° Ð½Ð° Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð° Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾: Ð½ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»ÐµÐ½ Ñ?Ð¾Ñ?Ð¼Ð°Ñ? Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾"
 
-#: ../camel/camel-gpg-context.c:1711
-#, c-format
-msgid "Could not generate encrypting data: %s"
+#: ../camel/camel-gpg-context.c:1858
+#, fuzzy
+msgid "Could not generate encrypting data: "
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð³ÐµÐ½ÐµÑ?Ð¸Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð´Ð°Ð½Ð½Ð¸ Ð·Ð° Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ðµ: %s"
 
-#: ../camel/camel-gpg-context.c:1761
+#: ../camel/camel-gpg-context.c:1911
 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:1969 ../camel/camel-gpg-context.c:1978
+#: ../camel/camel-gpg-context.c:2001
+#, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð´ÐµÑ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾: Ð³Ñ?ÐµÑ?ÐµÐ½ Ñ?Ð¾Ñ?Ð¼Ð°Ñ? Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾"
 
-#: ../camel/camel-gpg-context.c:1831
+#: ../camel/camel-gpg-context.c:1989
+#, c-format
 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:2078 ../camel/camel-smime-context.c:1255
 msgid "Encrypted content"
 msgstr "Ð¨Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð¾ Ñ?Ñ?Ð´Ñ?Ñ?Ð¶Ð°Ð½Ð¸Ðµ"
 
-#: ../camel/camel-gpg-context.c:1930
-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
-msgid "Unknown"
-msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ð¾"
-
-#: ../camel/camel-lock-client.c:104
+#: ../camel/camel-lock-client.c:106
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¾Ð¼Ð¾Ñ?ÐµÐ½ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼ÐµÐ½ ÐºÐ°Ð½Ð°Ð» Ð·Ð° Ð·Ð°ÐºÐ»Ñ?Ñ?Ð²Ð°Ð½Ðµ: %s"
 
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock-client.c:130
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ñ?Ð¾Ñ?ÐµÑ? Ð·Ð° Ð·Ð°ÐºÐ»Ñ?Ñ?Ð²Ð°Ð½Ðµ: %s"
 
-#: ../camel/camel-lock-client.c:203 ../camel/camel-lock-client.c:226
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð·Ð°ÐºÐ»Ñ?Ñ?Ð²Ð°Ð½Ðµ Ð½Ð° â??%sâ??: Ð¿Ñ?Ð¾Ñ?Ð¾ÐºÐ¾Ð»Ð½Ð° Ð³Ñ?ÐµÑ?ÐºÐ° Ð² lock-helper"
 
-#: ../camel/camel-lock-client.c:216
+#: ../camel/camel-lock-client.c:227
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð·Ð°ÐºÐ»Ñ?Ñ?Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° â??%sâ??"
 
-#: ../camel/camel-lock.c:103
+#: ../camel/camel-lock.c:102
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð·Ð°ÐºÐ»Ñ?Ñ?Ð²Ð°Ñ? Ñ?Ð°Ð¹Ð» Ð·Ð° %s: %s"
 
-#: ../camel/camel-lock.c:144
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+#: ../camel/camel-lock.c:145
+#, fuzzy, 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:205
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ð²Ð°Ð½Ðµ Ð½Ð° lock Ñ?Ñ?ÐµÐ· 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 "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ð²Ð°Ð½Ðµ Ð½Ð° lock Ñ?Ñ?ÐµÐ· flock(2): %s"
 
-#: ../camel/camel-movemail.c:106
+#: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ñ?Ð¾Ð²ÐµÑ?ÐºÐ°Ñ?Ð° Ð½Ð° Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ¸ Ñ?Ð°Ð¹Ð» %s: %s"
@@ -1798,147 +2047,148 @@ msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ñ?Ð¾Ð²ÐµÑ?ÐºÐ°Ñ?Ð° Ð½Ð° Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ¸ Ñ?Ð°Ð¹
 msgid "Could not open mail file %s: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¾Ñ?Ð²Ð°Ñ?Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ¸ Ñ?Ð°Ð¹Ð» %s: %s"
 
-#: ../camel/camel-movemail.c:127
+#: ../camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¾Ñ?Ð²Ð°Ñ?Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ð²Ñ?ÐµÐ¼ÐµÐ½ÐµÐ½ Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ¸ Ñ?Ð°Ð¹Ð» %s: %s"
 
-#: ../camel/camel-movemail.c:156
+#: ../camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð·Ð°Ð¿Ð°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾Ñ?Ð° Ð²Ñ?Ð² Ð²Ñ?ÐµÐ¼ÐµÐ½ÐµÐ½ Ñ?Ð°Ð¹Ð» %s: %s"
 
-#: ../camel/camel-movemail.c:186
+#: ../camel/camel-movemail.c:193
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼ÐµÐ½ ÐºÐ°Ð½Ð°Ð»: %s"
 
-#: ../camel/camel-movemail.c:198
+#: ../camel/camel-movemail.c:207
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ð°Ð·ÐºÐ»Ð¾Ð½Ñ?Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ñ?Ð¾Ñ?ÐµÑ?: %s"
 
-#: ../camel/camel-movemail.c:236
+#: ../camel/camel-movemail.c:245
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Ð?Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð°Ñ?Ð° Ð·Ð° Ð¿Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾Ñ?Ð° Ñ?Ðµ Ð¿Ñ?Ð¾Ð²Ð°Ð»Ð¸: %s"
 
-#: ../camel/camel-movemail.c:237
+#: ../camel/camel-movemail.c:246
 msgid "(Unknown error)"
 msgstr "(Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ð° Ð³Ñ?ÐµÑ?ÐºÐ°)"
 
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:273
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?ÐµÑ?ÐµÐ½Ðµ Ð½Ð° Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ¸ Ñ?Ð°Ð¹Ð»: %s"
 
-#: ../camel/camel-movemail.c:271
+#: ../camel/camel-movemail.c:286
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð·Ð°Ð¿Ð°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾Ñ?Ð° Ð²Ñ?Ð² Ð²Ñ?ÐµÐ¼ÐµÐ½ÐµÐ½ Ñ?Ð°Ð¹Ð»: %s"
 
-#: ../camel/camel-movemail.c:464 ../camel/camel-movemail.c:531
+#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ ÐºÐ¾Ð¿Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾Ñ?Ð° Ð²Ñ?Ð² Ð²Ñ?ÐµÐ¼ÐµÐ½ÐµÐ½ Ñ?Ð°Ð¹Ð»: %s"
 
-#: ../camel/camel-multipart-signed.c:592
-msgid "parse error"
-msgstr "Ð³Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð°Ð½Ð°Ð»Ð¸Ð·Ð¸Ñ?Ð°Ð½Ðµ"
+#: ../camel/camel-multipart-signed.c:327
+#, fuzzy, c-format
+msgid "No content available"
+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
-msgid "Canceled"
-msgstr "Ð?Ñ?ÐµÐºÑ?Ð°Ñ?ÐµÐ½Ð¾"
+#: ../camel/camel-multipart-signed.c:335
+#, fuzzy, c-format
+msgid "No signature available"
+msgstr "Ð?Ð¸Ð¿Ñ?Ð²Ð° Ð¾Ð¿Ð¸Ñ?Ð°Ð½Ð¸Ðµ"
 
-#: ../camel/camel-net-utils.c:521
-msgid "cannot create thread"
-msgstr "Ð½ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð½Ð¸Ñ?ÐºÐ°"
+#: ../camel/camel-multipart-signed.c:663
+#, c-format
+msgid "parse error"
+msgstr "Ð³Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð°Ð½Ð°Ð»Ð¸Ð·Ð¸Ñ?Ð°Ð½Ðµ"
 
-#: ../camel/camel-net-utils.c:678
+#: ../camel/camel-net-utils.c:695
 #, c-format
 msgid "Resolving: %s"
 msgstr "Ð?Ñ?ÐºÑ?Ð¸Ð²Ð°Ð½Ðµ Ð½Ð° Ð°Ð´Ñ?ÐµÑ?: %s"
 
-#: ../camel/camel-net-utils.c:700
+#: ../camel/camel-net-utils.c:718
 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:845
 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:872
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´Ñ?Ñ? Ð½Ð° Ð¸Ð¼ÐµÑ?Ð¾ Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?ÐµÐ½: %s"
 
-#: ../camel/camel-offline-folder.c:249
+#: ../camel/camel-offline-folder.c:189
 #, 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:144 ../camel/camel-offline-journal.c:174
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr ""
-"Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð·Ð°Ð¿Ð°Ð·Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¶Ñ?Ñ?Ð½Ð°Ð»Ð° Ð·Ð° Ñ?Ð°Ð±Ð¾Ñ?Ð° Ð² Ñ?ÐµÐ¶Ð¸Ð¼ â??Ð?Ð·ÐºÐ»Ñ?Ñ?ÐµÐ½â?? Ð·Ð° Ð¿Ð°Ð¿ÐºÐ°Ñ?Ð° â??%"
-"sâ??: %s"
+"Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð·Ð°Ð¿Ð°Ð·Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¶Ñ?Ñ?Ð½Ð°Ð»Ð° Ð·Ð° Ñ?Ð°Ð±Ð¾Ñ?Ð° Ð² Ñ?ÐµÐ¶Ð¸Ð¼ â??Ð?Ð·ÐºÐ»Ñ?Ñ?ÐµÐ½â?? Ð·Ð° Ð¿Ð°Ð¿ÐºÐ°Ñ?Ð° "
+"â??%sâ??: %s"
 
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:58
 msgid "Virtual folder email provider"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð¸Ðº Ð½Ð° Ð²Ð¸Ñ?Ñ?Ñ?Ð°Ð»Ð½Ð¸ Ð¿Ð°Ð¿ÐºÐ¸ Ð·Ð° Ðµ-Ð¿Ð¾Ñ?Ð°"
 
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:60
 msgid "For reading mail as a query of another set of folders"
 msgstr "Ð?Ð° Ñ?ÐµÑ?ÐµÐ½Ðµ Ð½Ð° Ð¿Ð¾Ñ?Ð°, ÐºÐ°Ñ?Ð¾ Ð·Ð°Ð¿Ð¸Ñ?Ð²Ð°Ð½Ðµ Ð´Ð¾ Ð´Ñ?Ñ?Ð³ Ð½Ð°Ð±Ð¾Ñ? Ð¿Ð°Ð¿ÐºÐ¸"
 
-#: ../camel/camel-provider.c:184
+#: ../camel/camel-provider.c:192
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð·Ð°Ñ?ÐµÐ¶Ð´Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° %s: Ð·Ð°Ñ?ÐµÐ¶Ð´Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¼Ð¾Ð´Ñ?Ð»Ð¸ Ð½Ðµ Ñ?Ðµ Ð¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð° Ð¾Ñ? Ñ?Ð°Ð·Ð¸ "
 "Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð°."
 
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:201
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð·Ð°Ñ?ÐµÐ¶Ð´Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° %s: %s"
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:210
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð·Ð°Ñ?ÐµÐ¶Ð´Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° %s: Ð½Ñ?Ð¼Ð° Ð¸Ð½Ð¸Ñ?Ð¸Ð°Ð»Ð¸Ð·Ð¸Ñ?Ð°Ñ? ÐºÐ¾Ð´ Ð² Ð¼Ð¾Ð´Ñ?Ð»Ð°."
 
-#: ../camel/camel-provider.c:379 ../camel/camel-session.c:180
+#: ../camel/camel-provider.c:392 ../camel/camel-session.c:202
 #, 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:70
+#, c-format
 msgid "Authentication failed."
 msgstr "Ð£Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½ÐµÑ?Ð¾ Ñ?Ðµ Ð¿Ñ?Ð¾Ð²Ð°Ð»Ð¸."
 
-#: ../camel/camel-sasl-anonymous.c:130
+#: ../camel/camel-sasl-anonymous.c:81
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -1947,7 +2197,7 @@ msgstr ""
 "Ð?Ñ?ÐµÑ?Ð½Ð° Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð°Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ¸ Ð°Ð´Ñ?ÐµÑ?:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:142
+#: ../camel/camel-sasl-anonymous.c:95
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1956,7 +2206,7 @@ msgstr ""
 "Ð?Ñ?ÐµÑ?Ð½Ð° Ñ?ÐºÑ?Ð¸Ñ?Ð° Ñ?Ñ?Ð°Ñ?Ð¸Ñ?Ð°Ñ?Ð° Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:154
+#: ../camel/camel-sasl-anonymous.c:109
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1965,11 +2215,11 @@ msgstr ""
 "Ð?Ñ?ÐµÑ?Ð½Ð° Ñ?Ñ?Ð°Ñ?Ð¸Ñ?Ð°Ñ?Ð° Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:41
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:40
+#: ../camel/camel-sasl-cram-md5.c:43
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -1977,11 +2227,11 @@ msgstr ""
 "Ð¢Ð°Ð·Ð¸ Ð¾Ð¿Ñ?Ð¸Ñ? Ñ?Ðµ Ð²Ð¸ Ñ?Ð²Ñ?Ñ?Ð¶Ðµ Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ñ?Ñ?ÐµÐ· Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð° Ð¿Ð°Ñ?Ð¾Ð»Ð° Ñ?Ð¸Ð¿ CRAM-MD5, Ð°ÐºÐ¾ "
 "Ñ?Ð¾Ð¹ Ñ? Ð¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð°."
 
-#: ../camel/camel-sasl-digest-md5.c:48
+#: ../camel/camel-sasl-digest-md5.c:54
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:50
+#: ../camel/camel-sasl-digest-md5.c:56
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -1989,40 +2239,46 @@ msgstr ""
 "Ð¢Ð°Ð·Ð¸ Ð¾Ð¿Ñ?Ð¸Ñ? Ñ?Ðµ Ð²Ð¸ Ñ?Ð²Ñ?Ñ?Ð¶Ðµ Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ñ?Ñ?ÐµÐ· Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð° Ð¿Ð°Ñ?Ð¾Ð»Ð° Ñ?Ð¸Ð¿ DIGEST-MD5, Ð°ÐºÐ¾ "
 "Ñ?Ð¾Ð¹ Ñ? Ð¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð°."
 
-#: ../camel/camel-sasl-digest-md5.c:844
+#: ../camel/camel-sasl-digest-md5.c:817
+#, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Ð?Ñ?ÐµÐ´Ð¸Ð·Ð²Ð¸ÐºÐ°Ñ?ÐµÐ»Ñ?Ñ?Ð²Ð¾Ñ?Ð¾ Ð¾Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ðµ Ñ?Ð²Ñ?Ñ?Ð´Ðµ Ð´Ñ?Ð»Ð³Ð¾ (>2048 Ð¾ÐºÑ?ÐµÑ?Ð°)"
 
-#: ../camel/camel-sasl-digest-md5.c:853
+#: ../camel/camel-sasl-digest-md5.c:828
+#, c-format
 msgid "Server challenge invalid\n"
 msgstr "Ð?Ñ?ÐµÐ´Ð¸Ð·Ð²Ð¸ÐºÐ°Ñ?ÐµÐ»Ñ?Ñ?Ð²Ð¾Ñ?Ð¾ Ð¾Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ðµ Ð½ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»Ð½Ð¾\n"
 
-#: ../camel/camel-sasl-digest-md5.c:859
+#: ../camel/camel-sasl-digest-md5.c:836
+#, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr ""
 "Ð?Ñ?ÐµÐ´Ð¸Ð·Ð²Ð¸ÐºÐ°Ñ?ÐµÐ»Ñ?Ñ?Ð²Ð¾Ñ?Ð¾ Ð¾Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ñ?Ñ?Ð´Ñ?Ñ?Ð¶Ð° Ð½ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»Ð½Ð° Ñ?Ð°Ñ?Ñ? â?? â??Ð?Ð°Ñ?ÐµÑ?Ñ?Ð²Ð¾ Ð½Ð° Ð·Ð°Ñ?Ð¸Ñ?Ð°â??"
 
-#: ../camel/camel-sasl-digest-md5.c:889
+#: ../camel/camel-sasl-digest-md5.c:871
+#, c-format
 msgid "Server response did not contain authorization data"
 msgstr "Ð?Ñ?Ð³Ð¾Ð²Ð¾Ñ?Ñ?Ñ? Ð½Ð° Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð½Ðµ Ñ?Ñ?Ð´Ñ?Ñ?Ð¶Ð° Ð´Ð°Ð½Ð½Ð¸ Ð·Ð° Ñ?Ð¿Ñ?Ð»Ð½Ð¾Ð¼Ð¾Ñ?Ð°Ð²Ð°Ð½Ðµ"
 
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:892
+#, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "Ð?Ñ?Ð³Ð¾Ð²Ð¾Ñ?Ñ?Ñ? Ð½Ð° Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ñ?Ñ?Ð´Ñ?Ñ?Ð¶Ð° Ð½ÐµÐ¿Ñ?Ð»Ð½Ð¸ Ð´Ð°Ð½Ð½Ð¸ Ð·Ð° Ñ?Ð¿Ñ?Ð»Ð½Ð¾Ð¼Ð¾Ñ?Ð°Ð²Ð°Ð½Ðµ"
 
-#: ../camel/camel-sasl-digest-md5.c:917
+#: ../camel/camel-sasl-digest-md5.c:905
+#, c-format
 msgid "Server response does not match"
 msgstr "Ð?Ñ?Ð³Ð¾Ð²Ð¾Ñ?Ñ?Ñ? Ð½Ð° Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð½Ðµ Ñ?Ñ?Ð²Ð¿Ð°Ð´Ð°"
 
-#: ../camel/camel-sasl-gssapi.c:72
+#: ../camel/camel-sasl-gssapi.c:86
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:74
+#: ../camel/camel-sasl-gssapi.c:88
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "Ð¢Ð°Ð·Ð¸ Ð¾Ð¿Ñ?Ð¸Ñ? Ñ?Ðµ Ð²Ð¸ Ñ?Ð²Ñ?Ñ?Ð¶Ðµ Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ñ?Ñ?ÐµÐ· Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½Ðµ Kerberos 5."
 
-#: ../camel/camel-sasl-gssapi.c:168
+#: ../camel/camel-sasl-gssapi.c:129
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -2030,18 +2286,18 @@ msgstr ""
 "Ð£ÐºÐ°Ð·Ð°Ð½Ð¸Ñ?Ñ? Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ñ?Ð¼ Ð½Ðµ Ñ?Ðµ Ð¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð° Ð¾Ñ? Ð¿Ñ?ÐµÐ´Ð¾Ñ?Ñ?Ð°Ð²ÐµÐ½Ð¸Ñ?Ðµ Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?ÐµÐ½Ð¸Ñ? Ð¸Ð»Ð¸ Ð½Ðµ Ñ?Ðµ "
 "Ñ?Ð°Ð·Ð¿Ð¾Ð·Ð½Ð°Ð²Ð° Ð¾Ñ? Ñ?ÐµÐ°Ð»Ð¸Ð·Ð°Ñ?Ð¸Ñ?Ñ?Ð°."
 
-#: ../camel/camel-sasl-gssapi.c:173
+#: ../camel/camel-sasl-gssapi.c:134
 msgid "The provided target_name parameter was ill-formed."
 msgstr "Ð?Ð¾Ð´Ð°Ð´ÐµÐ½Ð¸Ñ?Ñ? Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ? target_name Ðµ Ð·Ð»Ðµ Ñ?Ð¾Ñ?Ð¼Ð¸Ñ?Ð°Ð½."
 
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../camel/camel-sasl-gssapi.c:137
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr ""
 "Ð?Ð¾Ð´Ð°Ð´ÐµÐ½Ð¸Ñ?Ñ? Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ? target_name Ñ?Ñ?Ð´Ñ?Ñ?Ð¶Ð° Ð½ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»ÐµÐ½ Ð¸Ð»Ð¸ Ð½ÐµÐ¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð°Ð½ Ð²Ð¸Ð´ Ð¸Ð¼Ðµ."
 
-#: ../camel/camel-sasl-gssapi.c:180
+#: ../camel/camel-sasl-gssapi.c:141
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -2049,7 +2305,7 @@ msgstr ""
 "input_token Ñ?Ñ?Ð´Ñ?Ñ?Ð¶Ð° Ñ?Ð°Ð·Ð»Ð¸Ñ?Ð½Ð¸ Ð²Ñ?Ñ?Ð·ÐºÐ¸ Ñ? Ð²Ñ?Ð¾Ð´Ð½Ð¸ ÐºÐ°Ð½Ð°Ð»Ð¸ Ð¾Ñ? Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ?Ðµ Ð² "
 "Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ?Ð° input_chan_bindings."
 
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../camel/camel-sasl-gssapi.c:146
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
@@ -2057,7 +2313,7 @@ msgstr ""
 "input_token Ñ?Ñ?Ð´Ñ?Ñ?Ð¶Ð° Ð½ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»ÐµÐ½ Ð¿Ð¾Ð´Ð¿Ð¸Ñ? Ð¸Ð»Ð¸ Ð¿Ð¾Ð´Ð¿Ð¸Ñ?, ÐºÐ¾Ð¹Ñ?Ð¾ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±Ñ?Ð´Ðµ "
 "Ð¿Ñ?Ð¾Ð²ÐµÑ?ÐµÐ½."
 
-#: ../camel/camel-sasl-gssapi.c:189
+#: ../camel/camel-sasl-gssapi.c:150
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -2065,49 +2321,52 @@ msgstr ""
 "Ð£ÐºÐ°Ð·Ð°Ð½Ð¸Ñ?Ðµ Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?ÐµÐ½Ð¸Ñ? Ð½Ðµ Ñ?Ð° Ð²Ð°Ð»Ð¸Ð´Ð½Ð¸ Ð·Ð° ÐºÐ¾Ð½Ñ?ÐµÐºÑ?Ñ?Ð° Ð½Ð° Ð¸Ð½Ð¸Ñ?Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ?Ð¸Ñ? Ð¸Ð»Ð¸ "
 "Ñ?ÐºÐ°Ð·Ð°Ñ?ÐµÐ»Ñ?Ñ? Ð½Ð° Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?ÐµÐ½Ð¸Ñ? Ð½Ðµ Ñ?Ð¾Ñ?Ð¸ Ð½Ð¸ÐºÐ°ÐºÐ²Ð¸ Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?ÐµÐ½Ð¸Ñ?."
 
-#: ../camel/camel-sasl-gssapi.c:194
+#: ../camel/camel-sasl-gssapi.c:155
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "Ð?Ð¾Ð´Ð°Ð´ÐµÐ½Ð¸Ñ?Ñ? Ñ?ÐºÐ°Ð·Ð°Ñ?ÐµÐ» Ð½Ð° ÐºÐ¾Ð½Ñ?ÐµÐºÑ?Ñ? Ð½Ðµ Ñ?Ð¾Ñ?Ð¸ ÐºÑ?Ð¼ Ð²Ð°Ð»Ð¸Ð´ÐµÐ½ ÐºÐ¾Ð½Ñ?ÐµÐºÑ?Ñ?."
 
-#: ../camel/camel-sasl-gssapi.c:197
+#: ../camel/camel-sasl-gssapi.c:158
 msgid "The consistency checks performed on the input_token failed."
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?ÐºÐ¸Ñ?Ðµ Ð½Ð° input_token Ð·Ð° Ð¿Ð¾Ñ?Ð»ÐµÐ´Ð¾Ð²Ð°Ñ?ÐµÐ»Ð½Ð¾Ñ?Ñ? Ñ?Ð° Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð¸."
 
-#: ../camel/camel-sasl-gssapi.c:200
+#: ../camel/camel-sasl-gssapi.c:161
 msgid "The consistency checks performed on the credential failed."
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?ÐºÐ¸Ñ?Ðµ Ð·Ð° Ð¿Ð¾Ñ?Ð»ÐµÐ´Ð¾Ð²Ð°Ñ?ÐµÐ»Ð½Ð¾Ñ?Ñ? Ð½Ð° Ð¿Ñ?ÐµÐ¿Ð¾Ñ?Ñ?ÐºÐ¸Ñ?Ðµ Ñ? Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð¸."
 
-#: ../camel/camel-sasl-gssapi.c:203
+#: ../camel/camel-sasl-gssapi.c:164
 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:170 ../camel/camel-sasl-gssapi.c:310
+#: ../camel/camel-sasl-gssapi.c:354 ../camel/camel-sasl-gssapi.c:371
+#: ../camel/providers/smtp/camel-smtp-transport.c:1256
+#, c-format
 msgid "Bad authentication response from server."
 msgstr "Ð?Ñ?ÐµÑ?ÐµÐ½ Ð¾Ñ?Ð³Ð¾Ð²Ð¾Ñ? Ð·Ð° Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½Ðµ Ð¾Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð°."
 
 #: ../camel/camel-sasl-gssapi.c:383
+#, c-format
 msgid "Unsupported security layer."
 msgstr "Ð?ÐµÐ¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð°Ð½ Ñ?Ð»Ð¾Ð¹ Ð½Ð° Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð¾Ñ?Ñ?."
 
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:35
 msgid "Login"
 msgstr "Ð?Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸Ñ?Ð¸Ñ?Ð°Ð½Ðµ"
 
-#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:38
+#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
 msgid "This option will connect to the server using a simple password."
 msgstr "Ð¢Ð°Ð·Ð¸ Ð¾Ð¿Ñ?Ð¸Ñ? Ñ?Ðµ Ð²Ð¸ Ñ?Ð²Ñ?Ñ?Ð¶Ðµ Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ñ?Ñ?ÐµÐ· Ð½ÐµÑ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð° Ð¿Ð°Ñ?Ð¾Ð»Ð°."
 
-#: ../camel/camel-sasl-login.c:134
+#: ../camel/camel-sasl-login.c:91
+#, c-format
 msgid "Unknown authentication state."
 msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ð¾ Ñ?Ñ?Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ðµ Ð½Ð° Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½Ðµ."
 
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:37
 msgid "NTLM / SPA"
 msgstr "NTLM/SPA"
 
-#: ../camel/camel-sasl-ntlm.c:36
+#: ../camel/camel-sasl-ntlm.c:39
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -2115,51 +2374,53 @@ msgstr ""
 "Ð¢Ð°Ð·Ð¸ Ð¾Ð¿Ñ?Ð¸Ñ? Ñ?Ðµ Ð²Ð¸ Ñ?Ð²Ñ?Ñ?Ð¶Ðµ Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?, Ð±Ð°Ð·Ð¸Ñ?Ð°Ð½ Ð½Ð° â??Ð£Ð¸Ð½Ð´Ð¾Ñ?Ñ?â??, Ñ?Ñ?ÐµÐ· NTLM/Secure "
 "Password Authentication."
 
-#: ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-plain.c:39
 msgid "PLAIN"
 msgstr "Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?"
 
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:42
 msgid "POP before SMTP"
 msgstr "POP Ð¿Ñ?ÐµÐ´Ð¸ SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:41
+#: ../camel/camel-sasl-popb4smtp.c:44
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "Ð¢Ð°Ð·Ð¸ Ð¾Ð¿Ñ?Ð¸Ñ? Ñ?Ðµ Ñ?Ð¿Ñ?Ð»Ð½Ð¾Ð¼Ð¾Ñ?Ð¸ Ð²Ñ?Ñ?Ð·ÐºÐ° Ð¿Ð¾ POP Ð¿Ñ?ÐµÐ´Ð¸ SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:106
+#: ../camel/camel-sasl-popb4smtp.c:79
 msgid "POP Source URI"
 msgstr "Ð?Ð´Ñ?ÐµÑ? Ð½Ð° Ð¸Ð·Ñ?Ð¾Ñ?Ð½Ð¸ÐºÐ° Ð·Ð° POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:109
-msgid "POP Before SMTP auth using an unknown transport"
+#: ../camel/camel-sasl-popb4smtp.c:86
+#, fuzzy, c-format
+msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "Ð£Ð¿Ñ?Ð»Ð½Ð¾Ð¼Ð¾Ñ?Ð°Ð²Ð°Ð½Ðµ Ð¿Ð¾ POP Ð¿Ñ?ÐµÐ´Ð¸ SMTP Ñ?Ñ?ÐµÐ· Ð½ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?ÐµÐ½ Ñ?Ñ?Ð°Ð½Ñ?Ð¿Ð¾Ñ?Ñ?"
 
-#: ../camel/camel-sasl-popb4smtp.c:114
-msgid "POP Before SMTP auth using a non-pop source"
+#: ../camel/camel-sasl-popb4smtp.c:94
+#, fuzzy, c-format
+msgid "POP Before SMTP authentication using a non-POP source"
 msgstr "Ð£Ð¿Ñ?Ð»Ð½Ð¾Ð¼Ð¾Ñ?Ð°Ð²Ð°Ð½Ðµ Ð¿Ð¾ POP Ð¿Ñ?ÐµÐ´Ð¸ SMTP Ñ?Ñ?ÐµÐ· Ð½ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?ÐµÐ½ Ð¸Ð·Ñ?Ð¾Ñ?Ð½Ð¸Ðº"
 
-#: ../camel/camel-search-private.c:147
+#: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Ð?Ð¾Ð¼Ð¿Ð¸Ð»Ð¸Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ñ?ÐµÐ³Ñ?Ð»Ñ?Ñ?ÐµÐ½ Ð¸Ð·Ñ?Ð°Ð· Ð¿Ñ?Ð¾Ð¿Ð°Ð´Ð½Ð°: %s: %s"
 
-#: ../camel/camel-service.c:265
+#: ../camel/camel-service.c:85
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ñ?Ñ? â??%sâ?? Ñ?Ðµ Ð½Ñ?Ð¶Ð´Ð°Ðµ Ð¾Ñ? ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ? â??Ð¸Ð¼Ðµ Ð½Ð° Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð¸Ñ?ÐµÐ»â??"
 
-#: ../camel/camel-service.c:269
+#: ../camel/camel-service.c:89
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ñ?Ñ? â??%sâ?? Ñ?Ðµ Ð½Ñ?Ð¶Ð´Ð°Ðµ Ð¾Ñ? ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ? â??Ñ?Ð¾Ñ?Ñ?â??"
 
-#: ../camel/camel-service.c:273
+#: ../camel/camel-service.c:93
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ñ?Ñ? â??%sâ?? Ñ?Ðµ Ð½Ñ?Ð¶Ð´Ð°Ðµ Ð¾Ñ? ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ? â??Ð¿Ñ?Ñ?â??"
 
-#: ../camel/camel-session.c:305
+#: ../camel/camel-session.c:256
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2168,257 +2429,322 @@ msgstr ""
 "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ° %s:\n"
 "%s"
 
-#: ../camel/camel-session.c:477
+#: ../camel/camel-session.c:753
 #, 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:344 ../camel/camel-smime-context.c:1048
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð½Ð°Ð¼Ð¸Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð·Ð° â??%sâ??"
 
-#: ../camel/camel-smime-context.c:453
+#: ../camel/camel-smime-context.c:372
 msgid "Cannot create CMS message"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ñ?Ñ?Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ Ð·Ð° CMS"
 
-#: ../camel/camel-smime-context.c:458
+#: ../camel/camel-smime-context.c:377
 msgid "Cannot create CMS signed data"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð°Ð½Ð¸ Ð´Ð°Ð½Ð½Ð¸ Ð·Ð° CMS"
 
-#: ../camel/camel-smime-context.c:464
+#: ../camel/camel-smime-context.c:383
 msgid "Cannot attach CMS signed data"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ñ?Ð¸ÐºÑ?ÐµÐ¿Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð°Ð½Ð¸ Ð´Ð°Ð½Ð½Ð¸ Ð·Ð° CMS"
 
-#: ../camel/camel-smime-context.c:471
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS data"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ñ?Ð¸ÐºÑ?ÐµÐ¿Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ð´Ð°Ð½Ð½Ð¸ Ð·Ð° CMS"
 
-#: ../camel/camel-smime-context.c:477
+#: ../camel/camel-smime-context.c:396
 msgid "Cannot create CMS Signer information"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ? Ð·Ð° Ð¿Ð¾Ð´Ð¿Ð¸Ñ? Ð·Ð° CMS"
 
-#: ../camel/camel-smime-context.c:483
+#: ../camel/camel-smime-context.c:402
 msgid "Cannot find certificate chain"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð½Ð°Ð¼Ð¸Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?ÐµÐ»Ñ?ÐºÐ°Ñ?Ð° Ð²ÐµÑ?Ð¸Ð³Ð°"
 
-#: ../camel/camel-smime-context.c:489
+#: ../camel/camel-smime-context.c:408
 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:432 ../camel/camel-smime-context.c:447
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ñ?Ñ? Ð·Ð° Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð·Ð° â??%sâ?? Ð½Ðµ Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?Ð²Ð°"
 
-#: ../camel/camel-smime-context.c:530
+#: ../camel/camel-smime-context.c:454
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð´Ð¾Ð±Ð°Ð²Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ð°Ñ?Ñ?Ð¸Ð±Ñ?Ñ?Ð° SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:535
+#: ../camel/camel-smime-context.c:459
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð´Ð¾Ð±Ð°Ð²Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ð°Ñ?Ñ?Ð¸Ð±Ñ?Ñ?Ð° MS SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:540
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot add encryption certificate"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð´Ð¾Ð±Ð°Ð²Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð·Ð° Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ðµ"
 
-#: ../camel/camel-smime-context.c:546
+#: ../camel/camel-smime-context.c:470
 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
+#. Translators: A fallback message when couldn't verify an SMIME signature
+#: ../camel/camel-smime-context.c:503
 msgid "Unverified"
 msgstr "Ð?ÐµÐ¿Ð¾Ñ?Ð²Ñ?Ñ?Ð´ÐµÐ½"
 
-#: ../camel/camel-smime-context.c:702
+#: ../camel/camel-smime-context.c:505
 msgid "Good signature"
 msgstr "Ð?Ð°Ð»Ð¸Ð´ÐµÐ½ Ð¿Ð¾Ð´Ð¿Ð¸Ñ?"
 
-#: ../camel/camel-smime-context.c:704
+#: ../camel/camel-smime-context.c:507
 msgid "Bad signature"
 msgstr "Ð?ÐµÐ²Ð°Ð»Ð¸Ð´ÐµÐ½ Ð¿Ð¾Ð´Ð¿Ð¸Ñ?"
 
-#: ../camel/camel-smime-context.c:706
+#: ../camel/camel-smime-context.c:509
 msgid "Content tampered with or altered in transit"
 msgstr "Ð¡Ñ?Ð´Ñ?Ñ?Ð¶Ð°Ð½Ð¸ÐµÑ?Ð¾ Ðµ Ð¿Ð¾Ð²Ñ?ÐµÐ´ÐµÐ½Ð¾ Ð¸Ð»Ð¸ Ð¿Ñ?Ð¾Ð¼ÐµÐ½ÐµÐ½Ð¾ Ð¿Ñ?Ð¸ Ð¿Ñ?ÐµÐ½Ð°Ñ?Ñ?Ð½ÐµÑ?Ð¾"
 
-#: ../camel/camel-smime-context.c:708
+#: ../camel/camel-smime-context.c:511
 msgid "Signing certificate not found"
 msgstr "Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ñ?Ñ? Ð·Ð° Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð²Ð°Ð½Ðµ Ð½Ðµ Ðµ Ð¾Ñ?ÐºÑ?Ð¸Ñ?"
 
-#: ../camel/camel-smime-context.c:710
+#: ../camel/camel-smime-context.c:513
 msgid "Signing certificate not trusted"
 msgstr "Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ñ?Ñ? Ð·Ð° Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð²Ð°Ð½Ðµ Ð½Ðµ Ðµ Ð½Ð°Ð´ÐµÐ¶Ð´ÐµÐ½"
 
-#: ../camel/camel-smime-context.c:712
+#: ../camel/camel-smime-context.c:515
 msgid "Signature algorithm unknown"
 msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?ÐµÐ½ Ð°Ð»Ð³Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼ Ð·Ð° Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð²Ð°Ð½Ðµ"
 
-#: ../camel/camel-smime-context.c:714
+#: ../camel/camel-smime-context.c:517
 msgid "Signature algorithm unsupported"
 msgstr "Ð?Ð»Ð³Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ñ?Ñ? Ð·Ð° Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð²Ð°Ð½Ðµ Ð½Ðµ Ñ?Ðµ Ð¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð°"
 
-#: ../camel/camel-smime-context.c:716
+#: ../camel/camel-smime-context.c:519
 msgid "Malformed signature"
 msgstr "Ð?Ð¾Ñ?Ð¾ Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?Ð°Ð½ Ð¿Ð¾Ð´Ð¿Ð¸Ñ?"
 
-#: ../camel/camel-smime-context.c:718
+#: ../camel/camel-smime-context.c:521
 msgid "Processing error"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?Ð²Ð°Ð½ÐµÑ?Ð¾"
 
-#: ../camel/camel-smime-context.c:772
+#: ../camel/camel-smime-context.c:566
 msgid "No signed data in signature"
 msgstr "Ð?Ñ?Ð¼Ð° Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð°Ð½Ð¸ Ð´Ð°Ð½Ð½Ð¸ Ð² Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð°"
 
-#: ../camel/camel-smime-context.c:777
+#: ../camel/camel-smime-context.c:571
 msgid "Digests missing from enveloped data"
 msgstr "Ð?Ð¸Ð¿Ñ?Ð²Ð°Ñ? Ð¸Ð·Ð²Ð°Ð´ÐºÐ¸Ñ?Ðµ Ð¾Ñ? Ð¾Ð±Ñ?Ð²Ð°Ð½Ð°Ñ?Ð¸Ñ?Ðµ Ð´Ð°Ð½Ð½Ð¸"
 
-#: ../camel/camel-smime-context.c:790 ../camel/camel-smime-context.c:800
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
 msgstr "Ð?Ð·Ð²Ð°Ð´ÐºÐ¸Ñ?Ðµ Ð½Ðµ Ð¼Ð¾Ð³Ð°Ñ? Ð´Ð° Ñ?Ðµ Ð¸Ð·Ñ?Ð¸Ñ?Ð»Ñ?Ñ?"
 
-#: ../camel/camel-smime-context.c:807 ../camel/camel-smime-context.c:811
+#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
 msgstr "Ð?Ð·Ð²Ð°Ð´ÐºÐ¸Ñ?Ðµ Ð½Ðµ Ð¼Ð¾Ð³Ð°Ñ? Ð´Ð° Ð±Ñ?Ð´Ð°Ñ? Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸"
 
-#: ../camel/camel-smime-context.c:821 ../camel/camel-smime-context.c:826
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
 msgstr "Ð?Ð½Ð°Ñ?Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð¿Ñ?Ð¾Ð¿Ð°Ð´Ð½Ð°"
 
-#: ../camel/camel-smime-context.c:836
+#: ../camel/camel-smime-context.c:631
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr ""
 "Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ñ?Ñ? Ðµ ÐµÐ´Ð¸Ð½Ñ?Ñ?Ð²ÐµÐ½Ð¾Ñ?Ð¾ Ñ?Ñ?Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ. Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ñ?Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ñ?Ð²Ñ?Ñ?Ð´Ð¸."
 
-#: ../camel/camel-smime-context.c:839
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr ""
 "Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ñ?Ñ? Ðµ ÐµÐ´Ð¸Ð½Ñ?Ñ?Ð²ÐµÐ½Ð¾Ñ?Ð¾ Ñ?Ñ?Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ. Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ðµ Ñ?Ð° Ð²Ð½ÐµÑ?ÐµÐ½Ð¸ Ð¸ Ð¿Ð¾Ñ?Ð²Ñ?Ñ?Ð´ÐµÐ½Ð¸."
 
-#: ../camel/camel-smime-context.c:843
+#: ../camel/camel-smime-context.c:638
 msgid "Cannot find signature digests"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð½Ð°Ð¼Ð¸Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¸Ð·Ð²Ð°Ð´ÐºÐ¸Ñ?Ðµ Ð½Ð° Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð¸Ñ?Ðµ"
 
-#: ../camel/camel-smime-context.c:859
+#: ../camel/camel-smime-context.c:654
 #, 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:835 ../camel/camel-smime-context.c:1121
+msgid "Cannot create encoder context"
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° ÐºÐ¾Ð½Ñ?ÐµÐºÑ?Ñ? Ð·Ð° Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ðµ"
+
+#: ../camel/camel-smime-context.c:841
+msgid "Failed to add data to CMS encoder"
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð´Ð¾Ð±Ð°Ð²Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ð´Ð°Ð½Ð½Ð¸ ÐºÑ?Ð¼ ÐºÐ¾Ð´Ð¸Ñ?Ð°Ñ? CMS"
+
+#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1138
+msgid "Failed to encode data"
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ ÐºÐ¾Ð´Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Ð´Ð°Ð½Ð½Ð¸"
+
+#: ../camel/camel-smime-context.c:987 ../camel/camel-smime-context.c:1233
 msgid "Decoder failed"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð½Ð° Ð´ÐµÐºÐ¾Ð´ÐµÑ?Ð°"
 
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1056
 msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¾Ñ?ÐºÑ?Ð¸Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¾Ð´Ñ?Ð¾Ð´Ñ?Ñ? Ð°Ð»Ð³Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼ Ð·Ð° Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Ð¼Ð½Ð¾Ð³Ð¾ Ð´Ð°Ð½Ð½Ð¸"
 
-#: ../camel/camel-smime-context.c:1027
+#: ../camel/camel-smime-context.c:1064
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð·Ð°Ð´ÐµÐ»Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¼Ñ?Ñ?Ñ?Ð¾ Ð·Ð° ÐºÐ»Ñ?Ñ? Ð·Ð° Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Ð¼Ð½Ð¾Ð³Ð¾ Ð´Ð°Ð½Ð½Ð¸"
 
-#: ../camel/camel-smime-context.c:1038
+#: ../camel/camel-smime-context.c:1075
 msgid "Cannot create CMS Message"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ñ?Ñ?Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ Ð¿Ð¾ CMS"
 
-#: ../camel/camel-smime-context.c:1044
+#: ../camel/camel-smime-context.c:1081
 msgid "Cannot create CMS Enveloped data"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¾Ð±Ð²Ð¸Ñ?Ð¸ Ð´Ð°Ð½Ð½Ð¸ Ð¿Ð¾ CMS"
 
-#: ../camel/camel-smime-context.c:1050
+#: ../camel/camel-smime-context.c:1087
 msgid "Cannot attach CMS Enveloped data"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð´Ð¾Ð±Ð°Ð²Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¾Ð±Ð²Ð¸Ñ?Ð¸ Ð´Ð°Ð½Ð½Ð¸ Ð¿Ð¾ CMS"
 
-#: ../camel/camel-smime-context.c:1056
+#: ../camel/camel-smime-context.c:1093
 msgid "Cannot attach CMS data object"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ñ?Ð¸ÐºÑ?ÐµÐ¿Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¾Ð±ÐµÐºÑ? Ð·Ð° Ð´Ð°Ð½Ð½Ð¸ Ð¿Ð¾ CMS"
 
-#: ../camel/camel-smime-context.c:1065
+#: ../camel/camel-smime-context.c:1102
 msgid "Cannot create CMS Recipient information"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ? Ð·Ð° Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ñ?ÐµÐ» Ð¿Ð¾ CMS"
 
-#: ../camel/camel-smime-context.c:1070
+#: ../camel/camel-smime-context.c:1107
 msgid "Cannot add CMS Recipient information"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð´Ð¾Ð±Ð°Ð²Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ? Ð·Ð° Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ñ?ÐµÐ» Ð¿Ð¾ CMS"
 
-#: ../camel/camel-smime-context.c:1095
+#: ../camel/camel-smime-context.c:1132
 msgid "Failed to add data to encoder"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð´Ð¾Ð±Ð°Ð²Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ð´Ð°Ð½Ð½Ð¸ ÐºÑ?Ð¼ Ð´ÐµÐºÐ¾Ð´ÐµÑ?Ð°"
 
-#: ../camel/camel-smime-context.c:1191
+#: ../camel/camel-smime-context.c:1240
 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:2181
 #, 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 "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°Ñ?Ð°: Ð³Ñ?ÐµÑ?Ð½Ð° Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ? Ð·Ð° Ñ?Ð¾Ð²Ð° Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ"
+#. the name of the Trash folder, used for deleted messages
+#: ../camel/camel-store.c:2372 ../camel/camel-store.c:2382
+#: ../camel/camel-vtrash-folder.c:48
+msgid "Trash"
+msgstr "Ð?Ð¾Ñ?Ñ?Ðµ"
+
+#. the name of the Junk folder, used for spam messages
+#: ../camel/camel-store.c:2375 ../camel/camel-store.c:2386
+#: ../camel/camel-vtrash-folder.c:50
+msgid "Junk"
+msgstr "Ð¡Ð¿Ð°Ð¼"
 
-#: ../camel/camel-store.c:423
+#: ../camel/camel-store.c:2829
 #, 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:2956 ../camel/camel-vee-store.c:367
+#: ../camel/providers/local/camel-maildir-store.c:272
 #, 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:3097 ../camel/camel-vee-store.c:417
+#: ../camel/providers/local/camel-maildir-store.c:668
 #, 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
-msgid "Trash"
-msgstr "Ð?Ð¾Ñ?Ñ?Ðµ"
+#: ../camel/camel-tcp-stream-raw.c:749 ../camel/camel-tcp-stream-raw.c:760
+#, c-format
+msgid "The proxy host does not support SOCKS4"
+msgstr "Ð¡Ñ?Ñ?Ð²Ñ?Ñ?Ñ?Ñ?-Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸Ðº Ð½Ðµ Ð¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð° SOCKS4"
 
-#. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:903 ../camel/camel-vtrash-folder.c:56
-msgid "Junk"
-msgstr "Ð¡Ð¿Ð°Ð¼"
+#: ../camel/camel-tcp-stream-raw.c:771
+#, c-format
+msgid "The proxy host denied our request: code %d"
+msgstr "Ð¡Ñ?Ñ?Ð²Ñ?Ñ?Ñ?Ñ?-Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸Ðº Ð¾Ñ?ÐºÐ°Ð·Ð° Ð·Ñ?Ð°Ñ?Ð²ÐºÐ°Ñ?Ð° Ð½Ð¸: ÐºÐ¾Ð´ %d"
+
+#: ../camel/camel-tcp-stream-raw.c:867 ../camel/camel-tcp-stream-raw.c:873
+#, c-format
+msgid "The proxy host does not support SOCKS5"
+msgstr "Ð¡Ñ?Ñ?Ð²Ñ?Ñ?Ñ?Ñ?-Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸Ðº Ð½Ðµ Ð¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð° SOCKS5"
+
+#: ../camel/camel-tcp-stream-raw.c:879
+#, fuzzy, c-format
+msgid "Could not find a suitable authentication type: code 0x%x"
+msgstr "Ð?Ñ?Ð¼Ð° Ð¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶ÐºÐ° Ð·Ð° Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½Ðµ Ñ?Ð¸Ð¿ %s"
+
+#: ../camel/camel-tcp-stream-raw.c:891
+msgid "General SOCKS server failure"
+msgstr "Ð?Ð±Ñ?Ð° Ð³Ñ?ÐµÑ?ÐºÐ° Ð¾Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð°-Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸Ðº"
+
+#: ../camel/camel-tcp-stream-raw.c:892
+msgid "SOCKS server's rules do not allow connection"
+msgstr "Ð?Ñ?Ð°Ð²Ð¸Ð»Ð°Ð½Ð° Ð·Ð° SOCKS Ð½Ð° Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð°-Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸Ðº Ð½Ðµ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ñ?Ð²Ð°Ñ? Ð²Ñ?Ñ?Ð·ÐºÐ°"
+
+#: ../camel/camel-tcp-stream-raw.c:893
+msgid "Network is unreachable from SOCKS server"
+msgstr "Ð?Ñ?ÐµÐ¶Ð°Ñ?Ð° Ðµ Ð½ÐµÐ´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð° Ð¾Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð°-Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸Ðº"
+
+#: ../camel/camel-tcp-stream-raw.c:894
+msgid "Host is unreachable from SOCKS server"
+msgstr "Ð¦ÐµÐ»ÐµÐ²Ð°Ñ?Ð° Ð¼Ð°Ñ?Ð¸Ð½Ð° Ðµ Ð½ÐµÐ´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð° Ð¾Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð°-Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸Ðº"
+
+#: ../camel/camel-tcp-stream-raw.c:895
+#, fuzzy
+msgid "Connection refused"
+msgstr "Ð?Ñ?Ñ?Ð·ÐºÐ°Ñ?Ð° Ðµ Ð¿Ñ?ÐµÐºÑ?Ð°Ñ?ÐµÐ½Ð°"
+
+#: ../camel/camel-tcp-stream-raw.c:896
+#, fuzzy
+msgid "Time-to-live expired"
+msgstr "Ð?Ñ?ÐµÐ¼ÐµÑ?Ð¾ Ð·Ð° Ð¶Ð¸Ð²Ð¾Ñ? Ð¼Ð¸Ð½Ð°"
+
+#: ../camel/camel-tcp-stream-raw.c:897
+#, fuzzy
+msgid "Command not supported by SOCKS server"
+msgstr "Ð¡Ñ?Ñ?Ð²Ñ?Ñ?Ñ?Ñ? Ð½Ðµ Ð¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð° STLS"
+
+#: ../camel/camel-tcp-stream-raw.c:898
+#, fuzzy
+msgid "Address type not supported by SOCKS server"
+msgstr "Ð¡Ñ?Ñ?Ð²Ñ?Ñ?Ñ?Ñ? Ð½Ðµ Ð¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð° STLS"
+
+#: ../camel/camel-tcp-stream-raw.c:899
+#, fuzzy
+msgid "Unknown error from SOCKS server"
+msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ð° Ð³Ñ?ÐµÑ?ÐºÐ°: %s"
+
+#: ../camel/camel-tcp-stream-raw.c:932
+#, c-format
+msgid "Got unknown address type from SOCKS server"
+msgstr "Ð?Ð¾Ð»Ñ?Ñ?ÐµÐ½ Ðµ Ð½ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ? Ð²Ð¸Ð´ Ð°Ð´Ñ?ÐµÑ? Ð¾Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð°-Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸Ðº"
+
+#: ../camel/camel-tcp-stream-raw.c:950
+#, fuzzy, c-format
+msgid "Incomplete reply from SOCKS server"
+msgstr "Ð?ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»ÐµÐ½ Ð¾Ñ?Ð³Ð¾Ð²Ð¾Ñ? Ð¾Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð°"
+
+#: ../camel/camel-tcp-stream-raw.c:970
+#, c-format
+msgid "Hostname is too long (maximum is 255 characters)"
+msgstr "Ð?Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¾Ñ?Ð¾ Ð¸Ð¼Ðµ Ð½Ð° ÐºÐ¾Ð¼Ð¿Ñ?Ñ?Ñ?Ñ? Ðµ Ð¿Ñ?ÐµÐºÐ°Ð»ÐµÐ½Ð¾ Ð´Ñ?Ð»Ð³Ð¾ (Ð¼Ð°ÐºÑ?Ð¸Ð¼Ñ?Ð¼Ñ?Ñ? Ðµ 255 Ð·Ð½Ð°ÐºÐ°)"
 
-#: ../camel/camel-tcp-stream-ssl.c:870
+#. SOCKS5
+#. reserved - must be 0
+#: ../camel/camel-tcp-stream-raw.c:1002 ../camel/camel-tcp-stream-raw.c:1012
+#, fuzzy, c-format
+msgid "Invalid reply from proxy server"
+msgstr "Ð?ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»ÐµÐ½ Ð¾Ñ?Ð³Ð¾Ð²Ð¾Ñ? Ð¾Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð°"
+
+#: ../camel/camel-tcp-stream-ssl.c:453
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2431,16 +2757,16 @@ msgstr ""
 "Ð?Ñ?Ð¿ÐµÑ?Ð°Ñ?Ñ?Ðº:        %s\n"
 "Ð?Ð¾Ð´Ð¿Ð¸Ñ?:           %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:876
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "GOOD"
 msgstr "Ð?Ð?Ð?Ð?Ð?Ð?Ð?"
 
-#: ../camel/camel-tcp-stream-ssl.c:876
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "BAD"
 msgstr "Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-ssl.c:463
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2455,7 +2781,7 @@ msgstr ""
 "\n"
 "Ð?Ñ?Ð¸ÐµÐ¼Ð°Ñ?Ðµ Ð»Ð¸?"
 
-#: ../camel/camel-tcp-stream-ssl.c:924
+#: ../camel/camel-tcp-stream-ssl.c:507
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2464,7 +2790,7 @@ msgstr ""
 "Ð?Ñ?Ð¾Ð±Ð»ÐµÐ¼ Ñ?Ñ?Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?: %s\n"
 "Ð?Ð·Ð´Ð°Ñ?ÐµÐ»: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:976
+#: ../camel/camel-tcp-stream-ssl.c:559
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2473,7 +2799,7 @@ msgstr ""
 "Ð?ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»ÐµÐ½ Ð´Ð¾Ð¼ÐµÐ¹Ð½ Ð½Ð° Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°: %s\n"
 "Ð?Ð·Ð´Ð°Ñ?ÐµÐ»: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:994
+#: ../camel/camel-tcp-stream-ssl.c:577
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2482,7 +2808,7 @@ msgstr ""
 "Ð?Ð·Ñ?ÐµÐºÑ?Ð» Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?: %s\n"
 "Ð?Ð·Ð´Ð°Ñ?ÐµÐ»: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1011
+#: ../camel/camel-tcp-stream-ssl.c:594
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2491,294 +2817,289 @@ msgstr ""
 "Ð¡Ð¿Ð¸Ñ?Ñ?ÐºÑ?Ñ? Ð·Ð° Ð¾Ñ?Ð¼Ñ?Ð½Ð° Ð½Ð° Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð° Ðµ Ð¸Ð·Ñ?ÐµÐºÑ?Ð»: %s\n"
 "Ð?Ð·Ð´Ð°Ñ?ÐµÐ»: %s"
 
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:316
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð°Ð½Ð°Ð»Ð¸Ð·Ð¸Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð°Ð´Ñ?ÐµÑ?Ð° â??%sâ??"
 
-#: ../camel/camel-vee-folder.c:577
+#: ../camel/camel-vee-folder.c:1235 ../camel/camel-vee-folder.c:1398
 #, c-format
-msgid "Error storing '%s': %s"
-msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð·Ð°Ð¿Ð°Ð·Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° â??%sâ??: %s"
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr ""
+"Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð²Ð°Ð½ÐµÑ?Ð¾ Ð¸Ð»Ð¸ ÐºÐ¾Ð¿Ð¸Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð°Ñ?Ð° Ð²Ñ?Ð² Ð²Ð¸Ñ?Ñ?Ñ?Ð°Ð»Ð½Ð°Ñ?Ð° Ð¿Ð°Ð¿ÐºÐ°"
 
-#: ../camel/camel-vee-folder.c:654
+#: ../camel/camel-vee-folder.c:1271
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Ð?Ñ?Ð¼Ð° Ñ?Ð°ÐºÐ¾Ð²Ð° Ð¿Ð¸Ñ?Ð¼Ð¾ %s Ð² %s"
 
-#: ../camel/camel-vee-folder.c:813 ../camel/camel-vee-folder.c:819
-msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr ""
-"Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð²Ð°Ð½ÐµÑ?Ð¾ Ð¸Ð»Ð¸ ÐºÐ¾Ð¿Ð¸Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð°Ñ?Ð° Ð²Ñ?Ð² Ð²Ð¸Ñ?Ñ?Ñ?Ð°Ð»Ð½Ð°Ñ?Ð° Ð¿Ð°Ð¿ÐºÐ°"
+#: ../camel/camel-vee-folder.c:1339
+#, fuzzy, c-format
+msgid "Error storing '%s': "
+msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð·Ð°Ð¿Ð°Ð·Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° â??%sâ??: %s"
 
-#: ../camel/camel-vee-store.c:113 ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:353
+#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
+#: ../camel/camel-vee-store.c:322
 msgid "Unmatched"
 msgstr "Ð?ÐµÑ?Ñ?Ð²Ð¿Ð°Ð´Ð°Ñ?Ð¸"
 
-#: ../camel/camel-vee-store.c:400
+#: ../camel/camel-vee-store.c:393
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¸Ð·Ñ?Ñ?Ð¸Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°: %s: Ð½Ñ?Ð¼Ð° Ñ?Ð°ÐºÐ°Ð²Ð° Ð¿Ð°Ð¿ÐºÐ°"
 
-#: ../camel/camel-vee-store.c:422
+#: ../camel/camel-vee-store.c:427
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ð½ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ñ?ÐµÐ¸Ð¼ÐµÐ½Ñ?Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°: %s: Ð½Ñ?Ð¼Ð° Ñ?Ð°ÐºÐ°Ð²Ð° Ð¿Ð°Ð¿ÐºÐ°"
 
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ ÐºÐ¾Ð¿Ð¸Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð°Ñ?Ð° Ð² ÐºÐ¾Ñ?Ñ?ÐµÑ?Ð¾"
 
-#: ../camel/camel-vtrash-folder.c:57
+#: ../camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ ÐºÐ¾Ð¿Ð¸Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð°Ñ?Ð° Ð² Ð¿Ð°Ð¿ÐºÐ°Ñ?Ð° Ð·Ð° Ñ?Ð¿Ð°Ð¼"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-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
-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/pop3/camel-pop3-folder.c:268
-#: ../camel/providers/pop3/camel-pop3-folder.c:578
-#: ../camel/providers/pop3/camel-pop3-folder.c:639
-#: ../camel/providers/pop3/camel-pop3-folder.c:657
-msgid "User canceled"
-msgstr "Ð?Ñ?ÐºÐ°Ð·Ð°Ð½Ð¾ Ð¾Ñ? Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð¸Ñ?ÐµÐ»Ñ?"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c: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
-#, 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:2506
-#: ../camel/providers/imap4/camel-imap4-folder.c:837
-msgid "This message is not available in offline mode."
-msgstr "Ð¢Ð¾Ð²Ð° Ð¿Ð¸Ñ?Ð¼Ð¾ Ð½Ðµ Ðµ Ð½Ð°Ð»Ð¸Ñ?Ð½Ð¾ Ð² Ñ?ÐµÐ¶Ð¸Ð¼ â??Ð?Ð·ÐºÐ»Ñ?Ñ?ÐµÐ½â??."
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:195
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2009
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2060
-msgid "Could not get message"
-msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:982
-#: ../camel/providers/imap/camel-imap-folder.c:295
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:954
+#: ../camel/providers/imap/camel-imap-folder.c:392
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð·Ð°Ñ?ÐµÐ¶Ð´Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¾Ð±Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ Ð½Ð° â??%sâ??"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1055
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1030
 #, c-format
 msgid "Checking for deleted messages %s"
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?ÐºÐ° Ð·Ð° Ð¸Ð·Ñ?Ñ?Ð¸Ñ?Ð¸ Ð¿Ð¸Ñ?Ð¼Ð° %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1330
-msgid "Trash Folder Full. Please Empty."
-msgstr "Ð?Ð¾Ñ?Ñ?ÐµÑ?Ð¾ Ðµ Ð¿Ñ?Ð»Ð½Ð¾ â?? Ð¸Ð·Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ðµ Ð³Ð¾."
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1564
-#: ../camel/providers/groupwise/camel-groupwise-store.c:626
-#: ../camel/providers/groupwise/camel-groupwise-store.c:756
-#: ../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:1517
+#: ../camel/providers/groupwise/camel-groupwise-store.c:665
+#: ../camel/providers/groupwise/camel-groupwise-store.c:796
+#: ../camel/providers/imap/camel-imap-folder.c:3962
+#: ../camel/providers/imap/camel-imap-folder.c:4044
+#: ../camel/providers/imapx/camel-imapx-server.c:3871
+#: ../camel/providers/imapx/camel-imapx-server.c:4002
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "Ð?Ð·Ð²Ð»Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Ð¾Ð±Ð¾Ð±Ñ?ÐµÐ½Ð° Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ? Ð·Ð° Ð½Ð¾Ð²Ð¸ Ð¿Ð¸Ñ?Ð¼Ð° Ð² %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2360
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2403
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1987
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2040
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2704
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2714
+#, c-format
+msgid "Could not get message"
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2424
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2474
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð´Ð¾Ð±Ð°Ð²Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾ ÐºÑ?Ð¼ Ð¿Ð°Ð¿ÐºÐ°Ñ?Ð° â??%sâ??: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2391
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2460
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:281
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
+#, c-format
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+"Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾: %s\n"
+"  %s"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
+#: ../camel/providers/local/camel-maildir-folder.c:100
+#: ../camel/providers/local/camel-maildir-folder.c:307
+#: ../camel/providers/local/camel-mbox-folder.c:117
+#: ../camel/providers/local/camel-mbox-folder.c:325
+#: ../camel/providers/local/camel-mh-folder.c:156
+msgid "No such message"
+msgstr "Ð?Ñ?Ð¼Ð° Ñ?Ð°ÐºÐ¾Ð²Ð° Ð¿Ð¸Ñ?Ð¼Ð¾"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2659
+#: ../camel/providers/nntp/camel-nntp-folder.c:246
+#: ../camel/providers/nntp/camel-nntp-folder.c:413
+#: ../camel/providers/pop3/camel-pop3-folder.c:457
+#, fuzzy, c-format
+msgid "Cannot get message %s: "
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾ %s: %s"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2677
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2687
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2890
+#, c-format
+msgid "This message is not available in offline mode."
+msgstr "Ð¢Ð¾Ð²Ð° Ð¿Ð¸Ñ?Ð¼Ð¾ Ð½Ðµ Ðµ Ð½Ð°Ð»Ð¸Ñ?Ð½Ð¾ Ð² Ñ?ÐµÐ¶Ð¸Ð¼ â??Ð?Ð·ÐºÐ»Ñ?Ñ?ÐµÐ½â??."
+
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:248
 #, c-format
 msgid "Cannot get folder container %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° ÐºÐ¾Ð½Ñ?ÐµÐ¹Ð½ÐµÑ?Ð° %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:343
-#: ../camel/providers/imap4/camel-imap4-journal.c:311
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:318
+#, c-format
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð´Ð¾Ð±Ð°Ð²Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾ Ð² Ñ?ÐµÐ¶Ð¸Ð¼ â??Ð?Ð·ÐºÐ»Ñ?Ñ?ÐµÐ½â??: Ð½Ñ?Ð¼Ð° Ð½Ð°Ð»Ð¸Ñ?ÐµÐ½ ÐºÐµÑ?"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:359
-#: ../camel/providers/imap4/camel-imap4-journal.c:327
-#, c-format
-msgid "Cannot append message in offline mode: %s"
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:335
+#, fuzzy
+msgid "Cannot append message in offline mode: "
 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:46
 msgid "C_heck for new messages in all folders"
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?ÐºÐ° Ð·Ð° _Ð½Ð¾Ð²Ð¸ Ð¿Ð¸Ñ?Ð¼Ð° Ð²Ñ?Ð² Ð²Ñ?Ð¸Ñ?ÐºÐ¸ Ð¿Ð°Ð¿ÐºÐ¸"
 
-#: ../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/groupwise/camel-groupwise-provider.c:53
+#: ../camel/providers/imap/camel-imap-provider.c:64
 #: ../camel/providers/imapx/camel-imapx-provider.c:72
-#: ../camel/providers/local/camel-local-provider.c:46
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:106
+#: ../camel/providers/local/camel-local-provider.c:42
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:105
 msgid "Options"
 msgstr "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr ""
 "_Ð?Ñ?Ð¸Ð»Ð°Ð³Ð°Ð½Ðµ Ð½Ð° Ñ?Ð¸Ð»Ñ?Ñ?Ð¸ Ñ?Ð¿Ñ?Ñ?Ð¼Ð¾ Ð½Ð¾Ð²Ð¸Ñ?Ðµ Ð¿Ð¸Ñ?Ð¼Ð° Ð² Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ°Ñ?Ð° ÐºÑ?Ñ?Ð¸Ñ? Ð½Ð° Ñ?Ð¾Ð·Ð¸ Ñ?Ñ?Ñ?Ð²Ñ?Ñ?"
 
-#: ../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/groupwise/camel-groupwise-provider.c:59
+#: ../camel/providers/imap/camel-imap-provider.c:70
 #: ../camel/providers/imapx/camel-imapx-provider.c:78
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?ÐºÐ° Ð·Ð° Ñ?Ð¿Ð°Ð¼ Ñ?Ð°Ð¼Ð¾ Ð² Ð¿Ð°Ð¿ÐºÐ°Ñ?Ð° IN_BOX"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c: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:"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:80
+#, fuzzy
+msgid "Default GroupWise port"
+msgstr "Novell GroupWise"
+
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:86
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:88
 msgid "For accessing Novell GroupWise servers"
 msgstr "Ð?Ð° Ð´Ð¾Ñ?Ñ?Ñ?Ð¿ Ð´Ð¾ Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð¸ Novell GroupWise"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:104
-#: ../camel/providers/hula/camel-hula-provider.c:93
-#: ../camel/providers/imap/camel-imap-provider.c:100
-#: ../camel/providers/imap4/camel-imap4-provider.c:83
-#: ../camel/providers/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:105
+#: ../camel/providers/imap/camel-imap-provider.c:105
+#: ../camel/providers/imapx/camel-imapx-provider.c:113
+#: ../camel/providers/nntp/camel-nntp-provider.c:80
+#: ../camel/providers/pop3/camel-pop3-provider.c:81
 msgid "Password"
 msgstr "Ð?Ð°Ñ?Ð¾Ð»Ð°"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:107
 msgid ""
 "This option will connect to the GroupWise server using a plaintext password."
 msgstr "Ð¢Ð°Ð·Ð¸ Ð¾Ð¿Ñ?Ð¸Ñ? Ñ?Ðµ Ð²Ð¸ Ñ?Ð²Ñ?Ñ?Ð¶Ðµ Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ? GroupWise Ñ?Ñ?ÐµÐ· Ð½ÐµÑ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð° Ð¿Ð°Ñ?Ð¾Ð»Ð°."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:102
+#: ../camel/providers/groupwise/camel-groupwise-store.c:103
+#, c-format
 msgid "Host or user not available in url"
 msgstr "Ð¥Ð¾Ñ?Ñ?Ñ?Ñ? Ð¸Ð»Ð¸ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð¸Ñ?ÐµÐ»Ñ?Ñ? Ð½Ðµ Ñ?Ð° Ð½Ð°Ð»Ð¸Ñ?Ð½Ð¸ Ð² Ð°Ð´Ñ?ÐµÑ?Ð°"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:197
-#: ../camel/providers/imap/camel-imap-store.c:1356
+#: ../camel/providers/groupwise/camel-groupwise-store.c:205
+#: ../camel/providers/imap/camel-imap-store.c:801
+#: ../camel/providers/imapx/camel-imapx-server.c:3085
+#, c-format
 msgid "You did not enter a password."
 msgstr "Ð?Ðµ Ñ?Ñ?Ðµ Ð²Ñ?Ð²ÐµÐ»Ð¸ Ð¿Ð°Ñ?Ð¾Ð»Ð°."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:312
+#: ../camel/providers/groupwise/camel-groupwise-store.c:328
 msgid "Some features may not work correctly with your current server version"
 msgstr ""
 "Ð?Ñ?Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ðµ Ð½Ñ?ÐºÐ¾Ð¸ Ñ?Ñ?Ð½ÐºÑ?Ð¸Ð¸ Ð´Ð° Ð½Ðµ Ñ?Ð°Ð±Ð¾Ñ?Ñ?Ñ? Ð¿Ñ?Ð°Ð²Ð¸Ð»Ð½Ð¾ Ñ? Ñ?ÐµÐºÑ?Ñ?Ð°Ñ?Ð° Ð²ÐµÑ?Ñ?Ð¸Ñ? Ð½Ð° Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð°"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:533
-#: ../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:556
+#: ../camel/providers/imap/camel-imap-store.c:1808
+#: ../camel/providers/imap/camel-imap-store.c:2005
+#: ../camel/providers/imapx/camel-imapx-store.c:341
 #, c-format
 msgid "No such folder %s"
 msgstr "Ð?Ñ?Ð¼Ð° Ñ?Ð°ÐºÐ°Ð²Ð° Ð¿Ð°Ð¿ÐºÐ° â??%sâ??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1201
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1217
+#, c-format
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "Ð?Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ñ?Ðµ Ð¿Ð°Ð¿ÐºÐ¸ Ð² GroupWise Ð´Ð¾ÐºÐ°Ñ?Ð¾ Ñ?Ñ?Ðµ Ð² Ñ?ÐµÐ¶Ð¸Ð¼ â??Ð?Ð·ÐºÐ»Ñ?Ñ?ÐµÐ½â??."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1215
-#: ../camel/providers/imap/camel-imap-store.c:1954
-#: ../camel/providers/imap/camel-imap-store.c:2334
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1226
+#, fuzzy, c-format
+msgid "Cannot create a special system folder"
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¸Ð·Ñ?Ñ?Ð¸Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°Ñ?Ð° â??%sâ??: Ñ?Ð¿ÐµÑ?Ð¸Ð°Ð»Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°"
+
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1236
+#: ../camel/providers/imap/camel-imap-store.c:1886
+#: ../camel/providers/imap/camel-imap-store.c:2323
+#: ../camel/providers/imapx/camel-imapx-store.c:1340
+#, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ð?Ð° Ñ?Ð¾Ð´Ð¸Ñ?ÐµÐ»Ñ?ÐºÐ°Ñ?Ð° Ð¿Ð°Ð¿ÐºÐ° Ð½Ðµ Ðµ Ñ?Ð°Ð·Ñ?ÐµÑ?ÐµÐ½Ð¾ Ð´Ð° Ð¸Ð¼Ð° Ð¿Ð¾Ð´Ð¿Ð°Ð¿ÐºÐ¸"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1294
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1317
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1321
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1346
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
 msgstr "Ð?Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¿Ñ?ÐµÐ¸Ð¼ÐµÐ½Ñ?Ð²Ð°Ñ?Ðµ Ð¿Ð°Ð¿ÐºÐ°Ñ?Ð° â??%sâ?? Ð² GroupWise Ð½Ð° â??%sâ??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1349
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1380
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:47
 #, c-format
 msgid "GroupWise server %s"
 msgstr "Ð¡Ñ?Ñ?Ð²Ñ?Ñ? Ð½Ð° GroupWise %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1351
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "Ð£Ñ?Ð»Ñ?Ð³Ð° Ð½Ð° GroupWise Ð·Ð° %s Ð½Ð° %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:122
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:51
 #, c-format
 msgid "GroupWise mail delivery via %s"
 msgstr "Ð?Ð¾Ñ?Ð° Ð½Ð° Groupwise Ð¿Ñ?ÐµÐ· %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:164
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:97
 msgid "Sending Message"
 msgstr "Ð?Ð·Ð¿Ñ?Ð°Ñ?Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:212
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:107
+#, c-format
+msgid "Cannot get folder: Invalid operation on this store"
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°Ñ?Ð°: Ð³Ñ?ÐµÑ?Ð½Ð° Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ? Ð·Ð° Ñ?Ð¾Ð²Ð° Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ"
+
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
+#, c-format
 msgid ""
 "You have exceeded this account's storage limit. Your messages are queued in "
 "your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
@@ -2788,100 +3109,36 @@ 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:159
 #, 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 "_Ð?Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð´Ñ?Ñ?Ð³Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Ð·Ð° Ð²Ñ?Ñ?Ð·ÐºÐ° Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð°"
-
-#: ../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 "_Ð?Ð¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ñ?Ð°Ð¼Ð¾ Ð½Ð° Ð°Ð±Ð¾Ð½Ð¸Ñ?Ð°Ð½Ð¸Ñ?Ðµ Ð¿Ð°Ð¿ÐºÐ¸"
-
-#: ../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 "Ð¢Ð°Ð·Ð¸ Ð¾Ð¿Ñ?Ð¸Ñ? Ñ?Ðµ Ð²Ð¸ Ñ?Ð²Ñ?Ñ?Ð¶Ðµ Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ? Ð½Ð° Hula Ñ?Ñ?ÐµÐ· Ð½ÐµÑ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð° Ð¿Ð°Ñ?Ð¾Ð»Ð°."
-
-#: ../camel/providers/imap/camel-imap-command.c:181
-#: ../camel/providers/imap/camel-imap-command.c:265
+#: ../camel/providers/imap/camel-imap-command.c:197
+#: ../camel/providers/imap/camel-imap-command.c:301
+#, c-format
 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:205
+#: ../camel/providers/imap/camel-imap-command.c:309
+#, c-format
 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:255
+#, c-format
 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:373
 #, 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:394
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -2890,260 +3147,259 @@ msgstr ""
 "Ð?Ñ?ÐµÐ´Ñ?Ð¿Ñ?ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð¾Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð·Ð° IMAP %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:421
+#: ../camel/providers/imap/camel-imap-command.c:468
 #, 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:480
 #, 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:560
+#, c-format
 msgid "Server response ended too soon."
 msgstr "Ð?Ñ?Ð³Ð¾Ð²Ð¾Ñ?Ñ?Ñ? Ð½Ð° Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð·Ð°Ð²Ñ?Ñ?Ñ?Ð¸ Ñ?Ð²Ñ?Ñ?Ð´Ðµ Ð±Ñ?Ñ?Ð·Ð¾."
 
-#: ../camel/providers/imap/camel-imap-command.c:712
+#: ../camel/providers/imap/camel-imap-command.c:771
 #, 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:809
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Ð?ÐµÐ¾Ñ?Ð°ÐºÐ²Ð°Ð½ Ð¾Ñ?Ð³Ð¾Ð²Ð¾Ñ? OK Ð¾Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð·Ð° IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:90
+#: ../camel/providers/imap/camel-imap-folder.c:292
 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:369
 #, 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:992
+#: ../camel/providers/imapx/camel-imapx-server.c:3915
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?ÐºÐ° Ð·Ð° Ð¿Ñ?Ð¾Ð¼ÐµÐ½ÐµÐ½Ð¸ Ð¿Ð¸Ñ?Ð¼Ð° Ð² %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1986
-#, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr "Ð?ÐµÐ¾Ñ?Ð°ÐºÐ²Ð°Ð½ Ð¾Ñ?Ð³Ð¾Ð²Ð¾Ñ? Ð·Ð° Ñ?Ñ?Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ðµ â??%sâ?? Ñ?Ð»ÐµÐ´ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° APPEND"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2001
-msgid "No response on continuation after APPEND command"
-msgstr "Ð?Ñ?Ð¼Ð° Ð¾Ñ?Ð³Ð¾Ð²Ð¾Ñ? Ð·Ð° Ð¿Ñ?Ð¾Ð´Ñ?Ð»Ð¶Ð°Ð²Ð°Ð½Ðµ Ñ?Ð»ÐµÐ´ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° APPEND"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2046
-msgid "Unknown error occurred during APPEND command!"
-msgstr "Ð?Ñ?Ð·Ð½Ð¸ÐºÐ½Ð° Ð½ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ð° Ð³Ñ?ÐµÑ?ÐºÐ° Ð¿Ð¾ Ð²Ñ?ÐµÐ¼Ðµ Ð½Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° APPEND."
-
-#: ../camel/providers/imap/camel-imap-folder.c:2877
-#, c-format
-msgid "Unable to retrieve message: %s"
+#: ../camel/providers/imap/camel-imap-folder.c:3369
+#, fuzzy
+msgid "Unable to retrieve message: "
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¸Ð·Ð²Ð»Ð¸Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2912
+#: ../camel/providers/imap/camel-imap-folder.c:3404
+#: ../camel/providers/imapx/camel-imapx-server.c:5193
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾ Ñ? Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? %s: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2913
+#: ../camel/providers/imap/camel-imap-folder.c:3405
+#: ../camel/providers/imapx/camel-imapx-server.c:5194
 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:3480
+#: ../camel/providers/imap/camel-imap-folder.c:4375
+#: ../camel/providers/nntp/camel-nntp-folder.c:402
+#, c-format
 msgid "This message is not currently available"
 msgstr "Ð¢Ð¾Ð²Ð° Ð¿Ð¸Ñ?Ð¼Ð¾ Ð½Ðµ Ðµ Ð½Ð°Ð»Ð¸Ñ?Ð½Ð¾ Ð² Ð¼Ð¾Ð¼ÐµÐ½Ñ?Ð°"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3632
+#: ../camel/providers/imap/camel-imap-folder.c:4176
 #, 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:4186
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "Ð?ÐµÐ¿Ñ?Ð»ÐµÐ½ Ð¾Ñ?Ð³Ð¾Ð²Ð¾Ñ? Ð¾Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð°: Ð¿Ð¸Ñ?Ð¼Ð¾ %d Ð½Ñ?Ð¼Ð° Ñ?Ð½Ð¸ÐºÐ°Ð»ÐµÐ½ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ?"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3857
+#: ../camel/providers/imap/camel-imap-folder.c:4415
+#, c-format
 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
-#, c-format
-msgid "Could not open cache directory: %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:193
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
+#, fuzzy
+msgid "Could not open cache directory: "
 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:326
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ ÐºÐµÑ?Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾ %s: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:530
-#, c-format
-msgid "Failed to cache %s: %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:391
+#, fuzzy, c-format
+msgid "Failed to cache message %s: "
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ ÐºÐµÑ?Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾ %s: %s"
+
+#: ../camel/providers/imap/camel-imap-message-cache.c:529
+#, fuzzy, c-format
+msgid "Failed to cache %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:40
+msgid "Checking for New Mail"
+msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?ÐºÐ° Ð·Ð° Ð½Ð¾Ð²Ð° Ð¿Ð¾Ñ?Ð°"
+
+#: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?ÐºÐ° Ð·Ð° _Ð½Ð¾Ð²Ð¸ Ð¿Ð¸Ñ?Ð¼Ð° Ð² Ð°Ð±Ð¾Ð½Ð¸Ñ?Ð°Ð½Ð¸Ñ?Ðµ Ð¿Ð°Ð¿ÐºÐ¸"
 
-#: ../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:"
-msgstr "Ð?Ñ?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ð²Ð¾ Ð½Ð° Ð¸Ð¼ÐµÐ½Ð°Ñ?Ð°:"
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:52
+msgid "Connection to Server"
+msgstr "Ð¡Ð²Ñ?Ñ?Ð·Ð²Ð°Ð½Ðµ Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð°"
 
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:53
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
-msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "Ð?Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½Ðµ Ð½Ð° _Ñ?Ð¸Ð»Ñ?Ñ?Ð¸ Ð·Ð° Ð½Ð¾Ð²Ð¸ Ð¿Ð¸Ñ?Ð¼Ð° Ð² INBOX Ð¾Ñ? Ñ?Ð¾Ð·Ð¸ Ñ?Ñ?Ñ?Ð²Ñ?Ñ?"
+#: ../camel/providers/imap/camel-imap-provider.c:50
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
+msgid "_Use custom command to connect to server"
+msgstr "_Ð?Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð´Ñ?Ñ?Ð³Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Ð·Ð° Ð²Ñ?Ñ?Ð·ÐºÐ° Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð°"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
-#: ../camel/providers/imapx/camel-imapx-provider.c:76
-msgid "Check new messages for Jun_k contents"
-msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?ÐºÐ° Ð½Ð° Ð½Ð¾Ð²Ð¸Ñ?Ðµ Ð¿Ð¸Ñ?Ð¼Ð° Ð·Ð° _Ñ?Ð¿Ð°Ð¼"
+#: ../camel/providers/imap/camel-imap-provider.c:52
+#, fuzzy
+msgid "Co_mmand:"
+msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°:"
 
-#: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:59
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:62
+#: ../camel/providers/nntp/camel-nntp-provider.c:42
+msgid "Folders"
+msgstr "Ð?Ð°Ð¿ÐºÐ¸"
+
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
+msgid "_Show only subscribed folders"
+msgstr "_Ð?Ð¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ñ?Ð°Ð¼Ð¾ Ð½Ð° Ð°Ð±Ð¾Ð½Ð¸Ñ?Ð°Ð½Ð¸Ñ?Ðµ Ð¿Ð°Ð¿ÐºÐ¸"
+
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
+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:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
+msgid "Check new messages for Jun_k contents"
+msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?ÐºÐ° Ð½Ð° Ð½Ð¾Ð²Ð¸Ñ?Ðµ Ð¿Ð¸Ñ?Ð¼Ð° Ð·Ð° _Ñ?Ð¿Ð°Ð¼"
+
+#: ../camel/providers/imap/camel-imap-provider.c:72
 #: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "Ð?Ð²Ñ?Ð¾Ð¼Ð°Ñ?Ð¸Ñ?Ð½Ð¾ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾ Ñ?Ð¸Ð½Ñ?Ñ?Ð¾Ð½Ð¸_Ð·Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Ð¾Ñ?Ð´Ð°Ð»ÐµÑ?ÐµÐ½Ð°Ñ?Ð° Ð¿Ð¾Ñ?Ð°"
 
-#: ../camel/providers/imap/camel-imap-provider.c:83
+#: ../camel/providers/imap/camel-imap-provider.c:78
+msgid "IMAP default port"
+msgstr "Ð¡Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?ÐµÐ½ Ð¿Ð¾Ñ?Ñ? Ð·Ð° IMAP"
+
+#: ../camel/providers/imap/camel-imap-provider.c:79
+#: ../camel/providers/imapx/camel-imapx-provider.c:87
+msgid "IMAP over SSL"
+msgstr "IMAP Ð¿Ñ?ÐµÐ· SSL"
+
+#: ../camel/providers/imap/camel-imap-provider.c:85
 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:87
+#: ../camel/providers/imapx/camel-imapx-provider.c:96
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Ð?Ð° Ñ?ÐµÑ?ÐµÐ½Ðµ Ð¸ Ð·Ð°Ð¿Ð°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾Ñ?Ð° Ð½Ð° Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð¸ Ð·Ð° IMAP."
 
-#: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapx/camel-imapx-provider.c:106
+#: ../camel/providers/imap/camel-imap-provider.c:107
+#: ../camel/providers/imapx/camel-imapx-provider.c:115
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Ð¢Ð°Ð·Ð¸ Ð¾Ð¿Ñ?Ð¸Ñ? Ñ?Ðµ Ð²Ð¸ Ñ?Ð²Ñ?Ñ?Ð¶Ðµ Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ? Ð·Ð° IMAP Ñ?Ñ?ÐµÐ· Ð½ÐµÑ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð° Ð¿Ð°Ñ?Ð¾Ð»Ð°."
 
-#: ../camel/providers/imap/camel-imap-store.c:435
-#: ../camel/providers/imap4/camel-imap4-store.c:210
-#: ../camel/providers/imapx/camel-imapx-store.c:167
-#, 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
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "Ð£Ñ?Ð»Ñ?Ð³Ð° Ð¿Ð¾ IMAP Ð·Ð° %s Ð½Ð° %s"
-
-#: ../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:243
+#: ../camel/providers/nntp/camel-nntp-store.c:342
+#: ../camel/providers/pop3/camel-pop3-store.c:135
+#: ../camel/providers/smtp/camel-smtp-transport.c:151
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ð²Ñ?Ñ?Ð·Ð²Ð°Ð½ÐµÑ?Ð¾ Ñ? %s: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c: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:244
+#: ../camel/providers/nntp/camel-nntp-store.c:343
+#: ../camel/providers/pop3/camel-pop3-store.c:136
+#: ../camel/providers/smtp/camel-smtp-transport.c:152
 msgid "SSL unavailable"
 msgstr "Ð?Ð¸Ð¿Ñ?Ð²Ð° SSL"
 
-#: ../camel/providers/imap/camel-imap-store.c:578
-#: ../camel/providers/imap/camel-imap-store.c:860
-#: ../camel/providers/imapx/camel-imapx-server.c:2017
-msgid "Connection cancelled"
-msgstr "Ð?Ñ?Ñ?Ð·ÐºÐ°Ñ?Ð° Ðµ Ð¿Ñ?ÐµÐºÑ?Ð°Ñ?ÐµÐ½Ð°"
+#: ../camel/providers/imap/camel-imap-store.c:264
+#: ../camel/providers/nntp/camel-nntp-store.c:362
+#, fuzzy, c-format
+msgid "Could not connect to %s: "
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ð²Ñ?Ñ?Ð·Ð²Ð°Ð½ÐµÑ?Ð¾ Ñ? %s: %s"
 
-#: ../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:370
+#: ../camel/providers/imap/camel-imap-store.c:390
+#: ../camel/providers/imap/camel-imap-store.c:397
+#: ../camel/providers/imap/camel-imap-store.c:424
+#: ../camel/providers/imapx/camel-imapx-server.c:2927
+#: ../camel/providers/imapx/camel-imapx-server.c:2967
 #, 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:371
+#: ../camel/providers/imapx/camel-imapx-server.c:2928
+#: ../camel/providers/smtp/camel-smtp-transport.c:238
 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:391
+#: ../camel/providers/imapx/camel-imapx-server.c:2968
 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:398
+#: ../camel/providers/smtp/camel-smtp-transport.c:285
 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:549
+#: ../camel/providers/imapx/camel-imapx-server.c:2755
+#, c-format
+msgid "Connection cancelled"
+msgstr "Ð?Ñ?Ñ?Ð·ÐºÐ°Ñ?Ð° Ðµ Ð¿Ñ?ÐµÐºÑ?Ð°Ñ?ÐµÐ½Ð°"
+
+#: ../camel/providers/imap/camel-imap-store.c:554
+#: ../camel/providers/imapx/camel-imapx-server.c:2760
 #, 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/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
-msgid "Inbox"
-msgstr "Ð?Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ° ÐºÑ?Ñ?Ð¸Ñ?"
-
-#: ../camel/providers/imap/camel-imap-store.c:1303
+#: ../camel/providers/imap/camel-imap-store.c:740
+#: ../camel/providers/imapx/camel-imapx-server.c:3041
 #, 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:752
+#: ../camel/providers/imapx/camel-imapx-server.c:3053
+#: ../camel/providers/smtp/camel-smtp-transport.c:420
 #, 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:836
+#: ../camel/providers/imapx/camel-imapx-server.c:3129
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3154,448 +3410,193 @@ 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:997
+#: ../camel/providers/imapx/camel-imapx-store.c:182
+#, c-format
+msgid "IMAP server %s"
+msgstr "Ð¡Ñ?Ñ?Ð²Ñ?Ñ? Ð·Ð° IMAP %s"
+
+#: ../camel/providers/imap/camel-imap-store.c:1001
+#: ../camel/providers/imapx/camel-imapx-store.c:184
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "Ð£Ñ?Ð»Ñ?Ð³Ð° Ð¿Ð¾ IMAP Ð·Ð° %s Ð½Ð° %s"
+
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/providers/imap/camel-imap-store.c:1367
+#: ../camel/providers/imap/camel-imap-store.c:2416
+#: ../camel/providers/imapx/camel-imapx-store.c:371
+#: ../camel/providers/imapx/camel-imapx-store.c:793
+#: ../camel/providers/local/camel-maildir-folder.c:409
+#: ../camel/providers/local/camel-maildir-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:615
+#: ../camel/providers/local/camel-maildir-store.c:621
+#: ../camel/providers/local/camel-maildir-store.c:669
+#: ../camel/providers/local/camel-spool-store.c:289
+msgid "Inbox"
+msgstr "Ð?Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ° ÐºÑ?Ñ?Ð¸Ñ?"
+
+#: ../camel/providers/imap/camel-imap-store.c:1822
+#: ../camel/providers/imap/camel-imap-store.c:2259
+#: ../camel/providers/imapx/camel-imapx-store.c:1319
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "Ð?Ð¼ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°Ñ?Ð° â??%sâ?? Ðµ Ð½ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»Ð½Ð¾, Ð·Ð°Ñ?Ð¾Ñ?Ð¾ Ñ?Ñ?Ð´Ñ?Ñ?Ð¶Ð° Ð·Ð½Ð°ÐºÐ° â??%câ??"
 
-#: ../camel/providers/imap/camel-imap-store.c: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:1939
+#: ../camel/providers/local/camel-maildir-store.c:244
+#: ../camel/providers/local/camel-mbox-store.c:407
+#: ../camel/providers/local/camel-mh-store.c:504
 #, 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:2272
+#: ../camel/providers/imapx/camel-imapx-store.c:1330
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ð° Ñ?Ð¾Ð´Ð¸Ñ?ÐµÐ»Ñ?ÐºÐ° Ð¿Ð°Ð¿ÐºÐ°: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3107
+#: ../camel/providers/imap/camel-imap-store.c:3137
+#, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "Ð¡Ñ?Ñ?Ð²Ñ?Ñ?Ñ?Ñ? Ð½ÐµÐ¾Ñ?Ð°ÐºÐ²Ð°Ð½Ð¾ Ð¿Ñ?ÐµÐºÑ?Ð°Ñ?Ð¸ Ð²Ñ?Ñ?Ð·ÐºÐ°Ñ?Ð°"
 
-#: ../camel/providers/imap4/camel-imap4-command.c:572
-#: ../camel/providers/imap4/camel-imap4-command.c:579
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¸Ð·Ð¿Ñ?Ð°Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° ÐºÑ?Ð¼ Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð·Ð° IMAP %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:681
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Ð?ÐµÐ¾Ñ?Ð°ÐºÐ²Ð°Ð½ Ð¾Ñ?Ð³Ð¾Ð²Ð¾Ñ? Ð¾Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð·Ð° IMAP4 %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:215
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "Ð?ÐµÐ¾Ñ?Ð°ÐºÐ²Ð°Ð½ Ð¿Ð¾Ð·Ð´Ñ?Ð°Ð² Ð¾Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð·Ð° IMAP %s."
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:440
-#, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr ""
-"Ð?Ð°Ð¿ÐºÐ°Ñ?Ð° â??%sâ?? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±Ñ?Ð´Ðµ Ð¸Ð·Ð±Ñ?Ð°Ð½Ð°: Ð½ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»Ð½Ð¾ Ð¸Ð¼Ðµ Ð½Ð° Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ°Ñ?Ð° ÐºÑ?Ñ?Ð¸Ñ?"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:446
-#, c-format
-msgid "Cannot select folder '%s': Bad command"
-msgstr "Ð?Ð°Ð¿ÐºÐ°Ñ?Ð° â??%sâ?? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±Ñ?Ð´Ðµ Ð¸Ð·Ð±Ñ?Ð°Ð½Ð°: Ð½ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»Ð½Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1414
-#, c-format
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¸Ð·Ð¿Ñ?Ð°Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° ÐºÑ?Ð¼ Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð·Ð° IMAP %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1416
-msgid "service unavailable"
-msgstr "Ñ?Ñ?Ð»Ñ?Ð³Ð°Ñ?Ð° Ð½Ðµ Ðµ Ð½Ð°Ð»Ð¸Ñ?Ð½Ð°"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1546
-#: ../camel/providers/imap4/camel-imap4-engine.c:1584
-#: ../camel/providers/imap4/camel-imap4-engine.c:1628
-#: ../camel/providers/imap4/camel-imap4-engine.c:1683
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Ð?Ñ?Ñ?Ð·ÐºÐ°Ñ?Ð° Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð·Ð° IMAP4 %s Ð¿Ñ?ÐµÐºÑ?Ñ?Ð½Ð° Ð½ÐµÐ¾Ñ?Ð°ÐºÐ²Ð°Ð½Ð¾: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:87
-msgid ""
-"Enable extended Mailing-List detection required for some filter and vFolder "
-"rules"
-msgstr ""
-"Ð?ÐºÐ»Ñ?Ñ?Ð²Ð°Ð½Ðµ Ð½Ð° Ð¾Ñ?ÐºÑ?Ð¸Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ¸Ñ?Ðµ Ñ?Ð¿Ð¸Ñ?Ñ?Ñ?Ð¸, Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½Ð¾ Ð² Ð½Ñ?ÐºÐ¾Ð¸ Ñ?Ð¸Ð»Ñ?Ñ?Ð¸ Ð¸ "
-"Ð²Ð¸Ñ?Ñ?Ñ?Ð°Ð»Ð½Ð¸ Ð¿Ð°Ð¿ÐºÐ¸"
-
-#: ../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 "Ð?Ñ?Ð¾Ð²ÐµÑ?ÐºÐ° Ð½Ð° Ð½Ð¾Ð²Ð¸Ñ?Ðµ Ð¿Ð¸Ñ?Ð¼Ð° Ð·Ð° _Ñ?Ð¿Ð°Ð¼"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:57
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?ÐºÐ° Ð·Ð° Ñ?Ð¿Ð°Ð¼ Ñ?Ð°Ð¼Ð¾ Ð½Ð° _Ð¿Ð¸Ñ?Ð¼Ð° Ð² Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ°Ñ?Ð° ÐºÑ?Ñ?Ð¸Ñ?"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:66
-msgid "IMAP4rev1"
-msgstr "IMAP4rev1"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:68
-msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr "Ð?Ð° Ñ?ÐµÑ?ÐµÐ½Ðµ Ð¸ Ð·Ð°Ð¿Ð°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾Ñ?Ð° Ð¾Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð¸ Ð·Ð° IMAPv4rev1."
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:85
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Ð¢Ð°Ð·Ð¸ Ð¾Ð¿Ñ?Ð¸Ñ? Ñ?Ðµ Ð²Ð¸ Ñ?Ð²Ñ?Ñ?Ð¶Ðµ Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ? Ð·Ð° IMAPv4rev1 Ñ?Ñ?ÐµÐ· Ð½ÐµÑ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð° Ð¿Ð°Ñ?Ð¾Ð»Ð°."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:259
-#: ../camel/providers/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 ""
-"Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?Ñ?Ð° LIST Ð·Ð° Ð¿Ð°Ð¿ÐºÐ°Ñ?Ð° â??%sâ?? Ð½Ð° Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð·Ð° "
-"IMAP %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/imap/camel-imap-store.c:3140
+#, fuzzy
+msgid "Server unexpectedly disconnected: "
+msgstr "Ð¡Ñ?Ñ?Ð²Ñ?Ñ?Ñ?Ñ? Ð½ÐµÐ¾Ñ?Ð°ÐºÐ²Ð°Ð½Ð¾ Ñ?Ðµ Ð¸Ð·ÐºÐ»Ñ?Ñ?Ð¸: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1137
+#: ../camel/providers/imapx/camel-imapx-folder.c:74
 #, c-format
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-msgstr ""
-"Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ñ?ÐµÐ¸Ð¼ÐµÐ½Ñ?Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ° â??%sâ?? Ð½Ð° â??%sâ??: Ð½ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»Ð½Ð¾ Ð¸Ð¼Ðµ Ð½Ð° Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ° "
-"ÐºÑ?Ñ?Ð¸Ñ?"
+msgid "Could not create folder summary for %s"
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¾Ð±Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°Ñ?Ð° Ð·Ð° â??%sâ??"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Bad command"
-msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ñ?ÐµÐ¸Ð¼ÐµÐ½Ñ?Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ° â??%sâ?? Ð½Ð° â??%sâ??: Ð½ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»Ð½Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°"
+#: ../camel/providers/imapx/camel-imapx-folder.c:82
+#, fuzzy, c-format
+msgid "Could not create cache for %s: "
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð²Ñ?ÐµÐ¼ÐµÐ½ÐµÐ½ Ñ?Ð°Ð¹Ð» Ð·Ð° %s"
 
-#. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
-#. * The fourth one is an error message.
-#: ../camel/providers/imap4/camel-imap4-store.c:1572
-#, c-format
-msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
+#, fuzzy
+msgid "Use _Quick Resync if the server supports it"
 msgstr ""
-"Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ? Ñ?Ð¸Ð¿ %s Ð·Ð° Ñ?Ð°Ð±Ð»Ð¾Ð½Ð° â??%sâ?? Ð½Ð° Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð·Ð° "
-"IMAP %s: %s"
+"Ð?Ð° Ñ?Ðµ Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð° Ð²Ñ?Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñ?Ñ?Ñ?Ð° Ð·Ð° _Ð±ÐµÐ·Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ, Ð°ÐºÐ¾ Ñ?Ðµ Ð¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð° Ð¾Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð°"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1633
-msgid "Cannot subscribe to IMAP folders in offline mode."
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
+msgid "Use I_dle if the server supports it"
 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 ""
-"Ð?Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¿Ñ?ÐµÐºÑ?Ð°Ñ?Ð¸Ñ?Ðµ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ?Ð° Ð·Ð° Ð¿Ð°Ð¿ÐºÐ¸ Ð¿Ð¾ IMAP Ð´Ð¾ÐºÐ°Ñ?Ð¾ Ñ?Ñ?Ðµ Ð² Ñ?ÐµÐ¶Ð¸Ð¼ "
-"â??Ð?Ð·ÐºÐ»Ñ?Ñ?ÐµÐ½â??."
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "Command:"
+msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1750
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr ""
-"Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ñ?ÐµÐºÑ?Ð°Ñ?Ñ?Ð²Ð°Ð½Ðµ Ð½Ð° Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ?Ð° Ð·Ð° Ð¿Ð°Ð¿ÐºÐ° â??%sâ??: Ð½ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»Ð½Ð¾ Ð¸Ð¼Ðµ Ð½Ð° "
-"Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ° ÐºÑ?Ñ?Ð¸Ñ?"
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
+msgid "Numbe_r of cached connections to use"
+msgstr "_Ð?Ñ?Ð¾Ð¹ ÐºÐµÑ?Ð¸Ñ?Ð°Ð½Ð¸ Ð²Ñ?Ñ?Ð·ÐºÐ¸, ÐºÐ¾Ð¸Ñ?Ð¾ Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð»Ð·Ð²Ð°Ñ?"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr ""
-"Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ñ?ÐµÐºÑ?Ð°Ñ?Ñ?Ð²Ð°Ð½Ðµ Ð½Ð° Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ?Ð° Ð·Ð° Ð¿Ð°Ð¿ÐºÐ° â??%sâ??: Ð½ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»Ð½Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°"
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
+msgid "Namespace:"
+msgstr "Ð?Ñ?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ð²Ð¾ Ð½Ð° Ð¸Ð¼ÐµÐ½Ð°Ñ?Ð°:"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1590
-msgid "Scanning for changed messages"
-msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?ÐºÐ° Ð·Ð° Ð¿Ñ?Ð¾Ð¼ÐµÐ½ÐµÐ½Ð¸ Ð¿Ð¸Ñ?Ð¼Ð°"
+#: ../camel/providers/imapx/camel-imapx-provider.c:86
+msgid "Defalut IMAP port"
+msgstr "Ð¡Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?ÐµÐ½ Ð¿Ð¾Ñ?Ñ? Ð·Ð° IMAP"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1611
-#, c-format
-msgid "IMAP server %s is in an inconsistent state."
-msgstr "Ð¡Ñ?Ñ?Ð²Ñ?Ñ?Ñ?Ñ? Ð·Ð° IMAP %s Ðµ Ð² Ð½ÐµÐºÐ¾Ñ?ÐµÐºÑ?Ð½Ð¾ Ñ?Ñ?Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ðµ."
+#: ../camel/providers/imapx/camel-imapx-provider.c:94
+msgid "IMAP+"
+msgstr "IMAP+"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1638
-msgid "Fetching envelopes of new messages"
-msgstr "Ð?Ð·Ñ?ÐµÐ³Ð»Ñ?Ð½Ðµ Ð½Ð° Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ? Ð·Ð° Ð½Ð¾Ð²Ð¸ Ð¿Ð¸Ñ?Ð¼Ð°"
+#: ../camel/providers/imapx/camel-imapx-server.c:1404
+#, fuzzy
+msgid "Error writing to cache stream: "
+msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð·Ð°Ð¿Ð°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾Ñ?Ð° Ð²Ñ?Ð² Ð²Ñ?ÐµÐ¼ÐµÐ½ÐµÐ½ Ñ?Ð°Ð¹Ð»: %s"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:429
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Ð?ÐµÐ¾Ñ?Ð°ÐºÐ²Ð°Ð½Ð¸ Ð·Ð½Ð°Ñ?Ð¸ Ð² Ð¾Ñ?Ð³Ð¾Ð²Ð¾Ñ?Ð° Ð¾Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð·Ð° IMAP %s: "
+#: ../camel/providers/imapx/camel-imapx-server.c:2083
+#, fuzzy, c-format
+msgid "Not authenticated"
+msgstr "Ð?Ð¾Ñ?Ñ?ÐµÐ±Ð¸Ñ?ÐµÐ»Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸Ñ?Ð¸Ñ?Ð°"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:452
-msgid "No data"
-msgstr "Ð?Ñ?Ð¼Ð° Ð´Ð°Ð½Ð½Ð¸"
+#: ../camel/providers/imapx/camel-imapx-server.c:2850
+#, fuzzy, c-format
+msgid "Could not connect to %s (port %s): "
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ð²Ñ?Ñ?Ð·Ð²Ð°Ð½ÐµÑ?Ð¾ Ñ? %s (Ð¿Ð¾Ñ?Ñ? %s): %s"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:613
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Ð?Ñ?Ñ?Ð·ÐºÐ°Ñ?Ð° Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð·Ð° IMAP %s Ð¿Ñ?ÐµÐºÑ?Ñ?Ð½Ð° Ð½ÐµÐ¾Ñ?Ð°ÐºÐ²Ð°Ð½Ð¾: %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:3311
+#, fuzzy
+msgid "Closing tmp stream failed: "
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð¾ Ð¸Ð·Ð¿Ñ?Ð°Ñ?Ð°Ð½Ðµ: %s"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:84
-#, c-format
-msgid "Could not create folder summary for %s"
-msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¾Ð±Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°Ñ?Ð° Ð·Ð° â??%sâ??"
+#: ../camel/providers/imapx/camel-imapx-server.c:5343
+#: ../camel/providers/imapx/camel-imapx-server.c:5358
+#, fuzzy
+msgid "Cannot create spool file: "
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾: %s"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:92
+#: ../camel/providers/imapx/camel-imapx-store.c:1135
+#: ../camel/providers/nntp/camel-nntp-store.c:1666
 #, c-format
-msgid "Could not create cache for %s"
-msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð²Ñ?ÐµÐ¼ÐµÐ½ÐµÐ½ Ñ?Ð°Ð¹Ð» Ð·Ð° %s"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
-msgid "Use I_dle if the server supports it"
-msgstr ""
-"Ð?Ð° Ñ?Ðµ Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð° Ð²Ñ?Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñ?Ñ?Ñ?Ð° Ð·Ð° _Ð±ÐµÐ·Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ, Ð°ÐºÐ¾ Ñ?Ðµ Ð¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð° Ð¾Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð°"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:60
-msgid "Numbe_r of cached connections to use"
-msgstr "_Ð?Ñ?Ð¾Ð¹ ÐºÐµÑ?Ð¸Ñ?Ð°Ð½Ð¸ Ð²Ñ?Ñ?Ð·ÐºÐ¸, ÐºÐ¾Ð¸Ñ?Ð¾ Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð»Ð·Ð²Ð°Ñ?"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
-msgid "IMAP+"
-msgstr "IMAP+"
+msgid "No such folder: %s"
+msgstr "Ð?Ñ?Ð¼Ð° Ñ?Ð°ÐºÐ°Ð²Ð° Ð¿Ð°Ð¿ÐºÐ°: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2020
+#: ../camel/providers/imapx/camel-imapx-stream.c:70
 #, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ð²Ñ?Ñ?Ð·Ð²Ð°Ð½ÐµÑ?Ð¾ Ñ? %s (Ð¿Ð¾Ñ?Ñ? %s): %s"
+msgid "Source stream returned no data"
+msgstr "Ð?Ð·Ñ?Ð¾Ð´Ð½Ð¸Ñ?Ñ? Ð¿Ð¾Ñ?Ð¾Ðº Ð½Ðµ Ð²Ñ?Ñ?Ð½Ð° Ð´Ð°Ð½Ð½Ð¸"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2100
-#, c-format
-msgid "%sPlease enter the IMAP password for %s %s"
-msgstr "%sÐ?Ð¾Ð»Ñ? Ð²Ñ?Ð²ÐµÐ´ÐµÑ?Ðµ Ð¿Ð°Ñ?Ð¾Ð»Ð° Ð·Ð° IMAP Ð·Ð° %s %s"
+#: ../camel/providers/imapx/camel-imapx-stream.c:79
+#, fuzzy, c-format
+msgid "Source stream unavailable"
+msgstr "Ñ?Ñ?Ð»Ñ?Ð³Ð°Ñ?Ð° Ð½Ðµ Ðµ Ð½Ð°Ð»Ð¸Ñ?Ð½Ð°"
 
 #: ../camel/providers/local/camel-local-folder.c:178
-msgid "Index message body data"
-msgstr "Ð?Ð½Ð´ÐµÐºÑ?Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Ð´Ð°Ð½Ð½Ð¸Ñ?Ðµ Ð·Ð° Ñ?Ñ?Ð»Ð¾Ñ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð°Ñ?Ð°"
-
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:399
-#: ../camel/providers/local/camel-local-folder.c:402
+#: ../camel/providers/local/camel-local-folder.c:188
+#: ../camel/providers/local/camel-local-folder.c:197
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ° ÐºÑ?Ñ?Ð¸Ñ?: %s (%s)"
 
-#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:406
+#: ../camel/providers/local/camel-local-folder.c:206
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-provider.c:48
+#: ../camel/providers/local/camel-local-folder.c:466
+msgid "Index message body data"
+msgstr "Ð?Ð½Ð´ÐµÐºÑ?Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Ð´Ð°Ð½Ð½Ð¸Ñ?Ðµ Ð·Ð° Ñ?Ñ?Ð»Ð¾Ñ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð°Ñ?Ð°"
+
+#: ../camel/providers/local/camel-local-folder.c:700
+#, fuzzy, c-format
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
+msgstr ""
+"Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¸Ð·Ð²Ð»Ð¸Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾: %s Ð¾Ñ? Ð¿Ð°Ð¿ÐºÐ° %s\n"
+"  %s"
+
+#: ../camel/providers/local/camel-local-provider.c:44
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr "_Ð?Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ñ?Ð°Ð¹Ð»Ð° â??.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."
 
-#: ../camel/providers/local/camel-local-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:70
 msgid "Local delivery"
 msgstr "Ð?Ð¾ÐºÐ°Ð»Ð½Ð¾ Ñ?Ð°Ð·Ð¿Ñ?ÐµÐ´ÐµÐ»Ñ?Ð½Ðµ"
 
-#: ../camel/providers/local/camel-local-provider.c:74
+#: ../camel/providers/local/camel-local-provider.c:71
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
@@ -3603,29 +3604,29 @@ msgstr ""
 "Ð?Ð° Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ð²Ð°Ð½Ðµ (Ð¿Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð²Ð°Ð½Ðµ) Ð½Ð° Ð»Ð¾ÐºÐ°Ð»Ð½Ð°Ñ?Ð° Ð¿Ð¾Ñ?Ð° Ð¾Ñ? Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?ÐµÐ½ Ñ?Ð¿Ñ?Ð»ÐµÑ? Ð²Ñ?Ð² "
 "Ñ?Ð¾Ñ?Ð¼Ð°Ñ? mbox ÐºÑ?Ð¼ Ð¿Ð°Ð¿ÐºÐ¸ Ð¿Ð¾Ð´ Ñ?Ð¿Ñ?Ð°Ð²Ð»ÐµÐ½Ð¸ÐµÑ?Ð¾ Ð½Ð° Evolution."
 
-#: ../camel/providers/local/camel-local-provider.c:88
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:86
+#: ../camel/providers/local/camel-local-provider.c:106
 msgid "_Apply filters to new messages in INBOX"
 msgstr "Ð?Ñ?Ð¸Ð»Ð°Ð³Ð°Ð½Ðµ Ð½Ð° _Ñ?Ð¸Ð»Ñ?Ñ?Ð¸ Ð·Ð° Ð½Ð¾Ð²Ð¸ Ñ?Ñ?Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ? Ð² INBOX"
 
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:93
 msgid "Maildir-format mail directories"
 msgstr "Ð?Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ¸ Ð¿Ð°Ð¿ÐºÐ¸ Ñ?Ð¾Ñ?Ð¼Ð°Ñ? Maildir"
 
-#: ../camel/providers/local/camel-local-provider.c:96
+#: ../camel/providers/local/camel-local-provider.c:94
 msgid "For storing local mail in maildir directories."
 msgstr "Ð?Ð° Ñ?Ñ?Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¸Ðµ Ð½Ð° Ð»Ð¾ÐºÐ°Ð»Ð½Ð° Ð¿Ð¾Ñ?Ð° Ð² Ð¿Ð°Ð¿ÐºÐ¸ Ñ?Ð¸Ð¿ maildir."
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:107
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr ""
 "_Ð?Ð°Ð¿Ð°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð·Ð°Ð³Ð»Ð°Ð²Ð½Ð¸Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ Ð·Ð° Ñ?Ñ?Ñ?Ñ?Ð¾Ñ?Ð½Ð¸ÐµÑ?Ð¾ Ð²Ñ?Ð² Ñ?Ð¾Ñ?Ð¼Ð°Ñ? Ð½Ð° Elm/Pine/Mutt"
 
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:114
 msgid "Standard Unix mbox spool file"
 msgstr "Ð¡Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?ÐµÐ½ Ð·Ð° â??Ð®Ð½Ð¸ÐºÑ?â?? Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ¸ Ñ?Ð°Ð¹Ð» (Ñ?Ð¿Ñ?Ð»ÐµÑ? mbox)"
 
-#: ../camel/providers/local/camel-local-provider.c:116
+#: ../camel/providers/local/camel-local-provider.c:115
 #: ../camel/providers/local/camel-local-provider.c:127
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
@@ -3640,210 +3641,220 @@ msgstr ""
 msgid "Standard Unix mbox spool directory"
 msgstr "Ð¡Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?Ð½Ð° Ð·Ð° Unix Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ° Ð¿Ð°Ð¿ÐºÐ° (Ñ?Ð¿Ñ?Ð»ÐµÑ? mbox)"
 
-#: ../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:174
+#: ../camel/providers/local/camel-local-store.c:319
+#: ../camel/providers/local/camel-maildir-store.c:92
+#: ../camel/providers/local/camel-mbox-store.c:526
+#: ../camel/providers/local/camel-spool-store.c:318
 #, 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:183
 #, 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:194
+#: ../camel/providers/local/camel-local-store.c:204
+#: ../camel/providers/local/camel-local-store.c:332
+#: ../camel/providers/local/camel-maildir-store.c:124
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¾Ñ?Ð²Ð°Ñ?Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:199
+#: ../camel/providers/local/camel-local-store.c:220
+#, c-format
 msgid "Local stores do not have an inbox"
-msgstr "Ð?Ñ?Ð¸ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾ Ð·Ð°Ð¿Ð°Ð·Ð²Ð°Ð½Ðµ Ð½Ñ?Ð¼Ð° Ð²Ñ?Ð¾Ð´Ñ?Ñ?Ð° Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ° ÐºÑ?Ñ?Ð¸Ñ?"
+msgstr "Ð?Ñ?Ð¸ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾ Ð·Ð°Ð¿Ð°Ð·Ð²Ð°Ð½Ðµ Ð½Ñ?Ð¼Ð° Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ° ÐºÑ?Ñ?Ð¸Ñ?"
 
-#: ../camel/providers/local/camel-local-store.c:245
+#: ../camel/providers/local/camel-local-store.c:281
 #, c-format
 msgid "Local mail file %s"
 msgstr "Ð?Ð¾ÐºÐ°Ð»ÐµÐ½ Ñ?Ð°Ð¹Ð» Ñ? Ð¿Ð¾Ñ?Ð° %s"
 
-#: ../camel/providers/local/camel-local-store.c:340
+#: ../camel/providers/local/camel-local-store.c:393
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ñ?ÐµÐ¸Ð¼ÐµÐ½Ñ?Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ° %s Ð½Ð° %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:408
+#: ../camel/providers/local/camel-local-store.c:467
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ñ?ÐµÐ¸Ð¼ÐµÐ½Ñ?Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-local-store.c:433
-#: ../camel/providers/local/camel-mbox-store.c:298
+#: ../camel/providers/local/camel-local-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:695
 #, 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:526
+#: ../camel/providers/local/camel-mbox-store.c:724
 #, 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:548
+#, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð´Ð¾Ð±Ð°Ð²Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾ ÐºÑ?Ð¼ Ð¾Ð±Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ: Ð½ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ð° Ð¿Ñ?Ð¸Ñ?Ð¸Ð½Ð°"
 
-#: ../camel/providers/local/camel-maildir-folder.c:230
-msgid "Maildir append message canceled"
-msgstr "Ð?Ð¾Ð±Ð°Ð²Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾ Ð² maildir Ðµ Ð¾Ñ?Ð¼ÐµÐ½ÐµÐ½Ð¾"
-
-#: ../camel/providers/local/camel-maildir-folder.c:233
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
+#: ../camel/providers/local/camel-maildir-folder.c:198
+#, fuzzy, c-format
+msgid "Cannot append message to maildir folder: %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"
+#: ../camel/providers/local/camel-maildir-folder.c:246
+#: ../camel/providers/local/camel-maildir-folder.c:256
+#: ../camel/providers/local/camel-mbox-folder.c:386
+#: ../camel/providers/local/camel-mh-folder.c:168
+#: ../camel/providers/local/camel-mh-folder.c:178
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder %s: "
 msgstr ""
 "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¸Ð·Ð²Ð»Ð¸Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾: %s Ð¾Ñ? Ð¿Ð°Ð¿ÐºÐ° %s\n"
 "  %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:315
-msgid "Invalid message contents"
-msgstr "Ð?ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»Ð½Ð¾ Ñ?Ñ?Ð´Ñ?Ñ?Ð¶Ð°Ð½Ð¸Ðµ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾"
-
-#: ../camel/providers/local/camel-maildir-folder.c:418
-msgid "Cannot transfer message to destination folder"
+#: ../camel/providers/local/camel-maildir-folder.c:326
+#, fuzzy, c-format
+msgid "Cannot transfer message to destination folder: %s"
 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:100
+#, fuzzy, c-format
+msgid "Cannot create folder: %s : Folder name cannot contain a dot"
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°: %s: Ð²ÐµÑ?Ðµ Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?Ð²Ð°"
+
+#: ../camel/providers/local/camel-maildir-store.c:109
+#: ../camel/providers/local/camel-maildir-store.c:686
+#, fuzzy, c-format
+msgid "Folder %s already exists"
+msgstr "Ð?Ð°Ð¿ÐºÐ°Ñ?Ð° Ð²ÐµÑ?Ðµ Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?Ð²Ð°"
+
+#: ../camel/providers/local/camel-maildir-store.c:191
+#: ../camel/providers/local/camel-maildir-store.c:222
+#: ../camel/providers/local/camel-mbox-store.c:375
+#: ../camel/providers/local/camel-mbox-store.c:389
 #, 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:206
+#: ../camel/providers/local/camel-mbox-store.c:341
+#: ../camel/providers/local/camel-mh-store.c:464
 #, 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:212
+#: ../camel/providers/local/camel-mbox-store.c:351
+#: ../camel/providers/local/camel-mh-store.c:473
 #, 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:239
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¸Ð·Ð²Ð»Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ° â??%sâ??: Ð½Ðµ Ðµ Ð¿Ð°Ð¿ÐºÐ° Ñ?Ð¸Ð¿ maildir."
 
-#: ../camel/providers/local/camel-maildir-store.c:234
-#: ../camel/providers/local/camel-maildir-store.c:272
-#: ../camel/providers/local/camel-mh-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:293
+#: ../camel/providers/local/camel-maildir-store.c:333
+#: ../camel/providers/local/camel-mh-store.c:584
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¸Ð·Ñ?Ñ?Ð¸Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ° â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:295
 msgid "not a maildir directory"
 msgstr "Ð½Ðµ Ðµ Ð¿Ð°Ð¿ÐºÐ° Ñ?Ð¸Ð¿ maildir"
 
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:328
-#: ../camel/providers/local/camel-spool-store.c:342
+#: ../camel/providers/local/camel-maildir-store.c:508
+#: ../camel/providers/local/camel-maildir-store.c:825
+#: ../camel/providers/local/camel-spool-store.c:143
+#: ../camel/providers/local/camel-spool-store.c:159
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr ""
 "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?ÐºÐ°Ð½Ð¸Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ° â??%sâ??:\n"
 "%s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:432
-#: ../camel/providers/local/camel-maildir-summary.c:551
+#: ../camel/providers/local/camel-maildir-store.c:677
+#, c-format
+msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°: %s: Ð?Ð¼ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ° Ð½Ðµ Ñ?Ñ?Ñ?Ð±Ð²Ð° Ð´Ð° Ñ?Ñ?Ð´Ñ?Ñ?Ð¶Ð° â??.â??"
+
+#: ../camel/providers/local/camel-maildir-summary.c:436
+#: ../camel/providers/local/camel-maildir-summary.c:566
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¾Ñ?Ð²Ð°Ñ?Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ñ?Ñ? Ð´Ð¾ Ð¿Ð°Ð¿ÐºÐ° Ñ?Ð¸Ð¿ maildir: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:544
+#: ../camel/providers/local/camel-maildir-summary.c:557
 msgid "Checking folder consistency"
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?ÐºÐ° Ð½Ð° Ñ?ÐµÐ»Ð¾Ñ?Ñ?Ñ?Ð° Ð½Ð° Ð¿Ð°Ð¿ÐºÐ¸Ñ?Ðµ"
 
-#: ../camel/providers/local/camel-maildir-summary.c:637
+#: ../camel/providers/local/camel-maildir-summary.c:650
 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:743
+#: ../camel/providers/local/camel-mbox-summary.c:468
+#: ../camel/providers/local/camel-mbox-summary.c:690
+#: ../camel/providers/local/camel-mbox-summary.c:826
+#: ../camel/providers/local/camel-spool-summary.c:131
 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:183
 #, c-format
-msgid "Cannot create folder lock on %s: %s"
-msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð·Ð°ÐºÐ»Ñ?Ñ?Ð²Ð°Ð½ÐµÑ?Ð¾ Ð¿Ð°Ð¿ÐºÐ°Ñ?Ð° %s: %s"
+msgid "Cannot open mailbox: %s: "
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¾Ñ?Ð²Ð°Ñ?Ñ?Ð½Ðµ Ð½Ð° Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ° ÐºÑ?Ñ?Ð¸Ñ?: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:231
+#: ../camel/providers/local/camel-mbox-folder.c:249
 #, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¾Ñ?Ð²Ð°Ñ?Ñ?Ð½Ðµ Ð½Ð° Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ° ÐºÑ?Ñ?Ð¸Ñ?: %s: %s\n"
-
-#: ../camel/providers/local/camel-mbox-folder.c:297
-msgid "Mail append canceled"
-msgstr "Ð?Ð¾Ð±Ð°Ð²Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð° Ðµ Ð¿Ñ?ÐµÐºÑ?Ñ?Ð½Ð°Ñ?Ð¾"
+msgid "Cannot append message to mbox file: %s: "
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð´Ð¾Ð±Ð°Ð²Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾ ÐºÑ?Ð¼ Ñ?Ð°Ð¹Ð» Ñ?Ð¸Ð¿ mbox: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:300
-#, 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:378
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Ð?Ð·Ð³Ð»ÐµÐ¶Ð´Ð° Ð¿Ð°Ð¿ÐºÐ°Ñ?Ð° Ðµ Ð¿Ð¾Ð²Ñ?ÐµÐ´ÐµÐ½Ð° Ð½ÐµÐ¾Ð±Ñ?Ð°Ñ?Ð¸Ð¼Ð¾."
 
-#: ../camel/providers/local/camel-mbox-folder.c:474
-#: ../camel/providers/local/camel-mh-folder.c:245
-msgid "Message construction failed."
-msgstr "Ð¡Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾ Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð¾."
+#: ../camel/providers/local/camel-mbox-folder.c:436
+#: ../camel/providers/local/camel-spool-folder.c:70
+#, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð·Ð°ÐºÐ»Ñ?Ñ?Ð²Ð°Ð½ÐµÑ?Ð¾ Ð¿Ð°Ð¿ÐºÐ°Ñ?Ð° %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:164
 #: ../camel/providers/local/camel-mbox-store.c:363
+#: ../camel/providers/local/camel-mbox-store.c:534
+#, c-format
 msgid "Cannot create a folder by this name."
 msgstr "Ð?Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±Ñ?Ð´Ðµ Ñ?Ñ?Ð·Ð´Ð°Ð´ÐµÐ½Ð° Ð¿Ð°Ð¿ÐºÐ° Ñ? Ñ?Ð°ÐºÐ¾Ð²Ð° Ð¸Ð¼Ðµ."
 
-#: ../camel/providers/local/camel-mbox-store.c:196
+#: ../camel/providers/local/camel-mbox-store.c:400
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¸Ð·Ð²Ð»Ð¸Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ° â??%sâ??: Ð½Ðµ Ðµ Ð¾Ð±Ð¸ÐºÐ½Ð¾Ð²ÐµÐ½ Ñ?Ð°Ð¹Ð»."
 
-#: ../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:550
+#, c-format
+msgid "Cannot create directory '%s': %s."
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ° â??%sâ??: %s"
+
+#: ../camel/providers/local/camel-mbox-store.c:566
+#, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°: %s: %s"
+
+#: ../camel/providers/local/camel-mbox-store.c:568
+msgid "Folder already exists"
+msgstr "Ð?Ð°Ð¿ÐºÐ°Ñ?Ð° Ð²ÐµÑ?Ðµ Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?Ð²Ð°"
+
+#: ../camel/providers/local/camel-mbox-store.c:609
+#: ../camel/providers/local/camel-mbox-store.c:622
+#: ../camel/providers/local/camel-mbox-store.c:651
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3852,164 +3863,166 @@ msgstr ""
 "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¸Ð·Ñ?Ñ?Ð¸Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°Ñ?Ð° â??%sâ??:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:245
+#: ../camel/providers/local/camel-mbox-store.c:632
 #, 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:641
 #, 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:667
+#: ../camel/providers/local/camel-mbox-store.c:681
 #, 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:761
 #, c-format
-msgid "Cannot create directory '%s': %s."
-msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ° â??%sâ??: %s"
-
-#: ../camel/providers/local/camel-mbox-store.c:390
-#, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°: %s: %s"
-
-#: ../camel/providers/local/camel-mbox-store.c:392
-msgid "Folder already exists"
-msgstr "Ð?Ð°Ð¿ÐºÐ°Ñ?Ð° Ð²ÐµÑ?Ðµ Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?Ð²Ð°"
-
-#: ../camel/providers/local/camel-mbox-store.c:483
 msgid "The new folder name is illegal."
 msgstr "Ð?Ð¾Ð²Ð¾Ñ?Ð¾ Ð¸Ð¼Ðµ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°Ñ?Ð° Ðµ Ð½ÐµÐ²Ð°Ð»Ð¸Ð´Ð½Ð¾."
 
-#: ../camel/providers/local/camel-mbox-store.c:496
+#: ../camel/providers/local/camel-mbox-store.c:776
 #, 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:859
 #, 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:476
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¾Ñ?Ð²Ð°Ñ?Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°Ñ?Ð°: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:582
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
+#: ../camel/providers/local/camel-mbox-summary.c:537
+#, fuzzy, c-format
+msgid "Fatal mail parser error near position %s in folder %s"
 msgstr "Ð¤Ð°Ñ?Ð°Ð»Ð½Ð° Ð³Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð°Ð½Ð°Ð»Ð¸Ð·Ð¸Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¾Ñ?Ð°Ñ?Ð° Ð±Ð»Ð¸Ð·Ð¾ Ð´Ð¾ %ld Ð² Ð¿Ð°Ð¿ÐºÐ° %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:659
+#: ../camel/providers/local/camel-mbox-summary.c:622
 #, 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:697
+#: ../camel/providers/local/camel-mbox-summary.c:833
+#: ../camel/providers/local/camel-spool-summary.c:138
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¾Ñ?Ð²Ð°Ñ?Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ñ?Ð°Ð¹Ð»: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:739
-#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-mbox-summary.c:711
+#: ../camel/providers/local/camel-spool-summary.c:153
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¾Ñ?Ð²Ð°Ñ?Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ð²Ñ?ÐµÐ¼ÐµÐ½Ð½Ð° ÐºÑ?Ñ?Ð¸Ñ?: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:752
-#: ../camel/providers/local/camel-mbox-summary.c:957
+#: ../camel/providers/local/camel-mbox-summary.c:728
+#: ../camel/providers/local/camel-mbox-summary.c:949
 #, 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:739
 #, 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:756
 #, 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:846
+#: ../camel/providers/local/camel-mbox-summary.c:1099
 #, 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:886
+#: ../camel/providers/local/camel-mbox-summary.c:1131
+#, fuzzy, c-format
+msgid ""
+"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
+"it.)"
+msgstr ""
+"Ð¤Ð°Ð¹Ð»Ñ?Ñ? Ð·Ð° MBOX Ðµ Ñ?Ð°Ð·Ð²Ð°Ð»ÐµÐ½, Ð¿Ð¾Ð¿Ñ?Ð°Ð²ÐµÑ?Ðµ Ð³Ð¾. (Ð?Ñ?Ð°ÐºÐ²Ð°Ñ?Ðµ Ñ?Ðµ Ñ?ÐµÐ´ Ð·Ð°Ð¿Ð¾Ñ?Ð²Ð°Ñ? Ñ? "
+"â??Fromâ?? (Ð?Ñ?), Ð½Ð¾ Ñ?Ð°ÐºÑ?Ð² Ð½Ðµ Ð±Ðµ Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½.)"
+
+#: ../camel/providers/local/camel-mbox-summary.c:895
+#: ../camel/providers/local/camel-mbox-summary.c:1140
+#, c-format
 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:1052
+#: ../camel/providers/local/camel-spool-summary.c:343
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ð° Ð³Ñ?ÐµÑ?ÐºÐ°: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1190
-#: ../camel/providers/local/camel-mbox-summary.c:1216
+#: ../camel/providers/local/camel-mbox-summary.c:1210
+#: ../camel/providers/local/camel-mbox-summary.c:1240
 #, 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:1229
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð·Ð°Ð¿Ð°Ð·Ð²Ð°Ð½ÐµÑ?Ð¾ Ð²Ñ?Ð² Ð²Ñ?ÐµÐ¼ÐµÐ½Ð½Ð° ÐºÑ?Ñ?Ð¸Ñ?: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:180
-msgid "MH append message canceled"
-msgstr "Ð?Ñ?ÐµÐºÑ?Ñ?Ð½Ð°Ñ?Ð¾ Ð±Ðµ Ð´Ð¾Ð±Ð°Ð²Ñ?Ð½Ðµ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾ ÐºÑ?Ð¼ Ð¿Ð°Ð¿ÐºÐ° Ñ?Ð¸Ð¿ MH"
-
-#: ../camel/providers/local/camel-mh-folder.c:183
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
+#: ../camel/providers/local/camel-mh-folder.c:115
+#, fuzzy, c-format
+msgid "Cannot append message to mh folder: %s: "
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð´Ð¾Ð±Ð°Ð²Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾ ÐºÑ?Ð¼ Ð¿Ð°Ð¿ÐºÐ° Ñ?Ð¸Ð¿ MH: %s: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:232
+#: ../camel/providers/local/camel-mh-store.c:483
 #, 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:497
 #, 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:327
 #, 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:341
+#, c-format
+msgid "Spool '%s' is not a regular file or directory"
+msgstr "Ð¡Ð¿Ñ?Ð»ÐµÑ?Ñ?Ñ? â??%sâ?? Ð½Ðµ Ðµ Ð¾Ð±Ð¸ÐºÐ½Ð¾Ð²ÐµÐ½ Ñ?Ð°Ð¹Ð» Ð¸Ð»Ð¸ Ð¿Ð°Ð¿ÐºÐ°"
+
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool mail file %s"
+msgstr "Ð¤Ð°Ð¹Ð»-Ñ?Ð¿Ñ?Ð»ÐµÑ? %s"
+
+#: ../camel/providers/local/camel-spool-store.c:357
 #, c-format
-msgid "Spool '%s' is not a regular file or directory"
-msgstr "Ð¡Ð¿Ñ?Ð»ÐµÑ?Ñ?Ñ? â??%sâ?? Ð½Ðµ Ðµ Ð¾Ð±Ð¸ÐºÐ½Ð¾Ð²ÐµÐ½ Ñ?Ð°Ð¹Ð» Ð¸Ð»Ð¸ Ð¿Ð°Ð¿ÐºÐ°"
+msgid "Spool folder tree %s"
+msgstr "Ð?Ñ?Ñ?Ð²Ð¾ Ñ? Ð¿Ð°Ð¿ÐºÐ¸-Ñ?Ð¿Ñ?Ð»ÐµÑ? %s"
 
-#: ../camel/providers/local/camel-spool-store.c:163
+#: ../camel/providers/local/camel-spool-store.c:391
 #, 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:403
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -4018,12 +4031,12 @@ msgstr ""
 "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¾Ñ?Ð²Ð°Ñ?Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°Ñ?Ð° â??%sâ??:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:177
+#: ../camel/providers/local/camel-spool-store.c:409
 #, 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:416
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -4032,120 +4045,146 @@ msgstr ""
 "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ° â??%sâ??:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:190
+#: ../camel/providers/local/camel-spool-store.c:426
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "â??%sâ?? Ðµ Ð½ÐµÐ²Ð°Ð»Ð¸Ð´ÐµÐ½ Ñ?Ð°Ð¹Ð» Ñ?Ð¸Ð¿ mailbox."
 
-#: ../camel/providers/local/camel-spool-store.c:207
+#: ../camel/providers/local/camel-spool-store.c:462
+#, c-format
 msgid "Store does not support an INBOX"
 msgstr "Ð?Ñ?Ñ?Ð¸Ñ?Ñ?Ð° Ð½Ðµ Ð¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð° Ð¿Ð°Ð¿ÐºÐ° Ð·Ð° Ð²Ñ?Ð¾Ð´Ñ?Ñ?Ð¸ Ð¿Ð¸Ñ?Ð¼Ð°"
 
-#: ../camel/providers/local/camel-spool-store.c:219
+#: ../camel/providers/local/camel-spool-store.c:476
 #, c-format
-msgid "Spool mail file %s"
-msgstr "Ð¤Ð°Ð¹Ð»-Ñ?Ð¿Ñ?Ð»ÐµÑ? %s"
+msgid "Spool folders cannot be deleted"
+msgstr "Ð?Ð°Ð¿ÐºÐ¸Ñ?Ðµ Ð½Ð° Ñ?Ð¿Ñ?Ð»ÐµÑ?Ð° Ð½Ðµ Ð¼Ð¾Ð³Ð°Ñ? Ð´Ð° Ð±Ñ?Ð´Ð°Ñ? Ð¸Ð·Ñ?Ñ?Ð¸Ñ?Ð¸"
 
-#: ../camel/providers/local/camel-spool-store.c:219
+#: ../camel/providers/local/camel-spool-store.c:491
 #, c-format
-msgid "Spool folder tree %s"
-msgstr "Ð?Ñ?Ñ?Ð²Ð¾ Ñ? Ð¿Ð°Ð¿ÐºÐ¸-Ñ?Ð¿Ñ?Ð»ÐµÑ? %s"
-
-#: ../camel/providers/local/camel-spool-store.c:227
 msgid "Spool folders cannot be renamed"
 msgstr "Ð?Ð°Ð¿ÐºÐ¸Ñ?Ðµ Ð½Ð° Ñ?Ð¿Ñ?Ð»ÐµÑ?Ð° Ð½Ðµ Ð¼Ð¾Ð³Ð°Ñ? Ð´Ð° Ð±Ñ?Ð´Ð°Ñ? Ð¿Ñ?ÐµÐ¸Ð¼ÐµÐ½Ñ?Ð²Ð°Ð½Ð¸"
 
-#: ../camel/providers/local/camel-spool-store.c:235
-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
-#, c-format
-msgid "Could not sync temporary folder %s: %s"
+#: ../camel/providers/local/camel-spool-summary.c:169
+#: ../camel/providers/local/camel-spool-summary.c:181
+#: ../camel/providers/local/camel-spool-summary.c:193
+#, fuzzy, c-format
+msgid "Could not synchronize temporary folder %s: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ð¸Ð½Ñ?Ñ?Ð¾Ð½Ð¸Ð·Ð¸Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð²Ñ?ÐµÐ¼ÐµÐ½Ð½Ð°Ñ?Ð° Ð¿Ð°Ð¿ÐºÐ°: %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:216
-#, c-format
-msgid "Could not sync spool folder %s: %s"
+#: ../camel/providers/local/camel-spool-summary.c:211
+#, fuzzy, c-format
+msgid "Could not synchronize spool folder %s: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ð¸Ð½Ñ?Ñ?Ð¾Ð½Ð¸Ð·Ð¸Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°Ñ?Ð°-Ñ?Ð¿Ñ?Ð»ÐµÑ? â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:246
-#: ../camel/providers/local/camel-spool-summary.c:263
-#: ../camel/providers/local/camel-spool-summary.c:274
-#, c-format
+#: ../camel/providers/local/camel-spool-summary.c:243
+#: ../camel/providers/local/camel-spool-summary.c:262
+#: ../camel/providers/local/camel-spool-summary.c:275
+#, fuzzy, c-format
 msgid ""
-"Could not sync spool folder %s: %s\n"
+"Could not synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in '%s'"
 msgstr ""
 "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ð¸Ð½Ñ?Ñ?Ð¾Ð½Ð¸Ð·Ð¸Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°Ñ?Ð°-Ñ?Ð¿Ñ?Ð»ÐµÑ? â??%sâ??: %s\n"
 "Ð?Ð°Ð¿ÐºÐ°Ñ?Ð° Ð¼Ð¾Ð¶Ðµ Ð±Ð¸ Ðµ Ð¿Ð¾Ð²Ñ?ÐµÐ´ÐµÐ½Ð°, ÐºÐ¾Ð¿Ð¸ÐµÑ?Ð¾ Ðµ Ð·Ð°Ð¿Ð°Ð·ÐµÐ½Ð¾ Ð² â??%sâ??"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:135
-#: ../camel/providers/nntp/camel-nntp-folder.c:192
-#: ../camel/providers/nntp/camel-nntp-folder.c:224
+#: ../camel/providers/nntp/camel-nntp-folder.c:195
+#: ../camel/providers/nntp/camel-nntp-folder.c:274
+#: ../camel/providers/nntp/camel-nntp-folder.c:388
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "Ð?Ñ?Ñ?Ñ?ÐµÑ?Ð½Ð° Ð³Ñ?ÐµÑ?ÐºÐ°: Ñ?Ð½Ð¸ÐºÐ°Ð»Ð½Ð¸Ñ?Ñ? Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? Ðµ Ñ? Ð½ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»ÐµÐ½ Ñ?Ð¾Ñ?Ð¼Ð°Ñ?: %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:236
+#: ../camel/providers/nntp/camel-nntp-folder.c:240
+#: ../camel/providers/pop3/camel-pop3-folder.c:371
+#: ../camel/providers/pop3/camel-pop3-folder.c:436
+#: ../camel/providers/pop3/camel-pop3-folder.c:448
+#: ../camel/providers/pop3/camel-pop3-folder.c:697
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾ %s: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:472
+#: ../camel/providers/nntp/camel-nntp-folder.c:478
+#: ../camel/providers/nntp/camel-nntp-folder.c:525
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð¾ Ð¸Ð·Ð¿Ñ?Ð°Ñ?Ð°Ð½Ðµ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:430
+#: ../camel/providers/nntp/camel-nntp-folder.c:520
+msgid "Posting failed: "
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð¾ Ð¸Ð·Ð¿Ñ?Ð°Ñ?Ð°Ð½Ðµ: "
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:549
+#, c-format
 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:569
+#, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Ð?Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð´Ð° ÐºÐ¾Ð¿Ð¸Ñ?Ð°Ñ?Ðµ Ñ?Ñ?Ð°Ñ?Ð¸Ð¸ Ð¾Ñ? Ð¿Ð°Ð¿ÐºÐ° Ñ?Ð¸Ð¿ NNTP!"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid ""
 "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr ""
 "_Ð?Ð¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ñ?Ñ?ÐºÑ?Ð°Ñ?ÐµÐ½Ð¸ Ð¸Ð¼ÐµÐ½Ð° Ð½Ð° Ð¿Ð°Ð¿ÐºÐ¸Ñ?Ðµ (Ð½Ð°Ð¿Ñ?. c.o.linux Ð²Ð¼ÐµÑ?Ñ?Ð¾ comp.os."
 "linux)"
 
-#: ../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 "Ð?Ñ?Ð½Ð¾Ñ?Ð¸Ñ?ÐµÐ»Ð½Ð¸ Ð¸Ð¼ÐµÐ½Ð° Ð½Ð° Ð¿Ð°Ð¿ÐºÐ¸ Ð² _Ð¿Ñ?Ð¾Ð·Ð¾Ñ?ÐµÑ?Ð° Ð·Ð° Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ?"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:52
+msgid "Default NNTP port"
+msgstr "Ð¡Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?ÐµÐ½ Ð¿Ð¾Ñ?Ñ? Ð·Ð° NNTP"
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:53
+msgid "NNTP over SSL"
+msgstr "NNTP Ð¿Ñ?ÐµÐ· SSL"
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:59
 msgid "USENET news"
 msgstr "Ð?Ð¾Ð²Ð¸Ð½Ð¸ Ð² USENET"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:61
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "Ð¢Ð¾Ð²Ð° Ðµ Ð´Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð¸Ðº Ð·Ð° Ñ?ÐµÑ?ÐµÐ½Ðµ Ð¸ Ð¿Ñ?Ð±Ð»Ð¸ÐºÑ?Ð²Ð°Ð½Ðµ Ð² Ð³Ñ?Ñ?Ð¿Ð¸ Ð·Ð° Ð½Ð¾Ð²Ð¸Ð½Ð¸ Ð² USENET."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:76
+#: ../camel/providers/nntp/camel-nntp-provider.c:82
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr "Ð¢Ð°Ð·Ð¸ Ð¾Ð¿Ñ?Ð¸Ñ? Ñ?Ðµ Ð²Ð¸ Ñ?Ð²Ñ?Ñ?Ð¶Ðµ Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ? Ñ?Ð¸Ð¿ NNTP Ñ?Ñ?ÐµÐ· Ð½ÐµÑ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð° Ð¿Ð°Ñ?Ð¾Ð»Ð°."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:216
+#: ../camel/providers/nntp/camel-nntp-store.c:73
+#, c-format
+msgid "Authentication requested but no username provided"
+msgstr "Ð?Ð·Ð¸Ñ?ÐºÐ²Ð° Ñ?Ðµ Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½Ðµ, Ð½Ð¾ Ð½Ðµ Ðµ Ñ?ÐºÐ°Ð·Ð°Ð½Ð¾ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð¸Ñ?ÐµÐ»Ñ?ÐºÐ¾ Ð¸Ð¼Ðµ"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:85
 #, c-format
-msgid "Could not read greeting from %s: %s"
+msgid "Cannot authenticate to server: %s"
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½ÐµÑ?Ð¾ Ð¿Ñ?ÐµÐ´ Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð°: %s"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:375
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: "
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?ÐµÑ?ÐµÐ½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¾Ð·Ð´Ñ?Ð°Ð²Ð° Ð¾Ñ? %s: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:228
+#: ../camel/providers/nntp/camel-nntp-store.c:388
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "Ð¡Ñ?Ñ?Ð²Ñ?Ñ?Ñ?Ñ? Ð·Ð° NNTP %s Ð²Ñ?Ñ?Ð½Ð° ÐºÐ¾Ð´ Ð·Ð° Ð³Ñ?ÐµÑ?ÐºÐ° %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:410
+#: ../camel/providers/nntp/camel-nntp-store.c:582
 #, 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:1100
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4156,7 +4195,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:913
+#: ../camel/providers/nntp/camel-nntp-store.c:1215
+#, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -4166,7 +4206,8 @@ msgstr ""
 "\n"
 "Ð?Ñ?Ð¼Ð° Ñ?Ð°ÐºÐ°Ð²Ð° Ð³Ñ?Ñ?Ð¿Ð°. Ð?Ð°Ð¹-Ð²ÐµÑ?Ð¾Ñ?Ñ?Ð½Ð¾ Ð¸Ð·Ð±Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð¾Ð±ÐµÐºÑ? Ðµ Ñ?Ð¾Ð´Ð¸Ñ?ÐµÐ»Ñ?ÐºÐ° Ð¿Ð°Ð¿ÐºÐ°."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:945
+#: ../camel/providers/nntp/camel-nntp-store.c:1257
+#, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -4176,130 +4217,126 @@ msgstr ""
 "\n"
 "Ð?Ñ?Ñ?Ð¿Ð°Ñ?Ð° Ð½Ðµ Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?Ð²Ð°!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:970
+#: ../camel/providers/nntp/camel-nntp-store.c:1290
+#, c-format
 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:1306
+#, c-format
 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:1323
+#, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Ð?Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð´Ð° Ð¿Ñ?ÐµÐ¼Ð°Ñ?Ð²Ð°Ñ?Ðµ Ð¿Ð°Ð¿ÐºÐ° Ð² Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ Ð·Ð° Ð³Ñ?Ñ?Ð¿Ð¸ Ð½Ð¾Ð²Ð¸Ð½Ð¸. Ð?Ð¼ÐµÑ?Ñ?Ð¾ Ñ?Ð¾Ð²Ð° "
 "Ð¿Ñ?ÐµÐºÑ?Ð°Ñ?ÐµÑ?Ðµ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ?Ð° Ñ?Ð¸."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1180
-msgid "Authentication requested but no username provided"
-msgstr "Ð?Ð·Ð¸Ñ?ÐºÐ²Ð° Ñ?Ðµ Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½Ðµ, Ð½Ð¾ Ð½Ðµ Ðµ Ñ?ÐºÐ°Ð·Ð°Ð½Ð¾ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð¸Ñ?ÐµÐ»Ñ?ÐºÐ¾ Ð¸Ð¼Ðµ"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1192
-#, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½ÐµÑ?Ð¾ Ð¿Ñ?ÐµÐ´ Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð°: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1535
+msgid "NNTP Command failed: "
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° NNTP Ð¿Ñ?Ð¾Ð¿Ð°Ð´Ð½Ð°: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1315
+#: ../camel/providers/nntp/camel-nntp-store.c:1609
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° Ð·Ð° NNTP Ð¿Ñ?Ð¾Ð¿Ð°Ð´Ð½Ð°: %s"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1369
 msgid "Not connected."
 msgstr "Ð?Ðµ Ñ?Ñ?Ðµ Ñ?Ð²Ñ?Ñ?Ð·Ð°Ð½Ð¸."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1422
-#, c-format
-msgid "No such folder: %s"
-msgstr "Ð?Ñ?Ð¼Ð° Ñ?Ð°ÐºÐ°Ð²Ð° Ð¿Ð°Ð¿ÐºÐ°: %s"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:272
-#: ../camel/providers/nntp/camel-nntp-summary.c:370
+#: ../camel/providers/nntp/camel-nntp-summary.c:232
+#: ../camel/providers/nntp/camel-nntp-summary.c:348
 #, 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:365
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "Ð?ÐµÐ¾Ñ?Ð°ÐºÐ²Ð°Ð½ Ð¾Ñ?Ð³Ð¾Ð²Ð¾Ñ? Ð¾Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ? Ð¾Ñ? â??headâ??: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:420
-msgid "Use cancel"
-msgstr "Ð?Ñ?Ð¼ÐµÐ½ÐµÐ½Ð¾ Ð¾Ñ? Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð¸Ñ?ÐµÐ»Ñ?"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:422
+#: ../camel/providers/nntp/camel-nntp-summary.c:410
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Ð?Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?Ñ?Ð° e Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
+#: ../camel/providers/pop3/camel-pop3-folder.c:277
+#: ../camel/providers/pop3/camel-pop3-folder.c:336
+#, c-format
+msgid "No message with UID %s"
+msgstr "Ð?Ñ?Ð¼Ð° Ð¿Ð¸Ñ?Ð¼Ð¾ Ñ? Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? %s"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:344
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "Ð?Ð¾Ð»Ñ?Ñ?Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾ Ð¿Ð¾ POP %d"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:449
+msgid "Unknown reason"
+msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ð° Ð¿Ñ?Ð¸Ñ?Ð¸Ð½Ð°"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:488
 msgid "Retrieving POP summary"
 msgstr "Ð?Ð·Ð²Ð»Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Ð¾Ð±Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ Ð¿Ð¾ POP"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
+#: ../camel/providers/pop3/camel-pop3-folder.c:511
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¾Ð±Ð¾Ð±Ñ?ÐµÐ½Ð¸ÐµÑ?Ð¾ Ð¿Ð¾ POP: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:314
+#: ../camel/providers/pop3/camel-pop3-folder.c:563
 msgid "Expunging old messages"
 msgstr "Ð?Ñ?Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ð²Ð°Ð½Ðµ Ð½Ð° Ñ?Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ð¿Ð¸Ñ?Ð¼Ð°"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
+#: ../camel/providers/pop3/camel-pop3-folder.c:577
 msgid "Expunging deleted messages"
 msgstr "Ð?Ñ?Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ð²Ð°Ð½Ðµ Ð½Ð° Ð¸Ð·Ñ?Ñ?Ð¸Ñ?Ð¸Ñ?Ðµ Ð¿Ð¸Ñ?Ð¼Ð°"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:530
-#: ../camel/providers/pop3/camel-pop3-folder.c:552
-#, c-format
-msgid "No message with UID %s"
-msgstr "Ð?Ñ?Ð¼Ð° Ð¿Ð¸Ñ?Ð¼Ð¾ Ñ? Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? %s"
-
-#. Sigh, most of the crap in this function is so that the cancel button
-#. returns the proper exception code.  Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:559
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "Ð?Ð¾Ð»Ñ?Ñ?Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾ Ð¿Ð¾ POP %d"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-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 "_Ð?Ñ?Ñ?Ð°Ð²Ñ?Ð½Ðµ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð°Ñ?Ð° Ð½Ð° Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð°"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#. Translators: '%s' is replaced with a widget, where user can select how many days can be message left on the server
+#: ../camel/providers/pop3/camel-pop3-provider.c:44
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "_Ð?Ð·Ñ?Ñ?Ð¸Ð²Ð°Ð½Ðµ Ñ?Ð»ÐµÐ´ %s Ð´Ð½Ð¸"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:49
+#: ../camel/providers/pop3/camel-pop3-provider.c:46
+msgid "Delete _expunged from local Inbox"
+msgstr "_Ð?Ð·Ñ?Ñ?Ð¸Ð²Ð°Ð½Ðµ Ð½Ð° Ð¾Ñ?Ñ?Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¸Ñ?Ðµ Ð¿Ð¸Ñ?Ð¼Ð° Ð¾Ñ? Ð»Ð¾ÐºÐ°Ð»Ð½Ð°Ñ?Ð° Ð²Ñ?Ð¾Ð´Ñ?Ñ?Ð° Ð¿Ð¾Ñ?Ð°"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:48
 msgid "Disable _support for all POP3 extensions"
 msgstr "_Ð?Ð·ÐºÐ»Ñ?Ñ?Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶ÐºÐ°Ñ?Ð° Ð·Ð° Ð²Ñ?Ð¸Ñ?ÐºÐ¸ Ñ?Ð°Ð·Ñ?Ð¸Ñ?ÐµÐ½Ð¸Ñ? Ð½Ð° POP3"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Default POP3 port"
+msgstr "Ð¡Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?ÐµÐ½ Ð¿Ð¾Ñ?Ñ? Ð·Ð° POP3"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
+msgid "POP3 over SSL"
+msgstr "POP3 Ð¿Ñ?ÐµÐ· SSL"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:62
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:59
+#: ../camel/providers/pop3/camel-pop3-provider.c:64
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Ð?Ð° Ð²Ñ?Ñ?Ð·ÐºÐ° Ð¸ Ð¸Ð·Ñ?ÐµÐ³Ð»Ñ?Ð½Ðµ Ð½Ð° Ð¿Ð¾Ñ?Ð° Ð¾Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð¸ Ð·Ð° POP."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:76
+#: ../camel/providers/pop3/camel-pop3-provider.c:83
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4307,7 +4344,7 @@ msgstr ""
 "Ð¢Ð°Ð·Ð¸ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ° Ñ?Ðµ Ð²Ð¸ Ñ?Ð²Ñ?Ñ?Ð¶Ðµ Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ? Ð·Ð° POP Ñ?Ñ?ÐµÐ· Ð½ÐµÑ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð° Ð¿Ð°Ñ?Ð¾Ð»Ð°. Ð¢Ð¾Ð²Ð° "
 "Ðµ ÐµÐ´Ð¸Ð½Ñ?Ñ?Ð²ÐµÐ½Ð¸Ñ?Ñ? Ð²Ð°Ñ?Ð¸Ð°Ð½Ñ? Ð¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð°Ð½ Ð¾Ñ? Ð¼Ð½Ð¾Ð³Ð¾ Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð¸ Ð·Ð° POP."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:86
+#: ../camel/providers/pop3/camel-pop3-provider.c:93
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -4317,38 +4354,43 @@ msgstr ""
 "Ð¿Ñ?Ð¾Ñ?Ð¾ÐºÐ¾Ð»Ð° APOP. Ð¢Ð¾Ð²Ð° Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð½Ðµ Ñ?Ð°Ð±Ð¾Ñ?Ð¸ Ð·Ð° Ð²Ñ?Ð¸Ñ?ÐºÐ¸ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð¸Ñ?ÐµÐ»Ð¸ Ð½Ð° Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð·Ð° "
 "POP Ð´Ð¾Ñ?Ð¸ Ð¸ Ð¿Ñ?Ð¸ Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð¸, ÐºÐ¾Ð¸Ñ?Ð¾ Ð¾Ð±Ñ?Ð²Ñ?Ð²Ð°Ñ?, Ñ?Ðµ Ð¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð°Ñ? Ñ?Ð¾Ð·Ð¸ Ñ?Ð¸Ð¿ Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½Ðµ."
 
-#: ../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:98
+msgid ": "
+msgstr ": "
+
+#: ../camel/providers/pop3/camel-pop3-store.c:181
 #, 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:199
+#: ../camel/providers/pop3/camel-pop3-store.c:230
+#: ../camel/providers/pop3/camel-pop3-store.c:237
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ð²Ñ?Ñ?Ð·Ð²Ð°Ð½Ðµ Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð·Ð° POP %s Ð² Ñ?Ð¸Ð³Ñ?Ñ?ÐµÐ½ Ñ?ÐµÐ¶Ð¸Ð¼: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:247
+#: ../camel/providers/pop3/camel-pop3-store.c:200
 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:218
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ð²Ñ?Ñ?Ð·Ð²Ð°Ð½Ðµ Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð·Ð° POP %s Ð² Ñ?Ð¸Ð³Ñ?Ñ?ÐµÐ½ Ñ?ÐµÐ¶Ð¸Ð¼ %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:281
+#: ../camel/providers/pop3/camel-pop3-store.c:231
+msgid "TLS negotiations failed"
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð¸ Ð¿Ñ?ÐµÐ³Ð¾Ð²Ð¾Ñ?Ð¸ Ð¿Ð¾ TLS"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:238
 msgid "TLS is not available in this build"
 msgstr "Ð? Ñ?Ð¾Ð·Ð¸ ÐºÐ¾Ð¼Ð¿Ð¸Ð»Ð°Ñ? Ð»Ð¸Ð¿Ñ?Ð²Ð° TLS"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:387
-#, c-format
-msgid "Could not connect to POP server %s"
-msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ð²Ñ?Ñ?Ð·Ð²Ð°Ð½ÐµÑ?Ð¾ Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð·Ð° POP %s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:428
-#: ../camel/providers/pop3/camel-pop3-store.c:565
+#: ../camel/providers/pop3/camel-pop3-store.c:317
+#: ../camel/providers/pop3/camel-pop3-store.c:472
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -4357,22 +4399,23 @@ msgstr ""
 "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ð²Ñ?Ñ?Ð·Ð²Ð°Ð½ÐµÑ?Ð¾ ÐºÑ?Ð¼ Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð·Ð° POP %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:340
 #, 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:357
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð²Ð»Ð¸Ð·Ð°Ð½ÐµÑ?Ð¾ Ð² Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð·Ð° POP %s: Ð³Ñ?ÐµÑ?ÐºÐ° Ð² Ð¿Ñ?Ð¾Ñ?Ð¾ÐºÐ¾Ð»Ð° SASL"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:479
-#, c-format
-msgid "Failed to authenticate on POP server %s: %s"
+#: ../camel/providers/pop3/camel-pop3-store.c:374
+#, fuzzy, c-format
+msgid "Failed to authenticate on POP server %s: "
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½ÐµÑ?Ð¾ Ð¿Ñ?ÐµÐ´ Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð·Ð° POP %s: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:538
+#: ../camel/providers/pop3/camel-pop3-store.c:439
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4382,7 +4425,7 @@ msgstr ""
 "Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? Ð·Ð° APOP. Ð?Ð¼Ð° Ð²ÐµÑ?Ð¾Ñ?Ñ?Ð½Ð¾Ñ?Ñ? Ñ?Ð¾Ð²Ð° Ð´Ð° Ðµ Ð°Ñ?Ð°ÐºÐ° Ð·Ð° Ð¿Ð¾Ð´Ð¼Ñ?Ð½Ð° Ð½Ð° "
 "Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð½Ð¾Ñ?Ñ?Ñ?Ð°, Ñ?Ð²Ñ?Ñ?Ð¶ÐµÑ?Ðµ Ñ?Ðµ Ñ? Ð²Ð°Ñ?Ð¸Ñ? Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¾Ñ?."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:579
+#: ../camel/providers/pop3/camel-pop3-store.c:492
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4391,7 +4434,8 @@ msgstr ""
 "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ð²Ñ?Ñ?Ð·Ð²Ð°Ð½ÐµÑ?Ð¾ ÐºÑ?Ð¼ Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð·Ð° POP %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:505
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4400,7 +4444,8 @@ msgstr ""
 "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ð²Ñ?Ñ?Ð·Ð²Ð°Ð½ÐµÑ?Ð¾ ÐºÑ?Ð¼ Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð·Ð° POP %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:518
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4409,16 +4454,36 @@ msgstr ""
 "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ð²Ñ?Ñ?Ð·Ð²Ð°Ð½ÐµÑ?Ð¾ ÐºÑ?Ð¼ Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð·Ð° POP %s.\n"
 "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¸Ð·Ð¿Ñ?Ð°Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð°Ñ?Ð¾Ð»Ð° %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:703
+#: ../camel/providers/pop3/camel-pop3-store.c:558
+#, c-format
+msgid "POP3 server %s"
+msgstr "Ð¡Ñ?Ñ?Ð²Ñ?Ñ? Ð·Ð° POP %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:562
+#, fuzzy, c-format
+msgid "POP3 server for %s on %s"
+msgstr "Ð£Ñ?Ð»Ñ?Ð³Ð° Ð¿Ð¾ IMAP Ð·Ð° %s Ð½Ð° %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:693
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ð²Ñ?Ñ?Ð·Ð²Ð°Ð½ÐµÑ?Ð¾ Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð·Ð° POP %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:720
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Ð¢Ð°ÐºÐ°Ð²Ð° Ð¿Ð°Ð¿ÐºÐ° Ð»Ð¸Ð¿Ñ?Ð²Ð° â?? â??%sâ??."
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/pop3/camel-pop3-store.c:737
+#, c-format
+msgid "POP3 stores have no folder hierarchy"
+msgstr "POP3 Ð½Ðµ Ð¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð° Ð¹ÐµÑ?Ð°Ñ?Ñ?Ð¸Ñ? Ð¾Ñ? Ð¿Ð°Ð¿ÐºÐ¸"
+
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:40
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
@@ -4426,181 +4491,106 @@ msgstr ""
 "Ð?Ð° Ð¸Ð·Ð¿Ñ?Ð°Ñ?Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾Ñ?Ð° Ñ?Ñ?ÐµÐ· Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ñ? Ð½Ð° Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð°Ñ?Ð° â??sendmailâ?? Ð½Ð° Ð»Ð¾ÐºÐ°Ð»Ð½Ð°Ñ?Ð° "
 "Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð°."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:113
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:49
+msgid "sendmail"
+msgstr "sendmail"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:51
+msgid "Mail delivery via the sendmail program"
+msgstr "Ð?Ð·Ð¿Ñ?Ð°Ñ?Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾Ñ?Ð° Ñ?Ñ?ÐµÐ· Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð°Ñ?Ð° sendmail"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:86
+#, c-format
 msgid "Could not parse recipient list"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð°Ð½Ð°Ð»Ð¸Ð·Ð¸Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ñ?Ð¿Ð¸Ñ?Ñ?ÐºÐ° Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ñ?ÐµÐ»Ð¸"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:144
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:119
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼ÐµÐ½ ÐºÐ°Ð½Ð°Ð» Ð·Ð° sendmail: %s: Ð¿Ð¾Ñ?Ð°Ñ?Ð° Ð½Ðµ Ðµ "
 "Ð¸Ð·Ð¿Ñ?Ð°Ñ?ÐµÐ½Ð°"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:165
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:141
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð°Ñ?Ñ?Ð¸Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° sendmail: %s: Ð¿Ð¾Ñ?Ð°Ñ?Ð° Ð½Ðµ Ðµ Ð¸Ð·Ð¿Ñ?Ð°Ñ?ÐµÐ½Ð°"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:235
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
+msgid "Could not send message: "
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¸Ð·Ð¿Ñ?Ð°Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾: "
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail Ð·Ð°Ð²Ñ?Ñ?Ñ?Ð¸ Ñ?Ñ?Ñ? Ñ?Ð¸Ð³Ð½Ð°Ð» %s: Ð¿Ð¾Ñ?Ð°Ñ?Ð° Ð½Ðµ Ðµ Ð¸Ð·Ð¿Ñ?Ð°Ñ?ÐµÐ½Ð°"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:242
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:217
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¸Ð·Ð¿Ñ?Ð»Ð½Ñ?Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° %s: Ð¿Ð¾Ñ?Ð°Ñ?Ð° Ð½Ðµ Ðµ Ð¸Ð·Ð¿Ñ?Ð°Ñ?ÐµÐ½Ð°"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:247
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail Ð·Ð°Ð²Ñ?Ñ?Ñ?Ð¸ Ð² Ñ?Ñ?Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ðµ %d: Ð¿Ð¾Ñ?Ð°Ñ?Ð° Ð½Ðµ Ðµ Ð¸Ð·Ð¿Ñ?Ð°Ñ?ÐµÐ½Ð°"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:261
-msgid "sendmail"
-msgstr "sendmail"
+#: ../camel/providers/smtp/camel-smtp-provider.c:42
+msgid "Default SMTP port"
+msgstr "Ð¡Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?ÐµÐ½ Ð¿Ð¾Ñ?Ñ? Ð·Ð° SMTP"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
-msgid "Mail delivery via the sendmail program"
-msgstr "Ð?Ð·Ð¿Ñ?Ð°Ñ?Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾Ñ?Ð° Ñ?Ñ?ÐµÐ· Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð°Ñ?Ð° sendmail"
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
+msgid "SMTP over SSL"
+msgstr "SMTP Ð¿Ñ?ÐµÐ· SSL"
+
+#: ../camel/providers/smtp/camel-smtp-provider.c:44
+msgid "Message submission port"
+msgstr "Ð?Ð¾Ñ?Ñ? Ð·Ð° Ð¸Ð·Ð¿Ñ?Ð°Ñ?Ð°Ð½Ðµ Ð½Ð° Ñ?Ñ?Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ?Ñ?Ð°"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:50
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:43
+#: ../camel/providers/smtp/camel-smtp-provider.c:52
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 "Ð?Ð° Ð´Ð¾Ñ?Ñ?Ð°Ð²ÐºÐ° Ð½Ð° Ð¿Ð¾Ñ?Ð° Ñ?Ñ?ÐµÐ· Ñ?Ð²Ñ?Ñ?Ð·Ð²Ð°Ð½Ðµ ÐºÑ?Ð¼ Ð¾Ñ?Ð´Ð°Ð»ÐµÑ?ÐµÐ½ Ñ?Ð°Ð·Ð¿Ñ?ÐµÐ´ÐµÐ»Ð¸Ñ?ÐµÐ» Ð½Ð° Ð¿Ð¾Ñ?Ð° Ð¿Ñ?ÐµÐ· "
 "SMTP."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:167
-msgid "Syntax error, command unrecognized"
-msgstr "Ð¡Ð¸Ð½Ñ?Ð°ÐºÑ?Ð¸Ñ?Ð½Ð° Ð³Ñ?ÐµÑ?ÐºÐ°, Ð½ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:169
-msgid "Syntax error in parameters or arguments"
-msgstr "Ð¡Ð¸Ð½Ñ?Ð°ÐºÑ?Ð¸Ñ?Ð½Ð° Ð³Ñ?ÐµÑ?ÐºÐ° Ð² Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð¸Ñ?Ðµ Ð¸Ð»Ð¸ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ?Ð¸Ñ?Ðµ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:171
-msgid "Command not implemented"
-msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° Ð½Ðµ Ðµ Ñ?ÐµÐ°Ð»Ð¸Ð·Ð¸Ñ?Ð°Ð½Ð°"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:173
-msgid "Command parameter not implemented"
-msgstr "Ð?Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ?Ñ?Ñ? Ð½Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° Ð½Ðµ Ðµ Ñ?ÐµÐ°Ð»Ð¸Ð·Ð¸Ñ?Ð°Ð½"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:175
-msgid "System status, or system help reply"
-msgstr "Ð?Ñ?Ð³Ð¾Ð²Ð¾Ñ? Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ñ?Ð¾Ñ?Ð½Ð¸ÐµÑ?Ð¾ Ð½Ð° Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð°Ñ?Ð° Ð¸Ð»Ð¸ Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð½Ð° Ð¿Ð¾Ð¼Ð¾Ñ?"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:177
-msgid "Help message"
-msgstr "Ð?Ð¾Ð¼Ð¾Ñ?Ð½Ð¾ Ñ?Ñ?Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:179
-msgid "Service ready"
-msgstr "Ð£Ñ?Ð»Ñ?Ð³Ð°Ñ?Ð° Ðµ Ð³Ð¾Ñ?Ð¾Ð²Ð°"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:181
-msgid "Service closing transmission channel"
-msgstr "Ð£Ñ?Ð»Ñ?Ð³Ð°Ñ?Ð° Ð·Ð°Ñ?Ð²Ð¾Ñ?Ð¸ Ð¿Ñ?ÐµÑ?Ð²Ñ?Ñ?Ð»Ñ?Ñ?Ð¸Ñ? ÐºÐ°Ð½Ð°Ð»"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:183
-msgid "Service not available, closing transmission channel"
-msgstr "Ð£Ñ?Ð»Ñ?Ð³Ð°Ñ?Ð° Ð»Ð¸Ð¿Ñ?Ð²Ð°, Ð·Ð°Ñ?Ð²Ð°Ñ?Ñ?Ð½Ðµ Ð½Ð° Ð¿Ñ?ÐµÑ?Ð²Ñ?Ñ?Ð»Ñ?Ñ?Ð¸Ñ? ÐºÐ°Ð½Ð°Ð»"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:185
-msgid "Requested mail action okay, completed"
-msgstr "Ð?Ð°Ñ?Ð²ÐµÐ½Ð¾Ñ?Ð¾ Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ¾ Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ Ðµ Ð½Ð°Ñ?ÐµÐ´, Ð·Ð°Ð²Ñ?Ñ?Ñ?ÐµÐ½Ð¾"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:187
-msgid "User not local; will forward to <forward-path>"
-msgstr "Ð?Ð¾Ñ?Ñ?ÐµÐ±Ð¸Ñ?ÐµÐ»Ñ?Ñ? Ð½Ðµ Ðµ Ð»Ð¾ÐºÐ°Ð»ÐµÐ½: Ð¿Ñ?ÐµÐ¿Ñ?Ð°Ñ?Ð°Ð½Ðµ ÐºÑ?Ð¼ <forward-path>"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:189
-msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "Ð?Ð°Ñ?Ð²ÐµÐ½Ð¾Ñ?Ð¾ Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ¾ Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ Ð½Ðµ Ðµ Ð¸Ð·Ð²Ñ?Ñ?Ñ?ÐµÐ½Ð¾: Ð»Ð¸Ð¿Ñ?Ð²Ð° Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ° ÐºÑ?Ñ?Ð¸Ñ?"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:191
-msgid "Requested action not taken: mailbox unavailable"
-msgstr "Ð?Ð°Ñ?Ð²ÐµÐ½Ð¾Ñ?Ð¾ Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ Ð½Ðµ Ðµ Ð¸Ð·Ð²Ñ?Ñ?Ñ?ÐµÐ½Ð¾: Ð»Ð¸Ð¿Ñ?Ð²Ð° Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ° ÐºÑ?Ñ?Ð¸Ñ?"
-
 #: ../camel/providers/smtp/camel-smtp-transport.c:193
-msgid "Requested action aborted: error in processing"
-msgstr "Ð?Ð°Ñ?Ð²ÐµÐ½Ð¾Ñ?Ð¾ Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ Ðµ Ð¿Ñ?ÐµÐºÑ?Ñ?Ð½Ð°Ñ?Ð¾: Ð³Ñ?ÐµÑ?ÐºÐ° Ð² Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?ÐºÐ°Ñ?Ð°"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:195
-msgid "User not local; please try <forward-path>"
-msgstr "Ð?Ð¾Ñ?Ñ?ÐµÐ±Ð¸Ñ?ÐµÐ»Ñ?Ñ? Ð½Ðµ Ðµ Ð»Ð¾ÐºÐ°Ð»ÐµÐ½: Ð¾Ð¿Ð¸Ñ?Ð°Ð¹Ñ?Ðµ <forward-path>"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:197
-msgid "Requested action not taken: insufficient system storage"
-msgstr ""
-"Ð?Ð°Ñ?Ð²ÐµÐ½Ð¾Ñ?Ð¾ Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ Ð½Ðµ Ðµ Ð¸Ð·Ð²Ñ?Ñ?Ñ?ÐµÐ½Ð¾: Ð»Ð¸Ð¿Ñ?Ð° Ð½Ð° Ð´Ð¾Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ð½Ð¾ ÐºÐ²Ð¾Ñ?Ð° Ð·Ð° Ð·Ð°Ð¿Ð°Ð·Ð²Ð°Ð½Ðµ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:199
-msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr ""
-"Ð?Ð°Ñ?Ð²ÐµÐ½Ð¾Ñ?Ð¾ Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ¾ Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ Ðµ Ð¿Ñ?ÐµÐºÑ?Ñ?Ð½Ð°Ñ?Ð¾: ÐºÐ²Ð¾Ñ?Ð°Ñ?Ð° Ð·Ð° Ð·Ð°Ð¿Ð°Ð·Ð²Ð°Ð½Ðµ Ðµ Ð½Ð°Ð´Ð²Ð¸Ñ?ÐµÐ½Ð°"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:201
-msgid "Requested action not taken: mailbox name not allowed"
-msgstr ""
-"Ð?Ð°Ñ?Ð²ÐµÐ½Ð¾Ñ?Ð¾ Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ¾ Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ Ð½Ðµ Ðµ Ð¸Ð·Ð²Ñ?Ñ?Ñ?ÐµÐ½Ð¾: Ð¸Ð¼ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ°Ñ?Ð° ÐºÑ?Ñ?Ð¸Ñ? Ð½Ðµ Ðµ "
-"Ñ?Ð°Ð·Ñ?ÐµÑ?ÐµÐ½Ð¾"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:203
-msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr "Ð?Ñ?Ð²ÐµÐ´ÐµÑ?Ðµ Ð´Ð°Ð½Ð½Ð¸Ñ?Ðµ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾ Ð¸ Ð·Ð°Ð²Ñ?Ñ?Ñ?ÐµÑ?Ðµ Ñ? <CRLF>.<CRLF>"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:205
-msgid "Transaction failed"
-msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð° Ñ?Ñ?Ð°Ð½Ð·Ð°ÐºÑ?Ð¸Ñ?"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:209
-msgid "A password transition is needed"
-msgstr "Ð?ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼Ð° Ðµ Ð¿Ñ?Ð¾Ð¼Ñ?Ð½Ð° Ð½Ð° Ð¿Ð°Ñ?Ð¾Ð»Ð°Ñ?Ð°"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:211
-msgid "Authentication mechanism is too weak"
-msgstr "Ð?ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼Ñ?Ñ? Ð´Ð° Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½Ðµ Ðµ Ñ?Ð²Ñ?Ñ?Ð´Ðµ Ñ?Ð»Ð°Ð±"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:213
-msgid "Encryption required for requested authentication mechanism"
-msgstr "Ð?Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ?Ñ? Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ñ?Ð¼ Ð½Ð° Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½Ðµ Ð¸Ð·Ð¸Ñ?ÐºÐ²Ð° Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ðµ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
-msgid "Temporary authentication failure"
-msgstr "Ð?Ñ?ÐµÐ¼ÐµÐ½Ð½Ð° Ð³Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½Ðµ"
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
+msgid "Welcome response error: "
+msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¾Ñ?Ð³Ð¾Ð²Ð¾Ñ?Ð° Ð½Ð° Ð¿Ð¾Ð·Ð´Ñ?Ð°Ð²Ð°: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:296
-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:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:277
+#: ../camel/providers/smtp/camel-smtp-transport.c:284
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ð²Ñ?Ñ?Ð·Ð²Ð°Ð½ÐµÑ?Ð¾ Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð·Ð° SMTP %s Ð² Ñ?Ð¸Ð³Ñ?Ñ?ÐµÐ½ Ñ?ÐµÐ¶Ð¸Ð¼: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:340
+#: ../camel/providers/smtp/camel-smtp-transport.c:246
+#: ../camel/providers/smtp/camel-smtp-transport.c:259
+#: ../camel/providers/smtp/camel-smtp-transport.c:266
+msgid "STARTTLS command failed: "
+msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° STARTTLS Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:357
 #, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° STARTTLS Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°: %s"
+msgid "SMTP server %s"
+msgstr "Ð¡Ñ?Ñ?Ð²Ñ?Ñ? Ð·Ð° SMTP %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:355
-msgid "STARTTLS command failed"
-msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° STARTTLS Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°"
+#: ../camel/providers/smtp/camel-smtp-transport.c:361
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð½Ðµ Ð½Ð° Ð¿Ð¾Ñ?Ð° Ñ?Ñ?ÐµÐ· SMTP Ð¿Ñ?ÐµÐ· %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:496
+#: ../camel/providers/smtp/camel-smtp-transport.c:408
 #, 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:495
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4611,204 +4601,304 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:700
-#, c-format
-msgid "SMTP server %s"
-msgstr "Ð¡Ñ?Ñ?Ð²Ñ?Ñ? Ð·Ð° SMTP %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:702
+#: ../camel/providers/smtp/camel-smtp-transport.c:613
 #, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð½Ðµ Ð½Ð° Ð¿Ð¾Ñ?Ð° Ñ?Ñ?ÐµÐ· SMTP Ð¿Ñ?ÐµÐ· %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:720
 msgid "Cannot send message: service not connected."
 msgstr "Ð?Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾ Ð½Ð° Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±Ñ?Ð´Ðµ Ð¸Ð·Ð¿Ñ?Ð°Ñ?ÐµÐ½Ð¾: Ñ?Ñ?Ð»Ñ?Ð³Ð°Ñ?Ð° Ð½Ðµ Ðµ Ñ?Ð²Ñ?Ñ?Ð·Ð°Ð½Ð°."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:726
+#: ../camel/providers/smtp/camel-smtp-transport.c:620
+#, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "Ð?Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±Ñ?Ð´Ðµ Ð¸Ð·Ð¿Ñ?Ð°Ñ?ÐµÐ½Ð¾: Ð½ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»ÐµÐ½ Ð°Ð´Ñ?ÐµÑ? Ð½Ð° Ð¸Ð·Ð¿Ñ?Ð°Ñ?Ð°Ñ?Ð°."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:730
+#: ../camel/providers/smtp/camel-smtp-transport.c:624
 msgid "Sending message"
 msgstr "Ð?Ð·Ð¿Ñ?Ð°Ñ?Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
+#: ../camel/providers/smtp/camel-smtp-transport.c:649
+#, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "Ð?Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±Ñ?Ð´Ðµ Ð¸Ð·Ð¿Ñ?Ð°Ñ?ÐµÐ½Ð¾: Ð½Ñ?Ð¼Ð° Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ñ?ÐµÐ»Ð¸."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:756
+#: ../camel/providers/smtp/camel-smtp-transport.c:662
+#, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "Ð?Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±Ñ?Ð´Ðµ Ð¸Ð·Ð¿Ñ?Ð°Ñ?ÐµÐ½Ð¾: ÐµÐ´Ð¸Ð½ Ð¸Ð»Ð¸ Ð¿Ð¾Ð²ÐµÑ?Ðµ Ð½ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»Ð½Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð¸ Ð½Ð° "
 "Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ñ?ÐµÐ»Ð¸."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:985
-msgid "SMTP Greeting"
-msgstr "Ð?Ð¾Ð·Ð´Ñ?Ð°Ð² Ð¿Ð¾ SMTP"
+#: ../camel/providers/smtp/camel-smtp-transport.c:725
+msgid "Syntax error, command unrecognized"
+msgstr "Ð¡Ð¸Ð½Ñ?Ð°ÐºÑ?Ð¸Ñ?Ð½Ð° Ð³Ñ?ÐµÑ?ÐºÐ°, Ð½ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1010
-#, c-format
-msgid "HELO command failed: %s"
-msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° HELO Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:727
+msgid "Syntax error in parameters or arguments"
+msgstr "Ð¡Ð¸Ð½Ñ?Ð°ÐºÑ?Ð¸Ñ?Ð½Ð° Ð³Ñ?ÐµÑ?ÐºÐ° Ð² Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð¸Ñ?Ðµ Ð¸Ð»Ð¸ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ?Ð¸Ñ?Ðµ"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:729
+msgid "Command not implemented"
+msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° Ð½Ðµ Ðµ Ñ?ÐµÐ°Ð»Ð¸Ð·Ð¸Ñ?Ð°Ð½Ð°"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:731
+msgid "Command parameter not implemented"
+msgstr "Ð?Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ?Ñ?Ñ? Ð½Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° Ð½Ðµ Ðµ Ñ?ÐµÐ°Ð»Ð¸Ð·Ð¸Ñ?Ð°Ð½"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:733
+msgid "System status, or system help reply"
+msgstr "Ð?Ñ?Ð³Ð¾Ð²Ð¾Ñ? Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ñ?Ð¾Ñ?Ð½Ð¸ÐµÑ?Ð¾ Ð½Ð° Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð°Ñ?Ð° Ð¸Ð»Ð¸ Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð½Ð° Ð¿Ð¾Ð¼Ð¾Ñ?"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:735
+msgid "Help message"
+msgstr "Ð?Ð¾Ð¼Ð¾Ñ?Ð½Ð¾ Ñ?Ñ?Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:737
+msgid "Service ready"
+msgstr "Ð£Ñ?Ð»Ñ?Ð³Ð°Ñ?Ð° Ðµ Ð³Ð¾Ñ?Ð¾Ð²Ð°"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:739
+msgid "Service closing transmission channel"
+msgstr "Ð£Ñ?Ð»Ñ?Ð³Ð°Ñ?Ð° Ð·Ð°Ñ?Ð²Ð¾Ñ?Ð¸ Ð¿Ñ?ÐµÑ?Ð²Ñ?Ñ?Ð»Ñ?Ñ?Ð¸Ñ? ÐºÐ°Ð½Ð°Ð»"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:741
+msgid "Service not available, closing transmission channel"
+msgstr "Ð£Ñ?Ð»Ñ?Ð³Ð°Ñ?Ð° Ð»Ð¸Ð¿Ñ?Ð²Ð°, Ð·Ð°Ñ?Ð²Ð°Ñ?Ñ?Ð½Ðµ Ð½Ð° Ð¿Ñ?ÐµÑ?Ð²Ñ?Ñ?Ð»Ñ?Ñ?Ð¸Ñ? ÐºÐ°Ð½Ð°Ð»"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:743
+msgid "Requested mail action okay, completed"
+msgstr "Ð?Ð°Ñ?Ð²ÐµÐ½Ð¾Ñ?Ð¾ Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ¾ Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ Ðµ Ð½Ð°Ñ?ÐµÐ´, Ð·Ð°Ð²Ñ?Ñ?Ñ?ÐµÐ½Ð¾"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:745
+msgid "User not local; will forward to <forward-path>"
+msgstr "Ð?Ð¾Ñ?Ñ?ÐµÐ±Ð¸Ñ?ÐµÐ»Ñ?Ñ? Ð½Ðµ Ðµ Ð»Ð¾ÐºÐ°Ð»ÐµÐ½: Ð¿Ñ?ÐµÐ¿Ñ?Ð°Ñ?Ð°Ð½Ðµ ÐºÑ?Ð¼ <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1027
-msgid "HELO command failed"
-msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° HELO Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°"
+#: ../camel/providers/smtp/camel-smtp-transport.c:747
+msgid "Requested mail action not taken: mailbox unavailable"
+msgstr "Ð?Ð°Ñ?Ð²ÐµÐ½Ð¾Ñ?Ð¾ Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ¾ Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ Ð½Ðµ Ðµ Ð¸Ð·Ð²Ñ?Ñ?Ñ?ÐµÐ½Ð¾: Ð»Ð¸Ð¿Ñ?Ð²Ð° Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ° ÐºÑ?Ñ?Ð¸Ñ?"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:749
+msgid "Requested action not taken: mailbox unavailable"
+msgstr "Ð?Ð°Ñ?Ð²ÐµÐ½Ð¾Ñ?Ð¾ Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ Ð½Ðµ Ðµ Ð¸Ð·Ð²Ñ?Ñ?Ñ?ÐµÐ½Ð¾: Ð»Ð¸Ð¿Ñ?Ð²Ð° Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ° ÐºÑ?Ñ?Ð¸Ñ?"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:751
+msgid "Requested action aborted: error in processing"
+msgstr "Ð?Ð°Ñ?Ð²ÐµÐ½Ð¾Ñ?Ð¾ Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ Ðµ Ð¿Ñ?ÐµÐºÑ?Ñ?Ð½Ð°Ñ?Ð¾: Ð³Ñ?ÐµÑ?ÐºÐ° Ð² Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?ÐºÐ°Ñ?Ð°"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1093
-msgid "SMTP Authentication"
-msgstr "Ð£Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½Ðµ Ð¿Ð¾ SMTP"
+#: ../camel/providers/smtp/camel-smtp-transport.c:753
+msgid "User not local; please try <forward-path>"
+msgstr "Ð?Ð¾Ñ?Ñ?ÐµÐ±Ð¸Ñ?ÐµÐ»Ñ?Ñ? Ð½Ðµ Ðµ Ð»Ð¾ÐºÐ°Ð»ÐµÐ½: Ð¾Ð¿Ð¸Ñ?Ð°Ð¹Ñ?Ðµ <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1099
-msgid "Error creating SASL authentication object."
-msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð¾Ð±ÐµÐºÑ? Ð·Ð° Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½Ðµ Ð¿Ð¾ SASL."
+#: ../camel/providers/smtp/camel-smtp-transport.c:755
+msgid "Requested action not taken: insufficient system storage"
+msgstr ""
+"Ð?Ð°Ñ?Ð²ÐµÐ½Ð¾Ñ?Ð¾ Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ Ð½Ðµ Ðµ Ð¸Ð·Ð²Ñ?Ñ?Ñ?ÐµÐ½Ð¾: Ð»Ð¸Ð¿Ñ?Ð° Ð½Ð° Ð´Ð¾Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ð½Ð¾ ÐºÐ²Ð¾Ñ?Ð° Ð·Ð° Ð·Ð°Ð¿Ð°Ð·Ð²Ð°Ð½Ðµ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1116
-#: ../camel/providers/smtp/camel-smtp-transport.c:1127
-#, c-format
-msgid "AUTH command failed: %s"
-msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° AUTH Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:757
+msgid "Requested mail action aborted: exceeded storage allocation"
+msgstr ""
+"Ð?Ð°Ñ?Ð²ÐµÐ½Ð¾Ñ?Ð¾ Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ¾ Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ Ðµ Ð¿Ñ?ÐµÐºÑ?Ñ?Ð½Ð°Ñ?Ð¾: ÐºÐ²Ð¾Ñ?Ð°Ñ?Ð° Ð·Ð° Ð·Ð°Ð¿Ð°Ð·Ð²Ð°Ð½Ðµ Ðµ Ð½Ð°Ð´Ð²Ð¸Ñ?ÐµÐ½Ð°"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1133
-msgid "AUTH command failed"
-msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° AUTH Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°"
+#: ../camel/providers/smtp/camel-smtp-transport.c:759
+msgid "Requested action not taken: mailbox name not allowed"
+msgstr ""
+"Ð?Ð°Ñ?Ð²ÐµÐ½Ð¾Ñ?Ð¾ Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ¾ Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ Ð½Ðµ Ðµ Ð¸Ð·Ð²Ñ?Ñ?Ñ?ÐµÐ½Ð¾: Ð¸Ð¼ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ°Ñ?Ð° ÐºÑ?Ñ?Ð¸Ñ? Ð½Ðµ Ðµ "
+"Ñ?Ð°Ð·Ñ?ÐµÑ?ÐµÐ½Ð¾"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1203
-msgid "Bad authentication response from server.\n"
-msgstr "Ð?Ð¾Ñ? Ð¾Ñ?Ð³Ð¾Ð²Ð¾Ñ? Ð¿Ñ?Ð¸ Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½Ðµ Ð¾Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð°.\n"
+#: ../camel/providers/smtp/camel-smtp-transport.c:761
+msgid "Start mail input; end with <CRLF>.<CRLF>"
+msgstr "Ð?Ñ?Ð²ÐµÐ´ÐµÑ?Ðµ Ð´Ð°Ð½Ð½Ð¸Ñ?Ðµ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾ Ð¸ Ð·Ð°Ð²Ñ?Ñ?Ñ?ÐµÑ?Ðµ Ñ? <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1230
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° MAIL FROM Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°: %s: Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾ Ð½Ðµ Ðµ Ð¸Ð·Ð¿Ñ?Ð°Ñ?ÐµÐ½Ð¾"
+#: ../camel/providers/smtp/camel-smtp-transport.c:763
+msgid "Transaction failed"
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð° Ñ?Ñ?Ð°Ð½Ð·Ð°ÐºÑ?Ð¸Ñ?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1247
-msgid "MAIL FROM command failed"
-msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° MAIL FROM Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°"
+#: ../camel/providers/smtp/camel-smtp-transport.c:767
+msgid "A password transition is needed"
+msgstr "Ð?ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼Ð° Ðµ Ð¿Ñ?Ð¾Ð¼Ñ?Ð½Ð° Ð½Ð° Ð¿Ð°Ñ?Ð¾Ð»Ð°Ñ?Ð°"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1271
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° RCPT TO Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°: %s: Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾ Ð½Ðµ Ðµ Ð¸Ð·Ð¿Ñ?Ð°Ñ?ÐµÐ½Ð¾"
+#: ../camel/providers/smtp/camel-smtp-transport.c:769
+msgid "Authentication mechanism is too weak"
+msgstr "Ð?ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼Ñ?Ñ? Ð´Ð° Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½Ðµ Ðµ Ñ?Ð²Ñ?Ñ?Ð´Ðµ Ñ?Ð»Ð°Ð±"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1290
-#, c-format
-msgid "RCPT TO <%s> failed"
-msgstr "RCPT TO <%s> Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°"
+#: ../camel/providers/smtp/camel-smtp-transport.c:771
+msgid "Encryption required for requested authentication mechanism"
+msgstr "Ð?Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ?Ñ? Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ñ?Ð¼ Ð½Ð° Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½Ðµ Ð¸Ð·Ð¸Ñ?ÐºÐ²Ð° Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ðµ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1330
-#: ../camel/providers/smtp/camel-smtp-transport.c:1399
-#: ../camel/providers/smtp/camel-smtp-transport.c:1418
-#, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° DATA Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°: %s: Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾ Ð½Ðµ Ðµ Ð¸Ð·Ð¿Ñ?Ð°Ñ?ÐµÐ½Ð¾"
+#: ../camel/providers/smtp/camel-smtp-transport.c:773
+msgid "Temporary authentication failure"
+msgstr "Ð?Ñ?ÐµÐ¼ÐµÐ½Ð½Ð° Ð³Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½Ðµ"
 
-#. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1347
-#: ../camel/providers/smtp/camel-smtp-transport.c:1434
-msgid "DATA command failed"
-msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° DATA Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1030
+msgid "SMTP Greeting"
+msgstr "Ð?Ð¾Ð·Ð´Ñ?Ð°Ð² Ð¿Ð¾ SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1457
-#, c-format
-msgid "RSET command failed: %s"
-msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° RSET Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1057
+#: ../camel/providers/smtp/camel-smtp-transport.c:1074
+#: ../camel/providers/smtp/camel-smtp-transport.c:1082
+msgid "HELO command failed: "
+msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° HELO Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1473
-msgid "RSET command failed"
-msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° RSET Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1150
+msgid "SMTP Authentication"
+msgstr "Ð£Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½Ðµ Ð¿Ð¾ SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1496
+#: ../camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
-msgid "QUIT command failed: %s"
-msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° QUIT Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°: %s"
+msgid "Error creating SASL authentication object."
+msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð¾Ð±ÐµÐºÑ? Ð·Ð° Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½Ðµ Ð¿Ð¾ SASL."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1510
-msgid "QUIT command failed"
-msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° QUIT Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1176
+#: ../camel/providers/smtp/camel-smtp-transport.c:1187
+#: ../camel/providers/smtp/camel-smtp-transport.c:1196
+msgid "AUTH command failed: "
+msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° AUTH Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1304
+#: ../camel/providers/smtp/camel-smtp-transport.c:1318
+#: ../camel/providers/smtp/camel-smtp-transport.c:1327
+msgid "MAIL FROM command failed: "
+msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° MAIL FROM Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1354
+msgid "RCPT TO command failed: "
+msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° RCPT TO Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1370
+#: ../camel/providers/smtp/camel-smtp-transport.c:1379
+#, c-format
+msgid "RCPT TO <%s> failed: "
+msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° RCPT TO <%s> Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1421
+#: ../camel/providers/smtp/camel-smtp-transport.c:1431
+#: ../camel/providers/smtp/camel-smtp-transport.c:1441
+#: ../camel/providers/smtp/camel-smtp-transport.c:1500
+#: ../camel/providers/smtp/camel-smtp-transport.c:1519
+#: ../camel/providers/smtp/camel-smtp-transport.c:1532
+#: ../camel/providers/smtp/camel-smtp-transport.c:1540
+msgid "DATA command failed: "
+msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° DATA Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1565
+#: ../camel/providers/smtp/camel-smtp-transport.c:1579
+#: ../camel/providers/smtp/camel-smtp-transport.c:1587
+msgid "RSET command failed: "
+msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° RSET Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1612
+#: ../camel/providers/smtp/camel-smtp-transport.c:1626
+#: ../camel/providers/smtp/camel-smtp-transport.c:1633
+msgid "QUIT command failed: "
+msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° QUIT Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°: "
 
 #: ../libedataserver/e-categories.c:47
+msgctxt "CategoryName"
+msgid "Anniversary"
+msgstr "Ð?Ð¾Ð´Ð¸Ñ?Ð½Ð¸Ð½Ð°"
+
+#: ../libedataserver/e-categories.c:48
+msgctxt "CategoryName"
+msgid "Birthday"
+msgstr "Ð?Ð°Ñ?Ð° Ð½Ð° Ñ?Ð°Ð¶Ð´Ð°Ð½Ðµ"
+
+#: ../libedataserver/e-categories.c:49
+msgctxt "CategoryName"
 msgid "Business"
 msgstr "Ð?Ð¸Ð·Ð½ÐµÑ?"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:50
+msgctxt "CategoryName"
 msgid "Competition"
 msgstr "Ð?Ð¾Ð½ÐºÑ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:51
+msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "Ð?Ñ?Ð±Ð¸Ð¼Ð¸"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:52
+msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "Ð?Ð¾Ð´Ð°Ñ?Ñ?Ñ?Ð¸"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:53
+msgctxt "CategoryName"
 msgid "Goals/Objectives"
-msgstr "Ð¦ÐµÐ»Ð¸/Ð·Ð°Ð´Ð°Ñ?Ð¸"
+msgstr "Ð¦ÐµÐ»Ð¸ Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð¸"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:54
+msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "Ð?Ñ?Ð°Ð·Ð½Ð¸Ðº"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:55
+msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "Ð?Ð¾Ð·Ð´Ñ?Ð°Ð²Ð¸Ñ?ÐµÐ»Ð½Ð¸ ÐºÐ°Ñ?Ñ?Ð¸Ñ?ÐºÐ¸"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:57
+msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "Ð?Ð°Ð¶Ð½Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð¸"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:58
+msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "Ð?Ð´ÐµÐ¸"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:59
+msgctxt "CategoryName"
 msgid "International"
 msgstr "Ð?ÐµÐ¶Ð´Ñ?Ð½Ð°Ñ?Ð¾Ð´Ð½Ð¸"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:60
+msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "Ð?Ð»Ñ?Ñ?Ð¾Ð²Ð¸ ÐºÐ»Ð¸ÐµÐ½Ñ?Ð¸"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:61
+msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "Ð?Ñ?Ñ?Ð³Ð¸"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:62
+msgctxt "CategoryName"
 msgid "Personal"
 msgstr "Ð?Ð¸Ñ?Ð½Ð¸"
 
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:63
+msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "Ð¢ÐµÐ»ÐµÑ?Ð¾Ð½Ð½Ð¸ Ð¾Ð±Ð°Ð¶Ð´Ð°Ð½Ð¸Ñ?"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:65
+msgctxt "CategoryName"
 msgid "Status"
 msgstr "Ð¡Ñ?Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ðµ"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:66
+msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "Ð¡Ñ?Ñ?Ð°Ñ?ÐµÐ³Ð¸Ð¸"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:67
+msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð¸Ñ?Ð¸"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:68
+msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ Ð¸ Ñ?Ð°Ð·Ñ?Ð¾Ð´Ð¸"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:69
+msgctxt "CategoryName"
 msgid "VIP"
 msgstr "Ð?Ð?Ð?"
 
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:70
+msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "Ð?Ð·Ñ?Ð°ÐºÐ²Ð°Ð½Ðµ"
 
@@ -4816,7 +4906,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:1931
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%d.%m.%Y, %a, %I:%M:%S %p"
 
@@ -4824,7 +4914,7 @@ msgstr "%d.%m.%Y, %a, %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:1922
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%d.%m.%Y, %a, %H:%M:%S"
 
@@ -4832,7 +4922,7 @@ msgstr "%d.%m.%Y, %a, %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:1927
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%d.%m.%Y, %a, %I:%M %p"
 
@@ -4840,78 +4930,78 @@ msgstr "%d.%m.%Y, %a, %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:1918
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%d.%m.%Y, %a, %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 "%d.%m.%Y, %a, %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 "%d.%m.%Y, %a, %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:1783
+#: ../libedataserver/e-time-utils.c:1913
 msgid "%a %m/%d/%Y"
 msgstr "%d.%m.%Y, %a"
 
 #. 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 "%d.%m.%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 "%d.%m.%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 "%d.%m.%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 "%d.%m.%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 "%d.%m.%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 "%d.%m.%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:1786
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%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:1855 ../libedataserver/e-time-utils.c:1975
 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:1859 ../libedataserver/e-time-utils.c:1967
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4919,205 +5009,201 @@ 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:1864 ../libedataserver/e-time-utils.c:1972
 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:1868 ../libedataserver/e-time-utils.c:1964
 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:1871
 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:1875
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-book-auth-util.c:90
+#: ../libedataserverui/e-book-auth-util.c:93
+#: ../libedataserverui/e-book-auth-util.c:673
 msgid "Accessing LDAP Server anonymously"
 msgstr "Ð?Ð½Ð¾Ð½Ð¸Ð¼ÐµÐ½ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿ Ð´Ð¾ Ñ?Ñ?Ñ?Ð²Ñ?Ñ? Ð·Ð° LDAP"
 
-#: ../libedataserverui/e-book-auth-util.c:192
+#: ../libedataserverui/e-book-auth-util.c:199
+#: ../libedataserverui/e-book-auth-util.c:435
 msgid "Failed to authenticate.\n"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½ÐµÑ?Ð¾.\n"
 
-#: ../libedataserverui/e-categories-dialog.c:145
+#: ../libedataserverui/e-categories-dialog.c:127
+msgid "Category Properties"
+msgstr "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð½Ð° ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ñ?Ð°"
+
+#: ../libedataserverui/e-categories-dialog.c:138
+msgid "Category _Name"
+msgstr "Ð?_Ð¼Ðµ Ð½Ð° ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ñ?Ð°"
+
+#: ../libedataserverui/e-categories-dialog.c:144
+msgid "Category _Icon"
+msgstr "_Ð?ÐºÐ¾Ð½Ð° Ð½Ð° ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ñ?Ð°"
+
+#: ../libedataserverui/e-categories-dialog.c:185
 msgid "Category Icon"
 msgstr "Ð?ÐºÐ¾Ð½Ð° Ð½Ð° ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ñ?Ð°"
 
-#: ../libedataserverui/e-categories-dialog.c:151
+#: ../libedataserverui/e-categories-dialog.c:191
 msgid "_No Image"
 msgstr "_Ð?ÐµÐ· Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ðµ"
 
-#: ../libedataserverui/e-categories-dialog.c:372
+#: ../libedataserverui/e-categories-dialog.c:406
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "Ð? Ñ?Ð°Ð·Ð¸ ÐºÐ¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð°Ñ?Ð¸Ñ? Ð²ÐµÑ?Ðµ Ð¸Ð¼Ð° ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ? â??%sâ??. Ð?Ð·Ð±ÐµÑ?ÐµÑ?Ðµ Ð´Ñ?Ñ?Ð³Ð¾ Ð¸Ð¼Ðµ"
 
-#: ../libedataserverui/e-categories-dialog.c:680
-msgid "Icon"
-msgstr "Ð?ÐºÐ¾Ð½Ð°"
-
-#: ../libedataserverui/e-categories-dialog.c:685
-msgid "Category"
-msgstr "Ð?Ð°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:1
-msgid "Category Properties"
-msgstr "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð½Ð° ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ñ?Ð°"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:2
-msgid "Category _Icon"
-msgstr "_Ð?ÐºÐ¾Ð½Ð° Ð½Ð° ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ñ?Ð°"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:3
-msgid "Category _Name"
-msgstr "Ð?_Ð¼Ðµ Ð½Ð° ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ñ?Ð°"
+#: ../libedataserverui/e-categories-dialog.c:661
+msgid "Currently _used categories:"
+msgstr "_Ð¢ÐµÐºÑ?Ñ?Ð¾ Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½Ð¸ ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ð¸:"
 
-#: ../libedataserverui/e-categories-dialog.ui.h:4
-msgid "Item(s) _belong to these categories:"
-msgstr "Ð?Ð»ÐµÐ¼ÐµÐ½Ñ?Ñ?Ñ?(Ð¸Ñ?Ðµ) _Ð¿Ñ?Ð¸Ð½Ð°Ð´Ð»ÐµÐ¶Ð°Ñ? Ð½Ð° Ñ?ÐµÐ·Ð¸ ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ð¸:"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:5
+#: ../libedataserverui/e-categories-dialog.c:668
 msgid "_Available Categories:"
 msgstr "_Ð?Ð°Ð»Ð¸Ñ?Ð½Ð¸ ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ð¸:"
 
-#: ../libedataserverui/e-categories-dialog.ui.h:6
+#: ../libedataserverui/e-categories-dialog.c:711
 msgid "_Edit"
 msgstr "_Ð ÐµÐ´Ð°ÐºÑ?Ð¸Ñ?Ð°Ð½Ðµ"
 
-#: ../libedataserverui/e-categories-dialog.ui.h:7
-msgid "categories"
-msgstr "ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ð¸"
+#: ../libedataserverui/e-categories-dialog.c:768
+msgid "Icon"
+msgstr "Ð?ÐºÐ¾Ð½Ð°"
+
+#: ../libedataserverui/e-categories-dialog.c:773
+msgid "Category"
+msgstr "Ð?Ð°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?"
 
-#: ../libedataserverui/e-category-completion.c:292
+#: ../libedataserverui/e-category-completion.c:294
 #, c-format
 msgid "Create category \"%s\""
 msgstr "Ð¡Ñ?Ð·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ñ?Ð° â??%sâ??"
 
-#: ../libedataserverui/e-cell-renderer-color.c:222
-msgid "Color Info"
-msgstr "Ð?Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ? Ð·Ð° Ñ?Ð²ÐµÑ?Ð°"
+#: ../libedataserverui/e-name-selector-dialog.c:176
+msgid "Show Contacts"
+msgstr "Ð?Ð¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð¸Ñ?Ðµ"
 
-#: ../libedataserverui/e-cell-renderer-color.c:223
-msgid "The color to render"
-msgstr "Ð¦Ð²ÐµÑ?Ñ?Ñ?, ÐºÐ¾Ð¹Ñ?Ð¾ Ð´Ð° Ñ?Ðµ Ð¿Ð¾ÐºÐ°Ð¶Ðµ"
-
-#: ../libedataserverui/e-name-selector-dialog.c:292
-msgid "Select Contacts from Address Book"
-msgstr "Ð?Ð·Ð±Ð¾Ñ? Ð½Ð° ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð¸ Ð¾Ñ? Ð°Ð´Ñ?ÐµÑ?Ð½Ð¸ÐºÐ°"
+#: ../libedataserverui/e-name-selector-dialog.c:198
+msgid "Address B_ook:"
+msgstr "Ð?Ð´Ñ?ÐµÑ?Ð½Ð¸_Ðº:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:587
-msgid "_Add"
-msgstr "_Ð?Ð¾Ð±Ð°Ð²Ñ?Ð½Ðµ"
+#: ../libedataserverui/e-name-selector-dialog.c:206
+msgid "Cate_gory:"
+msgstr "Ð?_Ð°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?"
 
-#: ../libedataserverui/e-name-selector-dialog.c:612
-msgid "_Remove"
-msgstr "_Ð?Ñ?ÐµÐ¼Ð°Ñ?Ð²Ð°Ð½Ðµ"
+#: ../libedataserverui/e-name-selector-dialog.c:224
+msgid "_Search:"
+msgstr "_Ð¢Ñ?Ñ?Ñ?ÐµÐ½Ðµ:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:789
-#: ../libedataserverui/e-name-selector-dialog.ui.h:6
+#: ../libedataserverui/e-name-selector-dialog.c:242
+#: ../libedataserverui/e-name-selector-dialog.c:977
 msgid "Any Category"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð¾ Ð¸ Ð´Ð° Ðµ ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:1
-msgid "*"
-msgstr "*"
+#: ../libedataserverui/e-name-selector-dialog.c:244
+msgid "Co_ntacts"
+msgstr "_Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?Ð¸"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:2
-msgid "<b>Co_ntacts</b>"
-msgstr "<b>_Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?Ð¸</b>"
-
-#: ../libedataserverui/e-name-selector-dialog.ui.h:3
-msgid "<b>Show Contacts</b>"
-msgstr "<b>Ð?Ð¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð¸</b>"
-
-#: ../libedataserverui/e-name-selector-dialog.ui.h:4
-msgid "Address B_ook:"
-msgstr "Ð?Ð´Ñ?ÐµÑ?Ð½Ð¸_Ðº:"
+#: ../libedataserverui/e-name-selector-dialog.c:289
+msgid "Search"
+msgstr "Ð¢Ñ?Ñ?Ñ?ÐµÐ½Ðµ"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:5
+#: ../libedataserverui/e-name-selector-dialog.c:292
 msgid "Address Book"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ð½Ð¸Ðº"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:7
-msgid "Cate_gory:"
-msgstr "Ð?_Ð°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?"
-
-#: ../libedataserverui/e-name-selector-dialog.ui.h:8
+#: ../libedataserverui/e-name-selector-dialog.c:295
 msgid "Contacts"
 msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?Ð¸"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:9
-msgid "Search"
-msgstr "Ð¢Ñ?Ñ?Ñ?ÐµÐ½Ðµ"
+#: ../libedataserverui/e-name-selector-dialog.c:412
+msgid "Select Contacts from Address Book"
+msgstr "Ð?Ð·Ð±Ð¾Ñ? Ð½Ð° ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð¸ Ð¾Ñ? Ð°Ð´Ñ?ÐµÑ?Ð½Ð¸ÐºÐ°"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:10
-msgid "_Search:"
-msgstr "_Ð¢Ñ?Ñ?Ñ?ÐµÐ½Ðµ:"
+#: ../libedataserverui/e-name-selector-dialog.c:747
+msgid "_Add"
+msgstr "_Ð?Ð¾Ð±Ð°Ð²Ñ?Ð½Ðµ"
+
+#: ../libedataserverui/e-name-selector-dialog.c:751
+msgid "_Remove"
+msgstr "_Ð?Ñ?ÐµÐ¼Ð°Ñ?Ð²Ð°Ð½Ðµ"
+
+#: ../libedataserverui/e-name-selector-dialog.c:891
+#, c-format
+msgid "Error loading address book: %s"
+msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð·Ð°Ñ?ÐµÐ¶Ð´Ð°Ð½Ðµ Ð½Ð° Ð°Ð´Ñ?ÐµÑ?Ð½Ð¸ÐºÐ°: %s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2508
+#: ../libedataserverui/e-name-selector-entry.c:2661
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "_Ð?Ñ?Ñ?Ñ?ÐµÑ?Ð½Ð¾ Ñ?Ð°Ð·Ñ?Ð¸Ñ?Ñ?Ð²Ð°Ð½Ðµ Ð½Ð° %s"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2523
+#: ../libedataserverui/e-name-selector-entry.c:2676
 #, c-format
 msgid "Cop_y %s"
 msgstr "_Ð?Ð¾Ð¿Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2533
+#: ../libedataserverui/e-name-selector-entry.c:2686
 #, c-format
 msgid "C_ut %s"
 msgstr "Ð?Ñ?_Ñ?Ñ?Ð·Ð²Ð°Ð½Ðµ Ð½Ð° %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2550
+#: ../libedataserverui/e-name-selector-entry.c:2703
 #, c-format
 msgid "_Edit %s"
 msgstr "_Ð ÐµÐ´Ð°ÐºÑ?Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° %s"
 
-#: ../libedataserverui/e-name-selector-list.c:469
+#: ../libedataserverui/e-name-selector-list.c:509
 #, c-format
 msgid "_Delete %s"
 msgstr "_Ð?Ð·Ñ?Ñ?Ð¸Ð²Ð°Ð½Ðµ Ð½Ð° %s"
 
-#: ../libedataserverui/e-passwords.c:234
+#: ../libedataserverui/e-passwords.c:127
 #, c-format
 msgid "Keyring key is unusable: no user or host name"
 msgstr ""
 "Ð?Ð»Ñ?Ñ?Ñ?Ñ? Ð¾Ñ? ÐºÐ»Ñ?Ñ?Ð¾Ð´Ñ?Ñ?Ð¶Ð°Ñ?ÐµÐ»Ñ? Ðµ Ð½ÐµÐ¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°ÐµÐ¼: Ð»Ð¸Ð¿Ñ?Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð¸Ñ?ÐµÐ» Ð¸Ð»Ð¸ Ð¸Ð¼Ðµ Ð½Ð° Ñ?Ð¾Ñ?Ñ?"
 
 # Ð? gdm Ðµ Ñ?Ð°ÐºÐ°.
-#: ../libedataserverui/e-passwords.c:1093
+#: ../libedataserverui/e-passwords.c:701
+#: ../libedataserverui/e-passwords-win32.c:612
 msgid "You have the Caps Lock key on."
 msgstr "Ð?Ð»Ð°Ð²Ð¸Ñ?Ñ?Ñ? â??Caps Lockâ?? Ðµ Ð½Ð°Ñ?Ð¸Ñ?Ð½Ð°Ñ?."
 
-#: ../libedataserverui/e-passwords.c:1215
+#: ../libedataserverui/e-passwords.c:821
+#: ../libedataserverui/e-passwords-win32.c:735
 msgid "_Remember this passphrase"
 msgstr "_Ð?Ð°Ð¿Ð¾Ð¼Ð½Ñ?Ð½Ðµ Ð½Ð° Ð¿Ð°Ñ?Ð¾Ð»Ð°Ñ?Ð°"
 
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:822
+#: ../libedataserverui/e-passwords-win32.c:736
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "Ð?Ð°Ð¿Ð¾Ð¼Ð½Ñ?Ð½Ðµ Ð½Ð° Ð¿Ð°Ñ?Ð¾Ð»Ð°Ñ?Ð° Ð´Ð¾ _ÐºÑ?Ð°Ñ? Ð½Ð° Ñ?Ð°Ð·Ð¸ Ñ?ÐµÑ?Ð¸Ñ?"
 
-#: ../libedataserverui/e-passwords.c:1221
+#: ../libedataserverui/e-passwords.c:827
+#: ../libedataserverui/e-passwords-win32.c:741
 msgid "_Remember this password"
 msgstr "_Ð?Ð°Ð¿Ð¾Ð¼Ð½Ñ?Ð½Ðµ Ð½Ð° Ð¿Ð°Ñ?Ð¾Ð»Ð°Ñ?Ð°"
 
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:828
+#: ../libedataserverui/e-passwords-win32.c:742
 msgid "_Remember this password for the remainder of this session"
 msgstr "Ð?Ð°Ð¿Ð¾Ð¼Ð½Ñ?Ð½Ðµ Ð½Ð° Ð¿Ð°Ñ?Ð¾Ð»Ð°Ñ?Ð° Ð´Ð¾ _ÐºÑ?Ð°Ñ? Ð½Ð° Ñ?Ð°Ð·Ð¸ Ñ?ÐµÑ?Ð¸Ñ?"
 
@@ -5126,7 +5212,7 @@ msgstr "Ð?Ð°Ð¿Ð¾Ð¼Ð½Ñ?Ð½Ðµ Ð½Ð° Ð¿Ð°Ñ?Ð¾Ð»Ð°Ñ?Ð° Ð´Ð¾ _ÐºÑ?Ð°Ñ? Ð½Ð° Ñ?Ð°Ð·Ð¸ Ñ?
 msgid "Select destination"
 msgstr "Ð?Ð·Ð±Ð¾Ñ? Ð½Ð° Ñ?ÐµÐ»"
 
-#: ../libedataserverui/e-source-selector-dialog.c:156
+#: ../libedataserverui/e-source-selector-dialog.c:170
 msgid "_Destination"
 msgstr "_Ð¦ÐµÐ»"
 
@@ -5145,3 +5231,386 @@ msgstr "Ð?Ð¸Ð¿Ñ?Ð²Ð° Ð¾Ñ?Ð³Ð¾Ð²Ð¾Ñ? Ð¾Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð°"
 #: ../servers/groupwise/e-gw-connection.c:239
 msgid "Bad parameter"
 msgstr "Ð?Ð¾Ñ? Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ?"
+
+#~ msgid "Cannot complete operation"
+#~ msgstr "Ð?Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?Ñ?Ð° Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð·Ð°Ð²Ñ?Ñ?Ñ?Ð¸"
+
+#~ msgid "Could not create thread for getting deltas"
+#~ msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð½Ð¸Ñ?ÐºÐ° Ð·Ð° Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ñ?Ð°Ð·Ð»Ð¸ÐºÐ¸Ñ?Ðµ"
+
+#~ msgid "Offline mode unavailable"
+#~ msgstr "Ð?Ð¸Ð¿Ñ?Ð²Ð° Ñ?ÐµÐ¶Ð¸Ð¼ â??Ð?Ð·ÐºÐ»Ñ?Ñ?ÐµÐ½â??"
+
+#~ msgid "Verifying message"
+#~ msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?ÐºÐ° Ð½Ð° Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð° Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾"
+
+#~ msgid "Cannot open message"
+#~ 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"
+
+#~ msgid "Learning junk"
+#~ msgstr "Ð?Ð±Ñ?Ñ?Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ñ?Ð¿Ð°Ð¼-Ñ?Ð¸Ð»Ñ?Ñ?Ñ?Ð° Ñ? Ð¿Ð¸Ñ?Ð¼Ð° Ñ?Ð¸Ð¿ Ñ?Ð¿Ð°Ð¼"
+
+#~ msgid "Learning non-junk"
+#~ msgstr "Ð?Ð±Ñ?Ñ?Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ñ?Ð¿Ð°Ð¼-Ñ?Ð¸Ð»Ñ?Ñ?Ñ?Ð° Ñ? Ð¿Ð¸Ñ?Ð¼Ð°, ÐºÐ¾Ð¸Ñ?Ð¾ Ð½Ðµ Ñ?Ð° Ñ?Ð¿Ð°Ð¼"
+
+#~ msgid "Canceled."
+#~ msgstr "Ð?Ñ?ÐµÐºÑ?Ð°Ñ?ÐµÐ½Ð¾."
+
+#~ msgid "Cannot verify message signature: could not create temp file: %s"
+#~ msgstr ""
+#~ "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ñ?Ð¾Ð²ÐµÑ?ÐºÐ°Ñ?Ð° Ð½Ð° Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð° Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾: Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ñ?Ñ?Ð·Ð´Ð°Ð´Ðµ "
+#~ "Ð²Ñ?ÐµÐ¼ÐµÐ½ÐµÐ½ Ñ?Ð°Ð¹Ð»: %s"
+
+#~ msgid "Unable to parse message content"
+#~ msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð°Ð½Ð°Ð»Ð¸Ð·Ð¸Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ñ?Ñ?Ð´Ñ?Ñ?Ð¶Ð°Ð½Ð¸ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾"
+
+#~ msgid "cannot create thread"
+#~ 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 "User canceled"
+#~ msgstr "Ð?Ñ?ÐºÐ°Ð·Ð°Ð½Ð¾ Ð¾Ñ? Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð¸Ñ?ÐµÐ»Ñ?"
+
+#~ msgid "Trash Folder Full. Please Empty."
+#~ 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 "Ð¢Ð°Ð·Ð¸ Ð¾Ð¿Ñ?Ð¸Ñ? Ñ?Ðµ Ð²Ð¸ Ñ?Ð²Ñ?Ñ?Ð¶Ðµ Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ? Ð½Ð° Hula Ñ?Ñ?ÐµÐ· Ð½ÐµÑ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð° Ð¿Ð°Ñ?Ð¾Ð»Ð°."
+
+#~ msgid "Unexpected response status '%s' after APPEND command"
+#~ msgstr "Ð?ÐµÐ¾Ñ?Ð°ÐºÐ²Ð°Ð½ Ð¾Ñ?Ð³Ð¾Ð²Ð¾Ñ? Ð·Ð° Ñ?Ñ?Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ðµ â??%sâ?? Ñ?Ð»ÐµÐ´ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° APPEND"
+
+#~ msgid "No response on continuation after APPEND command"
+#~ msgstr "Ð?Ñ?Ð¼Ð° Ð¾Ñ?Ð³Ð¾Ð²Ð¾Ñ? Ð·Ð° Ð¿Ñ?Ð¾Ð´Ñ?Ð»Ð¶Ð°Ð²Ð°Ð½Ðµ Ñ?Ð»ÐµÐ´ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° APPEND"
+
+#~ msgid "Unknown error occurred during APPEND command!"
+#~ msgstr "Ð?Ñ?Ð·Ð½Ð¸ÐºÐ½Ð° Ð½ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ð° Ð³Ñ?ÐµÑ?ÐºÐ° Ð¿Ð¾ Ð²Ñ?ÐµÐ¼Ðµ Ð½Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° APPEND."
+
+#~ msgid "_Apply filters to new messages in INBOX on this server"
+#~ msgstr "Ð?Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½Ðµ Ð½Ð° _Ñ?Ð¸Ð»Ñ?Ñ?Ð¸ Ð·Ð° Ð½Ð¾Ð²Ð¸ Ð¿Ð¸Ñ?Ð¼Ð° Ð² INBOX Ð¾Ñ? Ñ?Ð¾Ð·Ð¸ Ñ?Ñ?Ñ?Ð²Ñ?Ñ?"
+
+#~ 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 "Ð?ÐµÐ¾Ñ?Ð°ÐºÐ²Ð°Ð½ Ð¿Ð¾Ð·Ð´Ñ?Ð°Ð² Ð¾Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð·Ð° IMAP %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 "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¸Ð·Ð¿Ñ?Ð°Ñ?Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° ÐºÑ?Ð¼ Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð·Ð° IMAP %s: %s"
+
+#~ 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 "Ð?Ñ?Ð¾Ð²ÐµÑ?ÐºÐ° Ð½Ð° Ð½Ð¾Ð²Ð¸Ñ?Ðµ Ð¿Ð¸Ñ?Ð¼Ð° Ð·Ð° _Ñ?Ð¿Ð°Ð¼"
+
+#~ msgid "Only check for Junk messa_ges in the INBOX folder"
+#~ msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?ÐºÐ° Ð·Ð° Ñ?Ð¿Ð°Ð¼ Ñ?Ð°Ð¼Ð¾ Ð½Ð° _Ð¿Ð¸Ñ?Ð¼Ð° Ð² Ð¿Ð¾Ñ?ÐµÐ½Ñ?ÐºÐ°Ñ?Ð° ÐºÑ?Ñ?Ð¸Ñ?"
+
+#~ msgid "IMAP4rev1"
+#~ msgstr "IMAP4rev1"
+
+#~ msgid "For reading and storing mail on IMAPv4rev1 servers."
+#~ msgstr "Ð?Ð° Ñ?ÐµÑ?ÐµÐ½Ðµ Ð¸ Ð·Ð°Ð¿Ð°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾Ñ?Ð° Ð¾Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð¸ Ð·Ð° IMAPv4rev1."
+
+#~ msgid ""
+#~ "This option will connect to the IMAPv4rev1 server using a plaintext "
+#~ "password."
+#~ msgstr ""
+#~ "Ð¢Ð°Ð·Ð¸ Ð¾Ð¿Ñ?Ð¸Ñ? Ñ?Ðµ Ð²Ð¸ Ñ?Ð²Ñ?Ñ?Ð¶Ðµ Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ? Ð·Ð° IMAPv4rev1 Ñ?Ñ?ÐµÐ· Ð½ÐµÑ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð° Ð¿Ð°Ñ?Ð¾Ð»Ð°."
+
+#~ 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 ""
+#~ "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?Ñ?Ð° LIST Ð·Ð° Ð¿Ð°Ð¿ÐºÐ°Ñ?Ð° â??%sâ?? Ð½Ð° Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° "
+#~ "Ð·Ð° IMAP %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 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 ""
+#~ "Ð?Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¿Ñ?ÐµÐºÑ?Ð°Ñ?Ð¸Ñ?Ðµ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½Ñ?Ð° Ð·Ð° Ð¿Ð°Ð¿ÐºÐ¸ Ð¿Ð¾ IMAP Ð´Ð¾ÐºÐ°Ñ?Ð¾ Ñ?Ñ?Ðµ Ð² Ñ?ÐµÐ¶Ð¸Ð¼ "
+#~ "â??Ð?Ð·ÐºÐ»Ñ?Ñ?ÐµÐ½â??."
+
+#~ 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 "Ð?Ñ?Ñ?Ð·ÐºÐ°Ñ?Ð° Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð° Ð·Ð° IMAP %s Ð¿Ñ?ÐµÐºÑ?Ñ?Ð½Ð° Ð½ÐµÐ¾Ñ?Ð°ÐºÐ²Ð°Ð½Ð¾: %s"
+
+#~ msgid "%sPlease enter the IMAP password for %s %s"
+#~ msgstr "%sÐ?Ð¾Ð»Ñ? Ð²Ñ?Ð²ÐµÐ´ÐµÑ?Ðµ Ð¿Ð°Ñ?Ð¾Ð»Ð° Ð·Ð° IMAP Ð·Ð° %s %s"
+
+#~ msgid "Maildir append message canceled"
+#~ msgstr "Ð?Ð¾Ð±Ð°Ð²Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾ Ð² maildir Ðµ Ð¾Ñ?Ð¼ÐµÐ½ÐµÐ½Ð¾"
+
+#~ msgid "Invalid message contents"
+#~ msgstr "Ð?ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»Ð½Ð¾ Ñ?Ñ?Ð´Ñ?Ñ?Ð¶Ð°Ð½Ð¸Ðµ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾"
+
+#~ msgid "Mail append canceled"
+#~ msgstr "Ð?Ð¾Ð±Ð°Ð²Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð° Ðµ Ð¿Ñ?ÐµÐºÑ?Ñ?Ð½Ð°Ñ?Ð¾"
+
+#~ msgid "Message construction failed."
+#~ msgstr "Ð¡Ñ?Ð·Ð´Ð°Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾ Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð¾."
+
+#~ msgid "MH append message canceled"
+#~ msgstr "Ð?Ñ?ÐµÐºÑ?Ñ?Ð½Ð°Ñ?Ð¾ Ð±Ðµ Ð´Ð¾Ð±Ð°Ð²Ñ?Ð½Ðµ Ð½Ð° Ð¿Ð¸Ñ?Ð¼Ð¾ ÐºÑ?Ð¼ Ð¿Ð°Ð¿ÐºÐ° Ñ?Ð¸Ð¿ MH"
+
+#~ msgid "Use cancel"
+#~ msgstr "Ð?Ñ?Ð¼ÐµÐ½ÐµÐ½Ð¾ Ð¾Ñ? Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð¸Ñ?ÐµÐ»Ñ?"
+
+#~ msgid "STARTTLS command failed"
+#~ msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° STARTTLS Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°"
+
+#~ msgid "HELO command failed"
+#~ msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° HELO Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°"
+
+#~ msgid "AUTH command failed"
+#~ msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° AUTH Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°"
+
+#~ msgid "Bad authentication response from server.\n"
+#~ msgstr "Ð?Ð¾Ñ? Ð¾Ñ?Ð³Ð¾Ð²Ð¾Ñ? Ð¿Ñ?Ð¸ Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð²Ð°Ð½Ðµ Ð¾Ñ? Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ð°.\n"
+
+#~ msgid "MAIL FROM command failed: %s: mail not sent"
+#~ msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° MAIL FROM Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°: %s: Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾ Ð½Ðµ Ðµ Ð¸Ð·Ð¿Ñ?Ð°Ñ?ÐµÐ½Ð¾"
+
+#~ msgid "RCPT TO command failed: %s: mail not sent"
+#~ msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° RCPT TO Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°: %s: Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾ Ð½Ðµ Ðµ Ð¸Ð·Ð¿Ñ?Ð°Ñ?ÐµÐ½Ð¾"
+
+#~ msgid "DATA command failed: %s: mail not sent"
+#~ msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° DATA Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°: %s: Ð¿Ð¸Ñ?Ð¼Ð¾Ñ?Ð¾ Ð½Ðµ Ðµ Ð¸Ð·Ð¿Ñ?Ð°Ñ?ÐµÐ½Ð¾"
+
+#~ msgid "RSET command failed"
+#~ msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° RSET Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°"
+
+#~ msgid "QUIT command failed"
+#~ msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°Ñ?Ð° QUIT Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð°"
+
+#~ msgid "Item(s) _belong to these categories:"
+#~ msgstr "Ð?Ð»ÐµÐ¼ÐµÐ½Ñ?Ñ?Ñ?(Ð¸Ñ?Ðµ) _Ð¿Ñ?Ð¸Ð½Ð°Ð´Ð»ÐµÐ¶Ð°Ñ? Ð½Ð° Ñ?ÐµÐ·Ð¸ ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ð¸:"
+
+#~ msgid "categories"
+#~ msgstr "ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ð¸"
+
+#~ msgid "Color Info"
+#~ msgstr "Ð?Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ? Ð·Ð° Ñ?Ð²ÐµÑ?Ð°"
+
+#~ msgid "The color to render"
+#~ msgstr "Ð¦Ð²ÐµÑ?Ñ?Ñ?, ÐºÐ¾Ð¹Ñ?Ð¾ Ð´Ð° Ñ?Ðµ Ð¿Ð¾ÐºÐ°Ð¶Ðµ"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "<b>Co_ntacts</b>"
+#~ msgstr "<b>_Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?Ð¸</b>"
+
+#~ msgid "<b>Show Contacts</b>"
+#~ msgstr "<b>Ð?Ð¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð¸</b>"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]