[evolution-data-server] Update Russian translation by Yuri Kozlov <yuray komyakino ru>

From: Leonid Kanter <lkanter src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-data-server] Update Russian translation by Yuri Kozlov <yuray komyakino ru>
Date: Wed, 24 Feb 2010 09:13:31 +0000 (UTC)
commit ef3c1aef54bf5237d84355f59473f08c53340d2e
Author: Leonid Kanter <leon asplinux ru>
Date:   Wed Feb 24 11:13:23 2010 +0200

    Update Russian translation by Yuri Kozlov <yuray komyakino ru>

 po/ru.po | 3120 ++++++++++++++++++++++++++++----------------------------------
 1 files changed, 1406 insertions(+), 1714 deletions(-)
---
diff --git a/po/ru.po b/po/ru.po
index 6caeaf8..ba7cb06 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,190 +1,104 @@
-# Russian translation of evolution-data-server 
-# Copyright (C) 2000,2002,2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# translation of evolution-data-server.master.ru.po to Russian
+# Russian translation of evolution-data-server
+# Copyright (C) 2000,2002,2003, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
 #
 # Valek Filippov <frob df ru>, 2000.
 # Dmitry Mastrukov  <dmitry taurussoft org>, 2001-2003.
 # Leonid Kanter <leon asplinux ru com>, 2004-2006, 2007.
 # Michael Yakhontov <mvy asplinux ru>, 2003.
+# Yuri Kozlov <yuray komyakino ru>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server trunk\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-15 20:29+0300\n"
-"PO-Revision-Date: 2009-03-15 16:17+0300\n"
-"Last-Translator: Yuriy Penkin <yuriy penkin gmail com>\n"
-"Language-Team: Russian <gnome-cyr gnome org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=evolution-data-server&component=general\n"
+"POT-Creation-Date: 2010-02-22 12:31+0000\n"
+"PO-Revision-Date: 2010-02-22 10:04+0300\n"
+"Last-Translator: Yuri Kozlov <yuray komyakino ru>\n"
+"Language-Team: Russian <debian-l10n-russian lists debian org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: ../addressbook/backends/file/e-book-backend-file.c:560
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2391
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
 msgid "Loading..."
 msgstr "Ð?Ð°Ð³Ñ?Ñ?Ð·ÐºÐ°..."
 
 #: ../addressbook/backends/file/e-book-backend-file.c:563
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2322
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2344
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2389
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4288
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
+#: ../addressbook/backends/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
 msgid "Searching..."
 msgstr "Ð?Ð¾Ð¸Ñ?Ðº..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2759
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4452
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4715
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "Ð¡ÐºÐ°Ñ?Ð¸Ð²Ð°Ñ?Ñ?Ñ?Ñ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ñ? (%d)... "
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2908
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3093
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3137
+#: ../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
 #, c-format
 msgid "Updating contacts cache (%d)... "
 msgstr "Ð?Ð±Ð½Ð¾Ð²Ð»Ñ?ÐµÑ?Ñ?Ñ? ÐºÑ?Ñ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð¾Ð² (%d)... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:751
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:816
 msgid "Using Distinguished Name (DN)"
-msgstr "Ð?Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ñ?Ñ? Ð¾Ñ?Ð»Ð¸Ñ?Ð¸Ñ?ÐµÐ»Ñ?Ð½Ð¾Ðµ Ð¸Ð¼ÐµÐ½Ñ? (DN)"
+msgstr "Ð?Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ñ?Ñ? Ð¾Ñ?Ð»Ð¸Ñ?Ð¸Ñ?ÐµÐ»Ñ?Ð½Ð¾Ðµ Ð¸Ð¼Ñ? (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:754
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:819
 msgid "Using Email Address"
 msgstr "Ð?Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ñ?Ð¹ Ð°Ð´Ñ?ÐµÑ?"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1019
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1096
 msgid "Reconnecting to LDAP server..."
 msgstr "Ð?Ð¾Ð²Ñ?Ð¾Ñ?Ð½Ð¾Ðµ Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ðµ Ðº Ñ?ÐµÑ?Ð²ÐµÑ?Ñ? LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1617
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1738
 msgid "Adding contact to LDAP server..."
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð° Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ðµ LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1872
 msgid "Removing contact from LDAP server..."
 msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð° Ñ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð° LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2064
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2309
 msgid "Modifying contact from LDAP server..."
 msgstr "Ð?Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð° Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ðµ LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4148
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4412
 msgid "Receiving LDAP search results..."
 msgstr "Ð?Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ðµ Ñ?ÐµÐ·Ñ?Ð»Ñ?Ñ?Ð°Ñ?Ð¾Ð² Ð¿Ð¾Ð¸Ñ?ÐºÐ° Ñ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð° LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4310
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4573
 msgid "Error performing search"
 msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° Ð²Ñ?Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ? Ð¿Ð¾Ð¸Ñ?ÐºÐ°"
 
-#. translators: the placeholders will be filled by
-#. * function names, e.g.
-#. * "e_book_add_contact" on book before
-#. * "e_book_open
-#: ../addressbook/libebook/e-book.c:288 ../addressbook/libebook/e-book.c:292
-#: ../addressbook/libebook/e-book.c:496 ../addressbook/libebook/e-book.c:500
-#: ../addressbook/libebook/e-book.c:639 ../addressbook/libebook/e-book.c:643
-#: ../addressbook/libebook/e-book.c:730 ../addressbook/libebook/e-book.c:734
-#: ../addressbook/libebook/e-book.c:1028 ../addressbook/libebook/e-book.c:1033
-#: ../addressbook/libebook/e-book.c:1211 ../addressbook/libebook/e-book.c:1215
-#: ../addressbook/libebook/e-book.c:1370 ../addressbook/libebook/e-book.c:1374
-#: ../addressbook/libebook/e-book.c:1575 ../addressbook/libebook/e-book.c:1579
-#: ../addressbook/libebook/e-book.c:1818 ../addressbook/libebook/e-book.c:1822
-#: ../addressbook/libebook/e-book.c:2055 ../addressbook/libebook/e-book.c:2059
-#: ../addressbook/libebook/e-book.c:2263 ../addressbook/libebook/e-book.c:2267
-#: ../addressbook/libebook/e-book.c:3454
-#, c-format
-msgid "\"%s\" on book before \"%s\""
-msgstr "Â«%sÂ» Ð² ÐºÐ½Ð¸Ð³Ðµ Ð¿ÐµÑ?ÐµÐ´ Â«%sÂ»"
-
-#: ../addressbook/libebook/e-book.c:301 ../addressbook/libebook/e-book.c:509
-#: ../addressbook/libebook/e-book.c:652 ../addressbook/libebook/e-book.c:743
-#: ../addressbook/libebook/e-book.c:1043 ../addressbook/libebook/e-book.c:1225
-#: ../addressbook/libebook/e-book.c:1384 ../addressbook/libebook/e-book.c:1588
-#: ../addressbook/libebook/e-book.c:1831 ../addressbook/libebook/e-book.c:2069
-#: ../addressbook/libebook/e-book.c:2276 ../addressbook/libebook/e-book.c:2685
-#: ../addressbook/libebook/e-book.c:2883
-#, c-format
-msgid "book busy"
-msgstr "ÐºÐ½Ð¸Ð³Ð° Ð·Ð°Ð½Ñ?Ñ?Ð°"
-
-#: ../addressbook/libebook/e-book.c:332 ../addressbook/libebook/e-book.c:336
-#: ../addressbook/libebook/e-book.c:540 ../addressbook/libebook/e-book.c:544
-#: ../addressbook/libebook/e-book.c:679 ../addressbook/libebook/e-book.c:683
-#: ../addressbook/libebook/e-book.c:770 ../addressbook/libebook/e-book.c:774
-#: ../addressbook/libebook/e-book.c:1070 ../addressbook/libebook/e-book.c:1073
-#: ../addressbook/libebook/e-book.c:1255 ../addressbook/libebook/e-book.c:1258
-#: ../addressbook/libebook/e-book.c:1411 ../addressbook/libebook/e-book.c:1415
-#: ../addressbook/libebook/e-book.c:1624 ../addressbook/libebook/e-book.c:1628
-#: ../addressbook/libebook/e-book.c:1878 ../addressbook/libebook/e-book.c:1882
-#: ../addressbook/libebook/e-book.c:2099 ../addressbook/libebook/e-book.c:2103
-#: ../addressbook/libebook/e-book.c:2302 ../addressbook/libebook/e-book.c:2306
-#: ../addressbook/libebook/e-book.c:2537 ../addressbook/libebook/e-book.c:2711
-#: ../addressbook/libebook/e-book.c:2715 ../addressbook/libebook/e-book.c:2909
-#: ../addressbook/libebook/e-book.c:2913 ../addressbook/libebook/e-book.c:3463
-#, c-format
-msgid "CORBA exception making \"%s\" call"
-msgstr "Ð?Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ðµ CORBA Ð² Ð¿Ñ?Ð¾Ñ?ÐµÑ?Ñ?Ðµ Ð²Ñ?Ð·Ð¾Ð²Ð° Â«%sÂ»"
-
-#: ../addressbook/libebook/e-book.c:2526
-#, c-format
-msgid "%s: there is no current operation"
-msgstr "%s: Ð½ÐµÑ? Ñ?ÐµÐºÑ?Ñ?ÐµÐ¹ Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ð¸"
-
-#: ../addressbook/libebook/e-book.c:2555 ../addressbook/libebook/e-book.c:2600
-#: ../addressbook/libebook/e-book.c:2639
-#, c-format
-msgid "%s: could not cancel"
-msgstr "%s: Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ñ?Ð¼ÐµÐ½Ð¸Ñ?Ñ?"
-
-#: ../addressbook/libebook/e-book.c:2671 ../addressbook/libebook/e-book.c:2675
-#, c-format
-msgid "\"%s\" on book after \"%s\""
-msgstr "Â«%sÂ» Ð² ÐºÐ½Ð¸Ð³Ðµ Ð¿Ð¾Ñ?Ð»Ðµ Â«%sÂ»"
-
-#: ../addressbook/libebook/e-book.c:2739
-#, c-format
-msgid "%s: canceled"
-msgstr "%s: Ð¾Ñ?Ð¼ÐµÐ½ÐµÐ½Ð¾"
-
-#: ../addressbook/libebook/e-book.c:3318
-#, c-format
-msgid "%s: Invalid source."
-msgstr "%s: Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ð¸Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ðº."
-
-#: ../addressbook/libebook/e-book.c:3326 ../addressbook/libebook/e-book.c:3392
-#, c-format
-msgid "%s: no factories available for URI `%s'"
-msgstr "%s: Ð½ÐµÑ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ñ?Ñ? Ñ?Ð°Ð±Ñ?Ð¸Ðº Ð´Ð»Ñ? URI Â«%sÂ»"
-
-#: ../addressbook/libebook/e-book.c:3338
-#, c-format
-msgid "%s: Could not create EBookListener"
-msgstr "%s: Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? EBookListener"
-
-#: ../addressbook/libebook/e-book.c:3605
-#, c-format
-msgid "%s: there was no self contact UID stored in gconf"
-msgstr "%s: UID Ñ?Ð²Ð¾ÐµÐ³Ð¾ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð° Ð½Ðµ Ñ?Ð¾Ñ?Ñ?Ð°Ð½ÐµÐ½ Ð² gconf"
-
-#: ../addressbook/libebook/e-book.c:3738
+#: ../addressbook/libebook/e-book.c:2149
 #, c-format
 msgid "%s: there was no source for uid `%s' stored in gconf."
 msgstr "%s: Ð¸Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ðº Ð´Ð»Ñ? uid Â«%sÂ» Ð½Ðµ Ñ?Ð¾Ñ?Ñ?Ð°Ð½ÐµÐ½ Ð² gconf."
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:113
+#: ../addressbook/libebook/e-contact.c:115
 msgid "Unique ID"
 msgstr "Ð£Ð½Ð¸ÐºÐ°Ð»Ñ?Ð½Ñ?Ð¹ ID"
 
-#: ../addressbook/libebook/e-contact.c:114
+#: ../addressbook/libebook/e-contact.c:116
 msgid "File Under"
 msgstr "Ð¡Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð¿Ð¾Ð´"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:116
+#: ../addressbook/libebook/e-contact.c:118
 msgid "Book URI"
 msgstr "Ð?Ð´Ñ?ÐµÑ? (URI) ÐºÐ½Ð¸Ð³Ð¸"
 
@@ -192,806 +106,866 @@ msgstr "Ð?Ð´Ñ?ÐµÑ? (URI) ÐºÐ½Ð¸Ð³Ð¸"
 #. FN isn't really a structured field - we use a getter/setter
 #. so we can set the N property (since evo 1.4 works fine with
 #. vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:122
+#: ../addressbook/libebook/e-contact.c:124
 msgid "Full Name"
 msgstr "Ð?Ð¾Ð»Ð½Ð¾Ðµ Ð¸Ð¼Ñ?"
 
-#: ../addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook/e-contact.c:125
 msgid "Given Name"
 msgstr "Ð?Ð¼Ñ?"
 
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:126
 msgid "Family Name"
 msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ?"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:127
 msgid "Nickname"
 msgstr "Ð?Ñ?ÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Email 1"
 msgstr "ÐÐ». Ð¿Ð¾Ñ?Ñ?Ð° 1"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Email 2"
 msgstr "ÐÐ». Ð¿Ð¾Ñ?Ñ?Ð° 2"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:132
 msgid "Email 3"
 msgstr "ÐÐ». Ð¿Ð¾Ñ?Ñ?Ð° 3"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 4"
 msgstr "ÐÐ». Ð¿Ð¾Ñ?Ñ?Ð° 4"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Mailer"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð¾Ð²Ñ?Ð¹ ÐºÐ»Ð¸ÐµÐ½Ñ?"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Home Address Label"
 msgstr "Ð¯Ñ?Ð»Ñ?Ðº Ð´Ð¾Ð¼Ð°Ñ?Ð½ÐµÐ³Ð¾ Ð°Ð´Ñ?ÐµÑ?Ð°"
 
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:139
 msgid "Work Address Label"
 msgstr "Ð¯Ñ?Ð»Ñ?Ðº Ñ?Ð°Ð±Ð¾Ñ?ÐµÐ³Ð¾ Ð°Ð´Ñ?ÐµÑ?Ð°"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Other Address Label"
 msgstr "Ð¯Ñ?Ð»Ñ?Ðº Ð´Ñ?Ñ?Ð³Ð¾Ð³Ð¾ Ð°Ð´Ñ?ÐµÑ?Ð°"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Assistant Phone"
 msgstr "Ð¢ÐµÐ»ÐµÑ?Ð¾Ð½ Ð¿Ð¾Ð¼Ð¾Ñ?Ð½Ð¸ÐºÐ°"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:144
 msgid "Business Phone"
 msgstr "Ð¡Ð»Ñ?Ð¶ÐµÐ±Ð½Ñ?Ð¹ Ñ?ÐµÐ»ÐµÑ?Ð¾Ð½"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Business Phone 2"
 msgstr "Ð¡Ð»Ñ?Ð¶ÐµÐ±Ð½Ñ?Ð¹ Ñ?ÐµÐ»ÐµÑ?Ð¾Ð½ 2"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Business Fax"
 msgstr "Ð Ð°Ð±Ð¾Ñ?Ð¸Ð¹ Ñ?Ð°ÐºÑ?"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Callback Phone"
 msgstr "Ð¢ÐµÐ»ÐµÑ?Ð¾Ð½ Ð´Ð»Ñ? Ð¾Ð±Ñ?Ð°Ñ?Ð½Ð¾Ð³Ð¾ Ð·Ð²Ð¾Ð½ÐºÐ°"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Car Phone"
 msgstr "Ð¢ÐµÐ»ÐµÑ?Ð¾Ð½ Ð² Ð¼Ð°Ñ?Ð¸Ð½Ðµ"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Company Phone"
 msgstr "Ð¢ÐµÐ»ÐµÑ?Ð¾Ð½ ÐºÐ¾Ð¼Ð¿Ð°Ð½Ð¸Ð¸"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Home Phone"
 msgstr "Ð?Ð¾Ð¼Ð°Ñ?Ð½Ð¸Ð¹ Ñ?ÐµÐ»ÐµÑ?Ð¾Ð½"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Home Phone 2"
 msgstr "Ð?Ð¾Ð¼Ð°Ñ?Ð½Ð¸Ð¹ Ñ?ÐµÐ»ÐµÑ?Ð¾Ð½ 2"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Home Fax"
 msgstr "Ð?Ð¾Ð¼Ð°Ñ?Ð½Ð¸Ð¹ Ð¤Ð°ÐºÑ?"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:153
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Mobile Phone"
 msgstr "Ð?Ð¾Ð±Ð¸Ð»Ñ?Ð½Ñ?Ð¹ Ñ?ÐµÐ»ÐµÑ?Ð¾Ð½"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Other Phone"
 msgstr "Ð?Ñ?Ñ?Ð³Ð¸Ðµ Ñ?ÐµÐ»ÐµÑ?Ð¾Ð½Ñ?"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Other Fax"
 msgstr "Ð?Ñ?Ñ?Ð³Ð¾Ð¹ Ñ?Ð°ÐºÑ?"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Pager"
 msgstr "Ð?ÐµÐ¹Ð´Ð¶ÐµÑ?"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Primary Phone"
 msgstr "Ð?Ñ?Ð½Ð¾Ð²Ð½Ð¾Ð¹ Ñ?ÐµÐ»ÐµÑ?Ð¾Ð½"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Radio"
 msgstr "Ð Ð°Ð´Ð¸Ð¾"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Telex"
 msgstr "Ð¢ÐµÐ»ÐµÐºÑ?"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:162
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Organization"
 msgstr "Ð?Ñ?Ð³Ð°Ð½Ð¸Ð·Ð°Ñ?Ð¸Ñ?"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Organizational Unit"
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸Ðµ Ð¾Ñ?Ð³Ð°Ð½Ð¸Ð·Ð°Ñ?Ð¸Ð¸"
 
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Office"
 msgstr "Ð?Ñ?Ð¸Ñ?"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Title"
 msgstr "Ð?Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Role"
 msgstr "Ð?Ð¾Ð»Ð¶Ð½Ð¾Ñ?Ñ?Ñ?"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Manager"
 msgstr "Ð?eÐ½ÐµÐ´Ð¶ÐµÑ?"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Assistant"
 msgstr "Ð?Ð¾Ð¼Ð¾Ñ?Ð½Ð¸Ðº"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Homepage URL"
 msgstr "URL Ð´Ð¾Ð¼Ð°Ñ?Ð½ÐµÐ¹ Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ?"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Weblog URL"
 msgstr "URL Ð²ÐµÐ±Ð»Ð¾Ð³Ð°"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:517
+#: ../addressbook/libebook/e-contact.c:178
+#: ../libedataserverui/e-categories-dialog.c:671
 msgid "Categories"
 msgstr "Ð?Ð°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ð¸"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Calendar URI"
 msgstr "URI ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?"
 
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:182
 msgid "Free/Busy URL"
 msgstr "Ð¡Ñ?Ñ?Ð»ÐºÐ° (URL) \"Ñ?Ð²Ð¾Ð±Ð¾Ð´ÐµÐ½/Ð·Ð°Ð½Ñ?Ñ?\":"
 
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:183
 msgid "ICS Calendar"
 msgstr "Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ? Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð° ICS"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Video Conferencing URL"
 msgstr "URL Ð²Ð¸Ð´ÐµÐ¾ÐºÐ¾Ð½Ñ?ÐµÑ?ÐµÐ½Ñ?Ð¸Ð¹"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:187
 msgid "Spouse's Name"
 msgstr "Ð?Ð¼Ñ? Ñ?Ñ?Ð¿Ñ?Ñ?Ð³(Ð¸)"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:188
 msgid "Note"
 msgstr "Ð?Ñ?Ð¸Ð¼ÐµÑ?Ð°Ð½Ð¸Ðµ"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:189
+#: ../addressbook/libebook/e-contact.c:191
 msgid "AIM Home Screen Name 1"
 msgstr "AIM - Ð´Ð¾Ð¼Ð°Ñ?Ð½ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 1"
 
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:192
 msgid "AIM Home Screen Name 2"
 msgstr "AIM - Ð´Ð¾Ð¼Ð°Ñ?Ð½ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 2"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:193
 msgid "AIM Home Screen Name 3"
 msgstr "AIM - Ð´Ð¾Ð¼Ð°Ñ?Ð½ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 3"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:194
 msgid "AIM Work Screen Name 1"
 msgstr "AIM - Ñ?Ð°Ð±Ð¾Ñ?ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 1"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Work Screen Name 2"
 msgstr "AIM - Ñ?Ð°Ð±Ð¾Ñ?ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 2"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Work Screen Name 3"
 msgstr "AIM - Ñ?Ð°Ð±Ð¾Ñ?ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 3"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:197
 msgid "GroupWise Home Screen Name 1"
 msgstr "Groupwise - Ð´Ð¾Ð¼Ð°Ñ?Ð½ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 1"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:198
 msgid "GroupWise Home Screen Name 2"
 msgstr "Groupwise - Ð´Ð¾Ð¼Ð°Ñ?Ð½ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 2"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:199
 msgid "GroupWise Home Screen Name 3"
 msgstr "Groupwise - Ð´Ð¾Ð¼Ð°Ñ?Ð½ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 3"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:200
 msgid "GroupWise Work Screen Name 1"
 msgstr "Groupwise - Ñ?Ð°Ð±Ð¾Ñ?ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 1"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Work Screen Name 2"
 msgstr "Groupwise - Ñ?Ð°Ð±Ð¾Ñ?ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 2"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Work Screen Name 3"
 msgstr "Groupwise - Ñ?Ð°Ð±Ð¾Ñ?ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 3"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:203
 msgid "Jabber Home Id 1"
 msgstr "Jabber - Ð´Ð¾Ð¼Ð°Ñ?Ð½Ð¸Ð¹ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? 1"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:204
 msgid "Jabber Home Id 2"
 msgstr "Jabber - Ð´Ð¾Ð¼Ð°Ñ?Ð½Ð¸Ð¹ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? 2"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:205
 msgid "Jabber Home Id 3"
 msgstr "Jabber - Ð´Ð¾Ð¼Ð°Ñ?Ð½Ð¸Ð¹ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? 3"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:206
 msgid "Jabber Work Id 1"
 msgstr "Jabber - Ñ?Ð°Ð±Ð¾Ñ?Ð¸Ð¹ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? 1"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:207
 msgid "Jabber Work Id 2"
 msgstr "Jabber - Ñ?Ð°Ð±Ð¾Ñ?Ð¸Ð¹ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? 2"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:208
 msgid "Jabber Work Id 3"
 msgstr "Jabber - Ñ?Ð°Ð±Ð¾Ñ?Ð¸Ð¹ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? 3"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:209
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo! - Ð´Ð¾Ð¼Ð°Ñ?Ð½ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 1"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo! - Ð´Ð¾Ð¼Ð°Ñ?Ð½ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 2"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo! - Ð´Ð¾Ð¼Ð°Ñ?Ð½ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 3"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo! - Ñ?Ð°Ð±Ð¾Ñ?ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 1"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo! - Ñ?Ð°Ð±Ð¾Ñ?ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 2"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo! - Ñ?Ð°Ð±Ð¾Ñ?ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 3"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:215
 msgid "MSN Home Screen Name 1"
 msgstr "MSN - Ð´Ð¾Ð¼Ð°Ñ?Ð½ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 1"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:216
 msgid "MSN Home Screen Name 2"
 msgstr "MSN - Ð´Ð¾Ð¼Ð°Ñ?Ð½ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 2"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:217
 msgid "MSN Home Screen Name 3"
 msgstr "MSN - Ð´Ð¾Ð¼Ð°Ñ?Ð½ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 3"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:218
 msgid "MSN Work Screen Name 1"
 msgstr "MSN - Ñ?Ð°Ð±Ð¾Ñ?ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 1"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Work Screen Name 2"
 msgstr "MSN - Ñ?Ð°Ð±Ð¾Ñ?ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 2"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Work Screen Name 3"
 msgstr "MSN - Ñ?Ð°Ð±Ð¾Ñ?ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 3"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:221
 msgid "ICQ Home Id 1"
 msgstr "ICQ - Ð´Ð¾Ð¼Ð°Ñ?Ð½Ð¸Ð¹ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? 1"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:222
 msgid "ICQ Home Id 2"
 msgstr "ICQ - Ð´Ð¾Ð¼Ð°Ñ?Ð½Ð¸Ð¹ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? 2"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:223
 msgid "ICQ Home Id 3"
 msgstr "ICQ - Ð´Ð¾Ð¼Ð°Ñ?Ð½Ð¸Ð¹ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? 3"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:224
 msgid "ICQ Work Id 1"
 msgstr "ICQ - Ñ?Ð°Ð±Ð¾Ñ?Ð¸Ð¹ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? 1"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:225
 msgid "ICQ Work Id 2"
 msgstr "ICQ - Ñ?Ð°Ð±Ð¾Ñ?Ð¸Ð¹ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? 2"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:226
 msgid "ICQ Work Id 3"
 msgstr "ICQ - Ñ?Ð°Ð±Ð¾Ñ?Ð¸Ð¹ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:229
 msgid "Last Revision"
 msgstr "Ð?Ð¾Ñ?Ð»ÐµÐ´Ð½Ñ?Ñ? Ð²ÐµÑ?Ñ?Ð¸Ñ?"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:230
 msgid "Name or Org"
 msgstr "Ð?Ð¼Ñ? Ð¸Ð»Ð¸ Ð?Ñ?Ð³"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Address List"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð¾Ðº Ð°Ð´Ñ?ÐµÑ?Ð¾Ð²"
 
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:234
 msgid "Home Address"
 msgstr "Ð?Ð¾Ð¼Ð°Ñ?Ð½Ð¸Ð¹ Ð°Ð´Ñ?ÐµÑ?"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:235
 msgid "Work Address"
 msgstr "Ð Ð°Ð±Ð¾Ñ?Ð¸Ð¹ Ð°Ð´Ñ?ÐµÑ?"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:236
 msgid "Other Address"
 msgstr "Ð?Ñ?Ñ?Ð³Ð¸Ðµ Ð°Ð´Ñ?ÐµÑ?Ð°"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Category List"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð¾Ðº ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ð¹"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Photo"
 msgstr "Ð¤Ð¾Ñ?Ð¾"
 
-#: ../addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Logo"
 msgstr "Ð?Ð¾Ð³Ð¾"
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:245
 msgid "Name"
 msgstr "Ð?Ð¼Ñ?"
 
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Email List"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð¾Ðº Ð°Ð´Ñ?ÐµÑ?Ð¾Ð² Ñ?Ð». Ð¿Ð¾Ñ?Ñ?Ñ?"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook/e-contact.c:249
 msgid "AIM Screen Name List"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð¾Ðº Ñ?ÐºÑ?Ð°Ð½Ð½Ñ?Ñ? Ð¸Ð¼ÐµÐ½ AIM"
 
-#: ../addressbook/libebook/e-contact.c:248
+#: ../addressbook/libebook/e-contact.c:250
 msgid "GroupWise Id List"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð¾Ðº Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ?Ð¾Ð² Groupwise"
 
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:251
 msgid "Jabber Id List"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð¾Ðº Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ?Ð¾Ð² Jabber"
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:252
 msgid "Yahoo! Screen Name List"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð¾Ðº Ñ?ÐºÑ?Ð°Ð½Ð½Ñ?Ñ? Ð¸Ð¼ÐµÐ½ Yahoo!"
 
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:253
 msgid "MSN Screen Name List"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð¾Ðº Ñ?ÐºÑ?Ð°Ð½Ð½Ñ?Ñ? Ð¸Ð¼ÐµÐ½ MSN"
 
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:254
 msgid "ICQ Id List"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð¾Ðº Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ?Ð¾Ð² ICQ"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Wants HTML Mail"
 msgstr "Ð?Ñ?ÐµÐ´Ð¿Ð¾Ñ?Ð¸Ñ?Ð°ÐµÑ? Ð¿Ð¾Ñ?Ñ?Ñ? Ð² HTML"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:258
 msgid "List"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð¾Ðº"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:259
 msgid "List Show Addresses"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð¾Ðº Ð¿Ð¾ÐºÐ°Ð·Ñ?Ð²Ð°ÐµÑ? Ð°Ð´Ñ?ÐµÑ?Ð°"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:261
 msgid "Birth Date"
 msgstr "Ð?Ð°Ñ?Ð° Ñ?Ð¾Ð¶Ð´ÐµÐ½Ð¸Ñ?"
 
-#: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
-#: ../libedataserver/e-categories.c:43
+#: ../addressbook/libebook/e-contact.c:262
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:715
+#: ../libedataserver/e-categories.c:45
 msgid "Anniversary"
 msgstr "Ð?Ð¾Ð´Ð¾Ð²Ñ?Ð¸Ð½Ð°"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:263
+#: ../addressbook/libebook/e-contact.c:265
 msgid "X.509 Certificate"
 msgstr "Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? X.509"
 
-#: ../addressbook/libebook/e-contact.c:265
+#: ../addressbook/libebook/e-contact.c:267
 msgid "Gadu-Gadu Home Id 1"
 msgstr "Gadu-Gadu - Ð´Ð¾Ð¼Ð°Ñ?Ð½Ð¸Ð¹ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? 1"
 
-#: ../addressbook/libebook/e-contact.c:266
+#: ../addressbook/libebook/e-contact.c:268
 msgid "Gadu-Gadu Home Id 2"
 msgstr "Gadu-Gadu - Ð´Ð¾Ð¼Ð°Ñ?Ð½Ð¸Ð¹ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? 2"
 
-#: ../addressbook/libebook/e-contact.c:267
+#: ../addressbook/libebook/e-contact.c:269
 msgid "Gadu-Gadu Home Id 3"
 msgstr "Gadu-Gadu - Ð´Ð¾Ð¼Ð°Ñ?Ð½Ð¸Ð¹ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? 3"
 
-#: ../addressbook/libebook/e-contact.c:268
+#: ../addressbook/libebook/e-contact.c:270
 msgid "Gadu-Gadu Work Id 1"
 msgstr "Gadu-Gadu - Ñ?Ð°Ð±Ð¾Ñ?Ð¸Ð¹ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? 1"
 
-#: ../addressbook/libebook/e-contact.c:269
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Gadu-Gadu Work Id 2"
 msgstr "Gadu-Gadu - Ñ?Ð°Ð±Ð¾Ñ?Ð¸Ð¹ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? 2"
 
-#: ../addressbook/libebook/e-contact.c:270
+#: ../addressbook/libebook/e-contact.c:272
 msgid "Gadu-Gadu Work Id 3"
 msgstr "Gadu-Gadu - Ñ?Ð°Ð±Ð¾Ñ?Ð¸Ð¹ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? 3"
 
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook/e-contact.c:273
 msgid "Gadu-Gadu Id List"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð¾Ðº Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ?Ð¾Ð² Gadu-Gadu"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Geographic Information"
 msgstr "Ð?ÐµÐ¾Ð³Ñ?Ð°Ñ?Ð¸Ñ?ÐµÑ?ÐºÐ°Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:278
 msgid "Telephone"
 msgstr "Ð¢ÐµÐ»ÐµÑ?Ð¾Ð½"
 
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:280
 msgid "Skype Home Name 1"
 msgstr "Skype - Ð´Ð¾Ð¼Ð°Ñ?Ð½ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 1"
 
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Skype Home Name 2"
 msgstr "Skype - Ð´Ð¾Ð¼Ð°Ñ?Ð½ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 2"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:282
 msgid "Skype Home Name 3"
 msgstr "Skype - Ð´Ð¾Ð¼Ð°Ñ?Ð½ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 3"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Work Name 1"
 msgstr "Skype - Ñ?Ð°Ð±Ð¾Ñ?ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 1"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Work Name 2"
 msgstr "Skype - Ñ?Ð°Ð±Ð¾Ñ?ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 2"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Work Name 3"
 msgstr "Skype - Ñ?Ð°Ð±Ð¾Ñ?ÐµÐµ Ñ?ÐºÑ?Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ? 3"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Name List"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð¾Ðº Ñ?ÐºÑ?Ð°Ð½Ð½Ñ?Ñ? Ð¸Ð¼ÐµÐ½ Skype"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:288
 msgid "SIP address"
 msgstr "Ð?Ð´Ñ?ÐµÑ? SIP"
 
-#: ../addressbook/libebook/e-contact.c:1535
-#: ../addressbook/libebook/e-destination.c:761
+#: ../addressbook/libebook/e-contact.c:1513
+#: ../addressbook/libebook/e-destination.c:739
 msgid "Unnamed List"
 msgstr "Ð?ÐµÐ·Ñ?Ð¼Ñ?Ð½Ð½Ñ?Ð¹ Ñ?Ð¿Ð¸Ñ?Ð¾Ðº"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
-#: ../libedataserver/e-categories.c:44
+#: ../addressbook/libedata-book/e-data-book-factory.c:290
+#, c-format
+msgid "Empty URI"
+msgstr "Ð?Ñ?Ñ?Ñ?Ð¾Ð¹ URI"
+
+#: ../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
+#, 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:319
+msgid "Cannot remove book"
+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:358
+msgid "Empty query"
+msgstr "Ð?Ñ?Ñ?Ñ?Ð¾Ð¹ Ð·Ð°Ð¿Ñ?Ð¾Ñ?"
+
+#: ../addressbook/libedata-book/e-data-book.c:402
+msgid "Cannot authenticate user"
+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:444
+#: ../addressbook/libedata-book/e-data-book.c:459
+msgid "Cannot modify contact"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ?Ñ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?"
+
+#: ../addressbook/libedata-book/e-data-book.c:494
+msgid "Cannot remove contacts"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð´Ð°Ð»Ð¸Ñ?Ñ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?"
+
+#: ../addressbook/libedata-book/e-data-book.c:569
+#: ../calendar/libedata-cal/e-cal-backend-util.c:139
+msgid "Invalid query"
+msgstr "Ð?ÐµÐºÐ¾Ñ?Ñ?ÐµÐºÑ?Ð½Ñ?Ð¹ Ð·Ð°Ð¿Ñ?Ð¾Ñ?"
+
+#: ../addressbook/libedata-book/e-data-book.c:598
+msgid "Cannot get changes"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ?"
+
+#: ../addressbook/libedata-book/e-data-book.c:699
+msgid "Cannot complete operation"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð·Ð°Ð²ÐµÑ?Ñ?Ð¸Ñ?Ñ? Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
+#: ../libedataserver/e-categories.c:46
 msgid "Birthday"
 msgstr "Ð?ÐµÐ½Ñ? Ñ?Ð¾Ð¶Ð´ÐµÐ½Ð¸Ñ?"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:746
 #, c-format
 msgid "Birthday: %s"
 msgstr "Ð?ÐµÐ½Ñ? Ñ?Ð¾Ð¶Ð´ÐµÐ½Ð¸Ñ?: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:770
 #, c-format
 msgid "Anniversary: %s"
 msgstr "Ð?Ð¾Ð´Ð¾Ð²Ñ?Ð¸Ð½Ð°: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:212
+#: ../calendar/backends/file/e-cal-backend-file.c:236
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð´Ð°Ð½Ð½Ñ?Ðµ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?: Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ URI."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:219
-#: ../calendar/backends/file/e-cal-backend-file.c:225
+#: ../calendar/backends/file/e-cal-backend-file.c:243
+#: ../calendar/backends/file/e-cal-backend-file.c:249
 msgid "Cannot save calendar data"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð´Ð°Ð½Ð½Ñ?Ðµ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:337
+#: ../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:369
-#: ../calendar/backends/google/e-cal-backend-google.c:1192
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1053
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1352
-#: ../calendar/backends/http/e-cal-backend-http.c:561
-#: ../calendar/backends/weather/e-cal-backend-weather.c:484
+#: ../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:382
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065
+#: ../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:1055
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1918
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2121
 msgid "Reply Requested: by "
 msgstr "Ð?Ð°Ð¿Ñ?Ð¾Ñ?ÐµÐ½ Ð¾Ñ?Ð²ÐµÑ?: "
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1060
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1923
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2126
 msgid "Reply Requested: When convenient"
 msgstr "Ð?Ð°Ð¿Ñ?Ð¾Ñ?ÐµÐ½ Ð¾Ñ?Ð²ÐµÑ?: Ð?Ð¾Ð³Ð´Ð° Ñ?Ð´Ð¾Ð±Ð½Ð¾"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:277
+#: ../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:889
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:919
 msgid "Calendar"
 msgstr "Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:977
 msgid "Invalid server URI"
 msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ URI Ñ?ÐµÑ?Ð²ÐµÑ?Ð°"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:966
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1071
-#: ../calendar/libecal/e-cal.c:5098
+#: ../calendar/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:1156
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1188
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1226
-#: ../camel/providers/groupwise/camel-groupwise-store.c:588
-#: ../camel/providers/groupwise/camel-groupwise-store.c:753
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:184
+#: ../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/http/e-cal-backend-http.c:268
+#: ../calendar/backends/http/e-cal-backend-http.c:335
 msgid "Redirected to Invalid URI"
 msgstr "Ð?ÐµÑ?ÐµÐ°Ð´Ñ?ÐµÑ?Ð¾Ð²Ð°Ð½ Ð½Ð° Ð½ÐµÐ´Ð¾Ð¿Ñ?Ñ?Ñ?Ð¸Ð¼Ñ?Ð¹ URI"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:289
+#: ../calendar/backends/http/e-cal-backend-http.c:358
 msgid "Bad file format."
 msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ñ?Ð¾Ñ?Ð¼Ð°Ñ? Ñ?Ð°Ð¹Ð»Ð°."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:295
+#: ../calendar/backends/http/e-cal-backend-http.c:365
 msgid "Not a calendar."
 msgstr "Ð?Ðµ Ñ?Ð²Ð»Ñ?ÐµÑ?Ñ?Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?ÐµÐ¼."
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:149
+#: ../calendar/backends/weather/e-cal-backend-weather.c:152
 msgid "Could not retrieve weather data"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð´Ð°Ð½Ð½Ñ?Ðµ Ð¿Ð¾Ð³Ð¾Ð´Ñ?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:246
+#: ../calendar/backends/weather/e-cal-backend-weather.c:251
 msgid "Weather: Fog"
 msgstr "Ð?Ð¾Ð³Ð¾Ð´Ð°: Ð¢Ñ?Ð¼Ð°Ð½"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
-msgid "Weather: Cloudy"
-msgstr "Ð?Ð¾Ð³Ð¾Ð´Ð°: Ð?Ð±Ð»Ð°Ñ?Ð½Ð¾"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
+#: ../calendar/backends/weather/e-cal-backend-weather.c:252
 msgid "Weather: Cloudy Night"
 msgstr "Ð?Ð¾Ð³Ð¾Ð´Ð°: Ð?Ð±Ð»Ð°Ñ?Ð½Ð°Ñ? Ð½Ð¾Ñ?Ñ?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
+#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+msgid "Weather: Cloudy"
+msgstr "Ð?Ð¾Ð³Ð¾Ð´Ð°: Ð?Ð±Ð»Ð°Ñ?Ð½Ð¾"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:254
 msgid "Weather: Overcast"
 msgstr "Ð?Ð¾Ð³Ð¾Ð´Ð°: Ð?Ð°Ñ?Ð¼Ñ?Ñ?Ð½Ð¾"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
+#: ../calendar/backends/weather/e-cal-backend-weather.c:255
 msgid "Weather: Showers"
 msgstr "Ð?Ð¾Ð³Ð¾Ð´Ð°: Ð?Ð¾Ð¶Ð´Ð¸"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:256
 msgid "Weather: Snow"
 msgstr "Ð?Ð¾Ð³Ð¾Ð´Ð°: Ð¡Ð½ÐµÐ³"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
-msgid "Weather: Sunny"
-msgstr "Ð?Ð¾Ð³Ð¾Ð´Ð°: Ð¡Ð¾Ð»Ð½ÐµÑ?Ð½Ð¾"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:257
 msgid "Weather: Clear Night"
 msgstr "Ð?Ð¾Ð³Ð¾Ð´Ð°: Ð¯Ñ?Ð½Ð°Ñ? Ð½Ð¾Ñ?Ñ?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:258
+msgid "Weather: Sunny"
+msgstr "Ð?Ð¾Ð³Ð¾Ð´Ð°: Ð¡Ð¾Ð»Ð½ÐµÑ?Ð½Ð¾"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:259
 msgid "Weather: Thunderstorms"
 msgstr "Ð?Ð¾Ð³Ð¾Ð´Ð°: Ð?Ñ?Ð¾Ð·Ñ?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:399
+#: ../calendar/backends/weather/e-cal-backend-weather.c:405
 msgid "Forecast"
 msgstr "Ð?Ñ?Ð¾Ð³Ð½Ð¾Ð·"
 
-#: ../calendar/libecal/e-cal-component.c:1322
+#: ../calendar/libecal/e-cal-component.c:1286
 msgid "Untitled appointment"
 msgstr "Ð?ÐµÐ¾Ð·Ð°Ð³Ð»Ð°Ð²Ð»ÐµÐ½Ð½Ð°Ñ? Ð²Ñ?Ñ?Ñ?ÐµÑ?Ð°"
 
-#: ../calendar/libecal/e-cal-recur.c:4041
+#: ../calendar/libecal/e-cal-recur.c:3951
 msgid "1st"
 msgstr "1-Ð¾Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4042
+#: ../calendar/libecal/e-cal-recur.c:3952
 msgid "2nd"
 msgstr "2-Ð¾Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4043
+#: ../calendar/libecal/e-cal-recur.c:3953
 msgid "3rd"
 msgstr "3-Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4044
+#: ../calendar/libecal/e-cal-recur.c:3954
 msgid "4th"
 msgstr "4-Ð¾Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4045
+#: ../calendar/libecal/e-cal-recur.c:3955
 msgid "5th"
 msgstr "5-Ð¾Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:3956
 msgid "6th"
 msgstr "6-Ð¾Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:3957
 msgid "7th"
 msgstr "7-Ð¾Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:3958
 msgid "8th"
 msgstr "8-Ð¾Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:3959
 msgid "9th"
 msgstr "9-Ð¾Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:3960
 msgid "10th"
 msgstr "10-Ð¾Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:3961
 msgid "11th"
 msgstr "11-Ð¾Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:3962
 msgid "12th"
 msgstr "12-Ð¾Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:3963
 msgid "13th"
 msgstr "13-Ð¾Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:3964
 msgid "14th"
 msgstr "14-Ð¾Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:3965
 msgid "15th"
 msgstr "15-Ð¾Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:3966
 msgid "16th"
 msgstr "16-Ð¾Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:3967
 msgid "17th"
 msgstr "17-Ð¾Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:3968
 msgid "18th"
 msgstr "18-Ð¾Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:3969
 msgid "19th"
 msgstr "19-Ð¾Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:3970
 msgid "20th"
 msgstr "20-Ð¾Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:3971
 msgid "21st"
 msgstr "21-Ð¾Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:3972
 msgid "22nd"
 msgstr "22-Ð¾Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:3973
 msgid "23rd"
 msgstr "23-Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:3974
 msgid "24th"
 msgstr "24-Ð¾Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:3975
 msgid "25th"
 msgstr "25-Ð¾Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:3976
 msgid "26th"
 msgstr "26-Ð¾Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4067
+#: ../calendar/libecal/e-cal-recur.c:3977
 msgid "27th"
 msgstr "27-Ð¾Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4068
+#: ../calendar/libecal/e-cal-recur.c:3978
 msgid "28th"
 msgstr "28-Ð¾Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4069
+#: ../calendar/libecal/e-cal-recur.c:3979
 msgid "29th"
 msgstr "29-Ð¾Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4070
+#: ../calendar/libecal/e-cal-recur.c:3980
 msgid "30th"
 msgstr "30-Ð¾Ðµ"
 
-#: ../calendar/libecal/e-cal-recur.c:4071
+#: ../calendar/libecal/e-cal-recur.c:3981
 msgid "31st"
 msgstr "31-Ð¾Ðµ"
 
-#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:713
+#: ../calendar/libecal/e-cal-util.c:688 ../calendar/libecal/e-cal-util.c:715
 msgid "High"
 msgstr "Ð?Ñ?Ñ?Ð¾ÐºÐ¸Ð¹"
 
-#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:715
+#: ../calendar/libecal/e-cal-util.c:690 ../calendar/libecal/e-cal-util.c:717
 msgid "Normal"
 msgstr "Ð?Ð¾Ñ?Ð¼Ð°Ð»Ñ?Ð½Ñ?Ð¹"
 
-#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:717
+#: ../calendar/libecal/e-cal-util.c:692 ../calendar/libecal/e-cal-util.c:719
 msgid "Low"
 msgstr "Ð?Ð¸Ð·ÐºÐ¸Ð¹"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:711
+#: ../calendar/libecal/e-cal-util.c:713
 msgid "Undefined"
 msgstr "Ð?ÐµÐ¾Ð¿Ñ?ÐµÐ´ÐµÐ»ÐµÐ½Ð¾"
 
-#: ../calendar/libecal/e-cal.c:1677 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1173 ../libedataserverui/e-book-auth-util.c:199
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Ð?Ð²ÐµÐ´Ð¸Ñ?Ðµ Ð¿Ð°Ñ?Ð¾Ð»Ñ? Ð´Ð»Ñ? %s (Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»Ñ? %s)"
@@ -1000,188 +974,183 @@ msgstr "Ð?Ð²ÐµÐ´Ð¸Ñ?Ðµ Ð¿Ð°Ñ?Ð¾Ð»Ñ? Ð´Ð»Ñ? %s (Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»Ñ? %s)"
 #. This password prompt will be prompted rarely. Since the key that is passed to
 #. the auth_func corresponds to the parent user.
 #.
-#: ../calendar/libecal/e-cal.c:1691
+#: ../calendar/libecal/e-cal.c:1187
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "Ð?Ð²ÐµÐ´Ð¸Ñ?Ðµ Ð¿Ð°Ñ?Ð¾Ð»Ñ? Ðº %s Ð´Ð»Ñ? Ð²ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Ð´Ð»Ñ? Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»Ñ? %s"
 
-#: ../calendar/libecal/e-cal.c:5070
+#: ../calendar/libecal/e-cal.c:3992
 msgid "Invalid argument"
 msgstr "Ð?ÐµÐ´Ð¾Ð¿Ñ?Ñ?Ñ?Ð¸Ð¼Ñ?Ð¹ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ?"
 
-#: ../calendar/libecal/e-cal.c:5072
+#: ../calendar/libecal/e-cal.c:3994
 msgid "Backend is busy"
 msgstr "Ð?Ð¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ? Ð·Ð°Ð½Ñ?Ñ?"
 
-#: ../calendar/libecal/e-cal.c:5074
+#: ../calendar/libecal/e-cal.c:3996
 #: ../calendar/libedata-cal/e-cal-backend-util.c:105
 msgid "Repository is offline"
 msgstr "Ð ÐµÐ¿Ð¾Ð·Ð¸Ñ?Ð¾Ñ?Ð¸Ð¹ Ð¾Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½ Ð¾Ñ? Ñ?ÐµÑ?Ð¸"
 
-#: ../calendar/libecal/e-cal.c:5076
+#: ../calendar/libecal/e-cal.c:3998
 #: ../calendar/libedata-cal/e-cal-backend-util.c:129
 msgid "No such calendar"
 msgstr "Ð?ÐµÑ? Ñ?Ð°ÐºÐ¾Ð³Ð¾ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?"
 
-#: ../calendar/libecal/e-cal.c:5078
+#: ../calendar/libecal/e-cal.c:4000
 #: ../calendar/libedata-cal/e-cal-backend-util.c:111
-#: ../servers/groupwise/e-gw-connection.c:233
+#: ../servers/groupwise/e-gw-connection.c:235
 msgid "Object not found"
 msgstr "Ð?Ð±Ñ?ÐµÐºÑ? Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½"
 
-#: ../calendar/libecal/e-cal.c:5080
+#: ../calendar/libecal/e-cal.c:4002
 #: ../calendar/libedata-cal/e-cal-backend-util.c:113
-#: ../servers/groupwise/e-gw-connection.c:227
+#: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ð¾Ð±Ñ?ÐµÐºÑ?"
 
-#: ../calendar/libecal/e-cal.c:5082
+#: ../calendar/libecal/e-cal.c:4004
 msgid "URI not loaded"
 msgstr "URI Ð½Ðµ Ð·Ð°Ð³Ñ?Ñ?Ð¶ÐµÐ½"
 
-#: ../calendar/libecal/e-cal.c:5084
+#: ../calendar/libecal/e-cal.c:4006
 msgid "URI already loaded"
 msgstr "URI Ñ?Ð¶Ðµ Ð·Ð°Ð³Ñ?Ñ?Ð¶ÐµÐ½"
 
-#: ../calendar/libecal/e-cal.c:5086
+#: ../calendar/libecal/e-cal.c:4008
 #: ../calendar/libedata-cal/e-cal-backend-util.c:107
-#: ../servers/exchange/storage/e-storage.c:571
 msgid "Permission denied"
 msgstr "Ð?Ð¾Ñ?Ñ?Ñ?Ð¿ Ð·Ð°Ð¿Ñ?ÐµÑ?ÐµÐ½"
 
-#: ../calendar/libecal/e-cal.c:5088
+#: ../calendar/libecal/e-cal.c:4010
 #: ../calendar/libedata-cal/e-cal-backend-util.c:131
-#: ../servers/groupwise/e-gw-connection.c:235
+#: ../servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»Ñ?"
 
-#: ../calendar/libecal/e-cal.c:5090
+#: ../calendar/libecal/e-cal.c:4012
 #: ../calendar/libedata-cal/e-cal-backend-util.c:115
 msgid "Object ID already exists"
 msgstr "Ð?Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? Ð¾Ð±Ñ?ÐµÐºÑ?Ð° Ñ?Ð¶Ðµ Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?ÐµÑ?"
 
-#: ../calendar/libecal/e-cal.c:5092
+#: ../calendar/libecal/e-cal.c:4014
 msgid "Protocol not supported"
 msgstr "Ð?Ñ?Ð¾Ñ?Ð¾ÐºÐ¾Ð» Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÑ?Ñ?Ñ?"
 
-#: ../calendar/libecal/e-cal.c:5094
+#: ../calendar/libecal/e-cal.c:4016
 msgid "Operation has been canceled"
 msgstr "Ð?Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ? Ð±Ñ?Ð»Ð° Ð¾Ñ?Ð¼ÐµÐ½ÐµÐ½Ð°"
 
-#: ../calendar/libecal/e-cal.c:5096
+#: ../calendar/libecal/e-cal.c:4018
 #: ../calendar/libedata-cal/e-cal-backend-util.c:143
 msgid "Could not cancel operation"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ñ?Ð¼ÐµÐ½Ð¸Ñ?Ñ? Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?"
 
-#: ../calendar/libecal/e-cal.c:5100
+#: ../calendar/libecal/e-cal.c:4022
 #: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:218
+#: ../camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication required"
 msgstr "Ð¢Ñ?ÐµÐ±Ñ?ÐµÑ?Ñ?Ñ? Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?"
 
-#: ../calendar/libecal/e-cal.c:5102
+#: ../calendar/libecal/e-cal.c:4024
 msgid "A CORBA exception has occurred"
 msgstr "Ð?Ñ?Ð¾Ð¸Ð·Ð¾Ñ?Ð»Ð¾ Ð¸Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ðµ CORBA"
 
-#: ../calendar/libecal/e-cal.c:5104
+#: ../calendar/libecal/e-cal.c:4026
 #: ../calendar/libedata-cal/e-cal-backend-util.c:146
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/imap/camel-imap-command.c:434
-#: ../camel/providers/imap/camel-imap-store.c:743
-#: ../camel/providers/imap4/camel-imap4-engine.c:1570
-#: ../camel/providers/imap4/camel-imap4-engine.c:1609
-#: ../camel/providers/imap4/camel-imap4-engine.c:1654
-#: ../camel/providers/imap4/camel-imap4-engine.c:1710
-#: ../camel/providers/imap4/camel-imap4-store.c:315
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
-#: ../camel/providers/pop3/camel-pop3-store.c:554
-#: ../camel/providers/pop3/camel-pop3-store.c:561
-#: ../camel/providers/pop3/camel-pop3-store.c:567
-#: ../servers/exchange/storage/e-storage.c:585
-#: ../servers/groupwise/e-gw-connection.c:241
+#: ../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:5106
+#: ../calendar/libecal/e-cal.c:4028
 #: ../calendar/libedata-cal/e-cal-backend-util.c:103
-#: ../servers/exchange/storage/e-storage.c:553
 msgid "No error"
 msgstr "Ð?ÐµÑ? Ð¾Ñ?Ð¸Ð±ÐºÐ¸"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:67
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:693
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:802
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1023
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1050
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:695
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:804
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1025
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1052
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "Â«%sÂ» Ð½Ðµ Ð¿Ñ?ÐµÐ´Ð¿Ð¾Ð»Ð°Ð³Ð°ÐµÑ? Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ?Ð¾Ð²"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:100
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:210
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:252
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:288
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:102
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:212
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:290
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1090
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "Â«%sÂ» Ð¿Ñ?ÐµÐ´Ð¿Ð¾Ð»Ð°Ð³Ð°ÐµÑ? Ð¾Ð´Ð¸Ð½ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ?"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:106
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:294
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:735
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:296
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:737
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "Â«%sÂ» Ð¿Ñ?ÐµÐ´Ð¿Ð¾Ð»Ð°Ð³Ð°ÐµÑ? Ñ?Ñ?Ñ?Ð¾ÐºÑ? Ð² ÐºÐ°Ñ?ÐµÑ?Ñ?Ð²Ðµ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ?Ð° 1"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr ""
 "%s Ð¿Ñ?ÐµÐ´Ñ?Ñ?Ð¼Ð°Ñ?Ñ?Ð¸Ð²Ð°ÐµÑ?, Ñ?Ñ?Ð¾ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ? 1 Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ð¾ÐºÐ¾Ð¹ Ð´Ð°Ñ?Ñ? Ð² Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ðµ ISO "
 "8601"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:361
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:162
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:363
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:415
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:731
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:864
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "Â«%sÂ» Ð¿Ñ?ÐµÐ´Ð¿Ð¾Ð»Ð°Ð³Ð°ÐµÑ? Ð´Ð²Ð° Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ?Ð°"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:216
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:258
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:367
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:419
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1094
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:168
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:218
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:260
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:369
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:421
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:870
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1096
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "Â«%sÂ» Ð¿Ñ?ÐµÐ´Ð¿Ð¾Ð»Ð°Ð³Ð°ÐµÑ? Ñ?Ð¸Ð¿ time_t Ð² ÐºÐ°Ñ?ÐµÑ?Ñ?Ð²Ðµ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ?Ð° 1"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "Â«%sÂ» Ð¿Ñ?ÐµÐ´Ð¿Ð¾Ð»Ð°Ð³Ð°ÐµÑ? Ñ?ÐµÐ»Ð¾Ðµ Ñ?Ð¸Ñ?Ð»Ð¾ Ð² ÐºÐ°Ñ?ÐµÑ?Ñ?Ð²Ðµ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ?Ð° 2"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:375
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:377
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:430
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "Â«%sÂ» Ð¿Ñ?ÐµÐ´Ð¿Ð¾Ð»Ð°Ð³Ð°ÐµÑ? Ñ?Ð¸Ð¿ time_t Ð² ÐºÐ°Ñ?ÐµÑ?Ñ?Ð²Ðµ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ?Ð° 1"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:743
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:745
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "Â«%sÂ» Ð¿Ñ?ÐµÐ´Ð¿Ð¾Ð»Ð°Ð³Ð°ÐµÑ? Ñ?Ñ?Ñ?Ð¾ÐºÑ? Ð² ÐºÐ°Ñ?ÐµÑ?Ñ?Ð²Ðµ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ?Ð° 2"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:773
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1191,19 +1160,19 @@ msgstr ""
 "Â«%sÂ» Ð¿Ñ?ÐµÐ´Ð¿Ð¾Ð»Ð°Ð³Ð°ÐµÑ? Ð¾Ð´Ð½Ð¾ Ð¸Ð· Â«anyÂ», Â«summaryÂ», Â«descriptionÂ», Â«locationÂ», Â«attendeeÂ», "
 "Â«organizerÂ» Ð¸Ð»Ð¸ Â«classificationÂ» Ð² ÐºÐ°Ñ?ÐµÑ?Ñ?Ð²Ðµ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ?Ð° 1"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:925
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "Â«%sÂ» Ð¿Ñ?ÐµÐ´Ð¿Ð¾Ð»Ð°Ð³Ð°ÐµÑ? Ð¿Ð¾ ÐºÑ?Ð°Ð¹Ð½ÐµÐ¹ Ð¼ÐµÑ?Ðµ 1 Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ?"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:939
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:941
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
 "be a boolean false (#f)"
 msgstr ""
-"Â«%sÂ» Ð¿Ñ?ÐµÐ´Ð¿Ð¾Ð»Ð°Ð³Ð°ÐµÑ?, Ñ?Ñ?Ð¾ Ð²Ñ?Ðµ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ?Ñ? - Ñ?Ñ?Ñ?Ð¾ÐºÐ¸ Ð¸Ð»Ð¸ Ð¾Ð´Ð¸Ð½-ÐµÐ´Ð¸Ð½Ñ?Ñ?Ð²ÐµÐ½Ð½Ñ?Ð¹ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ? "
-"- Ð»Ð¾Ð³Ð¸Ñ?ÐµÑ?ÐºÐ°Ñ? Ð»Ð¾Ð¶Ñ? (#f)"
+"Â«%sÂ» Ð¿Ñ?ÐµÐ´Ð¿Ð¾Ð»Ð°Ð³Ð°ÐµÑ?, Ñ?Ñ?Ð¾ Ð²Ñ?Ðµ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ?Ñ? - Ñ?Ñ?Ñ?Ð¾ÐºÐ¸ Ð¸Ð»Ð¸ ÐµÐ´Ð¸Ð½Ñ?Ñ?Ð²ÐµÐ½Ð½Ñ?Ð¹ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ? - "
+"Ð»Ð¾Ð³Ð¸Ñ?ÐµÑ?ÐºÐ°Ñ? Ð»Ð¾Ð¶Ñ? (#f)"
 
 #: ../calendar/libedata-cal/e-cal-backend-util.c:109
 msgid "Invalid range"
@@ -1237,10 +1206,6 @@ msgstr "Ð?Ñ?ÐµÐ²Ñ?Ñ?ÐµÐ½Ð¾ Ð¾Ð³Ñ?Ð°Ð½Ð¸Ñ?ÐµÐ½Ð¸Ðµ Ð½Ð° Ñ?Ð°Ð·Ð¼ÐµÑ? Ñ?ÐµÐ·Ñ?Ð»Ñ?
 msgid "Search time limit exceeded"
 msgstr "Ð?Ñ?ÐµÐ²Ñ?Ñ?ÐµÐ½Ð¾ Ð¾Ð³Ñ?Ð°Ð½Ð¸Ñ?ÐµÐ½Ð¸Ðµ Ð½Ð° Ð²Ñ?ÐµÐ¼Ñ? Ð¿Ð¾Ð¸Ñ?ÐºÐ°"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Invalid query"
-msgstr "Ð?ÐµÐºÐ¾Ñ?Ñ?ÐµÐºÑ?Ð½Ñ?Ð¹ Ð·Ð°Ð¿Ñ?Ð¾Ñ?"
-
 #: ../calendar/libedata-cal/e-cal-backend-util.c:141
 msgid "Query refused"
 msgstr "Ð?Ð°Ð¿Ñ?Ð¾Ñ? Ð¾Ñ?ÐºÐ»Ð¾Ð½Ñ?Ð½"
@@ -1249,6 +1214,136 @@ msgstr "Ð?Ð°Ð¿Ñ?Ð¾Ñ? Ð¾Ñ?ÐºÐ»Ð¾Ð½Ñ?Ð½"
 msgid "Invalid server version"
 msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ð°Ñ? Ð²ÐµÑ?Ñ?Ð¸Ñ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð°"
 
+#: ../calendar/libedata-cal/e-data-cal.c:491
+#, c-format
+msgid "Cannot retrieve calendar address"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:509
+#, c-format
+msgid "Cannot retrieve calendar alarm e-mail address"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ? Ñ?Ð». Ð¿Ð¾Ñ?Ñ?Ñ? Ð´Ð»Ñ? Ð¾Ñ?Ð¿Ñ?Ð°Ð²ÐºÐ¸ Ñ?Ð²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ð¹ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:527
+#, c-format
+msgid "Cannot retrieve calendar's ldap attribute"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð°Ñ?Ñ?Ð¸Ð±Ñ?Ñ? ldap ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:545
+#, c-format
+msgid "Cannot retrieve calendar scheduling information"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ñ?Ð°Ñ?Ð¿Ð¸Ñ?Ð°Ð½Ð¸Ðµ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:562
+#, c-format
+msgid "Cannot open calendar"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:579
+#, c-format
+msgid "Cannot refresh calendar"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ?Ñ? Ð´Ð°Ð½Ð½Ñ?Ðµ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:596
+#, c-format
+msgid "Cannot remove calendar"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð´Ð°Ð»Ð¸Ñ?Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:615
+#, c-format
+msgid "Cannot create calendar object"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:637
+#, c-format
+msgid "Cannot modify calendar object"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:661
+#, c-format
+msgid "Cannot remove calendar object"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð´Ð°Ð»Ð¸Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:680
+#, c-format
+msgid "Cannot receive calendar objects"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ?Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:697
+#, c-format
+msgid "Cannot discard calendar alarm"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð½Ñ?Ñ?Ñ? Ñ?Ð²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ðµ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:716
+#, c-format
+msgid "Cannot send calendar objects"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ?Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:751
+#, c-format
+msgid "Cannot retrieve default calendar object path"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¿Ñ?Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ?Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ? Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:769
+#, c-format
+msgid "Cannot retrieve calendar object path"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¿Ñ?Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ?Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:787
+#, c-format
+msgid "Cannot retrieve calendar object list"
+msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ñ?Ð¿Ð¸Ñ?Ð¾Ðº Ð¾Ð±Ñ?ÐµÐºÑ?Ð¾Ð² ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:825
+#, c-format
+msgid "Could not retrieve attachment list"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ñ?Ð¿Ð¸Ñ?Ð¾Ðº Ð¾Ð±Ñ?ÐµÐºÑ?Ð¾Ð² ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:847
+#, c-format
+msgid "Could not complete calendar query"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð·Ð°Ð²ÐµÑ?Ñ?Ð¸Ñ?Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:865
+#, c-format
+msgid "Could not retrieve calendar time zone"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ñ?Ð°Ñ?Ð¾Ð²Ð¾Ð¹ Ð¿Ð¾Ñ?Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:883
+#, c-format
+msgid "Could not add calendar time zone"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ñ?Ð°Ñ?Ð¾Ð²Ð¾Ð¹ Ð¿Ð¾Ñ?Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:900
+#, c-format
+msgid "Could not set default calendar time zone"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð·Ð°Ð´Ð°Ñ?Ñ? Ñ?Ð°Ñ?Ð¾Ð²Ð¾Ð¹ Ð¿Ð¾Ñ?Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ? Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:921
+#, c-format
+msgid "Cannot retrieve calendar changes"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:971
+#, c-format
+msgid "Cannot retrieve calendar free/busy list"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ñ?Ð¿Ð¸Ñ?Ð¾Ðº Ñ?Ð²Ð¾Ð±Ð¾Ð´Ð½Ñ?Ñ?/Ð·Ð°Ð½Ñ?Ñ?Ñ?Ñ? Ð´Ð½ÐµÐ¹ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:339
+#, c-format
+msgid "Invalid URI"
+msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ URI"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:350
+#, c-format
+msgid "No backend factory for '%s' of '%s'"
+msgstr "Ð?Ðµ Ñ?ÐºÐ°Ð·Ð°Ð½ Ð´Ñ?Ð°Ð¹Ð²ÐµÑ? Ñ?Ð°Ð±Ñ?Ð¸ÐºÐ¸ Ð´Ð»Ñ? Â«%sÂ» Ñ? Â«%sÂ»"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:390
+#, c-format
+msgid "Could not instantiate backend"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ? Ð´Ñ?Ð°Ð¹Ð²ÐµÑ?Ð°"
+
 #: ../camel/camel-cipher-context.c:102
 msgid "Signing is not supported by this cipher"
 msgstr "Ð?Ð¾Ð´Ð¿Ð¸Ñ?Ñ? Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÑ?Ñ?Ñ? Ñ?Ñ?Ð¸Ð¼ Ñ?Ð¸Ñ?Ñ?Ð¾Ð¼"
@@ -1289,20 +1384,20 @@ msgstr "Ð?Ð¼Ð¿Ð¾Ñ?Ñ? ÐºÐ»Ñ?Ñ?ÐµÐ¹ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÑ?Ñ?Ñ? Ñ?Ñ?Ð¸Ð¼ Ñ?
 msgid "You may not export keys with this cipher"
 msgstr "ÐÐºÑ?Ð¿Ð¾Ñ?Ñ? ÐºÐ»Ñ?Ñ?ÐµÐ¹ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÑ?Ñ?Ñ? Ñ?Ñ?Ð¸Ð¼ Ñ?Ð¸Ñ?Ñ?Ð¾Ð¼"
 
-#: ../camel/camel-data-cache.c:136
+#: ../camel/camel-data-cache.c:135
 msgid "Unable to create cache path"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? Ð¿Ñ?Ñ?Ñ? Ð´Ð»Ñ? ÐºÑ?Ñ?Ð°"
 
-#: ../camel/camel-data-cache.c:403
+#: ../camel/camel-data-cache.c:401
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð´Ð°Ð»Ð¸Ñ?Ñ? ÐºÑ?Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð½Ñ?Ð¹ Ñ?Ð»ÐµÐ¼ÐµÐ½Ñ?: %s: %s"
 
-#: ../camel/camel-db.c:390
+#: ../camel/camel-db.c:411
 msgid "Insufficient memory"
 msgstr "Ð?ÐµÐ´Ð¾Ñ?Ñ?Ð°Ñ?Ð¾Ñ?Ð½Ð¾ Ð¿Ð°Ð¼Ñ?Ñ?Ð¸"
 
-#: ../camel/camel-disco-diary.c:198
+#: ../camel/camel-disco-diary.c:197
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1313,8 +1408,8 @@ msgstr ""
 "Ð?Ð°Ð»Ñ?Ð½ÐµÐ¹Ñ?Ð¸Ðµ Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ð¸ Ð½Ðµ Ð±Ñ?Ð´Ñ?Ñ? Ð·Ð°Ð¿Ð¸Ñ?Ð°Ð½Ñ? Ð¸, Ñ?Ð¾Ð¾Ñ?Ð²ÐµÑ?Ñ?Ñ?Ð²ÐµÐ½Ð½Ð¾, Ð½Ðµ Ð±Ñ?Ð´Ñ?Ñ?\n"
 "Ð²Ð¾Ñ?Ð¿Ñ?Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ñ? Ð¿Ð¾Ñ?Ð»Ðµ Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ðº Ñ?ÐµÑ?Ð²ÐµÑ?Ñ?."
 
-#: ../camel/camel-disco-diary.c:261
-#: ../camel/providers/imap/camel-imap-journal.c:318
+#: ../camel/camel-disco-diary.c:260
+#: ../camel/providers/imap/camel-imap-journal.c:320
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1325,114 +1420,114 @@ msgstr ""
 "%s\n"
 "Ð?Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ?, Ñ?Ð´ÐµÐ»Ð°Ð½Ð½Ñ?Ðµ Ð² Ñ?Ñ?Ð¾Ð¹ Ð¿Ð°Ð¿ÐºÐµ, Ð½Ðµ Ð±Ñ?Ð´Ñ?Ñ? Ñ?Ð¸Ð½Ñ?Ñ?Ð¾Ð½Ð¸Ð·Ð¸Ñ?Ð¾Ð²Ð°Ð½Ñ?."
 
-#: ../camel/camel-disco-diary.c:297
+#: ../camel/camel-disco-diary.c:296
 msgid "Resynchronizing with server"
 msgstr "Ð¡Ð¸Ð½Ñ?Ñ?Ð¾Ð½Ð¸Ð·Ð°Ñ?Ð¸Ñ? Ñ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð¾Ð¼"
 
-#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:52
+#: ../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:111
+#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:107
 msgid "Downloading new messages for offline mode"
 msgstr "Ð?Ð¾Ð²Ñ?Ðµ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ? Ð·Ð°Ð³Ñ?Ñ?Ð¶Ð°Ñ?Ñ?Ñ?Ñ? Ð´Ð»Ñ? Ð°Ð²Ñ?Ð¾Ð½Ð¾Ð¼Ð½Ð¾Ð¹ Ñ?Ð°Ð±Ð¾Ñ?Ñ?"
 
-#: ../camel/camel-disco-folder.c:469
+#: ../camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Ð?Ð¾Ð´Ð³Ð¾Ñ?Ð¾Ð²ÐºÐ° Ð¿Ð°Ð¿ÐºÐ¸ Â«%sÂ» Ð´Ð»Ñ? Ð°Ð²Ñ?Ð¾Ð½Ð¾Ð¼Ð½Ð¾Ð¹ Ñ?Ð°Ð±Ð¾Ñ?Ñ?"
 
-#: ../camel/camel-disco-store.c:403
-#: ../camel/providers/groupwise/camel-groupwise-store.c:226
-#: ../camel/providers/imap/camel-imap-store.c:1003
-#: ../camel/providers/imap/camel-imap-store.c:1813
-#: ../camel/providers/imap/camel-imap-store.c:2229
-#: ../camel/providers/imap/camel-imap-store.c:2997
+#: ../camel/camel-disco-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
 msgid "You must be working online to complete this operation"
 msgstr "Ð?Ð»Ñ? Ð·Ð°Ð²ÐµÑ?Ñ?ÐµÐ½Ð¸Ñ? Ð´Ð°Ð½Ð½Ð¾Ð¹ Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ð¸ Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼Ð¾ Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ðµ Ðº Ñ?ÐµÑ?Ð¸"
 
-#: ../camel/camel-exception.c:262
+#: ../camel/camel-exception.c:260
 msgid "No description available"
 msgstr "Ð?Ð¿Ð¸Ñ?Ð°Ð½Ð¸Ðµ Ð½ÐµÐ´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¾"
 
-#: ../camel/camel-filter-driver.c:795 ../camel/camel-filter-search.c:581
+#: ../camel/camel-filter-driver.c:794 ../camel/camel-filter-search.c:579
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ñ?Ð¸ Ñ?Ð¾Ð·Ð´Ð°Ð½Ð¸Ð¸ Ð´Ð¾Ñ?ÐµÑ?Ð½ÐµÐ³Ð¾ Ð¿Ñ?Ð¾Ñ?ÐµÑ?Ñ?Ð° Â«%sÂ»: %s"
 
-#: ../camel/camel-filter-driver.c:837
+#: ../camel/camel-filter-driver.c:836
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ð¿Ð¾Ñ?Ð¾Ðº Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ð¹ Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½ Ð¸Ð· %s: %s"
 
-#: ../camel/camel-filter-driver.c:1026 ../camel/camel-filter-driver.c:1035
+#: ../camel/camel-filter-driver.c:1025 ../camel/camel-filter-driver.c:1034
 msgid "Syncing folders"
 msgstr "Ð¡Ð¸Ð½Ñ?Ñ?Ð¾Ð½Ð¸Ð·Ð°Ñ?Ð¸Ñ? Ð¿Ð°Ð¿Ð¾Ðº"
 
-#: ../camel/camel-filter-driver.c:1124 ../camel/camel-filter-driver.c:1530
+#: ../camel/camel-filter-driver.c:1121 ../camel/camel-filter-driver.c:1522
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð°Ð·Ð¾Ð±Ñ?Ð°Ñ?Ñ? Ñ?Ð¸Ð»Ñ?Ñ?Ñ?: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1133 ../camel/camel-filter-driver.c:1539
+#: ../camel/camel-filter-driver.c:1130 ../camel/camel-filter-driver.c:1531
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° Ð²Ñ?Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ? Ñ?Ð¸Ð»Ñ?Ñ?Ñ?Ð°: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1221
+#: ../camel/camel-filter-driver.c:1216
 msgid "Unable to open spool folder"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ? Ñ?Ð¿Ñ?Ð»Ð°"
 
-#: ../camel/camel-filter-driver.c:1230
+#: ../camel/camel-filter-driver.c:1225
 msgid "Unable to process spool folder"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?Ð°Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ? Ñ?Ð¿Ñ?Ð»Ð°"
 
-#: ../camel/camel-filter-driver.c:1246
+#: ../camel/camel-filter-driver.c:1241
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Ð?Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ðµ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ? %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1250
+#: ../camel/camel-filter-driver.c:1245
 msgid "Cannot open message"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ"
 
-#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1269
+#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1264
 #, c-format
 msgid "Failed on message %d"
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð½Ð° Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ð¸ %d"
 
-#: ../camel/camel-filter-driver.c:1283 ../camel/camel-filter-driver.c:1374
+#: ../camel/camel-filter-driver.c:1278 ../camel/camel-filter-driver.c:1368
 msgid "Syncing folder"
 msgstr "Ð¡Ð¸Ð½Ñ?Ñ?Ð¾Ð½Ð¸Ð·Ð°Ñ?Ð¸Ñ? Ð¿Ð°Ð¿ÐºÐ¸"
 
-#: ../camel/camel-filter-driver.c:1287 ../camel/camel-filter-driver.c:1379
+#: ../camel/camel-filter-driver.c:1282 ../camel/camel-filter-driver.c:1373
 msgid "Complete"
 msgstr "Ð?Ð°Ð²ÐµÑ?Ñ?ÐµÐ½Ð°"
 
-#: ../camel/camel-filter-driver.c:1344
+#: ../camel/camel-filter-driver.c:1338
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Ð?Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ðµ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ? %d Ð¸Ð· %d"
 
-#: ../camel/camel-filter-driver.c:1359
+#: ../camel/camel-filter-driver.c:1353
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð½Ð° Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ð¸ %d Ð¸Ð· %d"
 
-#: ../camel/camel-filter-search.c:138
+#: ../camel/camel-filter-search.c:137
 msgid "Failed to retrieve message"
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ñ?Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ð¸ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ?"
 
-#: ../camel/camel-filter-search.c:401
+#: ../camel/camel-filter-search.c:399
 msgid "Invalid arguments to (system-flag)"
 msgstr "Ð?ÐµÐ´Ð¾Ð¿Ñ?Ñ?Ñ?Ð¸Ð¼Ñ?Ðµ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ?Ñ? Ð´Ð»Ñ? system-flag"
 
-#: ../camel/camel-filter-search.c:416
+#: ../camel/camel-filter-search.c:414
 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:737 ../camel/camel-filter-search.c:745
+#: ../camel/camel-filter-search.c:735 ../camel/camel-filter-search.c:743
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° Ð²Ñ?Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ? Ð¿Ð¾Ð¸Ñ?ÐºÐ° Ñ?Ð¸Ð»Ñ?Ñ?Ñ?Ð°: %s: %s"
@@ -1457,72 +1552,73 @@ msgstr ""
 "Ð?Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¸ Ð²Ñ?Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ð¸ Ð²Ñ?Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ? Ð¿Ð¾Ð¸Ñ?ÐºÐ° Â«%sÂ»:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:853
+#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:852
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) Ñ?Ñ?ÐµÐ±Ñ?ÐµÑ? ÐµÐ´Ð¸Ð½Ñ?Ñ?Ð²ÐµÐ½Ð½Ð¾Ð³Ð¾ Ð»Ð¾Ð³Ð¸Ñ?ÐµÑ?ÐºÐ¾Ð³Ð¾ Ñ?ÐµÐ·Ñ?Ð»Ñ?Ñ?Ð°Ñ?Ð°"
 
-#: ../camel/camel-folder-search.c:906
+#: ../camel/camel-folder-search.c:905
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) Ð½Ðµ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ñ?ÐµÑ?Ñ?Ñ? Ð²Ð½Ñ?Ñ?Ñ?Ð¸ %s"
 
-#: ../camel/camel-folder-search.c:912 ../camel/camel-folder-search.c:919
+#: ../camel/camel-folder-search.c:911 ../camel/camel-folder-search.c:918
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) Ñ?Ñ?ÐµÐ±Ñ?ÐµÑ? Ñ?Ñ?Ñ?Ð¾ÐºÑ? Ñ?Ð¾Ð¾Ñ?Ð²ÐµÑ?Ñ?Ñ?Ð²Ð¸Ñ?"
 
-#: ../camel/camel-folder-search.c:946
+#: ../camel/camel-folder-search.c:945
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) Ð¾Ð¶Ð¸Ð´Ð°ÐµÑ? Ñ?ÐµÐ·Ñ?Ð»Ñ?Ñ?Ð°Ñ? Ð² Ð²Ð¸Ð´Ðµ Ð¼Ð°Ñ?Ñ?Ð¸Ð²Ð°"
 
-#: ../camel/camel-folder-search.c:955
+#: ../camel/camel-folder-search.c:954
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) Ñ?Ñ?ÐµÐ±Ñ?ÐµÑ? Ð½Ð°Ð±Ð¾Ñ? Ð¿Ð°Ð¿Ð¾Ðº"
 
-#: ../camel/camel-folder.c:696
+#: ../camel/camel-folder.c:676
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Ð?ÐµÐ¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ? Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?: Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ: Ð´Ð»Ñ? %s"
 
-#: ../camel/camel-folder.c:1398
+#: ../camel/camel-folder.c:1381
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Ð?ÐµÐ¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ? Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?: Ð¿Ð¾Ð¸Ñ?Ðº Ð²Ñ?Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ?: Ð´Ð»Ñ? %s"
 
-#: ../camel/camel-folder.c:1440
+#: ../camel/camel-folder.c:1422
 #, c-format
 msgid "Unsupported operation: count by expression: for %s"
 msgstr "Ð?ÐµÐ¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ? Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ? Ð¾Ð¿Ñ?ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ? ÐºÐ¾Ð»Ð¸Ñ?ÐµÑ?Ñ?Ð²Ð° Ð¿Ð¾ Ð²Ñ?Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ?: Ð´Ð»Ñ? %s"
 
-#: ../camel/camel-folder.c:1480
+#: ../camel/camel-folder.c:1461
 #, c-format
 msgid "Unsupported operation: search by UIDs: for %s"
 msgstr "Ð?ÐµÐ¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ? Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?: Ð¿Ð¾Ð¸Ñ?Ðº Ð¿Ð¾ UID: Ð´Ð»Ñ? %s"
 
-#: ../camel/camel-folder.c:1596
+#: ../camel/camel-folder.c:1574
+#: ../camel/providers/local/camel-maildir-folder.c:387
 msgid "Moving messages"
 msgstr "Ð?ÐµÑ?ÐµÐ¼ÐµÑ?ÐµÐ½Ð¸Ðµ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ð¹"
 
-#: ../camel/camel-folder.c:1596
+#: ../camel/camel-folder.c:1574
 msgid "Copying messages"
 msgstr "Ð?Ð¾Ð¿Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ðµ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ð¹"
 
-#: ../camel/camel-folder.c:1942
+#: ../camel/camel-folder.c:1915
 msgid "Learning junk"
 msgstr "Ð?Ð·Ñ?Ñ?Ð°ÐµÑ?Ñ?Ñ? Ñ?Ð¿Ð°Ð¼"
 
-#: ../camel/camel-folder.c:1959
+#: ../camel/camel-folder.c:1933
 msgid "Learning non-junk"
 msgstr "Ð?Ð·Ñ?Ñ?Ð°ÐµÑ?Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ, Ð½Ðµ Ñ?Ð²Ð»Ñ?Ñ?Ñ?ÐµÐµÑ?Ñ? Ñ?Ð¿Ð°Ð¼Ð¾Ð¼"
 
-#: ../camel/camel-folder.c:1978
+#: ../camel/camel-folder.c:1953
 msgid "Filtering new message(s)"
 msgstr "Ð¤Ð¸Ð»Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ? Ð½Ð¾Ð²Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ð¹"
 
-#: ../camel/camel-gpg-context.c:755
+#: ../camel/camel-gpg-context.c:760
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1533,22 +1629,22 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:770
+#: ../camel/camel-gpg-context.c:775
 msgid "Failed to parse gpg userid hint."
 msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¸ Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?ÐºÐµ Ð¿Ð¾Ð´Ñ?ÐºÐ°Ð·ÐºÐ¸ gpg userid."
 
-#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:808
+#: ../camel/camel-gpg-context.c:799 ../camel/camel-gpg-context.c:813
 msgid "Failed to parse gpg passphrase request."
 msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¸ Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?ÐºÐµ Ð·Ð°Ð¿Ñ?Ð¾Ñ?Ð° Ð¿Ð°Ñ?Ð¾Ð»Ñ?Ð½Ð¾Ð¹ Ñ?Ñ?Ð°Ð·Ñ? gpg."
 
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:833
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
 "SmartCard: \"%s\""
 msgstr "Ð?Ð»Ñ? Ñ?Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ñ? Ñ?Ð¼Ð°Ñ?Ñ?ÐºÐ°Ñ?Ñ?Ñ? Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼Ð¾ Ð²Ð²ÐµÑ?Ñ?Ð¸ PIN: Â«%sÂ»"
 
-#: ../camel/camel-gpg-context.c:832
+#: ../camel/camel-gpg-context.c:837
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1557,99 +1653,95 @@ msgstr ""
 "Ð?Ð²ÐµÐ´Ð¸Ñ?Ðµ ÐºÐ»Ñ?Ñ?ÐµÐ²Ñ?Ñ? Ñ?Ñ?Ð°Ð·Ñ?, Ñ?Ñ?Ð¾Ð±Ñ? Ñ?Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ñ?Ñ?\n"
 "ÐºÐ»Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»Ñ?: Â«%sÂ»"
 
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:842
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "Ð?ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ñ?Ð¹ Ð·Ð°Ð¿Ñ?Ð¾Ñ? Ð¾Ñ? GnuPG Ð´Ð»Ñ? Â«%sÂ»"
 
-#: ../camel/camel-gpg-context.c:862 ../camel/camel-gpg-context.c:1071
-#: ../camel/providers/nntp/camel-nntp-store.c:1304
+#: ../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:876
+#: ../camel/camel-gpg-context.c:881
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Ð¡Ð±Ð¾Ð¹ Ð¿Ñ?Ð¸ Ñ?Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ð¸ Ñ?ÐµÐºÑ?ÐµÑ?Ð½Ð¾Ð³Ð¾ ÐºÐ»Ñ?Ñ?Ð°: Ñ?ÐºÐ°Ð·Ð°Ð½Ð¾ 3 Ð½ÐµÐºÐ¾Ñ?Ñ?ÐµÐºÑ?Ð½Ñ?Ñ? Ð¿Ð°Ñ?Ð¾Ð»Ñ?Ð½Ñ?Ñ? "
 "Ñ?Ñ?Ð°Ð·Ñ?."
 
-#: ../camel/camel-gpg-context.c:884
+#: ../camel/camel-gpg-context.c:889
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Ð?ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ñ?Ð¹ Ð¾Ñ?Ð²ÐµÑ? Ð¾Ñ? GnuPG: %s"
 
-#: ../camel/camel-gpg-context.c:947
+#: ../camel/camel-gpg-context.c:988
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð·Ð°Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ñ?Ñ?Ð¾ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ: Ð?Ðµ Ð¾Ð¿Ñ?ÐµÐ´ÐµÐ»ÐµÐ½Ñ? ÐºÐ¾Ñ?Ñ?ÐµÐºÑ?Ð½Ñ?Ðµ Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ñ?ÐµÐ»Ð¸"
 
 #. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1209 ../camel/camel-gpg-context.c:1337
-#: ../camel/camel-gpg-context.c:1850 ../camel/camel-gpg-context.c:1895
+#: ../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:1305 ../camel/camel-smime-context.c:602
+#: ../camel/camel-gpg-context.c:1355 ../camel/camel-smime-context.c:605
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð³ÐµÐ½ÐµÑ?Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð´Ð°Ð½Ð½Ñ?Ðµ Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð¸: %s"
 
-#: ../camel/camel-gpg-context.c:1352 ../camel/camel-gpg-context.c:1554
-#: ../camel/camel-gpg-context.c:1640 ../camel/camel-gpg-context.c:1655
-#: ../camel/camel-gpg-context.c:1771 ../camel/camel-gpg-context.c:1786
-#: ../camel/camel-gpg-context.c:1866 ../camel/camel-gpg-context.c:1911
+#: ../camel/camel-gpg-context.c: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
 msgid "Failed to execute gpg."
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ñ?Ð¸ Ð¸Ñ?Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ð¸ gpg."
 
-#: ../camel/camel-gpg-context.c:1371
-msgid "This is a digitally signed message part"
-msgstr "ÐÑ?Ð° Ñ?Ð°Ñ?Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ? Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð°Ð½Ð° Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð¾Ð¹ Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ñ?Ñ?"
-
-#: ../camel/camel-gpg-context.c:1458 ../camel/camel-gpg-context.c:1464
-#: ../camel/camel-gpg-context.c:1470 ../camel/camel-gpg-context.c:1485
-#: ../camel/camel-smime-context.c:910 ../camel/camel-smime-context.c:921
-#: ../camel/camel-smime-context.c:928
+#: ../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
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ñ? Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ?: Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ñ?Ð¾Ñ?Ð¼Ð°Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ?"
 
-#: ../camel/camel-gpg-context.c:1524
+#: ../camel/camel-gpg-context.c:1600
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ñ? Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ?: Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? Ð²Ñ?ÐµÐ¼ÐµÐ½Ð½Ñ?Ð¹ Ñ?Ð°Ð¹Ð»: %s"
 
-#: ../camel/camel-gpg-context.c:1623
+#: ../camel/camel-gpg-context.c:1711
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð³ÐµÐ½ÐµÑ?Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð´Ð°Ð½Ð½Ñ?Ðµ Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð¸Ñ?: %s"
 
-#: ../camel/camel-gpg-context.c:1673
+#: ../camel/camel-gpg-context.c:1761
 msgid "This is a digitally encrypted message part"
 msgstr "ÐÑ?Ð¾ Ð·Ð°Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð½Ð°Ñ? Ñ?Ð°Ñ?Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ?"
 
-#: ../camel/camel-gpg-context.c:1726 ../camel/camel-gpg-context.c:1734
-#: ../camel/camel-gpg-context.c:1753
+#: ../camel/camel-gpg-context.c:1814 ../camel/camel-gpg-context.c:1822
+#: ../camel/camel-gpg-context.c:1841
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð´ÐµÐºÐ¾Ð´Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ: Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ñ?Ð¾Ñ?Ð¼Ð°Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ?"
 
-#: ../camel/camel-gpg-context.c:1743
+#: ../camel/camel-gpg-context.c:1831
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ñ?Ð¸ Ð´ÐµÐºÐ¾Ð´Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ MIME: Ð¾Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¾Ñ?Ð¾ÐºÐ¾Ð»Ð°"
 
-#: ../camel/camel-gpg-context.c:1808 ../camel/camel-smime-context.c:1185
+#: ../camel/camel-gpg-context.c:1909 ../camel/camel-smime-context.c:1205
 msgid "Encrypted content"
 msgstr "Ð?Ð°Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð½Ð¾Ðµ Ñ?Ð¾Ð´ÐµÑ?Ð¶Ð¸Ð¼Ð¾Ðµ"
 
-#: ../camel/camel-gpg-context.c:1827
+#: ../camel/camel-gpg-context.c:1930
 msgid "Unable to parse message content"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð°Ð·Ð¾Ð±Ñ?Ð°Ñ?Ñ? Ñ?Ð¾Ð´ÐµÑ?Ð¶Ð¸Ð¼Ð¾Ðµ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ?"
 
-#: ../camel/camel-gpg-context.c:1851 ../camel/camel-gpg-context.c:1896
-#: ../camel/camel-tcp-stream-openssl.c:635
-#: ../camel/providers/imap4/camel-imap4-utils.c:624
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
-#: ../camel/providers/smtp/camel-smtp-transport.c:221
+#: ../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 "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ð¾"
 
@@ -1663,12 +1755,12 @@ msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? ÐºÐ°Ð½Ð°Ð» Ðº Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð°Ñ?Ð¾Ñ?Ñ?:
 msgid "Cannot fork locking helper: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð·Ð°Ð¿Ñ?Ñ?Ñ?Ð¸Ñ?Ñ? Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð°Ñ?Ð¾Ñ?: %s"
 
-#: ../camel/camel-lock-client.c:204 ../camel/camel-lock-client.c:227
+#: ../camel/camel-lock-client.c:203 ../camel/camel-lock-client.c:226
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Â«%sÂ»: Ð¾Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¾Ñ?Ð¾ÐºÐ¾Ð»Ð° Ñ? Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð°Ñ?Ð¾Ñ?Ð¾Ð¼"
 
-#: ../camel/camel-lock-client.c:217
+#: ../camel/camel-lock-client.c:216
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Â«%sÂ»"
@@ -1749,54 +1841,54 @@ msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° Ñ?Ð¾Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¸Ñ? Ð²Ñ?ÐµÐ¼ÐµÐ½Ð½Ð¾Ð³Ð¾ Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ð¾Ð³
 msgid "Error copying mail temp file: %s"
 msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° ÐºÐ¾Ð¿Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ñ? Ð²Ñ?ÐµÐ¼ÐµÐ½Ð½Ð¾Ð³Ð¾ Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ð¾Ð³Ð¾ Ñ?Ð°Ð¹Ð»Ð°: %s"
 
-#: ../camel/camel-multipart-signed.c:593
+#: ../camel/camel-multipart-signed.c:592
 msgid "parse error"
 msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?ÐºÐ¸"
 
-#: ../camel/camel-net-utils.c:505 ../camel/camel-net-utils.c:667
-#: ../camel/camel-net-utils.c:799
-#: ../camel/providers/pop3/camel-pop3-store.c:448
-#: ../camel/providers/pop3/camel-pop3-store.c:548
+#: ../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-net-utils.c:524
+#: ../camel/camel-net-utils.c:521
 msgid "cannot create thread"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? Ð¿Ð¾Ñ?Ð¾Ðº"
 
-#: ../camel/camel-net-utils.c:671
+#: ../camel/camel-net-utils.c:678
 #, c-format
 msgid "Resolving: %s"
 msgstr "Ð?Ð¾Ð¸Ñ?Ðº Ñ?Ð·Ð»Ð°: %s"
 
-#: ../camel/camel-net-utils.c:693
+#: ../camel/camel-net-utils.c:700
 msgid "Host lookup failed"
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ð¾Ð¸Ñ?ÐºÐ° Ñ?Ð·Ð»Ð°"
 
-#: ../camel/camel-net-utils.c:695
+#: ../camel/camel-net-utils.c:702
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ð¾Ð¸Ñ?ÐºÐ° Ñ?Ð·Ð»Ð°: %s: %s"
 
-#: ../camel/camel-net-utils.c:803
+#: ../camel/camel-net-utils.c:809
 msgid "Resolving address"
 msgstr "Ð?Ð¾Ð¸Ñ?Ðº Ð°Ð´Ñ?ÐµÑ?Ð°"
 
-#: ../camel/camel-net-utils.c:823
+#: ../camel/camel-net-utils.c:829
 msgid "Name lookup failed"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ð¿Ñ?ÐµÐ´ÐµÐ»Ð¸Ñ?Ñ? Ñ?Ð·ÐµÐ»"
 
-#: ../camel/camel-net-utils.c:826
+#: ../camel/camel-net-utils.c:832
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ð¿Ñ?ÐµÐ´ÐµÐ»Ð¸Ñ?Ñ? Ñ?Ð·ÐµÐ»: %s"
 
-#: ../camel/camel-offline-folder.c:253
+#: ../camel/camel-offline-folder.c:249
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "Ð¡Ð¸Ð½Ñ?Ñ?Ð¾Ð½Ð¸Ð·Ð°Ñ?Ð¸Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ð¹ Ð² Ð¿Ð°Ð¿ÐºÐµ Â«%sÂ» Ð½Ð° Ð´Ð¸Ñ?Ðº"
 
-#: ../camel/camel-offline-journal.c:164 ../camel/camel-offline-journal.c:187
+#: ../camel/camel-offline-journal.c:159 ../camel/camel-offline-journal.c:182
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð·Ð°Ð¿Ð¸Ñ?Ð°Ñ?Ñ? Ð¶Ñ?Ñ?Ð½Ð°Ð» Ð°Ð²Ñ?Ð¾Ð½Ð¾Ð¼Ð½Ð¾Ð¹ Ñ?Ð°Ð±Ð¾Ñ?Ñ? Ð´Ð»Ñ? Ð¿Ð°Ð¿ÐºÐ¸ Â«%sÂ»: %s"
@@ -1825,24 +1917,24 @@ msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð·Ð°Ð³Ñ?Ñ?Ð·Ð¸Ñ?Ñ? %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð·Ð°Ð³Ñ?Ñ?Ð·Ð¸Ñ?Ñ? %s: Ð² Ð¼Ð¾Ð´Ñ?Ð»Ðµ Ð½ÐµÑ? Ð¸Ð½Ð¸Ñ?Ð¸Ð°Ð»Ð¸Ð·Ð¸Ñ?Ñ?Ñ?Ñ?ÐµÐ³Ð¾ ÐºÐ¾Ð´Ð°."
 
-#: ../camel/camel-provider.c:373 ../camel/camel-session.c:182
+#: ../camel/camel-provider.c:379 ../camel/camel-session.c:180
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "Ð?Ñ?Ð¾Ð²Ð°Ð¹Ð´ÐµÑ? Ð´Ð»Ñ? Ð¿Ñ?Ð¾Ñ?Ð¾ÐºÐ¾Ð»Ð° Â«%sÂ» Ð½Ðµ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿ÐµÐ½"
 
-#: ../camel/camel-sasl-anonymous.c:37
+#: ../camel/camel-sasl-anonymous.c:36
 msgid "Anonymous"
 msgstr "Anonymous"
 
-#: ../camel/camel-sasl-anonymous.c:39
+#: ../camel/camel-sasl-anonymous.c:38
 msgid "This option will connect to the server using an anonymous login."
 msgstr "Ð?Ñ?Ð´ÐµÑ? Ð¿Ñ?Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ?Ñ?Ñ?Ñ? Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾Ðµ (anonymous) Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ðµ Ðº Ñ?ÐµÑ?Ð²ÐµÑ?Ñ?."
 
-#: ../camel/camel-sasl-anonymous.c:124 ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:121 ../camel/camel-sasl-plain.c:91
 msgid "Authentication failed."
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ñ?Ð¾Ð²ÐµÑ?ÐºÐ¸ Ð¿Ð¾Ð´Ð»Ð¸Ð½Ð½Ð¾Ñ?Ñ?Ð¸."
 
-#: ../camel/camel-sasl-anonymous.c:133
+#: ../camel/camel-sasl-anonymous.c:130
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -1851,7 +1943,7 @@ msgstr ""
 "Ð?ÐµÐ²ÐµÑ?Ð½Ð°Ñ? Ñ?Ñ?Ð°Ñ?Ñ?Ð¸Ñ?Ð¾Ð²Ð¾Ñ?Ð½Ð°Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ? Ñ?Ð».Ð°Ð´Ñ?ÐµÑ?Ð°:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:145
+#: ../camel/camel-sasl-anonymous.c:142
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1860,7 +1952,7 @@ msgstr ""
 "Ð?ÐµÐ²ÐµÑ?Ð½Ð°Ñ? Ñ?ÐºÑ?Ñ?Ñ?Ð°Ñ? Ñ?Ñ?Ð°Ñ?Ñ?Ð¸Ñ?Ð¾Ð²Ð¾Ñ?Ð½Ð°Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:157
+#: ../camel/camel-sasl-anonymous.c:154
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1893,39 +1985,39 @@ msgstr ""
 "Ð?Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ðµ Ðº Ñ?ÐµÑ?Ð²ÐµÑ?Ñ? Ð±Ñ?Ð´ÐµÑ? Ð¿Ñ?Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ?Ñ?Ñ?Ñ? Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸ÐµÐ¼ Ð·Ð°Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð½Ð¾Ð³Ð¾ "
 "Ð¿Ð°Ñ?Ð¾Ð»Ñ? DIGEST-MD5, ÐµÑ?Ð»Ð¸ Ñ?ÐµÑ?Ð²ÐµÑ? ÐµÐ³Ð¾ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÑ?."
 
-#: ../camel/camel-sasl-digest-md5.c:845
+#: ../camel/camel-sasl-digest-md5.c:844
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Ð?Ñ?Ð²ÐµÑ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð° Ñ?Ð»Ð¸Ñ?ÐºÐ¾Ð¼ Ð´Ð»Ð¸Ð½Ð½Ñ?Ð¹ (>2048 Ð±Ð°Ð¹Ñ?)"
 
-#: ../camel/camel-sasl-digest-md5.c:854
+#: ../camel/camel-sasl-digest-md5.c:853
 msgid "Server challenge invalid\n"
 msgstr "Ð?ÐµÐ´Ð¾Ð¿Ñ?Ñ?Ñ?Ð¸Ð¼Ñ?Ð¹ Ð¾Ñ?Ð²ÐµÑ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð°\n"
 
-#: ../camel/camel-sasl-digest-md5.c:860
+#: ../camel/camel-sasl-digest-md5.c:859
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "Ð?Ñ?Ð²ÐµÑ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð° Ñ?Ð¾Ð´ÐµÑ?Ð¶Ð¸Ñ? Ð½ÐµÐ´Ð¾Ð¿Ñ?Ñ?Ñ?Ð¸Ð¼Ñ?Ð¹ Ð¶ÐµÑ?Ð¾Ð½ \"Ð?Ð°Ñ?ÐµÑ?Ñ?Ð²Ð¾ Ð·Ð°Ñ?Ð¸Ñ?Ñ?\""
 
-#: ../camel/camel-sasl-digest-md5.c:890
+#: ../camel/camel-sasl-digest-md5.c:889
 msgid "Server response did not contain authorization data"
 msgstr "Ð?Ñ?Ð²ÐµÑ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð° Ð½Ðµ Ñ?Ð¾Ð´ÐµÑ?Ð¶Ð¸Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ð¸ Ð¾Ð± Ð°Ð²Ñ?Ð¾Ñ?Ð¸Ð·Ð°Ñ?Ð¸Ð¸"
 
-#: ../camel/camel-sasl-digest-md5.c:908
+#: ../camel/camel-sasl-digest-md5.c:907
 msgid "Server response contained incomplete authorization data"
 msgstr "Ð?Ñ?Ð²ÐµÑ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð° Ñ?Ð¾Ð´ÐµÑ?Ð¶Ð¸Ñ? Ð½ÐµÐ¿Ð¾Ð»Ð½Ñ?Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ? Ð¾Ð± Ð°Ð²Ñ?Ð¾Ñ?Ð¸Ð·Ð°Ñ?Ð¸Ð¸"
 
-#: ../camel/camel-sasl-digest-md5.c:918
+#: ../camel/camel-sasl-digest-md5.c:917
 msgid "Server response does not match"
 msgstr "Ð?Ñ?Ð²ÐµÑ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð° Ð½Ðµ Ñ?Ð¾Ð²Ð¿Ð°Ð´Ð°ÐµÑ?"
 
-#: ../camel/camel-sasl-gssapi.c:64
+#: ../camel/camel-sasl-gssapi.c:72
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:66
+#: ../camel/camel-sasl-gssapi.c:74
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "Ð?Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ðµ Ðº Ñ?ÐµÑ?Ð²ÐµÑ?Ñ? Ð±Ñ?Ð´ÐµÑ? Ð¿Ñ?Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ?Ñ?Ñ?Ñ? Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸ÐµÐ¼ Kerberos 5."
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:168
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -1933,11 +2025,11 @@ msgstr ""
 "Ð£ÐºÐ°Ð·Ð°Ð½Ð½Ñ?Ð¹ Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÑ?Ñ?Ñ? Ð¿Ñ?ÐµÐ´Ð¾Ñ?Ñ?Ð°Ð²Ð»ÐµÐ½Ð½Ñ?Ð¼Ð¸ Ñ?Ñ?ÐµÐ´Ñ?Ñ?Ð²Ð°Ð¼Ð¸, Ð»Ð¸Ð±Ð¾ Ð½Ðµ "
 "Ñ?Ð°Ñ?Ð¿Ð¾Ð·Ð½Ð°ÐµÑ?Ñ?Ñ? Ð² Ñ?Ñ?Ð¾Ð¹ Ñ?ÐµÐ°Ð»Ð¸Ð·Ð°Ñ?Ð¸Ð¸."
 
-#: ../camel/camel-sasl-gssapi.c:169
+#: ../camel/camel-sasl-gssapi.c:173
 msgid "The provided target_name parameter was ill-formed."
 msgstr "Ð?Ñ?ÐµÐ´Ð¾Ñ?Ñ?Ð°Ð²Ð»ÐµÐ½Ð½Ñ?Ð¹ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ? target_name Ñ?Ñ?Ð¾Ñ?Ð¼Ð¸Ñ?Ð¾Ð²Ð°Ð½ Ð½ÐµÐ²ÐµÑ?Ð½Ð¾."
 
-#: ../camel/camel-sasl-gssapi.c:172
+#: ../camel/camel-sasl-gssapi.c:176
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
@@ -1945,7 +2037,7 @@ msgstr ""
 "Ð?Ñ?ÐµÐ´Ð¾Ñ?Ñ?Ð°Ð²Ð»ÐµÐ½Ð½Ñ?Ð¹ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ? target_name Ñ?Ð¾Ð´ÐµÑ?Ð¶Ð¸Ñ? Ð½ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ð¸Ð»Ð¸ Ð½ÐµÐ¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÐ¼Ñ?Ð¹ "
 "Ñ?Ð¸Ð¿ Ð¸Ð¼ÐµÐ½Ð¸."
 
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../camel/camel-sasl-gssapi.c:180
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -1953,7 +2045,7 @@ msgstr ""
 "input_token Ñ?Ð¾Ð´ÐµÑ?Ð¶Ð¸Ñ? Ð½Ðµ Ñ?Ð°ÐºÑ?Ñ? Ð¿Ñ?Ð¸Ð²Ñ?Ð·ÐºÑ? Ðº ÐºÐ°Ð½Ð°Ð»Ð°Ð¼, ÐºÐ°Ðº Ñ?ÐºÐ°Ð·Ð°Ð½Ð¾ Ð² Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ðµ "
 "input_chan_bindings."
 
-#: ../camel/camel-sasl-gssapi.c:181
+#: ../camel/camel-sasl-gssapi.c:185
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
@@ -1961,7 +2053,7 @@ msgstr ""
 "input_token Ñ?Ð¾Ð´ÐµÑ?Ð¶Ð¸Ñ? Ð½ÐµÐ²ÐµÑ?Ð½Ñ?Ñ? Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ñ?, Ð¸Ð»Ð¸ Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ñ?, ÐºÐ¾Ñ?Ð¾Ñ?Ð°Ñ? Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ? Ð±Ñ?Ñ?Ñ? "
 "Ð¿Ñ?Ð¾Ð²ÐµÑ?ÐµÐ½Ð°."
 
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../camel/camel-sasl-gssapi.c:189
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -1969,51 +2061,33 @@ msgstr ""
 "Ð?Ñ?ÐµÐ´Ð¾Ñ?Ñ?Ð°Ð²Ð»ÐµÐ½Ð½Ñ?Ðµ Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?ÐµÐ½Ð¸Ñ? Ð±Ñ?Ð»Ð¸ Ð½Ðµ Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ñ?ÐµÐ»Ñ?Ð½Ñ? Ð´Ð»Ñ? Ð¸Ð½Ð¸Ñ?Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ?Ð¸Ð¸ "
 "ÐºÐ¾Ð½Ñ?ÐµÐºÑ?Ñ?Ð°, Ð»Ð¸Ð±Ð¾ Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?Ñ?Ð¸Ðº Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?ÐµÐ½Ð¸Ñ? Ð½Ðµ Ñ?Ñ?Ñ?Ð»Ð°ÐµÑ?Ñ?Ñ? Ð½Ð° Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?ÐµÐ½Ð¸Ñ?."
 
-#: ../camel/camel-sasl-gssapi.c:190
+#: ../camel/camel-sasl-gssapi.c:194
 msgid "The supplied context handle did not refer to a valid context."
 msgstr ""
 "Ð£ÐºÐ°Ð·Ð°Ð½Ð½Ñ?Ð¹ Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?Ñ?Ð¸Ðº ÐºÐ¾Ð½Ñ?ÐµÐºÑ?Ñ?Ð° Ð½Ðµ Ñ?Ñ?Ñ?Ð»Ð°ÐµÑ?Ñ?Ñ? Ð½Ð° Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ñ?ÐµÐ»Ñ?Ð½Ñ?Ð¹ ÐºÐ¾Ð½Ñ?ÐµÐºÑ?Ñ?."
 
-#: ../camel/camel-sasl-gssapi.c:193
+#: ../camel/camel-sasl-gssapi.c:197
 msgid "The consistency checks performed on the input_token failed."
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ñ?Ð¾Ð²ÐµÑ?ÐºÐ¸ Ñ?ÐµÐ»Ð¾Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸ Ñ?Ð»ÐµÐ¼ÐµÐ½Ñ?Ð° input_token."
 
-#: ../camel/camel-sasl-gssapi.c:196
+#: ../camel/camel-sasl-gssapi.c:200
 msgid "The consistency checks performed on the credential failed."
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ñ?Ð¾Ð²ÐµÑ?ÐºÐ¸ Ñ?ÐµÐ»Ð¾Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸ Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?ÐµÐ½Ð¸Ð¹."
 
-#: ../camel/camel-sasl-gssapi.c:199
+#: ../camel/camel-sasl-gssapi.c:203
 msgid "The referenced credentials have expired."
 msgstr "Ð¡Ñ?Ð¾Ðº Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ñ? Ñ?Ð¿Ð¾Ð¼Ñ?Ð½Ñ?Ñ?Ñ?Ñ? Ñ?Ð´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?ÐµÐ½Ð¸Ð¹ Ð¸Ñ?Ñ?Ñ?Ðº."
 
-#: ../camel/camel-sasl-gssapi.c:205 ../camel/camel-sasl-gssapi.c:253
-#: ../camel/camel-sasl-gssapi.c:289 ../camel/camel-sasl-gssapi.c:304
-#: ../camel/camel-sasl-kerberos4.c:231
-#: ../camel/providers/imap/camel-imap-store.c:1273
+#: ../camel/camel-sasl-gssapi.c: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
 msgid "Bad authentication response from server."
 msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ð¾Ñ?Ð²ÐµÑ? Ð¾Ñ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð° Ð¿Ñ?Ð¸ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ð¸."
 
-#: ../camel/camel-sasl-gssapi.c:314
+#: ../camel/camel-sasl-gssapi.c:383
 msgid "Unsupported security layer."
 msgstr "Ð?ÐµÐ¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÐ¼Ñ?Ð¹ Ñ?Ñ?Ð¾Ð²ÐµÐ½Ñ? Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸."
 
-#: ../camel/camel-sasl-kerberos4.c:47
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: ../camel/camel-sasl-kerberos4.c:49
-msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "Ð?Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ðµ Ðº Ñ?ÐµÑ?Ð²ÐµÑ?Ñ? Ð±Ñ?Ð´ÐµÑ? Ð¿Ñ?Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ?Ñ?Ñ?Ñ? Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸ÐµÐ¼ Kerberos 4."
-
-#: ../camel/camel-sasl-kerberos4.c:174
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð±Ð¸Ð»ÐµÑ? Kerberos:\n"
-"%s"
-
 #: ../camel/camel-sasl-login.c:36
 msgid "Login"
 msgstr "Ð ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ñ?"
@@ -2024,7 +2098,7 @@ msgstr ""
 "Ð?Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ðµ Ðº Ñ?ÐµÑ?Ð²ÐµÑ?Ñ? Ð±Ñ?Ð´ÐµÑ? Ð¿Ñ?Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ?Ñ?Ñ?Ñ? Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸ÐµÐ¼ Ð½ÐµÐ·Ð°Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð½Ð¾Ð³Ð¾ "
 "Ð¿Ð°Ñ?Ð¾Ð»Ñ?."
 
-#: ../camel/camel-sasl-login.c:135
+#: ../camel/camel-sasl-login.c:134
 msgid "Unknown authentication state."
 msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ð¾Ðµ Ñ?Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ðµ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ð¸."
 
@@ -2064,27 +2138,27 @@ msgstr "POP Ð´Ð¾ SMTP Ð°Ð²Ñ?Ð¾Ñ?Ð¸Ð·Ð°Ñ?Ð¸Ñ?, Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ñ?Ñ? Ð½ÐµÐ¸Ð·Ð²ÐµÑ?
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP Ð´Ð¾ SMTP, Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ñ?Ñ? Ð½Ðµ-POP Ð¸Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ðº"
 
-#: ../camel/camel-search-private.c:149
+#: ../camel/camel-search-private.c:147
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Ð¡Ð±Ð¾Ð¹ ÐºÐ¾Ð¼Ð¿Ð¸Ð»Ñ?Ñ?Ð¸Ð¸ Ñ?ÐµÐ³Ñ?Ð»Ñ?Ñ?Ð½Ð¾Ð³Ð¾ Ð²Ñ?Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ?: %s: %s"
 
-#: ../camel/camel-service.c:270
+#: ../camel/camel-service.c:265
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL Â«%sÂ» Ð½Ñ?Ð¶Ð´Ð°ÐµÑ?Ñ?Ñ? Ð² ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ?Ðµ Ð¸Ð¼ÐµÐ½Ð¸ Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»Ñ?"
 
-#: ../camel/camel-service.c:274
+#: ../camel/camel-service.c:269
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL Â«%sÂ» Ð½Ñ?Ð¶Ð´Ð°ÐµÑ?Ñ?Ñ? Ð² ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ?Ðµ Ñ?Ð¾Ñ?Ñ?Ð°"
 
-#: ../camel/camel-service.c:278
+#: ../camel/camel-service.c:273
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL Â«%sÂ» Ð½Ñ?Ð¶Ð´Ð°ÐµÑ?Ñ?Ñ? Ð² ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ?Ðµ Ð¿Ñ?Ñ?Ð¸"
 
-#: ../camel/camel-session.c:308
+#: ../camel/camel-session.c:305
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2093,215 +2167,215 @@ msgstr ""
 "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? ÐºÐ°Ñ?Ð°Ð»Ð¾Ð³ %s:\n"
 "%s"
 
-#: ../camel/camel-session.c:483
+#: ../camel/camel-session.c:477
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "Ð?Ð²ÐµÐ´Ð¸Ñ?Ðµ Ð¿Ð°Ñ?Ð¾Ð»Ñ? %s Ð´Ð»Ñ? %s Ð½Ð° Ñ?Ð·Ð»Ðµ %s."
 
-#: ../camel/camel-session.c:822
+#: ../camel/camel-session.c:815
 msgid "Camel session doesn't support forwarding of a message."
 msgstr "Ð¡ÐµÐ°Ð½Ñ? camel Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÑ? Ð¿ÐµÑ?ÐµÑ?Ñ?Ð»ÐºÑ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ð¹."
 
-#: ../camel/camel-smime-context.c:444 ../camel/camel-smime-context.c:993
+#: ../camel/camel-smime-context.c:447 ../camel/camel-smime-context.c:1012
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð½Ð°Ð¹Ñ?Ð¸ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð´Ð»Ñ? Â«%sÂ»"
 
-#: ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:453
 msgid "Cannot create CMS message"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ CMS"
 
-#: ../camel/camel-smime-context.c:455
+#: ../camel/camel-smime-context.c:458
 msgid "Cannot create CMS signed data"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? CMS signedData"
 
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot attach CMS signed data"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð²Ð»Ð¾Ð¶Ð¸Ñ?Ñ? CMS signedData"
 
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:471
 msgid "Cannot attach CMS data"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð²Ð»Ð¾Ð¶Ð¸Ñ?Ñ? CMS data"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:477
 msgid "Cannot create CMS Signer information"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? CMS SignerInfo"
 
-#: ../camel/camel-smime-context.c:480
+#: ../camel/camel-smime-context.c:483
 msgid "Cannot find certificate chain"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð½Ð°Ð¹Ñ?Ð¸ Ñ?ÐµÐ¿Ð¾Ñ?ÐºÑ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ð²"
 
-#: ../camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:489
 msgid "Cannot add CMS Signing time"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? CMS SigningTime"
 
-#: ../camel/camel-smime-context.c:508 ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:511 ../camel/camel-smime-context.c:523
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð¸Ñ? Ð´Ð»Ñ? Â«%sÂ» Ð½Ðµ Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?ÐµÑ?"
 
-#: ../camel/camel-smime-context.c:527
+#: ../camel/camel-smime-context.c:530
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ð°Ñ?Ñ?Ð¸Ð±Ñ?Ñ? SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:532
+#: ../camel/camel-smime-context.c:535
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ð°Ñ?Ñ?Ð¸Ð±Ñ?Ñ? MS SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:537
+#: ../camel/camel-smime-context.c:540
 msgid "Cannot add encryption certificate"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð¸Ñ?"
 
-#: ../camel/camel-smime-context.c:543
+#: ../camel/camel-smime-context.c:546
 msgid "Cannot add CMS Signer information"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? CMS SignerInfo"
 
-#: ../camel/camel-smime-context.c:613 ../camel/camel-smime-context.c:1065
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:1084
 msgid "Cannot create encoder context"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? ÐºÐ¾Ð½Ñ?ÐµÐºÑ?Ñ? ÐºÐ¾Ð´Ð¸Ñ?Ð¾Ð²Ñ?Ð¸ÐºÐ°"
 
-#: ../camel/camel-smime-context.c:619
+#: ../camel/camel-smime-context.c:622
 msgid "Failed to add data to CMS encoder"
-msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð´Ð¾Ð±Ð°Ð²Ñ?Ñ? Ð´Ð°Ð½Ð½Ñ?Ðµ Ðº ÐºÐ¾Ð´Ð¸Ñ?Ð¾Ð²Ñ?Ð¸ÐºÑ? CMS"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ð´Ð°Ð½Ð½Ñ?Ðµ Ðº ÐºÐ¾Ð´Ð¸Ñ?Ð¾Ð²Ñ?Ð¸ÐºÑ? CMS"
 
-#: ../camel/camel-smime-context.c:624 ../camel/camel-smime-context.c:1082
+#: ../camel/camel-smime-context.c:627 ../camel/camel-smime-context.c:1101
 msgid "Failed to encode data"
 msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° ÐºÐ¾Ð´Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ñ? Ð´Ð°Ð½Ð½Ñ?Ñ?"
 
-#: ../camel/camel-smime-context.c:697
+#: ../camel/camel-smime-context.c:700
 msgid "Unverified"
 msgstr "Ð?ÐµÐ¿Ñ?Ð¾Ð²ÐµÑ?ÐµÐ½Ð¾"
 
-#: ../camel/camel-smime-context.c:699
+#: ../camel/camel-smime-context.c:702
 msgid "Good signature"
 msgstr "Ð?Ð¾Ð´Ð¿Ð¸Ñ?Ñ? Ð²ÐµÑ?Ð½Ð°"
 
-#: ../camel/camel-smime-context.c:701
+#: ../camel/camel-smime-context.c:704
 msgid "Bad signature"
 msgstr "Ð?Ð¾Ð´Ð¿Ð¸Ñ?Ñ? Ð½ÐµÐ²ÐµÑ?Ð½Ð°"
 
-#: ../camel/camel-smime-context.c:703
+#: ../camel/camel-smime-context.c:706
 msgid "Content tampered with or altered in transit"
 msgstr "Ð¡Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ Ð±Ñ?Ð»Ð¾ Ð¿Ð¾Ð´Ð´ÐµÐ»Ð°Ð½Ð¾ Ð¸Ð»Ð¸ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¾ Ð½Ð° Ð¿Ñ?Ñ?Ð¸"
 
-#: ../camel/camel-smime-context.c:705
+#: ../camel/camel-smime-context.c:708
 msgid "Signing certificate not found"
 msgstr "Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð¸ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½"
 
-#: ../camel/camel-smime-context.c:707
+#: ../camel/camel-smime-context.c:710
 msgid "Signing certificate not trusted"
 msgstr "Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð¸ Ð½ÐµÐ´Ð¾Ñ?Ñ?Ð¾Ð²ÐµÑ?ÐµÐ½"
 
-#: ../camel/camel-smime-context.c:709
+#: ../camel/camel-smime-context.c:712
 msgid "Signature algorithm unknown"
 msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ Ð°Ð»Ð³Ð¾Ñ?Ð¸Ñ?Ð¼ Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð¸"
 
-#: ../camel/camel-smime-context.c:711
+#: ../camel/camel-smime-context.c:714
 msgid "Signature algorithm unsupported"
 msgstr "Ð?ÐµÐ¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÐ¼Ñ?Ð¹ Ð°Ð»Ð³Ð¾Ñ?Ð¸Ñ?Ð¼ Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð¸"
 
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-smime-context.c:716
 msgid "Malformed signature"
 msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ð¾ Ñ?Ñ?Ð¾Ñ?Ð¼Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð½Ð°Ñ? Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ñ?"
 
-#: ../camel/camel-smime-context.c:715
+#: ../camel/camel-smime-context.c:718
 msgid "Processing error"
 msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?ÐºÐ¸"
 
-#: ../camel/camel-smime-context.c:753
+#: ../camel/camel-smime-context.c:772
 msgid "No signed data in signature"
 msgstr "Ð? Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð¸ Ð¾Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ð²Ñ?Ñ?Ñ? Ð´Ð°Ð½Ð½Ñ?Ðµ Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð¸"
 
-#: ../camel/camel-smime-context.c:758
+#: ../camel/camel-smime-context.c:777
 msgid "Digests missing from enveloped data"
 msgstr "Ð? Ð´Ð°Ð½Ð½Ñ?Ñ? ÐºÐ¾Ð½Ð²ÐµÑ?Ñ?Ð° Ð¾Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ð²Ñ?ÐµÑ? Ñ?Ð²Ð¾Ð´ÐºÐ°"
 
-#: ../camel/camel-smime-context.c:771 ../camel/camel-smime-context.c:781
+#: ../camel/camel-smime-context.c:790 ../camel/camel-smime-context.c:800
 msgid "Cannot calculate digests"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð²Ñ?Ñ?Ð¸Ñ?Ð»Ð¸Ñ?Ñ? Ð´Ð°Ð¹Ð´Ð¶ÐµÑ?Ñ?Ñ?"
 
-#: ../camel/camel-smime-context.c:788 ../camel/camel-smime-context.c:792
+#: ../camel/camel-smime-context.c:807 ../camel/camel-smime-context.c:811
 msgid "Cannot set message digests"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð¸Ñ?Ñ? Ð´Ð°Ð¹Ð´Ð¶ÐµÑ?Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ?"
 
-#: ../camel/camel-smime-context.c:802 ../camel/camel-smime-context.c:807
+#: ../camel/camel-smime-context.c:821 ../camel/camel-smime-context.c:826
 msgid "Certificate import failed"
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð¸Ð¼Ð¿Ð¾Ñ?Ñ?Ð° Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°"
 
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:836
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr ""
 "Ð¡Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ Ñ?Ð¾Ñ?Ñ?Ð¾Ð¸Ñ? Ñ?Ð¾Ð»Ñ?ÐºÐ¾ Ð¸Ð· Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ð², Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ñ?"
 
-#: ../camel/camel-smime-context.c:820
+#: ../camel/camel-smime-context.c:839
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "Ð? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ð¸ Ñ?Ð¾Ð»Ñ?ÐºÐ¾ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ñ?, Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ñ? Ð¸Ð¼Ð¿Ð¾Ñ?Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ñ? Ð¸ Ð¿Ñ?Ð¾Ð²ÐµÑ?ÐµÐ½Ñ?"
 
-#: ../camel/camel-smime-context.c:824
+#: ../camel/camel-smime-context.c:843
 msgid "Cannot find signature digests"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð½Ð°Ð¹Ñ?Ð¸ Ð´Ð°Ð¹Ð´Ð¶ÐµÑ?Ñ?Ñ? Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð¸"
 
-#: ../camel/camel-smime-context.c:840
+#: ../camel/camel-smime-context.c:859
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Ð?Ð¾Ð´Ð¿Ð¸Ñ?Ð°Ð½Ð¾: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:941 ../camel/camel-smime-context.c:1165
+#: ../camel/camel-smime-context.c:960 ../camel/camel-smime-context.c:1184
 msgid "Decoder failed"
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð´ÐµÐºÐ¾Ð´ÐµÑ?Ð°"
 
-#: ../camel/camel-smime-context.c:1000
+#: ../camel/camel-smime-context.c:1019
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð½Ð°Ð¹Ñ?Ð¸ Ð¾Ð±Ñ?Ð¸Ð¹ Ð°Ð»Ð³Ð¾Ñ?Ð¸Ñ?Ð¼ Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð¸Ñ?"
 
-#: ../camel/camel-smime-context.c:1008
+#: ../camel/camel-smime-context.c:1027
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð°Ñ?Ð¿Ñ?ÐµÐ´ÐµÐ»Ð¸Ñ?Ñ? Ñ?Ð»Ð¾Ñ? Ð´Ð»Ñ? ÐºÐ»Ñ?Ñ?Ð° Ð¾Ð±Ñ?ÐµÐ³Ð¾ Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð¸Ñ?"
 
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1038
 msgid "Cannot create CMS Message"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ CMS"
 
-#: ../camel/camel-smime-context.c:1025
+#: ../camel/camel-smime-context.c:1044
 msgid "Cannot create CMS Enveloped data"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? CMS EnvelopedData"
 
-#: ../camel/camel-smime-context.c:1031
+#: ../camel/camel-smime-context.c:1050
 msgid "Cannot attach CMS Enveloped data"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð²Ð»Ð¾Ð¶Ð¸Ñ?Ñ? CMS EnvelopedData"
 
-#: ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:1056
 msgid "Cannot attach CMS data object"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð²Ð»Ð¾Ð¶Ð¸Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ? CMS data"
 
-#: ../camel/camel-smime-context.c:1046
+#: ../camel/camel-smime-context.c:1065
 msgid "Cannot create CMS Recipient information"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? Ñ?Ð²ÐµÐ´ÐµÐ½Ð¸Ñ? CMS RecipientInfo"
 
-#: ../camel/camel-smime-context.c:1051
+#: ../camel/camel-smime-context.c:1070
 msgid "Cannot add CMS Recipient information"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ñ?Ð²ÐµÐ´ÐµÐ½Ð¸Ñ? CMS RecipientInfo"
 
-#: ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:1095
 msgid "Failed to add data to encoder"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ð´Ð°Ð½Ð½Ñ?Ðµ Ðº ÐºÐ¾Ð´Ð¸Ñ?Ð¾Ð²Ñ?Ð¸ÐºÑ?"
 
-#: ../camel/camel-smime-context.c:1172
+#: ../camel/camel-smime-context.c:1191
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME Decrypt: Ð?Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ð·Ð°Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð½Ð¾Ð³Ð¾ Ñ?Ð¾Ð´ÐµÑ?Ð¶Ð¸Ð¼Ð¾Ð³Ð¾"
 
-#: ../camel/camel-smime-context.c:1199
+#: ../camel/camel-smime-context.c:1219
 msgid "import keys: unimplemented"
 msgstr "Ð¸Ð¼Ð¿Ð¾Ñ?Ñ? ÐºÐ»Ñ?Ñ?ÐµÐ¹: Ð½Ðµ Ñ?ÐµÐ°Ð»Ð¸Ð·Ð¾Ð²Ð°Ð½Ð¾"
 
-#: ../camel/camel-smime-context.c:1207
+#: ../camel/camel-smime-context.c:1227
 msgid "export keys: unimplemented"
 msgstr "Ñ?ÐºÑ?Ð¿Ð¾Ñ?Ñ? ÐºÐ»Ñ?Ñ?ÐµÐ¹: Ð½Ðµ Ñ?ÐµÐ°Ð»Ð¸Ð·Ð¾Ð²Ð°Ð½Ð¾"
 
 #: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:174
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:171
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ?: Ð½ÐµÐ´Ð¾Ð¿Ñ?Ñ?Ñ?Ð¸Ð¼Ð°Ñ? Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ? Ð² Ñ?Ñ?Ð¾Ð¼ Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ"
 
@@ -2319,146 +2393,29 @@ msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ?: Ð½ÐµÐ´Ð¾Ð¿Ñ?Ñ?Ñ?Ð¸Ð¼Ð°Ñ?
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ?: %s: Ð¿Ð°Ð¿ÐºÐ° Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?ÐµÑ?"
 
-#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:384
+#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:377
 #: ../camel/providers/local/camel-maildir-store.c:219
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð´Ð°Ð»Ð¸Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ?: %s: Ð½ÐµÐ´Ð¾Ð¿Ñ?Ñ?Ñ?Ð¸Ð¼Ð°Ñ? Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?"
 
-#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:421
+#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:414
 #: ../camel/providers/local/camel-maildir-store.c:291
 #, 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:899 ../camel/camel-vtrash-folder.c:54
-#: ../camel/providers/imap/camel-imap-store.c:1061
+#: ../camel/camel-store.c:900 ../camel/camel-vtrash-folder.c:54
 msgid "Trash"
 msgstr "Ð?Ð¾Ñ?Ð·Ð¸Ð½Ð°"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:902 ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-store.c:903 ../camel/camel-vtrash-folder.c:56
 msgid "Junk"
 msgstr "Ð¡Ð¿Ð°Ð¼"
 
-#: ../camel/camel-tcp-stream-openssl.c:572
-msgid "Unable to get issuer's certificate"
-msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð¸ÐºÐ°"
-
-#: ../camel/camel-tcp-stream-openssl.c:574
-msgid "Unable to get Certificate Revocation List"
-msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ñ?Ð¿Ð¸Ñ?Ð¾Ðº Ð°Ð½Ð½Ñ?Ð»Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð½Ñ?Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ð²"
-
-#: ../camel/camel-tcp-stream-openssl.c:576
-msgid "Unable to decrypt certificate signature"
-msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð´ÐµÐºÐ¾Ð´Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°"
-
-#: ../camel/camel-tcp-stream-openssl.c:578
-msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð´ÐµÐºÐ¾Ð´Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ñ? Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð°Ð½Ð½Ñ?Ð»Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð½Ñ?Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ð²"
-
-#: ../camel/camel-tcp-stream-openssl.c:580
-msgid "Unable to decode issuer's public key"
-msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð´ÐµÐºÐ¾Ð´Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ñ?Ð±Ð»Ð¸Ñ?Ð½Ñ?Ð¹ ÐºÐ»Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð¸ÐºÐ°"
-
-#: ../camel/camel-tcp-stream-openssl.c:582
-msgid "Certificate signature failure"
-msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° Ð² Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð¸ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°"
-
-#: ../camel/camel-tcp-stream-openssl.c:584
-msgid "Certificate Revocation List signature failure"
-msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° Ð² Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð¸ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð°Ð½Ð½Ñ?Ð»Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð½Ñ?Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ð²"
-
-#: ../camel/camel-tcp-stream-openssl.c:586
-msgid "Certificate not yet valid"
-msgstr "Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð¿Ð¾ÐºÐ° ÐµÑ?Ðµ Ð½ÐµÐºÐ¾Ñ?Ñ?ÐµÐºÑ?ÐµÐ½"
-
-#: ../camel/camel-tcp-stream-openssl.c:588
-msgid "Certificate has expired"
-msgstr "Ð?Ñ?Ñ?ÐµÐº Ñ?Ñ?Ð¾Ðº Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°"
-
-#: ../camel/camel-tcp-stream-openssl.c:590
-msgid "CRL not yet valid"
-msgstr "CRL Ð¿Ð¾ÐºÐ° ÐµÑ?Ðµ Ð½ÐµÐºÐ¾Ñ?Ñ?ÐµÐºÑ?ÐµÐ½"
-
-#: ../camel/camel-tcp-stream-openssl.c:592
-msgid "CRL has expired"
-msgstr "Ð?Ñ?Ñ?ÐµÐº Ñ?Ñ?Ð¾Ðº Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ñ? CRL"
-
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Error in CRL"
-msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° Ð² CRL"
-
-#: ../camel/camel-tcp-stream-openssl.c:599
-msgid "Out of memory"
-msgstr "Ð?ÐµÐ´Ð¾Ñ?Ñ?Ð°Ñ?Ð¾Ñ?Ð½Ð¾ Ð¿Ð°Ð¼Ñ?Ñ?Ð¸"
-
-#: ../camel/camel-tcp-stream-openssl.c:601
-msgid "Zero-depth self-signed certificate"
-msgstr "Ð¡Ð°Ð¼Ð¾Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð°Ð½Ð½Ñ?Ð¹ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð½Ñ?Ð»ÐµÐ²Ð¾Ð¹ Ð³Ð»Ñ?Ð±Ð¸Ð½Ñ?"
-
-#: ../camel/camel-tcp-stream-openssl.c:603
-msgid "Self-signed certificate in chain"
-msgstr "Ð¡Ð°Ð¼Ð¾Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð°Ð½Ð½Ñ?Ð¹ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð² Ñ?ÐµÐ¿Ð¾Ñ?ÐºÐµ"
-
-#: ../camel/camel-tcp-stream-openssl.c:605
-msgid "Unable to get issuer's certificate locally"
-msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð»Ð¾ÐºÐ°Ð»Ñ?Ð½Ð¾ Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð¸ÐºÐ°"
-
-#: ../camel/camel-tcp-stream-openssl.c:607
-msgid "Unable to verify leaf signature"
-msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ñ? Ð»Ð¸Ñ?Ñ?Ð¾Ð²Ñ?Ñ? Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ñ?"
-
-#: ../camel/camel-tcp-stream-openssl.c:609
-msgid "Certificate chain too long"
-msgstr "Ð?Ð¾Ñ?Ð»ÐµÐ´Ð¾Ð²Ð°Ñ?ÐµÐ»Ñ?Ð½Ð¾Ñ?Ñ?Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð° Ñ?Ð»Ð¸Ñ?ÐºÐ¾Ð¼ Ð´Ð»Ð¸Ð½Ð½Ð°Ñ?"
-
-#: ../camel/camel-tcp-stream-openssl.c:611
-msgid "Certificate Revoked"
-msgstr "Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð°Ð½Ð½Ñ?Ð»Ð¸Ñ?Ð¾Ð²Ð°Ð½"
-
-#: ../camel/camel-tcp-stream-openssl.c:613
-msgid "Invalid Certificate Authority (CA)"
-msgstr "Ð?ÐµÐºÐ¾Ñ?Ñ?ÐµÐºÑ?Ð½Ð°Ñ? Ð°Ð²Ñ?Ð¾Ñ?Ð¸Ð·Ð°Ñ?Ð¸Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð° (CA)"
-
-#: ../camel/camel-tcp-stream-openssl.c:615
-msgid "Path length exceeded"
-msgstr "Ð?Ñ?ÐµÐ²Ñ?Ñ?ÐµÐ½Ð° Ð´Ð»Ð¸Ð½Ð° Ð¿Ñ?Ñ?Ð¸"
-
-#: ../camel/camel-tcp-stream-openssl.c:617
-msgid "Invalid purpose"
-msgstr "Ð?ÐµÐºÐ¾Ñ?Ñ?ÐµÐºÑ?Ð½Ð°Ñ? Ð¿Ñ?Ð¸Ñ?Ð¸Ð½Ð°"
-
-#: ../camel/camel-tcp-stream-openssl.c:619
-msgid "Certificate untrusted"
-msgstr "Ð?ÐµÐ´Ð¾Ð²ÐµÑ?Ð¸Ñ?ÐµÐ»Ñ?Ð½Ñ?Ð¹ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?"
-
-#: ../camel/camel-tcp-stream-openssl.c:621
-msgid "Certificate rejected"
-msgstr "Ð?Ñ?ÐºÐ»Ð¾Ð½ÐµÐ½Ð½Ñ?Ð¹ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?"
-
-#: ../camel/camel-tcp-stream-openssl.c:624
-msgid "Subject/Issuer mismatch"
-msgstr "Ð?ÐµÑ?Ð¾Ð¾Ñ?Ð²ÐµÑ?Ñ?Ñ?Ð²Ð¸Ðµ Ð¢ÐµÐ¼Ñ?/Ð?Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð¸ÐºÐ°"
-
-#: ../camel/camel-tcp-stream-openssl.c:626
-msgid "AKID/SKID mismatch"
-msgstr "Ð?ÐµÑ?Ð¾Ð¾Ñ?Ð²ÐµÑ?Ñ?Ñ?Ð²Ð¸Ðµ AKID/SKID "
-
-#: ../camel/camel-tcp-stream-openssl.c:628
-msgid "AKID/Issuer serial mismatch"
-msgstr "Ð?Ð¾Ñ?Ð»ÐµÐ´Ð¾Ð²Ð°Ñ?ÐµÐ»Ñ?Ð½Ð¾Ðµ Ð½ÐµÑ?Ð¾Ð¾Ñ?Ð²ÐµÑ?Ñ?Ñ?Ð²Ð¸Ðµ AKID/Ð?Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð¸ÐºÐ°"
-
-#: ../camel/camel-tcp-stream-openssl.c:630
-msgid "Key usage does not support certificate signing"
-msgstr "Ð?Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸Ðµ ÐºÐ»Ñ?Ñ?Ð° Ð½Ðµ Ð¾Ð±ÐµÑ?Ð¿ÐµÑ?Ð¸Ð²Ð°ÐµÑ? Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶ÐºÑ? Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð¸ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð° "
-
-#: ../camel/camel-tcp-stream-openssl.c:633
-msgid "Error in application verification"
-msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¸ Ð¿Ñ?Ð¾Ð²ÐµÑ?ÐºÐµ Ð¿Ñ?Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ?"
-
-#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-ssl.c:870
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2471,34 +2428,16 @@ msgstr ""
 "Ð?Ñ?Ð¿ÐµÑ?Ð°Ñ?Ð¾Ðº:         %s\n"
 "Ð?Ð¾Ð´Ð¿Ð¸Ñ?Ñ?:           %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-ssl.c:876
 msgid "GOOD"
 msgstr "GOOD"
 
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-ssl.c:876
 msgid "BAD"
 msgstr "BAD"
 
-#: ../camel/camel-tcp-stream-openssl.c:708
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
-msgstr ""
-"Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð¾Ñ? %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"Ð?Ñ?Ð¸Ð½Ñ?Ñ?Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð² Ð»Ñ?Ð±Ð¾Ð¼ Ñ?Ð»Ñ?Ñ?Ð°Ðµ?"
-
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:890
+#: ../camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2513,7 +2452,7 @@ msgstr ""
 "\n"
 "Ð?Ñ?Ñ? Ñ?Ð°Ð²Ð½Ð¾ Ð¿Ñ?Ð¸Ð½Ñ?Ñ?Ñ??"
 
-#: ../camel/camel-tcp-stream-ssl.c:934
+#: ../camel/camel-tcp-stream-ssl.c:924
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2522,7 +2461,7 @@ msgstr ""
 "Ð?Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð° Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ð¼: %s\n"
 "Ð?Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð¸Ðº: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:986
+#: ../camel/camel-tcp-stream-ssl.c:976
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2531,7 +2470,7 @@ msgstr ""
 "Ð?ÐµÐºÐ¾Ñ?Ñ?ÐµÐºÑ?Ð½Ñ?Ð¹ Ð´Ð¾Ð¼ÐµÐ½ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°: %s\n"
 "Ð?Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð¸Ðº: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1004
+#: ../camel/camel-tcp-stream-ssl.c:994
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2540,7 +2479,7 @@ msgstr ""
 "Ð?Ñ?Ñ?ÐµÐº Ñ?Ñ?Ð¾Ðº Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°: %s\n"
 "Ð?Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð¸Ðº: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1021
+#: ../camel/camel-tcp-stream-ssl.c:1011
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2554,31 +2493,31 @@ msgstr ""
 msgid "Could not parse URL '%s'"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð°Ð·Ð¾Ð±Ñ?Ð°Ñ?Ñ? URL Â«%sÂ»"
 
-#: ../camel/camel-vee-folder.c:582
+#: ../camel/camel-vee-folder.c:577
 #, c-format
 msgid "Error storing '%s': %s"
 msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¸Ð¸ Â«%sÂ»: %s"
 
-#: ../camel/camel-vee-folder.c:660
+#: ../camel/camel-vee-folder.c:654
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Ð?ÐµÑ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ? %s Ð² %s"
 
-#: ../camel/camel-vee-folder.c:820 ../camel/camel-vee-folder.c:826
+#: ../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-store.c:114 ../camel/camel-vee-store.c:115
-#: ../camel/camel-vee-store.c:360
+#: ../camel/camel-vee-store.c:113 ../camel/camel-vee-store.c:114
+#: ../camel/camel-vee-store.c:353
 msgid "Unmatched"
 msgstr "Ð?Ñ?Ð¾Ñ?ÐµÐµ"
 
-#: ../camel/camel-vee-store.c:407
+#: ../camel/camel-vee-store.c:400
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð´Ð°Ð»Ð¸Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ?: %s: Ð½ÐµÑ? Ñ?Ð°ÐºÐ¾Ð¹ Ð¿Ð°Ð¿ÐºÐ¸"
 
-#: ../camel/camel-vee-store.c:429
+#: ../camel/camel-vee-store.c:422
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿ÐµÑ?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ?: %s: Ð½ÐµÑ? Ñ?Ð°ÐºÐ¾Ð¹ Ð¿Ð°Ð¿ÐºÐ¸"
@@ -2591,7 +2530,7 @@ msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿ÐµÑ?ÐµÐ¼ÐµÑ?Ñ?Ð¸Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ? Ð² ÐºÐ¾Ñ?
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿ÐµÑ?ÐµÐ¼ÐµÑ?Ñ?Ð¸Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ? Ð² Ð¿Ð°Ð¿ÐºÑ? \"Ð¡Ð¿Ð°Ð¼\""
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2600,20 +2539,21 @@ msgstr ""
 "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ: %s\n"
 "  %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
-#: ../camel/providers/local/camel-maildir-folder.c:248
-#: ../camel/providers/local/camel-maildir-folder.c:275
-#: ../camel/providers/local/camel-mbox-folder.c:347
-#: ../camel/providers/local/camel-mbox-folder.c:399
-#: ../camel/providers/local/camel-mh-folder.c:214
+#: ../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:148
-#: ../camel/providers/imap4/camel-imap4-folder.c:821
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:251
-#: ../camel/providers/nntp/camel-nntp-folder.c:411
+#: ../camel/providers/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
@@ -2621,12 +2561,12 @@ msgstr "Ð?ÐµÑ? Ñ?Ð°ÐºÐ¾Ð³Ð¾ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ?"
 msgid "User canceled"
 msgstr "Ð?Ñ?Ð¼ÐµÐ½ÐµÐ½Ð¾ Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»ÐµÐ¼"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
-#: ../camel/providers/imap4/camel-imap4-folder.c:826
+#: ../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:168
-#: ../camel/providers/nntp/camel-nntp-folder.c:177
-#: ../camel/providers/nntp/camel-nntp-folder.c:253
+#: ../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
@@ -2636,196 +2576,207 @@ msgstr "Ð?Ñ?Ð¼ÐµÐ½ÐµÐ½Ð¾ Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»ÐµÐ¼"
 msgid "Cannot get message %s: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ %s: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:180
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2304
-#: ../camel/providers/imap4/camel-imap4-folder.c:844
+#: ../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:192
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:199
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1819
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1870
+#: ../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:892
-#: ../camel/providers/imap/camel-imap-folder.c:265
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:982
+#: ../camel/providers/imap/camel-imap-folder.c:295
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð·Ð°Ð³Ñ?Ñ?Ð·Ð¸Ñ?Ñ? ÐºÑ?Ð°Ñ?ÐºÑ?Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ? Ð¾ %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1152
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1055
+#, 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:1361
-#: ../camel/providers/groupwise/camel-groupwise-store.c:617
-#: ../camel/providers/groupwise/camel-groupwise-store.c:743
-#: ../camel/providers/imap/camel-imap-folder.c:3362
-#: ../camel/providers/imap/camel-imap-folder.c:3438
+#: ../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
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "Ð?Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ðµ ÐºÑ?Ð°Ñ?ÐºÐ¾Ð¹ Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ð¸ Ð¿Ð¾ Ð½Ð¾Ð²Ñ?Ð¼ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ?Ð¼ Ð¸Ð· %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2158
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2201
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2360
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2403
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ Ðº Ð¿Ð°Ð¿ÐºÐµ Â«%sÂ»: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2189
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2391
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:285
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:281
 #, c-format
 msgid "Cannot get folder container %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? ÐºÐ¾Ð½Ñ?ÐµÐ¹Ð½ÐµÑ? Ð¿Ð°Ð¿ÐºÐ¸ %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:349
-#: ../camel/providers/imap4/camel-imap4-journal.c:319
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:343
+#: ../camel/providers/imap4/camel-imap4-journal.c:311
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ Ð² Ð°Ð²Ñ?Ð¾Ð½Ð¾Ð¼Ð½Ð¾Ð¼ Ñ?ÐµÐ¶Ð¸Ð¼Ðµ: ÐºÑ?Ñ? Ð½ÐµÐ´Ð¾Ñ?Ñ?Ñ?Ð¿ÐµÐ½"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:365
-#: ../camel/providers/imap4/camel-imap4-journal.c:335
+#: ../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"
 msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ Ð² Ð°Ð²Ñ?Ð¾Ð½Ð¾Ð¼Ð½Ð¾Ð¼ Ñ?ÐµÐ¶Ð¸Ð¼Ðµ: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
-#: ../camel/providers/imap4/camel-imap4-provider.c:39
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:54
+#: ../camel/providers/imap4/camel-imap4-provider.c:38
 msgid "Checking for new mail"
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?ÐºÐ° Ð½Ð¾Ð²Ð¾Ð¹ Ð¿Ð¾Ñ?Ñ?Ñ?"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
-#: ../camel/providers/hula/camel-hula-provider.c:51
+#: ../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:41
+#: ../camel/providers/imap4/camel-imap4-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
 msgid "C_heck for new messages in all folders"
 msgstr "Ð?_Ñ?Ð¾Ð²ÐµÑ?Ñ?Ñ?Ñ? Ð½Ð¾Ð²Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ñ? Ð²Ð¾ Ð²Ñ?ÐµÑ? Ð¿Ð°Ð¿ÐºÐ°Ñ?"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
 #: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:52
+#: ../camel/providers/imap4/camel-imap4-provider.c:51
+#: ../camel/providers/imapx/camel-imapx-provider.c:72
 #: ../camel/providers/local/camel-local-provider.c:46
 #: ../camel/providers/local/camel-local-provider.c:86
 #: ../camel/providers/local/camel-local-provider.c:106
 msgid "Options"
 msgstr "Ð?Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ?"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:62
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr ""
 "_Ð?Ñ?Ð¸Ð¼ÐµÐ½Ð¸Ñ?Ñ? Ñ?Ð¸Ð»Ñ?Ñ?Ñ?Ñ? Ðº Ð½Ð¾Ð²Ñ?Ð¼ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ?Ð¼ Ð² Ð¿Ð°Ð¿ÐºÐµ \"Ð?Ñ?Ð¾Ð´Ñ?Ñ?Ð¸Ðµ\" Ð½Ð° Ñ?Ñ?Ð¾Ð¼ Ñ?ÐµÑ?Ð²ÐµÑ?Ðµ"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:64
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:63
 msgid "Check new messages for J_unk contents"
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ñ?Ñ?, Ñ?Ð²Ð»Ñ?Ñ?Ñ?Ñ?Ñ? Ð»Ð¸ Ð½Ð¾Ð²Ñ?Ðµ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ? Ñ?Ð¿Ð°Ð¼Ð¾Ð¼"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:65
 #: ../camel/providers/imap/camel-imap-provider.c:74
+#: ../camel/providers/imapx/camel-imapx-provider.c:78
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr ""
 "Ð?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ñ?Ñ?, Ñ?Ð²Ð»Ñ?Ñ?Ñ?Ñ?Ñ? Ð»Ð¸ Ð½Ð¾Ð²Ñ?Ðµ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ? Ñ?Ð¿Ð°Ð¼Ð¾Ð¼, Ñ?Ð¾Ð»Ñ?ÐºÐ¾ Ð² Ð¿Ð°Ð¿ÐºÐµ \"Ð?Ñ?Ð¾Ð´_Ñ?Ñ?Ð¸Ðµ\""
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:68
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:67
 msgid "Automatically synchroni_ze account locally"
 msgstr "Ð?Ð²Ñ?Ð¾Ð¼Ð°Ñ?Ð¸Ñ?ÐµÑ?ÐºÐ¸ Ñ?Ð¸Ð½Ñ?Ñ?Ð¾Ð½Ð¸_Ð·Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ñ?Ñ?ÐµÑ?Ð½Ñ?Ñ? Ð·Ð°Ð¿Ð¸Ñ?Ñ? Ð»Ð¾ÐºÐ°Ð»Ñ?Ð½Ð¾"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:73
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
 msgid "SOAP Settings"
 msgstr "Ð?Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ? SOAP"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:76
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:75
 msgid "Post Office Agent SOAP _Port:"
 msgstr "_Ð?Ð¾Ñ?Ñ? SOAP Ð?Ð³ÐµÐ½Ñ?Ð° Post Office:"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:91
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
 msgid "For accessing Novell GroupWise servers"
 msgstr "Ð?Ð»Ñ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð° Ðº Ñ?ÐµÑ?Ð²ÐµÑ?Ð°Ð¼ Novell Groupwise"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
-#: ../camel/providers/hula/camel-hula-provider.c:95
+#: ../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:84
-#: ../camel/providers/imapp/camel-imapp-provider.c:67
+#: ../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:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:74
 msgid "Password"
 msgstr "Ð?Ð°Ñ?Ð¾Ð»Ñ?"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:108
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
 msgid ""
 "This option will connect to the GroupWise server using a plaintext password."
 msgstr ""
 "Ð?Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ðµ Ðº Ñ?ÐµÑ?Ð²ÐµÑ?Ñ? IMAP Ð±Ñ?Ð´ÐµÑ? Ð¿Ñ?Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ?Ñ?Ñ?Ñ? Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸ÐµÐ¼ "
 "Ð½ÐµÐ·Ð°Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð¿Ð°Ñ?Ð¾Ð»Ñ?."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:104
+#: ../camel/providers/groupwise/camel-groupwise-store.c:102
 msgid "Host or user not available in url"
 msgstr "Ð£Ð·ÐµÐ» Ð¸Ð»Ð¸ Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»Ñ? Ð½ÐµÐ´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ñ? Ð² url"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:207
-#: ../camel/providers/imap/camel-imap-store.c:1357
+#: ../camel/providers/groupwise/camel-groupwise-store.c:197
+#: ../camel/providers/imap/camel-imap-store.c:1356
 msgid "You did not enter a password."
 msgstr "Ð?Ñ? Ð½Ðµ Ð²Ð²ÐµÐ»Ð¸ Ð¿Ð°Ñ?Ð¾Ð»Ñ?."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:303
+#: ../camel/providers/groupwise/camel-groupwise-store.c:312
 msgid "Some features may not work correctly with your current server version"
 msgstr "Ð?ÐµÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ðµ Ñ?Ñ?Ð½ÐºÑ?Ð¸Ð¸ Ð¼Ð¾Ð³Ñ?Ñ? Ñ?Ð°Ð±Ð¾Ñ?Ð°Ñ?Ñ? Ð½ÐµÐºÐ¾Ñ?Ñ?ÐµÐºÑ?Ð½Ð¾ Ñ? Ð²Ð°Ñ?ÐµÐ¹ Ð²ÐµÑ?Ñ?Ð¸ÐµÐ¹ Ñ?ÐµÑ?Ð²ÐµÑ?Ð°"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:524
-#: ../camel/providers/imap/camel-imap-store.c:1849
-#: ../camel/providers/imap/camel-imap-store.c:2047
+#: ../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
 #, c-format
 msgid "No such folder %s"
 msgstr "Ð?ÐµÑ? Ñ?Ð°ÐºÐ¾Ð¹ Ð¿Ð°Ð¿ÐºÐ¸ %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1241
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1201
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? Ð¿Ð°Ð¿ÐºÐ¸ GroupWise Ð² Ð°Ð²Ñ?Ð¾Ð½Ð¾Ð¼Ð½Ð¾Ð¼ Ñ?ÐµÐ¶Ð¸Ð¼Ðµ."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1255
-#: ../camel/providers/imap/camel-imap-store.c:1924
-#: ../camel/providers/imap/camel-imap-store.c:2304
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1215
+#: ../camel/providers/imap/camel-imap-store.c:1954
+#: ../camel/providers/imap/camel-imap-store.c:2334
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "ÐÑ?Ð° Ð¿Ð°Ð¿ÐºÐ° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ? Ñ?Ð¾Ð´ÐµÑ?Ð¶Ð°Ñ?Ñ? Ð¿Ð¾Ð´Ð¿Ð°Ð¿ÐºÐ¸"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1333
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1294
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1317
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿ÐµÑ?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ? Groupwise Â«%sÂ» Ð² Â«%sÂ»"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1391
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:121
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1349
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
 #, c-format
 msgid "GroupWise server %s"
 msgstr "Ð¡ÐµÑ?Ð²ÐµÑ? GroupWise %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1393
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1351
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "Ð¡ÐµÑ?Ð²Ð¸Ñ? GroupWise Ð´Ð»Ñ? %s Ð½Ð° %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:123
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:122
 #, c-format
 msgid "GroupWise mail delivery via %s"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²ÐºÐ° Ð¿Ð¾Ñ?Ñ?Ñ? Groupwise Ñ? Ð¿Ð¾Ð¼Ð¾Ñ?Ñ?Ñ? %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:167
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:164
 msgid "Sending Message"
 msgstr "Ð?Ñ?Ð¿Ñ?Ð°Ð²ÐºÐ° Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ?"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:221
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:212
 msgid ""
 "You have exceeded this account's storage limit. Your messages are queued in "
 "your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
@@ -2835,95 +2786,102 @@ msgstr ""
 "Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ð»ÐµÐ½Ñ? Ð² Ð¾Ñ?ÐµÑ?ÐµÐ´Ñ? Ð² Ð¿Ð°Ð¿ÐºÐµ \"Ð?Ñ?Ñ?Ð¾Ð´Ñ?Ñ?Ð¸Ðµ\". Ð?Ð¾Ð²Ñ?Ð¾Ñ?Ð¸Ñ?Ðµ Ð¾Ñ?Ð¿Ñ?Ð°Ð²ÐºÑ?, Ð½Ð°Ð¶Ð°Ð² ÐºÐ½Ð¾Ð¿ÐºÑ? "
 "Ð?Ñ?Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ñ?/Ð?Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ?, Ð¿Ð¾Ñ?Ð»Ðµ Ñ?Ð´Ð°Ð»ÐµÐ½Ð¸Ñ? Ð½ÐµÐºÐ¾Ñ?Ð¾Ñ?Ð¾Ð³Ð¾ ÐºÐ¾Ð»Ð¸Ñ?ÐµÑ?Ñ?Ð²Ð° Ð²Ð°Ñ?Ð¸Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ð¹.\n"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:209
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:207
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ: %s"
 
-#: ../camel/providers/hula/camel-hula-provider.c:49
+#: ../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:54
+#: ../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:56
+#: ../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:58
+#: ../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:61
+#: ../camel/providers/hula/camel-hula-provider.c:60
 #: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:44
+#: ../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:63
+#: ../camel/providers/hula/camel-hula-provider.c:62
 #: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:46
+#: ../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:65
+#: ../camel/providers/hula/camel-hula-provider.c:64
 #: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:48
+#: ../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:67
+#: ../camel/providers/hula/camel-hula-provider.c:66
 msgid "Namespace"
 msgstr "Ð?Ñ?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ð²Ð¾ Ð¸Ð¼ÐµÐ½"
 
-#: ../camel/providers/hula/camel-hula-provider.c:78
+#: ../camel/providers/hula/camel-hula-provider.c:76
 msgid "Hula"
 msgstr "Hula"
 
-#: ../camel/providers/hula/camel-hula-provider.c:80
+#: ../camel/providers/hula/camel-hula-provider.c:78
 msgid "For accessing Hula servers"
 msgstr "Ð?Ð»Ñ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð° Ðº Ñ?ÐµÑ?Ð²ÐµÑ?Ð°Ð¼ Hula"
 
-#: ../camel/providers/hula/camel-hula-provider.c:97
+#: ../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:183
-#: ../camel/providers/imap/camel-imap-command.c:267
+#: ../camel/providers/imap/camel-imap-command.c:181
+#: ../camel/providers/imap/camel-imap-command.c:265
 msgid "No output stream"
 msgstr "Ð?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ð²Ñ?ÐµÑ? Ð¿Ð¾Ñ?Ð¾ÐºÐ° Ð²Ñ?Ð²Ð¾Ð´Ð°"
 
-#: ../camel/providers/imap/camel-imap-command.c:188
-#: ../camel/providers/imap/camel-imap-command.c:272
+#: ../camel/providers/imap/camel-imap-command.c:186
+#: ../camel/providers/imap/camel-imap-command.c:270
 msgid "No input stream"
 msgstr "Ð?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ð²Ñ?ÐµÑ? Ð¿Ð¾Ñ?Ð¾Ðº Ð²Ð²Ð¾Ð´Ð°"
 
-#: ../camel/providers/imap/camel-imap-command.c:231
-#: ../camel/providers/imap/camel-imap-command.c:280
-#: ../camel/providers/imap/camel-imap-command.c:494
-#: ../camel/providers/imap/camel-imap-store.c:3037
+#: ../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
 msgid "Operation cancelled"
 msgstr "Ð?Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ? Ð¾Ñ?Ð¼ÐµÐ½ÐµÐ½Ð°"
 
-#: ../camel/providers/imap/camel-imap-command.c:333
-#: ../camel/providers/imap/camel-imap-store.c:3040
+#: ../camel/providers/imap/camel-imap-command.c:331
+#: ../camel/providers/imap/camel-imap-store.c:3110
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Ð¡ÐµÑ?Ð²ÐµÑ? Ð½ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ð¾ Ð¾Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ð»Ñ?Ñ?: %s"
 
 #. for imap ALERT codes, account user host
 #. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:354
+#: ../camel/providers/imap/camel-imap-command.c:352
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -2932,132 +2890,138 @@ msgstr ""
 "Ð¢Ñ?ÐµÐ²Ð¾Ð¶Ð½Ð¾Ðµ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ Ð¾Ñ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð° IMAP %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:423
+#: ../camel/providers/imap/camel-imap-command.c:421
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Ð?ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ñ?Ð¹ Ð¾Ñ?Ð²ÐµÑ? Ð¾Ñ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð° IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:433
+#: ../camel/providers/imap/camel-imap-command.c:431
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Ð¡Ð±Ð¾Ð¹ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ? IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:508
+#: ../camel/providers/imap/camel-imap-command.c:506
 msgid "Server response ended too soon."
 msgstr "Ð?Ðµ Ð¿Ð¾Ð»Ð½Ñ?Ð¹ Ð¾Ñ?Ð²ÐµÑ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð°."
 
-#: ../camel/providers/imap/camel-imap-command.c:715
+#: ../camel/providers/imap/camel-imap-command.c:712
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Ð?Ñ?Ð²ÐµÑ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð° IMAP Ð½Ðµ Ñ?Ð¾Ð´ÐµÑ?Ð¶Ð¸Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ð¸ Ð¾ %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:751
+#: ../camel/providers/imap/camel-imap-command.c:748
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Ð?ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ñ?Ð¹ Ð¾Ñ?Ð²ÐµÑ? \"OK\" Ð¾Ñ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð° IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:89
+#: ../camel/providers/imap/camel-imap-folder.c:90
 msgid "Always check for new mail in this folder"
 msgstr "Ð?Ñ?ÐµÐ³Ð´Ð° Ð¿Ñ?Ð¾Ð²ÐµÑ?Ñ?Ñ?Ñ? Ð½Ð°Ð»Ð¸Ñ?Ð¸Ðµ Ð½Ð¾Ð²Ð¾Ð¹ Ð¿Ð¾Ñ?Ñ?Ñ? Ð² Ñ?Ñ?Ð¾Ð¹ Ð¿Ð°Ð¿ÐºÐµ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:246
+#: ../camel/providers/imap/camel-imap-folder.c:276
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? ÐºÐ°Ñ?Ð°Ð»Ð¾Ð³ %s: %s"
 
 #. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:891
+#: ../camel/providers/imap/camel-imap-folder.c:918
+#: ../camel/providers/imapx/camel-imapx-server.c:2758
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "Ð?Ð¾Ð¸Ñ?Ðº Ð¸Ð·Ð¼ÐµÐ½Ñ?Ð½Ð½Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ð¹ Ð² %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1950
+#: ../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:1965
+#: ../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:2010
+#: ../camel/providers/imap/camel-imap-folder.c:2046
 msgid "Unknown error occurred during APPEND command!"
 msgstr "Ð?Ð¾ Ð²Ñ?ÐµÐ¼Ñ? Ð²Ñ?Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ? ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ? APPEND Ð²Ð¾Ð·Ð½Ð¸ÐºÐ»Ð° Ð½ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ð°Ñ? Ð¾Ñ?Ð¸Ð±ÐºÐ°!"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2842
+#: ../camel/providers/imap/camel-imap-folder.c:2877
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2877
+#: ../camel/providers/imap/camel-imap-folder.c:2912
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ Ñ? Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ?Ð¾Ð¼ %s: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2878
+#: ../camel/providers/imap/camel-imap-folder.c:2913
 msgid "No such message available."
 msgstr "Ð?ÐµÑ? Ñ?Ð°ÐºÐ¾Ð³Ð¾ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ?."
 
-#: ../camel/providers/imap/camel-imap-folder.c:2932
-#: ../camel/providers/imap/camel-imap-folder.c:3753
-#: ../camel/providers/nntp/camel-nntp-folder.c:239
+#: ../camel/providers/imap/camel-imap-folder.c:2974
+#: ../camel/providers/imap/camel-imap-folder.c:3819
+#: ../camel/providers/nntp/camel-nntp-folder.c:236
 msgid "This message is not currently available"
 msgstr "ÐÑ?Ð¾ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ Ð² Ð½Ð°Ñ?Ñ?Ð¾Ñ?Ñ?Ð¸Ð¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ? Ð½ÐµÐ´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¾"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3567
+#: ../camel/providers/imap/camel-imap-folder.c:3632
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "Ð?ÐµÐ¿Ð¾Ð»Ð½Ñ?Ð¹ Ð¾Ñ?Ð²ÐµÑ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð°: Ð½Ðµ Ð¿Ñ?ÐµÐ´Ð¾Ñ?Ñ?Ð°Ð²Ð»ÐµÐ½Ð° Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ? Ð¾ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ð¸ %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3575
+#: ../camel/providers/imap/camel-imap-folder.c:3640
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "Ð?ÐµÐ¿Ð¾Ð»Ð½Ñ?Ð¹ Ð¾Ñ?Ð²ÐµÑ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð°: Ð¾Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ð²Ñ?ÐµÑ? UID Ð´Ð»Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ? %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3791
+#: ../camel/providers/imap/camel-imap-folder.c:3857
 msgid "Could not find message body in FETCH response."
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð½Ð°Ð¹Ñ?Ð¸ Ñ?ÐµÐ»Ð¾ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ? Ð² Ð¾Ñ?Ð²ÐµÑ?Ðµ Ð½Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ? FETCH."
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:182
-#: ../camel/providers/imap/camel-imap-message-cache.c:246
+#: ../camel/providers/imap/camel-imap-message-cache.c:181
+#: ../camel/providers/imap/camel-imap-message-cache.c:244
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ? ÐºÐ°Ñ?Ð°Ð»Ð¾Ð³ ÐºÑ?Ñ?Ð°: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:333
-#: ../camel/providers/imap/camel-imap-message-cache.c:390
-#: ../camel/providers/imap/camel-imap-message-cache.c:421
-#: ../camel/providers/imap/camel-imap-message-cache.c:453
+#: ../camel/providers/imap/camel-imap-message-cache.c:330
+#: ../camel/providers/imap/camel-imap-message-cache.c:387
+#: ../camel/providers/imap/camel-imap-message-cache.c:418
+#: ../camel/providers/imap/camel-imap-message-cache.c:450
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ñ?Ð¸ ÐºÑ?Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ð¸ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ? %s: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:533
+#: ../camel/providers/imap/camel-imap-message-cache.c:530
 #, c-format
 msgid "Failed to cache %s: %s"
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ñ?Ð¸ ÐºÑ?Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ð¸ %s: %s"
 
 #: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:50
 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:50
+#: ../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:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:54
+#: ../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 ""
 "_Ð?Ñ?Ð¸Ð¼ÐµÐ½Ð¸Ñ?Ñ? Ñ?Ð¸Ð»Ñ?Ñ?Ñ?Ñ? Ðº Ð½Ð¾Ð²Ñ?Ð¼ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ?Ð¼ Ð² Ð¿Ð°Ð¿ÐºÐµ \"Ð?Ñ?Ð¾Ð´Ñ?Ñ?Ð¸Ðµ\" Ð½Ð° Ñ?Ñ?Ð¾Ð¼ Ñ?ÐµÑ?Ð²ÐµÑ?Ðµ"
 
 #: ../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:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:60
+#: ../camel/providers/imap4/camel-imap4-provider.c:59
+#: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "Ð?Ð²Ñ?Ð¾Ð¼Ð°Ñ?Ð¸Ñ?ÐµÑ?ÐºÐ¸ Ñ?Ð¸Ð½Ñ?Ñ?Ð¾Ð½Ð¸_Ð·Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ñ?Ð´Ð°Ð»ÐµÐ½Ð½Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ñ? Ð»Ð¾ÐºÐ°Ð»Ñ?Ð½Ð¾"
 
@@ -3066,126 +3030,122 @@ msgid "IMAP"
 msgstr "IMAP"
 
 #: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imapx/camel-imapx-provider.c:90
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Ð?Ð»Ñ? Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð¸ Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?Ñ? Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ð°Ñ? IMAP."
 
 #: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapp/camel-imapp-provider.c:69
+#: ../camel/providers/imapx/camel-imapx-provider.c:106
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Ð?Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ðµ Ðº Ñ?ÐµÑ?Ð²ÐµÑ?Ñ? IMAP Ð±Ñ?Ð´ÐµÑ? Ð¿Ñ?Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ?Ñ?Ñ?Ñ? Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸ÐµÐ¼ "
 "Ð½ÐµÐ·Ð°Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð¿Ð°Ñ?Ð¾Ð»Ñ?."
 
-#: ../camel/providers/imap/camel-imap-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:214
+#: ../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:439
-#: ../camel/providers/imap4/camel-imap4-store.c:216
+#: ../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:568
-#: ../camel/providers/imap/camel-imap-store.c:583
-#: ../camel/providers/imap4/camel-imap4-store.c:251
-#: ../camel/providers/imap4/camel-imap4-store.c:266
-#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/nntp/camel-nntp-store.c:198
-#: ../camel/providers/pop3/camel-pop3-store.c:172
-#: ../camel/providers/pop3/camel-pop3-store.c:186
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
-#: ../camel/providers/smtp/camel-smtp-transport.c:275
+#: ../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
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ?Ñ?Ñ? Ðº %s: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:569
-#: ../camel/providers/imap4/camel-imap4-store.c:252
-#: ../camel/providers/nntp/camel-nntp-store.c:184
-#: ../camel/providers/pop3/camel-pop3-store.c:173
-#: ../camel/providers/smtp/camel-smtp-transport.c:261
+#: ../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
 msgid "SSL unavailable"
 msgstr "SSL Ð½ÐµÐ´Ð¾Ñ?Ñ?Ñ?Ð¿ÐµÐ½"
 
-#: ../camel/providers/imap/camel-imap-store.c:580
-#: ../camel/providers/imap/camel-imap-store.c:862
+#: ../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:691
-#: ../camel/providers/imap/camel-imap-store.c:710
-#: ../camel/providers/imap/camel-imap-store.c:716
-#: ../camel/providers/imap/camel-imap-store.c:742
-#: ../camel/providers/imap4/camel-imap4-store.c:314
-#: ../camel/providers/imap4/camel-imap4-store.c:329
-#: ../camel/providers/imap4/camel-imap4-store.c:338
+#: ../camel/providers/imap/camel-imap-store.c: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
 #, 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:692
-#: ../camel/providers/smtp/camel-smtp-transport.c:333
+#: ../camel/providers/imap/camel-imap-store.c:690
+#: ../camel/providers/imapx/camel-imapx-server.c:2058
+#: ../camel/providers/smtp/camel-smtp-transport.c:332
 msgid "STARTTLS not supported"
 msgstr "STARTTLS Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÑ?Ñ?Ñ?"
 
-#: ../camel/providers/imap/camel-imap-store.c:711
+#: ../camel/providers/imap/camel-imap-store.c:709
+#: ../camel/providers/imapx/camel-imapx-server.c:2072
 msgid "SSL negotiations failed"
 msgstr "Ð¡Ð±Ð¾Ð¹ Ñ?Ð¾Ð³Ð»Ð°Ñ?Ð¾Ð²Ð°Ð½Ð¸Ð¹ SSL"
 
-#: ../camel/providers/imap/camel-imap-store.c:717
-#: ../camel/providers/imap4/camel-imap4-store.c:339
-#: ../camel/providers/smtp/camel-smtp-transport.c:372
+#: ../camel/providers/imap/camel-imap-store.c:715
+#: ../camel/providers/imap4/camel-imap4-store.c:335
+#: ../camel/providers/smtp/camel-smtp-transport.c:371
 msgid "SSL is not available in this build"
 msgstr "SSL Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÑ?Ñ?Ñ? Ð² Ñ?Ñ?Ð¾Ð¹ Ñ?Ð±Ð¾Ñ?ÐºÐµ"
 
-#: ../camel/providers/imap/camel-imap-store.c:865
+#: ../camel/providers/imap/camel-imap-store.c:863
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ?Ñ?Ñ? ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ Â«%sÂ»: %s"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1053
-#: ../camel/providers/imap/camel-imap-store.c:2400
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:368
-#: ../camel/providers/imap4/camel-imap4-store.c:1408
-#: ../camel/providers/local/camel-maildir-folder.c:78
+#: ../camel/providers/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:464
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
+#: ../camel/providers/local/camel-spool-store.c:461
 msgid "Inbox"
 msgstr "Ð?Ñ?Ð¾Ð´Ñ?Ñ?Ð¸Ðµ"
 
-#: ../camel/providers/imap/camel-imap-store.c:1055
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
-msgid "Drafts"
-msgstr "Ð§ÐµÑ?Ð½Ð¾Ð²Ð¸ÐºÐ¸"
-
-#: ../camel/providers/imap/camel-imap-store.c:1057
-msgid "Sent"
-msgstr "Ð?Ñ?Ð¿Ñ?Ð°Ð²Ð»ÐµÐ½Ð½Ñ?Ðµ"
-
-#: ../camel/providers/imap/camel-imap-store.c:1059
-msgid "Templates"
-msgstr "Ð¨Ð°Ð±Ð»Ð¾Ð½Ñ?"
-
-#: ../camel/providers/imap/camel-imap-store.c:1304
+#: ../camel/providers/imap/camel-imap-store.c:1303
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Ð¡ÐµÑ?Ð²ÐµÑ? IMAP %s Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÑ? Ð·Ð°Ñ?Ñ?ÐµÐ±Ð¾Ð²Ð°Ð½Ð½Ñ?Ð¹ Ñ?Ð¸Ð¿ Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ð¸ %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1314
-#: ../camel/providers/smtp/camel-smtp-transport.c:507
+#: ../camel/providers/imap/camel-imap-store.c:1313
+#: ../camel/providers/smtp/camel-smtp-transport.c:506
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ð?Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ? %s Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÑ?Ñ?Ñ?"
 
-#: ../camel/providers/imap/camel-imap-store.c:1388
+#: ../camel/providers/imap/camel-imap-store.c:1387
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3196,71 +3156,75 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1861
-#: ../camel/providers/imap/camel-imap-store.c:2242
-#: ../camel/providers/imap4/camel-imap4-store.c:959
+#: ../camel/providers/imap/camel-imap-store.c:1891
+#: ../camel/providers/imap/camel-imap-store.c:2272
+#: ../camel/providers/imap4/camel-imap4-store.c:954
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "Ð?Ð¼Ñ? Ð¿Ð°Ð¿ÐºÐ¸ Â«%sÂ» Ð½ÐµÐºÐ¾Ñ?Ñ?ÐµÐºÑ?Ð½Ð¾, Ñ?Ð°Ðº ÐºÐ°Ðº Ñ?Ð¾Ð´ÐµÑ?Ð¶Ð¸Ñ? Ñ?Ð¸Ð¼Ð²Ð¾Ð» \"%c\""
 
-#: ../camel/providers/imap/camel-imap-store.c:1978
+#: ../camel/providers/imap/camel-imap-store.c:2008
 #: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:204
+#: ../camel/providers/local/camel-mbox-store.c:202
 #: ../camel/providers/local/camel-mh-store.c:249
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ? Â«%sÂ»: Ð¿Ð°Ð¿ÐºÐ° Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?ÐµÑ?."
 
-#: ../camel/providers/imap/camel-imap-store.c:2253
+#: ../camel/providers/imap/camel-imap-store.c:2283
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ð°Ñ? Ñ?Ð¾Ð´Ð¸Ñ?ÐµÐ»Ñ?Ñ?ÐºÐ°Ñ? Ð¿Ð°Ð¿ÐºÐ°: %s"
 
-#: ../camel/providers/imap4/camel-imap4-command.c:576
-#: ../camel/providers/imap4/camel-imap4-command.c:583
+#: ../camel/providers/imap/camel-imap-store.c:3107
+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:686
+#: ../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:221
+#: ../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:450
+#: ../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:456
+#: ../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:1433
+#: ../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:1435
+#: ../camel/providers/imap4/camel-imap4-engine.c:1416
 msgid "service unavailable"
 msgstr "Ñ?Ð»Ñ?Ð¶Ð±Ð° Ð½ÐµÐ´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð°"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:1569
-#: ../camel/providers/imap4/camel-imap4-engine.c:1608
-#: ../camel/providers/imap4/camel-imap4-engine.c:1653
-#: ../camel/providers/imap4/camel-imap4-engine.c:1709
+#: ../camel/providers/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:89
+#: ../camel/providers/imap4/camel-imap4-folder.c:87
 msgid ""
 "Enable extended Mailing-List detection required for some filter and vFolder "
 "rules"
@@ -3268,122 +3232,121 @@ msgstr ""
 "Ð?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¾Ð¿Ñ?ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ Ñ?Ð¿Ð¸Ñ?ÐºÐ¾Ð² Ñ?Ð°Ñ?Ñ?Ñ?Ð»ÐºÐ¸, Ñ?Ñ?ÐµÐ±Ñ?Ñ?Ñ?ÐµÐµÑ?Ñ? Ð´Ð»Ñ? Ð½ÐµÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ñ? Ñ?Ð¸Ð»Ñ?Ñ?Ñ?Ð¾Ð² Ð¸ "
 "Ð¿Ñ?Ð°Ð²Ð¸Ð» vFolder"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:90
+#: ../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:91
+#: ../camel/providers/imap4/camel-imap4-folder.c:89
 msgid "Expire cached messages older than X seconds"
-msgstr "Ð?Ñ?Ñ?Ð±Ð°Ñ?Ñ?Ð²Ð°Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ?, Ñ?Ñ?Ð°Ð½Ð¸Ð¼Ñ?Ðµ Ð±Ð¾Ð»Ñ?Ñ?Ðµ X Ñ?ÐµÐºÑ?Ð½Ð´"
+msgstr "Ð?Ñ?Ð±Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ?, Ñ?Ñ?Ð°Ð½Ð¸Ð¼Ñ?Ðµ Ð±Ð¾Ð»Ñ?Ñ?Ðµ X Ñ?ÐµÐºÑ?Ð½Ð´"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:432
+#: ../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:491
+#: ../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:497
+#: ../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:637
+#: ../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:642
+#: ../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:898
+#: ../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:903
+#: ../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:947
+#: ../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:1040
+#: ../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:1070
+#: ../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:1190
+#: ../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:1194
+#: ../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:1202
+#: ../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:1206
+#: ../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:56
+#: ../camel/providers/imap4/camel-imap4-provider.c:55
 msgid "Check new messages for _Junk contents"
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ñ?Ñ?, Ñ?Ð²Ð»Ñ?Ñ?Ñ?Ñ?Ñ? Ð»Ð¸ Ð½Ð¾Ð²Ñ?Ðµ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ? Ñ?Ð¿Ð°Ð¼Ð¾Ð¼"
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:58
+#: ../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:67
+#: ../camel/providers/imap4/camel-imap4-provider.c:66
 msgid "IMAP4rev1"
 msgstr "IMAP4rev1"
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:69
+#: ../camel/providers/imap4/camel-imap4-provider.c:68
 msgid "For reading and storing mail on IMAPv4rev1 servers."
 msgstr "Ð?Ð»Ñ? Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð¸ Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?Ñ? Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ð°Ñ? IMAPv4rev."
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:86
+#: ../camel/providers/imap4/camel-imap4-provider.c:85
 msgid ""
 "This option will connect to the IMAPv4rev1 server using a plaintext password."
 msgstr ""
 "Ð?Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ðµ Ðº Ñ?ÐµÑ?Ð²ÐµÑ?Ñ? IMAP Ð±Ñ?Ð´ÐµÑ? Ð¿Ñ?Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ?Ñ?Ñ?Ñ? Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸ÐµÐ¼ "
 "Ð½ÐµÐ·Ð°Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð¿Ð°Ñ?Ð¾Ð»Ñ?."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:263
-#: ../camel/providers/imapp/camel-imapp-store.c:249
-#: ../camel/providers/nntp/camel-nntp-store.c:195
-#: ../camel/providers/nntp/camel-nntp-store.c:214
-#: ../camel/providers/pop3/camel-pop3-store.c:183
-#: ../camel/providers/smtp/camel-smtp-transport.c:272
+#: ../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:300
+#: ../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 "
@@ -3392,203 +3355,203 @@ msgstr ""
 "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ?Ñ?Ñ? Ðº Ñ?ÐµÑ?Ð²ÐµÑ?Ñ? IMAP %s Ð² Ð·Ð°Ñ?Ð¸Ñ?ÐµÐ½Ð½Ð¾Ð¼ Ñ?ÐµÐ¶Ð¸Ð¼Ðµ: Ñ?ÐµÑ?Ð²ÐµÑ? Ð½Ðµ "
 "Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÑ? STARTTLS"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:330
-#: ../camel/providers/pop3/camel-pop3-store.c:251
+#: ../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:415
+#: ../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:538
+#: ../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:701
-#: ../camel/providers/imap4/camel-imap4-store.c:969
+#: ../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:740
+#: ../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:821
+#: ../camel/providers/imap4/camel-imap4-store.c:816
 #, c-format
 msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ñ?Ð²ÐµÐ´ÐµÐ½Ð¸Ñ? Ð´Ð»Ñ? Â«%sÂ» Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ðµ IMAP %s: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
+#: ../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:902
+#: ../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:907
+#: ../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:1013
+#: ../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:1020
+#: ../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:1079
+#: ../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:1084
+#: ../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:1104
+#: ../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:1111
+#: ../camel/providers/imap4/camel-imap4-store.c:1106
 msgid "Cannot rename IMAP folders in offline mode."
 msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿ÐµÑ?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ð°Ð¿ÐºÐ¸ IMAP Ð² Ð°Ð²Ñ?Ð¾Ð½Ð¾Ð¼Ð½Ð¾Ð¼ Ñ?ÐµÐ¶Ð¸Ð¼Ðµ."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
+#: ../camel/providers/imap4/camel-imap4-store.c:1137
 #, c-format
 msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿ÐµÑ?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ? Â«%sÂ» Ð² Â«%sÂ»: Ð½ÐµÐ²ÐµÑ?Ð½Ð¾Ðµ Ð¸Ð¼Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ð¾Ð³Ð¾ Ñ?Ñ?Ð¸ÐºÐ°"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1147
+#: ../camel/providers/imap4/camel-imap4-store.c:1142
 #, c-format
 msgid "Cannot rename folder '%s' to '%s': Bad command"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿ÐµÑ?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ? Â«%sÂ» Ð² Â«%sÂ»: Ð½ÐµÐ²ÐµÑ?Ð½Ð°Ñ? ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°"
 
 #. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
 #. * The fourth one is an error message.
-#: ../camel/providers/imap4/camel-imap4-store.c:1577
+#: ../camel/providers/imap4/camel-imap4-store.c:1572
 #, c-format
 msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ñ?Ð²ÐµÐ´ÐµÐ½Ð¸Ñ? %s Ð´Ð»Ñ? Ñ?Ð°Ð±Ð»Ð¾Ð½Ð° Â«%sÂ» Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ðµ IMAP %s: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1638
+#: ../camel/providers/imap4/camel-imap4-store.c:1633
 msgid "Cannot subscribe to IMAP folders in offline mode."
 msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð°Ñ?Ñ?Ñ?Ñ? Ð½Ð° Ð¿Ð°Ð¿ÐºÐ¸ IMAP Ð² Ð°Ð²Ñ?Ð¾Ð½Ð¾Ð¼Ð½Ð¾Ð¼ Ñ?ÐµÐ¶Ð¸Ð¼Ðµ."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
+#: ../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:1688
+#: ../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:1710
+#: ../camel/providers/imap4/camel-imap4-store.c:1705
 msgid "Cannot unsubscribe from IMAP folders in offline mode."
 msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ñ?Ð¿Ð¸Ñ?Ð°Ñ?Ñ?Ñ?Ñ? Ð¾Ñ? Ð¿Ð°Ð¿Ð¾Ðº IMAP Ð² Ð°Ð²Ñ?Ð¾Ð½Ð¾Ð¼Ð½Ð¾Ð¼ Ñ?ÐµÐ¶Ð¸Ð¼Ðµ."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
+#: ../camel/providers/imap4/camel-imap4-store.c:1750
 #, c-format
 msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ñ?Ð¿Ð¸Ñ?Ð°Ñ?Ñ?Ñ?Ñ? Ð¾Ñ? Ð¿Ð°Ð¿ÐºÐ¸ Â«%sÂ»: Ð½ÐµÐ²ÐµÑ?Ð½Ð¾Ðµ Ð¸Ð¼Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ð¾Ð³Ð¾ Ñ?Ñ?Ð¸ÐºÐ°"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1760
+#: ../camel/providers/imap4/camel-imap4-store.c:1755
 #, c-format
 msgid "Cannot unsubscribe from folder '%s': Bad command"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ñ?Ð¿Ð¸Ñ?Ð°Ñ?Ñ?Ñ?Ñ? Ð¾Ñ? Ð¿Ð°Ð¿ÐºÐ¸ Â«%sÂ»: Ð?ÐµÐ²ÐµÑ?Ð½Ð°Ñ? ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1596
+#: ../camel/providers/imap4/camel-imap4-summary.c:1590
 msgid "Scanning for changed messages"
 msgstr "Ð?Ð¾Ð¸Ñ?Ðº Ð¸Ð·Ð¼ÐµÐ½Ñ?Ð½Ð½Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ð¹"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1617
+#: ../camel/providers/imap4/camel-imap4-summary.c:1611
 #, c-format
 msgid "IMAP server %s is in an inconsistent state."
 msgstr "Ð¡ÐµÑ?Ð²ÐµÑ? IMAP %s Ð½Ð°Ñ?Ð¾Ð´Ð¸Ñ?Ñ?Ñ? Ð² Ð½ÐµÑ?Ñ?Ñ?Ð¾Ð¹Ñ?Ð¸Ð²Ð¾Ð¼ Ñ?Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ð¸."
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1644
+#: ../camel/providers/imap4/camel-imap4-summary.c:1638
 msgid "Fetching envelopes of new messages"
 msgstr "Ð?Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ðµ ÐºÐ¾Ð½Ð²ÐµÑ?Ñ?Ð¾Ð² Ð½Ð¾Ð²Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ð¹"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:437
+#: ../camel/providers/imap4/camel-imap4-utils.c:429
 #, c-format
 msgid "Unexpected token in response from IMAP server %s: "
 msgstr "Ð?ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ñ?Ð¹ Ñ?Ð¾ÐºÐµÐ½ Ð² Ð¾Ñ?Ð²ÐµÑ?Ðµ Ñ?ÐµÑ?Ð²ÐµÑ?Ð° IMAP %s: "
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:460
+#: ../camel/providers/imap4/camel-imap4-utils.c:452
 msgid "No data"
 msgstr "Ð?ÐµÑ? Ð´Ð°Ð½Ð½Ñ?Ñ?"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:623
+#: ../camel/providers/imap4/camel-imap4-utils.c:613
 #, c-format
 msgid "IMAP server %s unexpectedly disconnected: %s"
 msgstr "Ð¡ÐµÑ?Ð²ÐµÑ? IMAP %s Ð½ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ð¾ Ð¾Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ð»Ñ?Ñ?: %s"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:41
-msgid "Message storage"
-msgstr "Ð¥Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ð¹"
+#: ../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-folder.c:92
+#, 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/imapp/camel-imapp-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:51
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-"ÐÐºÑ?Ð¿ÐµÑ?Ð¸Ð¼ÐµÐ½Ñ?Ð°Ð»Ñ?Ð½Ñ?Ð¹ ÐºÐ»Ð¸ÐµÐ½Ñ? IMAP 4(.1)\n"
-"ÐÑ?Ð¾ Ð½ÐµÐ¿Ñ?Ð¾Ð²ÐµÑ?ÐµÐ½Ð½Ñ?Ð¹ Ð¸ Ð½ÐµÐ¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÐ¼Ñ?Ð¹ ÐºÐ¾Ð´. Ð?Ð¼ÐµÑ?Ñ?Ð¾ Ð½ÐµÐ³Ð¾ Ñ?Ð»ÐµÐ´Ñ?ÐµÑ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ? "
-"Ð¾Ð±Ñ?Ñ?Ð½Ñ?Ð¹ IMAP.\n"
-"\n"
-" !!! Ð?Ð¡Ð?Ð?Ð?Ð¬Ð?Ð£Ð?Ð¢Ð? Ð¢Ð?Ð?Ð¬Ð?Ð? Ð? Ð¢Ð?Ð¡Ð¢Ð?Ð?Ð«Ð¥ Ð¦Ð?Ð?Ð¯Ð¥  !!!\n"
-
-#: ../camel/providers/imapp/camel-imapp-store.c:252
+#: ../camel/providers/imapx/camel-imapx-server.c:2020
 #, c-format
 msgid "Could not connect to %s (port %s): %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ?Ñ?Ñ? Ðº %s (Ð¿Ð¾Ñ?Ñ? %s): %s"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:349
+#: ../camel/providers/imapx/camel-imapx-server.c:2100
 #, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ?Ñ?Ñ? Ðº Ñ?ÐµÑ?Ð²ÐµÑ?Ñ? POP %s"
+msgid "%sPlease enter the IMAP password for %s %s"
+msgstr "%sÐ?Ð²ÐµÐ´Ð¸Ñ?Ðµ Ð¿Ð°Ñ?Ð¾Ð»Ñ? IMAP Ð´Ð»Ñ? %s %s"
 
-#: ../camel/providers/local/camel-local-folder.c:176
+#: ../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:392
+#: ../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:396
 #: ../camel/providers/local/camel-local-folder.c:399
+#: ../camel/providers/local/camel-local-folder.c:402
 #, c-format
-msgid "mailbox:%s (%s)"
+msgid "mailbox: %s (%s)"
 msgstr "Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ñ?Ð¹ Ñ?Ñ?Ð¸Ðº: %s: (%s)"
 
 #. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:403
+#: ../camel/providers/local/camel-local-folder.c:406
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -3652,53 +3615,53 @@ msgstr ""
 msgid "Standard Unix mbox spool directory"
 msgstr "Ð¡Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?Ð½Ñ?Ð¹ Ð´Ð»Ñ? Unix ÐºÐ°Ñ?Ð°Ð»Ð¾Ð³ Ð¾Ñ?ÐµÑ?ÐµÐ´ÐµÐ¹ Ñ?Ð¸Ð¿Ð° mbox"
 
-#: ../camel/providers/local/camel-local-store.c:165
-#: ../camel/providers/local/camel-local-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:359
-#: ../camel/providers/local/camel-spool-store.c:129
+#: ../camel/providers/local/camel-local-store.c: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
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Ð?Ñ?Ð½Ð¾Ñ?Ð¸Ñ?ÐµÐ»Ñ?Ð½Ñ?Ð¹ Ð¿Ñ?Ñ?Ñ? Ðº Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ñ? %s"
 
-#: ../camel/providers/local/camel-local-store.c:172
+#: ../camel/providers/local/camel-local-store.c:170
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Ð¥Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ %s Ð½Ðµ Ñ?Ð²Ð»Ñ?ÐµÑ?Ñ?Ñ? ÐºÐ°Ñ?Ð°Ð»Ð¾Ð³Ð¾Ð¼"
 
-#: ../camel/providers/local/camel-local-store.c:181
-#: ../camel/providers/local/camel-local-store.c:189
-#: ../camel/providers/local/camel-local-store.c:287
+#: ../camel/providers/local/camel-local-store.c:179
+#: ../camel/providers/local/camel-local-store.c:187
+#: ../camel/providers/local/camel-local-store.c:285
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ?: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:201
+#: ../camel/providers/local/camel-local-store.c:199
 msgid "Local stores do not have an inbox"
 msgstr "Ð?Ð¾ÐºÐ°Ð»Ñ?Ð½Ð¾Ðµ Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ Ð½Ðµ Ð¸Ð¼ÐµÐµÑ? Ð¿Ð°Ð¿ÐºÐ¸ Ð?Ñ?Ð¾Ð´Ñ?Ñ?Ð¸Ðµ"
 
-#: ../camel/providers/local/camel-local-store.c:247
+#: ../camel/providers/local/camel-local-store.c:245
 #, c-format
 msgid "Local mail file %s"
 msgstr "Ð?Ð¾ÐºÐ°Ð»Ñ?Ð½Ñ?Ð¹ Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ñ?Ð¹ Ñ?Ð°Ð¹Ð» %s"
 
-#: ../camel/providers/local/camel-local-store.c:342
+#: ../camel/providers/local/camel-local-store.c:340
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿ÐµÑ?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ? %s Ð² %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:410
+#: ../camel/providers/local/camel-local-store.c:408
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿ÐµÑ?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ?Ñ? Â«%sÂ»: %s"
 
-#: ../camel/providers/local/camel-local-store.c:435
-#: ../camel/providers/local/camel-mbox-store.c:300
+#: ../camel/providers/local/camel-local-store.c:433
+#: ../camel/providers/local/camel-mbox-store.c:298
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð´Ð°Ð»Ð¸Ñ?Ñ? Ð¸Ð½Ð´ÐµÐºÑ?Ð½Ñ?Ð¹ Ñ?Ð°Ð¹Ð» Ð¿Ð°Ð¿ÐºÐ¸ Â«%sÂ»: %s"
 
-#: ../camel/providers/local/camel-local-store.c:458
-#: ../camel/providers/local/camel-mbox-store.c:324
+#: ../camel/providers/local/camel-local-store.c:456
+#: ../camel/providers/local/camel-mbox-store.c:322
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð´Ð°Ð»Ð¸Ñ?Ñ? Ð¼ÐµÑ?Ð°-Ñ?Ð°Ð¹Ð» Ð¿Ð°Ð¿ÐºÐ¸ Â«%sÂ»: %s"
@@ -3707,27 +3670,28 @@ msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð´Ð°Ð»Ð¸Ñ?Ñ? Ð¼ÐµÑ?Ð°-Ñ?Ð°Ð¹Ð» Ð¿Ð°Ð¿ÐºÐ¸ Â«%sÂ»:
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ Ðº ÐºÑ?Ð°Ñ?ÐºÐ¾Ð¹ Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ð¸: Ð¿Ñ?Ð¸Ñ?Ð¸Ð½Ð° Ð½ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ð°"
 
-#: ../camel/providers/local/camel-maildir-folder.c:222
+#: ../camel/providers/local/camel-maildir-folder.c:230
 msgid "Maildir append message canceled"
 msgstr "Ð?Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ? Ðº Ð¿Ð°Ð¿ÐºÐµ Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ð¾Ð³Ð¾ ÐºÐ°Ñ?Ð°Ð»Ð¾Ð³Ð° Ð¾Ñ?Ð¼ÐµÐ½ÐµÐ½Ð¾"
 
-#: ../camel/providers/local/camel-maildir-folder.c:225
+#: ../camel/providers/local/camel-maildir-folder.c:233
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ Ðº Ð¿Ð°Ð¿ÐºÐµ Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ð¾Ð³Ð¾ ÐºÐ°Ñ?Ð°Ð»Ð¾Ð³Ð°: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:247
-#: ../camel/providers/local/camel-maildir-folder.c:274
-#: ../camel/providers/local/camel-maildir-folder.c:288
-#: ../camel/providers/local/camel-maildir-folder.c:297
-#: ../camel/providers/local/camel-mbox-folder.c:346
-#: ../camel/providers/local/camel-mbox-folder.c:398
-#: ../camel/providers/local/camel-mbox-folder.c:419
-#: ../camel/providers/local/camel-mbox-folder.c:450
-#: ../camel/providers/local/camel-mbox-folder.c:458
-#: ../camel/providers/local/camel-mh-folder.c:213
-#: ../camel/providers/local/camel-mh-folder.c:224
-#: ../camel/providers/local/camel-mh-folder.c:233
+#: ../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"
@@ -3736,27 +3700,31 @@ msgstr ""
 "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ: %s Ð¸Ð· Ð¿Ð°Ð¿ÐºÐ¸ %s\n"
 "  %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:298
+#: ../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"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿ÐµÑ?ÐµÐ¼ÐµÑ?Ñ?Ð¸Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ Ð² Ð¿Ð°Ð¿ÐºÑ? Ð½Ð°Ð·Ð½Ð°Ñ?ÐµÐ½Ð¸Ñ?"
+
 #: ../camel/providers/local/camel-maildir-store.c:148
 #: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:176
-#: ../camel/providers/local/camel-mbox-store.c:188
+#: ../camel/providers/local/camel-mbox-store.c:174
+#: ../camel/providers/local/camel-mbox-store.c:186
 #, 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:147
+#: ../camel/providers/local/camel-mbox-store.c:145
 #: ../camel/providers/local/camel-mh-store.c:217
 #, 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:155
+#: ../camel/providers/local/camel-mbox-store.c:153
 #: ../camel/providers/local/camel-mh-store.c:224
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
@@ -3779,76 +3747,76 @@ msgid "not a maildir directory"
 msgstr "Ð½Ðµ Ñ?Ð²Ð»Ñ?ÐµÑ?Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ñ?Ð¼ ÐºÐ°Ñ?Ð°Ð»Ð¾Ð³Ð¾Ð¼"
 
 #: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:331
-#: ../camel/providers/local/camel-spool-store.c:345
+#: ../camel/providers/local/camel-spool-store.c:328
+#: ../camel/providers/local/camel-spool-store.c:342
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ñ?Ð¾Ñ?ÐºÐ°Ð½Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ? Â«%sÂ»: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:439
-#: ../camel/providers/local/camel-maildir-summary.c:558
+#: ../camel/providers/local/camel-maildir-summary.c:432
+#: ../camel/providers/local/camel-maildir-summary.c:551
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ð¿Ñ?Ñ?Ñ? Ðº Ð¿Ð°Ð¿ÐºÐµ Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ð¾Ð³Ð¾ ÐºÐ°Ñ?Ð°Ð»Ð¾Ð³Ð°: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:551
+#: ../camel/providers/local/camel-maildir-summary.c:544
 msgid "Checking folder consistency"
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?ÐºÐ° Ñ?Ð¾Ð´ÐµÑ?Ð¶Ð°Ð½Ð¸Ñ? ÐºÐ°Ñ?Ð°Ð»Ð¾Ð³Ð¾Ð²"
 
-#: ../camel/providers/local/camel-maildir-summary.c:656
+#: ../camel/providers/local/camel-maildir-summary.c:637
 msgid "Checking for new messages"
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?ÐºÐ° Ð½Ð¾Ð²Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ð¹"
 
-#: ../camel/providers/local/camel-maildir-summary.c:742
-#: ../camel/providers/local/camel-mbox-summary.c:529
-#: ../camel/providers/local/camel-mbox-summary.c:711
-#: ../camel/providers/local/camel-mbox-summary.c:831
+#: ../camel/providers/local/camel-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
 msgid "Storing folder"
 msgstr "Ð¡Ð¾Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¸Ðµ Ð¿Ð°Ð¿ÐºÐ¸"
 
-#: ../camel/providers/local/camel-mbox-folder.c:159
+#: ../camel/providers/local/camel-mbox-folder.c:167
 #: ../camel/providers/local/camel-spool-folder.c:150
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ? %s: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:220
+#: ../camel/providers/local/camel-mbox-folder.c:231
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ñ?Ð¹ Ñ?Ñ?Ð¸Ðº: %s: %s\n"
 
-#: ../camel/providers/local/camel-mbox-folder.c:281
+#: ../camel/providers/local/camel-mbox-folder.c:297
 msgid "Mail append canceled"
 msgstr "Ð?Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð¾Ñ?Ñ?Ñ? Ð¾Ñ?Ð¼ÐµÐ½ÐµÐ½Ð¾"
 
-#: ../camel/providers/local/camel-mbox-folder.c:284
+#: ../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:451
+#: ../camel/providers/local/camel-mbox-folder.c:466
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Ð?Ð¸Ð´Ð¸Ð¼Ð¾, Ð¿Ð°Ð¿ÐºÐ° Ð½ÐµÐ²Ð¾Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð¸Ð¼Ð¾ Ð¸Ñ?Ð¿Ð¾Ñ?Ñ?ÐµÐ½Ð°."
 
-#: ../camel/providers/local/camel-mbox-folder.c:459
-#: ../camel/providers/local/camel-mh-folder.c:234
+#: ../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-store.c:166
-#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mbox-store.c:164
+#: ../camel/providers/local/camel-mbox-store.c:363
 msgid "Cannot create a folder by this name."
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ? Ñ? Ñ?Ð°ÐºÐ¸Ð¼ Ð¸Ð¼ÐµÐ½ÐµÐ¼."
 
-#: ../camel/providers/local/camel-mbox-store.c:198
+#: ../camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ? Â«%sÂ»: Ð½Ðµ Ñ?Ð²Ð»Ñ?ÐµÑ?Ñ?Ñ? Ð¾Ð±Ñ?Ñ?Ð½Ñ?Ð¼ Ñ?Ð°Ð¹Ð»Ð¾Ð¼."
 
-#: ../camel/providers/local/camel-mbox-store.c:228
-#: ../camel/providers/local/camel-mbox-store.c:239
-#: ../camel/providers/local/camel-mbox-store.c:262
+#: ../camel/providers/local/camel-mbox-store.c:226
+#: ../camel/providers/local/camel-mbox-store.c:237
+#: ../camel/providers/local/camel-mbox-store.c:260
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3857,129 +3825,129 @@ msgstr ""
 "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð´Ð°Ð»Ð¸Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ? Â«%sÂ»:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:247
+#: ../camel/providers/local/camel-mbox-store.c:245
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "Â«%sÂ» Ð½Ðµ Ñ?Ð²Ð»Ñ?ÐµÑ?Ñ?Ñ? Ð¾Ð±Ñ?Ñ?Ð½Ñ?Ð¼ Ñ?Ð°Ð¹Ð»Ð¾Ð¼."
 
-#: ../camel/providers/local/camel-mbox-store.c:254
+#: ../camel/providers/local/camel-mbox-store.c:252
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "Ð?Ð°Ð¿ÐºÐ° Â«%sÂ» Ð½Ðµ Ð¿Ñ?Ñ?Ñ?Ð°. Ð?Ðµ Ñ?Ð´Ð°Ð»ÐµÐ½Ð°."
 
-#: ../camel/providers/local/camel-mbox-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:288
+#: ../camel/providers/local/camel-mbox-store.c:274
+#: ../camel/providers/local/camel-mbox-store.c:286
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð´Ð°Ð»Ð¸Ñ?Ñ? Ñ?Ð°Ð¹Ð» ÐºÑ?Ð°Ñ?ÐºÐ¾Ð¹ Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ð¸ Â«%sÂ»: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:378
+#: ../camel/providers/local/camel-mbox-store.c:376
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? ÐºÐ°Ñ?Ð°Ð»Ð¾Ð³ Â«%sÂ»: %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:390
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ?: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:394
+#: ../camel/providers/local/camel-mbox-store.c:392
 msgid "Folder already exists"
 msgstr "Ð?Ð°Ð¿ÐºÐ° Ñ?Ð¶Ðµ Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?ÐµÑ?"
 
-#: ../camel/providers/local/camel-mbox-store.c:485
+#: ../camel/providers/local/camel-mbox-store.c:483
 msgid "The new folder name is illegal."
 msgstr "Ð?Ð¼Ñ? Ð½Ð¾Ð²Ð¾Ð¹ Ð¿Ð°Ð¿ÐºÐ¸ Ð½ÐµÐ´Ð¾Ð¿Ñ?Ñ?Ñ?Ð¸Ð¼Ð¾."
 
-#: ../camel/providers/local/camel-mbox-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:496
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿ÐµÑ?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ?Ñ? Â«%sÂ»: Â«%sÂ»: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:579
+#: ../camel/providers/local/camel-mbox-store.c:577
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿ÐµÑ?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ?Ñ? Â«%sÂ» Ð² %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:535
+#: ../camel/providers/local/camel-mbox-summary.c:532
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ?: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:585
+#: ../camel/providers/local/camel-mbox-summary.c:582
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Ð¤Ð°Ñ?Ð°Ð»Ñ?Ð½Ð°Ñ? Ð¾Ñ?Ð¸Ð±ÐºÐ° Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ð¾Ð³Ð¾ Ð°Ð½Ð°Ð»Ð¸Ð·Ð°Ñ?Ð¾Ñ?Ð° Ð²Ð¾Ð·Ð»Ðµ Ð¿Ð¾Ð·Ð¸Ñ?Ð¸Ð¸ %ld Ð² Ð¿Ð°Ð¿ÐºÐµ %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:648
+#: ../camel/providers/local/camel-mbox-summary.c:659
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ?: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:716
-#: ../camel/providers/local/camel-mbox-summary.c:836
+#: ../camel/providers/local/camel-mbox-summary.c:727
+#: ../camel/providers/local/camel-mbox-summary.c:847
 #: ../camel/providers/local/camel-spool-summary.c:155
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ñ?Ð°Ð¹Ð»: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:728
+#: ../camel/providers/local/camel-mbox-summary.c:739
 #: ../camel/providers/local/camel-spool-summary.c:168
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ð²Ñ?ÐµÐ¼ÐµÐ½Ð½Ñ?Ð¹ Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ñ?Ð¹ Ñ?Ñ?Ð¸Ðº: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:741
-#: ../camel/providers/local/camel-mbox-summary.c:945
+#: ../camel/providers/local/camel-mbox-summary.c:752
+#: ../camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð·Ð°ÐºÑ?Ñ?Ñ?Ñ? Ð¸Ñ?Ñ?Ð¾Ð´Ð½Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ? %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:750
+#: ../camel/providers/local/camel-mbox-summary.c:761
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð·Ð°ÐºÑ?Ñ?Ñ?Ñ? Ð²Ñ?ÐµÐ¼ÐµÐ½Ð½Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ?: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:765
+#: ../camel/providers/local/camel-mbox-summary.c:776
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿ÐµÑ?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ?: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:847
-#: ../camel/providers/local/camel-mbox-summary.c:1075
+#: ../camel/providers/local/camel-mbox-summary.c:858
+#: ../camel/providers/local/camel-mbox-summary.c:1084
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ?: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:886
-#: ../camel/providers/local/camel-mbox-summary.c:894
-#: ../camel/providers/local/camel-mbox-summary.c:1105
-#: ../camel/providers/local/camel-mbox-summary.c:1113
+#: ../camel/providers/local/camel-mbox-summary.c: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
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Ð¡Ð²Ð¾Ð´ÐºÐ° Ð¸ Ð¿Ð°Ð¿ÐºÐ° Ñ?Ð°Ñ?Ñ?Ð¾Ð´Ñ?Ñ?Ñ?Ñ? Ð´Ð°Ð¶Ðµ Ð¿Ð¾Ñ?Ð»Ðµ Ñ?Ð¸Ð½Ñ?Ñ?Ð¾Ð½Ð¸Ð·Ð°Ñ?Ð¸Ð¸"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1038
-#: ../camel/providers/local/camel-spool-summary.c:336
+#: ../camel/providers/local/camel-mbox-summary.c:1047
+#: ../camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ð°Ñ? Ð¾Ñ?Ð¸Ð±ÐºÐ°: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1181
-#: ../camel/providers/local/camel-mbox-summary.c:1207
+#: ../camel/providers/local/camel-mbox-summary.c:1190
+#: ../camel/providers/local/camel-mbox-summary.c:1216
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð·Ð°Ð¿Ð¸Ñ?Ð¸ Ð²Ð¾ Ð²Ñ?ÐµÐ¼ÐµÐ½Ð½Ñ?Ð¹ Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ñ?Ð¹ Ñ?Ñ?Ð¸Ðº: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1198
+#: ../camel/providers/local/camel-mbox-summary.c:1207
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð·Ð°Ð¿Ð¸Ñ?Ð¸ Ð²Ð¾ Ð²Ñ?ÐµÐ¼ÐµÐ½Ð½Ñ?Ð¹ Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ñ?Ð¹ Ñ?Ñ?Ð¸Ðº: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:178
+#: ../camel/providers/local/camel-mh-folder.c:180
 msgid "MH append message canceled"
 msgstr "Ð?Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ? Ð² Ð¿Ð°Ð¿ÐºÑ? Ð¾Ñ?Ð¼ÐµÐ½ÐµÐ½Ð¾"
 
-#: ../camel/providers/local/camel-mh-folder.c:181
+#: ../camel/providers/local/camel-mh-folder.c:183
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ Ðº Ð¿Ð°Ð¿ÐºÐµ mh: %s: %s"
@@ -3994,27 +3962,27 @@ msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ? Â«%sÂ»: %s"
 msgid "Cannot get folder '%s': not a directory."
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ? Â«%sÂ»: Ð½Ðµ Ñ?Ð²Ð»Ñ?ÐµÑ?Ñ?Ñ? ÐºÐ°Ñ?Ð°Ð»Ð¾Ð³Ð¾Ð¼."
 
-#: ../camel/providers/local/camel-mh-summary.c:264
+#: ../camel/providers/local/camel-mh-summary.c:240
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ? MH ÐºÐ°Ñ?Ð°Ð»Ð¾Ð³: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:135
+#: ../camel/providers/local/camel-spool-store.c:132
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ñ?Ð°Ð¹Ð» Ð½Ð°ÐºÐ¾Ð¿Ð»ÐµÐ½Ð¸Ñ? Â«%sÂ»: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:147
+#: ../camel/providers/local/camel-spool-store.c:144
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "Ð?Ð°ÐºÐ¾Ð¿Ð¸Ñ?ÐµÐ»Ñ? Â«%sÂ» Ð½Ðµ Ñ?Ð²Ð»Ñ?ÐµÑ?Ñ?Ñ? Ð¾Ð±Ñ?Ñ?Ð½Ñ?Ð¼ Ñ?Ð°Ð¹Ð»Ð¾Ð¼ Ð¸Ð»Ð¸ ÐºÐ°Ñ?Ð°Ð»Ð¾Ð³Ð¾Ð¼"
 
-#: ../camel/providers/local/camel-spool-store.c:166
+#: ../camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "Ð?Ð°Ð¿ÐºÐ° Â«%s/%sÂ» Ð½Ðµ Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?ÐµÑ?."
 
-#: ../camel/providers/local/camel-spool-store.c:176
+#: ../camel/providers/local/camel-spool-store.c:173
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -4023,12 +3991,12 @@ msgstr ""
 "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ? Â«%sÂ»:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:180
+#: ../camel/providers/local/camel-spool-store.c:177
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "Ð?Ð°Ð¿ÐºÐ° Â«%sÂ» Ð½Ðµ Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?ÐµÑ?."
 
-#: ../camel/providers/local/camel-spool-store.c:185
+#: ../camel/providers/local/camel-spool-store.c:182
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -4037,48 +4005,48 @@ msgstr ""
 "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ? Â«%sÂ»:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:193
+#: ../camel/providers/local/camel-spool-store.c:190
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "Â«%sÂ» Ð½Ðµ Ñ?Ð²Ð»Ñ?ÐµÑ?Ñ?Ñ? Ñ?Ð°Ð¹Ð»Ð¾Ð¼ Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ð¾Ð³Ð¾ Ñ?Ñ?Ð¸ÐºÐ°."
 
-#: ../camel/providers/local/camel-spool-store.c:210
+#: ../camel/providers/local/camel-spool-store.c:207
 msgid "Store does not support an INBOX"
 msgstr "Ð¥Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÑ? INBOX"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:219
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Ð¤Ð°Ð¹Ð» Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ð¾Ð³Ð¾ Ñ?Ð¿Ñ?Ð»Ð° %s"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:219
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Ð?ÐµÑ?ÐµÐ²Ð¾ Ð¿Ð°Ð¿ÐºÐ¸ Ñ?Ð¿Ñ?Ð»Ð° %s"
 
-#: ../camel/providers/local/camel-spool-store.c:230
+#: ../camel/providers/local/camel-spool-store.c:227
 msgid "Spool folders cannot be renamed"
 msgstr "Ð?Ð°Ð¿ÐºÐ¸ Ñ?Ð¿Ñ?Ð»Ð° Ð½Ðµ Ð¼Ð¾Ð³Ñ?Ñ? Ð±Ñ?Ñ?Ñ? Ð¿ÐµÑ?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ñ?"
 
-#: ../camel/providers/local/camel-spool-store.c:238
+#: ../camel/providers/local/camel-spool-store.c:235
 msgid "Spool folders cannot be deleted"
 msgstr "Ð?Ð°Ð¿ÐºÐ¸ Ñ?Ð¿Ñ?Ð»Ð° Ð½Ðµ Ð¼Ð¾Ð³Ñ?Ñ? Ð±Ñ?Ñ?Ñ? Ñ?Ð´Ð°Ð»ÐµÐ½Ñ?"
 
-#: ../camel/providers/local/camel-spool-summary.c:181
-#: ../camel/providers/local/camel-spool-summary.c:191
-#: ../camel/providers/local/camel-spool-summary.c:201
+#: ../camel/providers/local/camel-spool-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"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¸Ð½Ñ?Ñ?Ð¾Ð½Ð¸Ð·Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð²Ñ?ÐµÐ¼ÐµÐ½Ð½Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ? %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:217
+#: ../camel/providers/local/camel-spool-summary.c:216
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¸Ð½Ñ?Ñ?Ð¾Ð½Ð¸Ð·Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ? Ñ?Ð¿Ñ?Ð»Ð°: %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:248
-#: ../camel/providers/local/camel-spool-summary.c:265
-#: ../camel/providers/local/camel-spool-summary.c:276
+#: ../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
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -4087,26 +4055,26 @@ msgstr ""
 "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¸Ð½Ñ?Ñ?Ð¾Ð½Ð¸Ð·Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ? Ð½Ð°ÐºÐ¾Ð¿Ð»ÐµÐ½Ð¸Ñ?: %s: %s\n"
 "Ð?Ð°Ð¿ÐºÐ° Ð¼Ð¾Ð¶ÐµÑ? Ð±Ñ?Ñ?Ñ? Ð¸Ñ?Ð¿Ð¾Ñ?Ñ?ÐµÐ½Ð°, ÐºÐ¾Ð¿Ð¸Ñ? Ñ?Ð¾Ñ?Ñ?Ð°Ð½ÐµÐ½Ð° Ð² Â«%sÂ»"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:137
-#: ../camel/providers/nntp/camel-nntp-folder.c:195
-#: ../camel/providers/nntp/camel-nntp-folder.c:227
+#: ../camel/providers/nntp/camel-nntp-folder.c:135
+#: ../camel/providers/nntp/camel-nntp-folder.c:192
+#: ../camel/providers/nntp/camel-nntp-folder.c:224
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "Ð?Ð½Ñ?Ñ?Ñ?ÐµÐ½Ð½Ñ?Ñ? Ð¾Ñ?Ð¸Ð±ÐºÐ°: UID Ð² Ð½ÐµÐ²ÐµÑ?Ð½Ð¾Ð¼ Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ðµ: %s"
 
+#: ../camel/providers/nntp/camel-nntp-folder.c:365
 #: ../camel/providers/nntp/camel-nntp-folder.c:368
-#: ../camel/providers/nntp/camel-nntp-folder.c:371
-#: ../camel/providers/nntp/camel-nntp-folder.c:413
-#: ../camel/providers/nntp/camel-nntp-folder.c:415
+#: ../camel/providers/nntp/camel-nntp-folder.c:410
+#: ../camel/providers/nntp/camel-nntp-folder.c:412
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° Ð¾Ñ?Ð¿Ñ?Ð°Ð²ÐºÐ¸ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ?: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:433
+#: ../camel/providers/nntp/camel-nntp-folder.c:430
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Ð?Ñ? Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð»Ñ?Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ? NNTP Ð²Ð¾ Ð²Ñ?ÐµÐ¼Ñ? Ð°Ð²Ñ?Ð¾Ð½Ð¾Ð¼Ð½Ð¾Ð¹ Ñ?Ð°Ð±Ð¾Ñ?Ñ?!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:444
+#: ../camel/providers/nntp/camel-nntp-folder.c:441
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Ð?Ñ? Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ ÐºÐ¾Ð¿Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ? Ð¸Ð· Ð¿Ð°Ð¿ÐºÐ¸ NNTP!"
 
@@ -4138,22 +4106,22 @@ msgstr ""
 "Ð?Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ðµ Ðº Ñ?ÐµÑ?Ð²ÐµÑ?Ñ? NNTP Ð±Ñ?Ð´ÐµÑ? Ð¿Ñ?Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ?Ñ?Ñ?Ñ? Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸ÐµÐ¼ "
 "Ð½ÐµÐ·Ð°Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð¿Ð°Ñ?Ð¾Ð»Ñ?."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:217
+#: ../camel/providers/nntp/camel-nntp-store.c:216
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ñ? Ð¿Ñ?Ð¸Ð²ÐµÑ?Ñ?Ñ?Ð²Ð¸Ðµ Ð¸Ð· %s: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:229
+#: ../camel/providers/nntp/camel-nntp-store.c:228
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "Ð¡ÐµÑ?Ð²ÐµÑ? NNTP %s Ð²ÐµÑ?Ð½Ñ?Ð» ÐºÐ¾Ð´ Ð¾Ñ?Ð¸Ð±ÐºÐ¸ %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:406
+#: ../camel/providers/nntp/camel-nntp-store.c:410
 #, c-format
 msgid "USENET News via %s"
 msgstr "Ð?Ð¾Ð²Ð¾Ñ?Ñ?Ð¸ USENET Ñ?ÐµÑ?ÐµÐ· %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:815
+#: ../camel/providers/nntp/camel-nntp-store.c:819
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4164,7 +4132,7 @@ msgstr ""
 "\n"
 " %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:909
+#: ../camel/providers/nntp/camel-nntp-store.c:913
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -4175,7 +4143,7 @@ msgstr ""
 "Ð?ÐµÑ? Ñ?Ð°ÐºÐ¾Ð¹ Ð³Ñ?Ñ?Ð¿Ð¿Ñ? Ð½Ð¾Ð²Ð¾Ñ?Ñ?ÐµÐ¹. Ð?Ñ?Ð±Ñ?Ð°Ð½Ð½Ñ?Ð¹ Ñ?Ð»ÐµÐ¼ÐµÐ½Ñ? Ñ?ÐºÐ¾Ñ?ÐµÐµ Ð²Ñ?ÐµÐ³Ð¾ Ñ?Ð²Ð»Ñ?ÐµÑ?Ñ?Ñ? "
 "Ñ?Ð¾Ð´Ð¸Ñ?ÐµÐ»Ñ?Ñ?ÐºÐ¾Ð¹ Ð¿Ð°Ð¿ÐºÐ¾Ð¹."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:941
+#: ../camel/providers/nntp/camel-nntp-store.c:945
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -4185,66 +4153,66 @@ msgstr ""
 "\n"
 "Ð?Ñ?Ñ?Ð¿Ð¿Ð° Ð½Ð¾Ð²Ð¾Ñ?Ñ?ÐµÐ¹ Ð½Ðµ Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?ÐµÑ?!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:966
+#: ../camel/providers/nntp/camel-nntp-store.c:970
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "Ð?Ñ? Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ? Ð² Ð³Ñ?Ñ?Ð¿Ð¿Ð°Ñ? Ð½Ð¾Ð²Ð¾Ñ?Ñ?ÐµÐ¹: Ð²Ð¼ÐµÑ?Ñ?Ð¾ Ñ?Ñ?Ð¾Ð³Ð¾ Ñ?Ð»ÐµÐ´Ñ?ÐµÑ? "
 "Ð¿Ð¾Ð´Ð¿Ð¸Ñ?Ð°Ñ?Ñ?Ñ?Ñ?."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:974
+#: ../camel/providers/nntp/camel-nntp-store.c:978
 msgid "You cannot rename a folder in a News store."
 msgstr "Ð?Ñ? Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð¿ÐµÑ?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ? Ð² Ð³Ñ?Ñ?Ð¿Ð¿Ð°Ñ? Ð½Ð¾Ð²Ð¾Ñ?Ñ?ÐµÐ¹."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:982
+#: ../camel/providers/nntp/camel-nntp-store.c:986
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Ð?Ñ? Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ñ?Ð´Ð°Ð»Ð¸Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ? Ð² Ð³Ñ?Ñ?Ð¿Ð¿Ð°Ñ? Ð½Ð¾Ð²Ð¾Ñ?Ñ?ÐµÐ¹: Ð²Ð¼ÐµÑ?Ñ?Ð¾ Ñ?Ñ?Ð¾Ð³Ð¾ Ñ?Ð»ÐµÐ´Ñ?ÐµÑ? "
 "Ð¾Ñ?Ð¿Ð¸Ñ?Ð°Ñ?Ñ?Ñ?Ñ?."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1171
+#: ../camel/providers/nntp/camel-nntp-store.c:1180
 msgid "Authentication requested but no username provided"
 msgstr "Ð¢Ñ?ÐµÐ±Ñ?ÐµÑ?Ñ?Ñ? Ð¿Ñ?Ð¾Ð²ÐµÑ?ÐºÐ° Ð¿Ð¾Ð´Ð»Ð¸Ð½Ð½Ð¾Ñ?Ñ?Ð¸, Ð½Ð¾ Ð¸Ð¼Ñ? Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»Ñ? Ð½Ðµ Ñ?ÐºÐ°Ð·Ð°Ð½Ð¾"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1183
+#: ../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:1306
+#: ../camel/providers/nntp/camel-nntp-store.c:1315
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "Ð¡Ð±Ð¾Ð¹ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ? NNTP: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1360
+#: ../camel/providers/nntp/camel-nntp-store.c:1369
 msgid "Not connected."
 msgstr "Ð?Ðµ Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1413
+#: ../camel/providers/nntp/camel-nntp-store.c:1422
 #, c-format
 msgid "No such folder: %s"
 msgstr "Ð?ÐµÑ? Ñ?Ð°ÐºÐ¾Ð¹ Ð¿Ð°Ð¿ÐºÐ¸: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:271
-#: ../camel/providers/nntp/camel-nntp-summary.c:364
+#: ../camel/providers/nntp/camel-nntp-summary.c:272
+#: ../camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Ð?Ð¾Ð¸Ñ?Ðº Ð½Ð¾Ð²Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ð¹"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:278
+#: ../camel/providers/nntp/camel-nntp-summary.c:279
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "Ð?ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ñ?Ð¹ Ð¾Ñ?Ð²ÐµÑ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð° Ð¾Ñ? xover: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:378
+#: ../camel/providers/nntp/camel-nntp-summary.c:384
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "Ð?ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ñ?Ð¹ Ð¾Ñ?Ð²ÐµÑ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð° Ð¾Ñ? head: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:414
+#: ../camel/providers/nntp/camel-nntp-summary.c:420
 msgid "Use cancel"
 msgstr "Ð?Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð¾Ñ?Ð¼ÐµÐ½ÐµÐ½Ð¾"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:416
+#: ../camel/providers/nntp/camel-nntp-summary.c:422
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ð¸: %s"
@@ -4284,27 +4252,31 @@ msgid "Unknown reason"
 msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ð°Ñ? Ð¿Ñ?Ð¸Ñ?Ð¸Ð½Ð°"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:43
+msgid "Message storage"
+msgstr "Ð¥Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ð¹"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
 msgid "_Leave messages on server"
 msgstr "_Ð?Ñ?Ñ?Ð°Ð²Ð»Ñ?Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ? Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ðµ"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:47
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "_Ð£Ð´Ð°Ð»Ñ?Ñ?Ñ? Ñ?ÐµÑ?ÐµÐ· %s Ð´Ð½ÐµÐ¹"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:49
 msgid "Disable _support for all POP3 extensions"
 msgstr "Ð?Ð°Ð¿Ñ?ÐµÑ?Ð¸Ñ?Ñ? _Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶ÐºÑ? Ð²Ñ?ÐµÑ? Ñ?Ð°Ñ?Ñ?Ð¸Ñ?ÐµÐ½Ð¸Ð¹ POP3"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:57
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:59
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Ð?Ð»Ñ? Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð¸ Ð¿Ñ?Ð¸Ð½Ñ?Ñ?Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?Ñ? Ñ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð¾Ð² POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
+#: ../camel/providers/pop3/camel-pop3-provider.c:76
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4313,7 +4285,7 @@ msgstr ""
 "Ð½ÐµÐ·Ð°Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð¿Ð°Ñ?Ð¾Ð»Ñ?. Ð?Ð¾Ð»Ñ?Ñ?Ð¸Ð½Ñ?Ñ?Ð²Ð¾Ð¼ Ñ?ÐµÑ?Ð²ÐµÑ?Ð¾Ð² POP Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÑ?Ñ?Ñ? Ñ?Ð¾Ð»Ñ?ÐºÐ¾ "
 "Ñ?Ñ?Ð¾Ñ? Ð²Ð°Ñ?Ð¸Ð°Ð½Ñ?."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:84
+#: ../camel/providers/pop3/camel-pop3-provider.c:86
 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 "
@@ -4323,34 +4295,38 @@ msgstr ""
 "Ð¿Ð°Ñ?Ð¾Ð»Ñ? Ð¿Ð¾ Ð¿Ñ?Ð¾Ñ?Ð¾ÐºÐ¾Ð»Ñ? APOP. ÐÑ?Ð¾ Ð¼Ð¾Ð¶ÐµÑ? Ñ?Ð°Ð±Ð¾Ñ?Ð°Ñ?Ñ? Ð½Ðµ Ð´Ð»Ñ? Ð²Ñ?ÐµÑ? Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»ÐµÐ¹ Ð´Ð°Ð¶Ðµ "
 "Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ð°Ñ?, Ñ?ÐºÐ¾Ð±Ñ? Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°Ñ?Ñ?Ð¸Ñ? ÐµÐ³Ð¾."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:209
+#: ../camel/providers/pop3/camel-pop3-store.c:229
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¿Ñ?Ð¸Ð³Ð»Ð°Ñ?ÐµÐ½Ð¸Ðµ Ð¾Ñ? POP-Ñ?ÐµÑ?Ð²ÐµÑ?Ð° %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:226
-#: ../camel/providers/pop3/camel-pop3-store.c:240
-#: ../camel/providers/pop3/camel-pop3-store.c:250
-#: ../camel/providers/pop3/camel-pop3-store.c:256
+#: ../camel/providers/pop3/camel-pop3-store.c:246
+#: ../camel/providers/pop3/camel-pop3-store.c:274
+#: ../camel/providers/pop3/camel-pop3-store.c:280
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ñ?Ð¸ Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ð¸ Ðº Ñ?ÐµÑ?Ð²ÐµÑ?Ñ? POP %s Ð² Ð·Ð°Ñ?Ð¸Ñ?ÐµÐ½Ð½Ð¾Ð¼ Ñ?ÐµÐ¶Ð¸Ð¼Ðµ: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:227
+#: ../camel/providers/pop3/camel-pop3-store.c:247
 msgid "STLS not supported by server"
 msgstr "STLS Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÑ?Ñ?Ñ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð¾Ð¼"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:257
+#: ../camel/providers/pop3/camel-pop3-store.c:262
+#, 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
 msgid "TLS is not available in this build"
 msgstr "TLS Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÑ?Ñ?Ñ? Ð² Ñ?Ñ?Ð¾Ð¹ Ñ?Ð±Ð¾Ñ?ÐºÐµ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:363
+#: ../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:404
-#: ../camel/providers/pop3/camel-pop3-store.c:537
+#: ../camel/providers/pop3/camel-pop3-store.c:428
+#: ../camel/providers/pop3/camel-pop3-store.c:565
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -4359,22 +4335,22 @@ msgstr ""
 "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ?Ñ?Ñ? Ðº Ñ?ÐµÑ?Ð²ÐµÑ?Ñ? POP %s: Ð?Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÑ?Ñ?Ñ? Ð·Ð°Ñ?Ñ?ÐµÐ±Ð¾Ð²Ð°Ð½Ð½Ñ?Ð¹ "
 "Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ð¸."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:420
+#: ../camel/providers/pop3/camel-pop3-store.c:446
 #, c-format
-msgid "SASL '%s' Login failed for POP server %s: %s"
-msgstr "SASL Â«%sÂ» Ð?Ñ?Ð¸Ð±ÐºÐ° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ð¸ Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ðµ POP %s: %s"
+msgid "SASL '%s' Login failed for POP server %s%s"
+msgstr "SASL Â«%sÂ» Ð?Ñ?Ð¸Ð±ÐºÐ° Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ð¸ Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ðµ POP %s%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:432
+#: ../camel/providers/pop3/camel-pop3-store.c:460
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð·Ð°Ñ?ÐµÐ³Ð¸Ñ?Ñ?Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ?Ñ?Ñ? Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ðµ POP %s: Ð?Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¾Ñ?Ð¾ÐºÐ¾Ð»Ð° SASL"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:451
+#: ../camel/providers/pop3/camel-pop3-store.c:479
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Ð¡Ð±Ð¾Ð¹ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ð¸ Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ðµ POP %s: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:510
+#: ../camel/providers/pop3/camel-pop3-store.c:538
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4384,8 +4360,7 @@ msgstr ""
 "Ð½ÐµÐºÐ¾Ñ?Ñ?ÐµÐºÑ?Ð½Ñ?Ð¹ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? APOP. Ð?Ð¾Ð·Ð½Ð¸ÐºÐ°ÐµÑ? Ð¿Ð¾Ð´Ð¾Ð·Ñ?ÐµÐ½Ð¸Ðµ Ð¾ Ð¿Ñ?Ð¾Ð²ÐµÐ´ÐµÐ½Ð¸Ðµ Ð°Ñ?Ð°ÐºÐ¸ Ð½Ð° "
 "Ð¿ÐµÑ?Ñ?Ð¾Ð½Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?. Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ñ?Ð²Ñ?Ð¶Ð¸Ñ?ÐµÑ?Ñ? Ñ? Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¾Ñ?Ð¾Ð¼."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:551
-#: ../camel/providers/pop3/camel-pop3-store.c:564
+#: ../camel/providers/pop3/camel-pop3-store.c:579
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4394,16 +4369,25 @@ msgstr ""
 "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ?Ñ?Ñ? Ðº Ñ?ÐµÑ?Ð²ÐµÑ?Ñ? POP%s.\n"
 "Ð?Ñ?Ð¸Ð±ÐºÐ° Ð¾Ñ?Ð¿Ñ?Ð°Ð²ÐºÐ¸ Ð¿Ð°Ñ?Ð¾Ð»Ñ?: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:558
+#: ../camel/providers/pop3/camel-pop3-store.c:588
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending username: %s"
+"Error sending username%s"
 msgstr ""
 "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ?Ñ?Ñ? Ðº Ñ?ÐµÑ?Ð²ÐµÑ?Ñ? POP %s.\n"
-"Ð?Ñ?Ð¸Ð±ÐºÐ° Ð¾Ñ?Ð¿Ñ?Ð°Ð²ÐºÐ¸ Ð¸Ð¼ÐµÐ½Ð¸ Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»Ñ?: %s"
+"Ð?Ñ?Ð¸Ð±ÐºÐ° Ð¾Ñ?Ð¿Ñ?Ð°Ð²ÐºÐ¸ Ð¸Ð¼ÐµÐ½Ð¸ Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»Ñ?%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:671
+#: ../camel/providers/pop3/camel-pop3-store.c:597
+#, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending password%s"
+msgstr ""
+"Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ?Ñ?Ñ? Ðº Ñ?ÐµÑ?Ð²ÐµÑ?Ñ? POP%s.\n"
+"Ð?Ñ?Ð¸Ð±ÐºÐ° Ð¾Ñ?Ð¿Ñ?Ð°Ð²ÐºÐ¸ Ð¿Ð°Ñ?Ð¾Ð»Ñ?%s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:703
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Ð?ÐµÑ? Ñ?Ð°ÐºÐ¾Ð¹ Ð¿Ð°Ð¿ÐºÐ¸ Â«%sÂ»."
@@ -4419,177 +4403,177 @@ msgid ""
 msgstr ""
 "Ð?Ð»Ñ? Ð´Ð¾Ñ?Ñ?Ð°Ð²ÐºÐ¸ Ð¿Ð¾Ñ?Ñ?Ñ? Ð¿Ñ?Ñ?ÐµÐ¼ Ð·Ð°Ð¿Ñ?Ñ?ÐºÐ° Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð¼Ñ? \"sendmail\" Ð½Ð° Ð»Ð¾ÐºÐ°Ð»Ñ?Ð½Ð¾Ð¹ Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ðµ."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:115
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?Ð°Ñ?Ñ? Ñ?Ð¿Ð¸Ñ?Ð¾Ðº Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ñ?ÐµÐ»ÐµÐ¹"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:146
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? ÐºÐ°Ð½Ð°Ð» Ðº Sendmail: %s: Ð¿Ð¾Ñ?Ñ?Ð° Ð½Ðµ Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð»ÐµÐ½Ð°"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:167
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð·Ð°Ð¿Ñ?Ñ?Ñ?Ð¸Ñ?Ñ? Sendmail: %s: Ð¿Ð¾Ñ?Ñ?Ð° Ð½Ðµ Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð»ÐµÐ½Ð°"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:237
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:235
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "Sendmail Ð·Ð°Ð²ÐµÑ?Ñ?Ð¸Ð» Ñ?Ð°Ð±Ð¾Ñ?Ñ? Ñ? Ñ?Ð¸Ð³Ð½Ð°Ð»Ð¾Ð¼ %s: Ð¿Ð¾Ñ?Ñ?Ð° Ð½Ðµ Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð»ÐµÐ½Ð°."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:244
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:242
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð²Ñ?Ð¿Ð¾Ð»Ð½Ð¸Ñ?Ñ? %s: Ð¿Ð¾Ñ?Ñ?Ð° Ð½Ðµ Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð»ÐµÐ½Ð°."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:249
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:247
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "Sendmail Ð·Ð°Ð²ÐµÑ?Ñ?Ð¸Ð»Ð° Ñ?Ð°Ð±Ð¾Ñ?Ñ? Ñ? Ñ?ÐµÐ·Ñ?Ð»Ñ?Ñ?Ð°Ñ?Ð¾Ð¼ %d: Ð¿Ð¾Ñ?Ñ?Ð° Ð½Ðµ Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð»ÐµÐ½Ð°."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:261
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:265
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
 msgid "Mail delivery via the sendmail program"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²ÐºÐ° Ð¿Ð¾Ñ?Ñ?Ñ? Ñ?ÐµÑ?ÐµÐ· Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð¼Ñ? sendmail"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:39
+#: ../camel/providers/smtp/camel-smtp-provider.c:41
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 "Ð?Ð»Ñ? Ð´Ð¾Ñ?Ñ?Ð°Ð²ÐºÐ¸ Ð¿Ð¾Ñ?Ñ?Ñ? Ð¿Ñ?Ñ?ÐµÐ¼ Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ðº Ñ?Ð´Ð°Ð»Ñ?Ð½Ð½Ð¾Ð¼Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ð¾Ð¼Ñ? ÐºÐ¾Ð½Ñ?ÐµÐ½Ñ?Ñ?Ð°Ñ?Ð¾Ñ?Ñ? Ð¿Ð¾ "
 "Ð¿Ñ?Ð¾Ñ?Ð¾ÐºÐ¾Ð»Ñ? SMTP."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:168
+#: ../camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Syntax error, command unrecognized"
 msgstr "Ð¡Ð¸Ð½Ñ?Ð°ÐºÑ?Ð¸Ñ?ÐµÑ?ÐºÐ°Ñ? Ð¾Ñ?Ð¸Ð±ÐºÐ°, ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Ð½Ðµ Ñ?Ð°Ñ?Ð¿Ð¾Ð·Ð½Ð°Ð½Ð°"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error in parameters or arguments"
 msgstr "Ð¡Ð¸Ð½Ñ?Ð°ÐºÑ?Ð¸Ñ?ÐµÑ?ÐºÐ°Ñ? Ð¾Ñ?Ð¸Ð±ÐºÐ° Ð² Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð°Ñ? Ð¸Ð»Ð¸ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ?Ð°Ñ?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:172
+#: ../camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Command not implemented"
 msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð° Ð½Ðµ Ñ?ÐµÐ°Ð»Ð¸Ð·Ð¾Ð²Ð°Ð½Ð°"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:174
+#: ../camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command parameter not implemented"
 msgstr "Ð?Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ? ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ? Ð½Ðµ Ñ?ÐµÐ°Ð»Ð¸Ð·Ð¾Ð²Ð°Ð½"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:176
+#: ../camel/providers/smtp/camel-smtp-transport.c:175
 msgid "System status, or system help reply"
 msgstr "Ð¡Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ðµ Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ñ? Ð¸Ð»Ð¸ Ð¾Ñ?Ð²ÐµÑ? Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð½Ð¾Ð¹ Ñ?Ð¿Ñ?Ð°Ð²ÐºÐ¸"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:178
+#: ../camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Help message"
 msgstr "Ð¡Ð¿Ñ?Ð°Ð²Ð¾Ñ?Ð½Ð¾Ðµ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:180
+#: ../camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Service ready"
 msgstr "Ð¡ÐµÑ?Ð²Ð¸Ñ? Ð³Ð¾Ñ?Ð¾Ð²"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:182
+#: ../camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service closing transmission channel"
 msgstr "Ð¡ÐµÑ?Ð²Ð¸Ñ? Ð·Ð°ÐºÑ?Ñ?Ð²Ð°ÐµÑ? ÐºÐ°Ð½Ð°Ð» Ð¿ÐµÑ?ÐµÐ´Ð°Ñ?Ð¸"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service not available, closing transmission channel"
 msgstr "Ð¡ÐµÑ?Ð²Ð¸Ñ? Ð½Ðµ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿ÐµÐ½, Ð·Ð°ÐºÑ?Ñ?Ñ?Ð¸Ðµ ÐºÐ°Ð½Ð°Ð»Ð° Ð¿ÐµÑ?ÐµÐ´Ð°Ñ?Ð¸"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:186
+#: ../camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Requested mail action okay, completed"
 msgstr "Ð?Ð°Ð¿Ñ?Ð¾Ñ?ÐµÐ½Ð½Ð¾Ðµ Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ð¾Ðµ Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ Ð²Ñ?Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¾"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:188
+#: ../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:190
+#: ../camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Ð?Ð°Ð¿Ñ?Ð¾Ñ?ÐµÐ½Ð½Ð¾Ðµ Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾Ð¹ Ð½Ðµ Ð²Ñ?Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¾: Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ñ?Ð¹ Ñ?Ñ?Ð¸Ðº Ð½ÐµÐ´Ð¾Ñ?Ñ?Ñ?Ð¿ÐµÐ½"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
+#: ../camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Ð?Ð°Ð¿Ñ?Ð¾Ñ?ÐµÐ½Ð½Ð¾Ðµ Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ Ð½Ðµ Ð²Ñ?Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¾: Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ñ?Ð¹ Ñ?Ñ?Ð¸Ðº Ð½ÐµÐ´Ð¾Ñ?Ñ?Ñ?Ð¿ÐµÐ½"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:194
+#: ../camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action aborted: error in processing"
 msgstr "Ð?Ð°Ð¿Ñ?Ð¾Ñ?ÐµÐ½Ð½Ð¾Ðµ Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ Ð¿Ñ?ÐµÑ?Ð²Ð°Ð½Ð¾: Ð¾Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¸ Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?ÐºÐµ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
+#: ../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:198
+#: ../camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 "Ð?Ð°Ð¿Ñ?Ð¾Ñ?ÐµÐ½Ð½Ð¾Ðµ Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ Ð½Ðµ Ð²Ñ?Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¾: Ð½ÐµÐ´Ð¾Ñ?Ñ?Ð°Ñ?Ð¾Ñ?Ð½Ð¾ Ð¼ÐµÑ?Ñ?Ð° Ð² Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð½Ð¾Ð¼ Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Ð?Ð°Ð¿Ñ?Ð¾Ñ?ÐµÐ½Ð½Ð¾Ðµ Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ Ð¿Ñ?ÐµÑ?Ð²Ð°Ð½Ð¾: Ð¸Ñ?Ñ?ÐµÑ?Ð¿Ð°Ð½Ð¾ Ð¼ÐµÑ?Ñ?Ð¾ Ð² Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
+#: ../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:204
+#: ../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:206
+#: ../camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Transaction failed"
 msgstr "Ð¡Ð±Ð¾Ð¹ Ñ?Ñ?Ð°Ð½Ð·Ð°ÐºÑ?Ð¸Ð¸"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:210
+#: ../camel/providers/smtp/camel-smtp-transport.c:209
 msgid "A password transition is needed"
 msgstr "Ð?ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼Ð° Ð¿ÐµÑ?ÐµÐ´Ð°Ñ?Ð° Ð¿Ð°Ñ?Ð¾Ð»Ñ?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:212
+#: ../camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Authentication mechanism is too weak"
 msgstr "Ð¡Ð»Ð¸Ñ?ÐºÐ¾Ð¼ Ñ?Ð»Ð°Ð±Ñ?Ð¹ Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼ Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ð¸"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:214
+#: ../camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Ð?Ð»Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ?ÐµÐ½Ð½Ð¾Ð³Ð¾ Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð¼Ð° Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ð¸ Ñ?Ñ?ÐµÐ±Ñ?ÐµÑ?Ñ?Ñ? Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð¸Ðµ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:216
+#: ../camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Temporary authentication failure"
 msgstr "Ð?Ñ?ÐµÐ¼ÐµÐ½Ð½Ñ?Ð¹ Ñ?Ð±Ð¾Ð¹ Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ð¸"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:297
+#: ../camel/providers/smtp/camel-smtp-transport.c:296
 msgid "Welcome response error"
 msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¸ Ð¾Ñ?Ð²ÐµÑ?Ðµ Ð½Ð° Ð¿Ñ?Ð¸Ð²ÐµÑ?Ñ?Ñ?Ð²Ð¸Ðµ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
-#: ../camel/providers/smtp/camel-smtp-transport.c:365
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
+#: ../camel/providers/smtp/camel-smtp-transport.c:331
+#: ../camel/providers/smtp/camel-smtp-transport.c:364
+#: ../camel/providers/smtp/camel-smtp-transport.c:370
 #, 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:341
+#: ../camel/providers/smtp/camel-smtp-transport.c:340
 #, c-format
 msgid "STARTTLS command failed: %s"
 msgstr "Ð¡Ð±Ð¾Ð¹ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ? STARTTLS: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:356
+#: ../camel/providers/smtp/camel-smtp-transport.c:355
 msgid "STARTTLS command failed"
 msgstr "Ð¡Ð±Ð¾Ð¹ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ? STARTTLS"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:497
+#: ../camel/providers/smtp/camel-smtp-transport.c:496
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "Ð¡ÐµÑ?Ð²ÐµÑ? SMTP %s Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÑ? Ð·Ð°Ñ?Ñ?ÐµÐ±Ð¾Ð²Ð°Ð½Ð½Ñ?Ð¹ Ñ?Ð¸Ð¿ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ð¸ %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:568
+#: ../camel/providers/smtp/camel-smtp-transport.c:567
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4600,95 +4584,95 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:701
+#: ../camel/providers/smtp/camel-smtp-transport.c:700
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP Ñ?ÐµÑ?Ð²ÐµÑ? %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:703
+#: ../camel/providers/smtp/camel-smtp-transport.c:702
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²ÐºÐ° SMTP Ð¿Ð¾Ñ?Ñ?Ñ? Ñ?ÐµÑ?ÐµÐ· %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:721
+#: ../camel/providers/smtp/camel-smtp-transport.c:720
 msgid "Cannot send message: service not connected."
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ: Ñ?ÐµÑ?Ð²Ð¸Ñ? Ð½Ðµ Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:726
 msgid "Cannot send message: sender address not valid."
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ: Ð½ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ð°Ð´Ñ?ÐµÑ? Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð¸Ñ?ÐµÐ»Ñ?."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:731
+#: ../camel/providers/smtp/camel-smtp-transport.c:730
 msgid "Sending message"
 msgstr "Ð?Ñ?Ð¿Ñ?Ð°Ð²ÐºÐ° Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:746
+#: ../camel/providers/smtp/camel-smtp-transport.c:745
 msgid "Cannot send message: no recipients defined."
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ: Ð½Ðµ Ð¾Ð¿Ñ?ÐµÐ´ÐµÐ»ÐµÐ½Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ñ?ÐµÐ»Ð¸."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:757
+#: ../camel/providers/smtp/camel-smtp-transport.c:756
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ñ? Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ: Ñ?ÐºÐ°Ð·Ð°Ð½ Ð¾Ð´Ð¸Ð½ Ð¸Ð»Ð¸  Ð½ÐµÑ?ÐºÐ¾Ð»Ñ?ÐºÐ¾ Ð½ÐµÐºÐ¾Ñ?Ñ?ÐµÐºÑ?Ð½Ñ?Ñ? "
 "Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ñ?ÐµÐ»ÐµÐ¹"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:986
+#: ../camel/providers/smtp/camel-smtp-transport.c:985
 msgid "SMTP Greeting"
 msgstr "Ð?Ñ?Ð¸Ð²ÐµÑ?Ñ?Ñ?Ð²Ð¸Ðµ SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1011
+#: ../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:1028
+#: ../camel/providers/smtp/camel-smtp-transport.c:1027
 msgid "HELO command failed"
 msgstr "Ð¡Ð±Ð¾Ð¹ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ? HELO"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1094
+#: ../camel/providers/smtp/camel-smtp-transport.c:1093
 msgid "SMTP Authentication"
 msgstr "Ð?Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ? SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1100
+#: ../camel/providers/smtp/camel-smtp-transport.c:1099
 msgid "Error creating SASL authentication object."
 msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð¾Ð·Ð´Ð°Ð½Ð¸Ð¸ Ð¾Ð±Ñ?ÐµÐºÑ?Ð° Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ð¸ SASL."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1117
-#: ../camel/providers/smtp/camel-smtp-transport.c:1128
+#: ../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:1134
+#: ../camel/providers/smtp/camel-smtp-transport.c:1133
 msgid "AUTH command failed"
 msgstr "Ð¡Ð±Ð¾Ð¹ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ? AUTH"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1204
+#: ../camel/providers/smtp/camel-smtp-transport.c:1203
 msgid "Bad authentication response from server.\n"
 msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ð¾Ñ?Ð²ÐµÑ? Ð¾Ñ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð° Ð¿Ñ?Ð¸ Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ð¸.\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1231
+#: ../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:1248
+#: ../camel/providers/smtp/camel-smtp-transport.c:1247
 msgid "MAIL FROM command failed"
 msgstr "Ð¡Ð±Ð¾Ð¹ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ? MAIL FROM"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1272
+#: ../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:1291
+#: ../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:1331
-#: ../camel/providers/smtp/camel-smtp-transport.c:1400
-#: ../camel/providers/smtp/camel-smtp-transport.c:1419
+#: ../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: Ð¿Ð¾Ñ?Ñ?Ð° Ð½Ðµ Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð»ÐµÐ½Ð°"
@@ -4696,108 +4680,108 @@ msgstr "Ð¡Ð±Ð¾Ð¹ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ? DATA: %s: Ð¿Ð¾Ñ?Ñ?Ð° Ð½Ðµ Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð»ÐµÐ½Ð°"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1348
-#: ../camel/providers/smtp/camel-smtp-transport.c:1435
+#: ../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:1458
+#: ../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:1474
+#: ../camel/providers/smtp/camel-smtp-transport.c:1473
 msgid "RSET command failed"
 msgstr "Ð¡Ð±Ð¾Ð¹ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ? RSET"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1497
+#: ../camel/providers/smtp/camel-smtp-transport.c:1496
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "Ð¡Ð±Ð¾Ð¹ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ? QUIT: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1511
+#: ../camel/providers/smtp/camel-smtp-transport.c:1510
 msgid "QUIT command failed"
 msgstr "Ð¡Ð±Ð¾Ð¹ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ? QUIT"
 
-#: ../libedataserver/e-categories.c:45
+#: ../libedataserver/e-categories.c:47
 msgid "Business"
 msgstr "Ð?Ð¸Ð·Ð½ÐµÑ?"
 
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:48
 msgid "Competition"
 msgstr "Ð?Ð¾Ð½ÐºÑ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?"
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:49
 msgid "Favorites"
 msgstr "Ð?Ñ?Ð±Ð¸Ð¼Ð¾Ðµ"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:50
 msgid "Gifts"
 msgstr "Ð?Ð¾Ð´Ð°Ñ?ÐºÐ¸"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:51
 msgid "Goals/Objectives"
 msgstr "Ð¦ÐµÐ»Ð¸/Ð·Ð°Ð´Ð°Ñ?Ð¸"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:52
 msgid "Holiday"
 msgstr "Ð?Ñ?Ð°Ð·Ð´Ð½Ð¸Ðº (Ð²Ñ?Ñ?Ð¾Ð´Ð½Ð¾Ð¹)"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:53
 msgid "Holiday Cards"
 msgstr "Ð?Ð¾Ð·Ð´Ñ?Ð°Ð²Ð¸Ñ?ÐµÐ»Ñ?Ð½Ñ?Ðµ Ð¾Ñ?ÐºÑ?Ñ?Ñ?ÐºÐ¸"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:55
 msgid "Hot Contacts"
 msgstr "Ð?Ð¾Ñ?Ñ?Ñ?Ð¸Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ñ?"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:56
 msgid "Ideas"
 msgstr "Ð?Ð´ÐµÐ¸"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:57
 msgid "International"
 msgstr "Ð?ÐµÐ¶Ð´Ñ?Ð½Ð°Ñ?Ð¾Ð´Ð½Ñ?Ðµ"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:58
 msgid "Key Customer"
 msgstr "Ð?Ð»Ñ?Ñ?ÐµÐ²Ð¾Ð¹ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð¸Ñ?ÐµÐ»Ñ?"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:59
 msgid "Miscellaneous"
 msgstr "Ð Ð°Ð·Ð½Ð¾Ðµ"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:60
 msgid "Personal"
 msgstr "Ð?Ð¸Ñ?Ð½Ð¾Ðµ"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:61
 msgid "Phone Calls"
 msgstr "Ð¢ÐµÐ»ÐµÑ?Ð¾Ð½Ð½Ñ?Ðµ Ð·Ð²Ð¾Ð½ÐºÐ¸"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:63
 msgid "Status"
 msgstr "Ð¡Ñ?Ð°Ñ?Ñ?Ñ?"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:64
 msgid "Strategies"
 msgstr "Ð¡Ñ?Ñ?Ð°Ñ?ÐµÐ³Ð¸Ð¸"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:65
 msgid "Suppliers"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð¸ÐºÐ¸"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:66
 msgid "Time & Expenses"
 msgstr "Ð?Ñ?ÐµÐ¼Ñ? Ð¸ Ñ?Ð°Ñ?Ñ?Ð¾Ð´Ñ?"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:67
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:68
 msgid "Waiting"
 msgstr "Ð?Ð¶Ð¸Ð´Ð°Ð½Ð¸Ðµ"
 
@@ -4805,7 +4789,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:1644 ../libedataserver/e-time-utils.c:1911
+#: ../libedataserver/e-time-utils.c:1633 ../libedataserver/e-time-utils.c:1898
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
@@ -4813,7 +4797,7 @@ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1649 ../libedataserver/e-time-utils.c:1902
+#: ../libedataserver/e-time-utils.c:1638 ../libedataserver/e-time-utils.c:1889
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
@@ -4821,7 +4805,7 @@ msgstr "%a %d/%m/%Y %H:%M:%S"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1654 ../libedataserver/e-time-utils.c:1907
+#: ../libedataserver/e-time-utils.c:1643 ../libedataserver/e-time-utils.c:1894
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
@@ -4829,78 +4813,78 @@ msgstr "%a %d/%m/%Y %I:%M %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1659 ../libedataserver/e-time-utils.c:1898
+#: ../libedataserver/e-time-utils.c:1648 ../libedataserver/e-time-utils.c:1885
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1664
+#: ../libedataserver/e-time-utils.c:1653
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1669
+#: ../libedataserver/e-time-utils.c:1658
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d/%m/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1672 ../libedataserver/e-time-utils.c:1773
-#: ../libedataserver/e-time-utils.c:1893
+#: ../libedataserver/e-time-utils.c:1661 ../libedataserver/e-time-utils.c:1761
+#: ../libedataserver/e-time-utils.c:1880
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1680
+#: ../libedataserver/e-time-utils.c:1668
 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:1684
+#: ../libedataserver/e-time-utils.c:1672
 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:1689
+#: ../libedataserver/e-time-utils.c:1677
 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:1694
+#: ../libedataserver/e-time-utils.c:1682
 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:1699
+#: ../libedataserver/e-time-utils.c:1687
 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:1704
+#: ../libedataserver/e-time-utils.c:1692
 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:1707 ../libedataserver/e-time-utils.c:1776
+#: ../libedataserver/e-time-utils.c:1695 ../libedataserver/e-time-utils.c:1764
 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:1834 ../libedataserver/e-time-utils.c:1956
+#: ../libedataserver/e-time-utils.c:1822 ../libedataserver/e-time-utils.c:1942
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1838 ../libedataserver/e-time-utils.c:1948
+#: ../libedataserver/e-time-utils.c:1826 ../libedataserver/e-time-utils.c:1934
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4908,24 +4892,24 @@ msgstr "%H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1843 ../libedataserver/e-time-utils.c:1953
+#: ../libedataserver/e-time-utils.c:1831 ../libedataserver/e-time-utils.c:1939
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1847 ../libedataserver/e-time-utils.c:1945
+#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1931
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1850
+#: ../libedataserver/e-time-utils.c:1838
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1854
+#: ../libedataserver/e-time-utils.c:1842
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -4937,54 +4921,58 @@ msgstr "Ð?Ð½Ð¾Ð½Ð¸Ð¼Ð½Ñ?Ð¹ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿ Ðº Ñ?ÐµÑ?Ð²ÐµÑ?Ñ? LDAP"
 msgid "Failed to authenticate.\n"
 msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° Ð°Ð²Ñ?Ð¾Ñ?Ð¸Ð·Ð°Ñ?Ð¸Ð¸.\n"
 
-#: ../libedataserverui/e-categories-dialog.c:362
+#: ../libedataserverui/e-categories-dialog.c:145
+msgid "Category Icon"
+msgstr "Ð?Ð½Ð°Ñ?Ð¾Ðº ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ð¸"
+
+#: ../libedataserverui/e-categories-dialog.c:151
+msgid "_No Image"
+msgstr "Ð?ÐµÑ? _Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ?"
+
+#: ../libedataserverui/e-categories-dialog.c:372
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "Ð?Ð°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ? Ñ? Ð¸Ð¼ÐµÐ½ÐµÐ¼ Â«%sÂ» Ñ?Ð¶Ðµ ÐµÑ?Ñ?Ñ?. Ð?Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ñ?Ð¹Ñ?Ðµ Ð´Ñ?Ñ?Ð³Ð¾Ðµ Ð¸Ð¼Ñ?"
 
-#: ../libedataserverui/e-categories-dialog.c:526
+#: ../libedataserverui/e-categories-dialog.c:680
 msgid "Icon"
 msgstr "Ð?Ð½Ð°Ñ?Ð¾Ðº"
 
-#: ../libedataserverui/e-categories-dialog.c:531
+#: ../libedataserverui/e-categories-dialog.c:685
 msgid "Category"
 msgstr "Ð?Ð°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:1
-msgid "Category Icon"
-msgstr "Ð?Ð½Ð°Ñ?Ð¾Ðº ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ð¸"
-
-#: ../libedataserverui/e-categories-dialog.glade.h:2
+#: ../libedataserverui/e-categories-dialog.ui.h:1
 msgid "Category Properties"
 msgstr "Ð¡Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð° ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ð¸"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:3
+#: ../libedataserverui/e-categories-dialog.ui.h:2
 msgid "Category _Icon"
 msgstr "_Ð?Ð½Ð°Ñ?Ð¾Ðº ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ð¸"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:4
+#: ../libedataserverui/e-categories-dialog.ui.h:3
 msgid "Category _Name"
 msgstr "_Ð?Ð¼Ñ? ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ð¸"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:5
-msgid "Item(s) belong to these _categories:"
+#: ../libedataserverui/e-categories-dialog.ui.h:4
+msgid "Item(s) _belong to these categories:"
 msgstr "ÐÐ»ÐµÐ¼ÐµÐ½Ñ?(Ñ?) Ð¿Ñ?Ð¸Ð½Ð°Ð´Ð»ÐµÐ¶Ð°Ñ? Ñ?Ð»ÐµÐ´Ñ?Ñ?Ñ?Ð¸Ð¼ _ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ð¼:"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:6
+#: ../libedataserverui/e-categories-dialog.ui.h:5
 msgid "_Available Categories:"
 msgstr "_Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ñ?Ðµ ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ð¸:"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:7
+#: ../libedataserverui/e-categories-dialog.ui.h:6
 msgid "_Edit"
 msgstr "_Ð?Ñ?Ð°Ð²ÐºÐ°"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:8
+#: ../libedataserverui/e-categories-dialog.ui.h:7
 msgid "categories"
 msgstr "ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ð¸"
 
-#: ../libedataserverui/e-category-completion.c:290
+#: ../libedataserverui/e-category-completion.c:292
 #, c-format
 msgid "Create category \"%s\""
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ?Ñ? ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ? Â«%sÂ»"
@@ -4997,85 +4985,84 @@ msgstr "Ð?Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ? Ð¾ Ñ?Ð²ÐµÑ?Ðµ"
 msgid "The color to render"
 msgstr "Ð¦Ð²ÐµÑ? Ð´Ð»Ñ? Ð¾Ñ?Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ?"
 
-#: ../libedataserverui/e-name-selector-dialog.c:278
+#: ../libedataserverui/e-name-selector-dialog.c:292
 msgid "Select Contacts from Address Book"
 msgstr "Ð?Ñ?Ð±Ð¾Ñ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð¾Ð² Ð¸Ð· Ð°Ð´Ñ?ÐµÑ?Ð½Ð¾Ð¹ ÐºÐ½Ð¸Ð³Ð¸"
 
-#: ../libedataserverui/e-name-selector-dialog.c:565
+#: ../libedataserverui/e-name-selector-dialog.c:587
 msgid "_Add"
 msgstr "_Ð?Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ?"
 
-#: ../libedataserverui/e-name-selector-dialog.c:590
+#: ../libedataserverui/e-name-selector-dialog.c:612
 msgid "_Remove"
 msgstr "_Ð£Ð´Ð°Ð»Ð¸Ñ?Ñ?"
 
-#: ../libedataserverui/e-name-selector-dialog.c:767
-#: ../libedataserverui/e-name-selector-dialog.glade.h:6
+#: ../libedataserverui/e-name-selector-dialog.c:789
+#: ../libedataserverui/e-name-selector-dialog.ui.h:6
 msgid "Any Category"
 msgstr "Ð?Ñ?Ð±Ð°Ñ? ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:1
+#: ../libedataserverui/e-name-selector-dialog.ui.h:1
 msgid "*"
 msgstr "*"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:2
+#: ../libedataserverui/e-name-selector-dialog.ui.h:2
 msgid "<b>Co_ntacts</b>"
 msgstr "<b>_Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?Ñ?</b> "
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:3
+#: ../libedataserverui/e-name-selector-dialog.ui.h:3
 msgid "<b>Show Contacts</b>"
 msgstr "<b>Ð?Ð¾ÐºÐ°Ð·Ð°Ñ?Ñ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ñ?</b>"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:4
+#: ../libedataserverui/e-name-selector-dialog.ui.h:4
 msgid "Address B_ook:"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ð½Ð°Ñ? Ðº_Ð½Ð¸Ð³Ð°:"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:5
+#: ../libedataserverui/e-name-selector-dialog.ui.h:5
 msgid "Address Book"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ð½Ð°Ñ? ÐºÐ½Ð¸Ð³Ð°"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:7
+#: ../libedataserverui/e-name-selector-dialog.ui.h:7
 msgid "Cate_gory:"
 msgstr "Ð?_Ð°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?:"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:8
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:261
+#: ../libedataserverui/e-name-selector-dialog.ui.h:8
 msgid "Contacts"
 msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?Ñ?"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:9
+#: ../libedataserverui/e-name-selector-dialog.ui.h:9
 msgid "Search"
 msgstr "Ð?Ð¾Ð¸Ñ?Ðº"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:10
+#: ../libedataserverui/e-name-selector-dialog.ui.h:10
 msgid "_Search:"
 msgstr "_Ð?Ñ?ÐºÐ°Ñ?Ñ?:"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2456
+#: ../libedataserverui/e-name-selector-entry.c:2508
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "_Ð Ð°Ð·Ð²ÐµÑ?Ð½Ñ?Ñ?Ñ? %s"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2471
+#: ../libedataserverui/e-name-selector-entry.c:2523
 #, c-format
 msgid "Cop_y %s"
 msgstr "Ð?_Ð¾Ð¿Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2481
+#: ../libedataserverui/e-name-selector-entry.c:2533
 #, c-format
 msgid "C_ut %s"
 msgstr "Ð?_Ñ?Ñ?ÐµÐ·Ð°Ñ?Ñ? %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2498
+#: ../libedataserverui/e-name-selector-entry.c:2550
 #, c-format
 msgid "_Edit %s"
 msgstr "_Ð?Ñ?Ð°Ð²ÐºÐ° %s"
 
-#: ../libedataserverui/e-name-selector-list.c:472
+#: ../libedataserverui/e-name-selector-list.c:469
 #, c-format
 msgid "_Delete %s"
 msgstr "_Ð£Ð´Ð°Ð»Ð¸Ñ?Ñ? %s"
@@ -5085,23 +5072,23 @@ msgstr "_Ð£Ð´Ð°Ð»Ð¸Ñ?Ñ? %s"
 msgid "Keyring key is unusable: no user or host name"
 msgstr "Ð?Ð»Ñ?Ñ? Ð¸Ð· Ð±Ñ?ÐµÐ»Ð¾ÐºÐ° Ð½ÐµÐºÐ¾Ñ?Ñ?ÐµÐºÑ?ÐµÐ½: Ð¾Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ð²Ñ?ÐµÑ? Ð¸Ð¼Ñ? Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»Ñ? Ð¸Ð»Ð¸ Ñ?Ð·Ð»Ð°"
 
-#: ../libedataserverui/e-passwords.c:1094
+#: ../libedataserverui/e-passwords.c:1093
 msgid "You have the Caps Lock key on."
 msgstr "Ð?Ð° ÐºÐ»Ð°Ð²Ð¸Ð°Ñ?Ñ?Ñ?Ðµ Ð²ÐºÐ»Ñ?Ñ?Ñ?Ð½ Caps Lock."
 
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:1215
 msgid "_Remember this passphrase"
 msgstr "_Ð?Ð°Ð¿Ð¾Ð¼Ð½Ð¸Ñ?Ñ? Ñ?Ñ?Ñ? ÐºÐ»Ñ?Ñ?ÐµÐ²Ñ?Ñ? Ñ?Ñ?Ð°Ð·Ñ?"
 
-#: ../libedataserverui/e-passwords.c:1217
+#: ../libedataserverui/e-passwords.c:1216
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "_Ð?Ð°Ð¿Ð¾Ð¼Ð½Ð¸Ñ?Ñ? Ñ?Ñ?Ð¾Ñ? Ð¿Ð°Ñ?Ð¾Ð»Ñ? Ð´Ð¾ Ð¾ÐºÐ¾Ð½Ñ?Ð°Ð½Ð¸Ñ? Ñ?Ñ?Ð¾Ð³Ð¾ Ñ?ÐµÐ°Ð½Ñ?Ð°"
 
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:1221
 msgid "_Remember this password"
 msgstr "_Ð?Ð°Ð¿Ð¾Ð¼Ð½Ð¸Ñ?Ñ? Ñ?Ñ?Ð¾Ñ? Ð¿Ð°Ñ?Ð¾Ð»Ñ?"
 
-#: ../libedataserverui/e-passwords.c:1223
+#: ../libedataserverui/e-passwords.c:1222
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Ð?Ð°Ð¿Ð¾Ð¼Ð½Ð¸Ñ?Ñ? Ñ?Ñ?Ð¾Ñ? Ð¿Ð°Ñ?Ð¾Ð»Ñ? Ð´Ð¾ ÐºÐ¾Ð½Ñ?Ð° Ñ?ÐµÑ?Ñ?Ð¸Ð¸"
 
@@ -5114,313 +5101,18 @@ msgstr "Ð?Ñ?Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð½Ð°Ð·Ð½Ð°Ñ?ÐµÐ½Ð¸Ðµ"
 msgid "_Destination"
 msgstr "_Ð?Ð°Ð·Ð½Ð°Ñ?ÐµÐ½Ð¸Ðµ"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1698
-#: ../servers/exchange/storage/exchange-account.c:959
-#, c-format
-msgid "Enter password for %s"
-msgstr "Ð?Ð²ÐµÐ´Ð¸Ñ?Ðµ Ð¿Ð°Ñ?Ð¾Ð»Ñ? Ð´Ð»Ñ? %s"
-
-#: ../servers/exchange/lib/e2k-autoconfig.c:1699
-#: ../servers/exchange/storage/exchange-account.c:964
-msgid "Enter password"
-msgstr "Ð?Ð°Ñ?Ð¾Ð»Ñ?"
-
-#. i18n: These are Outlook's words for the default roles in
-#. the folder permissions dialog.
-#: ../servers/exchange/lib/e2k-security-descriptor.c:847
-msgid "Owner"
-msgstr "Ð?Ð»Ð°Ð´ÐµÐ»ÐµÑ?"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:857
-msgid "Publishing Editor"
-msgstr "Ð ÐµÐ´Ð°ÐºÑ?Ð¾Ñ? Ð¿Ñ?Ð±Ð»Ð¸ÐºÐ°Ñ?Ð¸Ð¸"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:865
-msgid "Editor"
-msgstr "Ð ÐµÐ´Ð°ÐºÑ?Ð¾Ñ?"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:872
-msgid "Publishing Author"
-msgstr "Ð?Ð²Ñ?Ð¾Ñ? Ð¿Ñ?Ð±Ð»Ð¸ÐºÐ°Ñ?Ð¸Ð¸"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:878
-msgid "Author"
-msgstr "Ð?Ð²Ñ?Ð¾Ñ?"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:883
-msgid "Non-editing Author"
-msgstr "Ð?Ð¾Ð½Ñ?Ñ?Ð»Ñ?Ñ?Ð¸Ñ?Ñ?Ñ?Ñ?Ð¸Ð¹ Ð°Ð²Ñ?Ð¾Ñ?"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:887
-msgid "Reviewer"
-msgstr "Ð?Ð±Ð¾Ð·Ñ?ÐµÐ²Ð°Ñ?ÐµÐ»Ñ?"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:889
-msgid "Contributor"
-msgstr "Ð£Ñ?Ð°Ñ?Ñ?Ð½Ð¸Ðº"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:891
-msgid "None"
-msgstr "Ð?ÐµÑ?"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:906
-msgid "Custom"
-msgstr "Ð?Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ?ÐµÐ»Ñ?Ð½Ð¾"
-
-#: ../servers/exchange/storage/e-storage.c:555
-msgid "Generic error"
-msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ð°Ñ? Ð¾Ñ?Ð¸Ð±ÐºÐ°"
-
-#: ../servers/exchange/storage/e-storage.c:557
-msgid "A folder with the same name already exists"
-msgstr "Ð?Ð°Ð¿ÐºÐ° Ñ? Ñ?Ð°ÐºÐ¸Ð¼ Ð¸Ð¼ÐµÐ½ÐµÐ¼ Ñ?Ð¶Ðµ Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?ÐµÑ?"
-
-#: ../servers/exchange/storage/e-storage.c:559
-msgid "The specified folder type is not valid"
-msgstr "Ð?Ð°Ð´Ð°Ð½Ð½Ð°Ñ? Ð¿Ð°Ð¿ÐºÐ° Ð½ÐµÐºÐ¾Ñ?Ñ?ÐµÐºÑ?Ð½Ð°"
-
-#: ../servers/exchange/storage/e-storage.c:561
-msgid "I/O error"
-msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° Ð²Ð²Ð¾Ð´Ð°/Ð²Ñ?Ð²Ð¾Ð´Ð°"
-
-#: ../servers/exchange/storage/e-storage.c:563
-msgid "Not enough space to create the folder"
-msgstr "Ð?ÐµÐ´Ð¾Ñ?Ñ?Ð°Ñ?Ð¾Ñ?Ð½Ð¾ Ð¼ÐµÑ?Ñ?Ð° Ð´Ð»Ñ? Ñ?Ð¾Ð·Ð´Ð°Ð½Ð¸Ñ? Ð¿Ð°Ð¿ÐºÐ¸"
-
-#: ../servers/exchange/storage/e-storage.c:565
-msgid "The folder is not empty"
-msgstr "Ð?Ð°Ð¿ÐºÐ° Ð½Ðµ Ð¿Ñ?Ñ?Ñ?Ð°"
-
-#: ../servers/exchange/storage/e-storage.c:567
-msgid "The specified folder was not found"
-msgstr "Ð?Ð°Ð´Ð°Ð½Ð½Ð°Ñ? Ð¿Ð°Ð¿ÐºÐ° Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð°"
-
-#: ../servers/exchange/storage/e-storage.c:569
-msgid "Function not implemented in this storage"
-msgstr "Ð?Ð°Ð½Ð½Ð°Ñ? Ñ?Ñ?Ð½ÐºÑ?Ð¸Ñ? Ð½Ðµ Ñ?ÐµÐ°Ð»Ð¸Ð·Ð¾Ð²Ð°Ð½Ð° Ð² Ñ?Ñ?Ð¾Ð¼ Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ"
-
-#: ../servers/exchange/storage/e-storage.c:573
-msgid "Operation not supported"
-msgstr "Ð?Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ? Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÑ?Ñ?Ñ?"
-
-#: ../servers/exchange/storage/e-storage.c:575
-msgid "The specified type is not supported in this storage"
-msgstr "Ð?Ð°Ð´Ð°Ð½Ð½Ñ?Ð¹ Ñ?Ð¸Ð¿ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÑ?Ñ?Ñ? Ð´Ð°Ð½Ð½Ñ?Ð¼ Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?ÐµÐ¼"
-
-#: ../servers/exchange/storage/e-storage.c:577
-msgid "The specified folder cannot be modified or removed"
-msgstr "Ð?Ð°Ð´Ð°Ð½Ð½Ð°Ñ? Ð¿Ð°Ð¿ÐºÐ° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ? Ð±Ñ?Ñ?Ñ? Ñ?Ð´Ð°Ð»ÐµÐ½Ð° Ð¸Ð»Ð¸ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð°"
-
-#: ../servers/exchange/storage/e-storage.c:579
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿ÐµÑ?ÐµÐ¼ÐµÑ?Ñ?Ð¸Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ? Ð² Ð¾Ð´Ð¸Ð½ Ð¸Ð· Ð¿Ð¾Ñ?Ð¾Ð¼ÐºÐ¾Ð²"
-
-#: ../servers/exchange/storage/e-storage.c:581
-msgid "Cannot create a folder with that name"
-msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? Ð¿Ð°Ð¿ÐºÑ? Ñ? Ñ?Ð°ÐºÐ¸Ð¼ Ð¸Ð¼ÐµÐ½ÐµÐ¼."
-
-#: ../servers/exchange/storage/e-storage.c:583
-msgid "This operation cannot be performed in off-line mode"
-msgstr "ÐÑ?Ð° Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ? Ð½ÐµÐ´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð° Ð² Ð°Ð²Ñ?Ð¾Ð½Ð¾Ð¼Ð½Ð¾Ð¼ Ñ?ÐµÐ¶Ð¸Ð¼Ðµ."
-
-#. i18n: This is the title of an "other user's folders"
-#. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:642
-#, c-format
-msgid "%s's Folders"
-msgstr "Ð?Ð°Ð¿ÐºÐ¸ %s"
-
-#: ../servers/exchange/storage/exchange-account.c:1265
-msgid "Personal Folders"
-msgstr "Ð?Ð¸Ñ?Ð½Ñ?Ðµ Ð¿Ð°Ð¿ÐºÐ¸"
-
-#: ../servers/exchange/storage/exchange-account.c:1280
-msgid "Favorite Public Folders"
-msgstr "Ð?Ð·Ð±Ñ?Ð°Ð½Ð½Ñ?Ðµ Ð¾Ð±Ñ?Ð¸Ðµ Ð¿Ð°Ð¿ÐºÐ¸"
-
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1297
-msgid "All Public Folders"
-msgstr "Ð?Ñ?Ðµ Ð¾Ð±Ñ?Ð¸Ðµ Ð¿Ð°Ð¿ÐºÐ¸"
-
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1311
-msgid "Global Address List"
-msgstr "Ð?Ð±Ñ?Ð¸Ð¹ Ñ?Ð¿Ð¸Ñ?Ð¾Ðº Ð°Ð´Ñ?ÐµÑ?Ð¾Ð²"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
-msgid "Deleted Items"
-msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð½Ñ?Ðµ Ñ?Ð»ÐµÐ¼ÐµÐ½Ñ?Ñ?"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
-msgid "Journal"
-msgstr "Ð?Ñ?Ñ?Ð½Ð°Ð»"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "Ð?Ð°Ð¼ÐµÑ?ÐºÐ¸"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "Ð?Ñ?Ñ?Ð¾Ð´Ñ?Ñ?Ð¸Ðµ"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "Ð?Ñ?Ð¿Ñ?Ð°Ð²Ð»ÐµÐ½Ð½Ñ?Ðµ"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "Ð?Ð°Ð´Ð°Ñ?Ð¸"
-
-#: ../servers/groupwise/e-gw-connection.c:225
+#: ../servers/groupwise/e-gw-connection.c:227
 msgid "Invalid connection"
 msgstr "Ð?ÐµÐºÐ¾Ñ?Ñ?ÐµÐºÑ?Ð½Ð¾Ðµ Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ"
 
-#: ../servers/groupwise/e-gw-connection.c:229
+#: ../servers/groupwise/e-gw-connection.c:231
 msgid "Invalid response from server"
 msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ð¾Ñ?Ð²ÐµÑ? Ð¾Ñ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð°"
 
-#: ../servers/groupwise/e-gw-connection.c:231
+#: ../servers/groupwise/e-gw-connection.c:233
 msgid "No response from the server"
 msgstr "Ð?ÐµÑ? Ð¾Ñ?Ð²ÐµÑ?Ð° Ð¾Ñ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð°"
 
-#: ../servers/groupwise/e-gw-connection.c:237
+#: ../servers/groupwise/e-gw-connection.c:239
 msgid "Bad parameter"
 msgstr "Ð?Ð»Ð¾Ñ?Ð¾Ð¹ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?"
-
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
-msgid "Evolution Addressbook file backend"
-msgstr "Ð?Ð¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ? Evolution Ð´Ð»Ñ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð° Ðº Ñ?Ð°Ð¹Ð»Ð°Ð¼"
-
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
-msgid "Evolution Calendar file and webcal backend"
-msgstr "Ð?Ð¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ? Evolution Ð´Ð»Ñ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð° Ðº Ñ?Ð°Ð¹Ð»Ð°Ð¼ Ð¸ webcal"
-
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:3
-msgid "Evolution Data Server interface check service"
-msgstr "Ð¡ÐµÑ?Ð²Ð¸Ñ? Ð¿Ñ?Ð¾Ð²ÐµÑ?ÐºÐ¸ Ð¸Ð½Ñ?ÐµÑ?Ñ?ÐµÐ¹Ñ?Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ð° Ð´Ð°Ð½Ð½Ñ?Ñ? Evolution"
-
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
-msgid "Evolution Data Server logging service"
-msgstr "Ð¡ÐµÑ?Ð²Ð¸Ñ? Ð¿Ñ?Ð¾Ñ?Ð¾ÐºÐ¾Ð»Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ñ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð° Ð´Ð°Ð½Ð½Ñ?Ñ? Evolution"
-
-#. dialog display isn't working out
-#: ../src/server.c:109
-#, c-format
-msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
-msgstr ""
-"Ð?Ð·-Ð·Ð° Ð¼Ð½Ð¾Ð³Ð¾Ñ?Ð¸Ñ?Ð»ÐµÐ½Ð½Ñ?Ñ? Ñ?Ð±Ð¾ÐµÐ² Ñ?ÐµÐ³Ð¼ÐµÐ½Ñ?Ð°Ñ?Ð¸Ð¸ Ð¾Ñ?Ð¾Ð±Ñ?Ð°Ð·Ð¸Ñ?Ñ? Ð´Ð¸Ð°Ð»Ð¾Ð³ Ð¾Ñ?Ð¸Ð±ÐºÐ¸ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾\n"
-
-#~ msgid "Fair"
-#~ msgstr "Ð¯Ñ?Ð½Ð¾"
-
-#~ msgid "Snow showers"
-#~ msgstr "Ð¡Ð½ÐµÐ¶Ð½Ñ?Ðµ Ð»Ð¸Ð²Ð½Ð¸"
-
-#~ msgid "Snow"
-#~ msgstr "Ð¡Ð½ÐµÐ³"
-
-#~ msgid "Partly cloudy"
-#~ msgstr "Ð?ÐµÑ?Ñ?Ð°Ð¼Ð¸ Ð¾Ð±Ð»Ð°Ñ?Ð½Ð¾"
-
-#~ msgid "Smoke"
-#~ msgstr "Ð¢Ñ?Ð¼Ð°Ð½"
-
-#~ msgid "Thunderstorms"
-#~ msgstr "Ð?Ñ?Ð¾Ð·Ñ?"
-
-#~ msgid "Cloudy"
-#~ msgstr "Ð?Ð±Ð»Ð°Ñ?Ð½Ð¾"
-
-#~ msgid "Drizzle"
-#~ msgstr "Ð?Ð¾Ñ?Ð¾Ñ?Ñ?Ñ?Ð¸Ð¹ Ð´Ð¾Ð¶Ð´Ñ?"
-
-#~ msgid "Sunny"
-#~ msgstr "Ð¡Ð¾Ð»Ð½ÐµÑ?Ð½Ð¾"
-
-#~ msgid "Dust"
-#~ msgstr "Ð?Ñ?Ð»Ñ?"
-
-#~ msgid "Clear"
-#~ msgstr "Ð¯Ñ?Ð½Ð¾"
-
-#~ msgid "Mostly cloudy"
-#~ msgstr "Ð?Ð°Ñ?Ð¼Ñ?Ñ?Ð½Ð¾"
-
-#~ msgid "Windy"
-#~ msgstr "Ð?ÐµÑ?Ñ?ÐµÐ½Ð½Ð¾"
-
-#~ msgid "Rain showers"
-#~ msgstr "Ð?Ð¸Ð²Ð½ÐµÐ²Ñ?Ðµ Ð´Ð¾Ð¶Ð´Ð¸"
-
-#~ msgid "Foggy"
-#~ msgstr "Ð¢Ñ?Ð¼Ð°Ð½Ð½Ð¾"
-
-#~ msgid "Rain/snow mixed"
-#~ msgstr "Ð?Ð¾Ð¶Ð´Ñ? Ñ?Ð¾ Ñ?Ð½ÐµÐ³Ð¾Ð¼"
-
-#~ msgid "Sleet"
-#~ msgstr "Ð?Ð¾Ð¶Ð´Ñ? Ñ?Ð¾ Ñ?Ð½ÐµÐ³Ð¾Ð¼"
-
-#~ msgid "Very hot/humid"
-#~ msgstr "Ð?Ñ?ÐµÐ½Ñ? Ð¶Ð°Ñ?ÐºÐ¾ Ð¸ Ð²Ð»Ð°Ð¶Ð½Ð¾"
-
-#~ msgid "Blizzard"
-#~ msgstr "Ð¡Ð½ÐµÐ¶Ð½Ð°Ñ? Ð±Ñ?Ñ?Ñ?"
-
-#~ msgid "Freezing rain"
-#~ msgstr "Ð?Ð°Ð¼ÐµÑ?Ð·Ð°Ñ?Ñ?Ð¸Ð¹ Ð´Ð¾Ð¶Ð´Ñ?"
-
-#~ msgid "Haze"
-#~ msgstr "Ð?ÐµÐ³ÐºÐ¸Ð¹ Ñ?Ñ?Ð¼Ð°Ð½"
-
-#~ msgid "Blowing snow"
-#~ msgstr "Ð?ÐµÑ?ÐµÐ»Ñ?"
-
-#~ msgid "Freezing drizzle"
-#~ msgstr "Ð?Ð·Ð¼Ð¾Ñ?Ð¾Ð·Ñ?"
-
-#~ msgid "Very cold/wind chill"
-#~ msgstr "Ð?Ñ?ÐµÐ½Ñ? Ñ?Ð¾Ð»Ð¾Ð´Ð½Ð¾/Ñ?Ð¾Ð»Ð¾Ð´Ð½Ñ?Ð¹ Ð²ÐµÑ?ÐµÑ?"
-
-#~ msgid "Rain"
-#~ msgstr "Ð?Ð¾Ð¶Ð´Ñ?"
-
-#~ msgid "Weather: Partly Cloudy"
-#~ msgstr "Ð?Ð¾Ð³Ð¾Ð´Ð°: Ð?ÐµÑ?ÐµÐ¼ÐµÐ½Ð½Ð°Ñ? Ð¾Ð±Ð»Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ñ?"
-
-#~ msgid "%.1fÂ°C - %s"
-#~ msgstr "%.1fÂ°C - %s"
-
-#~ msgid "%.1fÂ°F - %s"
-#~ msgstr "%.1fÂ°F - %s"
-
-#~ msgid "%.1f/%.1fÂ°C - %s"
-#~ msgstr "%.1f/%.1fÂ°C - %s"
-
-#~ msgid "%.1f/%.1fÂ°F - %s"
-#~ msgstr "%.1f/%.1fÂ°F - %s"
-
-#~ msgid "%d%% chance of precipitation\n"
-#~ msgstr "Ð?ÐµÑ?Ð¾Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ñ? Ð¾Ñ?Ð°Ð´ÐºÐ¾Ð² %d%%\n"
-
-#~ msgid "%.1fcm snow\n"
-#~ msgstr "%.1fÑ?Ð¼ Ñ?Ð½ÐµÐ³Ð°\n"
-
-#~ msgid "%.1fin snow\n"
-#~ msgstr "%.1f Ð´Ñ?Ð¹Ð¼Ð¾Ð² Ñ?Ð½ÐµÐ³Ð°\n"
-
-#~ msgid "%.1f-%.1fcm snow\n"
-#~ msgstr "%.1f-%.1fÑ?Ð¼ Ñ?Ð½ÐµÐ³Ð°\n"
-
-#~ msgid "%.1f-%.1fin snow\n"
-#~ msgstr "%.1f-%.1fÐ´Ñ?Ð¹Ð¼Ð¾Ð² Ñ?Ð½ÐµÐ³Ð°\n"
-
-#~ msgid "Failed to create create child process '%s': %s"
-#~ msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿Ñ?Ð¸ Ñ?Ð¾Ð·Ð´Ð°Ð½Ð¸Ð¸ Ð´Ð¾Ñ?ÐµÑ?Ð½ÐµÐ³Ð¾ Ð¿Ñ?Ð¾Ñ?ÐµÑ?Ñ?Ð° Â«%sÂ»: %s"
-
-#~ msgid "Performing query on unknown header: %s"
-#~ msgstr "Ð?Ð°Ð¿Ñ?Ð°Ñ?Ð¸Ð²Ð°ÐµÑ?Ñ?Ñ? Ð½ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº: %s"
-
-#~ msgid "Decoder failed, error %d"
-#~ msgstr "Ð¡Ð±Ð¾Ð¹ Ð´ÐµÐºÐ¾Ð´ÐµÑ?Ð°, Ð¾Ñ?Ð¸Ð±ÐºÐ° %d"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]