[evolution-data-server] Updated Bulgarian translation



commit d579bdedf08a2bc8193c664a647be906b88662b5
Author: Krasimir Chonov <mk2616 abv bg>
Date:   Mon Feb 20 07:21:59 2012 +0200

    Updated Bulgarian translation

 po/bg.po | 2431 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 1336 insertions(+), 1095 deletions(-)
---
diff --git a/po/bg.po b/po/bg.po
index 653585f..30be72c 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,21 +1,21 @@
 # Bulgarian translation of evolution-data-server po-file.
 # Copyright (C) 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
-# Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-# Copyright (C) 2010, 201 Krasimir Chonov <mk2616 abv bg>.
+# Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2010, 2012 Krasimir Chonov <mk2616 abv bg>.
 # Nikolay Hristov <geroy stemo bg>
-# Alexander Shopov <ash kambanaria org>, 2001, 2005, 2006, 2007, 2008, 2009, 2010, 2011.
+# Alexander Shopov <ash kambanaria org>, 2001, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
 # Yanko Kaneti <yaneti declera com>
 # Vladimir Petkov <vpetkov i-space org>, 2004, 2005.
 # Yavor Doganov <yavor gnu org>, 2007, 2008.
-# Krasimir Chonov <mk2616 abv bg> 2010, 2011.
+# Krasimir Chonov <mk2616 abv bg> 2010, 2011, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:02+0300\n"
-"PO-Revision-Date: 2011-09-26 20:02+0300\n"
-"Last-Translator: Alexander Shopov <ash kambanaria org>\n"
+"POT-Creation-Date: 2012-02-20 07:22+0200\n"
+"PO-Revision-Date: 2012-02-20 07:21+0200\n"
+"Last-Translator: Krasimir Chonov <mk2616 abv bg>\n"
 "Language-Team: Bulgarian <dict fsa-bg org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
@@ -23,64 +23,125 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:828
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:478
+#: ../addressbook/backends/file/e-book-backend-file.c:125
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:276
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:937
+#: ../addressbook/libebook/e-book-client.c:103
+#: ../addressbook/libedata-book/e-data-book.c:441
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:545
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:574
+#: ../calendar/backends/http/e-cal-backend-http.c:437
+#: ../calendar/libecal/e-cal.c:4597 ../calendar/libecal/e-cal-client.c:147
+#: ../camel/providers/imap/camel-imap-command.c:515
+#: ../camel/providers/imap/camel-imap-store.c:464
+#: ../camel/providers/imapx/camel-imapx-command.c:538
+#: ../libedataserver/e-client.c:161
+msgid "Unknown error"
+msgstr "ÐÐÐÐÐÐÑÑÐÐ ÐÑÐÑÐÐ"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:150
+#, c-format
+msgid "Failed to remove file '%s': %s"
+msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÑÐÐÐÐ â%sâ: %s"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:173
+#, c-format
+msgid "Failed to make directory %s: %s"
+msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ %s: %s"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:468
+#, c-format
+msgid "Failed to create hardlink for resource '%s': %s"
+msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐ ÐÑÑÐÐÐ ÐÐ ÑÐÑÑÑÑÐ â%sâ: %s"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:570
+#: ../addressbook/backends/file/e-book-backend-file.c:1125
+msgid "No UID in the contact"
+msgstr "ÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ Ð ÐÐÐÑÐÐÑÐ"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:1559
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:512
 msgid "Loading..."
 msgstr "ÐÐÑÐÐÐÐÐÐâ"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:831
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4816
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:480
+#: ../addressbook/backends/file/e-book-backend-file.c:1562
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4866
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:514
 msgid "Searching..."
 msgstr "ÐÑÑÑÐÐÐâ"
 
+#: ../addressbook/backends/file/e-book-backend-file.c:2104
+#, c-format
+msgid "Failed to build summary for an address book %s"
+msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐÐ %s"
+
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:841
+#: ../addressbook/backends/google/e-book-backend-google.c:831
 msgid "Querying for updated contactsâ"
 msgstr "ÐÑÐÐÐÑÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:892
-#: ../addressbook/libebook/e-book.c:3506 ../calendar/libecal/e-cal.c:1381
-#: ../libedataserver/e-client.c:1951
+#: ../addressbook/backends/google/e-book-backend-google.c:880
+#: ../addressbook/libebook/e-book.c:3529 ../calendar/libecal/e-cal.c:1381
+#: ../libedataserver/e-client.c:1915
 msgid "Personal"
 msgstr "ÐÐÑÐÐ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:894
+#: ../addressbook/backends/google/e-book-backend-google.c:882
 msgid "Friends"
 msgstr "ÐÑÐÑÑÐÐÐ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:896
+#: ../addressbook/backends/google/e-book-backend-google.c:884
 msgid "Family"
 msgstr "ÐÐÐÐÐÑÑÐÐ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:898
+#: ../addressbook/backends/google/e-book-backend-google.c:886
 msgid "Coworkers"
 msgstr "ÐÐÐÐÐÐ"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:982
+#: ../addressbook/backends/google/e-book-backend-google.c:970
 msgid "Querying for updated groupsâ"
 msgstr "ÐÑÐÐÐÑÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐ ÐÑÑÐÐâ"
 
+#: ../addressbook/backends/google/e-book-backend-google.c:1362
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1635
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:291
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:324
+msgid "The backend does not support bulk additions"
+msgstr "ÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÑÐÐ ÐÐÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐÑÑÐÐ ÑÐÑÑÑÑÐ"
+
 #. Insert the entry on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1404
+#: ../addressbook/backends/google/e-book-backend-google.c:1389
 msgid "Creating new contactâ"
 msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÐÐÐÑÐÐÑâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1514
+#: ../addressbook/backends/google/e-book-backend-google.c:1476
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:323
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:431
+msgid "The backend does not support bulk removals"
+msgstr "ÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÑÐÐ ÐÐÐÐÐÑÐÐÐÐÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑÑÐÐ ÑÐÑÑÑÑÐ"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1504
 msgid "Deleting contactâ"
 msgstr "ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÑâ"
 
+#: ../addressbook/backends/google/e-book-backend-google.c:1749
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2292
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:371
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:485
+msgid "The backend does not support bulk modifications"
+msgstr "ÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÑÐÐ ÐÐÐÐÐÑÐÐÐÐÐÐ ÐÑÐÐÑÐÐ ÐÐ ÐÐÐÐÐÑÑÐÐ ÑÐÑÑÑÑÐ"
+
 #. Update the contact on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1795
+#: ../addressbook/backends/google/e-book-backend-google.c:1782
 msgid "Modifying contactâ"
 msgstr "ÐÑÐÐÑÐÐ ÐÐ ÐÐÐÑÐÐÑâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2002
+#: ../addressbook/backends/google/e-book-backend-google.c:1983
 msgid "Loadingâ"
 msgstr "ÐÐÑÐÐÐÐÐÐâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2160
+#: ../addressbook/backends/google/e-book-backend-google.c:2108
 msgid "Authenticating with the serverâ"
 msgstr "ÐÐÐÐÑÐÑÐÑÐÑÐÐÐ ÐÑÐÐ ÑÑÑÐÑÑÐâ"
 
@@ -105,65 +166,49 @@ msgstr "ÐÐÐÑÐÑÐÐ ÑÐÑÑÐÐÐÐÐ ÑÑÑ ÑÑÑÐÑÑÐ ÐÐ LDAPâ"
 msgid "Invalid DN syntax"
 msgstr "ÐÑÐÑÐÐ ÑÐÐÑÐÐÑÐÑ ÐÐ DN"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1721
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1734
 msgid "Adding contact to LDAP server..."
 msgstr "ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÐÑÐÐÑ ÐÐ ÑÑÑÐÑÑÐ ÐÐ LDAPâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1852
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1865
 msgid "Removing contact from LDAP server..."
 msgstr "ÐÑÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÑÐÐÑ ÐÑ ÑÑÑÐÑÑÐ ÐÐ LDAPâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2287
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2314
 msgid "Modifying contact from LDAP server..."
 msgstr "ÐÑÐÐÑÐÐ ÐÐ ÐÐÐÑÐÐÑ Ð ÑÑÑÐÑÑÐ ÐÐ LDAPâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4667
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4716
 msgid "Receiving LDAP search results..."
 msgstr "ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÑÐÐÑÐÑÐÑÐÑÐ ÐÑ ÑÑÑÑÐÐÐÑÐ Ð LDAPâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4837
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4887
 msgid "Error performing search"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÐÐÐÐÐÐÑÐ ÐÐ ÑÑÑÑÐÐÐÑÐ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4958
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5008
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "ÐÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÑÐÐÑÐ (%d)â"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:277
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:905
-#: ../addressbook/libebook/e-book-client.c:103
-#: ../addressbook/libedata-book/e-data-book.c:442
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:527
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:556
-#: ../calendar/backends/http/e-cal-backend-http.c:430
-#: ../calendar/libecal/e-cal.c:4595 ../calendar/libecal/e-cal-client.c:147
-#: ../camel/providers/imap/camel-imap-command.c:484
-#: ../camel/providers/imap/camel-imap-store.c:411
-#: ../camel/providers/imapx/camel-imapx-server.c:2280
-#: ../camel/providers/smtp/camel-smtp-transport.c:451
-#: ../libedataserver/e-client.c:159
-msgid "Unknown error"
-msgstr "ÐÐÐÐÐÐÑÑÐÐ ÐÑÐÑÐÐ"
-
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:342
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:352
 #, c-format
 msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÑÐÑÑÑÑ â%sâ Ñ ÐÐÐ ÐÑ HTTP: %d (%s)"
 
-#: ../addressbook/libebook/e-book.c:3173
+#: ../addressbook/libebook/e-book.c:3196
 #, c-format
 msgid "%s: there was no source for UID '%s' stored in GConf."
 msgstr "%s: ÐÐ ÑÑÑÐÑÑÐÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ â%sâ Ð GConf."
 
-#: ../addressbook/libebook/e-book.c:3489 ../calendar/libecal/e-cal.c:1361
-#: ../libedataserver/e-client.c:1946
+#: ../addressbook/libebook/e-book.c:3512 ../calendar/libecal/e-cal.c:1361
+#: ../libedataserver/e-client.c:1910
 msgid "On This Computer"
 msgstr "ÐÐ ÑÐÐÐ ÐÐÐÐÑÑÑÑ"
 
-#: ../addressbook/libebook/e-book.c:3615
-#: ../addressbook/libebook/e-book-client.c:678
-#: ../addressbook/libedata-book/e-data-book.c:323
+#: ../addressbook/libebook/e-book.c:3638
+#: ../addressbook/libebook/e-book-client.c:699
+#: ../addressbook/libedata-book/e-data-book.c:322
 msgid "Address book does not exist"
 msgstr "ÐÐÑÐÑÐÐÐÑÑ ÐÐ ÑÑÑÐÑÑÐÑÐÐ"
 
@@ -172,12 +217,12 @@ msgid "No such book"
 msgstr "ÐÑÐÐ ÑÐÐÑÐ ÐÐÑÐÑÐÐÐ"
 
 #: ../addressbook/libebook/e-book-client.c:94
-#: ../addressbook/libedata-book/e-data-book.c:316
+#: ../addressbook/libedata-book/e-data-book.c:315
 msgid "Contact not found"
 msgstr "ÐÐÐÑÐÐÑÑÑ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÐÐÑÐÐ"
 
 #: ../addressbook/libebook/e-book-client.c:96
-#: ../addressbook/libedata-book/e-data-book.c:317
+#: ../addressbook/libedata-book/e-data-book.c:316
 msgid "Contact ID already exists"
 msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑÑÑ ÐÐ ÐÐÐÑÐÐÑÐ ÐÐÑÐ ÑÑÑÐÑÑÐÑÐÐ"
 
@@ -186,58 +231,58 @@ msgid "No such source"
 msgstr "ÐÑÐÐ ÑÐÐÑÐ ÐÐÑÐÑÐÐÐ"
 
 #: ../addressbook/libebook/e-book-client.c:100
-#: ../addressbook/libedata-book/e-data-book.c:333
+#: ../addressbook/libedata-book/e-data-book.c:332
 msgid "No space"
 msgstr "ÐÑÑÑÐÑÐ ÑÐÑÑÑÐ"
 
-#: ../addressbook/libebook/e-book-client.c:491
+#: ../addressbook/libebook/e-book-client.c:512
 msgid "Failed to run book factory"
 msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÑÑÐÑÑÐÑÐÐÐ"
 
-#: ../addressbook/libebook/e-book-client.c:501
-#: ../addressbook/libedata-book/e-data-book-factory.c:242
-#: ../addressbook/libedata-book/e-data-book-factory.c:274
+#: ../addressbook/libebook/e-book-client.c:522
+#: ../addressbook/libedata-book/e-data-book-factory.c:196
+#: ../addressbook/libedata-book/e-data-book-factory.c:228
 #: ../calendar/libecal/e-cal-client.c:610
-#: ../calendar/libedata-cal/e-data-cal-factory.c:257
-#: ../calendar/libedata-cal/e-data-cal-factory.c:286
+#: ../calendar/libedata-cal/e-data-cal-factory.c:213
+#: ../calendar/libedata-cal/e-data-cal-factory.c:242
 #, c-format
 msgid "Invalid source"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../addressbook/libebook/e-book-client.c:603
+#: ../addressbook/libebook/e-book-client.c:624
 #: ../calendar/libecal/e-cal-client.c:725
 #, c-format
 msgid "Incorrect uri '%s'"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑ â%sâ"
 
-#: ../addressbook/libebook/e-book-client.c:641
+#: ../addressbook/libebook/e-book-client.c:662
 msgid "Failed to find system book"
 msgstr "ÐÐÑÑÐÐÐÐÑÑ ÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÑÐÑÐÑ"
 
-#: ../addressbook/libebook/e-book-client.c:750
+#: ../addressbook/libebook/e-book-client.c:771
 #: ../calendar/libecal/e-cal-client.c:878
 #, c-format
 msgid "There was no source for UID '%s' stored in a source list."
 msgstr "ÐÐ ÑÑÑÐÑÑÐÑÐÐ ÐÐÑÐÑÐÐÐ Ñ ÐÐÐÐÑÐÑÐÐÐÑÐÑ â%sâ Ð ÑÐÐÑÑÐÐ Ñ ÐÐÑÐÑÐÐÑÐ."
 
-#: ../addressbook/libebook/e-book-client.c:2280
-#: ../calendar/libecal/e-cal-client.c:4482
+#: ../addressbook/libebook/e-book-client.c:2563
+#: ../calendar/libecal/e-cal-client.c:4480
 msgid "Cannot get connection to view"
 msgstr "ÐÑÐÐ ÐÑÑÐÐÐ ÐÑÐ ÐÐÐÐÐÐ"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:116
+#: ../addressbook/libebook/e-contact.c:117
 msgid "Unique ID"
 msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ"
 
 #. FILE_AS is not really a structured field - we use a getter/setter
 #. *         so we can generate its value if necessary in the getter
-#: ../addressbook/libebook/e-contact.c:119
+#: ../addressbook/libebook/e-contact.c:120
 msgid "File Under"
 msgstr "ÐÐÐÐÑÐÐÐÐ Ð"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:121
+#: ../addressbook/libebook/e-contact.c:122
 msgid "Book URI"
 msgstr "ÐÐÑÐÑ ÐÐ ÐÐÐÐÐÑÐ"
 
@@ -245,546 +290,546 @@ msgstr "ÐÐÑÐÑ ÐÐ ÐÐÐÐÐÑÐ"
 #. 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:127
+#: ../addressbook/libebook/e-contact.c:128
 msgid "Full Name"
 msgstr "ÐÑÐÐÐ ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:129
 msgid "Given Name"
 msgstr "ÐÐÐÑÑÐÐÐÐ ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Family Name"
 msgstr "ÐÐÐÐÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Nickname"
 msgstr "ÐÑÑÐÐÑ"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Email 1"
 msgstr "Ð-ÐÐÑÐ 1"
 
-#: ../addressbook/libebook/e-contact.c:134
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Email 2"
 msgstr "Ð-ÐÐÑÐ 2"
 
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook/e-contact.c:136
 msgid "Email 3"
 msgstr "Ð-ÐÐÑÐ 3"
 
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:137
 msgid "Email 4"
 msgstr "Ð-ÐÐÑÐ 4"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:139
 msgid "Mailer"
 msgstr "ÐÐÑÐÐÑÐÐ ÐÑÐÐÑÐÐÐ"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:142
 msgid "Home Address Label"
 msgstr "ÐÑÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐÑ ÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Work Address Label"
 msgstr "ÐÑÐÐÐÑ ÐÐ ÑÐÐÐÑÐÐÑ ÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:144
 msgid "Other Address Label"
 msgstr "ÐÑÐÐÐÑ ÐÐ ÐÑÑÐ ÐÐÑÐÑ"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Assistant Phone"
 msgstr "ÐÐÐÐÑÐÐ ÐÐ ÐÑÐÑÑÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Business Phone"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Business Phone 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÐÐ 2"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Business Fax"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Callback Phone"
 msgstr "ÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÑÐÐ ÐÑÑÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Car Phone"
 msgstr "ÐÐÐÐÑÐÐ Ð ÐÐÑÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Company Phone"
 msgstr "ÐÐÐÐÑÐÐ ÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Home Phone"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Home Phone 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÐÐ 2"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Home Fax"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:157
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Mobile Phone"
 msgstr "ÐÐÐÐÐÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Other Phone"
 msgstr "ÐÑÑÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Other Fax"
 msgstr "ÐÑÑÐ ÑÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:161
 msgid "Pager"
 msgstr "ÐÐÐÐÐÑÑ"
 
-#: ../addressbook/libebook/e-contact.c:161
+#: ../addressbook/libebook/e-contact.c:162
 msgid "Primary Phone"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:162
+#: ../addressbook/libebook/e-contact.c:163
 msgid "Radio"
 msgstr "ÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:164
 msgid "Telex"
 msgstr "ÐÐÐÐÐÑ"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:166
 msgid "TTY"
 msgstr "ÐÐÐÐÑÐÐ"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Organization"
 msgstr "ÐÑÐÐÐÐÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Organizational Unit"
 msgstr "ÐÑÐÐÐÐÐÐÑÐÐÐÐÐ ÐÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Office"
 msgstr "ÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:171
+#: ../addressbook/libebook/e-contact.c:172
 msgid "Title"
 msgstr "ÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:173
 msgid "Role"
 msgstr "ÐÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Manager"
 msgstr "ÐÑÐÐÐÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:174
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Assistant"
 msgstr "ÐÑÐÑÑÐÐÑ"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:177
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Homepage URL"
 msgstr "ÐÐÑÐÑ ÐÐ ÐÐÐÐÑÐÐÑÐ ÑÑÑÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:178
+#: ../addressbook/libebook/e-contact.c:179
 msgid "Weblog URL"
 msgstr "ÐÐÑÐÑ ÐÐ ÐÐÐÐ"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:182
 #: ../libedataserverui/e-categories-dialog.c:85
 msgid "Categories"
 msgstr "ÐÐÑÐÐÐÑÐÐ"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:184
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Calendar URI"
 msgstr "ÐÐÑÐÑ ÐÐ ÐÐÐÐÐÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:186
 msgid "Free/Busy URL"
 msgstr "ÐÐÑÐÑ ÐÐ ÑÑÑÑÐÑÐÐÐ ÑÐÐÐÐÐÐÐ/ÐÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:187
 msgid "ICS Calendar"
 msgstr "ÐÐÐÐÐÐÐÑ ICS"
 
-#: ../addressbook/libebook/e-contact.c:187
+#: ../addressbook/libebook/e-contact.c:188
 msgid "Video Conferencing URL"
 msgstr "ÐÐÑÐÑ ÐÐ ÐÐÐÐÐÐÐÐÑÐÑÐÐÑÐÐ ÐÑÑÐÐÐ"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:191
 msgid "Spouse's Name"
 msgstr "ÐÐÐ ÐÐ ÑÑÐÑÑÐ(Ð)"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:192
 msgid "Note"
 msgstr "ÐÐÐÐÐÐÐ"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Home Screen Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ AIM 1"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Home Screen Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ AIM 2"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:197
 msgid "AIM Home Screen Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ AIM 3"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:198
 msgid "AIM Work Screen Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ AIM 1"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:199
 msgid "AIM Work Screen Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ AIM 2"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:200
 msgid "AIM Work Screen Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ AIM 3"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Home Screen Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ GroupWise 1"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Home Screen Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ GroupWise 2"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:203
 msgid "GroupWise Home Screen Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ GroupWise 3"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:204
 msgid "GroupWise Work Screen Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ GroupWise 1"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:205
 msgid "GroupWise Work Screen Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ GroupWise 2"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:206
 msgid "GroupWise Work Screen Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ GroupWise 3"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:207
 msgid "Jabber Home ID 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Jabber 1"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:208
 msgid "Jabber Home ID 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Jabber 2"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:209
 msgid "Jabber Home ID 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Jabber 3"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Jabber Work ID 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Jabber 1"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Jabber Work ID 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Jabber 2"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Jabber Work ID 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Jabber 3"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Home Screen Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Yahoo! 1"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Home Screen Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Yahoo! 2"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:215
 msgid "Yahoo! Home Screen Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Yahoo! 3"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:216
 msgid "Yahoo! Work Screen Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Yahoo! 1"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Yahoo! Work Screen Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Yahoo! 2"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:218
 msgid "Yahoo! Work Screen Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Yahoo! 3"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Home Screen Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ MSN 1"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Home Screen Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ MSN 2"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:221
 msgid "MSN Home Screen Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ MSN 3"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:222
 msgid "MSN Work Screen Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ MSN 1"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:223
 msgid "MSN Work Screen Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ MSN 2"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:224
 msgid "MSN Work Screen Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ MSN 3"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:225
 msgid "ICQ Home ID 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ ICQ 1"
 
-#: ../addressbook/libebook/e-contact.c:225
+#: ../addressbook/libebook/e-contact.c:226
 msgid "ICQ Home ID 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ ICQ 2"
 
-#: ../addressbook/libebook/e-contact.c:226
+#: ../addressbook/libebook/e-contact.c:227
 msgid "ICQ Home ID 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ ICQ 3"
 
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:228
 msgid "ICQ Work ID 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ ICQ 1"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:229
 msgid "ICQ Work ID 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ ICQ 2"
 
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook/e-contact.c:230
 msgid "ICQ Work ID 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ ICQ 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Last Revision"
 msgstr "ÐÐÑÐÐÐÐÐ ÑÐÐÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:234
 msgid "Name or Org"
 msgstr "ÐÐÐ ÐÐÐ ÐÑÐ."
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:236
+#: ../addressbook/libebook/e-contact.c:237
 msgid "Address List"
 msgstr "ÐÐÐÑÑÐ Ñ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:238
 msgid "Home Address"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:238
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Work Address"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:239
+#: ../addressbook/libebook/e-contact.c:240
 msgid "Other Address"
 msgstr "ÐÑÑÐ ÐÐÑÐÑ"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:242
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Category List"
 msgstr "ÐÐÐÑÑÐ Ñ ÐÐÑÐÐÐÑÐÐ"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:245
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Photo"
 msgstr "ÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:246
+#: ../addressbook/libebook/e-contact.c:247
 msgid "Logo"
 msgstr "ÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:248
+#: ../addressbook/libebook/e-contact.c:249
 msgid "Name"
 msgstr "ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:250
 msgid "Email List"
 msgstr "ÐÐÐÑÑÐ Ñ ÐÐÑÐÑÐ ÐÐ Ð-ÐÐÑÐ"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:253
 msgid "AIM Screen Name List"
 msgstr "ÐÐÐÑÑÐ ÐÐ ÑÐÐÐÑÑÑÐÑÐÐÑÐ ÐÑÐ AIM"
 
-#: ../addressbook/libebook/e-contact.c:253
+#: ../addressbook/libebook/e-contact.c:254
 msgid "GroupWise ID List"
 msgstr "ÐÐÐÑÑÐ ÐÐ ÑÐÐÐÑÑÑÐÑÐÐÑÐ ÐÑÐ GroupWise"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:255
 msgid "Jabber ID List"
 msgstr "ÐÐÐÑÑÐ ÐÐ ÑÐÐÐÑÑÑÐÑÐÐÑÐ ÐÑÐ Jabber"
 
-#: ../addressbook/libebook/e-contact.c:255
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Yahoo! Screen Name List"
 msgstr "ÐÐÐÑÑÐ ÐÐ ÑÐÐÐÑÑÑÐÑÐÐÑÐ ÐÑÐ Yahoo!"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:257
 msgid "MSN Screen Name List"
 msgstr "ÐÐÐÑÑÐ ÐÐ ÑÐÐÐÑÑÑÐÑÐÐÑÐ ÐÑÐ MSN"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:258
 msgid "ICQ ID List"
 msgstr "ÐÐÐÑÑÐ ÐÐ ÑÐÐÐÑÑÑÐÑÐÐÑÐ ÐÑÐ ICQ"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:260
 msgid "Wants HTML Mail"
 msgstr "ÐÐÐÐÐ ÐÐÑÐ ÐÑÐ ÑÐÑÐÐÑ HTML"
 
-#: ../addressbook/libebook/e-contact.c:261
+#: ../addressbook/libebook/e-contact.c:262
 msgid "List"
 msgstr "ÐÐÐÑÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:262
+#: ../addressbook/libebook/e-contact.c:263
 msgid "List Show Addresses"
 msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÐ ÑÐÐÑÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:264
+#: ../addressbook/libebook/e-contact.c:265
 msgid "Birth Date"
 msgstr "ÐÐÑÐ ÐÐ ÑÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:265
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:756
+#: ../addressbook/libebook/e-contact.c:266
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1057
 msgid "Anniversary"
 msgstr "ÐÐÐÐÑÐÐÐÐ"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:268
+#: ../addressbook/libebook/e-contact.c:269
 msgid "X.509 Certificate"
 msgstr "ÐÐÑÑÐÑÐÐÐÑ X.509"
 
-#: ../addressbook/libebook/e-contact.c:270
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Gadu-Gadu Home ID 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Gadu-Gadu 1"
 
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook/e-contact.c:272
 msgid "Gadu-Gadu Home ID 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Gadu-Gadu 2"
 
-#: ../addressbook/libebook/e-contact.c:272
+#: ../addressbook/libebook/e-contact.c:273
 msgid "Gadu-Gadu Home ID 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Gadu-Gadu 3"
 
-#: ../addressbook/libebook/e-contact.c:273
+#: ../addressbook/libebook/e-contact.c:274
 msgid "Gadu-Gadu Work ID 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Gadu-Gadu 1"
 
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:275
 msgid "Gadu-Gadu Work ID 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Gadu-Gadu 2"
 
-#: ../addressbook/libebook/e-contact.c:275
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Gadu-Gadu Work ID 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Gadu-Gadu 3"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:277
 msgid "Gadu-Gadu ID List"
 msgstr "ÐÐÐÑÑÐ Ñ ÑÐÐÐÑÑÑÐÑÐÐ ÐÑÐ Gadu-Gadu"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:280
 msgid "Geographic Information"
 msgstr "ÐÐÐÐÑÐÑÑÐÐ ÐÐÑÐÑÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:282
 msgid "Telephone"
 msgstr "ÐÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Home Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Skype 1"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Home Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Skype 2"
 
-#: ../addressbook/libebook/e-contact.c:285
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Home Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Skype 3"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:287
 msgid "Skype Work Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Skype 1"
 
-#: ../addressbook/libebook/e-contact.c:287
+#: ../addressbook/libebook/e-contact.c:288
 msgid "Skype Work Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Skype 2"
 
-#: ../addressbook/libebook/e-contact.c:288
+#: ../addressbook/libebook/e-contact.c:289
 msgid "Skype Work Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Skype 3"
 
-#: ../addressbook/libebook/e-contact.c:289
+#: ../addressbook/libebook/e-contact.c:290
 msgid "Skype Name List"
 msgstr "ÐÐÐÑÑÐ ÐÐ ÑÐÐÐÑÑÑÐÑÐÐÑÐ ÐÑÐ Skype"
 
-#: ../addressbook/libebook/e-contact.c:291
+#: ../addressbook/libebook/e-contact.c:292
 msgid "SIP address"
 msgstr "ÐÐÑÐÑ ÐÐ SIP"
 
-#: ../addressbook/libebook/e-contact.c:293
+#: ../addressbook/libebook/e-contact.c:294
 msgid "Google Talk Home Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Google Talk 1"
 
-#: ../addressbook/libebook/e-contact.c:294
+#: ../addressbook/libebook/e-contact.c:295
 msgid "Google Talk Home Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Google Talk 2"
 
-#: ../addressbook/libebook/e-contact.c:295
+#: ../addressbook/libebook/e-contact.c:296
 msgid "Google Talk Home Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Google Talk 3"
 
-#: ../addressbook/libebook/e-contact.c:296
+#: ../addressbook/libebook/e-contact.c:297
 msgid "Google Talk Work Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Google Talk 1"
 
-#: ../addressbook/libebook/e-contact.c:297
+#: ../addressbook/libebook/e-contact.c:298
 msgid "Google Talk Work Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Google Talk 2"
 
-#: ../addressbook/libebook/e-contact.c:298
+#: ../addressbook/libebook/e-contact.c:299
 msgid "Google Talk Work Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Google Talk 3"
 
-#: ../addressbook/libebook/e-contact.c:299
+#: ../addressbook/libebook/e-contact.c:300
 msgid "Google Talk Name List"
 msgstr "ÐÐÐÑÑÐ ÐÐ ÑÐÐÐÑÑÑÐÑÐÐÑÐ ÐÑÐ Google Talk"
 
-#: ../addressbook/libebook/e-contact.c:1580
+#: ../addressbook/libebook/e-contact.c:1601
 #: ../addressbook/libebook/e-destination.c:884
 msgid "Unnamed List"
 msgstr "ÐÐÐÑÑÐ ÐÐÐ ÐÐÐ"
@@ -804,221 +849,226 @@ msgstr "ÐÐÐÐÐÐÐÑÐ ÑÐÐÐÑÑÐÐ ÐÐ ÐÐÑÐÑÐÐÐ: %s"
 msgid "Cannot change value of book property '%s'"
 msgstr "ÐÐÐÐÑÑÐÐÑÐ â%sâ ÐÐ ÐÐÑÐÑÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÑÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:470
-#: ../camel/camel-db.c:481
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:503
+#: ../camel/camel-db.c:503
 #, c-format
 msgid "Insufficient memory"
 msgstr "ÐÐÐÐÑÑÐÑÑÑÐÐ ÐÐÐÐÑ"
 
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1095
+#, c-format
+msgid "Contact '%s' not found"
+msgstr "ÐÐÐÑÐÐÑÑÑ â%sâ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÐÐÑÐÐ"
+
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:207
-#: ../addressbook/libedata-book/e-data-book.c:220
-#: ../addressbook/libedata-book/e-data-book.c:734
+#: ../addressbook/libedata-book/e-data-book.c:206
+#: ../addressbook/libedata-book/e-data-book.c:219
+#: ../addressbook/libedata-book/e-data-book.c:733
 msgid "Invalid query: "
 msgstr "ÐÑÐÑÐÐ ÐÐÑÐÐÐ: "
 
-#: ../addressbook/libedata-book/e-data-book.c:312
+#: ../addressbook/libedata-book/e-data-book.c:311
 #: ../calendar/libedata-cal/e-data-cal.c:427
 msgid "Success"
 msgstr "ÐÑÐÐÑ"
 
-#: ../addressbook/libedata-book/e-data-book.c:313
-#: ../calendar/libecal/e-cal.c:4563 ../calendar/libedata-cal/e-data-cal.c:428
-#: ../libedataserver/e-client.c:118
+#: ../addressbook/libedata-book/e-data-book.c:312
+#: ../calendar/libecal/e-cal.c:4565 ../calendar/libedata-cal/e-data-cal.c:428
+#: ../libedataserver/e-client.c:120
 msgid "Backend is busy"
 msgstr "ÐÐÑÐÑÐ ÐÐ ÐÐÑÐÐÐÑÐÐ Ð ÐÐÐÑÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:314
-#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:128
+#: ../addressbook/libedata-book/e-data-book.c:313
+#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:130
 msgid "Repository offline"
 msgstr "ÐÑÐÐÐÐÐÑÐÑÐ ÐÐ Ð ÐÐ ÐÐÐÐÑ"
 
-#: ../addressbook/libedata-book/e-data-book.c:315
-#: ../calendar/libecal/e-cal.c:4577 ../calendar/libedata-cal/e-data-cal.c:430
-#: ../libedataserver/e-client.c:132
+#: ../addressbook/libedata-book/e-data-book.c:314
+#: ../calendar/libecal/e-cal.c:4579 ../calendar/libedata-cal/e-data-cal.c:430
+#: ../libedataserver/e-client.c:134
 msgid "Permission denied"
 msgstr "ÐÐÑÑÑÐÑÑ Ð ÐÑÐÐÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:318
+#: ../addressbook/libedata-book/e-data-book.c:317
 #: ../calendar/libedata-cal/e-data-cal.c:435
 msgid "Authentication Failed"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:319
+#: ../addressbook/libedata-book/e-data-book.c:318
 #: ../calendar/libedata-cal/e-data-cal.c:436
 msgid "Authentication Required"
 msgstr "ÐÐÐÑÐÐÐ ÑÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:320
+#: ../addressbook/libedata-book/e-data-book.c:319
 #: ../calendar/libedata-cal/e-data-cal.c:437
 msgid "Unsupported field"
 msgstr "ÐÐÐÐÐÐÑÑÐÐÐÐ ÐÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:321
-#: ../calendar/libedata-cal/e-data-cal.c:439 ../libedataserver/e-client.c:140
+#: ../addressbook/libedata-book/e-data-book.c:320
+#: ../calendar/libedata-cal/e-data-cal.c:439 ../libedataserver/e-client.c:142
 msgid "Unsupported authentication method"
 msgstr "ÐÐÐÐÐÐÑÑÐÐÐ ÐÐÑÐÐ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:322
-#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:142
+#: ../addressbook/libedata-book/e-data-book.c:321
+#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:144
 msgid "TLS not available"
 msgstr "ÐÐÐÑÐÐ TLS"
 
-#: ../addressbook/libedata-book/e-data-book.c:324
+#: ../addressbook/libedata-book/e-data-book.c:323
 msgid "Book removed"
 msgstr "ÐÐÑÐÑÐÐÐÑÑ Ð ÐÐÑÑÐÑ"
 
-#: ../addressbook/libedata-book/e-data-book.c:325
+#: ../addressbook/libedata-book/e-data-book.c:324
 #: ../calendar/libedata-cal/e-data-cal.c:443
 msgid "Not available in offline mode"
 msgstr "ÐÐ Ð ÐÐÐÐÑÐÐ Ð ÑÐÐÐÐ âÐÐÐÐÑÑÐÐâ."
 
-#: ../addressbook/libedata-book/e-data-book.c:326
-#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:144
+#: ../addressbook/libedata-book/e-data-book.c:325
+#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:146
 msgid "Search size limit exceeded"
 msgstr "ÐÐÐÑÐÐÐÐÐÐÑÑ ÑÐÐÐÐÑ ÐÐ ÑÑÑÑÐÐÐ Ð ÐÐÐÐÐÑÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:327
-#: ../calendar/libedata-cal/e-data-cal.c:445 ../libedataserver/e-client.c:146
+#: ../addressbook/libedata-book/e-data-book.c:326
+#: ../calendar/libedata-cal/e-data-cal.c:445 ../libedataserver/e-client.c:148
 msgid "Search time limit exceeded"
 msgstr "ÐÐÐÑÐÐÐÐÐÐÑÐ ÐÑÐÐÐ ÐÐ ÑÑÑÑÐÐÐ Ð ÐÐÐÐÐÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:328
-#: ../calendar/libedata-cal/e-data-cal.c:446 ../libedataserver/e-client.c:148
+#: ../addressbook/libedata-book/e-data-book.c:327
+#: ../calendar/libedata-cal/e-data-cal.c:446 ../libedataserver/e-client.c:150
 msgid "Invalid query"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:329
-#: ../calendar/libedata-cal/e-data-cal.c:447 ../libedataserver/e-client.c:150
+#: ../addressbook/libedata-book/e-data-book.c:328
+#: ../calendar/libedata-cal/e-data-cal.c:447 ../libedataserver/e-client.c:152
 msgid "Query refused"
 msgstr "ÐÐÑÐÐÐÑÐ Ð ÐÑÐÐÐÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:330
-#: ../calendar/libedata-cal/e-data-cal.c:448 ../libedataserver/e-client.c:136
+#: ../addressbook/libedata-book/e-data-book.c:329
+#: ../calendar/libedata-cal/e-data-cal.c:448 ../libedataserver/e-client.c:138
 msgid "Could not cancel"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÑÐÐ"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
 #. { OtherError,			N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:332
+#: ../addressbook/libedata-book/e-data-book.c:331
 #: ../calendar/libedata-cal/e-data-cal.c:450
 msgid "Invalid server version"
 msgstr "ÐÑÐÑÐÐ ÐÐÑÑÐÑ ÐÐ ÑÑÑÐÑÑÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:334
-#: ../calendar/libecal/e-cal.c:4561 ../calendar/libedata-cal/e-data-cal.c:451
-#: ../libedataserver/e-client.c:116
+#: ../addressbook/libedata-book/e-data-book.c:333
+#: ../calendar/libecal/e-cal.c:4563 ../calendar/libedata-cal/e-data-cal.c:451
+#: ../libedataserver/e-client.c:118
 msgid "Invalid argument"
 msgstr "ÐÑÐÑÐÐ ÐÑÐÑÐÐÐÑ"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:336
-#: ../calendar/libecal/e-cal.c:4600 ../calendar/libedata-cal/e-data-cal.c:453
-#: ../libedataserver/e-client.c:138
+#: ../addressbook/libedata-book/e-data-book.c:335
+#: ../calendar/libecal/e-cal.c:4602 ../calendar/libedata-cal/e-data-cal.c:453
+#: ../libedataserver/e-client.c:140
 msgid "Not supported"
 msgstr "ÐÐ ÑÐ ÐÐÐÐÑÑÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:337
-#: ../calendar/libedata-cal/e-data-cal.c:454 ../libedataserver/e-client.c:156
+#: ../addressbook/libedata-book/e-data-book.c:336
+#: ../calendar/libedata-cal/e-data-cal.c:454 ../libedataserver/e-client.c:158
 msgid "Backend is not opened yet"
 msgstr "ÐÐÑÐÑÐ ÐÑÐ ÐÑÐ ÐÐ Ð ÑÑÐÑÑÐÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:345
+#: ../addressbook/libedata-book/e-data-book.c:344
 #: ../calendar/libecal/e-cal-client.c:618
-#: ../calendar/libedata-cal/e-data-cal.c:462 ../libedataserver/e-client.c:154
+#: ../calendar/libedata-cal/e-data-cal.c:462 ../libedataserver/e-client.c:156
 msgid "Other error"
 msgstr "ÐÑÑÐÐ ÐÑÐÑÐÐ"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:552
-#: ../addressbook/libedata-book/e-data-book.c:944
+#: ../addressbook/libedata-book/e-data-book.c:551
+#: ../addressbook/libedata-book/e-data-book.c:943
 msgid "Cannot get contact: "
 msgstr "ÐÐÐÑÐÐÑÑÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:577
-#: ../addressbook/libedata-book/e-data-book.c:602
+#: ../addressbook/libedata-book/e-data-book.c:576
+#: ../addressbook/libedata-book/e-data-book.c:601
 msgid "Empty query: "
 msgstr "ÐÑÐÐÐÐ ÐÐÑÐÐÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:627
-#: ../addressbook/libedata-book/e-data-book.c:1026
+#: ../addressbook/libedata-book/e-data-book.c:626
+#: ../addressbook/libedata-book/e-data-book.c:1041
 msgid "Cannot add contact: "
 msgstr "ÐÐÐÑÐÐÑÑÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:652
-#: ../addressbook/libedata-book/e-data-book.c:1048
-msgid "Cannot modify contact: "
-msgstr "ÐÐÐÑÐÐÑÑÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÐÐÐ: "
+#: ../addressbook/libedata-book/e-data-book.c:651
+#: ../addressbook/libedata-book/e-data-book.c:1075
+msgid "Cannot modify contacts: "
+msgstr "ÐÐÐÑÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÑÐ ÐÑÐÐÐÐÑÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:760
+#: ../addressbook/libedata-book/e-data-book.c:759
 #: ../calendar/libedata-cal/e-data-cal.c:866
 msgid "Cannot authenticate user: "
 msgstr "ÐÐÑÑÐÐÐÑÐÐÑÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÐÑÐÑÐÑÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:831
+#: ../addressbook/libedata-book/e-data-book.c:830
 msgid "Cannot open book: "
 msgstr "ÐÐÑÐÑÐÐÐÑÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:847
+#: ../addressbook/libedata-book/e-data-book.c:846
 msgid "Cannot remove book: "
 msgstr "ÐÐÑÐÑÐÐÐÑÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÐÑÐÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:874
+#: ../addressbook/libedata-book/e-data-book.c:873
 msgid "Cannot refresh address book: "
 msgstr "ÐÐÐÐÐÐÐÑÑÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:900
+#: ../addressbook/libedata-book/e-data-book.c:899
 msgid "Cannot get backend property: "
 msgstr "ÐÐÐÐÑÑÐÐÑÐ ÐÐ ÑÐÑÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:925
+#: ../addressbook/libedata-book/e-data-book.c:924
 #: ../calendar/libedata-cal/e-data-cal.c:1069
 msgid "Cannot set backend property: "
 msgstr "ÐÐÐÐÑÑÐÐÑÐ ÐÐ ÑÐÑÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÐÐÐÐÐÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:962
+#: ../addressbook/libedata-book/e-data-book.c:961
 msgid "Cannot get contact list: "
 msgstr "ÐÐÐÑÑÐÑÑ Ñ ÐÐÐÑÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:996
+#: ../addressbook/libedata-book/e-data-book.c:995
 msgid "Cannot get contact list uids: "
 msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑÑÑ ÐÐ ÑÐÐÑÑÐÐ Ñ ÐÐÐÑÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: %s"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1069
+#: ../addressbook/libedata-book/e-data-book.c:1100
 msgid "Cannot remove contacts: "
 msgstr "ÐÐÐÑÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÑÐ ÐÑÐÐÐÑÐÐÑ: "
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:230
-#: ../addressbook/libedata-book/e-data-book-factory.c:258
-#: ../calendar/libedata-cal/e-data-cal-factory.c:273
+#: ../addressbook/libedata-book/e-data-book-factory.c:184
+#: ../addressbook/libedata-book/e-data-book-factory.c:212
+#: ../calendar/libedata-cal/e-data-cal-factory.c:229
 #, c-format
 msgid "Empty URI"
 msgstr "ÐÑÐÐÐÐ ÐÐÑÐÑ"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:525
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:543
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "ÐÑÑÐÑÑÑÑ Ð ÐÐÐÐÑÑÑÐÐÐ (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:553
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:571
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "ÐÐÐÑÑÐÐ Ð ÐÐÐÑÐÐÐÐÐ ÐÐÐ ÐÐ HTTP ÐÐ ÑÑÑÑÐÑÐÐÐ â %d (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2181
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2540
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2242
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2605
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1027,92 +1077,108 @@ msgstr ""
 "ÐÑÑÐÑÑÑÑ Ð ÐÐÐÐÑÑÑÐÐÐ Ð ÐÐÐÐÐÐÐÑÑÑ Ð ÐÑÐÐÑÐÐ Ð ÑÐÐÐÐ ÑÐÐÐ ÐÐ ÑÐÑÐÐÐ.\n"
 "ÐÑÐÐÑÐÐÐÐ ÐÐ ÐÑÐÑÐÐ: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4480
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4562
 msgid "Calendar doesn't support Free/Busy"
 msgstr "ÐÐÐÐÐÐÐÑÑÑ ÐÐ ÐÐÐÐÑÑÐÐ ÑÑÑÑÐÑÐÐÑÑÐ âÐÐÐÐÐÐÐÐâ/âÐÐÐÑâ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:758
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:214
+#: ../libedataserverui/e-client-utils.c:875
+#, c-format
+msgid ""
+"Enter password for address book %s (user %s)\n"
+"Reason: %s"
+msgstr ""
+"ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐÐ %s (ÐÐÑÑÐÐÐÑÐÐ â%sâ)\n"
+"ÐÑÐÑÐÐÐ: %s"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:216
+#: ../libedataserverui/e-client-utils.c:877
+#, c-format
+msgid "Enter password for address book %s (user %s)"
+msgstr "ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐÐ %s (ÐÐÑÑÐÐÐÑÐÐ â%sâ)"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1059
 msgid "Birthday"
 msgstr "ÐÐÑÐ ÐÐ ÑÐÐÐÐÐÐ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:788
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1095
 #, c-format
 msgid "Birthday: %s"
 msgstr "ÐÐÑÐ ÐÐ ÑÐÐÐÐÐÐ: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:813
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1126
 #, c-format
 msgid "Anniversary: %s"
 msgstr "ÐÐÐÐÑÐÐÐÐ: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:241
+#: ../calendar/backends/file/e-cal-backend-file.c:249
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "ÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÐÑÐÐÑ ÐÐÐÐÐÐÐÐ: ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑ."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:248
-#: ../calendar/backends/file/e-cal-backend-file.c:254
+#: ../calendar/backends/file/e-cal-backend-file.c:256
+#: ../calendar/backends/file/e-cal-backend-file.c:262
 msgid "Cannot save calendar data"
 msgstr "ÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÐÑÐÐÑ ÐÐÐÐÐÐÐÐ"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:413
+#: ../calendar/backends/http/e-cal-backend-http.c:418
 msgid "Redirected to Invalid URI"
 msgstr "ÐÑÐÐÐÑÐÑÐÐÐ ÐÑÐ ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑ"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:451
+#: ../calendar/backends/http/e-cal-backend-http.c:459
 msgid "Bad file format."
 msgstr "ÐÐÐÐ Ð ÐÐÐÑÐÐÐÐÐÐ ÑÐÑÐÐÑ."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:458
+#: ../calendar/backends/http/e-cal-backend-http.c:467
 msgid "Not a calendar."
 msgstr "ÐÐ Ð ÐÐÐÐÐÐÐÑ."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:779
-#: ../calendar/backends/http/e-cal-backend-http.c:780
-#: ../calendar/backends/weather/e-cal-backend-weather.c:536
+#: ../calendar/backends/http/e-cal-backend-http.c:793
+#: ../calendar/backends/http/e-cal-backend-http.c:794
+#: ../calendar/backends/weather/e-cal-backend-weather.c:522
 msgid "Could not create cache file"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐ Ñ ÐÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:183
+#: ../calendar/backends/weather/e-cal-backend-weather.c:181
 msgid "Could not retrieve weather data"
 msgstr "ÐÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÐÑÐÐÑ ÐÐÐÑÑÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:291
+#: ../calendar/backends/weather/e-cal-backend-weather.c:277
 msgid "Weather: Fog"
 msgstr "ÐÑÐÐÐ: ÐÑÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:292
+#: ../calendar/backends/weather/e-cal-backend-weather.c:278
 msgid "Weather: Cloudy Night"
 msgstr "ÐÑÐÐÐ: ÐÐÐÐÑÐÐ ÐÐÑÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:293
+#: ../calendar/backends/weather/e-cal-backend-weather.c:279
 msgid "Weather: Cloudy"
 msgstr "ÐÑÐÐÐ: ÐÐÐÐÑÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:294
+#: ../calendar/backends/weather/e-cal-backend-weather.c:280
 msgid "Weather: Overcast"
 msgstr "ÐÑÐÐÐ: ÐÐÑÑÐÐ ÐÐÐÐÑÐÐÑÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:295
+#: ../calendar/backends/weather/e-cal-backend-weather.c:281
 msgid "Weather: Showers"
 msgstr "ÐÑÐÐÐ: ÐÐÐÐÐÐ Ñ ÐÑÐÐÑÑÐÐÐÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:296
+#: ../calendar/backends/weather/e-cal-backend-weather.c:282
 msgid "Weather: Snow"
 msgstr "ÐÑÐÐÐ: ÑÐÑÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:297
+#: ../calendar/backends/weather/e-cal-backend-weather.c:283
 msgid "Weather: Clear Night"
 msgstr "ÐÑÐÐÐ: ÑÑÐÐ ÐÐÑÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:298
+#: ../calendar/backends/weather/e-cal-backend-weather.c:284
 msgid "Weather: Sunny"
 msgstr "ÐÑÐÐÐ: ÑÐÑÐÑÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:299
+#: ../calendar/backends/weather/e-cal-backend-weather.c:285
 msgid "Weather: Thunderstorms"
 msgstr "ÐÑÐÐÐ: ÐÑÑÐÐÑÐÐÐÑÐÐ ÐÑÑÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:447
+#: ../calendar/backends/weather/e-cal-backend-weather.c:433
 msgid "Forecast"
 msgstr "ÐÑÐÐÐÐÐÐ"
 
@@ -1132,68 +1198,68 @@ msgid "Enter password for %s to enable proxy for user %s"
 msgstr ""
 "ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐ ÐÐ %s, ÐÐ ÐÐ ÐÐÐÑÑÐÑÐ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÑÐÐÐÑÐÐÑ â%sâ"
 
-#: ../calendar/libecal/e-cal.c:4565
+#: ../calendar/libecal/e-cal.c:4567
 msgid "Repository is offline"
 msgstr "ÐÑÐÐÐÐÐÑÐÑÐ ÐÐ Ð ÐÐÑÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4567 ../calendar/libecal/e-cal-client.c:134
+#: ../calendar/libecal/e-cal.c:4569 ../calendar/libecal/e-cal-client.c:134
 msgid "No such calendar"
 msgstr "ÐÑÐÐ ÑÐÐÑÐ ÐÐÐÐÐÐÐÑ"
 
-#: ../calendar/libecal/e-cal.c:4569 ../calendar/libecal/e-cal-client.c:136
+#: ../calendar/libecal/e-cal.c:4571 ../calendar/libecal/e-cal-client.c:136
 #: ../calendar/libedata-cal/e-data-cal.c:432
 msgid "Object not found"
 msgstr "ÐÐÐÐÑÑÑ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4571 ../calendar/libecal/e-cal-client.c:138
+#: ../calendar/libecal/e-cal.c:4573 ../calendar/libecal/e-cal-client.c:138
 #: ../calendar/libedata-cal/e-data-cal.c:433
 msgid "Invalid object"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÑ"
 
-#: ../calendar/libecal/e-cal.c:4573
+#: ../calendar/libecal/e-cal.c:4575
 msgid "URI not loaded"
 msgstr "ÐÐÑÐÑÑÑ ÐÐ Ð ÐÐÑÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4575
+#: ../calendar/libecal/e-cal.c:4577
 msgid "URI already loaded"
 msgstr "ÐÐÑÐÑÑÑ ÐÐÑÐ Ð ÐÐÑÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4579
+#: ../calendar/libecal/e-cal.c:4581
 msgid "Unknown User"
 msgstr "ÐÐÐÐÐÐÑÑÐÐ ÐÐÑÑÐÐÐÑÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4581 ../calendar/libecal/e-cal-client.c:142
+#: ../calendar/libecal/e-cal.c:4583 ../calendar/libecal/e-cal-client.c:142
 #: ../calendar/libedata-cal/e-data-cal.c:434
 msgid "Object ID already exists"
 msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑÑÑ ÐÐ ÐÐÐÐÑÐ ÐÐÑÐ ÑÑÑÐÑÑÐÑÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4583
+#: ../calendar/libecal/e-cal.c:4585
 msgid "Protocol not supported"
 msgstr "ÐÑÐÑÐÐÐÐÑÑ ÐÐ ÑÐ ÐÐÐÐÑÑÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4585
+#: ../calendar/libecal/e-cal.c:4587
 msgid "Operation has been canceled"
 msgstr "ÐÑÐÐÐÐÐÐ ÐÐÐÑÑÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4587
+#: ../calendar/libecal/e-cal.c:4589
 msgid "Could not cancel operation"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÑÐÐ ÐÐ ÐÐÐÑÑÐÐÐÑÐ"
 
-#: ../calendar/libecal/e-cal.c:4589 ../libedataserver/e-client.c:124
+#: ../calendar/libecal/e-cal.c:4591 ../libedataserver/e-client.c:126
 msgid "Authentication failed"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4591
-#: ../camel/providers/smtp/camel-smtp-transport.c:767
-#: ../libedataserver/e-client.c:126
+#: ../calendar/libecal/e-cal.c:4593
+#: ../camel/providers/smtp/camel-smtp-transport.c:846
+#: ../libedataserver/e-client.c:128
 msgid "Authentication required"
 msgstr "ÐÐÐÑÐÐÐ ÑÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4593
+#: ../calendar/libecal/e-cal.c:4595
 msgid "A D-Bus exception has occurred"
 msgstr "ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÑÐÐÐÐ ÐÐ D-Bus"
 
-#: ../calendar/libecal/e-cal.c:4597
+#: ../calendar/libecal/e-cal.c:4599
 msgid "No error"
 msgstr "ÐÑÐÐ ÐÑÐÑÐÐ"
 
@@ -1224,7 +1290,7 @@ msgstr "ÐÐÐÐÐÐÐÑÑÑ ÐÐ ÑÑÑÐÑÑÐÑÐÐ"
 msgid "Invalid source type"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../calendar/libecal/e-cal-component.c:1326
+#: ../calendar/libecal/e-cal-component.c:1362
 msgid "Untitled appointment"
 msgstr "ÐÑÐÑÐ ÐÐÐ ÐÐÐÐÐÐÐÐ"
 
@@ -1387,86 +1453,93 @@ msgstr "ÐÐÐÐÐÐÐÑÐ ÑÐÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐÐÐÑ: â%sâ"
 msgid "Cannot change value of calendar property '%s'"
 msgstr "ÐÐÐÐÑÑÐÐÑÐ â%sâ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÑÐÐÐÐÐÐÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:72
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:728
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:750
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:865
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:896
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1096
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1126
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:77
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:807
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:829
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:944
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:975
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1175
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1205
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "â%sâ ÐÐ ÐÑÐÐÐÐ ÐÑÐÑÐÐÐÑÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:224
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:269
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:308
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1167
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:229
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:274
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:313
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1246
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "â%sâ ÐÑÐÐÐÐ ÐÐÐÐ ÐÑÐÑÐÐÐÑ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:114
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:314
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:795
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:119
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:126
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:319
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:874
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "â%sâ ÐÑÐÐÐÐ ÐÑÑÐÐÑÑ ÐÑÐÑÐÐÐÑ ÐÐ ÐÑÐÐ ÐÐÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:129
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:134
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr "â%sâ ÐÑÐÐÐÐ ÐÑÑÐÐÑÑ ÐÑÐÑÐÐÐÑ ÐÐ ÐÑÐÐ ÐÐÐ ÐÐ ÐÐÑÐ/ÐÑÐÐÐ ÐÐ ISO 8601"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:171
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:455
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:789
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:931
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:535
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1010
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "â%sâ ÐÑÐÐÐÐ ÐÐÐ ÐÑÐÑÐÐÐÑÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:177
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:230
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:275
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:396
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:461
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:937
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1173
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:182
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:235
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:280
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:401
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:484
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:541
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1016
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1252
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "â%sâ ÐÑÐÐÐÐ ÐÑÑÐÐÑÑ ÐÑÐÑÐÐÐÑ ÐÐ ÐÑÐÐ ÐÑ ÐÐÐÐ time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:185
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:190
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "â%sâ ÐÑÐÐÐÐ ÐÑÐÑÐÑÑ ÐÑÐÑÐÐÐÑ ÐÐ ÐÑÐÐ ÐÑ ÐÐÐÐ integer"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:390
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:395
 #, c-format
 msgid "\"%s\" expects two or three arguments"
 msgstr "â%sâ ÐÑÐÐÐÐ ÐÐÐ ÐÐÐ ÑÑÐ ÐÑÐÑÐÐÐÑÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:404
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:470
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:945
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:409
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:490
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:550
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1024
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "â%sâ ÐÑÐÐÐÐ ÐÑÐÑÐÑÑ ÐÑÐÑÐÐÐÑ ÐÐ ÐÑÐÐ ÐÑ ÐÐÐÐ time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:418
 #, c-format
 msgid "\"%s\" expects the third argument to be a string"
 msgstr "â%sâ ÐÑÐÐÐÐ ÑÑÐÑÐÑÑ ÐÑÐÑÐÐÐÑ ÐÐ ÐÑÐÐ ÐÐÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:803
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:478
+#, c-format
+msgid "\"%s\" expects none or two arguments"
+msgstr "â%sâ ÐÑÐÐÐÐ ÐÐÐÐÐÐÐ ÐÐÐ ÐÐÐ ÐÑÐÑÐÐÐÑÐ"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:882
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "â%sâ ÐÑÐÐÐÐ ÐÑÐÑÐÑ ÐÑÐÑÐÐÐÑ ÐÐ ÐÑÐÐ ÐÐÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:833
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:912
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1478,12 +1551,12 @@ msgstr ""
 "âlocationâ (ÐÐÑÑÐÐÐÐÐÐÐÐÐÐ), âattendeeâ (ÑÑÐÑÑÐÐÐ), âattendeeâ (ÐÑÐÐÐÐÐÐÑÐÑ) "
 "ÐÐÐ âclassificationâ (ÐÐÐÑÐÑÐÐÐÑÐÑ)"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:995
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1074
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "â%sâ ÐÑÐÐÐÐ ÐÐÐÐ ÐÐÐÐ ÐÑÐÑÐÐÐÑ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1009
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1581,7 +1654,7 @@ msgstr "ÐÐÑÐÐÐÑÑ ÐÐÑÑ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ Ñ
 msgid "Could not add calendar time zone: "
 msgstr "ÐÐÑÐÐÐÑÑ ÐÐÑÑ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐ: "
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:243
+#: ../calendar/libedata-cal/e-data-cal-factory.c:199
 #, c-format
 msgid "Invalid call"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐ"
@@ -1616,15 +1689,15 @@ msgstr "ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÑÑÑÐ ÐÐÑÑÐÐÐ Ñ ÑÐÐÐ ÑÐÑ
 msgid "You may not export keys with this cipher"
 msgstr "ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÑÑÐ ÐÐÑÑÐÐÐ Ñ ÑÐÐÐ ÑÐÑÑÑ"
 
-#: ../camel/camel-cipher-context.c:812
+#: ../camel/camel-cipher-context.c:800
 msgid "Signing message"
 msgstr "ÐÐÐÐÐÑÐÐÐÐ ÐÐ ÐÐÑÐÐÑÐ"
 
-#: ../camel/camel-cipher-context.c:1053
+#: ../camel/camel-cipher-context.c:1041
 msgid "Encrypting message"
 msgstr "ÐÐÑÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐÑÐ"
 
-#: ../camel/camel-cipher-context.c:1180
+#: ../camel/camel-cipher-context.c:1168
 msgid "Decrypting message"
 msgstr "ÐÐÑÐÑÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐÑÐ"
 
@@ -1669,32 +1742,39 @@ msgstr "ÐÐÐÑÑÐÐÐÐÐÑÐÐÐ ÑÑÑ ÑÑÑÐÑÑÐ"
 msgid "Downloading new messages for offline mode"
 msgstr "ÐÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐ ÑÑÐÐÑÐÐÐÑ ÐÐ ÑÐÐÐÐ âÐÐÐÐÑÑÐÐâ"
 
-#: ../camel/camel-disco-folder.c:410
+#: ../camel/camel-disco-folder.c:412
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "ÐÐÐÐÐÑÐÑÐÐ ÐÐ ÐÐÐÐÐÑÐ â%sâ ÐÐ ÑÐÐÐÐ âÐÐÐÐÑÑÐÐâ"
 
-#: ../camel/camel-disco-folder.c:476 ../camel/camel-offline-folder.c:325
-msgid "Copy folder content locally for offline operation"
+#: ../camel/camel-disco-folder.c:478 ../camel/camel-offline-folder.c:323
+msgid "Copy folder content locally for _offline operation"
 msgstr ""
-"ÐÐÐÐÑÐÐÐ ÐÐ ÑÑÐÑÑÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐÑÐ Ð ÑÐÐÐÐ âÐÐÐÐÑÑÐÐâ"
+"_ÐÐÐÐÑÐÐÐ ÐÐ ÑÑÐÑÑÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐÑÐ Ð ÑÐÐÐÐ âÐÐÐÐÑÑÐÐâ"
 
 #: ../camel/camel-disco-store.c:456
-#: ../camel/providers/imap/camel-imap-store.c:1167
-#: ../camel/providers/imap/camel-imap-store.c:1968
-#: ../camel/providers/imap/camel-imap-store.c:2463
-#: ../camel/providers/imap/camel-imap-store.c:3225
-#: ../camel/providers/imapx/camel-imapx-folder.c:324
-#: ../camel/providers/imapx/camel-imapx-folder.c:357
-#: ../camel/providers/imapx/camel-imapx-folder.c:411
-#: ../camel/providers/imapx/camel-imapx-folder.c:457
-#: ../camel/providers/imapx/camel-imapx-folder.c:491
-#: ../camel/providers/imapx/camel-imapx-folder.c:531
-#: ../camel/providers/imapx/camel-imapx-folder.c:567
-#: ../camel/providers/imapx/camel-imapx-store.c:240
-#: ../camel/providers/imapx/camel-imapx-store.c:1304
-#: ../camel/providers/imapx/camel-imapx-store.c:1392
-#: ../camel/providers/imapx/camel-imapx-store.c:1438
+#: ../camel/providers/imap/camel-imap-store.c:1239
+#: ../camel/providers/imap/camel-imap-store.c:2028
+#: ../camel/providers/imap/camel-imap-store.c:2523
+#: ../camel/providers/imap/camel-imap-store.c:3282
+#: ../camel/providers/imapx/camel-imapx-folder.c:407
+#: ../camel/providers/imapx/camel-imapx-folder.c:440
+#: ../camel/providers/imapx/camel-imapx-folder.c:474
+#: ../camel/providers/imapx/camel-imapx-folder.c:530
+#: ../camel/providers/imapx/camel-imapx-folder.c:587
+#: ../camel/providers/imapx/camel-imapx-folder.c:621
+#: ../camel/providers/imapx/camel-imapx-folder.c:661
+#: ../camel/providers/imapx/camel-imapx-folder.c:697
+#: ../camel/providers/imapx/camel-imapx-store.c:276
+#: ../camel/providers/imapx/camel-imapx-store.c:1367
+#: ../camel/providers/imapx/camel-imapx-store.c:1455
+#: ../camel/providers/imapx/camel-imapx-store.c:1501
+#: ../camel/providers/pop3/camel-pop3-folder.c:527
+#: ../camel/providers/pop3/camel-pop3-folder.c:657
+#: ../camel/providers/pop3/camel-pop3-folder.c:840
+#: ../camel/providers/pop3/camel-pop3-folder.c:1038
+#: ../camel/providers/pop3/camel-pop3-store.c:393
+#: ../camel/providers/pop3/camel-pop3-store.c:805
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "ÐÑÑÐÐÐ ÐÐ ÑÑÐ Ð ÑÐÐÐÐ âÐÐÐÑÑÐÐâ, ÐÐ ÐÐ ÐÐÐÑÑÑÐÑÐ ÑÐÐÐ ÐÐÐÑÑÐÐÐ"
@@ -1704,64 +1784,64 @@ msgstr "ÐÑÑÐÐÐ ÐÐ ÑÑÐ Ð ÑÐÐÐÐ âÐÐÐÑÑÐÐâ, ÐÐ ÐÐ 
 msgid "Canceled"
 msgstr "ÐÑÐÐÐÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:878 ../camel/camel-filter-search.c:697
+#: ../camel/camel-filter-driver.c:889 ../camel/camel-filter-search.c:762
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÑÑÐÑÐÐ ÐÑÐÑÐÑ â%sâ: %s"
 
-#: ../camel/camel-filter-driver.c:926
+#: ../camel/camel-filter-driver.c:937
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "ÐÐÐÑÑÐÐ Ð ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÐ ÑÑÐÐÑÐÐÐÑ ÐÑ %s: %s"
 
-#: ../camel/camel-filter-driver.c:1131 ../camel/camel-filter-driver.c:1140
+#: ../camel/camel-filter-driver.c:1142 ../camel/camel-filter-driver.c:1151
 msgid "Syncing folders"
 msgstr "ÐÐÐÑÑÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1235 ../camel/camel-filter-driver.c:1681
+#: ../camel/camel-filter-driver.c:1247 ../camel/camel-filter-driver.c:1705
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÐÐÑÐÐÐÑÐ ÐÐ ÑÐÐÑÑÑ: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1692
+#: ../camel/camel-filter-driver.c:1258 ../camel/camel-filter-driver.c:1716
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÐÐÐÐÐÐ ÐÐ ÑÐÐÑÑÑ: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1344
+#: ../camel/camel-filter-driver.c:1356
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐÑÐ-ÑÐÑÐÐÑ"
 
-#: ../camel/camel-filter-driver.c:1355
+#: ../camel/camel-filter-driver.c:1368
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐÑÐ-ÑÐÑÐÐÑ"
 
-#: ../camel/camel-filter-driver.c:1373
+#: ../camel/camel-filter-driver.c:1386
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1380 ../camel/camel-filter-driver.c:1402
+#: ../camel/camel-filter-driver.c:1393 ../camel/camel-filter-driver.c:1415
 #, c-format
 msgid "Failed on message %d"
 msgstr "ÐÐÑÑÐÐÑ ÐÑÐ ÐÐÑÐÐ %d"
 
-#: ../camel/camel-filter-driver.c:1417 ../camel/camel-filter-driver.c:1518
+#: ../camel/camel-filter-driver.c:1430 ../camel/camel-filter-driver.c:1537
 msgid "Syncing folder"
 msgstr "ÐÐÐÑÑÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1422 ../camel/camel-filter-driver.c:1524
+#: ../camel/camel-filter-driver.c:1435 ../camel/camel-filter-driver.c:1543
 msgid "Complete"
 msgstr "ÐÐÐÑÑÑÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1482
+#: ../camel/camel-filter-driver.c:1495
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ %d ÐÑ %d"
 
-#: ../camel/camel-filter-driver.c:1500
+#: ../camel/camel-filter-driver.c:1513
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÐ %d ÐÑ %d"
@@ -1770,66 +1850,66 @@ msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÐ %d ÐÑ %d"
 msgid "Failed to retrieve message"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÑÐ"
 
-#: ../camel/camel-filter-search.c:447
+#: ../camel/camel-filter-search.c:512
 msgid "Invalid arguments to (system-flag)"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐÐÑÐ ÐÑÐ (system-flag)"
 
-#: ../camel/camel-filter-search.c:465
+#: ../camel/camel-filter-search.c:530
 msgid "Invalid arguments to (user-tag)"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐÐÑÐ ÐÑÐ (user-tag)"
 
-#: ../camel/camel-filter-search.c:874 ../camel/camel-filter-search.c:883
+#: ../camel/camel-filter-search.c:939 ../camel/camel-filter-search.c:948
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÑÑÑÐÐÐ ÑÑÐÐ ÑÐÐÑÑÑ: %s: %s"
 
-#: ../camel/camel-folder.c:243
+#: ../camel/camel-folder.c:258
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
 msgstr[0] "ÐÐÐÑÐÑÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÐ Ð â%sâ ÐÐÑÐ ÑÐÐÐ"
 msgstr[1] "ÐÐÐÑÐÑÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÐ Ð â%sâ ÐÐÑÐ ÑÐÐÐ"
 
-#: ../camel/camel-folder.c:283
+#: ../camel/camel-folder.c:298
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
 msgstr[0] "ÐÐÐÑÐÑÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÐ Ð â%sâ, ÑÐ ÐÐ Ð ÑÐÐÐ"
 msgstr[1] "ÐÐÐÑÐÑÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÐ Ð â%sâ, ÑÐ ÐÐ ÑÐ ÑÐÐÐ"
 
-#: ../camel/camel-folder.c:331
+#: ../camel/camel-folder.c:346
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
 msgstr[0] "ÐÐÐÑÑÐÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÐ Ð â%sâ"
 msgstr[1] "ÐÐÐÑÑÐÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÐ Ð â%sâ"
 
-#: ../camel/camel-folder.c:902
-#: ../camel/providers/local/camel-maildir-folder.c:319
+#: ../camel/camel-folder.c:914
+#: ../camel/providers/local/camel-maildir-folder.c:322
 msgid "Moving messages"
 msgstr "ÐÑÐÐÐÑÑÐÐÐÐ ÐÐ ÐÐÑÐÐ"
 
-#: ../camel/camel-folder.c:905
+#: ../camel/camel-folder.c:917
 msgid "Copying messages"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐ"
 
-#: ../camel/camel-folder.c:1160
+#: ../camel/camel-folder.c:1229
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr "ÐÐÐÐÐÑÐ â%sâ ÐÐ ÐÐÐÐÑÑÐÐ ÐÐÑÐÑÐÐÑÐÑ ÐÐ ÐÐÐÑÐ"
 
-#: ../camel/camel-folder.c:3271
+#: ../camel/camel-folder.c:3535
 #, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ â%sâ Ð %s"
 
-#: ../camel/camel-folder.c:3404
+#: ../camel/camel-folder.c:3681
 #, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "ÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐÑÐÑ ÐÐ ÐÐÐÑÐÑÐ ÐÐ â%sâ"
 
-#: ../camel/camel-folder-search.c:348 ../camel/camel-folder-search.c:459
-#: ../camel/camel-folder-search.c:630
+#: ../camel/camel-folder-search.c:362 ../camel/camel-folder-search.c:476
+#: ../camel/camel-folder-search.c:661
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1838,8 +1918,8 @@ msgstr ""
 "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ ÑÑÑÑÐÐÐ: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:360 ../camel/camel-folder-search.c:471
-#: ../camel/camel-folder-search.c:642
+#: ../camel/camel-folder-search.c:374 ../camel/camel-folder-search.c:488
+#: ../camel/camel-folder-search.c:673
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1849,47 +1929,47 @@ msgstr ""
 "%s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:856 ../camel/camel-folder-search.c:899
+#: ../camel/camel-folder-search.c:887 ../camel/camel-folder-search.c:930
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) ÐÐÐÑÐÐÐ ÐÐÐÐÐÑÐÐ ÐÑÐÐÐ ÑÐÐÑÐÑÐÑ"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:960
+#: ../camel/camel-folder-search.c:991
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) ÐÐ Ð ÐÐÐÐÐÐÐÐ ÐÑÑÑÐ Ð â%sâ"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:967 ../camel/camel-folder-search.c:975
+#: ../camel/camel-folder-search.c:998 ../camel/camel-folder-search.c:1006
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) ÐÐÐÑÐÐÐ ÐÐÐ ÐÐ ÑÑÐÐÐÐÐÐÐ"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1003
+#: ../camel/camel-folder-search.c:1034
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) ÐÑÐÐÐÐ ÑÐÐÑÐÑÐÑ-ÐÐÑÐÐ"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1013
+#: ../camel/camel-folder-search.c:1044
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) ÐÐÐÑÐÐÐ ÐÐÐÐÐÑÐ ÐÐ Ð ÐÐÐÑÐÐÐ"
 
-#: ../camel/camel-gpg-context.c:657 ../camel/camel-gpg-context.c:662
-#: ../camel/camel-gpg-context.c:1288
+#: ../camel/camel-gpg-context.c:659 ../camel/camel-gpg-context.c:664
+#: ../camel/camel-gpg-context.c:1323
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÐÐÐÐÐÐ ÐÐ gpg: %s"
 
-#: ../camel/camel-gpg-context.c:662
-#: ../camel/providers/smtp/camel-smtp-transport.c:770
+#: ../camel/camel-gpg-context.c:664
+#: ../camel/providers/smtp/camel-smtp-transport.c:849
 msgid "Unknown"
 msgstr "ÐÐÐÐÐÐÑÑÐÐ"
 
-#: ../camel/camel-gpg-context.c:727
+#: ../camel/camel-gpg-context.c:729
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1900,17 +1980,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:744
+#: ../camel/camel-gpg-context.c:765
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐÐÐÑÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÐ gpg."
 
-#: ../camel/camel-gpg-context.c:769 ../camel/camel-gpg-context.c:784
+#: ../camel/camel-gpg-context.c:790 ../camel/camel-gpg-context.c:805
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐ ÐÐ ÐÐÑÐÐÐÑÐ ÐÐ ÑÐÐÐÐ ÑÑÐÐÐ ÐÐ gpg."
 
-#: ../camel/camel-gpg-context.c:805
+#: ../camel/camel-gpg-context.c:826
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1919,7 +1999,7 @@ msgstr ""
 "ÐÑÐÐÐÐÑÐ ÑÐ ÐÑ ÐÐÐ, ÐÐ ÐÐ ÐÑÐÐÑÑÐÑÐ ÐÐÑÑÐ ÐÐ\n"
 "ÑÐÐÑÑÐ ÑÐÐÑÑ ÐÐÑÑÐ: â%sâ"
 
-#: ../camel/camel-gpg-context.c:809
+#: ../camel/camel-gpg-context.c:830
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1928,83 +2008,88 @@ msgstr ""
 "ÐÑÐÐÐÐÑÐ ÑÐ ÐÑ ÑÐÐÐÐ ÑÑÐÐÐ, ÐÐ ÐÐ ÐÑÐÐÑÑÐÑÐ ÐÐÑÑÐ\n"
 "ÐÐ ÐÐÑÑÐÐÐÑÐÐÑ: â%sâ"
 
-#: ../camel/camel-gpg-context.c:815
+#: ../camel/camel-gpg-context.c:836
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐ ÐÑ GnuPG ÐÐ â%sâ"
 
-#: ../camel/camel-gpg-context.c:844 ../camel/camel-net-utils.c:523
-#: ../camel/camel-tcp-stream-raw.c:260
-#: ../camel/providers/imapx/camel-imapx-server.c:5030
-#: ../camel/providers/imapx/camel-imapx-server.c:5047
-#: ../camel/providers/imapx/camel-imapx-store.c:159
-#: ../camel/providers/nntp/camel-nntp-summary.c:414
-#: ../libedataserver/e-client.c:134 ../libedataserverui/e-book-auth-util.c:227
+#: ../camel/camel-gpg-context.c:846
+msgid ""
+"Note the encrypted content doesn't contain information about a recipient, "
+"thus there will be a password prompt for each of stored private key."
+msgstr ""
+"ÐÐÑÑÐÑÐÐÐÑÐ ÑÑÐÑÑÐÐÐÐÐ ÐÐ ÑÑÐÑÑÐÐ ÐÐÑÐÑÐÐÑÐÑ ÐÐ ÐÐÐÑÑÐÑÐÐ, ÑÐ ÐÑÐÐÑÐ "
+"ÐÐÐÐÑÐÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ ÐÑÐÐÐ ÑÑÑÑÐÐÐÐ ÑÐÑÑÐÐ ÐÐÑÑ."
+
+#: ../camel/camel-gpg-context.c:875 ../camel/camel-net-utils.c:523
+#: ../camel/camel-tcp-stream-raw.c:268
+#: ../camel/providers/nntp/camel-nntp-summary.c:382
+#: ../libedataserver/e-client.c:136 ../libedataserverui/e-book-auth-util.c:227
 #, c-format
 msgid "Cancelled"
 msgstr "ÐÑÐÐÐÐÐÐ"
 
-#: ../camel/camel-gpg-context.c:862
+#: ../camel/camel-gpg-context.c:896
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÑÑÐÐÐÐ ÐÐ ÑÐÐÐ ÐÐÑÑ: ÐÐÐÐÐÐÐÐ 3 ÐÑÐÑÐÐ ÑÑÐÐÐ."
 
-#: ../camel/camel-gpg-context.c:874
+#: ../camel/camel-gpg-context.c:909
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "ÐÐÐÑÐÐÐÐÐ ÐÑÐÐÐÐÑ ÐÑ GnuPG: %s"
 
-#: ../camel/camel-gpg-context.c:1005
+#: ../camel/camel-gpg-context.c:1040
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÑÐÐÐ: ÐÑÐÐ ÐÐÐÐÐÐÐÐ ÐÐÑÐÐÑÐÐ ÐÐÐÑÑÐÑÐÐÐ."
 
-#: ../camel/camel-gpg-context.c:1552 ../camel/camel-smime-context.c:827
+#: ../camel/camel-gpg-context.c:1587 ../camel/camel-smime-context.c:827
 msgid "Could not generate signing data: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑ: "
 
-#: ../camel/camel-gpg-context.c:1601 ../camel/camel-gpg-context.c:1805
-#: ../camel/camel-gpg-context.c:1915 ../camel/camel-gpg-context.c:2062
-#: ../camel/camel-gpg-context.c:2162 ../camel/camel-gpg-context.c:2210
+#: ../camel/camel-gpg-context.c:1636 ../camel/camel-gpg-context.c:1840
+#: ../camel/camel-gpg-context.c:1950 ../camel/camel-gpg-context.c:2097
+#: ../camel/camel-gpg-context.c:2197 ../camel/camel-gpg-context.c:2245
 msgid "Failed to execute gpg."
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÐÐÐÐÐÐ ÐÐ gpg."
 
-#: ../camel/camel-gpg-context.c:1680 ../camel/camel-gpg-context.c:1688
-#: ../camel/camel-gpg-context.c:1696 ../camel/camel-gpg-context.c:1716
+#: ../camel/camel-gpg-context.c:1715 ../camel/camel-gpg-context.c:1723
+#: ../camel/camel-gpg-context.c:1731 ../camel/camel-gpg-context.c:1751
 #: ../camel/camel-smime-context.c:953 ../camel/camel-smime-context.c:967
 #: ../camel/camel-smime-context.c:976
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐÑÐ: ÐÐÐÑÐÐÐÐÐÐ ÑÐÑÐÐÑ ÐÐ ÐÐÑÐÐÑÐ"
 
-#: ../camel/camel-gpg-context.c:1758
+#: ../camel/camel-gpg-context.c:1793
 msgid "Cannot verify message signature: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐÑÐ: "
 
-#: ../camel/camel-gpg-context.c:1881
+#: ../camel/camel-gpg-context.c:1916
 msgid "Could not generate encrypting data: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐÐ ÐÐ ÑÐÑÑÐÑÐÐÐ: "
 
-#: ../camel/camel-gpg-context.c:1934
+#: ../camel/camel-gpg-context.c:1969
 msgid "This is a digitally encrypted message part"
 msgstr "ÐÐÐÐ Ð ÑÐÑÑÐÐÐ ÑÐÑÑÐÑÐÐÐ ÑÐÑÑ ÐÑ ÐÐÑÐÐÑÐ"
 
-#: ../camel/camel-gpg-context.c:1992 ../camel/camel-gpg-context.c:2001
-#: ../camel/camel-gpg-context.c:2024
+#: ../camel/camel-gpg-context.c:2027 ../camel/camel-gpg-context.c:2036
+#: ../camel/camel-gpg-context.c:2059
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐÑÐ: ÐÑÐÑÐÐ ÑÐÑÐÐÑ ÐÐ ÐÐÑÐÐÑÐ"
 
-#: ../camel/camel-gpg-context.c:2012
+#: ../camel/camel-gpg-context.c:2047
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÑÐÑÐÐÐ ÐÐ ÑÐÑÑ MIME: ÐÑÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐ"
 
-#: ../camel/camel-gpg-context.c:2103 ../camel/camel-smime-context.c:1264
+#: ../camel/camel-gpg-context.c:2138 ../camel/camel-smime-context.c:1264
 msgid "Encrypted content"
 msgstr "ÐÐÑÑÐÑÐÐÐ ÑÑÐÑÑÐÐÐÐÐ"
 
-#: ../camel/camel-http-stream.c:546 ../camel/camel-stream-null.c:78
+#: ../camel/camel-http-stream.c:545 ../camel/camel-stream-null.c:78
 msgid "Only reset to beginning is supported with CamelHttpStream"
 msgstr ""
 "ÐÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ CamelHttpStream ÑÐ ÐÐÐÐÑÑÐÐ ÐÐÐÐÑÑÐÐÐÐ ÐÑÑÑÐÐÐ Ð ÐÐÑÐÐÐÑÐ"
@@ -2120,20 +2205,6 @@ msgstr "ÐÐÐÑÐÐ ÐÐÐÐÐÑ"
 msgid "parse error"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÐÐÑÐÐÐ"
 
-#: ../camel/camel-network-service.c:99
-#, c-format
-msgid "Could not connect to %s: %s"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ Ñ %s: %s"
-
-#: ../camel/camel-network-service.c:100
-msgid "SSL unavailable"
-msgstr "ÐÐÐÑÐÐ SSL"
-
-#: ../camel/camel-network-service.c:123
-#, c-format
-msgid "Could not connect to %s: "
-msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ Ñ %s: "
-
 #: ../camel/camel-net-utils.c:703
 #, c-format
 msgid "Resolving: %s"
@@ -2161,12 +2232,17 @@ msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÑÑÐÐÐ ÐÐ ÐÐÑÐÑ"
 msgid "Name lookup failed: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÑÑÐÐÐ ÐÐ ÐÐÑÐÑ: %s"
 
+#: ../camel/camel-network-service.c:112
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ Ñ %s: "
+
 #: ../camel/camel-offline-folder.c:202
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "ÐÐÐÑÑÐÐÐÐÐÑÐÑ ÐÐ ÐÐÑÐÐÑÐ Ð ÐÐÐÐÐ â%sâ Ñ ÐÐÑÐÐ"
 
-#: ../camel/camel-offline-journal.c:147 ../camel/camel-offline-journal.c:177
+#: ../camel/camel-offline-journal.c:145 ../camel/camel-offline-journal.c:177
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr ""
@@ -2181,24 +2257,24 @@ msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐ ÐÐÑÑÑÐÐÐÐ ÐÐÐÐÐ ÐÐ Ð-ÐÐÑÐ"
 msgid "For reading mail as a query of another set of folders"
 msgstr "ÐÐ ÑÐÑÐÐÐ ÐÐ ÐÐÑÐ ÑÑÐÐ ÐÐÑÐÐÐ ÐÑÐ ÐÑÑÐ ÐÐÐÐÑ ÐÐÐÐÐ"
 
-#: ../camel/camel-provider.c:192
+#: ../camel/camel-provider.c:193
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÐÐÐÐÐ ÐÐ %s: ÐÐÑÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÐ ÐÐ ÑÐ ÐÐÐÐÑÑÐÐ ÐÑ ÑÐÐÐ "
 "ÑÐÑÑÐÐÐ."
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:202
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÐÐÐÐÐ ÐÐ %s: %s"
 
-#: ../camel/camel-provider.c:210
+#: ../camel/camel-provider.c:211
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÐÐÐÐÐ ÐÐ %s: ÐÑÐÐ ÐÐÐÑÐÐÐÐÐÐÑÐÑ ÐÐÐ Ð ÐÐÐÑÐÐ."
 
-#: ../camel/camel-provider.c:394 ../camel/camel-session.c:376
+#: ../camel/camel-provider.c:402 ../camel/camel-session.c:384
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "ÐÑÐÐ ÐÐÐÐÑÐÐ ÐÐÑÑÐÐÑÐÐ ÐÐ ÐÑÐÑÐÐÐÐ â%sâ"
@@ -2243,11 +2319,11 @@ msgstr ""
 "ÐÑÐÑÐÐ ÑÑÐÑÐÑÐÑÐ ÐÐÑÐÑÐÐÑÐÑ:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:41
+#: ../camel/camel-sasl-cram-md5.c:42
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:43
+#: ../camel/camel-sasl-cram-md5.c:44
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -2255,11 +2331,11 @@ msgstr ""
 "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐ ÐÐ ÑÐÑÑÐÐ ÑÑÑ ÑÑÑÐÑÑÐ ÑÑÐÐ ÑÐÐÑÑÐÐ ÐÐÑÐÐÐ CRAM-MD5, ÐÐÐ "
 "ÑÐÐ Ñ ÐÐÐÐÑÑÐÐ."
 
-#: ../camel/camel-sasl-digest-md5.c:54
+#: ../camel/camel-sasl-digest-md5.c:55
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:56
+#: ../camel/camel-sasl-digest-md5.c:57
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -2267,47 +2343,47 @@ msgstr ""
 "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐ ÐÐ ÑÐÑÑÐÐ ÑÑÑ ÑÑÑÐÑÑÐ ÑÑÐÐ ÑÐÐÑÑÐÐ ÐÐÑÐÐÐ DIGEST-MD5, ÐÐÐ "
 "ÑÐÐ Ñ ÐÐÐÐÑÑÐÐ."
 
-#: ../camel/camel-sasl-digest-md5.c:834
+#: ../camel/camel-sasl-digest-md5.c:846
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "ÐÑÐÐÐÐÐÐÐÐÑÐÐÑÑÐÐÑÐ ÐÑ ÑÑÑÐÑÑÐ Ð ÑÐÑÑÐÐ ÐÑÐÐÐ (>2048 ÐÐÑÐÑÐ)"
 
-#: ../camel/camel-sasl-digest-md5.c:845
+#: ../camel/camel-sasl-digest-md5.c:857
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "ÐÑÐÐÐÐÐÐÐÐÑÐÐÑÑÐÐÑÐ ÐÑ ÑÑÑÐÑÑÐ Ð ÐÐÐÑÐÐÐÐÐÐ\n"
 
-#: ../camel/camel-sasl-digest-md5.c:853
+#: ../camel/camel-sasl-digest-md5.c:865
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr ""
 "ÐÑÐÐÐÐÐÐÐÐÑÐÐÑÑÐÐÑÐ ÐÑ ÑÑÑÐÑÑÐ ÑÑÐÑÑÐÐ ÐÐÐÑÐÐÐÐÐÐ ÑÐÑÑ â âÐÐÑÐÑÑÐÐ ÐÐ ÐÐÑÐÑÐâ"
 
-#: ../camel/camel-sasl-digest-md5.c:887
+#: ../camel/camel-sasl-digest-md5.c:898
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "ÐÑÐÐÐÐÑÑÑ ÐÐ ÑÑÑÐÑÑÐ ÐÐ ÑÑÐÑÑÐÐ ÐÐÐÐÐ ÐÐ ÑÐÑÐÐÐÐÐÑÐÐÐÐÐ"
 
-#: ../camel/camel-sasl-digest-md5.c:908
+#: ../camel/camel-sasl-digest-md5.c:919
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "ÐÑÐÐÐÐÑÑÑ ÐÐ ÑÑÑÐÑÑÐ ÑÑÐÑÑÐÐ ÐÐÐÑÐÐÐ ÐÐÐÐÐ ÐÐ ÑÐÑÐÐÐÐÐÑÐÐÐÐÐ"
 
-#: ../camel/camel-sasl-digest-md5.c:921
+#: ../camel/camel-sasl-digest-md5.c:932
 #, c-format
 msgid "Server response does not match"
 msgstr "ÐÑÐÐÐÐÑÑÑ ÐÐ ÑÑÑÐÑÑÐ ÐÐ ÑÑÐÐÐÐÐ"
 
-#: ../camel/camel-sasl-gssapi.c:86
+#: ../camel/camel-sasl-gssapi.c:87
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:88
+#: ../camel/camel-sasl-gssapi.c:89
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr ""
 "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐ ÐÐ ÑÐÑÑÐÐ ÑÑÑ ÑÑÑÐÑÑÐ ÑÑÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ Kerberos 5."
 
-#: ../camel/camel-sasl-gssapi.c:129
+#: ../camel/camel-sasl-gssapi.c:130
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -2315,18 +2391,18 @@ msgstr ""
 "ÐÐÐÐÐÐÐÑÑ ÐÐÑÐÐÐÐÑÐ ÐÐ ÑÐ ÐÐÐÐÑÑÐÐ ÐÑ ÐÑÐÐÐÑÑÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐÐ ÐÐÐ ÐÐ ÑÐ "
 "ÑÐÐÐÐÐÐÐÐÐ ÐÑ ÑÐÐÐÐÐÐÑÐÑÑÐ."
 
-#: ../camel/camel-sasl-gssapi.c:134
+#: ../camel/camel-sasl-gssapi.c:135
 msgid "The provided target_name parameter was ill-formed."
 msgstr "ÐÐÐÐÐÐÐÐÑÑ ÐÐÑÐÐÐÑÑÑ target_name Ð ÐÐÐ ÑÐÑÐÐÑÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:137
+#: ../camel/camel-sasl-gssapi.c:138
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr ""
 "ÐÐÐÐÐÐÐÐÑÑ ÐÐÑÐÐÐÑÑÑ target_name ÑÑÐÑÑÐÐ ÐÐÐÑÐÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÑÑÐÐÐ ÐÐÐ ÐÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:141
+#: ../camel/camel-sasl-gssapi.c:142
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -2334,7 +2410,7 @@ msgstr ""
 "input_token ÑÑÐÑÑÐÐ ÐÑÑÐÐÐ Ñ ÐÑÐÐÐÐ ÐÐÐÐÐÐ ÑÐÐÐÐÑÐÐ ÐÑ ÐÐÐÐÐÐÐÐÑÐ Ð "
 "ÐÐÑÐÐÐÑÑÑÐ input_chan_bindings."
 
-#: ../camel/camel-sasl-gssapi.c:146
+#: ../camel/camel-sasl-gssapi.c:147
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
@@ -2342,7 +2418,7 @@ msgstr ""
 "input_token ÑÑÐÑÑÐÐ ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÑ ÐÐÐ ÐÐÐÐÐÑ, ÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ "
 "ÐÑÐÐÐÑÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:150
+#: ../camel/camel-sasl-gssapi.c:151
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -2350,52 +2426,52 @@ msgstr ""
 "ÐÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐÐ ÐÐ ÐÐÐÐÑ ÐÐ ÐÐÐÑÐÐÑÑÐ ÐÐ ÐÐÐÑÐÐÐÐÐÐÑÐÑ ÐÐÐ ÑÐÐÐÐÑÐÐÑÑ "
 "ÐÐ ÐÐÑÐÐÐÑÐÑÐÐ ÐÐ ÑÐÑÐ ÐÐÐÐÐÐÐ ÐÐÑÐÐÐÑÐÑÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:155
+#: ../camel/camel-sasl-gssapi.c:156
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "ÐÐÐÐÐÐÐÐÑÑ ÑÐÐÐÐÑÐÐ ÐÐ ÐÐÐÑÐÐÑÑ ÐÐ ÑÐÑÐ ÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÑÐÐÑÑ."
 
-#: ../camel/camel-sasl-gssapi.c:158
+#: ../camel/camel-sasl-gssapi.c:159
 msgid "The consistency checks performed on the input_token failed."
 msgstr "ÐÑÐÐÐÑÐÐÑÐ ÐÐ input_token ÐÐ ÐÐÑÐÐÐÐÐÐÑÐÐÐÐÑÑ ÑÐ ÐÐÑÑÐÐÑÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:161
+#: ../camel/camel-sasl-gssapi.c:162
 msgid "The consistency checks performed on the credential failed."
 msgstr "ÐÑÐÐÐÑÐÐÑÐ ÐÐ ÐÐÑÐÐÐÐÐÐÑÐÐÐÐÑÑ ÐÐ ÐÐÑÐÐÐÑÐÑÐÐÑÐ ÑÐ ÐÐÑÑÐÐÑÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:165
 msgid "The referenced credentials have expired."
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐÐ ÑÐ ÐÐÑÐÐÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:321
-#: ../camel/camel-sasl-gssapi.c:365 ../camel/camel-sasl-gssapi.c:382
-#: ../camel/providers/smtp/camel-smtp-transport.c:1238
+#: ../camel/camel-sasl-gssapi.c:171 ../camel/camel-sasl-gssapi.c:333
+#: ../camel/camel-sasl-gssapi.c:377 ../camel/camel-sasl-gssapi.c:394
+#: ../camel/providers/smtp/camel-smtp-transport.c:562
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÑ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÑ ÑÑÑÐÑÑÐ."
 
-#: ../camel/camel-sasl-gssapi.c:394
+#: ../camel/camel-sasl-gssapi.c:406
 #, c-format
 msgid "Unsupported security layer."
 msgstr "ÐÐÐÐÐÐÑÑÐÐÐ ÑÐÐÐ ÐÐ ÑÐÐÑÑÐÐÑÑ."
 
-#: ../camel/camel-sasl-login.c:35
+#: ../camel/camel-sasl-login.c:36
 msgid "Login"
 msgstr "ÐÐÐÐÑÐÑÐÑÐÑÐÐÐ"
 
-#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
+#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:42
 msgid "This option will connect to the server using a simple password."
 msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐ ÐÐ ÑÐÑÑÐÐ ÑÑÑ ÑÑÑÐÑÑÐ ÑÑÐÐ ÐÐÑÐÑÑÐÑÐÐÐ ÐÐÑÐÐÐ."
 
-#: ../camel/camel-sasl-login.c:96
+#: ../camel/camel-sasl-login.c:103
 #, c-format
 msgid "Unknown authentication state."
 msgstr "ÐÐÐÐÐÐÑÑÐÐ ÑÑÑÑÐÑÐÐÐ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ."
 
-#: ../camel/camel-sasl-ntlm.c:42
+#: ../camel/camel-sasl-ntlm.c:43
 msgid "NTLM / SPA"
 msgstr "NTLM/SPA"
 
-#: ../camel/camel-sasl-ntlm.c:44
+#: ../camel/camel-sasl-ntlm.c:45
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -2403,7 +2479,7 @@ msgstr ""
 "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐ ÐÐ ÑÐÑÑÐÐ ÑÑÑ ÑÑÑÐÑÑ, ÐÐÐÐÑÐÐ ÐÐ âÐÐÐÐÐÑÑâ, ÑÑÐÐ NTLM/"
 "Secure Password Authentication."
 
-#: ../camel/camel-sasl-plain.c:39
+#: ../camel/camel-sasl-plain.c:40
 msgid "PLAIN"
 msgstr "ÐÐÐÐÐÐÐÐÐÐ"
 
@@ -2434,27 +2510,27 @@ msgstr "POP ÐÑÐÐÐ ÑÐÑÐÐÐÐÐÑÐÐÐÐÐ ÐÐ SMTP ÑÑÐÐ ÑÑÐÑ
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐÐÐ ÐÐ ÑÐÐÑÐÑÑÐÐ ÐÐÑÐÐ: %s: %s"
 
-#: ../camel/camel-service.c:543
+#: ../camel/camel-session.c:393
 #, c-format
-msgid "URL '%s' needs a user component"
-msgstr "ÐÐÑÐÑÑÑ â%sâ ÑÐ ÐÑÐÐÐÐ ÐÑ ÐÐÐÐÐÐÐÐÑ âÐÐÐ ÐÐ ÐÐÑÑÐÐÐÑÐÐâ"
-
-#: ../camel/camel-service.c:554
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr "ÐÐÑÐÑÑÑ â%sâ ÑÐ ÐÑÐÐÐÐ ÐÑ ÐÐÐÐÐÐÐÐÑ âÑÐÑÑâ"
+msgid "Invalid GType registered for protocol '%s'"
+msgstr "ÐÐÐÐÑÑÑÐÑÐÐ Ð ÐÐÐÑÐÐÐÐÐÐ ÐÐÐ GType ÐÐ ÐÑÐÑÐÐÐÐÐ â%sâ"
 
-#: ../camel/camel-service.c:565
+#: ../camel/camel-session.c:462
+#: ../camel/providers/imap/camel-imap-store.c:1143
+#: ../camel/providers/imapx/camel-imapx-server.c:2946
+#: ../camel/providers/pop3/camel-pop3-store.c:249
+#: ../camel/providers/pop3/camel-pop3-store.c:566
+#: ../camel/providers/smtp/camel-smtp-transport.c:455
 #, c-format
-msgid "URL '%s' needs a path component"
-msgstr "ÐÐÑÐÑÑÑ â%sâ ÑÐ ÐÑÐÐÐÐ ÐÑ ÐÐÐÐÐÐÐÐÑ âÐÑÑâ"
+msgid "No support for %s authentication"
+msgstr "ÐÑÐÐ ÐÐÐÐÑÑÐÐÐ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ %s"
 
-#: ../camel/camel-session.c:386
+#: ../camel/camel-session.c:477
 #, c-format
-msgid "Invalid GType registered for protocol '%s'"
-msgstr "ÐÐÐÐÑÑÑÐÑÐÐ Ð ÐÐÐÑÐÐÐÐÐÐ ÐÐÐ GType ÐÐ ÐÑÐÑÐÐÐÐÐ â%sâ"
+msgid "%s authentication failed"
+msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÐ %s"
 
-#: ../camel/camel-session.c:996
+#: ../camel/camel-session.c:1183
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐ ÐÐ %s ÐÐ %s ÐÐ ÑÐÑÑÐ %s."
@@ -2651,51 +2727,51 @@ msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐ ÐÑÐ ÐÐÐÐÐÐ
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "ÐÐÑÐÑÑÐÑÐÐÐ S/MIME: ÐÐ Ð ÐÑÐÑÐÑÐ ÑÐÑÑÐÑÐÐÐ ÑÑÐÑÑÐÐÐÐÐ"
 
-#: ../camel/camel-store.c:1818
+#: ../camel/camel-store.c:1799
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ: ÐÐÑÐ ÑÑÑÐÑÑÐÑÐÐ"
 
-#: ../camel/camel-store.c:1861
+#: ../camel/camel-store.c:1842
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "ÐÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐÑÐ â%sâ"
 
-#: ../camel/camel-store.c:2046
+#: ../camel/camel-store.c:2027
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "ÐÑÑÑÐÐÐ Ð ÐÐÐÐÐÑÐ Ð â%sâ"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2058 ../camel/camel-store.c:2068
+#: ../camel/camel-store.c:2039 ../camel/camel-store.c:2049
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "ÐÐÑÑÐ"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2061 ../camel/camel-store.c:2072
+#: ../camel/camel-store.c:2042 ../camel/camel-store.c:2053
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "ÐÐÐÐ"
 
-#: ../camel/camel-store.c:2520
+#: ../camel/camel-store.c:2501
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ: %s: ÐÐÑÐ ÑÑÑÐÑÑÐÑÐÐ"
 
-#: ../camel/camel-store.c:2534
+#: ../camel/camel-store.c:2515
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐ â%sâ"
 
-#: ../camel/camel-store.c:2652 ../camel/camel-vee-store.c:352
-#: ../camel/providers/local/camel-maildir-store.c:272
+#: ../camel/camel-store.c:2633 ../camel/camel-vee-store.c:352
+#: ../camel/providers/local/camel-maildir-store.c:300
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÐ: %s: ÐÑÐÑÐÐ ÐÐÐÑÐÑÐÑ"
 
-#: ../camel/camel-store.c:2795 ../camel/camel-vee-store.c:402
-#: ../camel/providers/local/camel-maildir-store.c:710
+#: ../camel/camel-store.c:2776 ../camel/camel-vee-store.c:402
+#: ../camel/providers/local/camel-maildir-store.c:764
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐ: %s: ÐÑÐÑÐÐ ÐÐÐÑÐÑÐÑ"
@@ -2714,122 +2790,137 @@ msgstr "ÐÑÑÐÐÐÑÐ Ð ÐÑÐÐÑÐÑÐÐÐ"
 msgid "Could not connect with command \"%s\": %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ Ñ ÐÐÐÐÐÐÐ â%sâ: %s"
 
-#: ../camel/camel-tcp-stream-raw.c:756 ../camel/camel-tcp-stream-raw.c:767
+#: ../camel/camel-tcp-stream-raw.c:303
+#, c-format
+msgid "NSPR error code %d"
+msgstr "ÐÐÐ ÐÐ ÐÑÐÑÐÐ ÐÐ NSPR: %d"
+
+#: ../camel/camel-tcp-stream-raw.c:640 ../camel/camel-tcp-stream-raw.c:651
 #, c-format
 msgid "The proxy host does not support SOCKS4"
 msgstr "ÐÑÑÐÑÑÑÑ-ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÑÑÐÐ SOCKS4"
 
-#: ../camel/camel-tcp-stream-raw.c:778
+#: ../camel/camel-tcp-stream-raw.c:662
 #, c-format
 msgid "The proxy host denied our request: code %d"
 msgstr "ÐÑÑÐÑÑÑÑ-ÐÐÑÑÐÐÐÐÐ ÐÑÐÐÐÐ ÐÐÑÐÐÐÑÐ: ÐÐÐ %d"
 
-#: ../camel/camel-tcp-stream-raw.c:874 ../camel/camel-tcp-stream-raw.c:880
+#: ../camel/camel-tcp-stream-raw.c:758 ../camel/camel-tcp-stream-raw.c:764
 #, c-format
 msgid "The proxy host does not support SOCKS5"
 msgstr "ÐÑÑÐÑÑÑÑ-ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÑÑÐÐ SOCKS5"
 
-#: ../camel/camel-tcp-stream-raw.c:886
+#: ../camel/camel-tcp-stream-raw.c:770
 #, c-format
 msgid "Could not find a suitable authentication type: code 0x%x"
 msgstr "ÐÐÐÑÐÐ ÐÐÐÑÐÐÑÑ ÐÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ: ÐÐÐ 0x%x"
 
-#: ../camel/camel-tcp-stream-raw.c:898
+#: ../camel/camel-tcp-stream-raw.c:782
 msgid "General SOCKS server failure"
 msgstr "ÐÐÑÐ ÐÑÐÑÐÐ ÐÑ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:899
+#: ../camel/camel-tcp-stream-raw.c:783
 msgid "SOCKS server's rules do not allow connection"
 msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐ SOCKS ÐÐ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐÑÐÐÑ ÐÑÑÐÐÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:900
+#: ../camel/camel-tcp-stream-raw.c:784
 msgid "Network is unreachable from SOCKS server"
 msgstr "ÐÑÐÐÐÑÐ Ð ÐÐÐÐÑÑÑÐÐÐ ÐÑ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:901
+#: ../camel/camel-tcp-stream-raw.c:785
 msgid "Host is unreachable from SOCKS server"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐ Ð ÐÐÐÐÑÑÑÐÐÐ ÐÑ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:902
+#: ../camel/camel-tcp-stream-raw.c:786
 msgid "Connection refused"
 msgstr "ÐÑÑÐÐÐÑÐ Ð ÐÑÐÐÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:903
+#: ../camel/camel-tcp-stream-raw.c:787
 msgid "Time-to-live expired"
 msgstr "ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:904
+#: ../camel/camel-tcp-stream-raw.c:788
 msgid "Command not supported by SOCKS server"
 msgstr "ÐÑÑÐÑÑÑÑ-ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÑÑÐÐ ÑÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:905
+#: ../camel/camel-tcp-stream-raw.c:789
 msgid "Address type not supported by SOCKS server"
 msgstr "ÐÑÑÐÑÑÑÑ-ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÑÑÐÐ ÑÐÐÐ ÐÐÐ ÐÐÑÐÑÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:906
+#: ../camel/camel-tcp-stream-raw.c:790
 msgid "Unknown error from SOCKS server"
 msgstr "ÐÐÐÐÐÐÑÑÐÐ ÐÑÐÑÐÐ ÐÑ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:939
+#: ../camel/camel-tcp-stream-raw.c:823
 #, c-format
 msgid "Got unknown address type from SOCKS server"
 msgstr "ÐÐÐÑÑÐÐ Ð ÐÐÐÐÐÐÐÑ ÐÐÐ ÐÐÑÐÑ ÐÑ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:957
+#: ../camel/camel-tcp-stream-raw.c:841
 #, c-format
 msgid "Incomplete reply from SOCKS server"
 msgstr "ÐÐÐÑÐÐÐ ÐÑÐÐÐÐÑ ÐÑ ÑÑÑÐÑÑÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:977
+#: ../camel/camel-tcp-stream-raw.c:861
 #, c-format
 msgid "Hostname is too long (maximum is 255 characters)"
 msgstr "ÐÐÐÑÑÐÐÐÑÐ ÐÐÐ ÐÐ ÐÐÐÐÑÑÑÑ Ð ÐÑÐÐÐÐÐÐÐ ÐÑÐÐÐ (ÐÐÐÑÐÐÑÐÑÑ Ð 255 ÐÐÐÐÐ)"
 
 #. SOCKS5
 #. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:1009 ../camel/camel-tcp-stream-raw.c:1019
+#: ../camel/camel-tcp-stream-raw.c:893 ../camel/camel-tcp-stream-raw.c:903
 #, c-format
 msgid "Invalid reply from proxy server"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÑÐÐÐÐÑ ÐÑ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-ssl.c:462
+#: ../camel/camel-tcp-stream-ssl.c:470
 #, c-format
 msgid ""
-"Issuer:            %s\n"
-"Subject:           %s\n"
-"Fingerprint:       %s\n"
-"Signature:         %s"
+"   Issuer:       %s\n"
+"   Subject:      %s\n"
+"   Fingerprint:  %s\n"
+"   Signature:    %s"
 msgstr ""
-"ÐÐÐÐÑÐÐ:          %s\n"
-"ÐÐÐÐÐÐÐÐ:         %s\n"
-"ÐÑÐÐÑÐÑÑÐ:        %s\n"
-"ÐÐÐÐÐÑ:           %s"
+"   ÐÐÐÐÑÐÐ:          %s\n"
+"   ÐÐÐÐÐÐÐÐ:         %s\n"
+"   ÐÑÐÐÑÐÑÑÐ:        %s\n"
+"   ÐÐÐÐÐÑ:           %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:468
+#: ../camel/camel-tcp-stream-ssl.c:476
 msgid "GOOD"
 msgstr "ÐÐÐÐÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-ssl.c:468
+#: ../camel/camel-tcp-stream-ssl.c:476
 msgid "BAD"
 msgstr "ÐÐÐÐÐÐÐÐÐÐ"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:472
+#: ../camel/camel-tcp-stream-ssl.c:480
 #, c-format
 msgid ""
-"SSL Certificate check for %s:\n"
-"\n"
-"%s\n"
+"SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
 "\n"
-"Do you wish to accept?"
+"Detailed information about the certificate:\n"
+"%s"
 msgstr ""
-"ÐÑÐÐÐÑÐÐ ÐÐ ÑÐÑÑÐÑÐÐÐÑÐ ÐÐ SSL ÐÐ %s:\n"
+"ÐÐÑÑÐÑÐÐÐÑÑÑ ÐÐ SSL ÐÐ â%sâ ÐÐ Ð ÐÐÐÐÑÐÐ. ÐÑÐÐÑÐ ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÑÐ?\n"
 "\n"
-"%s\n"
-"\n"
-"ÐÑÐÐÐÐÑÐ ÐÐ?"
+"ÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐÐÑÐÑ ÐÐ ÑÐÑÑÐÑÐÐÐÑÐ:\n"
+"%s"
+
+#: ../camel/camel-tcp-stream-ssl.c:484
+msgid "_Reject"
+msgstr "_ÐÑÑÐÑÑÐÑÐÐ"
 
-#: ../camel/camel-tcp-stream-ssl.c:516
+#: ../camel/camel-tcp-stream-ssl.c:485
+msgid "Accept _Temporarily"
+msgstr "_ÐÑÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐ"
+
+#: ../camel/camel-tcp-stream-ssl.c:486
+msgid "_Accept Permanently"
+msgstr "_ÐÐÑÑÐÑÐÐÐ ÐÑÐÐÐÐÐÐ"
+
+#: ../camel/camel-tcp-stream-ssl.c:544
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2838,7 +2929,7 @@ msgstr ""
 "ÐÑÐÐÐÐÐ ÑÑÑ ÑÐÑÑÐÑÐÐÐÑ: %s\n"
 "ÐÐÐÐÑÐÐ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:568
+#: ../camel/camel-tcp-stream-ssl.c:596
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2847,7 +2938,7 @@ msgstr ""
 "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐ ÐÐ ÑÐÑÑÐÑÐÐÐÑÐ: %s\n"
 "ÐÐÐÐÑÐÐ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:586
+#: ../camel/camel-tcp-stream-ssl.c:614
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2856,7 +2947,7 @@ msgstr ""
 "ÐÐÑÐÐÑÐ ÑÐÑÑÐÑÐÐÐÑ: %s\n"
 "ÐÐÐÐÑÐÐ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:603
+#: ../camel/camel-tcp-stream-ssl.c:631
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2870,17 +2961,22 @@ msgstr ""
 msgid "Could not parse URL '%s'"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÑÐ â%sâ"
 
-#: ../camel/camel-vee-folder.c:1310 ../camel/camel-vee-folder.c:1470
+#: ../camel/camel-vee-folder.c:647
+#, c-format
+msgid "Updating %s folder"
+msgstr "ÐÐÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐ %s"
+
+#: ../camel/camel-vee-folder.c:1321 ../camel/camel-vee-folder.c:1478
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÑÑÐÐÐÐ ÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐ ÐÐÑÐÐÑÐ ÐÑÐ ÐÐÑÑÑÐÐÐÐÑÐ ÐÐÐÐÐ"
 
-#: ../camel/camel-vee-folder.c:1343
+#: ../camel/camel-vee-folder.c:1354
 #, c-format
 msgid "No such message %s in %s"
 msgstr "ÐÑÐÐ ÑÐÐÐÐÐ ÐÐÑÐÐ %s Ð %s"
 
-#: ../camel/camel-vee-folder.c:1411
+#: ../camel/camel-vee-folder.c:1422
 #, c-format
 msgid "Error storing '%s': "
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÐÐÐÐÑÐ ÐÐ â%sâ: "
@@ -2909,24 +3005,33 @@ msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÑÐ Ð ÐÐÑÑÐÑ
 msgid "Cannot copy messages to the Junk folder"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÑÐ Ð ÐÐÐÐÐÑÐ ÐÐ ÑÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-command.c:198
-#: ../camel/providers/imap/camel-imap-command.c:293
+#: ../camel/providers/imap/camel-imap-command.c:200
+#: ../camel/providers/imap/camel-imap-command.c:297
 #, c-format
 msgid "No output stream"
 msgstr "ÐÐÐÑÐÐ ÐÐÑÐÐÑÑ ÐÐÑÐÐ"
 
-#: ../camel/providers/imap/camel-imap-command.c:206
-#: ../camel/providers/imap/camel-imap-command.c:301
+#: ../camel/providers/imap/camel-imap-command.c:208
+#: ../camel/providers/imap/camel-imap-command.c:305
 #, c-format
 msgid "No input stream"
 msgstr "ÐÐÐÑÐÐ ÐÑÐÐÑÑ ÐÐÑÐÐ"
 
-#: ../camel/providers/imap/camel-imap-command.c:365
+#: ../camel/providers/imap/camel-imap-command.c:383
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "ÐÑÑÐÑÑÑÑ ÐÐÐÑÐÐÐÐÐÐ ÑÐ ÐÐÐÐÑÑÐ: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:395
+#: ../camel/providers/imap/camel-imap-command.c:416
+#, c-format
+msgid ""
+"Alert from IMAP server %s %s in folder %s:\n"
+"%s"
+msgstr ""
+"ÐÑÐÐÑÐÑÐÐÐÐÐÐÐ ÐÑ ÑÑÑÐÑÑÐ ÐÐ IMAP %s %s Ð ÐÐÐÐÐ %s:\n"
+"%s"
+
+#: ../camel/providers/imap/camel-imap-command.c:420
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -2935,112 +3040,118 @@ msgstr ""
 "ÐÑÐÐÑÐÑÐÐÐÐÐÐÐ ÐÑ ÑÑÑÐÑÑÐ ÐÐ IMAP %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:471
+#: ../camel/providers/imap/camel-imap-command.c:502
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "ÐÐÐÑÐÐÐÐÐ ÐÑÐÐÐÐÑ ÐÑ ÑÑÑÐÑÑÐ ÐÐ IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:483
+#: ../camel/providers/imap/camel-imap-command.c:514
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐÐ ÐÐ IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:563
+#: ../camel/providers/imap/camel-imap-command.c:594
 #, c-format
 msgid "Server response ended too soon."
 msgstr "ÐÑÐÐÐÐÑÑÑ ÐÐ ÑÑÑÐÑÑÐ ÐÐÐÑÑÑÐ ÑÐÑÑÐÐ ÐÑÑÐÐ."
 
-#: ../camel/providers/imap/camel-imap-command.c:775
+#: ../camel/providers/imap/camel-imap-command.c:806
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "ÐÑÑÐÑÑÑÑ ÐÐ IMAP ÐÐ ÑÑÐÑÑÐÐ ÐÐÑÐÑÐÐÑÐÑ %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:813
+#: ../camel/providers/imap/camel-imap-command.c:844
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "ÐÐÐÑÐÐÐÐÐ ÐÑÐÐÐÐÑ OK ÐÑ ÑÑÑÐÑÑÐ ÐÐ IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:296
-msgid "Always check for new mail in this folder"
-msgstr "ÐÐÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÐÑÑÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐ Ð ÑÐÐÐ ÐÐÐÐÐ"
+#: ../camel/providers/imap/camel-imap-folder.c:344
+msgid "Always check for _new mail in this folder"
+msgstr "_ÐÐÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÐÑÑÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐ Ð ÑÐÐÐ ÐÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:372
+#: ../camel/providers/imap/camel-imap-folder.c:355
+#: ../camel/providers/imapx/camel-imapx-folder.c:747
+#: ../camel/providers/nntp/camel-nntp-folder.c:756
+msgid "Apply message _filters to this folder"
+msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐ _ÑÐÐÑÑÐ ÐÑÐ ÑÐÐÐ ÐÐÐÐÐ"
+
+#: ../camel/providers/imap/camel-imap-folder.c:437
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ %s: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:395
+#: ../camel/providers/imap/camel-imap-folder.c:458
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐ â%sâ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1057
-#: ../camel/providers/imapx/camel-imapx-server.c:4081
+#: ../camel/providers/imap/camel-imap-folder.c:1116
+#: ../camel/providers/imapx/camel-imapx-server.c:3949
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "ÐÑÐÐÐÑÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐ ÐÐÑÐÐ Ð %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3486
+#: ../camel/providers/imap/camel-imap-folder.c:3473
 msgid "Unable to retrieve message: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐÑÐ: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:3523
-#: ../camel/providers/imapx/camel-imapx-server.c:5360
+#: ../camel/providers/imap/camel-imap-folder.c:3510
+#: ../camel/providers/imapx/camel-imapx-server.c:5511
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ Ñ ÐÐÐÐÑÐÑÐÐÐÑÐÑ %s: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3524
-#: ../camel/providers/imapx/camel-imapx-server.c:5361
+#: ../camel/providers/imap/camel-imap-folder.c:3511
+#: ../camel/providers/imapx/camel-imapx-server.c:5512
 msgid "No such message available."
 msgstr "ÐÑÐÐ ÑÐÐÐÐÐ ÐÐÑÐÐ."
 
-#: ../camel/providers/imap/camel-imap-folder.c:3599
-#: ../camel/providers/imap/camel-imap-folder.c:4506
-#: ../camel/providers/nntp/camel-nntp-folder.c:438
+#: ../camel/providers/imap/camel-imap-folder.c:3586
+#: ../camel/providers/imap/camel-imap-folder.c:4464
+#: ../camel/providers/nntp/camel-nntp-folder.c:511
 #, c-format
 msgid "This message is not currently available"
 msgstr "ÐÐÐÐ ÐÐÑÐÐ ÐÐ Ð ÐÐÐÐÑÐÐ Ð ÐÐÐÐÐÑÐ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4090
-#: ../camel/providers/imap/camel-imap-folder.c:4173
-#: ../camel/providers/imapx/camel-imapx-server.c:4039
-#: ../camel/providers/imapx/camel-imapx-server.c:4189
+#: ../camel/providers/imap/camel-imap-folder.c:4045
+#: ../camel/providers/imap/camel-imap-folder.c:4128
+#: ../camel/providers/imapx/camel-imapx-server.c:3901
+#: ../camel/providers/imapx/camel-imapx-server.c:4081
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "ÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÑÐÑ ÐÐ ÐÐÐÐ ÐÐÑÐÐ Ð %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4307
+#: ../camel/providers/imap/camel-imap-folder.c:4262
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "ÐÐÐÑÐÐÐ ÐÑÐÐÐÐÑ ÐÑ ÑÑÑÐÑÑÐ: ÐÑÐÐ ÐÐÐÐÐ ÐÐ ÐÐÑÐÐ %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4317
+#: ../camel/providers/imap/camel-imap-folder.c:4272
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "ÐÐÐÑÐÐÐ ÐÑÐÐÐÐÑ ÐÑ ÑÑÑÐÑÑÐ: ÐÐÑÐÐ %d ÐÑÐÐ ÑÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4546
+#: ../camel/providers/imap/camel-imap-folder.c:4504
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ÑÑÐÐÑÐ ÐÐ ÐÐÑÐÐÑÐ Ð ÐÑÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÐÐÑÐ FETCH."
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:197
-#: ../camel/providers/imap/camel-imap-message-cache.c:257
+#: ../camel/providers/imap/camel-imap-message-cache.c:196
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
 msgid "Could not open cache directory: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐÑÐ Ñ ÐÐÑ: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:335
+#: ../camel/providers/imap/camel-imap-message-cache.c:331
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐ %s: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:401
+#: ../camel/providers/imap/camel-imap-message-cache.c:397
 #, c-format
 msgid "Failed to cache message %s: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐ %s: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:543
+#: ../camel/providers/imap/camel-imap-message-cache.c:539
 #, c-format
 msgid "Failed to cache %s: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐ %s: "
@@ -3051,12 +3162,12 @@ msgid "Checking for New Mail"
 msgstr "ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐ"
 
 #: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
 msgid "C_heck for new messages in all folders"
 msgstr "ÐÑÐÐÐÑÐÐ ÐÐ _ÐÐÐÐ ÐÐÑÐÐ ÐÑÐ ÐÑÐÑÐÐ ÐÐÐÐÐ"
 
 #: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "ÐÑÐÐÐÑÐÐ ÐÐ _ÐÐÐÐ ÐÐÑÐÐ Ð ÐÐÐÐÐÑÐÐÐÑÐ ÐÐÐÐÐ"
 
@@ -3076,7 +3187,7 @@ msgstr "_ÐÐÐÐÐÐÐ:"
 
 #: ../camel/providers/imap/camel-imap-provider.c:56
 #: ../camel/providers/imapx/camel-imapx-provider.c:62
-#: ../camel/providers/nntp/camel-nntp-provider.c:42
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "Folders"
 msgstr "ÐÐÐÐÐ"
 
@@ -3099,212 +3210,195 @@ msgstr "_ÐÑÐÑÑÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐ:"
 #: ../camel/providers/local/camel-local-provider.c:42
 #: ../camel/providers/local/camel-local-provider.c:84
 #: ../camel/providers/local/camel-local-provider.c:105
+#: ../camel/providers/nntp/camel-nntp-provider.c:41
 msgid "Options"
 msgstr "ÐÐÑÑÑÐÐÐÐ"
 
 #: ../camel/providers/imap/camel-imap-provider.c:66
 #: ../camel/providers/imapx/camel-imapx-provider.c:74
-msgid "_Apply filters to new messages in Inbox on this server"
-msgstr ""
-"_ÐÑÐÐÐÐÐÐÐ ÐÐ ÑÐÐÑÑÐ ÑÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐÑÐÐ Ð ÐÐÑÐÐÑÐÐÑÐ ÐÑÑÐÑ ÐÐ ÑÐÐÐ ÑÑÑÐÑÑ"
+#: ../camel/providers/nntp/camel-nntp-provider.c:43
+msgid "Apply _filters to new messages in all folders"
+msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐ _ÑÐÐÑÑÐ ÐÐ ÐÐÐÐ ÐÐÑÐÐ ÐÑÐ ÐÑÐÑÐÐ ÐÐÐÐÐ"
 
 #: ../camel/providers/imap/camel-imap-provider.c:68
 #: ../camel/providers/imapx/camel-imapx-provider.c:76
-msgid "Check new messages for Jun_k contents"
-msgstr "ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÑÐÐ ÐÐ _ÑÐÐÐ"
+msgid "_Apply filters to new messages in Inbox on this server"
+msgstr ""
+"_ÐÑÐÐÐÐÐÐÐ ÐÐ ÑÐÐÑÑÐ ÑÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐÑÐÐ Ð ÐÐÑÐÐÑÐÐÑÐ ÐÑÑÐÑ ÐÐ ÑÐÐÐ ÑÑÑÐÑÑ"
 
 #: ../camel/providers/imap/camel-imap-provider.c:70
 #: ../camel/providers/imapx/camel-imapx-provider.c:78
-msgid "Only check for Junk messages in the IN_BOX folder"
-msgstr "ÐÑÐÐÐÑÐÐ ÐÐ ÑÐÐÐ ÑÐÐÐ ÐÑÐ _ÐÑÐÐÑÑÐÑÐ ÐÐÑÐ (INBOX)"
+msgid "Check new messages for _Junk contents"
+msgstr "ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÑÐÐ ÐÐ _ÑÐÐÐ"
 
 #: ../camel/providers/imap/camel-imap-provider.c:72
 #: ../camel/providers/imapx/camel-imapx-provider.c:80
+msgid "Only check for Junk messages in the IN_BOX folder"
+msgstr "ÐÑÐÐÐÑÐÐ ÐÐ ÑÐÐÐ ÑÐÐÐ ÐÑÐ _ÐÑÐÐÑÑÐÑÐ ÐÐÑÐ (INBOX)"
+
+#: ../camel/providers/imap/camel-imap-provider.c:74
+#: ../camel/providers/imapx/camel-imapx-provider.c:82
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "ÐÐÑÐÐÐÑÐÑÐÐ ÐÐÐÐÐÐÐ ÑÐÐÑÑÐÐÐ_ÐÐÑÐÐÐ ÐÐ ÐÑÐÐÐÐÑÐÐÐÑÐ ÐÐÑÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:78
+#: ../camel/providers/imap/camel-imap-provider.c:80
 msgid "IMAP default port"
 msgstr "ÐÑÐÐÐÐÑÑÐÐ ÐÐÑÑ ÐÐ IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:79
-#: ../camel/providers/imapx/camel-imapx-provider.c:87
+#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:89
 msgid "IMAP over SSL"
 msgstr "IMAP ÐÑÐÐ SSL"
 
-#: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imap/camel-imap-provider.c:87
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:87
-#: ../camel/providers/imapx/camel-imapx-provider.c:96
+#: ../camel/providers/imap/camel-imap-provider.c:89
+#: ../camel/providers/imapx/camel-imapx-provider.c:98
 msgid "For reading and storing mail on IMAP servers."
 msgstr "ÐÐ ÑÐÑÐÐÐ Ð ÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐ ÐÐ ÑÑÑÐÑÑÐ ÐÐ IMAP."
 
-#: ../camel/providers/imap/camel-imap-provider.c:105
-#: ../camel/providers/imapx/camel-imapx-provider.c:113
-#: ../camel/providers/nntp/camel-nntp-provider.c:80
-#: ../camel/providers/pop3/camel-pop3-provider.c:81
+#: ../camel/providers/imap/camel-imap-provider.c:107
+#: ../camel/providers/imapx/camel-imapx-provider.c:118
+#: ../camel/providers/nntp/camel-nntp-provider.c:84
+#: ../camel/providers/pop3/camel-pop3-provider.c:82
 msgid "Password"
 msgstr "ÐÐÑÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:107
-#: ../camel/providers/imapx/camel-imapx-provider.c:115
+#: ../camel/providers/imap/camel-imap-provider.c:109
+#: ../camel/providers/imapx/camel-imapx-provider.c:120
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐ ÐÐ ÑÐÑÑÐÐ ÑÑÑ ÑÑÑÐÑÑ ÐÐ IMAP ÑÑÐÐ ÐÐÑÐÑÑÐÑÐÐÐ ÐÐÑÐÐÐ."
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:224
-#: ../camel/providers/imap/camel-imap-store.c:2634
-#: ../camel/providers/imapx/camel-imapx-store.c:338
-#: ../camel/providers/imapx/camel-imapx-store.c:794
-#: ../camel/providers/local/camel-maildir-folder.c:464
-#: ../camel/providers/local/camel-maildir-store.c:273
-#: ../camel/providers/local/camel-maildir-store.c:619
-#: ../camel/providers/local/camel-maildir-store.c:625
-#: ../camel/providers/local/camel-maildir-store.c:711
-#: ../camel/providers/local/camel-spool-store.c:328
+#: ../camel/providers/imap/camel-imap-store.c:272
+#: ../camel/providers/imap/camel-imap-store.c:2694
+#: ../camel/providers/imapx/camel-imapx-store.c:373
+#: ../camel/providers/imapx/camel-imapx-store.c:844
+#: ../camel/providers/local/camel-maildir-folder.c:471
+#: ../camel/providers/local/camel-maildir-store.c:301
+#: ../camel/providers/local/camel-maildir-store.c:675
+#: ../camel/providers/local/camel-maildir-store.c:681
+#: ../camel/providers/local/camel-maildir-store.c:765
+#: ../camel/providers/local/camel-spool-store.c:387
 msgid "Inbox"
 msgstr "ÐÐÑÐÐÑÐÐ ÐÑÑÐÑ"
 
-#: ../camel/providers/imap/camel-imap-store.c:356
-#: ../camel/providers/imap/camel-imap-store.c:383
-#: ../camel/providers/imap/camel-imap-store.c:410
-#: ../camel/providers/imapx/camel-imapx-server.c:3048
+#: ../camel/providers/imap/camel-imap-store.c:409
+#: ../camel/providers/imap/camel-imap-store.c:463
+#: ../camel/providers/imapx/camel-imapx-server.c:2828
 #, 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:357
-#: ../camel/providers/imapx/camel-imapx-server.c:3049
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
+#: ../camel/providers/imap/camel-imap-store.c:410
+#: ../camel/providers/imapx/camel-imapx-server.c:2829
+#: ../camel/providers/smtp/camel-smtp-transport.c:196
 msgid "STARTTLS not supported"
 msgstr "ÐÐ ÑÐ ÐÐÐÐÑÑÐÐ STARTTLS"
 
-#: ../camel/providers/imap/camel-imap-store.c:376
-#: ../camel/providers/imapx/camel-imapx-server.c:3087
+#: ../camel/providers/imap/camel-imap-store.c:435
+#: ../camel/providers/imapx/camel-imapx-server.c:2868
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ ÑÑÑ ÑÑÑÐÑÑÐ ÐÐ IMAP %s Ð ÑÐÐÑÑÐÐ ÑÐÐÐÐ: "
 
-#: ../camel/providers/imap/camel-imap-store.c:384
-#: ../camel/providers/smtp/camel-smtp-transport.c:238
-msgid "SSL is not available in this build"
-msgstr "Ð ÑÐÐÐ ÐÐÐÐÐÐÐÑ ÐÐÐÑÐÐ SSL"
-
-#: ../camel/providers/imap/camel-imap-store.c:711
-#: ../camel/providers/imapx/camel-imapx-server.c:3182
+#: ../camel/providers/imap/camel-imap-store.c:734
+#: ../camel/providers/imapx/camel-imapx-server.c:2935
 #, c-format
-msgid "IMAP server %s does not support requested authentication type %s"
+msgid "IMAP server %s does not support %s authentication"
 msgstr "ÐÑÑÐÑÑÑÑ ÐÐ IMAP %s ÐÐ ÐÐÐÐÑÑÐÐ ÐÐÑÐÐÐÐÑ ÐÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:722
-#: ../camel/providers/imapx/camel-imapx-server.c:3195
-#: ../camel/providers/smtp/camel-smtp-transport.c:350
-#, c-format
-msgid "No support for authentication type %s"
-msgstr "ÐÑÐÐ ÐÐÐÐÑÑÐÐÐ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:733
-#: ../camel/providers/smtp/camel-smtp-transport.c:363
-#, c-format
-msgid "Error creating SASL authentication object."
-msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÑ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÐ SASL."
-
-#: ../camel/providers/imap/camel-imap-store.c:791
-#: ../camel/providers/imapx/camel-imapx-server.c:3250
-#, c-format
-msgid "You did not enter a password."
-msgstr "ÐÐ ÑÑÐ ÐÑÐÐÐÐ ÐÐÑÐÐÐ."
-
-#: ../camel/providers/imap/camel-imap-store.c:832
-#: ../camel/providers/imapx/camel-imapx-server.c:3295
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"ÐÐÑÑÐÐÑÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÑÐÐ ÑÑÑÐÑÑÐ ÐÐ IMAP.\n"
-"%s\n"
-"\n"
-
-#: ../camel/providers/imap/camel-imap-store.c:888
-#: ../camel/providers/imapx/camel-imapx-store.c:142
+#: ../camel/providers/imap/camel-imap-store.c:809
+#: ../camel/providers/imapx/camel-imapx-store.c:155
 #, c-format
 msgid "IMAP server %s"
 msgstr "ÐÑÑÐÑÑ ÐÐ IMAP %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:891
-#: ../camel/providers/imapx/camel-imapx-store.c:145
+#: ../camel/providers/imap/camel-imap-store.c:812
+#: ../camel/providers/imapx/camel-imapx-store.c:158
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "ÐÑÐÑÐÐ ÐÐ IMAP ÐÐ %s ÐÐ %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:2005
-#: ../camel/providers/imap/camel-imap-store.c:2209
-#: ../camel/providers/imapx/camel-imapx-store.c:313
+#: ../camel/providers/imap/camel-imap-store.c:1111
+#: ../camel/providers/imapx/camel-imapx-server.c:2965
+#: ../camel/providers/nntp/camel-nntp-store.c:505
+msgid "Cannot authenticate without a username"
+msgstr "ÐÐÐÑÑÐÐÐÑÑÐÐÐÐÑÐ Ð ÐÐÐÑÐÐÐÐÐÐ ÐÐÐ ÐÐÑÑÐÐÐÑÐÐÑÐÐ ÐÐÐ"
+
+#: ../camel/providers/imap/camel-imap-store.c:1119
+#: ../camel/providers/imapx/camel-imapx-server.c:2974
+#: ../camel/providers/nntp/camel-nntp-store.c:514
+#: ../camel/providers/pop3/camel-pop3-store.c:491
+#: ../camel/providers/pop3/camel-pop3-store.c:511
+msgid "Authentication password not available"
+msgstr "ÐÐ Ð ÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐ"
+
+#: ../camel/providers/imap/camel-imap-store.c:2065
+#: ../camel/providers/imap/camel-imap-store.c:2269
+#: ../camel/providers/imapx/camel-imapx-store.c:348
 #, c-format
 msgid "No such folder %s"
 msgstr "ÐÑÐÐ ÑÐÐÐÐÐ ÐÐÐÐÐ â%sâ"
 
-#: ../camel/providers/imap/camel-imap-store.c:2019
-#: ../camel/providers/imap/camel-imap-store.c:2478
-#: ../camel/providers/imapx/camel-imapx-store.c:1325
+#: ../camel/providers/imap/camel-imap-store.c:2079
+#: ../camel/providers/imap/camel-imap-store.c:2538
+#: ../camel/providers/imapx/camel-imapx-store.c:1388
 #, 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:2083
-#: ../camel/providers/imap/camel-imap-store.c:2542
-#: ../camel/providers/imapx/camel-imapx-store.c:1346
+#: ../camel/providers/imap/camel-imap-store.c:2143
+#: ../camel/providers/imap/camel-imap-store.c:2602
+#: ../camel/providers/imapx/camel-imapx-store.c:1409
 #, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "ÐÐ ÑÐÐÐÑÐÐÑÐÐÑÐ ÐÐÐÐÐ ÐÐ Ð ÑÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐ ÐÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-store.c:2136
-#: ../camel/providers/local/camel-maildir-store.c:244
-#: ../camel/providers/local/camel-mbox-store.c:424
-#: ../camel/providers/local/camel-mh-store.c:550
+#: ../camel/providers/imap/camel-imap-store.c:2196
+#: ../camel/providers/local/camel-maildir-store.c:268
+#: ../camel/providers/local/camel-mbox-store.c:421
+#: ../camel/providers/local/camel-mh-store.c:558
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "ÐÐÐÐÐÑÐ â%sâ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÑÑÐÐÐÐÐÐÐ: ÐÐÑÐ ÑÑÑÐÑÑÐÑÐÐ."
 
-#: ../camel/providers/imap/camel-imap-store.c:2491
-#: ../camel/providers/imapx/camel-imapx-store.c:1336
+#: ../camel/providers/imap/camel-imap-store.c:2551
+#: ../camel/providers/imapx/camel-imapx-store.c:1399
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "ÐÐÐÐÐÐÑÑÐÐ ÑÐÐÐÑÐÐÑÐÐ ÐÐÐÐÐ: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3268
+#: ../camel/providers/imap/camel-imap-store.c:3326
 #, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "ÐÑÑÐÑÑÑÑ ÐÐÐÑÐÐÐÐÐÐ ÐÑÐÐÑÐÑÐ ÐÑÑÐÐÐÑÐ"
 
-#: ../camel/providers/imap/camel-imap-store.c:3271
+#: ../camel/providers/imap/camel-imap-store.c:3329
 msgid "Server unexpectedly disconnected: "
 msgstr "ÐÑÑÐÑÑÑÑ ÐÐÐÑÐÐÐÐÐÐ ÐÑÐÐÑÐÑÐ ÐÑÑÐÐÐÑÐ: "
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:91
+#: ../camel/providers/imapx/camel-imapx-folder.c:101
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐ ÐÐ â%sâ"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:99
+#: ../camel/providers/imapx/camel-imapx-folder.c:109
 #, c-format
 msgid "Could not create cache for %s: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÑ ÐÐ %s"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
 msgid "Use _Quick Resync if the server supports it"
 msgstr "ÐÐ ÑÐ ÐÐÐÐÐÐÐÐ _ÐÑÑÐÐ ÑÐÐÑÑÐÐÐÐÐÑÐÑ, ÐÐÐ ÑÐ ÐÐÐÐÑÑÐÐ ÐÑ ÑÑÑÐÑÑÐ"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
-msgid "Use I_dle if the server supports it"
-msgstr ""
-"ÐÐ ÑÐ ÐÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÑÑÑÐ ÐÐ _ÐÐÐÐÐÐÑÑÐÐÐ, ÐÐÐ ÑÐ ÐÐÐÐÑÑÐÐ ÐÑ ÑÑÑÐÑÑÐ"
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
+msgid "_Listen for server change notifications"
+msgstr "_ÐÐÑÑÐÐÐ ÐÐ ÑÐÐÐÐÐÑÐÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐ ÑÑÑÐÑÑÐ"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:56
 msgid "Command:"
@@ -3318,34 +3412,120 @@ msgstr "_ÐÑÐÐ ÐÐÑÐÑÐÐÐ ÐÑÑÐÐÐ, ÐÐÐÑÐ ÐÐ ÑÐ ÐÐÐÐÐ
 msgid "Namespace:"
 msgstr "ÐÑÐÑÑÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐÑÐ:"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:86
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
 msgid "Default IMAP port"
 msgstr "ÐÑÐÐÐÐÑÑÐÐ ÐÐÑÑ ÐÐ IMAP"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:94
+#: ../camel/providers/imapx/camel-imapx-provider.c:96
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1504
+#: ../camel/providers/imapx/camel-imapx-server.c:817
+msgid "Server disconnected"
+msgstr "ÐÑÑÐÑÑÑÑ ÐÑÐÐÑÐÑÐ ÐÑÑÐÐÐÑÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:1206
 msgid "Error writing to cache stream: "
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÐÐÑÐ Ð ÐÐÑÐÐÐ ÐÐ ÐÐÑÐ: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2214
+#: ../camel/providers/imapx/camel-imapx-server.c:1940
 #, c-format
 msgid "Not authenticated"
 msgstr "ÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3468
+#: ../camel/providers/imapx/camel-imapx-server.c:2005
+msgid "Error performing IDLE"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÑÐÑÑÐ IDLE"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3160
+msgid "Error fetching message"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3228
 msgid "Closing tmp stream failed: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÐÑÑÐÐ ÐÐ ÐÑÐÐÐÐÐÐÑ ÐÐÑÐÐ: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5506
-#: ../camel/providers/imapx/camel-imapx-server.c:5521
+#: ../camel/providers/imapx/camel-imapx-server.c:3327
+msgid "Error copying messages"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3457
+msgid "Error appending message"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÐÑÐÐÐÐ ÐÐ ÐÐÑÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3637
+msgid "Error fetching message headers"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐÐÐÑÐ ÑÐÑÑÐ ÐÐ ÐÐÑÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3778
+msgid "Error retrieving message"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3982
+msgid "Error fetching new messages"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4174
+msgid "Error while fetching messages"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4182
+#: ../camel/providers/imapx/camel-imapx-server.c:4212
+#, c-format
+msgid "Fetching summary information for %d message in %s"
+msgid_plural "Fetching summary information for %d messages in %s"
+msgstr[0] "ÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÑÐÑ ÐÐ %d ÐÐÐÐ ÐÐÑÐÐ Ð %s"
+msgstr[1] "ÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÑÐÑ ÐÐ %d ÐÐÐÐ ÐÐÑÐÐ Ð %s"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4334
+#: ../camel/providers/imapx/camel-imapx-server.c:4368
+msgid "Error refreshing folder"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4457
+msgid "Error expunging message"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4542
+msgid "Error fetching folders"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4616
+msgid "Error subscribing to folder"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4669
+msgid "Error creating folder"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4714
+msgid "Error deleting folder"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4764
+msgid "Error renaming folder"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4815
+msgid "Error performing NOOP"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÑÐÑÑÐ NOOP"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4910
+msgid "Error syncing changes"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÑÐÐÐÐÐÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5666
+#: ../camel/providers/imapx/camel-imapx-server.c:5681
 msgid "Cannot create spool file: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐ-ÑÐÑÐÐÑ: "
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1113
-#: ../camel/providers/nntp/camel-nntp-store.c:1768
+#: ../camel/providers/imapx/camel-imapx-store.c:1076
+#, c-format
+msgid "Retrieving folder list for %s"
+msgstr "ÐÐÐÐÐÑÐÐÐ ÐÐ ÑÐÐÑÑÐ Ñ ÐÐÐÐÐ ÐÐ â%sâ"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1176
+#: ../camel/providers/nntp/camel-nntp-store.c:1790
 #, c-format
 msgid "No such folder: %s"
 msgstr "ÐÑÐÐ ÑÐÐÐÐÐ ÐÐÐÐÐ: %s"
@@ -3360,27 +3540,27 @@ msgstr "ÐÐÑÐÐÐÐÑÑ ÐÐÑÐÐ ÐÐ ÐÑÑÐÐ ÐÐÐÐÐ"
 msgid "Source stream unavailable"
 msgstr "ÐÐÑÐÐÐÐÑÑ ÐÐÑÐÐ ÐÐ Ð ÐÐÐÐÑÐÐ"
 
-#: ../camel/providers/local/camel-local-folder.c:178
+#: ../camel/providers/local/camel-local-folder.c:187
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:188
 #: ../camel/providers/local/camel-local-folder.c:197
+#: ../camel/providers/local/camel-local-folder.c:206
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "ÐÐÑÐÐÑÐÐ ÐÑÑÐÑ: %s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:206
+#: ../camel/providers/local/camel-local-folder.c:215
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:473
-msgid "Index message body data"
-msgstr "ÐÐÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐÐÑÐ ÐÐ ÑÑÐÐÑÐ ÐÐ ÐÐÑÐÐÑÐ"
+#: ../camel/providers/local/camel-local-folder.c:479
+msgid "_Index message body data"
+msgstr "_ÐÐÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐÐÑÐ ÐÐ ÑÑÐÐÑÐ ÐÐ ÐÐÑÐÐÑÐ"
 
-#: ../camel/providers/local/camel-local-folder.c:704
+#: ../camel/providers/local/camel-local-folder.c:710
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3415,8 +3595,8 @@ msgstr ""
 
 #: ../camel/providers/local/camel-local-provider.c:86
 #: ../camel/providers/local/camel-local-provider.c:107
-msgid "_Apply filters to new messages in INBOX"
-msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐ _ÑÐÐÑÑÐ ÐÐ ÐÐÐÐ ÑÑÐÐÑÐÐÐÑ ÐÑÐ ÐÑÐÐÑÑÐÑÐ ÐÐÑÐ (INBOX)"
+msgid "_Apply filters to new messages in Inbox"
+msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐ _ÑÐÐÑÑÐ ÐÐ ÐÐÐÐ ÑÑÐÐÑÐÐÐÑ ÐÑÐ ÐÑÐÐÑÑÐÑÐ ÐÐÑÐ (Inbox)"
 
 #: ../camel/providers/local/camel-local-provider.c:93
 msgid "Maildir-format mail directories"
@@ -3450,228 +3630,228 @@ msgstr ""
 msgid "Standard Unix mbox spool directory"
 msgstr "ÐÑÐÐÐÐÑÑÐÐ ÐÐ Unix ÐÐÑÐÐÑÐÐ ÐÐÐÐÐ (ÑÐÑÐÐÑ mbox)"
 
-#: ../camel/providers/local/camel-local-store.c:92
+#: ../camel/providers/local/camel-local-store.c:98
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐ %s ÐÐ %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:184
+#: ../camel/providers/local/camel-local-store.c:178
 #, c-format
 msgid "Local mail file %s"
 msgstr "ÐÐÐÐÐÐÐ ÑÐÐÐ Ñ ÐÐÑÐ %s"
 
-#: ../camel/providers/local/camel-local-store.c:215
-#: ../camel/providers/local/camel-local-store.c:357
-#: ../camel/providers/local/camel-maildir-store.c:92
-#: ../camel/providers/local/camel-mbox-store.c:542
-#: ../camel/providers/local/camel-spool-store.c:574
+#: ../camel/providers/local/camel-local-store.c:218
+#: ../camel/providers/local/camel-local-store.c:375
+#: ../camel/providers/local/camel-maildir-store.c:101
+#: ../camel/providers/local/camel-mbox-store.c:555
+#: ../camel/providers/local/camel-spool-store.c:86
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐÐÐÐ %s ÐÐ Ð ÐÐÐÑÐÐÐ Ñ ÐÐÑÐÐÑÑÐÐ ÐÑÑ"
 
-#: ../camel/providers/local/camel-local-store.c:224
+#: ../camel/providers/local/camel-local-store.c:227
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐÐÐÐ %s ÐÐ Ð ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐ"
 
-#: ../camel/providers/local/camel-local-store.c:235
-#: ../camel/providers/local/camel-local-store.c:245
-#: ../camel/providers/local/camel-local-store.c:370
-#: ../camel/providers/local/camel-maildir-store.c:124
+#: ../camel/providers/local/camel-local-store.c:239
+#: ../camel/providers/local/camel-local-store.c:249
+#: ../camel/providers/local/camel-local-store.c:388
+#: ../camel/providers/local/camel-maildir-store.c:134
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐ: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:277
+#: ../camel/providers/local/camel-local-store.c:286
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "ÐÑÐ ÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐ ÐÑÐÐ ÐÐÑÐÐÑÐÐ ÐÑÑÐÑ"
 
-#: ../camel/providers/local/camel-local-store.c:415
-#: ../camel/providers/local/camel-mbox-store.c:716
+#: ../camel/providers/local/camel-local-store.c:445
+#: ../camel/providers/local/camel-mbox-store.c:722
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑ ÑÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ: %s"
 
-#: ../camel/providers/local/camel-local-store.c:443
-#: ../camel/providers/local/camel-mbox-store.c:746
+#: ../camel/providers/local/camel-local-store.c:473
+#: ../camel/providers/local/camel-mbox-store.c:752
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐ-ÑÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐ â%sâ: %s"
 
-#: ../camel/providers/local/camel-local-store.c:529
+#: ../camel/providers/local/camel-local-store.c:581
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÐÐÑÐÐÐÐ ÐÐ â%sâ: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:569
+#: ../camel/providers/local/camel-local-summary.c:527
 #, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐ ÐÑÐ ÐÐÐÐÑÐÐÐÐ: ÐÐÐÐÐÐÑÑÐÐ ÐÑÐÑÐÐÐ"
 
 #: ../camel/providers/local/camel-maildir-folder.c:100
-#: ../camel/providers/local/camel-maildir-folder.c:333
+#: ../camel/providers/local/camel-maildir-folder.c:336
 #: ../camel/providers/local/camel-mbox-folder.c:117
-#: ../camel/providers/local/camel-mbox-folder.c:325
-#: ../camel/providers/local/camel-mh-folder.c:156
+#: ../camel/providers/local/camel-mbox-folder.c:329
+#: ../camel/providers/local/camel-mh-folder.c:160
 msgid "No such message"
 msgstr "ÐÑÐÐ ÑÐÐÐÐÐ ÐÐÑÐÐ"
 
-#: ../camel/providers/local/camel-maildir-folder.c:223
+#: ../camel/providers/local/camel-maildir-folder.c:226
 #, c-format
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐÑÐ Ð ÐÐÐÐÐ maildir: %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:271
-#: ../camel/providers/local/camel-maildir-folder.c:281
-#: ../camel/providers/local/camel-mbox-folder.c:386
-#: ../camel/providers/local/camel-mh-folder.c:168
-#: ../camel/providers/local/camel-mh-folder.c:178
+#: ../camel/providers/local/camel-maildir-folder.c:274
+#: ../camel/providers/local/camel-maildir-folder.c:284
+#: ../camel/providers/local/camel-mbox-folder.c:390
+#: ../camel/providers/local/camel-mh-folder.c:172
+#: ../camel/providers/local/camel-mh-folder.c:182
 #, c-format
 msgid "Cannot get message %s from folder %s: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ: %s ÐÑ ÐÐÐÐÐ %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:351
+#: ../camel/providers/local/camel-maildir-folder.c:354
 #, c-format
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "ÐÐÑÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÑÐÑÐÑÑÐÐ Ð ÑÐÐÐÐÐÑÐ ÐÐÐÐÐ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:100
+#: ../camel/providers/local/camel-maildir-store.c:109
 #, c-format
-msgid "Cannot create folder: %s : Folder name cannot contain a dot"
+msgid "Cannot create folder: %s: Folder name cannot contain a dot"
 msgstr ""
 "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ: %s: ÐÐÐÑÐ ÐÐ ÐÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÑÑÐÑÑÐÐ â.â"
 
-#: ../camel/providers/local/camel-maildir-store.c:109
-#: ../camel/providers/local/camel-maildir-store.c:728
+#: ../camel/providers/local/camel-maildir-store.c:119
+#: ../camel/providers/local/camel-maildir-store.c:782
 #, c-format
 msgid "Folder %s already exists"
 msgstr "ÐÐÐÐÐÑÐ â%sâ ÐÐÑÐ ÑÑÑÐÑÑÐÑÐÐ"
 
-#: ../camel/providers/local/camel-maildir-store.c:191
-#: ../camel/providers/local/camel-maildir-store.c:222
-#: ../camel/providers/local/camel-mbox-store.c:392
-#: ../camel/providers/local/camel-mbox-store.c:406
+#: ../camel/providers/local/camel-maildir-store.c:215
+#: ../camel/providers/local/camel-maildir-store.c:246
+#: ../camel/providers/local/camel-mbox-store.c:389
+#: ../camel/providers/local/camel-mbox-store.c:403
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:206
-#: ../camel/providers/local/camel-mbox-store.c:358
-#: ../camel/providers/local/camel-mh-store.c:505
+#: ../camel/providers/local/camel-maildir-store.c:230
+#: ../camel/providers/local/camel-mbox-store.c:355
+#: ../camel/providers/local/camel-mh-store.c:516
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:212
-#: ../camel/providers/local/camel-mbox-store.c:368
-#: ../camel/providers/local/camel-mh-store.c:514
+#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mh-store.c:525
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ: ÐÐÐÐÐÑÐ ÐÐ ÑÑÑÐÑÑÐÑÐÐ."
 
-#: ../camel/providers/local/camel-maildir-store.c:239
+#: ../camel/providers/local/camel-maildir-store.c:263
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ: ÐÐ Ð ÐÐÐÐÐ maildir."
 
-#: ../camel/providers/local/camel-maildir-store.c:293
-#: ../camel/providers/local/camel-maildir-store.c:333
-#: ../camel/providers/local/camel-mh-store.c:652
+#: ../camel/providers/local/camel-maildir-store.c:329
+#: ../camel/providers/local/camel-maildir-store.c:369
+#: ../camel/providers/local/camel-mh-store.c:670
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:295
+#: ../camel/providers/local/camel-maildir-store.c:331
 msgid "not a maildir directory"
 msgstr "ÐÐ Ð ÐÐÐÐÐ maildir"
 
-#: ../camel/providers/local/camel-maildir-store.c:510
-#: ../camel/providers/local/camel-maildir-store.c:885
-#: ../camel/providers/local/camel-spool-store.c:161
-#: ../camel/providers/local/camel-spool-store.c:180
+#: ../camel/providers/local/camel-maildir-store.c:569
+#: ../camel/providers/local/camel-maildir-store.c:970
+#: ../camel/providers/local/camel-spool-store.c:209
+#: ../camel/providers/local/camel-spool-store.c:228
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr ""
 "ÐÐÑÑÐÐÑÐÐ ÑÑÑÑÐÐÐ Ð ÐÐÐÐÐ â%sâ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-maildir-store.c:719
+#: ../camel/providers/local/camel-maildir-store.c:773
 #, c-format
 msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
 msgstr ""
 "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ: %s: ÐÐÐÑÐ ÐÐ ÐÐÐÐÐ ÐÐ ÑÑÑÐÐÐ ÐÐ ÑÑÐÑÑÐÐ â.â"
 
-#: ../camel/providers/local/camel-maildir-summary.c:439
-#: ../camel/providers/local/camel-maildir-summary.c:571
+#: ../camel/providers/local/camel-maildir-summary.c:413
+#: ../camel/providers/local/camel-maildir-summary.c:546
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÑÑÐÐ ÐÐ ÐÑÑ ÐÐ ÐÐÐÐÐ maildir: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:562
+#: ../camel/providers/local/camel-maildir-summary.c:537
 msgid "Checking folder consistency"
 msgstr "ÐÑÐÐÐÑÐÐ ÐÐ ÑÐÐÐÑÑÑÐ ÐÐ ÐÐÐÐÐÑÐ"
 
-#: ../camel/providers/local/camel-maildir-summary.c:655
+#: ../camel/providers/local/camel-maildir-summary.c:630
 msgid "Checking for new messages"
 msgstr "ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÐ"
 
-#: ../camel/providers/local/camel-maildir-summary.c:748
-#: ../camel/providers/local/camel-mbox-summary.c:485
-#: ../camel/providers/local/camel-mbox-summary.c:717
-#: ../camel/providers/local/camel-mbox-summary.c:863
-#: ../camel/providers/local/camel-spool-summary.c:131
+#: ../camel/providers/local/camel-maildir-summary.c:725
+#: ../camel/providers/local/camel-mbox-summary.c:418
+#: ../camel/providers/local/camel-mbox-summary.c:649
+#: ../camel/providers/local/camel-mbox-summary.c:793
+#: ../camel/providers/local/camel-spool-summary.c:130
 msgid "Storing folder"
 msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ"
 
-#: ../camel/providers/local/camel-mbox-folder.c:183
+#: ../camel/providers/local/camel-mbox-folder.c:187
 #, c-format
 msgid "Cannot open mailbox: %s: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÑÑÐÐ ÐÐ ÐÐÑÐÐÑÐÐ ÐÑÑÐÑ: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:249
+#: ../camel/providers/local/camel-mbox-folder.c:253
 #, c-format
 msgid "Cannot append message to mbox file: %s: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐ ÐÑÐ ÑÐÐÐ mbox: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:378
+#: ../camel/providers/local/camel-mbox-folder.c:382
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÐÐÑÐ Ð ÐÐÐÑÐÐÐÐÐ ÐÐÐÐÑÐÑÐÐÐ."
 
-#: ../camel/providers/local/camel-mbox-folder.c:436
-#: ../camel/providers/local/camel-spool-folder.c:71
+#: ../camel/providers/local/camel-mbox-folder.c:439
+#: ../camel/providers/local/camel-spool-folder.c:70
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐ %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:380
-#: ../camel/providers/local/camel-mbox-store.c:550
+#: ../camel/providers/local/camel-mbox-store.c:377
+#: ../camel/providers/local/camel-mbox-store.c:563
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐÐÐÐ Ñ ÑÐÐÐÐÐ ÐÐÐ."
 
-#: ../camel/providers/local/camel-mbox-store.c:417
+#: ../camel/providers/local/camel-mbox-store.c:414
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ: ÐÐ Ð ÐÐÐÐÐÐÐÐÐ ÑÐÐÐ."
 
-#: ../camel/providers/local/camel-mbox-store.c:566
+#: ../camel/providers/local/camel-mbox-store.c:579
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:582
+#: ../camel/providers/local/camel-mbox-store.c:591
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:584
+#: ../camel/providers/local/camel-mbox-store.c:593
 msgid "Folder already exists"
 msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐ ÑÑÑÐÑÑÐÑÐÐ"
 
-#: ../camel/providers/local/camel-mbox-store.c:627
-#: ../camel/providers/local/camel-mbox-store.c:640
-#: ../camel/providers/local/camel-mbox-store.c:669
+#: ../camel/providers/local/camel-mbox-store.c:633
+#: ../camel/providers/local/camel-mbox-store.c:646
+#: ../camel/providers/local/camel-mbox-store.c:675
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3680,89 +3860,89 @@ msgstr ""
 "ÐÐÑÑÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐ â%sâ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:650
+#: ../camel/providers/local/camel-mbox-store.c:656
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "â%sâ ÐÐ Ð ÐÐÐÐÐÐÐÐÐ ÑÐÐÐ."
 
-#: ../camel/providers/local/camel-mbox-store.c:659
+#: ../camel/providers/local/camel-mbox-store.c:665
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "ÐÐÐÐÐÑÐ â%sâ ÐÐ Ð ÐÑÐÐÐÐ. ÐÐ Ð ÐÐÑÑÐÑÐ."
 
-#: ../camel/providers/local/camel-mbox-store.c:686
-#: ../camel/providers/local/camel-mbox-store.c:701
+#: ../camel/providers/local/camel-mbox-store.c:692
+#: ../camel/providers/local/camel-mbox-store.c:707
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÑÐÐÐ Ñ ÐÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:783
+#: ../camel/providers/local/camel-mbox-store.c:789
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "ÐÐÐÐÑÐ ÐÐÐ ÐÐ ÐÐÐÐÐÑÐ Ð ÐÐÐÑÐÐÐÐÐÐ."
 
-#: ../camel/providers/local/camel-mbox-store.c:799
+#: ../camel/providers/local/camel-mbox-store.c:805
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÐÐÑÐÐÐÐ ÐÐ â%sâ: â%sâ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:882
+#: ../camel/providers/local/camel-mbox-store.c:888
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÐÐÑÐÐÐÐ ÐÑ â%sâ ÐÐ %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:495
+#: ../camel/providers/local/camel-mbox-summary.c:428
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐÑÐ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:556
+#: ../camel/providers/local/camel-mbox-summary.c:490
 #, c-format
 msgid "Fatal mail parser error near position %s in folder %s"
 msgstr "ÐÐÑÐÐÐÐ ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÐÐÑÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐ %s Ð ÐÐÐÐÐ %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:645
+#: ../camel/providers/local/camel-mbox-summary.c:574
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:730
-#: ../camel/providers/local/camel-mbox-summary.c:872
-#: ../camel/providers/local/camel-spool-summary.c:138
+#: ../camel/providers/local/camel-mbox-summary.c:662
+#: ../camel/providers/local/camel-mbox-summary.c:802
+#: ../camel/providers/local/camel-spool-summary.c:137
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÑÑÐÐ ÐÐ ÑÐÐÐ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:744
-#: ../camel/providers/local/camel-spool-summary.c:153
+#: ../camel/providers/local/camel-mbox-summary.c:676
+#: ../camel/providers/local/camel-spool-summary.c:152
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÑÑÐÐ ÐÐ ÐÑÐÐÐÐÐÐ ÐÑÑÐÑ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:761
-#: ../camel/providers/local/camel-mbox-summary.c:988
+#: ../camel/providers/local/camel-mbox-summary.c:693
+#: ../camel/providers/local/camel-mbox-summary.c:918
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÐ %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:772
+#: ../camel/providers/local/camel-mbox-summary.c:704
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÐÑÑÐÐ ÐÐ ÐÑÐÐÐÐÐÐÑÐ ÐÐÐÐÐ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:789
+#: ../camel/providers/local/camel-mbox-summary.c:721
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:886
-#: ../camel/providers/local/camel-mbox-summary.c:1153
+#: ../camel/providers/local/camel-mbox-summary.c:816
+#: ../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:925
-#: ../camel/providers/local/camel-mbox-summary.c:1184
+#: ../camel/providers/local/camel-mbox-summary.c:855
+#: ../camel/providers/local/camel-mbox-summary.c:1115
 #, c-format
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
@@ -3771,65 +3951,79 @@ msgstr ""
 "ÐÐÐÐÑÑ MBOX Ð ÑÐÐÐÐÐÐÐ, ÐÐÐÑÐÐÐÑÐ ÐÐ. (ÐÑÐÐÐÐÑÐ ÑÐ ÑÐÐ ÐÐÐÐÑÐÐÑ Ñ "
 "âFromâ (ÐÑ), ÐÐ ÑÐÐÑÐ ÐÐ ÐÐ ÐÐÐÑÑÐÐ.)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:934
-#: ../camel/providers/local/camel-mbox-summary.c:1193
+#: ../camel/providers/local/camel-mbox-summary.c:864
+#: ../camel/providers/local/camel-mbox-summary.c:1124
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "ÐÐÐÐÑÐÐÐÐÑÐ Ð ÐÐÐÐÐÑÐ ÐÐ ÑÑÐÐÐÐÐÑ ÐÐÑÐ Ð ÑÐÐÐ ÑÐÐÑÑÐÐÐÐÐÑÐÑ"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1099
-#: ../camel/providers/local/camel-spool-summary.c:343
+#: ../camel/providers/local/camel-mbox-summary.c:1029
+#: ../camel/providers/local/camel-spool-summary.c:345
 #, c-format
 msgid "Unknown error: %s"
 msgstr "ÐÐÐÐÐÐÑÑÐÐ ÐÑÐÑÐÐ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1263
-#: ../camel/providers/local/camel-mbox-summary.c:1293
+#: ../camel/providers/local/camel-mbox-summary.c:1182
+#: ../camel/providers/local/camel-mbox-summary.c:1212
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐÐÐÐ ÐÑÐ ÐÑÐÐÐÐÐÐ ÐÑÑÐÑ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1282
+#: ../camel/providers/local/camel-mbox-summary.c:1201
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐÐÐÐ ÐÑÐ ÐÑÐÐÐÐÐÐ ÐÑÑÐÑ: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:115
+#: ../camel/providers/local/camel-mh-folder.c:119
 #, c-format
 msgid "Cannot append message to mh folder: %s: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐ ÐÑÐ ÐÐÐÐÐ MH: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:525
+#: ../camel/providers/local/camel-mh-store.c:535
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:542
+#: ../camel/providers/local/camel-mh-store.c:551
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ: ÐÐ Ð ÐÐÐÐÐ."
 
-#: ../camel/providers/local/camel-mh-summary.c:227
+#: ../camel/providers/local/camel-mh-summary.c:224
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐ MH: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:350
+#: ../camel/providers/local/camel-spool-store.c:94
+#, c-format
+msgid "Spool '%s' cannot be opened: %s"
+msgstr "ÐÐÑÐÐÑÑÑ â%sâ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÑÐÐÑÐÐ: %s"
+
+#: ../camel/providers/local/camel-spool-store.c:108
+#, c-format
+msgid "Spool '%s' is not a regular file or directory"
+msgstr "ÐÐÑÐÐÑÑÑ â%sâ ÐÐ Ð ÐÐÐÐÐÐÐÐÐ ÑÐÐÐ ÐÐÐ ÐÐÐÐÐ"
+
+#: ../camel/providers/local/camel-spool-store.c:416
 #, c-format
 msgid "Spool mail file %s"
 msgstr "ÐÐÐÐ-ÑÐÑÐÐÑ %s"
 
-#: ../camel/providers/local/camel-spool-store.c:353
+#: ../camel/providers/local/camel-spool-store.c:420
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "ÐÑÑÐÐ Ñ ÐÐÐÐÐ-ÑÐÑÐÐÑ %s"
 
-#: ../camel/providers/local/camel-spool-store.c:394
+#: ../camel/providers/local/camel-spool-store.c:423
+msgid "Invalid spool"
+msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐ-ÑÐÑÐÐÑ"
+
+#: ../camel/providers/local/camel-spool-store.c:480
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "ÐÐÐÐÐÑÐ â%s/%sâ ÐÐ ÑÑÑÐÑÑÐÑÐÐ."
 
-#: ../camel/providers/local/camel-spool-store.c:408
+#: ../camel/providers/local/camel-spool-store.c:493
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3838,12 +4032,12 @@ msgstr ""
 "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐÑÐ â%sâ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:414
+#: ../camel/providers/local/camel-spool-store.c:499
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "ÐÐÐÐÐÑÐ â%sâ ÐÐ ÑÑÑÐÑÑÐÑÐÐ."
 
-#: ../camel/providers/local/camel-spool-store.c:421
+#: ../camel/providers/local/camel-spool-store.c:507
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -3852,51 +4046,41 @@ msgstr ""
 "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:433
+#: ../camel/providers/local/camel-spool-store.c:520
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "â%sâ Ð ÐÐÐÑÐÐÐÐÐÐ ÑÐÐÐ mailbox."
 
-#: ../camel/providers/local/camel-spool-store.c:481
+#: ../camel/providers/local/camel-spool-store.c:584
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "ÐÑÑÐÑÑÐ ÐÐ ÐÐÐÐÑÑÐÐ ÐÐÐÐÐ ÐÐ ÐÑÐÐÑÑÐ ÐÐÑÐÐ"
 
-#: ../camel/providers/local/camel-spool-store.c:495
+#: ../camel/providers/local/camel-spool-store.c:603
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "ÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÐÑÐÐÑ ÐÐÑÑÐÑÐ"
 
-#: ../camel/providers/local/camel-spool-store.c:510
+#: ../camel/providers/local/camel-spool-store.c:618
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "ÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÐÑÐÐÑ ÐÑÐÐÐÐÐÑÐÐÐÐ"
 
-#: ../camel/providers/local/camel-spool-store.c:583
-#, c-format
-msgid "Spool '%s' cannot be opened: %s"
-msgstr "ÐÐÑÐÐÑÑÑ â%sâ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÑÐÐÑÐÐ: %s"
-
-#: ../camel/providers/local/camel-spool-store.c:599
-#, c-format
-msgid "Spool '%s' is not a regular file or directory"
-msgstr "ÐÐÑÐÐÑÑÑ â%sâ ÐÐ Ð ÐÐÐÐÐÐÐÐÐ ÑÐÐÐ ÐÐÐ ÐÐÐÐÐ"
-
-#: ../camel/providers/local/camel-spool-summary.c:169
-#: ../camel/providers/local/camel-spool-summary.c:181
-#: ../camel/providers/local/camel-spool-summary.c:193
+#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-spool-summary.c:180
+#: ../camel/providers/local/camel-spool-summary.c:192
 #, c-format
 msgid "Could not synchronize temporary folder %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÐÑÑÐÐÐÐÐÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐÑÐ ÐÐÐÐÐ: %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:211
+#: ../camel/providers/local/camel-spool-summary.c:210
 #, c-format
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÐÑÑÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÑÐ-ÑÐÑÐÐÑ â%sâ: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:243
-#: ../camel/providers/local/camel-spool-summary.c:262
-#: ../camel/providers/local/camel-spool-summary.c:275
+#: ../camel/providers/local/camel-spool-summary.c:242
+#: ../camel/providers/local/camel-spool-summary.c:261
+#: ../camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not synchronize spool folder %s: %s\n"
@@ -3905,110 +4089,100 @@ msgstr ""
 "ÐÐÑÑÐÐÑÐÐ ÑÐÐÑÑÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÑÐ-ÑÐÑÐÐÑ â%sâ: %s\n"
 "ÐÐÐÐÐÑÐ ÐÐÐÐ ÐÐ Ð ÐÐÐÑÐÐÐÐÐ, ÐÐÐÐÐÑÐ Ð ÐÐÐÐÐÐÐÐ Ð â%sâ"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:213
-#: ../camel/providers/nntp/camel-nntp-folder.c:302
-#: ../camel/providers/nntp/camel-nntp-folder.c:424
+#: ../camel/providers/nntp/camel-nntp-folder.c:286
+#: ../camel/providers/nntp/camel-nntp-folder.c:375
+#: ../camel/providers/nntp/camel-nntp-folder.c:497
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "ÐÑÑÑÐÑÐÐ ÐÑÐÑÐÐ: ÑÐÐÐÐÐÐÐÑÑ ÐÐÐÐÑÐÑÐÐÐÑÐÑ Ð Ñ ÐÐÐÑÐÐÐÐÐÐ ÑÐÑÐÐÑ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:263
-#: ../camel/providers/nntp/camel-nntp-folder.c:267
-#: ../camel/providers/pop3/camel-pop3-folder.c:431
-#: ../camel/providers/pop3/camel-pop3-folder.c:696
+#: ../camel/providers/nntp/camel-nntp-folder.c:336
+#: ../camel/providers/nntp/camel-nntp-folder.c:340
+#: ../camel/providers/pop3/camel-pop3-folder.c:613
+#: ../camel/providers/pop3/camel-pop3-folder.c:997
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ %s: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:274
-#: ../camel/providers/nntp/camel-nntp-folder.c:449
-#: ../camel/providers/pop3/camel-pop3-folder.c:368
-#: ../camel/providers/pop3/camel-pop3-folder.c:420
-#: ../camel/providers/pop3/camel-pop3-folder.c:440
+#: ../camel/providers/nntp/camel-nntp-folder.c:347
+#: ../camel/providers/nntp/camel-nntp-folder.c:522
+#: ../camel/providers/pop3/camel-pop3-folder.c:551
+#: ../camel/providers/pop3/camel-pop3-folder.c:603
+#: ../camel/providers/pop3/camel-pop3-folder.c:622
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ %s:"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:508
-#: ../camel/providers/nntp/camel-nntp-folder.c:514
-#: ../camel/providers/nntp/camel-nntp-folder.c:561
+#: ../camel/providers/nntp/camel-nntp-folder.c:581
+#: ../camel/providers/nntp/camel-nntp-folder.c:587
+#: ../camel/providers/nntp/camel-nntp-folder.c:634
 #, c-format
 msgid "Posting failed: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÐÑÐÐÐ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:556
+#: ../camel/providers/nntp/camel-nntp-folder.c:629
 msgid "Posting failed: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÐÑÐÐÐ: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:585
+#: ../camel/providers/nntp/camel-nntp-folder.c:658
 #, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "ÐÐ ÐÐÐÐ ÐÐ ÐÐÐÑÐÑÐÑÐ ÑÑÐÑÐÐ ÐÐ NNTP ÐÐÐÐÑÐ ÑÑÐ Ð ÑÐÐÐÐ âÐÐÐÐÑÑÐÐâ!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:605
+#: ../camel/providers/nntp/camel-nntp-folder.c:678
 #, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐÑÐ ÑÑÐÑÐÐ ÐÑ ÐÐÐÐÐ NNTP!"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
+#: ../camel/providers/nntp/camel-nntp-provider.c:48
 msgid ""
 "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr ""
 "_ÐÐÐÐÐÐÐÐÐ ÐÐ ÑÑÐÑÐÑÐÐÐ ÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐ (ÐÐÐÑ. c.o.linux ÐÐÐÑÑÐ comp.os."
 "linux)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:50
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "ÐÑÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐ ÐÐ ÐÐÐÐÐ Ð _ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐÐÐÐÐÑ"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:52
+#: ../camel/providers/nntp/camel-nntp-provider.c:56
 msgid "Default NNTP port"
 msgstr "ÐÑÐÐÐÐÑÑÐÐ ÐÐÑÑ ÐÐ NNTP"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:53
+#: ../camel/providers/nntp/camel-nntp-provider.c:57
 msgid "NNTP over SSL"
 msgstr "NNTP ÐÑÐÐ SSL"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:59
+#: ../camel/providers/nntp/camel-nntp-provider.c:63
 msgid "USENET news"
 msgstr "ÐÐÐÐÐÐ Ð USENET"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:61
+#: ../camel/providers/nntp/camel-nntp-provider.c:65
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "ÐÐÐÐ Ð ÐÐÑÑÐÐÑÐÐ ÐÐ ÑÐÑÐÐÐ Ð ÐÑÐÐÐÐÑÐÐÐÐ Ð ÐÑÑÐÐ ÐÐ ÐÐÐÐÐÐ Ð USENET."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:82
+#: ../camel/providers/nntp/camel-nntp-provider.c:86
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐ ÐÐ ÑÐÑÑÐÐ ÑÑÑ ÑÑÑÐÑÑ NNTP ÑÑÐÐ ÐÐÑÐÑÑÐÑÐÐÐ ÐÐÑÐÐÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:101
-#, c-format
-msgid "Authentication requested but no username provided"
-msgstr "ÐÐÐÑÐÐÐ ÑÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ, ÐÐ ÐÐ Ð ÑÐÐÐÐÐÐ ÐÐÑÑÐÐÐÑÐÐÑÐÐ ÐÐÐ"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:114
-#, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÑÐÐ ÑÑÑÐÑÑÐ: %s"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:367
+#: ../camel/providers/nntp/camel-nntp-store.c:285
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐ ÐÑ %s: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:380
+#: ../camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "ÐÑÑÐÑÑÑÑ ÐÐ NNTP %s ÐÑÑÐÐ ÐÐÐ ÐÐ ÐÑÐÑÐÐ %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:538
+#: ../camel/providers/nntp/camel-nntp-store.c:469
 #, c-format
 msgid "USENET News via %s"
 msgstr "ÐÐÐÐÐÐ Ð USENET ÐÑÐÐ %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1063
+#: ../camel/providers/nntp/camel-nntp-store.c:1072
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4019,26 +4193,26 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1156
+#: ../camel/providers/nntp/camel-nntp-store.c:1165
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÑÐÐÐÐÐÑÐ ÐÐÐÐÐ Ð ÑÑÐÐÐÐÐÑÐ ÐÐ ÐÑÑÐÐ ÐÐÐÐÐÐ. ÐÐÐÑÑÐ ÑÐÐÐ ÑÐ "
 "ÐÐÐÐÐÑÐÐÑÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1172
+#: ../camel/providers/nntp/camel-nntp-store.c:1181
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐÐÐÑÐÐÑÐ ÐÐÐÐÐ Ð ÑÑÐÐÐÐÐÑÐ ÐÐ ÐÑÑÐÐ ÐÐÐÐÐÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1195
+#: ../camel/providers/nntp/camel-nntp-store.c:1204
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐÑÐÐÑÐ ÐÐÐÐÐ Ð ÑÑÐÐÐÐÐÑÐ ÐÐ ÐÑÑÐÐ ÐÐÐÐÐÐ. ÐÐÐÑÑÐ ÑÐÐÐ "
 "ÐÑÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐÐÐÑÐ ÑÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1393
+#: ../camel/providers/nntp/camel-nntp-store.c:1402
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4049,7 +4223,7 @@ msgstr ""
 "\n"
 "ÐÑÐÐ ÑÐÐÐÐÐ ÐÑÑÐÐ. ÐÐÐ-ÐÐÑÐÑÑÐÐ ÐÐÐÑÐÐÐÑÑ ÐÐÐÐÑ Ð ÑÐÐÐÑÐÐÑÐÐ ÐÐÐÐÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1444
+#: ../camel/providers/nntp/camel-nntp-store.c:1453
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4060,64 +4234,64 @@ msgstr ""
 "\n"
 "ÐÑÑÐÐÑÐ ÐÐ ÑÑÑÐÑÑÐÑÐÐ!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1637
+#: ../camel/providers/nntp/camel-nntp-store.c:1647
 msgid "NNTP Command failed: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐÐ ÐÐ NNTP: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1711
+#: ../camel/providers/nntp/camel-nntp-store.c:1732
 #, c-format
 msgid "Not connected."
 msgstr "ÐÐ ÑÑÐ ÑÐÑÑÐÐÐÐ."
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:240
-#: ../camel/providers/nntp/camel-nntp-summary.c:358
+#: ../camel/providers/nntp/camel-nntp-summary.c:195
+#: ../camel/providers/nntp/camel-nntp-summary.c:322
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐ ÑÑÐÑÐÐ"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:256
+#: ../camel/providers/nntp/camel-nntp-summary.c:213
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "ÐÐÐÑÐÐÐÐÐ ÐÑÐÐÐÐÑ ÐÑ ÑÑÑÐÑÑ ÐÑ âxoverâ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:374
+#: ../camel/providers/nntp/camel-nntp-summary.c:340
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "ÐÐÐÑÐÐÐÐÐ ÐÑÐÐÐÐÑ ÐÑ ÑÑÑÐÑÑ ÐÑ âheadâ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:419
+#: ../camel/providers/nntp/camel-nntp-summary.c:387
 #, c-format
 msgid "Operation failed: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐ: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:285
-#: ../camel/providers/pop3/camel-pop3-folder.c:344
+#: ../camel/providers/pop3/camel-pop3-folder.c:448
+#: ../camel/providers/pop3/camel-pop3-folder.c:519
 #, c-format
 msgid "No message with UID %s"
 msgstr "ÐÑÐÐ ÐÐÑÐÐ Ñ ÐÐÐÐÑÐÑÐÐÐÑÐÑ %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:352
+#: ../camel/providers/pop3/camel-pop3-folder.c:535
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ ÐÐ POP %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:432
+#: ../camel/providers/pop3/camel-pop3-folder.c:614
 msgid "Unknown reason"
 msgstr "ÐÐÐÐÐÐÑÑÐÐ ÐÑÐÑÐÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:472
+#: ../camel/providers/pop3/camel-pop3-folder.c:662
 msgid "Retrieving POP summary"
 msgstr "ÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐ POP"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:487
+#: ../camel/providers/pop3/camel-pop3-folder.c:713
 msgid "Cannot get POP summary: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐÑÐ ÐÐ POP: "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:557
+#: ../camel/providers/pop3/camel-pop3-folder.c:825
 msgid "Expunging old messages"
 msgstr "ÐÑÑÑÑÐÐÑÐÐÐÐ ÐÐ ÑÑÐÑÐÑÐ ÐÐÑÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:569
+#: ../camel/providers/pop3/camel-pop3-folder.c:845
 msgid "Expunging deleted messages"
 msgstr "ÐÑÑÑÑÐÐÑÐÐÐÐ ÐÐ ÐÐÑÑÐÑÐÑÐ ÐÐÑÐÐ"
 
@@ -4159,7 +4333,7 @@ msgstr "POP"
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "ÐÐ ÐÑÑÐÐÐ Ð ÐÐÑÐÐÐÑÐÐ ÐÐ ÐÐÑÐ ÐÑ ÑÑÑÐÑÑÐ ÐÐ POP."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:83
+#: ../camel/providers/pop3/camel-pop3-provider.c:84
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4167,7 +4341,7 @@ msgstr ""
 "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐ ÐÐ ÑÐÑÑÐÐ ÑÑÑ ÑÑÑÐÑÑ ÐÐ POP ÑÑÐÐ ÐÐÑÐÑÑÐÑÐÐÐ ÐÐÑÐÐÐ. ÐÐÐÐ "
 "Ð ÐÐÐÐÑÑÐÐÐÐÑÑ ÐÐÑÐÐÐÑ ÐÐÐÐÑÑÐÐÐ ÐÑ ÐÐÐÐÐ ÑÑÑÐÑÑÐ ÐÐ POP."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:93
+#: ../camel/providers/pop3/camel-pop3-provider.c:94
 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 "
@@ -4182,63 +4356,52 @@ msgstr ""
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:130
+#: ../camel/providers/pop3/camel-pop3-store.c:136
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐÑÐÐ ÐÐÐÐÑÐÐ ÐÑ ÑÑÑÐÑÑÐ ÐÐ POP %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:150
-#: ../camel/providers/pop3/camel-pop3-store.c:189
+#: ../camel/providers/pop3/camel-pop3-store.c:153
 #, 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:151
+#: ../camel/providers/pop3/camel-pop3-store.c:154
 msgid "STLS not supported by server"
 msgstr "ÐÑÑÐÑÑÑÑ ÐÐ ÐÐÐÐÑÑÐÐ STLS"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:169
+#: ../camel/providers/pop3/camel-pop3-store.c:172
 #, 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:182
+#: ../camel/providers/pop3/camel-pop3-store.c:185
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ ÑÑÑ ÑÑÑÐÑÑÐ ÐÐ POP %s Ð ÑÐÐÑÑÐÐ ÑÐÐÐÐ: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:190
-msgid "TLS is not available in this build"
-msgstr "Ð ÑÐÐÐ ÐÐÐÐÐÐÐÑ ÐÐÐÑÐÐ TLS"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:241
-#: ../camel/providers/pop3/camel-pop3-store.c:425
-#, c-format
-msgid ""
-"Unable to connect to POP server %s: No support for requested authentication "
-"mechanism."
-msgstr ""
-"ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ ÐÑÐ ÑÑÑÐÑÑÐ ÐÐ POP %s: ÐÐÐÑÐÐ ÐÐÐÐÑÑÐÐÐ ÐÐ ÐÑÐÐÐÑ "
-"ÐÐÑÐÐÐÐÑÐ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ."
-
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:269
-#, c-format
-msgid "SASL '%s' Login failed for POP server %s%s"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐÐ ÑÑÐÐ SASL â%sâ Ð ÑÑÑÐÑÑÐ ÐÐ POP %s%s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:286
+#: ../camel/providers/pop3/camel-pop3-store.c:288
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐÐ Ð ÑÑÑÐÑÑÐ ÐÐ POP %s: ÐÑÐÑÐÐ Ð ÐÑÐÑÐÐÐÐÐ SASL"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:308
+#: ../camel/providers/pop3/camel-pop3-store.c:310
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÑÐÐ ÑÑÑÐÑÑÐ ÐÐ POP %s: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:391
+#: ../camel/providers/pop3/camel-pop3-store.c:359
+#, c-format
+msgid "POP3 server %s"
+msgstr "ÐÑÑÐÑÑ ÐÐ POP %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:362
+#, c-format
+msgid "POP3 server for %s on %s"
+msgstr "ÐÑÑÐÑÑ ÐÐ POP ÐÐ %s ÐÐ %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:525
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4248,7 +4411,7 @@ msgstr ""
 "ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÐ APOP. ÐÐÐ ÐÐÑÐÑÑÐÐÑÑ ÑÐÐÐ ÐÐ Ð ÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐ ÐÐ "
 "ÐÐÐÐÑÐÑÐÐÑÑÑÐ, ÑÐÑÑÐÐÑÐ ÑÐ Ñ ÐÐÑÐÑ ÐÐÐÐÐÐÑÑÑÐÑÐÑ."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:438
+#: ../camel/providers/pop3/camel-pop3-store.c:577
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4257,8 +4420,9 @@ msgstr ""
 "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ ÐÑÐ ÑÑÑÐÑÑÐ ÐÐ POP %s.\n"
 "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÐÑÐÐÐÑÐ ÐÐ ÐÐÑÐÐÐ: "
 
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:448
+#. Translators: Last %s is an optional explanation
+#. * beginning with ": " separator.
+#: ../camel/providers/pop3/camel-pop3-store.c:592
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4267,37 +4431,17 @@ msgstr ""
 "ÐÐÑÑÐÐÑÐÐ ÐÑÐ ÑÐÑÑÐÐÐÐÐ ÐÑÐ ÑÑÑÐÑÑÐ ÐÐ POP %s.\n"
 "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÐÑÐÐÐÑÐ ÐÐ ÐÐÑÑÐÐÐÑÐÐÑÐÐ ÐÐÐ %s"
 
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:460
-#, 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:503
-#, c-format
-msgid "POP3 server %s"
-msgstr "ÐÑÑÐÑÑ ÐÐ POP %s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:506
-#, c-format
-msgid "POP3 server for %s on %s"
-msgstr "ÐÑÑÐÑÑ ÐÐ POP ÐÐ %s ÐÐ %s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:634
+#: ../camel/providers/pop3/camel-pop3-store.c:650
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ ÑÑÑ ÑÑÑÐÑÑÐ ÐÐ POP %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:661
+#: ../camel/providers/pop3/camel-pop3-store.c:678
 #, c-format
 msgid "No such folder '%s'."
 msgstr "ÐÐÐÐÐÐ ÐÐÐÐÐ ÐÐÐÑÐÐ â â%sâ."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:678
+#: ../camel/providers/pop3/camel-pop3-store.c:695
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 ÐÐ ÐÐÐÐÑÑÐÐ ÐÐÑÐÑÑÐÑ ÐÑ ÐÐÐÐÐ"
@@ -4338,21 +4482,21 @@ msgstr ""
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÑÑÐÑÐÐÐ ÐÐ sendmail: %s: ÐÐÑÐÑÐ ÐÐ Ð ÐÐÐÑÐÑÐÐÐ"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:184
 msgid "Could not send message: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐ: "
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:212
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail ÐÐÐÑÑÑÐ ÑÑÑ ÑÐÐÐÐÐ %s: ÐÐÑÐÑÐ ÐÐ Ð ÐÐÐÑÐÑÐÐÐ"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:217
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:219
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÐÐÐÐÐÐ ÐÐ %s: ÐÐÑÐÑÐ ÐÐ Ð ÐÐÐÑÐÑÐÐÐ"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:224
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail ÐÐÐÑÑÑÐ Ð ÑÑÑÑÐÑÐÐÐ %d: ÐÐÑÐÑÐ ÐÐ Ð ÐÐÐÑÐÑÐÐÐ"
@@ -4379,235 +4523,228 @@ msgstr ""
 "ÐÐ ÐÐÑÑÐÐÐÐ ÐÐ ÐÐÑÐ ÑÑÐÐ ÑÐÑÑÐÐÐÐÐ ÐÑÐ ÐÑÐÐÐÐÑÐÐ ÑÐÐÐÑÐÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐ ÐÑÐÐ "
 "SMTP."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:149
-#: ../camel/providers/smtp/camel-smtp-transport.c:156
+#: ../camel/providers/smtp/camel-smtp-transport.c:150
+#: ../camel/providers/smtp/camel-smtp-transport.c:158
 msgid "Welcome response error: "
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐÐÐ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:191
-#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:195
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ ÑÑÑ ÑÑÑÐÑÑÐ ÐÐ SMTP %s Ð ÑÐÐÑÑÐÐ ÑÐÐÐÐ: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
-#: ../camel/providers/smtp/camel-smtp-transport.c:213
-#: ../camel/providers/smtp/camel-smtp-transport.c:220
+#: ../camel/providers/smtp/camel-smtp-transport.c:204
+#: ../camel/providers/smtp/camel-smtp-transport.c:217
+#: ../camel/providers/smtp/camel-smtp-transport.c:224
 msgid "STARTTLS command failed: "
 msgstr "ÐÐÐÐÐÐÐÑÐ STARTTLS Ð ÐÐÑÑÐÐÑÐÐ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:230
+#: ../camel/providers/smtp/camel-smtp-transport.c:235
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ ÑÑÑ ÑÑÑÐÑÑÐ ÐÐ SMTP %s Ð ÑÐÐÑÑÐÐ ÑÐÐÐÐ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:283
+#: ../camel/providers/smtp/camel-smtp-transport.c:292
 #, c-format
 msgid "SMTP server %s"
 msgstr "ÐÑÑÐÑÑ ÐÐ SMTP %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:287
+#: ../camel/providers/smtp/camel-smtp-transport.c:295
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐ ÐÐÑÐ ÑÑÐÐ SMTP ÐÑÐÐ %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:338
+#: ../camel/providers/smtp/camel-smtp-transport.c:367
 #, c-format
-msgid "SMTP server %s does not support requested authentication type %s."
+msgid "SMTP server %s does not support %s authentication"
 msgstr "ÐÑÑÐÑÑÑÑ ÐÐ SMTP %s ÐÐ ÐÐÐÐÑÑÐÐ ÐÐÐÐÑÐÐÐÐÐÑ ÐÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ %s."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:449
+#: ../camel/providers/smtp/camel-smtp-transport.c:446
 #, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"ÐÐÑÑÐÐÑÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÑÐÐ ÑÑÑÐÑÑÐ ÐÐ SMTP.\n"
-"%s\n"
-"\n"
+msgid "No SASL mechanism was specified"
+msgstr "ÐÐ ÐÐÑÐ ÑÐÐÐÐÐ ÐÐÑÐÐÐÐÑÐ ÐÐ SASL"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:459
+msgid "SMTP Authentication"
+msgstr "ÐÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÐ SMTP"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:478
+#: ../camel/providers/smtp/camel-smtp-transport.c:489
+#: ../camel/providers/smtp/camel-smtp-transport.c:502
+msgid "AUTH command failed: "
+msgstr "ÐÐÐÐÐÐÐÑÐ AUTH Ð ÐÐÑÑÐÐÑÐÐ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:565
+#: ../camel/providers/smtp/camel-smtp-transport.c:643
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "ÐÐÑÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÐÑÐÑÐÐÐ: ÑÑÐÑÐÐÑÐ ÐÐ Ð ÑÐÑÑÐÐÐÐ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:572
+#: ../camel/providers/smtp/camel-smtp-transport.c:650
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "ÐÐÑÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÐÑÐÑÐÐÐ: ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑ ÐÐ ÐÐÐÑÐÑÐÑÐ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:576
+#: ../camel/providers/smtp/camel-smtp-transport.c:654
 msgid "Sending message"
 msgstr "ÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:601
+#: ../camel/providers/smtp/camel-smtp-transport.c:679
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "ÐÐÑÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÐÑÐÑÐÐÐ: ÐÑÐÐ ÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÑÐÐÐ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:614
+#: ../camel/providers/smtp/camel-smtp-transport.c:692
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "ÐÐÑÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÐÑÐÑÐÐÐ: ÐÐÐÐ ÐÐÐ ÐÐÐÐÑÐ ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐ "
 "ÐÐÐÑÑÐÑÐÐÐ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:717
+#: ../camel/providers/smtp/camel-smtp-transport.c:796
 msgid "Syntax error, command unrecognized"
 msgstr "ÐÐÐÑÐÐÑÐÑÐÐ ÐÑÐÑÐÐ, ÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:719
+#: ../camel/providers/smtp/camel-smtp-transport.c:798
 msgid "Syntax error in parameters or arguments"
 msgstr "ÐÐÐÑÐÐÑÐÑÐÐ ÐÑÐÑÐÐ Ð ÐÐÑÐÐÐÑÑÐÑÐ ÐÐÐ ÐÑÐÑÐÐÐÑÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:721
+#: ../camel/providers/smtp/camel-smtp-transport.c:800
 msgid "Command not implemented"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐ Ð ÑÐÐÐÐÐÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:723
+#: ../camel/providers/smtp/camel-smtp-transport.c:802
 msgid "Command parameter not implemented"
 msgstr "ÐÐÑÐÐÐÑÑÑÑÑ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ Ð ÑÐÐÐÐÐÐÑÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:725
+#: ../camel/providers/smtp/camel-smtp-transport.c:804
 msgid "System status, or system help reply"
 msgstr "ÐÑÐÐÐÐÑ ÑÑÑ ÑÑÑÑÐÑÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÐÑÐ ÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐÐÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:806
 msgid "Help message"
 msgstr "ÐÐÐÐÑÐÐ ÑÑÐÐÑÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:729
+#: ../camel/providers/smtp/camel-smtp-transport.c:808
 msgid "Service ready"
 msgstr "ÐÑÐÑÐÐÑÐ Ð ÐÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:731
+#: ../camel/providers/smtp/camel-smtp-transport.c:810
 msgid "Service closing transmission channel"
 msgstr "ÐÑÐÑÐÐÑÐ ÐÐÑÐÐÑÐ ÐÑÐÑÐÑÑÐÑÑÐÑ ÐÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:733
+#: ../camel/providers/smtp/camel-smtp-transport.c:812
 msgid "Service not available, closing transmission channel"
 msgstr "ÐÑÐÑÐÐÑÐ ÐÐÐÑÐÐ, ÐÐÑÐÐÑÑÐÐ ÐÐ ÐÑÐÑÐÑÑÐÑÑÐÑ ÐÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:735
+#: ../camel/providers/smtp/camel-smtp-transport.c:814
 msgid "Requested mail action okay, completed"
 msgstr "ÐÐÑÐÐÐÐÑÐ ÐÐÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐ Ð ÐÐÑÐÐ, ÐÐÐÑÑÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:737
+#: ../camel/providers/smtp/camel-smtp-transport.c:816
 msgid "User not local; will forward to <forward-path>"
 msgstr "ÐÐÑÑÐÐÐÑÐÐÑÑ ÐÐ Ð ÐÐÐÐÐÐÐ: ÐÑÐÐÑÐÑÐÐÐ ÐÑÐ <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:739
+#: ../camel/providers/smtp/camel-smtp-transport.c:818
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "ÐÐÑÐÐÐÐÑÐ ÐÐÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐ ÐÐ Ð ÐÐÐÑÑÑÐÐÐ: ÐÐÐÑÐÐ ÐÐÑÐÐÑÐÐ ÐÑÑÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:741
+#: ../camel/providers/smtp/camel-smtp-transport.c:820
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "ÐÐÑÐÐÐÐÑÐ ÐÐÐÑÑÐÐÐ ÐÐ Ð ÐÐÐÑÑÑÐÐÐ: ÐÐÐÑÐÐ ÐÐÑÐÐÑÐÐ ÐÑÑÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:743
+#: ../camel/providers/smtp/camel-smtp-transport.c:822
 msgid "Requested action aborted: error in processing"
 msgstr "ÐÐÑÐÐÐÐÑÐ ÐÐÐÑÑÐÐÐ Ð ÐÑÐÐÑÑÐÐÑÐ: ÐÑÐÑÐÐ Ð ÐÐÑÐÐÐÑÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
+#: ../camel/providers/smtp/camel-smtp-transport.c:824
 msgid "User not local; please try <forward-path>"
 msgstr "ÐÐÑÑÐÐÐÑÐÐÑÑ ÐÐ Ð ÐÐÐÐÐÐÐ: ÐÐÐÑÐÐÑÐ <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:747
+#: ../camel/providers/smtp/camel-smtp-transport.c:826
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 "ÐÐÑÐÐÐÐÑÐ ÐÐÐÑÑÐÐÐ ÐÐ Ð ÐÐÐÑÑÑÐÐÐ: ÐÐÐÑÐ ÐÐ ÐÐÑÑÐÑÑÑÐÐ ÐÐÐÑÐ ÐÐ ÐÐÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:749
+#: ../camel/providers/smtp/camel-smtp-transport.c:828
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 "ÐÐÑÐÐÐÐÑÐ ÐÐÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐ Ð ÐÑÐÐÑÑÐÐÑÐ: ÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐÐÐÐÐÐ Ð ÐÐÐÐÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:751
+#: ../camel/providers/smtp/camel-smtp-transport.c:830
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 "ÐÐÑÐÐÐÐÑÐ ÐÐÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐ ÐÐ Ð ÐÐÐÑÑÑÐÐÐ: ÐÐÐÑÐ ÐÐ ÐÐÑÐÐÑÐÐÑÐ ÐÑÑÐÑ ÐÐ Ð "
 "ÑÐÐÑÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:753
+#: ../camel/providers/smtp/camel-smtp-transport.c:832
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "ÐÑÐÐÐÐÑÐ ÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐÑÐ Ð ÐÐÐÑÑÑÐÑÐ Ñ <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:755
+#: ../camel/providers/smtp/camel-smtp-transport.c:834
 msgid "Transaction failed"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÑÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:759
+#: ../camel/providers/smtp/camel-smtp-transport.c:838
 msgid "A password transition is needed"
 msgstr "ÐÐÐÐÑÐÐÐÐÐ Ð ÐÑÐÐÑÐÐ ÐÐ ÐÐÑÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:761
+#: ../camel/providers/smtp/camel-smtp-transport.c:840
 msgid "Authentication mechanism is too weak"
 msgstr "ÐÐÑÐÐÐÐÐÑÑ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ Ð ÑÐÑÑÐÐ ÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:763
+#: ../camel/providers/smtp/camel-smtp-transport.c:842
 msgid "Encryption required for requested authentication mechanism"
 msgstr "ÐÐÐÐÐÐÐÐÑÑ ÐÐÑÐÐÐÐÑÐ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÐÐÑÐÐÐ ÑÐÑÑÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:765
+#: ../camel/providers/smtp/camel-smtp-transport.c:844
 msgid "Temporary authentication failure"
 msgstr "ÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1016
+#: ../camel/providers/smtp/camel-smtp-transport.c:1095
 msgid "SMTP Greeting"
 msgstr "ÐÐÐÐÑÐÐ ÐÐ SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1043
-#: ../camel/providers/smtp/camel-smtp-transport.c:1060
-#: ../camel/providers/smtp/camel-smtp-transport.c:1068
+#: ../camel/providers/smtp/camel-smtp-transport.c:1122
+#: ../camel/providers/smtp/camel-smtp-transport.c:1139
+#: ../camel/providers/smtp/camel-smtp-transport.c:1147
 msgid "HELO command failed: "
 msgstr "ÐÐÐÐÐÐÐÑÐ HELO Ð ÐÐÑÑÐÐÑÐÐ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1137
-msgid "SMTP Authentication"
-msgstr "ÐÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÐ SMTP"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1156
-#: ../camel/providers/smtp/camel-smtp-transport.c:1167
-#: ../camel/providers/smtp/camel-smtp-transport.c:1180
-msgid "AUTH command failed: "
-msgstr "ÐÐÐÐÐÐÐÑÐ AUTH Ð ÐÐÑÑÐÐÑÐÐ: "
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1286
-#: ../camel/providers/smtp/camel-smtp-transport.c:1300
-#: ../camel/providers/smtp/camel-smtp-transport.c:1309
+#: ../camel/providers/smtp/camel-smtp-transport.c:1222
+#: ../camel/providers/smtp/camel-smtp-transport.c:1236
+#: ../camel/providers/smtp/camel-smtp-transport.c:1245
 msgid "MAIL FROM command failed: "
 msgstr "ÐÐÐÐÐÐÐÑÐ MAIL FROM Ð ÐÐÑÑÐÐÑÐÐ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1336
+#: ../camel/providers/smtp/camel-smtp-transport.c:1272
 msgid "RCPT TO command failed: "
 msgstr "ÐÐÐÐÐÐÐÑÐ RCPT TO Ð ÐÐÑÑÐÐÑÐÐ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1352
-#: ../camel/providers/smtp/camel-smtp-transport.c:1361
+#: ../camel/providers/smtp/camel-smtp-transport.c:1288
+#: ../camel/providers/smtp/camel-smtp-transport.c:1297
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "ÐÐÐÐÐÐÐÑÐ RCPT TO <%s> Ð ÐÐÑÑÐÐÑÐÐ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1403
-#: ../camel/providers/smtp/camel-smtp-transport.c:1413
-#: ../camel/providers/smtp/camel-smtp-transport.c:1423
-#: ../camel/providers/smtp/camel-smtp-transport.c:1482
-#: ../camel/providers/smtp/camel-smtp-transport.c:1501
-#: ../camel/providers/smtp/camel-smtp-transport.c:1514
-#: ../camel/providers/smtp/camel-smtp-transport.c:1522
+#: ../camel/providers/smtp/camel-smtp-transport.c:1339
+#: ../camel/providers/smtp/camel-smtp-transport.c:1349
+#: ../camel/providers/smtp/camel-smtp-transport.c:1359
+#: ../camel/providers/smtp/camel-smtp-transport.c:1418
+#: ../camel/providers/smtp/camel-smtp-transport.c:1437
+#: ../camel/providers/smtp/camel-smtp-transport.c:1450
+#: ../camel/providers/smtp/camel-smtp-transport.c:1458
 msgid "DATA command failed: "
 msgstr "ÐÐÐÐÐÐÐÑÐ DATA Ð ÐÐÑÑÐÐÑÐÐ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1547
-#: ../camel/providers/smtp/camel-smtp-transport.c:1561
-#: ../camel/providers/smtp/camel-smtp-transport.c:1569
+#: ../camel/providers/smtp/camel-smtp-transport.c:1483
+#: ../camel/providers/smtp/camel-smtp-transport.c:1497
+#: ../camel/providers/smtp/camel-smtp-transport.c:1505
 msgid "RSET command failed: "
 msgstr "ÐÐÐÐÐÐÐÑÐ RSET Ð ÐÐÑÑÐÐÑÐÐ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1594
-#: ../camel/providers/smtp/camel-smtp-transport.c:1608
-#: ../camel/providers/smtp/camel-smtp-transport.c:1615
+#: ../camel/providers/smtp/camel-smtp-transport.c:1530
+#: ../camel/providers/smtp/camel-smtp-transport.c:1544
+#: ../camel/providers/smtp/camel-smtp-transport.c:1551
 msgid "QUIT command failed: "
 msgstr "ÐÐÐÐÐÐÐÑÐ QUIT Ð ÐÐÑÑÐÐÑÐÐ: "
 
@@ -4723,19 +4860,19 @@ msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "ÐÐÑÐÐÐÐÐÐ"
 
-#: ../libedataserver/e-client.c:120
+#: ../libedataserver/e-client.c:122
 msgid "Source not loaded"
 msgstr "ÐÐÑÐÑÑÑ ÐÐ Ð ÐÐÑÐÐÐÐ"
 
-#: ../libedataserver/e-client.c:122
+#: ../libedataserver/e-client.c:124
 msgid "Source already loaded"
 msgstr "ÐÐÑÐÑÑÑ ÐÐÑÐ Ð ÐÐÑÐÐÐÐ"
 
-#: ../libedataserver/e-client.c:130
+#: ../libedataserver/e-client.c:132
 msgid "Offline unavailable"
 msgstr "ÐÐÐÑÐÐ ÑÐÐÐÑÐ Ð ÑÐÐÐÐ âÐÐÐÐÑÑÐÐâ"
 
-#: ../libedataserver/e-client.c:152
+#: ../libedataserver/e-client.c:154
 msgid "D-Bus error"
 msgstr "ÐÑÐÑÐÐ ÐÐ D-Bus"
 
@@ -4867,8 +5004,116 @@ msgstr "%H%M"
 msgid "%I %p"
 msgstr "%I %p"
 
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
+msgid "Automatic proxy configuration URL"
+msgstr "ÐÐÑÐÐÐÑÐÑÐÐ ÐÐÑÑÑÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐ ÐÐ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2
+msgid "Host name for HTTP requests"
+msgstr "ÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ HTTP"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
+msgid "Host name for HTTPS requests"
+msgstr "ÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ HTTPS"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4
+msgid "Host name for SOCKS requests"
+msgstr "ÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ SOCKS"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5
+msgid "Host name to use for HTTP requests."
+msgstr "ÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ HTTP."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
+msgid "Host name to use for HTTPS requests."
+msgstr "ÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ HTTPS."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7
+msgid "Host name to use for SOCKS requests."
+msgstr "ÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ SOCKS."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8
+msgid "List of hosts for which do not use proxy."
+msgstr "ÐÐÐÑÑÐ ÐÐ ÐÐÑÐÐÐÑÐ, ÐÐ ÐÐÐÑÐ ÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐÐ ÑÑÑÐÑÑ-ÐÐÑÑÐÐÐÐÐ."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9
+msgid "List of hosts to connect to without proxy"
+msgstr "ÐÐÐÑÑÐ ÐÐ ÐÐÑÐÐÐÑÐ, ÐÐ ÐÐÐÑÐ ÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐÐ ÑÑÑÐÑÑ-ÐÐÑÑÐÐÐÐÐ"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10
+msgid "Password to use to authenticate against proxy server."
+msgstr "ÐÐÑÐÐÐ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÑÐÐ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
+msgid "Port number for HTTP requests"
+msgstr "ÐÐÐÐÑ ÐÐ ÐÐÑÑ ÐÐ ÐÐÑÐÐÐ ÐÐ HTTP"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
+msgid "Port number for HTTPS requests"
+msgstr "ÐÐÐÐÑ ÐÐ ÐÐÑÑ ÐÐ ÐÐÑÐÐÐ ÐÐ HTTPS"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
+msgid "Port number for SOCKS requests"
+msgstr "ÐÐÐÐÑ ÐÐ ÐÐÑÑ ÐÐ ÐÐÑÐÐÐ ÐÐ SOCKS"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
+msgid "Port number to use for HTTP requests."
+msgstr "ÐÐÐÐÑ ÐÐ ÐÐÑÑ ÐÐ ÐÐÑÐÐÐ ÐÐ HTTP."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:15
+msgid "Port number to use for HTTPS requests."
+msgstr "ÐÐÐÐÑ ÐÐ ÐÐÑÑ ÐÐ ÐÐÑÐÐÐ ÐÐ HTTPS."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:16
+msgid "Port number to use for SOCKS requests."
+msgstr "ÐÐÐÐÑ ÐÐ ÐÐÑÑ ÐÐ ÐÐÑÐÐÐ ÐÐ SOCKS."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:17
+msgid "Proxy authentication password"
+msgstr "ÐÐÑÐÐÐ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÑÐÐ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:18
+msgid "Proxy authentication user name"
+msgstr "ÐÐÑÑÐÐÐÑÐÐÑÐÐ ÐÐÐ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÑÐÐ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:19
+msgid "Proxy type to use"
+msgstr "ÐÐÐ ÑÑÑÐÑÑ-ÐÐÑÑÐÐÐÐÐ"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:20
+msgid "User name to use to authenticate against proxy server."
+msgstr "ÐÐÑÑÐÐÐÑÐÐÑÐÐ ÐÐÐ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÑÐÐ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:21
+msgid ""
+"What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" "
+"means manual proxy."
+msgstr ""
+"ÐÐÐÑÐ ÐÐÐ ÐÐÑÑÑÐÐÐÐ ÐÐ ÑÑÑÐÑÑ-ÐÐÑÑÐÐÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÑ. â0â ÐÐÐÐÑÐÐÐ "
+"ÑÐÑÑÐÐÐÐÑÐ, â1â â ÐÐÐ ÑÑÑÐÑÑ ÐÐÑÑÐÐÐÐÐ, â2â â ÑÑÑÐÐ ÐÐÑÑÑÐÐÐÐÐÐ."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:22
+msgid "Where to read automatic proxy configuration from."
+msgstr "ÐÑÐÑÐÐ ÐÐ ÑÐ ÐÑÐÑÐÑÐÑ ÐÐÑÐÐÐÑÐÑÐÐÑÐ ÐÐÑÑÑÐÐÐÐ ÐÐ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:23
+msgid "Whether authentication is required to access proxy server."
+msgstr "ÐÐÐÐ ÑÑÑÐÑÑÑÑ-ÐÐÑÑÐÐÐÐÐ ÐÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:24
+msgid "Whether proxy server requires authentication"
+msgstr "ÐÐÐÐ ÑÑÑÐÑÑÑÑ-ÐÐÑÑÐÐÐÐÐ ÐÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:25
+msgid "Whether to use http-proxy"
+msgstr "ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐ ÑÑÑÐÑÑ-ÐÐÑÑÐÐÐÐÐ"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:26
+msgid "Whether to use proxy for HTTP requests."
+msgstr "ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐ ÑÑÑÐÑÑ-ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐÐÑÐ ÐÐ HTTP."
+
 #: ../libedataserverui/e-book-auth-util.c:96
-#: ../libedataserverui/e-book-auth-util.c:662
+#: ../libedataserverui/e-book-auth-util.c:656
 msgid "Accessing LDAP Server anonymously"
 msgstr "ÐÐÐÐÐÐÐÐ ÐÐÑÑÑÐ ÐÐ ÑÑÑÐÑÑ ÐÐ LDAP"
 
@@ -4877,11 +5122,11 @@ msgstr "ÐÐÐÐÐÐÐÐ ÐÐÑÑÑÐ ÐÐ ÑÑÑÐÑÑ ÐÐ LDAP"
 msgid "Failed to authenticate.\n"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ.\n"
 
-#: ../libedataserverui/e-categories-editor.c:221
+#: ../libedataserverui/e-categories-editor.c:224
 msgid "Currently _used categories:"
 msgstr "_ÐÐÐÑÑÐ ÐÐÐÐÐÐÐÐ ÐÐÑÐÐÐÑÐÐ:"
 
-#: ../libedataserverui/e-categories-editor.c:230
+#: ../libedataserverui/e-categories-editor.c:233
 msgid "_Available Categories:"
 msgstr "_ÐÐÐÐÑÐÐ ÐÐÑÐÐÐÑÐÐ:"
 
@@ -4951,7 +5196,7 @@ msgstr ""
 #: ../libedataserverui/e-client-utils.c:864
 #, c-format
 msgid "Enter password for task list %s (user %s)"
-msgstr "ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐ ÐÐ ÑÐÐÑÑÐÐ ÑÑ ÐÐÐÐÑÐ %s (ÐÐÑÑÐÐÐÑÐÐ â%sâ)"
+msgstr "ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐ ÐÐ ÑÐÐÑÑÐÐ ÑÑÑ ÐÐÐÐÑÐ %s (ÐÐÑÑÐÐÐÑÐÐ â%sâ)"
 
 #: ../libedataserverui/e-client-utils.c:868
 #, c-format
@@ -4967,20 +5212,6 @@ msgstr ""
 msgid "Enter password for memo list %s (user %s)"
 msgstr "ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐ ÐÐ ÑÐÐÑÑÐÐ Ñ ÐÐÐÐÐÐÐ %s (ÐÐÑÑÐÐÐÑÐÐ â%sâ)"
 
-#: ../libedataserverui/e-client-utils.c:875
-#, c-format
-msgid ""
-"Enter password for address book %s (user %s)\n"
-"Reason: %s"
-msgstr ""
-"ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐÐ %s (ÐÐÑÑÐÐÐÑÐÐ â%sâ)\n"
-"ÐÑÐÑÐÐÐ: %s"
-
-#: ../libedataserverui/e-client-utils.c:877
-#, c-format
-msgid "Enter password for address book %s (user %s)"
-msgstr "ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐÐ %s (ÐÐÑÑÐÐÐÑÐÐ â%sâ)"
-
 #: ../libedataserverui/e-client-utils.c:981
 msgid "Enter Passphrase"
 msgstr "ÐÑÐÐÐÐÑÐ ÑÐÐÐÐ ÑÑÐÐÐ"
@@ -5044,25 +5275,25 @@ msgid "Error loading address book: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐÐ: %s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2816
+#: ../libedataserverui/e-name-selector-entry.c:2819
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "_ÐÑÑÑÐÑÐÐ ÑÐÐÑÐÑÑÐÐÐÐ ÐÐ %s"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2831
+#: ../libedataserverui/e-name-selector-entry.c:2834
 #, c-format
 msgid "Cop_y %s"
 msgstr "_ÐÐÐÐÑÐÐÐ ÐÐ %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2841
+#: ../libedataserverui/e-name-selector-entry.c:2844
 #, c-format
 msgid "C_ut %s"
 msgstr "ÐÑ_ÑÑÐÐÐÐÐ ÐÐ %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2858
+#: ../libedataserverui/e-name-selector-entry.c:2861
 #, c-format
 msgid "_Edit %s"
 msgstr "_ÐÐÐÐÐÑÐÑÐÐÐ ÐÐ %s"
@@ -5111,3 +5342,13 @@ msgstr "ÐÐÐÐÑ ÐÐ ÑÐÐ"
 #: ../libedataserverui/e-source-selector-dialog.c:174
 msgid "_Destination"
 msgstr "_ÐÐÐ"
+
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:47
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:51
+msgid "Keep running after the last client is closed"
+msgstr "ÐÑÐÐÑÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐÑÐÑÐ ÐÐÑÐ, ÐÐÐÐÑÐ ÐÑÐÐ ÑÐÑÑÐÐÐÐ ÐÐÐÐÐÑÐ"
+
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:49
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:53
+msgid "Wait running until at least one client is connected"
+msgstr "ÐÐÑÐÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÐÐ ÐÐÐÐÐÑ"



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