[evolution-data-server] Updated Bulgarian translation



commit 88714c8dfcbe32b4e55ba0ca50154ba69e3f498c
Author: Alexander Shopov <ash kambanaria org>
Date:   Fri Jun 29 08:17:24 2012 +0300

    Updated Bulgarian translation

 po/bg.po | 3051 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 1594 insertions(+), 1457 deletions(-)
---
diff --git a/po/bg.po b/po/bg.po
index 30be72c..acb37f6 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -13,140 +13,137 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server master\n"
 "Report-Msgid-Bugs-To: \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"
+"POT-Creation-Date: 2012-07-03 16:35+0300\n"
+"PO-Revision-Date: 2012-07-03 16:35+0300\n"
+"Last-Translator: Alexander Shopov <ash kambanaria org>\n"
 "Language-Team: Bulgarian <dict fsa-bg org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-
-#: ../addressbook/backends/file/e-book-backend-file.c: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
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:116
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:278
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:939
+#: ../addressbook/libebook/e-book-client.c:106
+#: ../addressbook/libedata-book/e-data-book.c:432
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:566
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:596
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:615
+#: ../calendar/libecal/e-cal.c:4032 ../calendar/libecal/e-cal-client.c:148
+#: ../camel/camel-imapx-command.c:594
+#: ../camel/providers/imap/camel-imap-command.c:521
 #: ../camel/providers/imap/camel-imap-store.c:464
-#: ../camel/providers/imapx/camel-imapx-command.c:538
-#: ../libedataserver/e-client.c:161
+#: ../libedataserver/e-client.c:165
 msgid "Unknown error"
 msgstr "ÐÐÐÐÐÐÑÑÐÐ ÐÑÐÑÐÐ"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:150
+#: ../addressbook/backends/file/e-book-backend-file.c:141
 #, c-format
 msgid "Failed to remove file '%s': %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÑÐÐÐÐ â%sâ: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:173
+#: ../addressbook/backends/file/e-book-backend-file.c:164
 #, c-format
 msgid "Failed to make directory %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ %s: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:468
+#: ../addressbook/backends/file/e-book-backend-file.c:459
 #, 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
+#: ../addressbook/backends/file/e-book-backend-file.c:561
+#: ../addressbook/backends/file/e-book-backend-file.c:1127
 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
+#: ../addressbook/backends/file/e-book-backend-file.c:1569
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:508
 msgid "Loading..."
 msgstr "ÐÐÑÐÐÐÐÐÐâ"
 
-#: ../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
+#: ../addressbook/backends/file/e-book-backend-file.c:1572
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4886
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:510
 msgid "Searching..."
 msgstr "ÐÑÑÑÐÐÐâ"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:2104
+#: ../addressbook/backends/file/e-book-backend-file.c:2115
 #, 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:831
+#: ../addressbook/backends/google/e-book-backend-google.c:709
 msgid "Querying for updated contactsâ"
 msgstr "ÐÑÐÐÐÑÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐâ"
 
-#: ../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:882
-msgid "Friends"
-msgstr "ÐÑÐÑÑÐÐÐ"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:884
-msgid "Family"
-msgstr "ÐÐÐÐÐÑÑÐÐ"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:886
-msgid "Coworkers"
-msgstr "ÐÐÐÐÐÐ"
-
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:970
+#: ../addressbook/backends/google/e-book-backend-google.c:843
 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
+#: ../addressbook/backends/google/e-book-backend-google.c:1275
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1655
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:287
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:326
 msgid "The backend does not support bulk additions"
 msgstr "ÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÑÐÐ ÐÐÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐÑÑÐÐ ÑÐÑÑÑÑÐ"
 
 #. Insert the entry on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1389
+#: ../addressbook/backends/google/e-book-backend-google.c:1307
 msgid "Creating new contactâ"
 msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÐÐÐÑÐÐÑâ"
 
-#: ../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
+#: ../addressbook/backends/google/e-book-backend-google.c:1396
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:319
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:433
 msgid "The backend does not support bulk removals"
 msgstr "ÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÑÐÐ ÐÐÐÐÐÑÐÐÐÐÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑÑÐÐ ÑÐÑÑÑÑÐ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1504
+#: ../addressbook/backends/google/e-book-backend-google.c:1424
 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
+#: ../addressbook/backends/google/e-book-backend-google.c:1674
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2312
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:367
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:487
 msgid "The backend does not support bulk modifications"
 msgstr "ÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÑÐÐ ÐÐÐÐÐÑÐÐÐÐÐÐ ÐÑÐÐÑÐÐ ÐÐ ÐÐÐÐÐÑÑÐÐ ÑÐÑÑÑÑÐ"
 
 #. Update the contact on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1782
+#: ../addressbook/backends/google/e-book-backend-google.c:1712
 msgid "Modifying contactâ"
 msgstr "ÐÑÐÐÑÐÐ ÐÐ ÐÐÐÑÐÐÑâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1983
+#: ../addressbook/backends/google/e-book-backend-google.c:1895
 msgid "Loadingâ"
 msgstr "ÐÐÑÐÐÐÐÐÐâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2108
-msgid "Authenticating with the serverâ"
-msgstr "ÐÐÐÐÑÐÑÐÑÐÑÐÐÐ ÐÑÐÐ ÑÑÑÐÑÑÐâ"
+#: ../addressbook/backends/google/e-book-google-utils.c:1557
+msgid "Personal"
+msgstr "ÐÐÑÐÐ"
+
+#. System Group: My Contacts
+#: ../addressbook/backends/google/e-book-google-utils.c:1558
+msgid "Friends"
+msgstr "ÐÑÐÑÑÐÐÐ"
+
+#. System Group: Friends
+#: ../addressbook/backends/google/e-book-google-utils.c:1559
+msgid "Family"
+msgstr "ÐÐÐÐÐÑÑÐÐ"
+
+#. System Group: Family
+#: ../addressbook/backends/google/e-book-google-utils.c:1560
+msgid "Coworkers"
+msgstr "ÐÐÐÐÐÐ"
 
 #. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:165
 msgid "Not connected"
 msgstr "ÐÑÐÐ ÐÑÑÐÐÐ"
 
@@ -158,917 +155,929 @@ msgstr "ÐÑÐÐ ÐÑÐÐÑÐÑÐÐÐÐ ÐÐÐ (DN)"
 msgid "Using Email Address"
 msgstr "ÐÑÐÐ Ð-ÐÐÑÐ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1067
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1090
 msgid "Reconnecting to LDAP server..."
 msgstr "ÐÐÐÑÐÑÐÐ ÑÐÑÑÐÐÐÐÐ ÑÑÑ ÑÑÑÐÑÑÐ ÐÐ LDAPâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1196
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1216
 msgid "Invalid DN syntax"
-msgstr "ÐÑÐÑÐÐ ÑÐÐÑÐÐÑÐÑ ÐÐ DN"
+msgstr "ÐÑÐÑÐÐ ÑÐÐÑÐÐÑÐÑ ÐÐ ÐÑÐÐÑÐÑÐÐÐÐ ÐÐÐ (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1734
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1754
 msgid "Adding contact to LDAP server..."
 msgstr "ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÐÑÐÐÑ ÐÐ ÑÑÑÐÑÑÐ ÐÐ LDAPâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1865
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1885
 msgid "Removing contact from LDAP server..."
 msgstr "ÐÑÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÑÐÐÑ ÐÑ ÑÑÑÐÑÑÐ ÐÐ LDAPâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2314
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2334
 msgid "Modifying contact from LDAP server..."
 msgstr "ÐÑÐÐÑÐÐ ÐÐ ÐÐÐÑÐÐÑ Ð ÑÑÑÐÑÑÐ ÐÐ LDAPâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4716
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4736
 msgid "Receiving LDAP search results..."
 msgstr "ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÑÐÐÑÐÑÐÑÐÑÐ ÐÑ ÑÑÑÑÐÐÐÑÐ Ð LDAPâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4887
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4907
 msgid "Error performing search"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÐÐÐÐÐÐÑÐ ÐÐ ÑÑÑÑÐÐÐÑÐ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5008
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5028
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "ÐÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÑÐÐÑÐ (%d)â"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:352
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5567
 #, c-format
-msgid "Create resource '%s' failed with HTTP status: %d (%s)"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÑÐÑÑÑÑ â%sâ Ñ ÐÐÐ ÐÑ HTTP: %d (%s)"
+msgid "Failed to get the DN for user '%s'"
+msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÑÐÐÑÐÑÐÐÐÐ ÐÐÐ (DN) ÐÐ ÐÐÑÑÐÐÐÑÐÐÑ â%sâ"
 
-#: ../addressbook/libebook/e-book.c:3196
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:354
 #, c-format
-msgid "%s: there was no source for UID '%s' stored in GConf."
-msgstr "%s: ÐÐ ÑÑÑÐÑÑÐÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ â%sâ Ð GConf."
-
-#: ../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:3638
-#: ../addressbook/libebook/e-book-client.c:699
-#: ../addressbook/libedata-book/e-data-book.c:322
-msgid "Address book does not exist"
-msgstr "ÐÐÑÐÑÐÐÐÑÑ ÐÐ ÑÑÑÐÑÑÐÑÐÐ"
+msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÑÐÑÑÑÑ â%sâ Ñ ÐÐÐ ÐÑ HTTP: %d (%s)"
 
-#: ../addressbook/libebook/e-book-client.c:92
+#: ../addressbook/libebook/e-book-client.c:95
 msgid "No such book"
 msgstr "ÐÑÐÐ ÑÐÐÑÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../addressbook/libebook/e-book-client.c:94
-#: ../addressbook/libedata-book/e-data-book.c:315
+#: ../addressbook/libebook/e-book-client.c:97
+#: ../addressbook/libedata-book/e-data-book.c:306
 msgid "Contact not found"
 msgstr "ÐÐÐÑÐÐÑÑÑ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-book-client.c:96
-#: ../addressbook/libedata-book/e-data-book.c:316
+#: ../addressbook/libebook/e-book-client.c:99
+#: ../addressbook/libedata-book/e-data-book.c:307
 msgid "Contact ID already exists"
 msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑÑÑ ÐÐ ÐÐÐÑÐÐÑÐ ÐÐÑÐ ÑÑÑÐÑÑÐÑÐÐ"
 
-#: ../addressbook/libebook/e-book-client.c:98
+#: ../addressbook/libebook/e-book-client.c:101
 msgid "No such source"
 msgstr "ÐÑÐÐ ÑÐÐÑÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../addressbook/libebook/e-book-client.c:100
-#: ../addressbook/libedata-book/e-data-book.c:332
+#: ../addressbook/libebook/e-book-client.c:103
+#: ../addressbook/libedata-book/e-data-book.c:323
 msgid "No space"
 msgstr "ÐÑÑÑÐÑÐ ÑÐÑÑÑÐ"
 
-#: ../addressbook/libebook/e-book-client.c:512
+#: ../addressbook/libebook/e-book-client.c:488
 msgid "Failed to run book factory"
 msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÑÑÐÑÑÐÑÐÐÐ"
 
-#: ../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:213
-#: ../calendar/libedata-cal/e-data-cal-factory.c:242
-#, c-format
-msgid "Invalid source"
-msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ"
-
-#: ../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:662
-msgid "Failed to find system book"
-msgstr "ÐÐÑÑÐÐÐÐÑÑ ÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÑÐÑÐÑ"
-
-#: ../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:2563
-#: ../calendar/libecal/e-cal-client.c:4480
+#: ../addressbook/libebook/e-book-client.c:2282
+#: ../calendar/libecal/e-cal-client.c:4640
 msgid "Cannot get connection to view"
 msgstr "ÐÑÐÐ ÐÑÑÐÐÐ ÐÑÐ ÐÐÐÐÐÐ"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:117
+#: ../addressbook/libebook/e-contact.c:121
 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:120
+#. * so we can generate its value if necessary in the getter
+#. Translators: This is an EContact field description, in this case it's a
+#. * preferred user's description (or display name) of the contact. Note 'File' is a verb here.
+#: ../addressbook/libebook/e-contact.c:126
 msgid "File Under"
 msgstr "ÐÐÐÐÑÐÐÐÐ Ð"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:122
-msgid "Book URI"
-msgstr "ÐÐÑÐÑ ÐÐ ÐÐÐÐÐÑÐ"
+#: ../addressbook/libebook/e-contact.c:128
+msgid "Book UID"
+msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÐ ÐÐÑÐÑÐÐÐÐ"
 
 #. Name fields
 #. FN isn't really a structured field - we use a getter/setter
 #. * so we can set the N property (since evo 1.4 works fine with
 #. * vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Full Name"
 msgstr "ÐÑÐÐÐ ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Given Name"
 msgstr "ÐÐÐÑÑÐÐÐÐ ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:136
 msgid "Family Name"
 msgstr "ÐÐÐÐÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:137
 msgid "Nickname"
 msgstr "ÐÑÑÐÐÑ"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:134
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Email 1"
 msgstr "Ð-ÐÐÑÐ 1"
 
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook/e-contact.c:141
 msgid "Email 2"
 msgstr "Ð-ÐÐÑÐ 2"
 
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:142
 msgid "Email 3"
 msgstr "Ð-ÐÐÑÐ 3"
 
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Email 4"
 msgstr "Ð-ÐÐÑÐ 4"
 
-#: ../addressbook/libebook/e-contact.c:139
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Mailer"
 msgstr "ÐÐÑÐÐÑÐÐ ÐÑÐÐÑÐÐÐ"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Home Address Label"
 msgstr "ÐÑÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐÑ ÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Work Address Label"
 msgstr "ÐÑÐÐÐÑ ÐÐ ÑÐÐÐÑÐÐÑ ÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Other Address Label"
 msgstr "ÐÑÐÐÐÑ ÐÐ ÐÑÑÐ ÐÐÑÐÑ"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Assistant Phone"
 msgstr "ÐÐÐÐÑÐÐ ÐÐ ÐÑÐÑÑÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Business Phone"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Business Phone 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÐÐ 2"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Business Fax"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Callback Phone"
 msgstr "ÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÑÐÐ ÐÑÑÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Car Phone"
 msgstr "ÐÐÐÐÑÐÐ Ð ÐÐÑÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Company Phone"
 msgstr "ÐÐÐÐÑÐÐ ÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Home Phone"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:161
 msgid "Home Phone 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÐÐ 2"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:162
 msgid "Home Fax"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:163
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:164
 msgid "Mobile Phone"
 msgstr "ÐÐÐÐÐÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Other Phone"
 msgstr "ÐÑÑÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Other Fax"
 msgstr "ÐÑÑÐ ÑÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:161
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Pager"
 msgstr "ÐÐÐÐÐÑÑ"
 
-#: ../addressbook/libebook/e-contact.c:162
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Primary Phone"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Radio"
 msgstr "ÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Telex"
 msgstr "ÐÐÐÐÐÑ"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:172
 msgid "TTY"
 msgstr "ÐÐÐÐÑÐÐ"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Organization"
 msgstr "ÐÑÐÐÐÐÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook/e-contact.c:176
 msgid "Organizational Unit"
 msgstr "ÐÑÐÐÐÐÐÐÑÐÐÐÐÐ ÐÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:171
+#: ../addressbook/libebook/e-contact.c:177
 msgid "Office"
 msgstr "ÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Title"
 msgstr "ÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:179
 msgid "Role"
 msgstr "ÐÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:174
+#: ../addressbook/libebook/e-contact.c:180
 msgid "Manager"
 msgstr "ÐÑÐÐÐÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:175
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Assistant"
 msgstr "ÐÑÐÑÑÐÐÑ"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:178
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Homepage URL"
 msgstr "ÐÐÑÐÑ ÐÐ ÐÐÐÐÑÐÐÑÐ ÑÑÑÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Weblog URL"
 msgstr "ÐÐÑÐÑ ÐÐ ÐÐÐÐ"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:182
-#: ../libedataserverui/e-categories-dialog.c:85
+#: ../addressbook/libebook/e-contact.c:188
+#: ../libedataserverui/e-categories-dialog.c:90
 msgid "Categories"
 msgstr "ÐÐÑÐÐÐÑÐÐ"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:191
 msgid "Calendar URI"
 msgstr "ÐÐÑÐÑ ÐÐ ÐÐÐÐÐÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:192
 msgid "Free/Busy URL"
 msgstr "ÐÐÑÐÑ ÐÐ ÑÑÑÑÐÑÐÐÐ ÑÐÐÐÐÐÐÐ/ÐÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:187
+#: ../addressbook/libebook/e-contact.c:193
 msgid "ICS Calendar"
 msgstr "ÐÐÐÐÐÐÐÑ ICS"
 
-#: ../addressbook/libebook/e-contact.c:188
+#: ../addressbook/libebook/e-contact.c:194
 msgid "Video Conferencing URL"
 msgstr "ÐÐÑÐÑ ÐÐ ÐÐÐÐÐÐÐÐÑÐÑÐÐÑÐÐ ÐÑÑÐÐÐ"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:197
 msgid "Spouse's Name"
 msgstr "ÐÐÐ ÐÐ ÑÑÐÑÑÐ(Ð)"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:198
 msgid "Note"
 msgstr "ÐÐÐÐÐÐÐ"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:201
 msgid "AIM Home Screen Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ AIM 1"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:202
 msgid "AIM Home Screen Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ AIM 2"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:203
 msgid "AIM Home Screen Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ AIM 3"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:204
 msgid "AIM Work Screen Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ AIM 1"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:205
 msgid "AIM Work Screen Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ AIM 2"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:206
 msgid "AIM Work Screen Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ AIM 3"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:207
 msgid "GroupWise Home Screen Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ GroupWise 1"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:208
 msgid "GroupWise Home Screen Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ GroupWise 2"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:209
 msgid "GroupWise Home Screen Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ GroupWise 3"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:210
 msgid "GroupWise Work Screen Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ GroupWise 1"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:211
 msgid "GroupWise Work Screen Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ GroupWise 2"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:212
 msgid "GroupWise Work Screen Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ GroupWise 3"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Jabber Home ID 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Jabber 1"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Jabber Home ID 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Jabber 2"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:215
 msgid "Jabber Home ID 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Jabber 3"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:216
 msgid "Jabber Work ID 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Jabber 1"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Jabber Work ID 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Jabber 2"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:218
 msgid "Jabber Work ID 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Jabber 3"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:219
 msgid "Yahoo! Home Screen Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Yahoo! 1"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:220
 msgid "Yahoo! Home Screen Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Yahoo! 2"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:221
 msgid "Yahoo! Home Screen Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Yahoo! 3"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:222
 msgid "Yahoo! Work Screen Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Yahoo! 1"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:223
 msgid "Yahoo! Work Screen Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Yahoo! 2"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:224
 msgid "Yahoo! Work Screen Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Yahoo! 3"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:225
 msgid "MSN Home Screen Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ MSN 1"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:226
 msgid "MSN Home Screen Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ MSN 2"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:227
 msgid "MSN Home Screen Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ MSN 3"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:228
 msgid "MSN Work Screen Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ MSN 1"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:229
 msgid "MSN Work Screen Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ MSN 2"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:230
 msgid "MSN Work Screen Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ MSN 3"
 
-#: ../addressbook/libebook/e-contact.c:225
+#: ../addressbook/libebook/e-contact.c:231
 msgid "ICQ Home ID 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ ICQ 1"
 
-#: ../addressbook/libebook/e-contact.c:226
+#: ../addressbook/libebook/e-contact.c:232
 msgid "ICQ Home ID 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ ICQ 2"
 
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:233
 msgid "ICQ Home ID 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ ICQ 3"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:234
 msgid "ICQ Work ID 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ ICQ 1"
 
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook/e-contact.c:235
 msgid "ICQ Work ID 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ ICQ 2"
 
-#: ../addressbook/libebook/e-contact.c:230
+#: ../addressbook/libebook/e-contact.c:236
 msgid "ICQ Work ID 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ ICQ 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Last Revision"
 msgstr "ÐÐÑÐÐÐÐÐ ÑÐÐÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:234
+#. Translators: This is an EContact field description, in this case it's a
+#. * virtual field, which returns either name of the contact or the organization
+#. * name, recognized by multiple other fields, where the first filled is used.
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Name or Org"
 msgstr "ÐÐÐ ÐÐÐ ÐÑÐ."
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Address List"
 msgstr "ÐÐÐÑÑÐ Ñ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:238
+#: ../addressbook/libebook/e-contact.c:247
 msgid "Home Address"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:239
+#: ../addressbook/libebook/e-contact.c:248
 msgid "Work Address"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook/e-contact.c:249
 msgid "Other Address"
 msgstr "ÐÑÑÐ ÐÐÑÐÑ"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:252
 msgid "Category List"
 msgstr "ÐÐÐÑÑÐ Ñ ÐÐÑÐÐÐÑÐÐ"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:246
+#: ../addressbook/libebook/e-contact.c:255
 msgid "Photo"
 msgstr "ÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Logo"
 msgstr "ÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:249
+#. Translators: This is an EContact field description, in this case it's a name
+#. * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2
+#: ../addressbook/libebook/e-contact.c:260
 msgid "Name"
 msgstr "ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:261
 msgid "Email List"
 msgstr "ÐÐÐÑÑÐ Ñ ÐÐÑÐÑÐ ÐÐ Ð-ÐÐÑÐ"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:253
+#: ../addressbook/libebook/e-contact.c:264
 msgid "AIM Screen Name List"
 msgstr "ÐÐÐÑÑÐ ÐÐ ÑÐÐÐÑÑÑÐÑÐÐÑÐ ÐÑÐ AIM"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:265
 msgid "GroupWise ID List"
 msgstr "ÐÐÐÑÑÐ ÐÐ ÑÐÐÐÑÑÑÐÑÐÐÑÐ ÐÑÐ GroupWise"
 
-#: ../addressbook/libebook/e-contact.c:255
+#: ../addressbook/libebook/e-contact.c:266
 msgid "Jabber ID List"
 msgstr "ÐÐÐÑÑÐ ÐÐ ÑÐÐÐÑÑÑÐÑÐÐÑÐ ÐÑÐ Jabber"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:267
 msgid "Yahoo! Screen Name List"
 msgstr "ÐÐÐÑÑÐ ÐÐ ÑÐÐÐÑÑÑÐÑÐÐÑÐ ÐÑÐ Yahoo!"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:268
 msgid "MSN Screen Name List"
 msgstr "ÐÐÐÑÑÐ ÐÐ ÑÐÐÐÑÑÑÐÑÐÐÑÐ ÐÑÐ MSN"
 
-#: ../addressbook/libebook/e-contact.c:258
+#: ../addressbook/libebook/e-contact.c:269
 msgid "ICQ ID List"
 msgstr "ÐÐÐÑÑÐ ÐÐ ÑÐÐÐÑÑÑÐÑÐÐÑÐ ÐÑÐ ICQ"
 
-#: ../addressbook/libebook/e-contact.c:260
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Wants HTML Mail"
 msgstr "ÐÐÐÐÐ ÐÐÑÐ ÐÑÐ ÑÐÑÐÐÑ HTML"
 
-#: ../addressbook/libebook/e-contact.c:262
+#. Translators: This is an EContact field description, in this case it's a
+#. * field describing whether it's a Contact list (list of email addresses) or a
+#. * regular contact for one person/organization/...
+#: ../addressbook/libebook/e-contact.c:276
 msgid "List"
 msgstr "ÐÐÐÑÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:263
-msgid "List Show Addresses"
-msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÐ ÑÐÐÑÑÐ"
+#. Translators: This is an EContact field description, in this case it's a flag
+#. * used to determine whether when sending to Contact lists the addresses should be
+#. * shown or not to other recipients - basically whether to use BCC field or CC
+#. * message header when sending messages to this Contact list.
+#: ../addressbook/libebook/e-contact.c:281
+msgid "List Shows Addresses"
+msgstr "ÐÐÐÐÐÐÐÐÐ/ÑÐÑÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐ ÐÐÑÐ ÐÐÐÑÑÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:265
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Birth Date"
 msgstr "ÐÐÑÐ ÐÐ ÑÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:266
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1057
+#: ../addressbook/libebook/e-contact.c:284
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:919
 msgid "Anniversary"
 msgstr "ÐÐÐÐÑÐÐÐÐ"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:269
+#: ../addressbook/libebook/e-contact.c:287
 msgid "X.509 Certificate"
 msgstr "ÐÐÑÑÐÑÐÐÐÑ X.509"
 
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook/e-contact.c:289
 msgid "Gadu-Gadu Home ID 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Gadu-Gadu 1"
 
-#: ../addressbook/libebook/e-contact.c:272
+#: ../addressbook/libebook/e-contact.c:290
 msgid "Gadu-Gadu Home ID 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Gadu-Gadu 2"
 
-#: ../addressbook/libebook/e-contact.c:273
+#: ../addressbook/libebook/e-contact.c:291
 msgid "Gadu-Gadu Home ID 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Gadu-Gadu 3"
 
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:292
 msgid "Gadu-Gadu Work ID 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Gadu-Gadu 1"
 
-#: ../addressbook/libebook/e-contact.c:275
+#: ../addressbook/libebook/e-contact.c:293
 msgid "Gadu-Gadu Work ID 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Gadu-Gadu 2"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:294
 msgid "Gadu-Gadu Work ID 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Gadu-Gadu 3"
 
-#: ../addressbook/libebook/e-contact.c:277
+#: ../addressbook/libebook/e-contact.c:295
 msgid "Gadu-Gadu ID List"
 msgstr "ÐÐÐÑÑÐ Ñ ÑÐÐÐÑÑÑÐÑÐÐ ÐÑÐ Gadu-Gadu"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:298
 msgid "Geographic Information"
 msgstr "ÐÐÐÐÑÐÑÑÐÐ ÐÐÑÐÑÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:300
 msgid "Telephone"
 msgstr "ÐÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:302
 msgid "Skype Home Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Skype 1"
 
-#: ../addressbook/libebook/e-contact.c:285
+#: ../addressbook/libebook/e-contact.c:303
 msgid "Skype Home Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Skype 2"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:304
 msgid "Skype Home Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Skype 3"
 
-#: ../addressbook/libebook/e-contact.c:287
+#: ../addressbook/libebook/e-contact.c:305
 msgid "Skype Work Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Skype 1"
 
-#: ../addressbook/libebook/e-contact.c:288
+#: ../addressbook/libebook/e-contact.c:306
 msgid "Skype Work Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Skype 2"
 
-#: ../addressbook/libebook/e-contact.c:289
+#: ../addressbook/libebook/e-contact.c:307
 msgid "Skype Work Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Skype 3"
 
-#: ../addressbook/libebook/e-contact.c:290
+#: ../addressbook/libebook/e-contact.c:308
 msgid "Skype Name List"
 msgstr "ÐÐÐÑÑÐ ÐÐ ÑÐÐÐÑÑÑÐÑÐÐÑÐ ÐÑÐ Skype"
 
-#: ../addressbook/libebook/e-contact.c:292
+#: ../addressbook/libebook/e-contact.c:310
 msgid "SIP address"
 msgstr "ÐÐÑÐÑ ÐÐ SIP"
 
-#: ../addressbook/libebook/e-contact.c:294
+#: ../addressbook/libebook/e-contact.c:312
 msgid "Google Talk Home Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Google Talk 1"
 
-#: ../addressbook/libebook/e-contact.c:295
+#: ../addressbook/libebook/e-contact.c:313
 msgid "Google Talk Home Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Google Talk 2"
 
-#: ../addressbook/libebook/e-contact.c:296
+#: ../addressbook/libebook/e-contact.c:314
 msgid "Google Talk Home Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Google Talk 3"
 
-#: ../addressbook/libebook/e-contact.c:297
+#: ../addressbook/libebook/e-contact.c:315
 msgid "Google Talk Work Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Google Talk 1"
 
-#: ../addressbook/libebook/e-contact.c:298
+#: ../addressbook/libebook/e-contact.c:316
 msgid "Google Talk Work Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Google Talk 2"
 
-#: ../addressbook/libebook/e-contact.c:299
+#: ../addressbook/libebook/e-contact.c:317
 msgid "Google Talk Work Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Google Talk 3"
 
-#: ../addressbook/libebook/e-contact.c:300
+#: ../addressbook/libebook/e-contact.c:318
 msgid "Google Talk Name List"
 msgstr "ÐÐÐÑÑÐ ÐÐ ÑÐÐÐÑÑÑÐÑÐÐÑÐ ÐÑÐ Google Talk"
 
-#: ../addressbook/libebook/e-contact.c:1601
-#: ../addressbook/libebook/e-destination.c:884
+#: ../addressbook/libebook/e-contact.c:320
+msgid "Twitter Name List"
+msgstr "ÐÐÐÑÑÐ ÐÐ ÑÐÐÐÑÑÑÐÑÐÐÑÐ ÐÑÐ Twitter"
+
+#: ../addressbook/libebook/e-contact.c:1623
+#: ../addressbook/libebook/e-destination.c:879
 msgid "Unnamed List"
 msgstr "ÐÐÐÑÑÐ ÐÐÐ ÐÐÐ"
 
-#: ../addressbook/libedata-book/e-book-backend.c:19
+#: ../addressbook/libedata-book/e-book-backend.c:17
 msgid "Cannot process, book backend is opening"
 msgstr ""
 "ÐÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÑÐÐÐÑÐ, ÑÐÑÐÑÐ ÐÐ ÐÐÑÐÑÐÐÐÐ ÑÐÐÑÑÐÐ ÑÐ ÐÐÐÐÐÑÑÐÐ"
 
-#: ../addressbook/libedata-book/e-book-backend.c:87
+#: ../addressbook/libedata-book/e-book-backend.c:90
 #, c-format
 msgid "Unknown book property '%s'"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÑÐÐÐÑÑÐÐ ÐÐ ÐÐÑÐÑÐÐÐ: %s"
 
-#: ../addressbook/libedata-book/e-book-backend.c:104
+#: ../addressbook/libedata-book/e-book-backend.c:107
 #, c-format
 msgid "Cannot change value of book property '%s'"
 msgstr "ÐÐÐÐÑÑÐÐÑÐ â%sâ ÐÐ ÐÐÑÐÑÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÑÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:503
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:500
 #: ../camel/camel-db.c:503
 #, c-format
 msgid "Insufficient memory"
 msgstr "ÐÐÐÐÑÑÐÑÑÑÐÐ ÐÐÐÐÑ"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1095
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1092
 #, 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:206
-#: ../addressbook/libedata-book/e-data-book.c:219
-#: ../addressbook/libedata-book/e-data-book.c:733
+#: ../addressbook/libedata-book/e-data-book.c:201
+#: ../addressbook/libedata-book/e-data-book.c:214
+#: ../addressbook/libedata-book/e-data-book.c:724
 msgid "Invalid query: "
 msgstr "ÐÑÐÑÐÐ ÐÐÑÐÐÐ: "
 
-#: ../addressbook/libedata-book/e-data-book.c:311
-#: ../calendar/libedata-cal/e-data-cal.c:427
+#: ../addressbook/libedata-book/e-data-book.c:302
+#: ../calendar/libedata-cal/e-data-cal.c:415
 msgid "Success"
 msgstr "ÐÑÐÐÑ"
 
-#: ../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
+#: ../addressbook/libedata-book/e-data-book.c:303
+#: ../calendar/libecal/e-cal.c:4000 ../calendar/libedata-cal/e-data-cal.c:416
+#: ../libedataserver/e-client.c:122
 msgid "Backend is busy"
 msgstr "ÐÐÑÐÑÐ ÐÐ ÐÐÑÐÐÐÑÐÐ Ð ÐÐÐÑÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:313
-#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:130
+#: ../addressbook/libedata-book/e-data-book.c:304
+#: ../calendar/libedata-cal/e-data-cal.c:417 ../libedataserver/e-client.c:132
 msgid "Repository offline"
 msgstr "ÐÑÐÐÐÐÐÑÐÑÐ ÐÐ Ð ÐÐ ÐÐÐÐÑ"
 
-#: ../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
+#: ../addressbook/libedata-book/e-data-book.c:305
+#: ../calendar/libecal/e-cal.c:4014 ../calendar/libedata-cal/e-data-cal.c:418
+#: ../libedataserver/e-client.c:138
 msgid "Permission denied"
 msgstr "ÐÐÑÑÑÐÑÑ Ð ÐÑÐÐÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:317
-#: ../calendar/libedata-cal/e-data-cal.c:435
+#: ../addressbook/libedata-book/e-data-book.c:308
+#: ../calendar/libedata-cal/e-data-cal.c:423
 msgid "Authentication Failed"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:318
-#: ../calendar/libedata-cal/e-data-cal.c:436
+#: ../addressbook/libedata-book/e-data-book.c:309
+#: ../calendar/libedata-cal/e-data-cal.c:424
 msgid "Authentication Required"
 msgstr "ÐÐÐÑÐÐÐ ÑÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:319
-#: ../calendar/libedata-cal/e-data-cal.c:437
+#: ../addressbook/libedata-book/e-data-book.c:310
+#: ../calendar/libedata-cal/e-data-cal.c:425
 msgid "Unsupported field"
 msgstr "ÐÐÐÐÐÐÑÑÐÐÐÐ ÐÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:320
-#: ../calendar/libedata-cal/e-data-cal.c:439 ../libedataserver/e-client.c:142
+#: ../addressbook/libedata-book/e-data-book.c:311
+#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:146
 msgid "Unsupported authentication method"
 msgstr "ÐÐÐÐÐÐÑÑÐÐÐ ÐÐÑÐÐ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:321
-#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:144
+#: ../addressbook/libedata-book/e-data-book.c:312
+#: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:148
 msgid "TLS not available"
 msgstr "ÐÐÐÑÐÐ TLS"
 
-#: ../addressbook/libedata-book/e-data-book.c:323
+#: ../addressbook/libedata-book/e-data-book.c:313
+msgid "Address book does not exist"
+msgstr "ÐÐÑÐÑÐÐÐÑÑ ÐÐ ÑÑÑÐÑÑÐÑÐÐ"
+
+#: ../addressbook/libedata-book/e-data-book.c:314
 msgid "Book removed"
 msgstr "ÐÐÑÐÑÐÐÐÑÑ Ð ÐÐÑÑÐÑ"
 
-#: ../addressbook/libedata-book/e-data-book.c:324
-#: ../calendar/libedata-cal/e-data-cal.c:443
+#: ../addressbook/libedata-book/e-data-book.c:315
+#: ../calendar/libedata-cal/e-data-cal.c:431
 msgid "Not available in offline mode"
 msgstr "ÐÐ Ð ÐÐÐÐÑÐÐ Ð ÑÐÐÐÐ âÐÐÐÐÑÑÐÐâ."
 
-#: ../addressbook/libedata-book/e-data-book.c:325
-#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:146
+#: ../addressbook/libedata-book/e-data-book.c:316
+#: ../calendar/libedata-cal/e-data-cal.c:432 ../libedataserver/e-client.c:150
 msgid "Search size limit exceeded"
 msgstr "ÐÐÐÑÐÐÐÐÐÐÑÑ ÑÐÐÐÐÑ ÐÐ ÑÑÑÑÐÐÐ Ð ÐÐÐÐÐÑÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:326
-#: ../calendar/libedata-cal/e-data-cal.c:445 ../libedataserver/e-client.c:148
+#: ../addressbook/libedata-book/e-data-book.c:317
+#: ../calendar/libedata-cal/e-data-cal.c:433 ../libedataserver/e-client.c:152
 msgid "Search time limit exceeded"
 msgstr "ÐÐÐÑÐÐÐÐÐÐÑÐ ÐÑÐÐÐ ÐÐ ÑÑÑÑÐÐÐ Ð ÐÐÐÐÐÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:327
-#: ../calendar/libedata-cal/e-data-cal.c:446 ../libedataserver/e-client.c:150
+#: ../addressbook/libedata-book/e-data-book.c:318
+#: ../calendar/libedata-cal/e-data-cal.c:434 ../libedataserver/e-client.c:154
 msgid "Invalid query"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:328
-#: ../calendar/libedata-cal/e-data-cal.c:447 ../libedataserver/e-client.c:152
+#: ../addressbook/libedata-book/e-data-book.c:319
+#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:156
 msgid "Query refused"
 msgstr "ÐÐÑÐÐÐÑÐ Ð ÐÑÐÐÐÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:329
-#: ../calendar/libedata-cal/e-data-cal.c:448 ../libedataserver/e-client.c:138
+#: ../addressbook/libedata-book/e-data-book.c:320
+#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:142
 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:331
-#: ../calendar/libedata-cal/e-data-cal.c:450
+#: ../addressbook/libedata-book/e-data-book.c:322
+#: ../calendar/libedata-cal/e-data-cal.c:438
 msgid "Invalid server version"
 msgstr "ÐÑÐÑÐÐ ÐÐÑÑÐÑ ÐÐ ÑÑÑÐÑÑÐ"
 
-#: ../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
+#: ../addressbook/libedata-book/e-data-book.c:324
+#: ../calendar/libecal/e-cal.c:3998 ../calendar/libedata-cal/e-data-cal.c:439
+#: ../libedataserver/e-client.c:120
 msgid "Invalid argument"
 msgstr "ÐÑÐÑÐÐ ÐÑÐÑÐÐÐÑ"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../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
+#: ../addressbook/libedata-book/e-data-book.c:326
+#: ../calendar/libecal/e-cal.c:4037 ../calendar/libedata-cal/e-data-cal.c:441
+#: ../libedataserver/e-client.c:144
 msgid "Not supported"
 msgstr "ÐÐ ÑÐ ÐÐÐÐÑÑÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:336
-#: ../calendar/libedata-cal/e-data-cal.c:454 ../libedataserver/e-client.c:158
+#: ../addressbook/libedata-book/e-data-book.c:327
+#: ../calendar/libedata-cal/e-data-cal.c:442 ../libedataserver/e-client.c:162
 msgid "Backend is not opened yet"
 msgstr "ÐÐÑÐÑÐ ÐÑÐ ÐÑÐ ÐÐ Ð ÑÑÐÑÑÐÑÐÐÐ"
 
-#: ../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:156
+#: ../addressbook/libedata-book/e-data-book.c:335
+#: ../calendar/libecal/e-cal-client.c:619
+#: ../calendar/libedata-cal/e-data-cal.c:450 ../libedataserver/e-client.c:160
 msgid "Other error"
 msgstr "ÐÑÑÐÐ ÐÑÐÑÐÐ"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:551
-#: ../addressbook/libedata-book/e-data-book.c:943
+#: ../addressbook/libedata-book/e-data-book.c:542
+#: ../addressbook/libedata-book/e-data-book.c:909
 msgid "Cannot get contact: "
 msgstr "ÐÐÐÑÐÐÑÑÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:576
-#: ../addressbook/libedata-book/e-data-book.c:601
+#: ../addressbook/libedata-book/e-data-book.c:567
+#: ../addressbook/libedata-book/e-data-book.c:592
 msgid "Empty query: "
 msgstr "ÐÑÐÐÐÐ ÐÐÑÐÐÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:626
-#: ../addressbook/libedata-book/e-data-book.c:1041
+#: ../addressbook/libedata-book/e-data-book.c:617
+#: ../addressbook/libedata-book/e-data-book.c:1007
 msgid "Cannot add contact: "
 msgstr "ÐÐÐÑÐÐÑÑÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:651
-#: ../addressbook/libedata-book/e-data-book.c:1075
+#: ../addressbook/libedata-book/e-data-book.c:642
+#: ../addressbook/libedata-book/e-data-book.c:1041
 msgid "Cannot modify contacts: "
 msgstr "ÐÐÐÑÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÑÐ ÐÑÐÐÐÐÑÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../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:830
+#: ../addressbook/libedata-book/e-data-book.c:796
 msgid "Cannot open book: "
 msgstr "ÐÐÑÐÑÐÐÐÑÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:846
+#: ../addressbook/libedata-book/e-data-book.c:812
 msgid "Cannot remove book: "
 msgstr "ÐÐÑÐÑÐÐÐÑÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÐÑÐÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:873
+#: ../addressbook/libedata-book/e-data-book.c:839
 msgid "Cannot refresh address book: "
 msgstr "ÐÐÐÐÐÐÐÑÑÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:899
+#: ../addressbook/libedata-book/e-data-book.c:865
 msgid "Cannot get backend property: "
 msgstr "ÐÐÐÐÑÑÐÐÑÐ ÐÐ ÑÐÑÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:924
-#: ../calendar/libedata-cal/e-data-cal.c:1069
+#: ../addressbook/libedata-book/e-data-book.c:890
+#: ../calendar/libedata-cal/e-data-cal.c:1016
 msgid "Cannot set backend property: "
 msgstr "ÐÐÐÐÑÑÐÐÑÐ ÐÐ ÑÐÑÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÐÐÐÐÐÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:961
+#: ../addressbook/libedata-book/e-data-book.c:927
 msgid "Cannot get contact list: "
 msgstr "ÐÐÐÑÑÐÑÑ Ñ ÐÐÐÑÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:995
+#: ../addressbook/libedata-book/e-data-book.c:961
 msgid "Cannot get contact list uids: "
 msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑÑÑ ÐÐ ÑÐÐÑÑÐÐ Ñ ÐÐÐÑÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: %s"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1100
+#: ../addressbook/libedata-book/e-data-book.c:1066
 msgid "Cannot remove contacts: "
 msgstr "ÐÐÐÑÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÑÐ ÐÑÐÐÐÑÐÐÑ: "
 
-#: ../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
+#: ../addressbook/libedata-book/e-data-book-factory.c:103
+#: ../calendar/libedata-cal/e-data-cal-factory.c:114
+#, c-format
+msgid "No backend name in source '%s'"
+msgstr "Ð ÐÐÑÐÑÐÐÐÐ â%sâ ÐÐÐÑÐÐ ÐÐÐ ÐÐ ÑÐÑÐ"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:115
+#: ../calendar/libedata-cal/e-data-cal-factory.c:127
+#, c-format
+msgid "Invalid backend name '%s' in source '%s'"
+msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐ ÐÐ ÑÐÑÐ â%sâ Ð ÐÐÑÐÑÐÐÐÐ â%sâ"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:319
+#: ../calendar/libedata-cal/e-data-cal-factory.c:230
+msgid "Missing source UID"
+msgstr "ÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÐ ÐÐÑÐÑÐÐÐÐ"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:332
+#: ../calendar/libedata-cal/e-data-cal-factory.c:243
 #, c-format
-msgid "Empty URI"
-msgstr "ÐÑÐÐÐÐ ÐÐÑÐÑ"
+msgid "No such source for UID '%s'"
+msgstr "ÐÑÐÐ ÐÐÑÐÑÐÐÐ Ñ ÐÐÐÐÑÐÑÐÐÐÑÐÑ â%sâ."
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:543
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:564
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "ÐÑÑÐÑÑÑÑ Ð ÐÐÐÐÑÑÑÐÐÐ (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:571
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:594
+#, c-format
+msgid "Failed to connect to a server using SSL: %s"
+msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ ÑÑÑ ÑÑÑÐÑÑÐ ÑÑÐÐ SSL: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:599
+msgid ""
+"Failed to connect to a server using SSL. One possible reason is an invalid "
+"certificate being used by the server. If this is expected, like self-signed "
+"certificate being used on the server, then disable certificate validity "
+"tests by selecting 'Ignore invalid SSL certificate' option in Properties"
+msgstr ""
+"ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ ÐÑÐ ÑÑÑÐÑÑ ÑÑÐÐ SSL. ÐÐÐÐ ÐÑ ÐÑÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐÐ Ð, ÑÐ "
+"ÑÑÑÐÑÑÑÑ ÐÐÐÐÐÐÐÐ ÐÐÑ ÑÐÑÑÐÑÐÐÐÑ. ÐÐÐ ÑÐÐÐ ÑÐ ÐÑÐÐÐÐ (ÐÐÐÑÐ ÐÐÐÐÑÐ "
+"ÑÐÑÑÐÑÐÐÐÑÑÑ Ð ÑÐÐÐÐÐÐÐÐÑÐÐ), ÐÐÐÐÑÑÐÑÐ ÐÑÐÐÐÑÐÐÑÐ ÐÐ ÑÐÑÑÐÑÐÐÐÑÐ ÑÑÐÐ "
+"ÐÐÑÑÑÐÐÐÐÑÐ âÐÐÐ ÐÑÐÐÐÑÐÐ ÐÐ ÑÐÑÑÐÑÐÐÐÑÐâ"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:612
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "ÐÐÐÑÑÐÐ Ð ÐÐÐÑÐÐÐÐÐ ÐÐÐ ÐÐ HTTP ÐÐ ÑÑÑÑÐÑÐÐÐ â %d (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2242
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2605
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2302
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2672
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1077,389 +1086,364 @@ msgstr ""
 "ÐÑÑÐÑÑÑÑ Ð ÐÐÐÐÑÑÑÐÐÐ Ð ÐÐÐÐÐÐÐÑÑÑ Ð ÐÑÐÐÑÐÐ Ð ÑÐÐÐÐ ÑÐÐÐ ÐÐ ÑÐÑÐÐÐ.\n"
 "ÐÑÐÐÑÐÐÐÐ ÐÐ ÐÑÐÑÐÐ: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4562
-msgid "Calendar doesn't support Free/Busy"
-msgstr "ÐÐÐÐÐÐÐÑÑÑ ÐÐ ÐÐÐÐÑÑÐÐ ÑÑÑÑÐÑÐÐÑÑÐ âÐÐÐÐÐÐÐÐâ/âÐÐÐÑâ"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3668
+msgid "CalDAV does not support bulk additions"
+msgstr "CalDAV ÐÐ ÐÐÐÐÑÑÐÐ ÐÐÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐÑÑÐÐ ÑÐÑÑÑÑÐ"
 
-#: ../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/caldav/e-cal-backend-caldav.c:3770
+msgid "CalDAV does not support bulk modifications"
+msgstr "CalDAV ÐÐ ÐÐÐÐÑÑÐÐ ÐÐÐÐÐÑÐÐÐÐÐÐ ÐÑÐÐÑÐÐ ÐÐ ÐÐÐÐÐÑÑÐÐ ÑÐÑÑÑÑÐ"
 
-#: ../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/caldav/e-cal-backend-caldav.c:3938
+msgid "CalDAV does not support bulk removals"
+msgstr "CalDAV ÐÐ ÐÐÐÐÑÑÐÐ ÐÐÐÐÐÑÐÐÐÐÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑÑÐÐ ÑÐÑÑÑÑÐ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1059
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4597
+msgid "Calendar doesn't support Free/Busy"
+msgstr "ÐÐÐÐÐÐÐÑÑÑ ÐÐ ÐÐÐÐÑÑÐÐ ÑÑÑÑÐÑÐÐÑÑÐ âÐÐÐÐÐÐÐÐâ/âÐÐÐÑâ"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:921
 msgid "Birthday"
 msgstr "ÐÐÑÐ ÐÐ ÑÐÐÐÐÐÐ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1095
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:957
 #, c-format
 msgid "Birthday: %s"
 msgstr "ÐÐÑÐ ÐÐ ÑÐÐÐÐÐÐ: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1126
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:988
 #, c-format
 msgid "Anniversary: %s"
 msgstr "ÐÐÐÐÑÐÐÐÐ: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:249
+#: ../calendar/backends/file/e-cal-backend-file.c:235
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "ÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÐÑÐÐÑ ÐÐÐÐÐÐÐÐ: ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑ."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:256
-#: ../calendar/backends/file/e-cal-backend-file.c:262
+#: ../calendar/backends/file/e-cal-backend-file.c:242
+#: ../calendar/backends/file/e-cal-backend-file.c:248
 msgid "Cannot save calendar data"
 msgstr "ÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÐÑÐÐÑ ÐÐÐÐÐÐÐÐ"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:418
+#: ../calendar/backends/http/e-cal-backend-http.c:480
+#, c-format
+msgid "Malformed URI: %s"
+msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑ: %s"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:541
+#, c-format
 msgid "Redirected to Invalid URI"
 msgstr "ÐÑÐÐÐÑÐÑÐÐÐ ÐÑÐ ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑ"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:459
+#: ../calendar/backends/http/e-cal-backend-http.c:578
+#, c-format
 msgid "Bad file format."
 msgstr "ÐÐÐÐ Ð ÐÐÐÑÐÐÐÐÐÐ ÑÐÑÐÐÑ."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:467
+#: ../calendar/backends/http/e-cal-backend-http.c:588
+#, c-format
 msgid "Not a calendar."
 msgstr "ÐÐ Ð ÐÐÐÐÐÐÐÑ."
 
-#: ../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
+#: ../calendar/backends/http/e-cal-backend-http.c:933
+#: ../calendar/backends/http/e-cal-backend-http.c:937
+#: ../calendar/backends/weather/e-cal-backend-weather.c:511
 msgid "Could not create cache file"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐ Ñ ÐÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:181
+#: ../calendar/backends/weather/e-cal-backend-weather.c:171
 msgid "Could not retrieve weather data"
 msgstr "ÐÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÐÑÐÐÑ ÐÐÐÑÑÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:277
+#: ../calendar/backends/weather/e-cal-backend-weather.c:276
 msgid "Weather: Fog"
 msgstr "ÐÑÐÐÐ: ÐÑÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:278
+#: ../calendar/backends/weather/e-cal-backend-weather.c:277
 msgid "Weather: Cloudy Night"
 msgstr "ÐÑÐÐÐ: ÐÐÐÐÑÐÐ ÐÐÑÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:279
+#: ../calendar/backends/weather/e-cal-backend-weather.c:278
 msgid "Weather: Cloudy"
 msgstr "ÐÑÐÐÐ: ÐÐÐÐÑÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:280
+#: ../calendar/backends/weather/e-cal-backend-weather.c:279
 msgid "Weather: Overcast"
 msgstr "ÐÑÐÐÐ: ÐÐÑÑÐÐ ÐÐÐÐÑÐÐÑÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:281
+#: ../calendar/backends/weather/e-cal-backend-weather.c:280
 msgid "Weather: Showers"
 msgstr "ÐÑÐÐÐ: ÐÐÐÐÐÐ Ñ ÐÑÐÐÑÑÐÐÐÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:282
+#: ../calendar/backends/weather/e-cal-backend-weather.c:281
 msgid "Weather: Snow"
 msgstr "ÐÑÐÐÐ: ÑÐÑÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:283
+#: ../calendar/backends/weather/e-cal-backend-weather.c:282
 msgid "Weather: Clear Night"
 msgstr "ÐÑÐÐÐ: ÑÑÐÐ ÐÐÑÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:284
+#: ../calendar/backends/weather/e-cal-backend-weather.c:283
 msgid "Weather: Sunny"
 msgstr "ÐÑÐÐÐ: ÑÐÑÐÑÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:285
+#: ../calendar/backends/weather/e-cal-backend-weather.c:284
 msgid "Weather: Thunderstorms"
 msgstr "ÐÑÐÐÐ: ÐÑÑÐÐÑÐÐÐÑÐÐ ÐÑÑÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:433
+#: ../calendar/backends/weather/e-cal-backend-weather.c:408
 msgid "Forecast"
 msgstr "ÐÑÐÐÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:892 ../libedataserverui/e-book-auth-util.c:204
-#: ../libedataserverui/e-book-auth-util.c:428
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐ ÐÐ %s (ÐÐÑÑÐÐÐÑÐÐ â%sâ)"
-
-#.
-#. * This password prompt will be prompted rarely. Since the key that is passed to
-#. * the auth_func corresponds to the parent user.
-#.
-#: ../calendar/libecal/e-cal.c:906
-#, c-format
-msgid "Enter password for %s to enable proxy for user %s"
-msgstr ""
-"ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐ ÐÐ %s, ÐÐ ÐÐ ÐÐÐÑÑÐÑÐ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÑÐÐÐÑÐÐÑ â%sâ"
-
-#: ../calendar/libecal/e-cal.c:4567
+#: ../calendar/libecal/e-cal.c:4002
 msgid "Repository is offline"
 msgstr "ÐÑÐÐÐÐÐÑÐÑÐ ÐÐ Ð ÐÐÑÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4569 ../calendar/libecal/e-cal-client.c:134
+#: ../calendar/libecal/e-cal.c:4004 ../calendar/libecal/e-cal-client.c:135
 msgid "No such calendar"
 msgstr "ÐÑÐÐ ÑÐÐÑÐ ÐÐÐÐÐÐÐÑ"
 
-#: ../calendar/libecal/e-cal.c:4571 ../calendar/libecal/e-cal-client.c:136
-#: ../calendar/libedata-cal/e-data-cal.c:432
+#: ../calendar/libecal/e-cal.c:4006 ../calendar/libecal/e-cal-client.c:137
+#: ../calendar/libedata-cal/e-data-cal.c:420
 msgid "Object not found"
 msgstr "ÐÐÐÐÑÑÑ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4573 ../calendar/libecal/e-cal-client.c:138
-#: ../calendar/libedata-cal/e-data-cal.c:433
+#: ../calendar/libecal/e-cal.c:4008 ../calendar/libecal/e-cal-client.c:139
+#: ../calendar/libedata-cal/e-data-cal.c:421
 msgid "Invalid object"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÑ"
 
-#: ../calendar/libecal/e-cal.c:4575
+#: ../calendar/libecal/e-cal.c:4010
 msgid "URI not loaded"
 msgstr "ÐÐÑÐÑÑÑ ÐÐ Ð ÐÐÑÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4577
+#: ../calendar/libecal/e-cal.c:4012
 msgid "URI already loaded"
 msgstr "ÐÐÑÐÑÑÑ ÐÐÑÐ Ð ÐÐÑÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4581
+#: ../calendar/libecal/e-cal.c:4016
 msgid "Unknown User"
 msgstr "ÐÐÐÐÐÐÑÑÐÐ ÐÐÑÑÐÐÐÑÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4583 ../calendar/libecal/e-cal-client.c:142
-#: ../calendar/libedata-cal/e-data-cal.c:434
+#: ../calendar/libecal/e-cal.c:4018 ../calendar/libecal/e-cal-client.c:143
+#: ../calendar/libedata-cal/e-data-cal.c:422
 msgid "Object ID already exists"
 msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑÑÑ ÐÐ ÐÐÐÐÑÐ ÐÐÑÐ ÑÑÑÐÑÑÐÑÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4585
+#: ../calendar/libecal/e-cal.c:4020
 msgid "Protocol not supported"
 msgstr "ÐÑÐÑÐÐÐÐÑÑ ÐÐ ÑÐ ÐÐÐÐÑÑÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4587
+#: ../calendar/libecal/e-cal.c:4022
 msgid "Operation has been canceled"
 msgstr "ÐÑÐÐÐÐÐÐ ÐÐÐÑÑÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4589
+#: ../calendar/libecal/e-cal.c:4024
 msgid "Could not cancel operation"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÑÐÐ ÐÐ ÐÐÐÑÑÐÐÐÑÐ"
 
-#: ../calendar/libecal/e-cal.c:4591 ../libedataserver/e-client.c:126
+#: ../calendar/libecal/e-cal.c:4026 ../libedataserver/e-client.c:128
 msgid "Authentication failed"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4593
-#: ../camel/providers/smtp/camel-smtp-transport.c:846
-#: ../libedataserver/e-client.c:128
+#: ../calendar/libecal/e-cal.c:4028
+#: ../camel/providers/smtp/camel-smtp-transport.c:845
+#: ../libedataserver/e-client.c:130
 msgid "Authentication required"
 msgstr "ÐÐÐÑÐÐÐ ÑÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4595
+#: ../calendar/libecal/e-cal.c:4030
 msgid "A D-Bus exception has occurred"
 msgstr "ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÑÐÐÐÐ ÐÐ D-Bus"
 
-#: ../calendar/libecal/e-cal.c:4599
+#: ../calendar/libecal/e-cal.c:4034
 msgid "No error"
 msgstr "ÐÑÐÐ ÐÑÐÑÐÐ"
 
-#: ../calendar/libecal/e-cal-client.c:140
-#: ../calendar/libedata-cal/e-data-cal.c:442
+#: ../calendar/libecal/e-cal-client.c:141
+#: ../calendar/libedata-cal/e-data-cal.c:430
 msgid "Unknown user"
 msgstr "ÐÐÐÐÐÐÑÑÐÐ ÐÐÑÑÐÐÐÑÐÐ"
 
-#: ../calendar/libecal/e-cal-client.c:144
-#: ../calendar/libedata-cal/e-data-cal.c:431
+#: ../calendar/libecal/e-cal-client.c:145
+#: ../calendar/libedata-cal/e-data-cal.c:419
 msgid "Invalid range"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal-client.c:600
+#: ../calendar/libecal/e-cal-client.c:610
 msgid "Failed to run calendar factory"
 msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÑÑÐÑÑÐÑÐ"
 
-#: ../calendar/libecal/e-cal-client.c:765
-msgid "Failed to find system calendar"
-msgstr "ÐÐÑÑÐÐÐÐÑÑ ÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÑÐÑÐÑ"
-
-#: ../calendar/libecal/e-cal-client.c:804
-#: ../calendar/libedata-cal/e-data-cal.c:441
-msgid "Calendar does not exist"
-msgstr "ÐÐÐÐÐÐÐÑÑÑ ÐÐ ÑÑÑÐÑÑÐÑÐÐ"
-
-#: ../calendar/libecal/e-cal-client.c:919
-msgid "Invalid source type"
-msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐ ÐÐÑÐÑÐÐÐ"
-
-#: ../calendar/libecal/e-cal-component.c:1362
+#: ../calendar/libecal/e-cal-component.c:1339
 msgid "Untitled appointment"
 msgstr "ÐÑÐÑÐ ÐÐÐ ÐÐÐÐÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "1st"
 msgstr "1-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3982
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "2nd"
 msgstr "2-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3983
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "3rd"
 msgstr "3-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3984
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "4th"
 msgstr "4-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3985
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "5th"
 msgstr "5-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3986
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "6th"
 msgstr "6-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "7th"
 msgstr "7-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "8th"
 msgstr "8-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "9th"
 msgstr "9-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "10th"
 msgstr "10-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "11th"
 msgstr "11-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "12th"
 msgstr "12-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "13th"
 msgstr "13-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "14th"
 msgstr "14-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "15th"
 msgstr "15-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "16th"
 msgstr "16-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "17th"
 msgstr "17-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "18th"
 msgstr "18-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "19th"
 msgstr "19-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "20th"
 msgstr "20-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "21st"
 msgstr "21-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "22nd"
 msgstr "22-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "23rd"
 msgstr "23-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "24th"
 msgstr "24-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "25th"
 msgstr "25-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "26th"
 msgstr "26-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "27th"
 msgstr "27-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "28th"
 msgstr "28-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "29th"
 msgstr "29-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4010
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "30th"
 msgstr "30-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4011
+#: ../calendar/libecal/e-cal-recur.c:4017
 msgid "31st"
 msgstr "31-ÐÐ"
 
-#: ../calendar/libecal/e-cal-util.c:691 ../calendar/libecal/e-cal-util.c:718
+#: ../calendar/libecal/e-cal-util.c:696 ../calendar/libecal/e-cal-util.c:723
 msgctxt "Priority"
 msgid "High"
 msgstr "ÐÐÑÐÐ"
 
-#: ../calendar/libecal/e-cal-util.c:693 ../calendar/libecal/e-cal-util.c:720
+#: ../calendar/libecal/e-cal-util.c:698 ../calendar/libecal/e-cal-util.c:725
 msgctxt "Priority"
 msgid "Normal"
 msgstr "ÐÐÑÐÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal-util.c:695 ../calendar/libecal/e-cal-util.c:722
+#: ../calendar/libecal/e-cal-util.c:700 ../calendar/libecal/e-cal-util.c:727
 msgctxt "Priority"
 msgid "Low"
 msgstr "ÐÐÑÑÐ"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:716
+#: ../calendar/libecal/e-cal-util.c:721
 msgctxt "Priority"
 msgid "Undefined"
 msgstr "ÐÐÐÐÑÐÐÐÐÐÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:34
+#: ../calendar/libedata-cal/e-cal-backend.c:36
 msgid "Cannot process, calendar backend is opening"
 msgstr "ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÑÐÐÐÑÐ, ÑÐÑÐÑÐ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÑÐ ÐÐ Ð ÑÑÐÑÑÐÑÐÐÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:142
+#: ../calendar/libedata-cal/e-cal-backend.c:135
 #, c-format
 msgid "Unknown calendar property '%s'"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÑÐÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐÐÐÑ: â%sâ"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:159
+#: ../calendar/libedata-cal/e-cal-backend.c:152
 #, c-format
 msgid "Cannot change value of calendar property '%s'"
 msgstr "ÐÐÐÐÑÑÐÐÑÐ â%sâ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÑÐÐÐÐÐÐÐ"
 
 #: ../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
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:839
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:954
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:985
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1185
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1215
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "â%sâ ÐÐ ÐÑÐÐÐÐ ÐÑÐÑÐÐÐÑÐ"
@@ -1468,7 +1452,7 @@ msgstr "â%sâ ÐÐ ÐÑÐÐÐÐ ÐÑÐÑÐÐÐÑÐ"
 #: ../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
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1256
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "â%sâ ÐÑÐÐÐÐ ÐÐÐÐ ÐÑÐÑÐÐÐÑ"
@@ -1476,7 +1460,7 @@ msgstr "â%sâ ÐÑÐÐÐÐ ÐÐÐÐ ÐÑÐÑÐÐÐÑ"
 #: ../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
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:884
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "â%sâ ÐÑÐÐÐÐ ÐÑÑÐÐÑÑ ÐÑÐÑÐÐÐÑ ÐÐ ÐÑÐÐ ÐÐÐ"
@@ -1488,8 +1472,8 @@ msgstr "â%sâ ÐÑÐÐÐÐ ÐÑÑÐÐÑÑ ÐÑÐÑÐÐÐÑ ÐÐ ÐÑÐÐ ÐÐ
 
 #: ../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
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1020
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "â%sâ ÐÑÐÐÐÐ ÐÐÐ ÐÑÐÑÐÐÐÑÐ"
@@ -1500,8 +1484,8 @@ msgstr "â%sâ ÐÑÐÐÐÐ ÐÐÐ ÐÑÐÑÐÐÐÑÐ"
 #: ../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
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1026
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1262
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "â%sâ ÐÑÐÐÐÐ ÐÑÑÐÐÑÑ ÐÑÐÑÐÐÐÑ ÐÐ ÐÑÐÐ ÐÑ ÐÐÐÐ time_t"
@@ -1519,7 +1503,7 @@ msgstr "â%sâ ÐÑÐÐÐÐ ÐÐÐ ÐÐÐ ÑÑÐ ÐÑÐÑÐÐÐÑÐ"
 #: ../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
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1034
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "â%sâ ÐÑÐÐÐÐ ÐÑÐÑÐÑÑ ÐÑÐÑÐÐÐÑ ÐÐ ÐÑÐÐ ÐÑ ÐÐÐÐ time_t"
@@ -1534,12 +1518,12 @@ msgstr "â%sâ ÐÑÐÐÐÐ ÑÑÐÑÐÑÑ ÐÑÐÑÐÐÐÑ ÐÐ ÐÑÐÐ ÐÐ
 msgid "\"%s\" expects none or two arguments"
 msgstr "â%sâ ÐÑÐÐÐÐ ÐÐÐÐÐÐÐ ÐÐÐ ÐÐÐ ÐÑÐÑÐÐÐÑÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:882
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:892
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "â%sâ ÐÑÐÐÐÐ ÐÑÐÑÐÑ ÐÑÐÑÐÐÐÑ ÐÐ ÐÑÐÐ ÐÐÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:912
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:922
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1551,12 +1535,12 @@ msgstr ""
 "âlocationâ (ÐÐÑÑÐÐÐÐÐÐÐÐÐÐ), âattendeeâ (ÑÑÐÑÑÐÐÐ), âattendeeâ (ÐÑÐÐÐÐÐÐÑÐÑ) "
 "ÐÐÐ âclassificationâ (ÐÐÐÑÐÑÐÐÐÑÐÑ)"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1074
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1084
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "â%sâ ÐÑÐÐÐÐ ÐÐÐÐ ÐÐÐÐ ÐÑÐÑÐÐÐÑ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1098
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1565,148 +1549,156 @@ msgstr ""
 "â%sâ ÐÑÐÐÐÐ ÐÑÐÑÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐ ÑÐ ÐÐÐÐÐÐ ÐÐÐ ÑÐÑÐÐ ÐÐÐÐ ÐÑÐÑÐÐÐÑ ÐÐ ÐÑÐÐ "
 "ÐÑÐÐÐÐÑÐ ÑÑÐÐÐÐÑÑ âÐÑÐÐâ (#f)"
 
-#: ../calendar/libedata-cal/e-data-cal.c:438
+#: ../calendar/libedata-cal/e-data-cal.c:426
 msgid "Unsupported method"
 msgstr "ÐÐÐÐÐÐÑÑÐÐÐ ÐÐÑÐÐ"
 
+#: ../calendar/libedata-cal/e-data-cal.c:429
+msgid "Calendar does not exist"
+msgstr "ÐÐÐÐÐÐÐÑÑÑ ÐÐ ÑÑÑÐÑÑÐÑÐÐ"
+
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:962
+#: ../calendar/libedata-cal/e-data-cal.c:909
 msgid "Cannot open calendar: "
 msgstr "ÐÐÐÐÐÐÐÑÑÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:987
+#: ../calendar/libedata-cal/e-data-cal.c:934
 msgid "Cannot remove calendar: "
 msgstr "ÐÐÐÐÐÐÐÑÑÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÐÑÐÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1014
+#: ../calendar/libedata-cal/e-data-cal.c:961
 msgid "Cannot refresh calendar: "
 msgstr "ÐÐÐÐÐÐÐÑÑÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1043
+#: ../calendar/libedata-cal/e-data-cal.c:990
 msgid "Cannot retrieve backend property: "
 msgstr "ÐÐÐÐÑÑÐÐÑÐ ÐÐ ÑÐÑÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÐÑÐÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1098
+#: ../calendar/libedata-cal/e-data-cal.c:1045
 msgid "Cannot retrieve calendar object path: "
 msgstr "ÐÑÑÑÑ ÐÐ ÐÐÐÐÐÐÐÑÐÐÑ ÐÐÐÐÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1128
+#: ../calendar/libedata-cal/e-data-cal.c:1075
 msgid "Cannot retrieve calendar object list: "
 msgstr "ÐÐÐÑÑÐÑÑ ÐÐ ÐÐÐÐÐÐÐÑÐÐÑÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1157
+#: ../calendar/libedata-cal/e-data-cal.c:1104
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "ÐÐÐÑÑÐÑÑ ÐÐ ÐÐÐÑÐÑÑÑÐ ÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1188
+#: ../calendar/libedata-cal/e-data-cal.c:1142
 msgid "Cannot create calendar object: "
 msgstr "ÐÐÐÐÑÑÑ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÑÑÐÐÐÐÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1220
+#: ../calendar/libedata-cal/e-data-cal.c:1177
 msgid "Cannot modify calendar object: "
 msgstr "ÐÐÐÐÑÑÑ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÐÐÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1254
+#: ../calendar/libedata-cal/e-data-cal.c:1217
 msgid "Cannot remove calendar object: "
 msgstr "ÐÐÐÐÑÑÑ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÐÑÐÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1281
+#: ../calendar/libedata-cal/e-data-cal.c:1254
 msgid "Cannot receive calendar objects: "
 msgstr "ÐÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÑÐ ÐÐÐÑÑÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1312
+#: ../calendar/libedata-cal/e-data-cal.c:1285
 msgid "Cannot send calendar objects: "
 msgstr "ÐÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÑ ÐÐ ÑÐ ÐÐÐÑÐÑÑÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1344
+#: ../calendar/libedata-cal/e-data-cal.c:1317
 msgid "Could not retrieve attachment uris: "
 msgstr "ÐÐÐÑÑÐÑÑ Ñ ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐÑÐÐÐ ÑÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1372
+#: ../calendar/libedata-cal/e-data-cal.c:1345
 msgid "Could not discard reminder: "
 msgstr "ÐÐÐÐÐÐÑÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÑÑÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1401
+#: ../calendar/libedata-cal/e-data-cal.c:1374
 msgid "Could not get calendar view path: "
 msgstr "ÐÑÑÑÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1431
+#: ../calendar/libedata-cal/e-data-cal.c:1404
 msgid "Could not retrieve calendar time zone: "
 msgstr "ÐÐÑÐÐÐÑÑ ÐÐÑÑ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1457
+#: ../calendar/libedata-cal/e-data-cal.c:1430
 msgid "Could not add calendar time zone: "
 msgstr "ÐÐÑÐÐÐÑÑ ÐÐÑÑ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐ: "
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:199
+#: ../calendar/libedata-cal/e-data-cal-factory.c:220
 #, c-format
 msgid "Invalid call"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐ"
 
-#: ../camel/camel-cipher-context.c:200
+#: ../camel/camel-cipher-context.c:206
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "ÐÐÐÐ ÑÐÑÑÑ ÐÐ ÐÐÐÐÑÑÐÐ ÐÐÐÐÐÑÐÐÐÐ "
 
-#: ../camel/camel-cipher-context.c:213
+#: ../camel/camel-cipher-context.c:219
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "ÐÐÐÐ ÑÐÑÑÑ ÐÐ ÐÐÐÐÑÑÐÐ ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐÑ"
 
-#: ../camel/camel-cipher-context.c:229
+#: ../camel/camel-cipher-context.c:235
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "ÐÐÐÐ ÑÐÑÑÑ ÐÐ ÐÐÐÐÑÑÐÐ ÑÐÑÑÐÑÐÐÐ"
 
-#: ../camel/camel-cipher-context.c:243
+#: ../camel/camel-cipher-context.c:249
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "ÐÐÐÐ ÑÐÑÑÑ ÐÐ ÐÐÐÐÑÑÐÐ ÐÐÑÐÑÑÐÑÐÐÐ"
 
-#: ../camel/camel-cipher-context.c:256
+#: ../camel/camel-cipher-context.c:262
 #, c-format
 msgid "You may not import keys with this cipher"
 msgstr "ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÑÑÑÐ ÐÐÑÑÐÐÐ Ñ ÑÐÐÐ ÑÐÑÑÑ"
 
-#: ../camel/camel-cipher-context.c:270
+#: ../camel/camel-cipher-context.c:276
 #, c-format
 msgid "You may not export keys with this cipher"
 msgstr "ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÑÑÐ ÐÐÑÑÐÐÐ Ñ ÑÐÐÐ ÑÐÑÑÑ"
 
-#: ../camel/camel-cipher-context.c:800
+#: ../camel/camel-cipher-context.c:817
 msgid "Signing message"
 msgstr "ÐÐÐÐÐÑÐÐÐÐ ÐÐ ÐÐÑÐÐÑÐ"
 
-#: ../camel/camel-cipher-context.c:1041
+#: ../camel/camel-cipher-context.c:1058
 msgid "Encrypting message"
 msgstr "ÐÐÑÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐÑÐ"
 
-#: ../camel/camel-cipher-context.c:1168
+#: ../camel/camel-cipher-context.c:1185
 msgid "Decrypting message"
 msgstr "ÐÐÑÐÑÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐÑÐ"
 
-#: ../camel/camel-data-cache.c:178
+#: ../camel/camel-data-cache.c:181
 #, c-format
 msgid "Unable to create cache path"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÑÑ ÐÐ ÐÐÑÐ"
 
-#: ../camel/camel-data-cache.c:504
+#: ../camel/camel-data-cache.c:440
+msgid "Empty cache file"
+msgstr "ÐÐÑÐÑÑÐÐÐÐ ÐÐ ÑÐÐÐÐ ÐÐ ÐÐÑÐ"
+
+#: ../camel/camel-data-cache.c:509
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "ÐÐÐÐÑÑÑ Ð ÐÐÑÐ â%sâ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÑÑÐÑ: %s"
@@ -1738,43 +1730,37 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "ÐÐÐÑÑÐÐÐÐÐÑÐÐÐ ÑÑÑ ÑÑÑÐÑÑÐ"
 
-#: ../camel/camel-disco-folder.c:72 ../camel/camel-offline-folder.c:89
+#: ../camel/camel-disco-folder.c:76 ../camel/camel-offline-folder.c:93
 msgid "Downloading new messages for offline mode"
 msgstr "ÐÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐ ÑÑÐÐÑÐÐÐÑ ÐÐ ÑÐÐÐÐ âÐÐÐÐÑÑÐÐâ"
 
-#: ../camel/camel-disco-folder.c:412
+#: ../camel/camel-disco-folder.c:416
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "ÐÐÐÐÐÑÐÑÐÐ ÐÐ ÐÐÐÐÐÑÐ â%sâ ÐÐ ÑÐÐÐÐ âÐÐÐÐÑÑÐÐâ"
 
-#: ../camel/camel-disco-folder.c:478 ../camel/camel-offline-folder.c:323
+#: ../camel/camel-disco-folder.c:482 ../camel/camel-offline-folder.c:329
 msgid "Copy folder content locally for _offline operation"
 msgstr ""
 "_ÐÐÐÐÑÐÐÐ ÐÐ ÑÑÐÑÑÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐÑÐ Ð ÑÐÐÐÐ âÐÐÐÐÑÑÐÐâ"
 
-#: ../camel/camel-disco-store.c:456
-#: ../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
+#: ../camel/camel-disco-store.c:466 ../camel/camel-imapx-folder.c:410
+#: ../camel/camel-imapx-folder.c:443 ../camel/camel-imapx-folder.c:479
+#: ../camel/camel-imapx-folder.c:535 ../camel/camel-imapx-folder.c:611
+#: ../camel/camel-imapx-folder.c:645 ../camel/camel-imapx-folder.c:685
+#: ../camel/camel-imapx-folder.c:721 ../camel/camel-imapx-store.c:273
+#: ../camel/camel-imapx-store.c:1363 ../camel/camel-imapx-store.c:1451
+#: ../camel/camel-imapx-store.c:1497
+#: ../camel/providers/imap/camel-imap-store.c:1246
+#: ../camel/providers/imap/camel-imap-store.c:2002
+#: ../camel/providers/imap/camel-imap-store.c:2469
+#: ../camel/providers/imap/camel-imap-store.c:3219
+#: ../camel/providers/pop3/camel-pop3-folder.c:525
+#: ../camel/providers/pop3/camel-pop3-folder.c:655
+#: ../camel/providers/pop3/camel-pop3-folder.c:838
+#: ../camel/providers/pop3/camel-pop3-folder.c:1036
+#: ../camel/providers/pop3/camel-pop3-store.c:394
+#: ../camel/providers/pop3/camel-pop3-store.c:807
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "ÐÑÑÐÐÐ ÐÐ ÑÑÐ Ð ÑÐÐÐÐ âÐÐÐÑÑÐÐâ, ÐÐ ÐÐ ÐÐÐÑÑÑÐÑÐ ÑÐÐÐ ÐÐÐÑÑÐÐÐ"
@@ -1784,64 +1770,64 @@ msgstr "ÐÑÑÐÐÐ ÐÐ ÑÑÐ Ð ÑÐÐÐÐ âÐÐÐÑÑÐÐâ, ÐÐ ÐÐ 
 msgid "Canceled"
 msgstr "ÐÑÐÐÐÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:889 ../camel/camel-filter-search.c:762
+#: ../camel/camel-filter-driver.c:895 ../camel/camel-filter-search.c:762
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÑÑÐÑÐÐ ÐÑÐÑÐÑ â%sâ: %s"
 
-#: ../camel/camel-filter-driver.c:937
+#: ../camel/camel-filter-driver.c:943
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "ÐÐÐÑÑÐÐ Ð ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÐ ÑÑÐÐÑÐÐÐÑ ÐÑ %s: %s"
 
-#: ../camel/camel-filter-driver.c:1142 ../camel/camel-filter-driver.c:1151
+#: ../camel/camel-filter-driver.c:1139 ../camel/camel-filter-driver.c:1146
 msgid "Syncing folders"
 msgstr "ÐÐÐÑÑÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1247 ../camel/camel-filter-driver.c:1705
+#: ../camel/camel-filter-driver.c:1240 ../camel/camel-filter-driver.c:1695
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÐÐÑÐÐÐÑÐ ÐÐ ÑÐÐÑÑÑ: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1258 ../camel/camel-filter-driver.c:1716
+#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1706
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÐÐÐÐÐÐ ÐÐ ÑÐÐÑÑÑ: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1356
+#: ../camel/camel-filter-driver.c:1347
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐÑÐ-ÑÐÑÐÐÑ"
 
-#: ../camel/camel-filter-driver.c:1368
+#: ../camel/camel-filter-driver.c:1359
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐÑÐ-ÑÐÑÐÐÑ"
 
-#: ../camel/camel-filter-driver.c:1386
+#: ../camel/camel-filter-driver.c:1377
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1393 ../camel/camel-filter-driver.c:1415
+#: ../camel/camel-filter-driver.c:1384 ../camel/camel-filter-driver.c:1406
 #, c-format
 msgid "Failed on message %d"
 msgstr "ÐÐÑÑÐÐÑ ÐÑÐ ÐÐÑÐÐ %d"
 
-#: ../camel/camel-filter-driver.c:1430 ../camel/camel-filter-driver.c:1537
+#: ../camel/camel-filter-driver.c:1421 ../camel/camel-filter-driver.c:1527
 msgid "Syncing folder"
 msgstr "ÐÐÐÑÑÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1435 ../camel/camel-filter-driver.c:1543
+#: ../camel/camel-filter-driver.c:1426 ../camel/camel-filter-driver.c:1533
 msgid "Complete"
 msgstr "ÐÐÐÑÑÑÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1495
+#: ../camel/camel-filter-driver.c:1485
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ %d ÐÑ %d"
 
-#: ../camel/camel-filter-driver.c:1513
+#: ../camel/camel-filter-driver.c:1503
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÐ %d ÐÑ %d"
@@ -1863,53 +1849,52 @@ msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐÐÑÐ ÐÑÐ (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÑÑÑÐÐÐ ÑÑÐÐ ÑÐÐÑÑÑ: %s: %s"
 
-#: ../camel/camel-folder.c:258
+#: ../camel/camel-folder.c:270
 #, 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:298
+#: ../camel/camel-folder.c:310
 #, 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:346
+#: ../camel/camel-folder.c:358
 #, 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:914
+#: ../camel/camel-folder.c:930
 #: ../camel/providers/local/camel-maildir-folder.c:322
 msgid "Moving messages"
 msgstr "ÐÑÐÐÐÑÑÐÐÐÐ ÐÐ ÐÐÑÐÐ"
 
-#: ../camel/camel-folder.c:917
+#: ../camel/camel-folder.c:933
 msgid "Copying messages"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐ"
 
-#: ../camel/camel-folder.c:1229
+#: ../camel/camel-folder.c:1253
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr "ÐÐÐÐÐÑÐ â%sâ ÐÐ ÐÐÐÐÑÑÐÐ ÐÐÑÐÑÐÐÑÐÑ ÐÐ ÐÐÐÑÐ"
 
-#: ../camel/camel-folder.c:3535
+#: ../camel/camel-folder.c:3595
 #, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ â%sâ Ð %s"
 
-#: ../camel/camel-folder.c:3681
+#: ../camel/camel-folder.c:3744
 #, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "ÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐÑÐÑ ÐÐ ÐÐÐÑÐÑÐ ÐÐ â%sâ"
 
-#: ../camel/camel-folder-search.c:362 ../camel/camel-folder-search.c:476
-#: ../camel/camel-folder-search.c:661
+#: ../camel/camel-folder-search.c:414 ../camel/camel-folder-search.c:575
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1918,8 +1903,7 @@ msgstr ""
 "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ ÑÑÑÑÐÐÐ: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:374 ../camel/camel-folder-search.c:488
-#: ../camel/camel-folder-search.c:673
+#: ../camel/camel-folder-search.c:426 ../camel/camel-folder-search.c:587
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1929,47 +1913,47 @@ msgstr ""
 "%s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:887 ../camel/camel-folder-search.c:930
+#: ../camel/camel-folder-search.c:800 ../camel/camel-folder-search.c:843
 #, 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:991
+#: ../camel/camel-folder-search.c:904
 #, 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:998 ../camel/camel-folder-search.c:1006
+#: ../camel/camel-folder-search.c:911 ../camel/camel-folder-search.c:919
 #, 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:1034
+#: ../camel/camel-folder-search.c:947
 #, 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:1044
+#: ../camel/camel-folder-search.c:957
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) ÐÐÐÑÐÐÐ ÐÐÐÐÐÑÐ ÐÐ Ð ÐÐÐÑÐÐÐ"
 
-#: ../camel/camel-gpg-context.c:659 ../camel/camel-gpg-context.c:664
-#: ../camel/camel-gpg-context.c:1323
+#: ../camel/camel-gpg-context.c:663 ../camel/camel-gpg-context.c:668
+#: ../camel/camel-gpg-context.c:1327
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÐÐÐÐÐÐ ÐÐ gpg: %s"
 
-#: ../camel/camel-gpg-context.c:664
-#: ../camel/providers/smtp/camel-smtp-transport.c:849
+#: ../camel/camel-gpg-context.c:668
+#: ../camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Unknown"
 msgstr "ÐÐÐÐÐÐÑÑÐÐ"
 
-#: ../camel/camel-gpg-context.c:729
+#: ../camel/camel-gpg-context.c:733
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1980,17 +1964,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:765
+#: ../camel/camel-gpg-context.c:769
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐÐÐÑÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÐ gpg."
 
-#: ../camel/camel-gpg-context.c:790 ../camel/camel-gpg-context.c:805
+#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:809
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐ ÐÐ ÐÐÑÐÐÐÑÐ ÐÐ ÑÐÐÐÐ ÑÑÐÐÐ ÐÐ gpg."
 
-#: ../camel/camel-gpg-context.c:826
+#: ../camel/camel-gpg-context.c:830
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1999,7 +1983,7 @@ msgstr ""
 "ÐÑÐÐÐÐÑÐ ÑÐ ÐÑ ÐÐÐ, ÐÐ ÐÐ ÐÑÐÐÑÑÐÑÐ ÐÐÑÑÐ ÐÐ\n"
 "ÑÐÐÑÑÐ ÑÐÐÑÑ ÐÐÑÑÐ: â%sâ"
 
-#: ../camel/camel-gpg-context.c:830
+#: ../camel/camel-gpg-context.c:834
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2008,12 +1992,12 @@ msgstr ""
 "ÐÑÐÐÐÐÑÐ ÑÐ ÐÑ ÑÐÐÐÐ ÑÑÐÐÐ, ÐÐ ÐÐ ÐÑÐÐÑÑÐÑÐ ÐÐÑÑÐ\n"
 "ÐÐ ÐÐÑÑÐÐÐÑÐÐÑ: â%sâ"
 
-#: ../camel/camel-gpg-context.c:836
+#: ../camel/camel-gpg-context.c:840
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐ ÐÑ GnuPG ÐÐ â%sâ"
 
-#: ../camel/camel-gpg-context.c:846
+#: ../camel/camel-gpg-context.c:850
 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."
@@ -2021,78 +2005,348 @@ msgstr ""
 "ÐÐÑÑÐÑÐÐÐÑÐ ÑÑÐÑÑÐÐÐÐÐ ÐÐ ÑÑÐÑÑÐÐ ÐÐÑÐÑÐÐÑÐÑ ÐÐ ÐÐÐÑÑÐÑÐÐ, ÑÐ ÐÑÐÐÑÐ "
 "ÐÐÐÐÑÐÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ ÐÑÐÐÐ ÑÑÑÑÐÐÐÐ ÑÐÑÑÐÐ ÐÐÑÑ."
 
-#: ../camel/camel-gpg-context.c:875 ../camel/camel-net-utils.c:523
+#: ../camel/camel-gpg-context.c:879 ../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
+#: ../libedataserver/e-client.c:140
 #, c-format
 msgid "Cancelled"
 msgstr "ÐÑÐÐÐÐÐÐ"
 
-#: ../camel/camel-gpg-context.c:896
+#: ../camel/camel-gpg-context.c:900
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÑÑÐÐÐÐ ÐÐ ÑÐÐÐ ÐÐÑÑ: ÐÐÐÐÐÐÐÐ 3 ÐÑÐÑÐÐ ÑÑÐÐÐ."
 
-#: ../camel/camel-gpg-context.c:909
+#: ../camel/camel-gpg-context.c:913
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "ÐÐÐÑÐÐÐÐÐ ÐÑÐÐÐÐÑ ÐÑ GnuPG: %s"
 
-#: ../camel/camel-gpg-context.c:1040
+#: ../camel/camel-gpg-context.c:1044
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÑÐÐÐ: ÐÑÐÐ ÐÐÐÐÐÐÐÐ ÐÐÑÐÐÑÐÐ ÐÐÐÑÑÐÑÐÐÐ."
 
-#: ../camel/camel-gpg-context.c:1587 ../camel/camel-smime-context.c:827
+#: ../camel/camel-gpg-context.c:1591 ../camel/camel-smime-context.c:831
 msgid "Could not generate signing data: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑ: "
 
-#: ../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
+#: ../camel/camel-gpg-context.c:1640 ../camel/camel-gpg-context.c:1844
+#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:2101
+#: ../camel/camel-gpg-context.c:2201 ../camel/camel-gpg-context.c:2249
 msgid "Failed to execute gpg."
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÐÐÐÐÐÐ ÐÐ gpg."
 
-#: ../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
+#: ../camel/camel-gpg-context.c:1719 ../camel/camel-gpg-context.c:1727
+#: ../camel/camel-gpg-context.c:1735 ../camel/camel-gpg-context.c:1755
+#: ../camel/camel-smime-context.c:957 ../camel/camel-smime-context.c:971
+#: ../camel/camel-smime-context.c:980
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐÑÐ: ÐÐÐÑÐÐÐÐÐÐ ÑÐÑÐÐÑ ÐÐ ÐÐÑÐÐÑÐ"
 
-#: ../camel/camel-gpg-context.c:1793
+#: ../camel/camel-gpg-context.c:1797
 msgid "Cannot verify message signature: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐÑÐ: "
 
-#: ../camel/camel-gpg-context.c:1916
+#: ../camel/camel-gpg-context.c:1920
 msgid "Could not generate encrypting data: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐÐ ÐÐ ÑÐÑÑÐÑÐÐÐ: "
 
-#: ../camel/camel-gpg-context.c:1969
+#: ../camel/camel-gpg-context.c:1973
 msgid "This is a digitally encrypted message part"
 msgstr "ÐÐÐÐ Ð ÑÐÑÑÐÐÐ ÑÐÑÑÐÑÐÐÐ ÑÐÑÑ ÐÑ ÐÐÑÐÐÑÐ"
 
-#: ../camel/camel-gpg-context.c:2027 ../camel/camel-gpg-context.c:2036
-#: ../camel/camel-gpg-context.c:2059
+#: ../camel/camel-gpg-context.c:2031 ../camel/camel-gpg-context.c:2040
+#: ../camel/camel-gpg-context.c:2063
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐÑÐ: ÐÑÐÑÐÐ ÑÐÑÐÐÑ ÐÐ ÐÐÑÐÐÑÐ"
 
-#: ../camel/camel-gpg-context.c:2047
+#: ../camel/camel-gpg-context.c:2051
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÑÐÑÐÐÐ ÐÐ ÑÐÑÑ MIME: ÐÑÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐ"
 
-#: ../camel/camel-gpg-context.c:2138 ../camel/camel-smime-context.c:1264
+#: ../camel/camel-gpg-context.c:2142 ../camel/camel-smime-context.c:1268
 msgid "Encrypted content"
 msgstr "ÐÐÑÑÐÑÐÐÐ ÑÑÐÑÑÐÐÐÐÐ"
 
-#: ../camel/camel-http-stream.c:545 ../camel/camel-stream-null.c:78
-msgid "Only reset to beginning is supported with CamelHttpStream"
-msgstr ""
-"ÐÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ CamelHttpStream ÑÐ ÐÐÐÐÑÑÐÐ ÐÐÐÐÑÑÐÐÐÐ ÐÑÑÑÐÐÐ Ð ÐÐÑÐÐÐÑÐ"
+#: ../camel/camel-imapx-folder.c:101
+#, c-format
+msgid "Could not create folder summary for %s"
+msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐ ÐÐ â%sâ"
+
+#: ../camel/camel-imapx-folder.c:109
+#, c-format
+msgid "Could not create cache for %s: "
+msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÑ ÐÐ %s"
+
+#: ../camel/camel-imapx-folder.c:791
+#: ../camel/providers/imap/camel-imap-folder.c:359
+#: ../camel/providers/nntp/camel-nntp-folder.c:731
+msgid "Apply message _filters to this folder"
+msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐ _ÑÐÐÑÑÐ ÐÑÐ ÑÐÐÐ ÐÐÐÐÐ"
+
+#: ../camel/camel-imapx-server.c:1015
+msgid "Server disconnected"
+msgstr "ÐÑÑÐÑÑÑÑ ÐÑÐÐÑÐÑÐ ÐÑÑÐÐÐÑÐ"
+
+#: ../camel/camel-imapx-server.c:1457
+msgid "Error writing to cache stream: "
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÐÐÑÐ Ð ÐÐÑÐÐÐ ÐÐ ÐÐÑÐ: "
+
+#: ../camel/camel-imapx-server.c:2384
+#, c-format
+msgid "Not authenticated"
+msgstr "ÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ"
+
+#: ../camel/camel-imapx-server.c:2453
+msgid "Error performing IDLE"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÑÐÑÑÐ IDLE"
+
+#: ../camel/camel-imapx-server.c:3297
+#: ../camel/providers/imap/camel-imap-store.c:409
+#: ../camel/providers/imap/camel-imap-store.c:463
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ ÑÑÑ ÑÑÑÐÑÑÐ ÐÐ IMAP %s Ð ÑÐÐÑÑÐÐ ÑÐÐÐÐ: %s"
+
+#: ../camel/camel-imapx-server.c:3298
+#: ../camel/providers/imap/camel-imap-store.c:410
+#: ../camel/providers/smtp/camel-smtp-transport.c:197
+msgid "STARTTLS not supported"
+msgstr "ÐÐ ÑÐ ÐÐÐÐÑÑÐÐ STARTTLS"
+
+#: ../camel/camel-imapx-server.c:3337
+#: ../camel/providers/imap/camel-imap-store.c:435
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: "
+msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ ÑÑÑ ÑÑÑÐÑÑÐ ÐÐ IMAP %s Ð ÑÐÐÑÑÐÐ ÑÐÐÐÐ: "
+
+#: ../camel/camel-imapx-server.c:3404
+#: ../camel/providers/imap/camel-imap-store.c:734
+#, c-format
+msgid "IMAP server %s does not support %s authentication"
+msgstr "ÐÑÑÐÑÑÑÑ ÐÐ IMAP %s ÐÐ ÐÐÐÐÑÑÐÐ ÐÐÑÐÐÐÐÑ ÐÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ %s"
+
+#: ../camel/camel-imapx-server.c:3415 ../camel/camel-session.c:486
+#: ../camel/providers/imap/camel-imap-store.c:1150
+#: ../camel/providers/pop3/camel-pop3-store.c:249
+#: ../camel/providers/pop3/camel-pop3-store.c:568
+#: ../camel/providers/smtp/camel-smtp-transport.c:458
+#, c-format
+msgid "No support for %s authentication"
+msgstr "ÐÑÐÐ ÐÐÐÐÑÑÐÐÐ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ %s"
+
+#: ../camel/camel-imapx-server.c:3434
+#: ../camel/providers/imap/camel-imap-store.c:1118
+#: ../camel/providers/nntp/camel-nntp-store.c:494
+msgid "Cannot authenticate without a username"
+msgstr "ÐÐÐÑÑÐÐÐÑÑÐÐÐÐÑÐ Ð ÐÐÐÑÐÐÐÐÐÐ ÐÐÐ ÐÐÑÑÐÐÐÑÐÐÑÐÐ ÐÐÐ"
+
+#: ../camel/camel-imapx-server.c:3443
+#: ../camel/providers/imap/camel-imap-store.c:1126
+#: ../camel/providers/nntp/camel-nntp-store.c:503
+#: ../camel/providers/pop3/camel-pop3-store.c:493
+#: ../camel/providers/pop3/camel-pop3-store.c:513
+msgid "Authentication password not available"
+msgstr "ÐÐ Ð ÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐ"
+
+#: ../camel/camel-imapx-server.c:3633
+msgid "Error fetching message"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐ"
+
+#: ../camel/camel-imapx-server.c:3715
+msgid "Failed to copy the tmp file"
+msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐÑ ÑÐÐÐ"
+
+#: ../camel/camel-imapx-server.c:3729
+msgid "Failed to close the tmp stream"
+msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÐÑÑÐÐ ÐÐ ÐÑÐÐÐÐÐÐÑ ÐÐÑÐÐ"
+
+#: ../camel/camel-imapx-server.c:3827
+msgid "Error copying messages"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐ"
+
+#: ../camel/camel-imapx-server.c:3962
+msgid "Error appending message"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÐÑÐÐÐÐ ÐÐ ÐÐÑÐÐ"
+
+#: ../camel/camel-imapx-server.c:4149
+msgid "Error fetching message headers"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐÐÐÑÐ ÑÐÑÑÐ ÐÐ ÐÐÑÐÐ"
+
+#: ../camel/camel-imapx-server.c:4295
+msgid "Error retrieving message"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ"
+
+#: ../camel/camel-imapx-server.c:4417 ../camel/camel-imapx-server.c:4622
+#: ../camel/providers/imap/camel-imap-folder.c:4005
+#: ../camel/providers/imap/camel-imap-folder.c:4085
+#, c-format
+msgid "Fetching summary information for new messages in %s"
+msgstr "ÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÑÐÑ ÐÐ ÐÐÐÐ ÐÐÑÐÐ Ð %s"
+
+#: ../camel/camel-imapx-server.c:4476
+#: ../camel/providers/imap/camel-imap-folder.c:1127
+#, c-format
+msgid "Scanning for changed messages in %s"
+msgstr "ÐÑÐÐÐÑÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐ ÐÐÑÐÐ Ð %s"
+
+#: ../camel/camel-imapx-server.c:4518
+msgid "Error fetching new messages"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÐ"
+
+#: ../camel/camel-imapx-server.c:4717
+msgid "Error while fetching messages"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ"
+
+#: ../camel/camel-imapx-server.c:4725 ../camel/camel-imapx-server.c:4757
+#, 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/camel-imapx-server.c:4882 ../camel/camel-imapx-server.c:4918
+msgid "Error refreshing folder"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐ"
+
+#: ../camel/camel-imapx-server.c:5011
+msgid "Error expunging message"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ"
+
+#: ../camel/camel-imapx-server.c:5100
+msgid "Error fetching folders"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐ"
+
+#: ../camel/camel-imapx-server.c:5179
+msgid "Error subscribing to folder"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐ"
+
+#: ../camel/camel-imapx-server.c:5236
+msgid "Error creating folder"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ"
+
+#: ../camel/camel-imapx-server.c:5285
+msgid "Error deleting folder"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÐ"
+
+#: ../camel/camel-imapx-server.c:5339
+msgid "Error renaming folder"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐ"
+
+#: ../camel/camel-imapx-server.c:5394
+msgid "Error performing NOOP"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÑÐÑÑÐ NOOP"
+
+#: ../camel/camel-imapx-server.c:5492
+msgid "Error syncing changes"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÑÐÐÐÐÐÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐ"
+
+#: ../camel/camel-imapx-server.c:6114
+#: ../camel/providers/imap/camel-imap-folder.c:3473
+#, c-format
+msgid "Cannot get message with message ID %s: %s"
+msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ Ñ ÐÐÐÐÑÐÑÐÐÐÑÐÑ %s: %s"
+
+#: ../camel/camel-imapx-server.c:6115
+#: ../camel/providers/imap/camel-imap-folder.c:3474
+msgid "No such message available."
+msgstr "ÐÑÐÐ ÑÐÐÐÐÐ ÐÐÑÐÐ."
+
+#: ../camel/camel-imapx-server.c:6270 ../camel/camel-imapx-server.c:6285
+msgid "Cannot create spool file: "
+msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐ-ÑÐÑÐÐÑ: "
+
+#: ../camel/camel-imapx-store.c:155
+#: ../camel/providers/imap/camel-imap-store.c:810
+#, c-format
+msgid "IMAP server %s"
+msgstr "ÐÑÑÐÑÑ ÐÐ IMAP %s"
+
+#: ../camel/camel-imapx-store.c:158
+#: ../camel/providers/imap/camel-imap-store.c:813
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "ÐÑÐÑÐÐ ÐÐ IMAP ÐÐ %s ÐÐ %s"
+
+#: ../camel/camel-imapx-store.c:249
+#: ../camel/providers/imap/camel-imap-provider.c:98
+#: ../camel/providers/nntp/camel-nntp-provider.c:84
+#: ../camel/providers/pop3/camel-pop3-provider.c:82
+msgid "Password"
+msgstr "ÐÐÑÐÐÐ"
+
+#: ../camel/camel-imapx-store.c:251
+#: ../camel/providers/imap/camel-imap-provider.c:100
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr ""
+"ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐ ÐÐ ÑÐÑÑÐÐ ÑÑÑ ÑÑÑÐÑÑ ÐÐ IMAP ÑÑÐÐ ÐÐÑÐÑÑÐÑÐÐÐ ÐÐÑÐÐÐ."
+
+#: ../camel/camel-imapx-store.c:342
+#: ../camel/providers/imap/camel-imap-store.c:2033
+#: ../camel/providers/imap/camel-imap-store.c:2227
+#, c-format
+msgid "No such folder %s"
+msgstr "ÐÑÐÐ ÑÐÐÐÐÐ ÐÐÐÐÐ â%sâ"
+
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/camel-imapx-store.c:367 ../camel/camel-imapx-store.c:838
+#: ../camel/providers/imap/camel-imap-store.c:272
+#: ../camel/providers/imap/camel-imap-store.c:2640
+#: ../camel/providers/local/camel-maildir-folder.c:474
+#: ../camel/providers/local/camel-maildir-store.c:301
+#: ../camel/providers/local/camel-maildir-store.c:679
+#: ../camel/providers/local/camel-maildir-store.c:685
+#: ../camel/providers/local/camel-maildir-store.c:769
+#: ../camel/providers/local/camel-spool-store.c:387
+msgid "Inbox"
+msgstr "ÐÐÑÐÐÑÐÐ ÐÑÑÐÑ"
+
+#: ../camel/camel-imapx-store.c:1070
+#, c-format
+msgid "Retrieving folder list for %s"
+msgstr "ÐÐÐÐÐÑÐÐÐ ÐÐ ÑÐÐÑÑÐ Ñ ÐÐÐÐÐ ÐÐ â%sâ"
+
+#: ../camel/camel-imapx-store.c:1171
+#: ../camel/providers/nntp/camel-nntp-store.c:1749
+#, c-format
+msgid "No such folder: %s"
+msgstr "ÐÑÐÐ ÑÐÐÐÐÐ ÐÐÐÐÐ: %s"
+
+#: ../camel/camel-imapx-store.c:1384
+#: ../camel/providers/imap/camel-imap-store.c:2046
+#: ../camel/providers/imap/camel-imap-store.c:2484
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "ÐÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐ â%sâ Ð ÐÐÐÑÐÐÐÐÐÐ, ÐÐÑÐÑÐ ÑÑÐÑÑÐÐ ÐÐÐÐÐ â%câ"
+
+#: ../camel/camel-imapx-store.c:1395
+#: ../camel/providers/imap/camel-imap-store.c:2497
+#, c-format
+msgid "Unknown parent folder: %s"
+msgstr "ÐÐÐÐÐÐÑÑÐÐ ÑÐÐÐÑÐÐÑÐÐ ÐÐÐÐÐ: %s"
+
+#: ../camel/camel-imapx-store.c:1405
+#: ../camel/providers/imap/camel-imap-store.c:2109
+#: ../camel/providers/imap/camel-imap-store.c:2548
+#, c-format
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "ÐÐ ÑÐÐÐÑÐÐÑÐÐÑÐ ÐÐÐÐÐ ÐÐ Ð ÑÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐ ÐÐÐÐÐÐÐÐ"
+
+#: ../camel/camel-imapx-stream.c:72
+#, c-format
+msgid "Source stream returned no data"
+msgstr "ÐÐÑÐÐÐÐÑÑ ÐÐÑÐÐ ÐÐ ÐÑÑÐÐ ÐÐÐÐÐ"
+
+#: ../camel/camel-imapx-stream.c:81
+#, c-format
+msgid "Source stream unavailable"
+msgstr "ÐÐÑÐÐÐÐÑÑ ÐÐÑÐÐ ÐÐ Ð ÐÐÐÐÑÐÐ"
 
 #: ../camel/camel-lock.c:102
 #, c-format
@@ -2237,7 +2491,7 @@ msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÑÑÐÐÐ ÐÐ ÐÐÑÐÑ: %s"
 msgid "Could not connect to %s: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ Ñ %s: "
 
-#: ../camel/camel-offline-folder.c:202
+#: ../camel/camel-offline-folder.c:206
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "ÐÐÐÑÑÐÐÐÐÐÑÐÑ ÐÐ ÐÐÑÐÐÑÐ Ð ÐÐÐÐÐ â%sâ Ñ ÐÐÑÐÐ"
@@ -2274,7 +2528,7 @@ msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÐÐÐÐÐ ÐÐ %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÐÐÐÐÐ ÐÐ %s: ÐÑÐÐ ÐÐÐÑÐÐÐÐÐÐÑÐÑ ÐÐÐ Ð ÐÐÐÑÐÐ."
 
-#: ../camel/camel-provider.c:402 ../camel/camel-session.c:384
+#: ../camel/camel-provider.c:410 ../camel/camel-session.c:398
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "ÐÑÐÐ ÐÐÐÐÑÐÐ ÐÐÑÑÐÐÑÐÐ ÐÐ ÐÑÐÑÐÐÐÐ â%sâ"
@@ -2319,11 +2573,11 @@ msgstr ""
 "ÐÑÐÑÐÐ ÑÑÐÑÐÑÐÑÐ ÐÐÑÐÑÐÐÑÐÑ:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:42
+#: ../camel/camel-sasl-cram-md5.c:46
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:44
+#: ../camel/camel-sasl-cram-md5.c:48
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -2331,11 +2585,11 @@ msgstr ""
 "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐ ÐÐ ÑÐÑÑÐÐ ÑÑÑ ÑÑÑÐÑÑÐ ÑÑÐÐ ÑÐÐÑÑÐÐ ÐÐÑÐÐÐ CRAM-MD5, ÐÐÐ "
 "ÑÐÐ Ñ ÐÐÐÐÑÑÐÐ."
 
-#: ../camel/camel-sasl-digest-md5.c:55
+#: ../camel/camel-sasl-digest-md5.c:59
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:57
+#: ../camel/camel-sasl-digest-md5.c:61
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -2343,47 +2597,47 @@ msgstr ""
 "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐ ÐÐ ÑÐÑÑÐÐ ÑÑÑ ÑÑÑÐÑÑÐ ÑÑÐÐ ÑÐÐÑÑÐÐ ÐÐÑÐÐÐ DIGEST-MD5, ÐÐÐ "
 "ÑÐÐ Ñ ÐÐÐÐÑÑÐÐ."
 
-#: ../camel/camel-sasl-digest-md5.c:846
+#: ../camel/camel-sasl-digest-md5.c:850
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "ÐÑÐÐÐÐÐÐÐÐÑÐÐÑÑÐÐÑÐ ÐÑ ÑÑÑÐÑÑÐ Ð ÑÐÑÑÐÐ ÐÑÐÐÐ (>2048 ÐÐÑÐÑÐ)"
 
-#: ../camel/camel-sasl-digest-md5.c:857
+#: ../camel/camel-sasl-digest-md5.c:861
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "ÐÑÐÐÐÐÐÐÐÐÑÐÐÑÑÐÐÑÐ ÐÑ ÑÑÑÐÑÑÐ Ð ÐÐÐÑÐÐÐÐÐÐ\n"
 
-#: ../camel/camel-sasl-digest-md5.c:865
+#: ../camel/camel-sasl-digest-md5.c:869
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr ""
 "ÐÑÐÐÐÐÐÐÐÐÑÐÐÑÑÐÐÑÐ ÐÑ ÑÑÑÐÑÑÐ ÑÑÐÑÑÐÐ ÐÐÐÑÐÐÐÐÐÐ ÑÐÑÑ â âÐÐÑÐÑÑÐÐ ÐÐ ÐÐÑÐÑÐâ"
 
-#: ../camel/camel-sasl-digest-md5.c:898
+#: ../camel/camel-sasl-digest-md5.c:902
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "ÐÑÐÐÐÐÑÑÑ ÐÐ ÑÑÑÐÑÑÐ ÐÐ ÑÑÐÑÑÐÐ ÐÐÐÐÐ ÐÐ ÑÐÑÐÐÐÐÐÑÐÐÐÐÐ"
 
-#: ../camel/camel-sasl-digest-md5.c:919
+#: ../camel/camel-sasl-digest-md5.c:923
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "ÐÑÐÐÐÐÑÑÑ ÐÐ ÑÑÑÐÑÑÐ ÑÑÐÑÑÐÐ ÐÐÐÑÐÐÐ ÐÐÐÐÐ ÐÐ ÑÐÑÐÐÐÐÐÑÐÐÐÐÐ"
 
-#: ../camel/camel-sasl-digest-md5.c:932
+#: ../camel/camel-sasl-digest-md5.c:936
 #, c-format
 msgid "Server response does not match"
 msgstr "ÐÑÐÐÐÐÑÑÑ ÐÐ ÑÑÑÐÑÑÐ ÐÐ ÑÑÐÐÐÐÐ"
 
-#: ../camel/camel-sasl-gssapi.c:87
+#: ../camel/camel-sasl-gssapi.c:91
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:89
+#: ../camel/camel-sasl-gssapi.c:93
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr ""
 "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐ ÐÐ ÑÐÑÑÐÐ ÑÑÑ ÑÑÑÐÑÑÐ ÑÑÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ Kerberos 5."
 
-#: ../camel/camel-sasl-gssapi.c:130
+#: ../camel/camel-sasl-gssapi.c:134
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -2391,18 +2645,18 @@ msgstr ""
 "ÐÐÐÐÐÐÐÑÑ ÐÐÑÐÐÐÐÑÐ ÐÐ ÑÐ ÐÐÐÐÑÑÐÐ ÐÑ ÐÑÐÐÐÑÑÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐÐ ÐÐÐ ÐÐ ÑÐ "
 "ÑÐÐÐÐÐÐÐÐÐ ÐÑ ÑÐÐÐÐÐÐÑÐÑÑÐ."
 
-#: ../camel/camel-sasl-gssapi.c:135
+#: ../camel/camel-sasl-gssapi.c:139
 msgid "The provided target_name parameter was ill-formed."
 msgstr "ÐÐÐÐÐÐÐÐÑÑ ÐÐÑÐÐÐÑÑÑ target_name Ð ÐÐÐ ÑÐÑÐÐÑÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:138
+#: ../camel/camel-sasl-gssapi.c:142
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr ""
 "ÐÐÐÐÐÐÐÐÑÑ ÐÐÑÐÐÐÑÑÑ target_name ÑÑÐÑÑÐÐ ÐÐÐÑÐÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÑÑÐÐÐ ÐÐÐ ÐÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:142
+#: ../camel/camel-sasl-gssapi.c:146
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -2410,7 +2664,7 @@ msgstr ""
 "input_token ÑÑÐÑÑÐÐ ÐÑÑÐÐÐ Ñ ÐÑÐÐÐÐ ÐÐÐÐÐÐ ÑÐÐÐÐÑÐÐ ÐÑ ÐÐÐÐÐÐÐÐÑÐ Ð "
 "ÐÐÑÐÐÐÑÑÑÐ input_chan_bindings."
 
-#: ../camel/camel-sasl-gssapi.c:147
+#: ../camel/camel-sasl-gssapi.c:151
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
@@ -2418,7 +2672,7 @@ msgstr ""
 "input_token ÑÑÐÑÑÐÐ ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÑ ÐÐÐ ÐÐÐÐÐÑ, ÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ "
 "ÐÑÐÐÐÑÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:151
+#: ../camel/camel-sasl-gssapi.c:155
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -2426,52 +2680,52 @@ msgstr ""
 "ÐÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐÐ ÐÐ ÐÐÐÐÑ ÐÐ ÐÐÐÑÐÐÑÑÐ ÐÐ ÐÐÐÑÐÐÐÐÐÐÑÐÑ ÐÐÐ ÑÐÐÐÐÑÐÐÑÑ "
 "ÐÐ ÐÐÑÐÐÐÑÐÑÐÐ ÐÐ ÑÐÑÐ ÐÐÐÐÐÐÐ ÐÐÑÐÐÐÑÐÑÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:156
+#: ../camel/camel-sasl-gssapi.c:160
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "ÐÐÐÐÐÐÐÐÑÑ ÑÐÐÐÐÑÐÐ ÐÐ ÐÐÐÑÐÐÑÑ ÐÐ ÑÐÑÐ ÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÑÐÐÑÑ."
 
-#: ../camel/camel-sasl-gssapi.c:159
+#: ../camel/camel-sasl-gssapi.c:163
 msgid "The consistency checks performed on the input_token failed."
 msgstr "ÐÑÐÐÐÑÐÐÑÐ ÐÐ input_token ÐÐ ÐÐÑÐÐÐÐÐÐÑÐÐÐÐÑÑ ÑÐ ÐÐÑÑÐÐÑÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:162
+#: ../camel/camel-sasl-gssapi.c:166
 msgid "The consistency checks performed on the credential failed."
 msgstr "ÐÑÐÐÐÑÐÐÑÐ ÐÐ ÐÐÑÐÐÐÐÐÐÑÐÐÐÐÑÑ ÐÐ ÐÐÑÐÐÐÑÐÑÐÐÑÐ ÑÐ ÐÐÑÑÐÐÑÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:165
+#: ../camel/camel-sasl-gssapi.c:169
 msgid "The referenced credentials have expired."
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐÐ ÑÐ ÐÐÑÐÐÐÐ."
 
-#: ../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
+#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:337
+#: ../camel/camel-sasl-gssapi.c:381 ../camel/camel-sasl-gssapi.c:398
+#: ../camel/providers/smtp/camel-smtp-transport.c:563
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÑ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÑ ÑÑÑÐÑÑÐ."
 
-#: ../camel/camel-sasl-gssapi.c:406
+#: ../camel/camel-sasl-gssapi.c:410
 #, c-format
 msgid "Unsupported security layer."
 msgstr "ÐÐÐÐÐÐÑÑÐÐÐ ÑÐÐÐ ÐÐ ÑÐÐÑÑÐÐÑÑ."
 
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:40
 msgid "Login"
 msgstr "ÐÐÐÐÑÐÑÐÑÐÑÐÐÐ"
 
-#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:42
+#: ../camel/camel-sasl-login.c:42 ../camel/camel-sasl-plain.c:46
 msgid "This option will connect to the server using a simple password."
 msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐ ÐÐ ÑÐÑÑÐÐ ÑÑÑ ÑÑÑÐÑÑÐ ÑÑÐÐ ÐÐÑÐÑÑÐÑÐÐÐ ÐÐÑÐÐÐ."
 
-#: ../camel/camel-sasl-login.c:103
+#: ../camel/camel-sasl-login.c:107
 #, c-format
 msgid "Unknown authentication state."
 msgstr "ÐÐÐÐÐÐÑÑÐÐ ÑÑÑÑÐÑÐÐÐ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ."
 
-#: ../camel/camel-sasl-ntlm.c:43
+#: ../camel/camel-sasl-ntlm.c:47
 msgid "NTLM / SPA"
 msgstr "NTLM/SPA"
 
-#: ../camel/camel-sasl-ntlm.c:45
+#: ../camel/camel-sasl-ntlm.c:49
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -2479,28 +2733,28 @@ msgstr ""
 "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐ ÐÐ ÑÐÑÑÐÐ ÑÑÑ ÑÑÑÐÑÑ, ÐÐÐÐÑÐÐ ÐÐ âÐÐÐÐÐÑÑâ, ÑÑÐÐ NTLM/"
 "Secure Password Authentication."
 
-#: ../camel/camel-sasl-plain.c:40
+#: ../camel/camel-sasl-plain.c:44
 msgid "PLAIN"
 msgstr "ÐÐÐÐÐÐÐÐÐÐ"
 
-#: ../camel/camel-sasl-popb4smtp.c:42
+#: ../camel/camel-sasl-popb4smtp.c:46
 msgid "POP before SMTP"
 msgstr "POP ÐÑÐÐÐ SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:44
+#: ../camel/camel-sasl-popb4smtp.c:48
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐ ÑÐÑÐÐÐÐÐÑÐ ÐÑÑÐÐÐ ÐÐ POP ÐÑÐÐÐ SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:80
+#: ../camel/camel-sasl-popb4smtp.c:84
 msgid "POP Source UID"
 msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÐ ÐÐÑÐÑÐÐÐÐ ÐÐ POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:92
+#: ../camel/camel-sasl-popb4smtp.c:96
 #, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "POP ÐÑÐÐÐ ÑÐÑÐÐÐÐÐÑÐÐÐÐÐ ÐÐ SMTP ÑÑÐÐ ÐÐÐÐÐÐÑÑÐÐ ÑÑÐÐÑÐÐÑÑ"
 
-#: ../camel/camel-sasl-popb4smtp.c:104 ../camel/camel-sasl-popb4smtp.c:114
+#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:118
 #, c-format
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "POP ÐÑÐÐÐ ÑÐÑÐÐÐÐÐÑÐÐÐÐÐ ÐÐ SMTP ÑÑÐÐ ÑÑÐÑÐÐ %s"
@@ -2510,276 +2764,271 @@ msgstr "POP ÐÑÐÐÐ ÑÐÑÐÐÐÐÐÑÐÐÐÐÐ ÐÐ SMTP ÑÑÐÐ ÑÑÐÑ
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐÐÐ ÐÐ ÑÐÐÑÐÑÑÐÐ ÐÐÑÐÐ: %s: %s"
 
-#: ../camel/camel-session.c:393
+#: ../camel/camel-session.c:407
 #, c-format
 msgid "Invalid GType registered for protocol '%s'"
 msgstr "ÐÐÐÐÑÑÑÐÑÐÐ Ð ÐÐÐÑÐÐÐÐÐÐ ÐÐÐ GType ÐÐ ÐÑÐÑÐÐÐÐÐ â%sâ"
 
-#: ../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 "No support for %s authentication"
-msgstr "ÐÑÐÐ ÐÐÐÐÑÑÐÐÐ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ %s"
-
-#: ../camel/camel-session.c:477
+#: ../camel/camel-session.c:501
 #, c-format
 msgid "%s authentication failed"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÐ %s"
 
-#: ../camel/camel-session.c:1183
+#: ../camel/camel-session.c:1239
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐ ÐÐ %s ÐÐ %s ÐÐ ÑÐÑÑÐ %s."
 
-#: ../camel/camel-smime-context.c:347 ../camel/camel-smime-context.c:1053
+#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1057
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ÑÐÑÑÐÑÐÐÐÑ ÐÐ â%sâ"
 
-#: ../camel/camel-smime-context.c:375
+#: ../camel/camel-smime-context.c:379
 msgid "Cannot create CMS message"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÑÑÐÐÑÐÐÐÐ ÐÐ CMS"
 
-#: ../camel/camel-smime-context.c:380
+#: ../camel/camel-smime-context.c:384
 msgid "Cannot create CMS signed data"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐ ÐÐ CMS"
 
-#: ../camel/camel-smime-context.c:386
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS signed data"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÑÐÐÑÐÐ ÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐ ÐÐ CMS"
 
-#: ../camel/camel-smime-context.c:393
+#: ../camel/camel-smime-context.c:397
 msgid "Cannot attach CMS data"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÑÐÐÑÐÐ ÐÐ ÐÐÐÐÐ ÐÐ CMS"
 
-#: ../camel/camel-smime-context.c:399
+#: ../camel/camel-smime-context.c:403
 msgid "Cannot create CMS Signer information"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐÐÑÐÑ ÐÐ ÐÐÐÐÐÑ ÐÐ CMS"
 
-#: ../camel/camel-smime-context.c:405
+#: ../camel/camel-smime-context.c:409
 msgid "Cannot find certificate chain"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ÑÐÐÑÑÐÐÐÑÐÑÐÐÑÐÐÑÐ ÐÐÑÐÐÐ"
 
-#: ../camel/camel-smime-context.c:411
+#: ../camel/camel-smime-context.c:415
 msgid "Cannot add CMS Signing time"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐ ÐÐ CMS"
 
-#: ../camel/camel-smime-context.c:435 ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:439 ../camel/camel-smime-context.c:454
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "ÐÐÑÑÐÑÐÐÐÑÑÑ ÐÐ ÑÐÑÑÐÑÐÐÐ ÐÐ â%sâ ÐÐ ÑÑÑÐÑÑÐÑÐÐ"
 
-#: ../camel/camel-smime-context.c:457
+#: ../camel/camel-smime-context.c:461
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÑÑÐÐÑÑÐ SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:462
+#: ../camel/camel-smime-context.c:466
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÑÑÐÐÑÑÐ MS SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:467
+#: ../camel/camel-smime-context.c:471
 msgid "Cannot add encryption certificate"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÑÐÑÑÐÑÐÐÐÑ ÐÐ ÑÐÑÑÐÑÐÐÐ"
 
-#: ../camel/camel-smime-context.c:473
+#: ../camel/camel-smime-context.c:477
 msgid "Cannot add CMS Signer information"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÑÐÐÑÐÑ ÐÐ ÐÐÐÐÐÑ ÐÑÐ CMS"
 
 #. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../camel/camel-smime-context.c:506
+#: ../camel/camel-smime-context.c:510
 msgid "Unverified"
 msgstr "ÐÐÐÐÑÐÑÑÐÐÐ"
 
-#: ../camel/camel-smime-context.c:508
+#: ../camel/camel-smime-context.c:512
 msgid "Good signature"
 msgstr "ÐÑÐÐÐÐÐÐ ÐÐÐÐÐÑ"
 
-#: ../camel/camel-smime-context.c:510
+#: ../camel/camel-smime-context.c:514
 msgid "Bad signature"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÑ"
 
-#: ../camel/camel-smime-context.c:512
+#: ../camel/camel-smime-context.c:516
 msgid "Content tampered with or altered in transit"
 msgstr "ÐÑÐÑÑÐÐÐÐÐÑÐ Ð ÐÐÐÑÐÐÐÐÐ ÐÐÐ ÐÑÐÐÐÐÐÐÐ ÐÑÐ ÐÑÐÐÐÑÑÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:514
+#: ../camel/camel-smime-context.c:518
 msgid "Signing certificate not found"
 msgstr "ÐÐÑÑÐÑÐÐÐÑÑÑ ÐÐ ÐÐÐÐÐÑÐÐÐÐ ÐÐ Ð ÐÑÐÑÐÑ"
 
-#: ../camel/camel-smime-context.c:516
+#: ../camel/camel-smime-context.c:520
 msgid "Signing certificate not trusted"
 msgstr "ÐÐÑÑÐÑÐÐÐÑÑÑ ÐÐ ÐÐÐÐÐÑÐÐÐÐ ÐÐ Ð ÐÐÐÐÐÐÐÐ"
 
-#: ../camel/camel-smime-context.c:518
+#: ../camel/camel-smime-context.c:522
 msgid "Signature algorithm unknown"
 msgstr "ÐÐÐÐÐÐÑÑÐÐ ÐÐÐÐÑÐÑÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐ"
 
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:524
 msgid "Signature algorithm unsupported"
 msgstr "ÐÐÐÐÑÐÑÑÐÑÑ ÐÐ ÐÐÐÐÐÑÐÐÐÐ ÐÐ ÑÐ ÐÐÐÐÑÑÐÐ"
 
-#: ../camel/camel-smime-context.c:522
+#: ../camel/camel-smime-context.c:526
 msgid "Malformed signature"
 msgstr "ÐÐÑÐ ÑÐÑÐÐÑÐÑÐÐ ÐÐÐÐÐÑ"
 
-#: ../camel/camel-smime-context.c:524
+#: ../camel/camel-smime-context.c:528
 msgid "Processing error"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÐÐÑÐÐÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:569
+#: ../camel/camel-smime-context.c:573
 msgid "No signed data in signature"
 msgstr "ÐÑÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐ Ð ÐÐÐÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:574
+#: ../camel/camel-smime-context.c:578
 msgid "Digests missing from enveloped data"
 msgstr "ÐÐÐÑÐÐÑ ÐÐÐÐÐÐÐÑÐ ÐÑ ÐÐÑÐÐÐÐÑÐÑÐ ÐÐÐÐÐ"
 
-#: ../camel/camel-smime-context.c:587 ../camel/camel-smime-context.c:598
+#: ../camel/camel-smime-context.c:591 ../camel/camel-smime-context.c:602
 msgid "Cannot calculate digests"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÑÐ ÐÐÑÐÑÐÑÑ"
 
-#: ../camel/camel-smime-context.c:605 ../camel/camel-smime-context.c:609
+#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:613
 msgid "Cannot set message digests"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÐÑÐÐÑ ÐÐÐÐÐÐÐÐ"
 
-#: ../camel/camel-smime-context.c:619 ../camel/camel-smime-context.c:624
+#: ../camel/camel-smime-context.c:623 ../camel/camel-smime-context.c:628
 msgid "Certificate import failed"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐ ÐÐ ÑÐÑÑÐÑÐÐÐÑ"
 
-#: ../camel/camel-smime-context.c:634
+#: ../camel/camel-smime-context.c:638
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr ""
 "ÐÐÑÑÐÑÐÐÐÑÑÑ Ð ÐÐÐÐÑÑÐÐÐÐÑÐ ÑÑÐÐÑÐÐÐÐ. ÐÐÑÑÐÑÐÐÐÑÑÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÑÐÑÑÐÐ."
 
-#: ../camel/camel-smime-context.c:637
+#: ../camel/camel-smime-context.c:641
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr ""
 "ÐÐÑÑÐÑÐÐÐÑÑÑ Ð ÐÐÐÐÑÑÐÐÐÐÑÐ ÑÑÐÐÑÐÐÐÐ. ÐÐÑÑÐÑÐÐÐÑÐÑÐ ÑÐ ÐÐÐÑÐÐÐ Ð ÐÐÑÐÑÑÐÐÐÐ."
 
-#: ../camel/camel-smime-context.c:641
+#: ../camel/camel-smime-context.c:645
 msgid "Cannot find signature digests"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐÑÐ"
 
-#: ../camel/camel-smime-context.c:657
+#: ../camel/camel-smime-context.c:661
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ÐÐÐÐÐÑÐÐÑ: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:838 ../camel/camel-smime-context.c:1126
+#: ../camel/camel-smime-context.c:842 ../camel/camel-smime-context.c:1130
 msgid "Cannot create encoder context"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÑÑ ÐÐ ÑÐÑÑÐÑÐÐÐ"
 
-#: ../camel/camel-smime-context.c:844
+#: ../camel/camel-smime-context.c:848
 msgid "Failed to add data to CMS encoder"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐ ÐÑÐ ÐÐÐÐÑÐÑ CMS"
 
-#: ../camel/camel-smime-context.c:849 ../camel/camel-smime-context.c:1143
+#: ../camel/camel-smime-context.c:853 ../camel/camel-smime-context.c:1147
 msgid "Failed to encode data"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐ"
 
-#: ../camel/camel-smime-context.c:992 ../camel/camel-smime-context.c:1239
+#: ../camel/camel-smime-context.c:996 ../camel/camel-smime-context.c:1243
 msgid "Decoder failed"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐÑÐÐÐ"
 
-#: ../camel/camel-smime-context.c:1061
+#: ../camel/camel-smime-context.c:1065
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÑÑ ÐÐÐÐÑÐÑÑÐ ÐÐ ÑÐÑÑÐÑÐÐÐ ÐÐ ÐÐÐÐÐ ÐÐÐÐÐ"
 
-#: ../camel/camel-smime-context.c:1069
+#: ../camel/camel-smime-context.c:1073
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÑÑÑÐ ÐÐ ÐÐÑÑ ÐÐ ÑÐÑÑÐÑÐÐÐ ÐÐ ÐÐÐÐÐ ÐÐÐÐÐ"
 
-#: ../camel/camel-smime-context.c:1080
+#: ../camel/camel-smime-context.c:1084
 msgid "Cannot create CMS Message"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÑÑÐÐÑÐÐÐÐ ÐÐ CMS"
 
-#: ../camel/camel-smime-context.c:1086
+#: ../camel/camel-smime-context.c:1090
 msgid "Cannot create CMS Enveloped data"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÐÐÐ ÐÐ CMS"
 
-#: ../camel/camel-smime-context.c:1092
+#: ../camel/camel-smime-context.c:1096
 msgid "Cannot attach CMS Enveloped data"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÐÐÐ ÐÐ CMS"
 
-#: ../camel/camel-smime-context.c:1098
+#: ../camel/camel-smime-context.c:1102
 msgid "Cannot attach CMS data object"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÑÐÐÑÐÐ ÐÐ ÐÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÐ CMS"
 
-#: ../camel/camel-smime-context.c:1107
+#: ../camel/camel-smime-context.c:1111
 msgid "Cannot create CMS Recipient information"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐÐÑÐÑ ÐÐ ÐÐÐÑÑÐÑÐÐ ÐÐ CMS"
 
-#: ../camel/camel-smime-context.c:1112
+#: ../camel/camel-smime-context.c:1116
 msgid "Cannot add CMS Recipient information"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÑÐÐÑÐÑ ÐÐ ÐÐÐÑÑÐÑÐÐ ÐÐ CMS"
 
-#: ../camel/camel-smime-context.c:1137
+#: ../camel/camel-smime-context.c:1141
 msgid "Failed to add data to encoder"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐ ÐÑÐ ÐÐÐÐÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:1246
+#: ../camel/camel-smime-context.c:1250
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "ÐÐÑÐÑÑÐÑÐÐÐ S/MIME: ÐÐ Ð ÐÑÐÑÐÑÐ ÑÐÑÑÐÑÐÐÐ ÑÑÐÑÑÐÐÐÐÐ"
 
-#: ../camel/camel-store.c:1799
+#: ../camel/camel-store.c:1838
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ: ÐÐÑÐ ÑÑÑÐÑÑÐÑÐÐ"
 
-#: ../camel/camel-store.c:1842
+#: ../camel/camel-store.c:1881
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "ÐÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐÑÐ â%sâ"
 
-#: ../camel/camel-store.c:2027
+#: ../camel/camel-store.c:2066
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "ÐÑÑÑÐÐÐ Ð ÐÐÐÐÐÑÐ Ð â%sâ"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2039 ../camel/camel-store.c:2049
+#: ../camel/camel-store.c:2078 ../camel/camel-store.c:2088
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "ÐÐÑÑÐ"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2042 ../camel/camel-store.c:2053
+#: ../camel/camel-store.c:2081 ../camel/camel-store.c:2092
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "ÐÐÐÐ"
 
-#: ../camel/camel-store.c:2501
+#: ../camel/camel-store.c:2540
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ: %s: ÐÐÑÐ ÑÑÑÐÑÑÐÑÐÐ"
 
-#: ../camel/camel-store.c:2515
+#: ../camel/camel-store.c:2554
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐ â%sâ"
 
-#: ../camel/camel-store.c:2633 ../camel/camel-vee-store.c:352
+#: ../camel/camel-store.c:2672 ../camel/camel-vee-store.c:410
 #: ../camel/providers/local/camel-maildir-store.c:300
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÐ: %s: ÐÑÐÑÐÐ ÐÐÐÑÐÑÐÑ"
 
-#: ../camel/camel-store.c:2776 ../camel/camel-vee-store.c:402
-#: ../camel/providers/local/camel-maildir-store.c:764
+#: ../camel/camel-store.c:2815 ../camel/camel-vee-store.c:460
+#: ../camel/providers/local/camel-maildir-store.c:768
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐ: %s: ÐÑÐÑÐÐ ÐÐÐÑÐÑÐÑ"
 
-#: ../camel/camel-stream-filter.c:327
+#: ../camel/camel-stream-filter.c:334
 msgid "Only reset to beginning is supported with CamelStreamFilter"
 msgstr "CamelStreamFilter ÐÐÐÐÑÑÐÐ ÑÐÐÐ ÐÑÑÑÐÐÐ Ð ÐÐÑÐÐÐÑÐ"
 
+#: ../camel/camel-stream-null.c:78
+msgid "Only reset to beginning is supported with CamelHttpStream"
+msgstr ""
+"ÐÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ CamelHttpStream ÑÐ ÐÐÐÐÑÑÐÐ ÐÐÐÐÑÑÐÐÐÐ ÐÑÑÑÐÐÐ Ð ÐÐÑÐÐÐÑÐ"
+
 #: ../camel/camel-stream-process.c:267
 #, c-format
 msgid "Connection cancelled"
@@ -2790,90 +3039,90 @@ msgstr "ÐÑÑÐÐÐÑÐ Ð ÐÑÐÐÑÐÑÐÐÐ"
 msgid "Could not connect with command \"%s\": %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ Ñ ÐÐÐÐÐÐÐ â%sâ: %s"
 
-#: ../camel/camel-tcp-stream-raw.c:303
+#: ../camel/camel-tcp-stream-raw.c:310
 #, c-format
 msgid "NSPR error code %d"
 msgstr "ÐÐÐ ÐÐ ÐÑÐÑÐÐ ÐÐ NSPR: %d"
 
-#: ../camel/camel-tcp-stream-raw.c:640 ../camel/camel-tcp-stream-raw.c:651
+#: ../camel/camel-tcp-stream-raw.c:647 ../camel/camel-tcp-stream-raw.c:658
 #, c-format
 msgid "The proxy host does not support SOCKS4"
 msgstr "ÐÑÑÐÑÑÑÑ-ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÑÑÐÐ SOCKS4"
 
-#: ../camel/camel-tcp-stream-raw.c:662
+#: ../camel/camel-tcp-stream-raw.c:669
 #, c-format
 msgid "The proxy host denied our request: code %d"
 msgstr "ÐÑÑÐÑÑÑÑ-ÐÐÑÑÐÐÐÐÐ ÐÑÐÐÐÐ ÐÐÑÐÐÐÑÐ: ÐÐÐ %d"
 
-#: ../camel/camel-tcp-stream-raw.c:758 ../camel/camel-tcp-stream-raw.c:764
+#: ../camel/camel-tcp-stream-raw.c:765 ../camel/camel-tcp-stream-raw.c:771
 #, c-format
 msgid "The proxy host does not support SOCKS5"
 msgstr "ÐÑÑÐÑÑÑÑ-ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÑÑÐÐ SOCKS5"
 
-#: ../camel/camel-tcp-stream-raw.c:770
+#: ../camel/camel-tcp-stream-raw.c:777
 #, c-format
 msgid "Could not find a suitable authentication type: code 0x%x"
 msgstr "ÐÐÐÑÐÐ ÐÐÐÑÐÐÑÑ ÐÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ: ÐÐÐ 0x%x"
 
-#: ../camel/camel-tcp-stream-raw.c:782
+#: ../camel/camel-tcp-stream-raw.c:789
 msgid "General SOCKS server failure"
 msgstr "ÐÐÑÐ ÐÑÐÑÐÐ ÐÑ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:783
+#: ../camel/camel-tcp-stream-raw.c:790
 msgid "SOCKS server's rules do not allow connection"
 msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐ SOCKS ÐÐ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐÑÐÐÑ ÐÑÑÐÐÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:784
+#: ../camel/camel-tcp-stream-raw.c:791
 msgid "Network is unreachable from SOCKS server"
 msgstr "ÐÑÐÐÐÑÐ Ð ÐÐÐÐÑÑÑÐÐÐ ÐÑ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:785
+#: ../camel/camel-tcp-stream-raw.c:792
 msgid "Host is unreachable from SOCKS server"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐ Ð ÐÐÐÐÑÑÑÐÐÐ ÐÑ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:786
+#: ../camel/camel-tcp-stream-raw.c:793
 msgid "Connection refused"
 msgstr "ÐÑÑÐÐÐÑÐ Ð ÐÑÐÐÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:787
+#: ../camel/camel-tcp-stream-raw.c:794
 msgid "Time-to-live expired"
 msgstr "ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:788
+#: ../camel/camel-tcp-stream-raw.c:795
 msgid "Command not supported by SOCKS server"
 msgstr "ÐÑÑÐÑÑÑÑ-ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÑÑÐÐ ÑÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:789
+#: ../camel/camel-tcp-stream-raw.c:796
 msgid "Address type not supported by SOCKS server"
 msgstr "ÐÑÑÐÑÑÑÑ-ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÑÑÐÐ ÑÐÐÐ ÐÐÐ ÐÐÑÐÑÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:790
+#: ../camel/camel-tcp-stream-raw.c:797
 msgid "Unknown error from SOCKS server"
 msgstr "ÐÐÐÐÐÐÑÑÐÐ ÐÑÐÑÐÐ ÐÑ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:823
+#: ../camel/camel-tcp-stream-raw.c:830
 #, c-format
 msgid "Got unknown address type from SOCKS server"
 msgstr "ÐÐÐÑÑÐÐ Ð ÐÐÐÐÐÐÐÑ ÐÐÐ ÐÐÑÐÑ ÐÑ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:841
+#: ../camel/camel-tcp-stream-raw.c:848
 #, c-format
 msgid "Incomplete reply from SOCKS server"
 msgstr "ÐÐÐÑÐÐÐ ÐÑÐÐÐÐÑ ÐÑ ÑÑÑÐÑÑÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:861
+#: ../camel/camel-tcp-stream-raw.c:868
 #, c-format
 msgid "Hostname is too long (maximum is 255 characters)"
 msgstr "ÐÐÐÑÑÐÐÐÑÐ ÐÐÐ ÐÐ ÐÐÐÐÑÑÑÑ Ð ÐÑÐÐÐÐÐÐÐ ÐÑÐÐÐ (ÐÐÐÑÐÐÑÐÑÑ Ð 255 ÐÐÐÐÐ)"
 
 #. SOCKS5
 #. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:893 ../camel/camel-tcp-stream-raw.c:903
+#: ../camel/camel-tcp-stream-raw.c:900 ../camel/camel-tcp-stream-raw.c:910
 #, c-format
 msgid "Invalid reply from proxy server"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÑÐÐÐÐÑ ÐÑ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-ssl.c:470
+#: ../camel/camel-tcp-stream-ssl.c:502
 #, c-format
 msgid ""
 "   Issuer:       %s\n"
@@ -2886,16 +3135,16 @@ msgstr ""
 "   ÐÑÐÐÑÐÑÑÐ:        %s\n"
 "   ÐÐÐÐÐÑ:           %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:476
+#: ../camel/camel-tcp-stream-ssl.c:508
 msgid "GOOD"
 msgstr "ÐÐÐÐÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-ssl.c:476
+#: ../camel/camel-tcp-stream-ssl.c:508
 msgid "BAD"
 msgstr "ÐÐÐÐÐÐÐÐÐÐ"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:480
+#: ../camel/camel-tcp-stream-ssl.c:512
 #, c-format
 msgid ""
 "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
@@ -2908,19 +3157,19 @@ msgstr ""
 "ÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐÐÑÐÑ ÐÐ ÑÐÑÑÐÑÐÐÐÑÐ:\n"
 "%s"
 
-#: ../camel/camel-tcp-stream-ssl.c:484
+#: ../camel/camel-tcp-stream-ssl.c:516
 msgid "_Reject"
 msgstr "_ÐÑÑÐÑÑÐÑÐÐ"
 
-#: ../camel/camel-tcp-stream-ssl.c:485
+#: ../camel/camel-tcp-stream-ssl.c:517
 msgid "Accept _Temporarily"
 msgstr "_ÐÑÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-ssl.c:486
+#: ../camel/camel-tcp-stream-ssl.c:518
 msgid "_Accept Permanently"
 msgstr "_ÐÐÑÑÐÑÐÐÐ ÐÑÐÐÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-ssl.c:544
+#: ../camel/camel-tcp-stream-ssl.c:579
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2929,7 +3178,7 @@ msgstr ""
 "ÐÑÐÐÐÐÐ ÑÑÑ ÑÐÑÑÐÑÐÐÐÑ: %s\n"
 "ÐÐÐÐÑÐÐ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:596
+#: ../camel/camel-tcp-stream-ssl.c:631
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2938,7 +3187,7 @@ msgstr ""
 "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐ ÐÐ ÑÐÑÑÐÑÐÐÐÑÐ: %s\n"
 "ÐÐÐÐÑÐÐ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:614
+#: ../camel/camel-tcp-stream-ssl.c:649
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2947,7 +3196,7 @@ msgstr ""
 "ÐÐÑÐÐÑÐ ÑÐÑÑÐÑÐÐÐÑ: %s\n"
 "ÐÐÐÐÑÐÐ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:631
+#: ../camel/camel-tcp-stream-ssl.c:666
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2961,42 +3210,50 @@ msgstr ""
 msgid "Could not parse URL '%s'"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÑÐ â%sâ"
 
-#: ../camel/camel-vee-folder.c:647
+#: ../camel/camel-vee-folder.c:485
 #, c-format
 msgid "Updating %s folder"
 msgstr "ÐÐÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐ %s"
 
-#: ../camel/camel-vee-folder.c:1321 ../camel/camel-vee-folder.c:1478
+#: ../camel/camel-vee-folder.c:842 ../camel/camel-vee-folder.c:952
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÑÑÐÐÐÐ ÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐ ÐÐÑÐÐÑÐ ÐÑÐ ÐÐÑÑÑÐÐÐÐÑÐ ÐÐÐÐÐ"
 
-#: ../camel/camel-vee-folder.c:1354
+#: ../camel/camel-vee-folder.c:875
 #, c-format
 msgid "No such message %s in %s"
 msgstr "ÐÑÐÐ ÑÐÐÐÐÐ ÐÐÑÐÐ %s Ð %s"
 
-#: ../camel/camel-vee-folder.c:1422
+#: ../camel/camel-vee-folder.c:928
 #, c-format
 msgid "Error storing '%s': "
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÐÐÐÐÑÐ ÐÐ â%sâ: "
 
+#: ../camel/camel-vee-folder.c:1156
+msgid "Automatically _update on change in source folders"
+msgstr "_ÐÐÑÐÐÐÑÐÑÐÐ ÐÐÐÐÐÑÐÐÐÐ ÐÑÐ ÐÑÐÐÑÐÐ Ð ÐÐÐÐÐÑÐ ÐÑÐ ÐÐÑÐÑÐÐÐÐ"
+
 #. Translators: 'Unmatched' is a folder name under Search folders where are shown
 #. * all messages not belonging into any other configured search folder
-#: ../camel/camel-vee-store.c:37
+#: ../camel/camel-vee-store.c:38
 msgid "Unmatched"
 msgstr "ÐÐÑÑÐÐÐÐÐÑÐ"
 
-#: ../camel/camel-vee-store.c:378
+#: ../camel/camel-vee-store.c:436
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÐ: %s: ÐÑÐÐ ÑÐÐÐÐÐ ÐÐÐÐÐ"
 
-#: ../camel/camel-vee-store.c:412
+#: ../camel/camel-vee-store.c:470
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐ: %s: ÐÑÐÐ ÑÐÐÐÐÐ ÐÐÐÐÐ"
 
+#: ../camel/camel-vee-store.c:532
+msgid "Enable _Unmatched folder"
+msgstr "ÐÐÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐ â_ÐÐÑÑÐÐÐÐÐÑÐâ"
+
 #: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÑÐ Ð ÐÐÑÑÐÑÐ"
@@ -3006,23 +3263,23 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÑÐ Ð ÐÐÐÐÐÑÐ ÐÐ ÑÐÐÐ"
 
 #: ../camel/providers/imap/camel-imap-command.c:200
-#: ../camel/providers/imap/camel-imap-command.c:297
+#: ../camel/providers/imap/camel-imap-command.c:299
 #, c-format
 msgid "No output stream"
 msgstr "ÐÐÐÑÐÐ ÐÐÑÐÐÑÑ ÐÐÑÐÐ"
 
 #: ../camel/providers/imap/camel-imap-command.c:208
-#: ../camel/providers/imap/camel-imap-command.c:305
+#: ../camel/providers/imap/camel-imap-command.c:307
 #, c-format
 msgid "No input stream"
 msgstr "ÐÐÐÑÐÐ ÐÑÐÐÑÑ ÐÐÑÐÐ"
 
-#: ../camel/providers/imap/camel-imap-command.c:383
+#: ../camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "ÐÑÑÐÑÑÑÑ ÐÐÐÑÐÐÐÐÐÐ ÑÐ ÐÐÐÐÑÑÐ: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:416
+#: ../camel/providers/imap/camel-imap-command.c:422
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s in folder %s:\n"
@@ -3031,7 +3288,7 @@ msgstr ""
 "ÐÑÐÐÑÐÑÐÐÐÐÐÐÐ ÐÑ ÑÑÑÐÑÑÐ ÐÐ IMAP %s %s Ð ÐÐÐÐÐ %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:420
+#: ../camel/providers/imap/camel-imap-command.c:426
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -3040,98 +3297,67 @@ msgstr ""
 "ÐÑÐÐÑÐÑÐÐÐÐÐÐÐ ÐÑ ÑÑÑÐÑÑÐ ÐÐ IMAP %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:502
+#: ../camel/providers/imap/camel-imap-command.c:508
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "ÐÐÐÑÐÐÐÐÐ ÐÑÐÐÐÐÑ ÐÑ ÑÑÑÐÑÑÐ ÐÐ IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:514
+#: ../camel/providers/imap/camel-imap-command.c:520
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐÐ ÐÐ IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:594
+#: ../camel/providers/imap/camel-imap-command.c:603
 #, c-format
 msgid "Server response ended too soon."
 msgstr "ÐÑÐÐÐÐÑÑÑ ÐÐ ÑÑÑÐÑÑÐ ÐÐÐÑÑÑÐ ÑÐÑÑÐÐ ÐÑÑÐÐ."
 
-#: ../camel/providers/imap/camel-imap-command.c:806
+#: ../camel/providers/imap/camel-imap-command.c:818
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "ÐÑÑÐÑÑÑÑ ÐÐ IMAP ÐÐ ÑÑÐÑÑÐÐ ÐÐÑÐÑÐÐÑÐÑ %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:844
+#: ../camel/providers/imap/camel-imap-command.c:856
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "ÐÐÐÑÐÐÐÐÐ ÐÑÐÐÐÐÑ OK ÐÑ ÑÑÑÐÑÑÐ ÐÐ IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:344
+#: ../camel/providers/imap/camel-imap-folder.c:348
 msgid "Always check for _new mail in this folder"
 msgstr "_ÐÐÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÐÑÑÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐ Ð ÑÐÐÐ ÐÐÐÐÐ"
 
-#: ../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
+#: ../camel/providers/imap/camel-imap-folder.c:439
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ %s: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:458
+#: ../camel/providers/imap/camel-imap-folder.c:460
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐ â%sâ"
 
-#: ../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:3473
+#: ../camel/providers/imap/camel-imap-folder.c:3436
 msgid "Unable to retrieve message: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐÑÐ: "
 
-#: ../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:3511
-#: ../camel/providers/imapx/camel-imapx-server.c:5512
-msgid "No such message available."
-msgstr "ÐÑÐÐ ÑÐÐÐÐÐ ÐÐÑÐÐ."
-
-#: ../camel/providers/imap/camel-imap-folder.c:3586
-#: ../camel/providers/imap/camel-imap-folder.c:4464
-#: ../camel/providers/nntp/camel-nntp-folder.c:511
+#: ../camel/providers/imap/camel-imap-folder.c:3547
+#: ../camel/providers/imap/camel-imap-folder.c:4417
+#: ../camel/providers/nntp/camel-nntp-folder.c:493
 #, c-format
 msgid "This message is not currently available"
 msgstr "ÐÐÐÐ ÐÐÑÐÐ ÐÐ Ð ÐÐÐÐÑÐÐ Ð ÐÐÐÐÐÑÐ"
 
-#: ../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:4262
+#: ../camel/providers/imap/camel-imap-folder.c:4216
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "ÐÐÐÑÐÐÐ ÐÑÐÐÐÐÑ ÐÑ ÑÑÑÐÑÑÐ: ÐÑÐÐ ÐÐÐÐÐ ÐÐ ÐÐÑÐÐ %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4272
+#: ../camel/providers/imap/camel-imap-folder.c:4226
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "ÐÐÐÑÐÐÐ ÐÑÐÐÐÐÑ ÐÑ ÑÑÑÐÑÑÐ: ÐÐÑÐÐ %d ÐÑÐÐ ÑÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4504
+#: ../camel/providers/imap/camel-imap-folder.c:4454
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ÑÑÐÐÑÐ ÐÐ ÐÐÑÐÐÑÐ Ð ÐÑÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÐÐÑÐ FETCH."
@@ -3157,209 +3383,95 @@ msgid "Failed to cache %s: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐ %s: "
 
 #: ../camel/providers/imap/camel-imap-provider.c:40
-#: ../camel/providers/imapx/camel-imapx-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:38
 msgid "Checking for New Mail"
 msgstr "ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐ"
 
 #: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
 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:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "ÐÑÐÐÐÑÐÐ ÐÐ _ÐÐÐÐ ÐÐÑÐÐ Ð ÐÐÐÐÐÑÐÐÐÑÐ ÐÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:52
-msgid "Connection to Server"
-msgstr "ÐÐÑÑÐÐÐÐÐ ÑÑÑ ÑÑÑÐÑÑÐ"
-
-#: ../camel/providers/imap/camel-imap-provider.c:50
-#: ../camel/providers/imapx/camel-imapx-provider.c:54
-msgid "_Use custom command to connect to server"
-msgstr "_ÐÐÐÐÐÐÐÐÐÐ ÐÐ ÐÑÑÐÐ ÐÐÐÐÐÐÐ ÐÐ ÐÑÑÐÐÐ ÑÑÑ ÑÑÑÐÑÑÐ"
-
-#: ../camel/providers/imap/camel-imap-provider.c:52
-msgid "Co_mmand:"
-msgstr "_ÐÐÐÐÐÐÐ:"
-
-#: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:62
+#: ../camel/providers/imap/camel-imap-provider.c:47
+#: ../camel/providers/imapx/camel-imapx-provider.c:49
 #: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "Folders"
 msgstr "ÐÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:58
-#: ../camel/providers/imapx/camel-imapx-provider.c:64
+#: ../camel/providers/imap/camel-imap-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:51
 msgid "_Show only subscribed folders"
 msgstr "_ÐÐÐÐÐÐÐÐÐ ÑÐÐÐ ÐÐ ÐÐÐÐÐÑÐÐÐÑÐ ÐÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imapx/camel-imapx-provider.c:67
+#: ../camel/providers/imap/camel-imap-provider.c:51
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
 msgid "O_verride server-supplied folder namespace"
 msgstr "Ð_ÑÐÑÐÐ ÐÐ ÐÑÐÑÑÑÐÐÑÑÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐÐ ÐÑ ÑÑÑÐÑÑÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:62
+#: ../camel/providers/imap/camel-imap-provider.c:53
 msgid "Names_pace:"
 msgstr "_ÐÑÐÑÑÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐ:"
 
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imapx/camel-imapx-provider.c:72
-#: ../camel/providers/local/camel-local-provider.c:42
-#: ../camel/providers/local/camel-local-provider.c:84
-#: ../camel/providers/local/camel-local-provider.c:105
+#: ../camel/providers/imap/camel-imap-provider.c:55
+#: ../camel/providers/imapx/camel-imapx-provider.c:59
+#: ../camel/providers/local/camel-local-provider.c:41
+#: ../camel/providers/local/camel-local-provider.c:77
+#: ../camel/providers/local/camel-local-provider.c:97
 #: ../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
+#: ../camel/providers/imap/camel-imap-provider.c:57
+#: ../camel/providers/imapx/camel-imapx-provider.c:61
 #: ../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
+#: ../camel/providers/imap/camel-imap-provider.c:59
+#: ../camel/providers/imapx/camel-imapx-provider.c:63
 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
+#: ../camel/providers/imap/camel-imap-provider.c:61
+#: ../camel/providers/imapx/camel-imapx-provider.c:65
 msgid "Check new messages for _Junk contents"
 msgstr "ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÑÐÐ ÐÐ _ÑÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
-#: ../camel/providers/imapx/camel-imapx-provider.c:80
+#: ../camel/providers/imap/camel-imap-provider.c:63
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
 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
+#: ../camel/providers/imap/camel-imap-provider.c:65
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "ÐÐÑÐÐÐÑÐÑÐÐ ÐÐÐÐÐÐÐ ÑÐÐÑÑÐÐÐ_ÐÐÑÐÐÐ ÐÐ ÐÑÐÐÐÐÑÐÐÐÑÐ ÐÐÑÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:80
+#: ../camel/providers/imap/camel-imap-provider.c:71
 msgid "IMAP default port"
 msgstr "ÐÑÐÐÐÐÑÑÐÐ ÐÐÑÑ ÐÐ IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:81
-#: ../camel/providers/imapx/camel-imapx-provider.c:89
+#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "IMAP over SSL"
 msgstr "IMAP ÐÑÐÐ SSL"
 
-#: ../camel/providers/imap/camel-imap-provider.c:87
+#: ../camel/providers/imap/camel-imap-provider.c:78
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:89
-#: ../camel/providers/imapx/camel-imapx-provider.c:98
+#: ../camel/providers/imap/camel-imap-provider.c:80
+#: ../camel/providers/imapx/camel-imapx-provider.c:85
 msgid "For reading and storing mail on IMAP servers."
 msgstr "ÐÐ ÑÐÑÐÐÐ Ð ÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐ ÐÐ ÑÑÑÐÑÑÐ ÐÐ IMAP."
 
-#: ../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: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: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: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: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: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:734
-#: ../camel/providers/imapx/camel-imapx-server.c:2935
-#, c-format
-msgid "IMAP server %s does not support %s authentication"
-msgstr "ÐÑÑÐÑÑÑÑ ÐÐ IMAP %s ÐÐ ÐÐÐÐÑÑÐÐ ÐÐÑÐÐÐÐÑ ÐÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ %s"
-
-#: ../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: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: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: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: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:2196
+#: ../camel/providers/imap/camel-imap-store.c:2158
 #: ../camel/providers/local/camel-maildir-store.c:268
 #: ../camel/providers/local/camel-mbox-store.c:421
 #: ../camel/providers/local/camel-mh-store.c:558
@@ -3367,200 +3479,61 @@ msgstr "ÐÐ ÑÐÐÐÑÐÐÑÐÐÑÐ ÐÐÐÐÐ ÐÐ Ð ÑÐÐÑÐÑÐÐÐ ÐÐ
 msgid "Cannot create folder '%s': folder exists."
 msgstr "ÐÐÐÐÐÑÐ â%sâ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÑÑÐÐÐÐÐÐÐ: ÐÐÑÐ ÑÑÑÐÑÑÐÑÐÐ."
 
-#: ../camel/providers/imap/camel-imap-store.c:2551
-#: ../camel/providers/imapx/camel-imapx-store.c:1399
+#: ../camel/providers/imap/camel-imap-store.c:2921
 #, c-format
-msgid "Unknown parent folder: %s"
-msgstr "ÐÐÐÐÐÐÑÑÐÐ ÑÐÐÐÑÐÐÑÐÐ ÐÐÐÐÐ: %s"
+msgid "Retrieving list of folders at '%s'"
+msgstr "ÐÐÐÐÐÑÐÐÐ ÐÐ ÑÐÐÑÑÐ Ñ ÐÐÐÐÐ ÐÑÐ â%sâ"
 
-#: ../camel/providers/imap/camel-imap-store.c:3326
+#: ../camel/providers/imap/camel-imap-store.c:3263
 #, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "ÐÑÑÐÑÑÑÑ ÐÐÐÑÐÐÐÐÐÐ ÐÑÐÐÑÐÑÐ ÐÑÑÐÐÐÑÐ"
 
-#: ../camel/providers/imap/camel-imap-store.c:3329
+#: ../camel/providers/imap/camel-imap-store.c:3266
 msgid "Server unexpectedly disconnected: "
 msgstr "ÐÑÑÐÑÑÑÑ ÐÐÐÑÐÐÐÐÐÐ ÐÑÐÐÑÐÑÐ ÐÑÑÐÐÐÑÐ: "
 
-#: ../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:109
-#, c-format
-msgid "Could not create cache for %s: "
-msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÑ ÐÐ %s"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
 msgid "Use _Quick Resync if the server supports it"
 msgstr "ÐÐ ÑÐ ÐÐÐÐÐÐÐÐ _ÐÑÑÐÐ ÑÐÐÑÑÐÐÐÐÐÑÐÑ, ÐÐÐ ÑÐ ÐÐÐÐÑÑÐÐ ÐÑ ÑÑÑÐÑÑÐ"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
 msgid "_Listen for server change notifications"
 msgstr "_ÐÐÑÑÐÐÐ ÐÐ ÑÐÐÐÐÐÑÐÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐ ÑÑÑÐÑÑÐ"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:56
-msgid "Command:"
-msgstr "ÐÐÐÐÐÐÐ:"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:58
-msgid "Numbe_r of cached connections to use"
-msgstr "_ÐÑÐÐ ÐÐÑÐÑÐÐÐ ÐÑÑÐÐÐ, ÐÐÐÑÐ ÐÐ ÑÐ ÐÐÐÐÐÐÑ"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "Namespace:"
 msgstr "ÐÑÐÑÑÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐÑÐ:"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
 msgid "Default IMAP port"
 msgstr "ÐÑÐÐÐÐÑÑÐÐ ÐÐÑÑ ÐÐ IMAP"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:96
+#: ../camel/providers/imapx/camel-imapx-provider.c:83
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../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:1940
-#, c-format
-msgid "Not authenticated"
-msgstr "ÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ"
-
-#: ../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: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: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"
-
-#: ../camel/providers/imapx/camel-imapx-stream.c:70
-#, c-format
-msgid "Source stream returned no data"
-msgstr "ÐÐÑÐÐÐÐÑÑ ÐÐÑÐÐ ÐÐ ÐÑÑÐÐ ÐÐÐÐÐ"
-
-#: ../camel/providers/imapx/camel-imapx-stream.c:79
-#, c-format
-msgid "Source stream unavailable"
-msgstr "ÐÐÑÐÐÐÐÑÑ ÐÐÑÐÐ ÐÐ Ð ÐÐÐÐÑÐÐ"
-
-#: ../camel/providers/local/camel-local-folder.c:187
+#: ../camel/providers/local/camel-local-folder.c:191
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:197
-#: ../camel/providers/local/camel-local-folder.c:206
+#: ../camel/providers/local/camel-local-folder.c:201
+#: ../camel/providers/local/camel-local-folder.c:210
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "ÐÐÑÐÐÑÐÐ ÐÑÑÐÑ: %s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:215
+#: ../camel/providers/local/camel-local-folder.c:219
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:479
+#: ../camel/providers/local/camel-local-folder.c:495
 msgid "_Index message body data"
 msgstr "_ÐÐÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐÐÑÐ ÐÐ ÑÑÐÐÑÐ ÐÐ ÐÐÑÐÐÑÐ"
 
-#: ../camel/providers/local/camel-local-folder.c:710
+#: ../camel/providers/local/camel-local-folder.c:726
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3569,23 +3542,23 @@ msgstr ""
 "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ: %s ÐÑ ÐÐÐÐÐ %s\n"
 "%s"
 
-#: ../camel/providers/local/camel-local-provider.c:44
+#: ../camel/providers/local/camel-local-provider.c:43
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr "_ÐÐÐÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐÐ â.foldersâ Ñ ÐÐÐÑÐÐÐÑ ÐÐ ÐÐÐÐÐÑÐ (exmh)"
 
-#: ../camel/providers/local/camel-local-provider.c:51
+#: ../camel/providers/local/camel-local-provider.c:50
 msgid "MH-format mail directories"
 msgstr "ÐÐÑÐÐÑÐÐ ÐÐÐÐÐ ÑÐÑÐÐÑ MH"
 
-#: ../camel/providers/local/camel-local-provider.c:52
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in MH-like mail directories."
 msgstr "ÐÐ ÑÑÑÑÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÐ Ð ÐÐÑÐÐÑÐÐ ÐÐÐÐÐ ÐÐÐÐÐÐÐ ÐÐ MH."
 
-#: ../camel/providers/local/camel-local-provider.c:70
+#: ../camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "ÐÐÐÐÐÐÐ ÑÐÐÐÑÐÐÐÐÑÐÐ"
 
-#: ../camel/providers/local/camel-local-provider.c:71
+#: ../camel/providers/local/camel-local-provider.c:65
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
@@ -3593,30 +3566,30 @@ msgstr ""
 "ÐÐ ÐÐÐÑÑÐÐÐÐÐ (ÐÑÐÐÐÑÑÐÐÐÐ) ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐÑÐ ÐÑ ÑÑÐÐÐÐÑÑÐÐ ÑÐÑÐÐÑ ÐÑÐ "
 "ÑÐÑÐÐÑ mbox ÐÑÐ ÐÐÐÐÐ ÐÐÐ ÑÐÑÐÐÐÐÐÐÐÑÐ ÐÐ Evolution."
 
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:79
+#: ../camel/providers/local/camel-local-provider.c:99
 msgid "_Apply filters to new messages in Inbox"
 msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐ _ÑÐÐÑÑÐ ÐÐ ÐÐÐÐ ÑÑÐÐÑÐÐÐÑ ÐÑÐ ÐÑÐÐÑÑÐÑÐ ÐÐÑÐ (Inbox)"
 
-#: ../camel/providers/local/camel-local-provider.c:93
+#: ../camel/providers/local/camel-local-provider.c:86
 msgid "Maildir-format mail directories"
 msgstr "ÐÐÑÐÐÑÐÐ ÐÐÐÐÐ ÑÐÑÐÐÑ Maildir"
 
-#: ../camel/providers/local/camel-local-provider.c:94
+#: ../camel/providers/local/camel-local-provider.c:87
 msgid "For storing local mail in maildir directories."
 msgstr "ÐÐ ÑÑÑÑÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÐ Ð ÐÐÐÐÐ maildir."
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:100
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr ""
 "_ÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐÐÐÑÐ ÑÐÑÑÐ ÐÐ ÑÑÑÑÐÑÐÐÐÑÐ ÐÑÐ ÑÐÑÐÐÑ ÐÐ Elm/Pine/Mutt"
 
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:107
 msgid "Standard Unix mbox spool file"
 msgstr "ÐÑÐÐÐÐÑÑÐÐ ÐÐ âÐÐÐÐÑâ ÐÐÑÐÐÑÐÐ ÑÐÐÐ (ÑÐÑÐÐÑ mbox)"
 
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:128
+#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:120
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -3626,7 +3599,7 @@ msgstr ""
 "ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐÐ Ð ÐÐ ÐÑÐÑÐÑÐÐÐÑÐ ÐÐ ÐÑÑÐÐ ÐÑ ÐÐÐÐÐ ÐÑÐ ÑÐÑÐÐÑ Elm, Pine, "
 "ÐÐÐ Mutt."
 
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:119
 msgid "Standard Unix mbox spool directory"
 msgstr "ÐÑÐÐÐÐÑÑÐÐ ÐÐ Unix ÐÐÑÐÐÑÐÐ ÐÐÐÐÐ (ÑÐÑÐÐÑ mbox)"
 
@@ -3723,7 +3696,7 @@ msgstr ""
 "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ: %s: ÐÐÐÑÐ ÐÐ ÐÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÑÑÐÑÑÐÐ â.â"
 
 #: ../camel/providers/local/camel-maildir-store.c:119
-#: ../camel/providers/local/camel-maildir-store.c:782
+#: ../camel/providers/local/camel-maildir-store.c:786
 #, c-format
 msgid "Folder %s already exists"
 msgstr "ÐÐÐÐÐÑÐ â%sâ ÐÐÑÐ ÑÑÑÐÑÑÐÑÐÐ"
@@ -3767,7 +3740,7 @@ msgid "not a maildir directory"
 msgstr "ÐÐ Ð ÐÐÐÐÐ maildir"
 
 #: ../camel/providers/local/camel-maildir-store.c:569
-#: ../camel/providers/local/camel-maildir-store.c:970
+#: ../camel/providers/local/camel-maildir-store.c:974
 #: ../camel/providers/local/camel-spool-store.c:209
 #: ../camel/providers/local/camel-spool-store.c:228
 #, c-format
@@ -3776,27 +3749,27 @@ msgstr ""
 "ÐÐÑÑÐÐÑÐÐ ÑÑÑÑÐÐÐ Ð ÐÐÐÐÐ â%sâ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-maildir-store.c:773
+#: ../camel/providers/local/camel-maildir-store.c:777
 #, c-format
 msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
 msgstr ""
 "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ: %s: ÐÐÐÑÐ ÐÐ ÐÐÐÐÐ ÐÐ ÑÑÑÐÐÐ ÐÐ ÑÑÐÑÑÐÐ â.â"
 
-#: ../camel/providers/local/camel-maildir-summary.c:413
-#: ../camel/providers/local/camel-maildir-summary.c:546
+#: ../camel/providers/local/camel-maildir-summary.c:434
+#: ../camel/providers/local/camel-maildir-summary.c:567
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÑÑÐÐ ÐÐ ÐÑÑ ÐÐ ÐÐÐÐÐ maildir: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:537
+#: ../camel/providers/local/camel-maildir-summary.c:558
 msgid "Checking folder consistency"
 msgstr "ÐÑÐÐÐÑÐÐ ÐÐ ÑÐÐÐÑÑÑÐ ÐÐ ÐÐÐÐÐÑÐ"
 
-#: ../camel/providers/local/camel-maildir-summary.c:630
+#: ../camel/providers/local/camel-maildir-summary.c:651
 msgid "Checking for new messages"
 msgstr "ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÐ"
 
-#: ../camel/providers/local/camel-maildir-summary.c:725
+#: ../camel/providers/local/camel-maildir-summary.c:746
 #: ../camel/providers/local/camel-mbox-summary.c:418
 #: ../camel/providers/local/camel-mbox-summary.c:649
 #: ../camel/providers/local/camel-mbox-summary.c:793
@@ -3989,7 +3962,7 @@ msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ: %s"
 msgid "Cannot get folder '%s': not a directory."
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ: ÐÐ Ð ÐÐÐÐÐ."
 
-#: ../camel/providers/local/camel-mh-summary.c:224
+#: ../camel/providers/local/camel-mh-summary.c:227
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐ MH: %s: %s"
@@ -4089,47 +4062,47 @@ msgstr ""
 "ÐÐÑÑÐÐÑÐÐ ÑÐÐÑÑÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÑÐ-ÑÐÑÐÐÑ â%sâ: %s\n"
 "ÐÐÐÐÐÑÐ ÐÐÐÐ ÐÐ Ð ÐÐÐÑÐÐÐÐÐ, ÐÐÐÐÐÑÐ Ð ÐÐÐÐÐÐÐÐ Ð â%sâ"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:286
-#: ../camel/providers/nntp/camel-nntp-folder.c:375
-#: ../camel/providers/nntp/camel-nntp-folder.c:497
+#: ../camel/providers/nntp/camel-nntp-folder.c:278
+#: ../camel/providers/nntp/camel-nntp-folder.c:360
+#: ../camel/providers/nntp/camel-nntp-folder.c:481
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "ÐÑÑÑÐÑÐÐ ÐÑÐÑÐÐ: ÑÐÐÐÐÐÐÐÑÑ ÐÐÐÐÑÐÑÐÐÐÑÐÑ Ð Ñ ÐÐÐÑÐÐÐÐÐÐ ÑÐÑÐÐÑ: %s"
 
-#: ../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
+#: ../camel/providers/nntp/camel-nntp-folder.c:328
+#: ../camel/providers/nntp/camel-nntp-folder.c:332
+#: ../camel/providers/pop3/camel-pop3-folder.c:611
+#: ../camel/providers/pop3/camel-pop3-folder.c:995
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ %s: %s"
 
-#: ../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
+#: ../camel/providers/nntp/camel-nntp-folder.c:339
+#: ../camel/providers/nntp/camel-nntp-folder.c:504
+#: ../camel/providers/pop3/camel-pop3-folder.c:549
+#: ../camel/providers/pop3/camel-pop3-folder.c:601
+#: ../camel/providers/pop3/camel-pop3-folder.c:620
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ %s:"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:581
-#: ../camel/providers/nntp/camel-nntp-folder.c:587
-#: ../camel/providers/nntp/camel-nntp-folder.c:634
+#: ../camel/providers/nntp/camel-nntp-folder.c:559
+#: ../camel/providers/nntp/camel-nntp-folder.c:565
+#: ../camel/providers/nntp/camel-nntp-folder.c:611
 #, c-format
 msgid "Posting failed: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÐÑÐÐÐ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:629
+#: ../camel/providers/nntp/camel-nntp-folder.c:606
 msgid "Posting failed: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÐÑÐÐÐ: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:658
+#: ../camel/providers/nntp/camel-nntp-folder.c:633
 #, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "ÐÐ ÐÐÐÐ ÐÐ ÐÐÐÑÐÑÐÑÐ ÑÑÐÑÐÐ ÐÐ NNTP ÐÐÐÐÑÐ ÑÑÐ Ð ÑÐÐÐÐ âÐÐÐÐÑÑÐÐâ!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:678
+#: ../camel/providers/nntp/camel-nntp-folder.c:653
 #, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐÑÐ ÑÑÐÑÐÐ ÐÑ ÐÐÐÐÐ NNTP!"
@@ -4167,22 +4140,22 @@ msgid ""
 "password."
 msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐ ÐÐ ÑÐÑÑÐÐ ÑÑÑ ÑÑÑÐÑÑ NNTP ÑÑÐÐ ÐÐÑÐÑÑÐÑÐÐÐ ÐÐÑÐÐÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:285
+#: ../camel/providers/nntp/camel-nntp-store.c:283
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐ ÐÑ %s: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:297
+#: ../camel/providers/nntp/camel-nntp-store.c:295
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "ÐÑÑÐÑÑÑÑ ÐÐ NNTP %s ÐÑÑÐÐ ÐÐÐ ÐÐ ÐÑÐÑÐÐ %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:469
+#: ../camel/providers/nntp/camel-nntp-store.c:458
 #, c-format
 msgid "USENET News via %s"
 msgstr "ÐÐÐÐÐÐ Ð USENET ÐÑÐÐ %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1072
+#: ../camel/providers/nntp/camel-nntp-store.c:1044
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4193,26 +4166,26 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1165
+#: ../camel/providers/nntp/camel-nntp-store.c:1136
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÑÐÐÐÐÐÑÐ ÐÐÐÐÐ Ð ÑÑÐÐÐÐÐÑÐ ÐÐ ÐÑÑÐÐ ÐÐÐÐÐÐ. ÐÐÐÑÑÐ ÑÐÐÐ ÑÐ "
 "ÐÐÐÐÐÑÐÐÑÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1181
+#: ../camel/providers/nntp/camel-nntp-store.c:1152
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐÐÐÑÐÐÑÐ ÐÐÐÐÐ Ð ÑÑÐÐÐÐÐÑÐ ÐÐ ÐÑÑÐÐ ÐÐÐÐÐÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1204
+#: ../camel/providers/nntp/camel-nntp-store.c:1175
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐÑÐÐÑÐ ÐÐÐÐÐ Ð ÑÑÐÐÐÐÐÑÐ ÐÐ ÐÑÑÐÐ ÐÐÐÐÐÐ. ÐÐÐÑÑÐ ÑÐÐÐ "
 "ÐÑÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐÐÐÑÐ ÑÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1402
+#: ../camel/providers/nntp/camel-nntp-store.c:1371
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4223,7 +4196,7 @@ msgstr ""
 "\n"
 "ÐÑÐÐ ÑÐÐÐÐÐ ÐÑÑÐÐ. ÐÐÐ-ÐÐÑÐÑÑÐÐ ÐÐÐÑÐÐÐÑÑ ÐÐÐÐÑ Ð ÑÐÐÐÑÐÐÑÐÐ ÐÐÐÐÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1453
+#: ../camel/providers/nntp/camel-nntp-store.c:1416
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4234,11 +4207,11 @@ msgstr ""
 "\n"
 "ÐÑÑÐÐÑÐ ÐÐ ÑÑÑÐÑÑÐÑÐÐ!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1647
+#: ../camel/providers/nntp/camel-nntp-store.c:1606
 msgid "NNTP Command failed: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐÐ ÐÐ NNTP: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1732
+#: ../camel/providers/nntp/camel-nntp-store.c:1691
 #, c-format
 msgid "Not connected."
 msgstr "ÐÐ ÑÑÐ ÑÐÑÑÐÐÐÐ."
@@ -4264,34 +4237,34 @@ msgstr "ÐÐÐÑÐÐÐÐÐ ÐÑÐÐÐÐÑ ÐÑ ÑÑÑÐÑÑ ÐÑ âheadâ: %s"
 msgid "Operation failed: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐ: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:448
-#: ../camel/providers/pop3/camel-pop3-folder.c:519
+#: ../camel/providers/pop3/camel-pop3-folder.c:447
+#: ../camel/providers/pop3/camel-pop3-folder.c:517
 #, c-format
 msgid "No message with UID %s"
 msgstr "ÐÑÐÐ ÐÐÑÐÐ Ñ ÐÐÐÐÑÐÑÐÐÐÑÐÑ %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:535
+#: ../camel/providers/pop3/camel-pop3-folder.c:533
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ ÐÐ POP %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:614
+#: ../camel/providers/pop3/camel-pop3-folder.c:612
 msgid "Unknown reason"
 msgstr "ÐÐÐÐÐÐÑÑÐÐ ÐÑÐÑÐÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:662
+#: ../camel/providers/pop3/camel-pop3-folder.c:660
 msgid "Retrieving POP summary"
 msgstr "ÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐ POP"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:713
+#: ../camel/providers/pop3/camel-pop3-folder.c:711
 msgid "Cannot get POP summary: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐÑÐ ÐÐ POP: "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:825
+#: ../camel/providers/pop3/camel-pop3-folder.c:823
 msgid "Expunging old messages"
 msgstr "ÐÑÑÑÑÐÐÑÐÐÐÐ ÐÐ ÑÑÐÑÐÑÐ ÐÐÑÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:845
+#: ../camel/providers/pop3/camel-pop3-folder.c:843
 msgid "Expunging deleted messages"
 msgstr "ÐÑÑÑÑÐÐÑÐÐÐÐ ÐÐ ÐÐÑÑÐÑÐÑÐ ÐÐÑÐÐ"
 
@@ -4391,17 +4364,17 @@ msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐÐ Ð ÑÑÑÐÑÑÐ ÐÐ POP %s: ÐÑÐ
 msgid "Failed to authenticate on POP server %s: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÑÐÐ ÑÑÑÐÑÑÐ ÐÐ POP %s: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:359
+#: ../camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "POP3 server %s"
 msgstr "ÐÑÑÐÑÑ ÐÐ POP %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:362
+#: ../camel/providers/pop3/camel-pop3-store.c:363
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "ÐÑÑÐÑÑ ÐÐ POP ÐÐ %s ÐÐ %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:525
+#: ../camel/providers/pop3/camel-pop3-store.c:527
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4411,7 +4384,7 @@ msgstr ""
 "ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÐ APOP. ÐÐÐ ÐÐÑÐÑÑÐÐÑÑ ÑÐÐÐ ÐÐ Ð ÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐ ÐÐ "
 "ÐÐÐÐÑÐÑÐÐÑÑÑÐ, ÑÐÑÑÐÐÑÐ ÑÐ Ñ ÐÐÑÐÑ ÐÐÐÐÐÐÑÑÑÐÑÐÑ."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:577
+#: ../camel/providers/pop3/camel-pop3-store.c:579
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4422,7 +4395,7 @@ msgstr ""
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:592
+#: ../camel/providers/pop3/camel-pop3-store.c:594
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4431,17 +4404,17 @@ msgstr ""
 "ÐÐÑÑÐÐÑÐÐ ÐÑÐ ÑÐÑÑÐÐÐÐÐ ÐÑÐ ÑÑÑÐÑÑÐ ÐÐ POP %s.\n"
 "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÐÑÐÐÐÑÐ ÐÐ ÐÐÑÑÐÐÐÑÐÐÑÐÐ ÐÐÐ %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:650
+#: ../camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ ÑÑÑ ÑÑÑÐÑÑÐ ÐÐ POP %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:678
+#: ../camel/providers/pop3/camel-pop3-store.c:680
 #, c-format
 msgid "No such folder '%s'."
 msgstr "ÐÐÐÐÐÐ ÐÐÐÐÐ ÐÐÐÑÐÐ â â%sâ."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:695
+#: ../camel/providers/pop3/camel-pop3-store.c:697
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 ÐÐ ÐÐÐÐÑÑÐÐ ÐÐÑÐÑÑÐÑ ÐÑ ÐÐÐÐÐ"
@@ -4528,359 +4501,520 @@ msgstr ""
 msgid "Welcome response error: "
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐÐÐ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:195
+#: ../camel/providers/smtp/camel-smtp-transport.c:196
 #, 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:204
-#: ../camel/providers/smtp/camel-smtp-transport.c:217
-#: ../camel/providers/smtp/camel-smtp-transport.c:224
+#: ../camel/providers/smtp/camel-smtp-transport.c:205
+#: ../camel/providers/smtp/camel-smtp-transport.c:218
+#: ../camel/providers/smtp/camel-smtp-transport.c:225
 msgid "STARTTLS command failed: "
 msgstr "ÐÐÐÐÐÐÐÑÐ STARTTLS Ð ÐÐÑÑÐÐÑÐÐ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:235
+#: ../camel/providers/smtp/camel-smtp-transport.c:236
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ ÑÑÑ ÑÑÑÐÑÑÐ ÐÐ SMTP %s Ð ÑÐÐÑÑÐÐ ÑÐÐÐÐ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:292
+#: ../camel/providers/smtp/camel-smtp-transport.c:294
 #, c-format
 msgid "SMTP server %s"
 msgstr "ÐÑÑÐÑÑ ÐÐ SMTP %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:295
+#: ../camel/providers/smtp/camel-smtp-transport.c:297
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐ ÐÐÑÐ ÑÑÐÐ SMTP ÐÑÐÐ %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:367
+#: ../camel/providers/smtp/camel-smtp-transport.c:369
 #, c-format
 msgid "SMTP server %s does not support %s authentication"
 msgstr "ÐÑÑÐÑÑÑÑ ÐÐ SMTP %s ÐÐ ÐÐÐÐÑÑÐÐ ÐÐÐÐÑÐÐÐÐÐÑ ÐÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ %s."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:446
+#: ../camel/providers/smtp/camel-smtp-transport.c:449
 #, c-format
 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
+#: ../camel/providers/smtp/camel-smtp-transport.c:479
+#: ../camel/providers/smtp/camel-smtp-transport.c:490
+#: ../camel/providers/smtp/camel-smtp-transport.c:503
 msgid "AUTH command failed: "
 msgstr "ÐÐÐÐÐÐÐÑÐ AUTH Ð ÐÐÑÑÐÐÑÐÐ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:643
+#: ../camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "ÐÐÑÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÐÑÐÑÐÐÐ: ÑÑÐÑÐÐÑÐ ÐÐ Ð ÑÐÑÑÐÐÐÐ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:650
+#: ../camel/providers/smtp/camel-smtp-transport.c:649
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "ÐÐÑÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÐÑÐÑÐÐÐ: ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑ ÐÐ ÐÐÐÑÐÑÐÑÐ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:654
+#: ../camel/providers/smtp/camel-smtp-transport.c:653
 msgid "Sending message"
 msgstr "ÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:679
+#: ../camel/providers/smtp/camel-smtp-transport.c:678
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "ÐÐÑÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÐÑÐÑÐÐÐ: ÐÑÐÐ ÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÑÐÐÐ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:692
+#: ../camel/providers/smtp/camel-smtp-transport.c:691
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "ÐÐÑÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÐÑÐÑÐÐÐ: ÐÐÐÐ ÐÐÐ ÐÐÐÐÑÐ ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐ "
 "ÐÐÐÑÑÐÑÐÐÐ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:796
+#: ../camel/providers/smtp/camel-smtp-transport.c:795
 msgid "Syntax error, command unrecognized"
 msgstr "ÐÐÐÑÐÐÑÐÑÐÐ ÐÑÐÑÐÐ, ÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:798
+#: ../camel/providers/smtp/camel-smtp-transport.c:797
 msgid "Syntax error in parameters or arguments"
 msgstr "ÐÐÐÑÐÐÑÐÑÐÐ ÐÑÐÑÐÐ Ð ÐÐÑÐÐÐÑÑÐÑÐ ÐÐÐ ÐÑÐÑÐÐÐÑÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:800
+#: ../camel/providers/smtp/camel-smtp-transport.c:799
 msgid "Command not implemented"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐ Ð ÑÐÐÐÐÐÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:802
+#: ../camel/providers/smtp/camel-smtp-transport.c:801
 msgid "Command parameter not implemented"
 msgstr "ÐÐÑÐÐÐÑÑÑÑÑ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ Ð ÑÐÐÐÐÐÐÑÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:804
+#: ../camel/providers/smtp/camel-smtp-transport.c:803
 msgid "System status, or system help reply"
 msgstr "ÐÑÐÐÐÐÑ ÑÑÑ ÑÑÑÑÐÑÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÐÑÐ ÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐÐÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:806
+#: ../camel/providers/smtp/camel-smtp-transport.c:805
 msgid "Help message"
 msgstr "ÐÐÐÐÑÐÐ ÑÑÐÐÑÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:808
+#: ../camel/providers/smtp/camel-smtp-transport.c:807
 msgid "Service ready"
 msgstr "ÐÑÐÑÐÐÑÐ Ð ÐÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:810
+#: ../camel/providers/smtp/camel-smtp-transport.c:809
 msgid "Service closing transmission channel"
 msgstr "ÐÑÐÑÐÐÑÐ ÐÐÑÐÐÑÐ ÐÑÐÑÐÑÑÐÑÑÐÑ ÐÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:812
+#: ../camel/providers/smtp/camel-smtp-transport.c:811
 msgid "Service not available, closing transmission channel"
 msgstr "ÐÑÐÑÐÐÑÐ ÐÐÐÑÐÐ, ÐÐÑÐÐÑÑÐÐ ÐÐ ÐÑÐÑÐÑÑÐÑÑÐÑ ÐÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:814
+#: ../camel/providers/smtp/camel-smtp-transport.c:813
 msgid "Requested mail action okay, completed"
 msgstr "ÐÐÑÐÐÐÐÑÐ ÐÐÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐ Ð ÐÐÑÐÐ, ÐÐÐÑÑÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:816
+#: ../camel/providers/smtp/camel-smtp-transport.c:815
 msgid "User not local; will forward to <forward-path>"
 msgstr "ÐÐÑÑÐÐÐÑÐÐÑÑ ÐÐ Ð ÐÐÐÐÐÐÐ: ÐÑÐÐÑÐÑÐÐÐ ÐÑÐ <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:818
+#: ../camel/providers/smtp/camel-smtp-transport.c:817
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "ÐÐÑÐÐÐÐÑÐ ÐÐÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐ ÐÐ Ð ÐÐÐÑÑÑÐÐÐ: ÐÐÐÑÐÐ ÐÐÑÐÐÑÐÐ ÐÑÑÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:820
+#: ../camel/providers/smtp/camel-smtp-transport.c:819
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "ÐÐÑÐÐÐÐÑÐ ÐÐÐÑÑÐÐÐ ÐÐ Ð ÐÐÐÑÑÑÐÐÐ: ÐÐÐÑÐÐ ÐÐÑÐÐÑÐÐ ÐÑÑÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:822
+#: ../camel/providers/smtp/camel-smtp-transport.c:821
 msgid "Requested action aborted: error in processing"
 msgstr "ÐÐÑÐÐÐÐÑÐ ÐÐÐÑÑÐÐÐ Ð ÐÑÐÐÑÑÐÐÑÐ: ÐÑÐÑÐÐ Ð ÐÐÑÐÐÐÑÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:824
+#: ../camel/providers/smtp/camel-smtp-transport.c:823
 msgid "User not local; please try <forward-path>"
 msgstr "ÐÐÑÑÐÐÐÑÐÐÑÑ ÐÐ Ð ÐÐÐÐÐÐÐ: ÐÐÐÑÐÐÑÐ <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:826
+#: ../camel/providers/smtp/camel-smtp-transport.c:825
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 "ÐÐÑÐÐÐÐÑÐ ÐÐÐÑÑÐÐÐ ÐÐ Ð ÐÐÐÑÑÑÐÐÐ: ÐÐÐÑÐ ÐÐ ÐÐÑÑÐÑÑÑÐÐ ÐÐÐÑÐ ÐÐ ÐÐÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:828
+#: ../camel/providers/smtp/camel-smtp-transport.c:827
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 "ÐÐÑÐÐÐÐÑÐ ÐÐÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐ Ð ÐÑÐÐÑÑÐÐÑÐ: ÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐÐÐÐÐÐ Ð ÐÐÐÐÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:830
+#: ../camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 "ÐÐÑÐÐÐÐÑÐ ÐÐÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐ ÐÐ Ð ÐÐÐÑÑÑÐÐÐ: ÐÐÐÑÐ ÐÐ ÐÐÑÐÐÑÐÐÑÐ ÐÑÑÐÑ ÐÐ Ð "
 "ÑÐÐÑÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:832
+#: ../camel/providers/smtp/camel-smtp-transport.c:831
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "ÐÑÐÐÐÐÑÐ ÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐÑÐ Ð ÐÐÐÑÑÑÐÑÐ Ñ <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:834
+#: ../camel/providers/smtp/camel-smtp-transport.c:833
 msgid "Transaction failed"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÑÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:838
+#: ../camel/providers/smtp/camel-smtp-transport.c:837
 msgid "A password transition is needed"
 msgstr "ÐÐÐÐÑÐÐÐÐÐ Ð ÐÑÐÐÑÐÐ ÐÐ ÐÐÑÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:840
+#: ../camel/providers/smtp/camel-smtp-transport.c:839
 msgid "Authentication mechanism is too weak"
 msgstr "ÐÐÑÐÐÐÐÐÑÑ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ Ð ÑÐÑÑÐÐ ÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:842
+#: ../camel/providers/smtp/camel-smtp-transport.c:841
 msgid "Encryption required for requested authentication mechanism"
 msgstr "ÐÐÐÐÐÐÐÐÑÑ ÐÐÑÐÐÐÐÑÐ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÐÐÑÐÐÐ ÑÐÑÑÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:844
+#: ../camel/providers/smtp/camel-smtp-transport.c:843
 msgid "Temporary authentication failure"
 msgstr "ÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1095
+#: ../camel/providers/smtp/camel-smtp-transport.c:1094
 msgid "SMTP Greeting"
 msgstr "ÐÐÐÐÑÐÐ ÐÐ SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1122
+#: ../camel/providers/smtp/camel-smtp-transport.c:1121
 #: ../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:1222
-#: ../camel/providers/smtp/camel-smtp-transport.c:1236
-#: ../camel/providers/smtp/camel-smtp-transport.c:1245
+#: ../camel/providers/smtp/camel-smtp-transport.c:1237
+#: ../camel/providers/smtp/camel-smtp-transport.c:1247
 msgid "MAIL FROM command failed: "
 msgstr "ÐÐÐÐÐÐÐÑÐ MAIL FROM Ð ÐÐÑÑÐÐÑÐÐ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1272
+#: ../camel/providers/smtp/camel-smtp-transport.c:1274
 msgid "RCPT TO command failed: "
 msgstr "ÐÐÐÐÐÐÐÑÐ RCPT TO Ð ÐÐÑÑÐÐÑÐÐ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1288
-#: ../camel/providers/smtp/camel-smtp-transport.c:1297
+#: ../camel/providers/smtp/camel-smtp-transport.c:1291
+#: ../camel/providers/smtp/camel-smtp-transport.c:1301
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "ÐÐÐÐÐÐÐÑÐ RCPT TO <%s> Ð ÐÐÑÑÐÐÑÐÐ: "
 
-#: ../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:1343
+#: ../camel/providers/smtp/camel-smtp-transport.c:1354
+#: ../camel/providers/smtp/camel-smtp-transport.c:1365
+#: ../camel/providers/smtp/camel-smtp-transport.c:1424
+#: ../camel/providers/smtp/camel-smtp-transport.c:1444
 #: ../camel/providers/smtp/camel-smtp-transport.c:1458
+#: ../camel/providers/smtp/camel-smtp-transport.c:1467
 msgid "DATA command failed: "
 msgstr "ÐÐÐÐÐÐÐÑÐ DATA Ð ÐÐÑÑÐÐÑÐÐ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1483
-#: ../camel/providers/smtp/camel-smtp-transport.c:1497
-#: ../camel/providers/smtp/camel-smtp-transport.c:1505
+#: ../camel/providers/smtp/camel-smtp-transport.c:1492
+#: ../camel/providers/smtp/camel-smtp-transport.c:1507
+#: ../camel/providers/smtp/camel-smtp-transport.c:1516
 msgid "RSET command failed: "
 msgstr "ÐÐÐÐÐÐÐÑÐ RSET Ð ÐÐÑÑÐÐÑÐÐ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1530
-#: ../camel/providers/smtp/camel-smtp-transport.c:1544
-#: ../camel/providers/smtp/camel-smtp-transport.c:1551
+#: ../camel/providers/smtp/camel-smtp-transport.c:1541
+#: ../camel/providers/smtp/camel-smtp-transport.c:1555
+#: ../camel/providers/smtp/camel-smtp-transport.c:1562
 msgid "QUIT command failed: "
 msgstr "ÐÐÐÐÐÐÐÑÐ QUIT Ð ÐÐÑÑÐÐÑÐÐ: "
 
-#: ../libedataserver/e-categories.c:47
+#: ../data/org.gnome.evolution-data-server.addressbook.gschema.xml.in.h:1
+msgid "Contact UID of a user"
+msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÐ ÐÐÐÑÐÐÑÐ"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:1
+msgid "Birthday and anniversary reminder"
+msgstr "ÐÐÐÐÐÐÑÐÐ ÐÐ ÑÐÐÐÐÐ ÐÐÐ ÐÐÐ ÐÐÐÐÑÐÐÐÐ"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:2
+msgid "Whether to set a reminder for birthdays and anniversaries"
+msgstr "ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐÑ ÐÐÐÐÐÐÑÐÐÑÑÐ ÐÐ ÑÐÐÐÐÐÐ ÐÐÐ Ð ÐÐÐÐÑÐÐÐÐ"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:3
+msgid "Birthday and anniversary reminder value"
+msgstr "ÐÑÐÐÐÐÑÑ ÐÐ ÐÐÐÐÐÐÑÐÐÑÐ ÐÐ ÑÐÐÐÐÐ ÐÐÐ ÐÐÐ ÐÐÐÐÑÐÐÐÐ"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:4
+msgid "Number of units for determining a birthday or anniversary reminder"
+msgstr "ÐÑÐÐ ÐÐÐÐÐÑÐ ÐÑÐÐÐ ÐÐ ÐÐÐÐÐÐÑÐÐ ÐÐ ÑÐÐÐÐÐ ÐÐÐ ÐÐÐ ÐÐÐÐÑÐÐÐÐ"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:5
+msgid "Birthday and anniversary reminder units"
+msgstr "ÐÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐ ÐÐ ÐÐÐÐÐÐÑÐÐ ÐÐ ÑÐÐÐÐÐ ÐÐÐ ÐÐÐ ÐÐÐÐÑÐÐÐÐ"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:6
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\""
+msgstr ""
+"ÐÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐ  ÐÐ ÐÐÐÐÐÐÑÐÐ ÐÐ ÑÐÐÐÐÐ ÐÐÐ ÐÐÐ ÐÐÐÐÑÐÐÐÐ â "
+"âminutesâ (ÐÐÐÑÑÐ), âhoursâ (ÑÐÑÐÐÐ) ÐÐÐ âdaysâ (ÐÐÐ)"
+
+#: ../libebackend/e-authentication-mediator.c:145
+#: ../libebackend/e-authentication-mediator.c:156
+#: ../libebackend/e-authentication-mediator.c:612
+#: ../libebackend/e-authentication-mediator.c:973
+msgid "Bus name vanished (client terminated?)"
+msgstr "ÐÐÐÑÐ ÐÐÑÐÐÐÐ ÐÑ ÑÐÐÐÑÐ (ÐÐ ÐÐ ÐÐ ÐÐÐÐÐÑÑÑ ÐÐ Ð ÑÐÑÐÐ ÑÐÐÐÑÐ?)"
+
+#: ../libebackend/e-authentication-mediator.c:204
+msgid "No response from client"
+msgstr "ÐÐÐÐÐÑÑÑ ÐÐ ÐÑÑÐÐ ÐÑÐÐÐÐÑ"
+
+#: ../libebackend/e-authentication-mediator.c:264
+#: ../libebackend/e-authentication-mediator.c:275
+#: ../libebackend/e-authentication-mediator.c:606
+#: ../libebackend/e-authentication-mediator.c:967
+msgid "Client cancelled the operation"
+msgstr "ÐÐÐÐÐÑÑÑ ÐÑÐÐÐÐ ÐÐÐÑÑÐÐÐÑÐ"
+
+#: ../libebackend/e-authentication-mediator.c:334
+msgid "Client reports password was rejected"
+msgstr "ÐÐÐÑÐÐ ÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐ Ð ÐÑÑÐÑÑÐÐÐÐ"
+
+#: ../libebackend/e-authentication-session.c:530
+msgid "Add this password to your keyring"
+msgstr "ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐÐÑÐ ÐÑÐ ÐÐÑÑÐÐÑÑÐÐÑÐÐÑ ÐÐ"
+
+#: ../libebackend/e-authentication-session.c:593
+msgid "Password was incorrect"
+msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐ"
+
+#: ../libebackend/e-authentication-session.c:1322
+#: ../libebackend/e-authentication-session.c:1494
+#: ../libebackend/e-authentication-session.c:1673
+msgid "Keyring operation was cancelled"
+msgstr "ÐÐÐÑÑÐÐÐÑÐ ÐÐ ÐÐÑÑÐÐÑÑÐÐÑÐÐÑ ÐÐ ÐÑÐÐÐÐÐÐ"
+
+#: ../libebackend/e-server-side-source.c:162
+#, c-format
+msgid "Data source is missing a [%s] group"
+msgstr "Ð ÐÐÑÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐ ÐÐÐÑÐÐ ÐÑÑÐÐÑÐ [%s]."
+
+#: ../libebackend/e-server-side-source.c:1068
+#, c-format
+msgid "File must have a '.source' extension"
+msgstr "ÐÐÐÐÑÑ ÑÑÑÐÐÐ ÐÐ Ð Ñ ÑÐÐÑÐÑÐÐÐÐ â.sourceâ"
+
+#: ../libebackend/e-source-registry-server.c:598
+#, c-format
+msgid "UID '%s' is already in use"
+msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑÑÑ â%sâ ÐÐÑÐ ÑÐ ÐÐÐÐÐÐ"
+
+#: ../libedataserver/e-categories.c:46
 msgctxt "CategoryName"
 msgid "Anniversary"
 msgstr "ÐÐÐÐÑÐÐÐÐ"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:47
 msgctxt "CategoryName"
 msgid "Birthday"
 msgstr "ÐÐÑÐ ÐÐ ÑÐÐÐÐÐÐ"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:48
 msgctxt "CategoryName"
 msgid "Business"
 msgstr "ÐÐÐÐÐÑ"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:49
 msgctxt "CategoryName"
 msgid "Competition"
 msgstr "ÐÐÐÐÑÑÐÐÑÐÑ"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:50
 msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "ÐÑÐÐÐÐ"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:51
 msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "ÐÐÐÐÑÑÑÐ"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:52
 msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "ÐÐÐÐ Ð ÐÐÐÐÑÐ"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:53
 msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "ÐÑÐÐÐÐÐ"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:54
 msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "ÐÐÐÐÑÐÐÐÑÐÐÐÐ ÐÐÑÑÐÑÐÐ"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:56
 msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "ÐÐÐÐÐ ÐÐÐÑÐÐÑÐ"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:57
 msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "ÐÐÐÐ"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:58
 msgctxt "CategoryName"
 msgid "International"
 msgstr "ÐÐÐÐÑÐÐÑÐÐÐÐ"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:59
 msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "ÐÐÑÑÐÐÐ ÐÐÐÐÐÑÐ"
 
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:60
 msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "ÐÑÑÐÐ"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:61
 msgctxt "CategoryName"
 msgid "Personal"
 msgstr "ÐÐÑÐÐ"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:62
 msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "ÐÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐÑ"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:64
 msgctxt "CategoryName"
 msgid "Status"
 msgstr "ÐÑÑÑÐÑÐÐÐ"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:65
 msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "ÐÑÑÐÑÐÐÐÐ"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:66
 msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "ÐÐÑÑÐÐÑÐÑÐ"
 
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:67
 msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "ÐÑÐÐÐ Ð ÑÐÐÑÐÐÐ"
 
-#: ../libedataserver/e-categories.c:69
+#: ../libedataserver/e-categories.c:68
 msgctxt "CategoryName"
 msgid "VIP"
 msgstr "ÐÐÐ"
 
-#: ../libedataserver/e-categories.c:70
+#: ../libedataserver/e-categories.c:69
 msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "ÐÐÑÐÐÐÐÐÐ"
 
-#: ../libedataserver/e-client.c:122
+#: ../libedataserver/e-client.c:124
 msgid "Source not loaded"
 msgstr "ÐÐÑÐÑÑÑ ÐÐ Ð ÐÐÑÐÐÐÐ"
 
-#: ../libedataserver/e-client.c:124
+#: ../libedataserver/e-client.c:126
 msgid "Source already loaded"
 msgstr "ÐÐÑÐÑÑÑ ÐÐÑÐ Ð ÐÐÑÐÐÐÐ"
 
-#: ../libedataserver/e-client.c:132
+#. Translators: This means that the EClient does not support offline mode, or
+#. * it's not set to by a user, thus it is unavailable while user is not connected.
+#: ../libedataserver/e-client.c:136
 msgid "Offline unavailable"
 msgstr "ÐÐÐÑÐÐ ÑÐÐÐÑÐ Ð ÑÐÐÐÐ âÐÐÐÐÑÑÐÐâ"
 
-#: ../libedataserver/e-client.c:154
+#: ../libedataserver/e-client.c:158
 msgid "D-Bus error"
 msgstr "ÐÑÐÑÐÐ ÐÐ D-Bus"
 
+#: ../libedataserver/e-source-authenticator.c:166
+msgid "Address book authentication request"
+msgstr "ÐÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÐ ÐÐÑÑÑÐ ÐÐ ÐÐÑÐÑÐÐÐÐ"
+
+#: ../libedataserver/e-source-authenticator.c:171
+msgid "Calendar authentication request"
+msgstr "ÐÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÑÐÐ ÑÑÑÐÑÑÐ ÐÐ ÐÐÐÐÐÐÐÑÐ"
+
+#: ../libedataserver/e-source-authenticator.c:175
+msgid "Mail authentication request"
+msgstr "ÐÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÑÐÐ ÑÑÑÐÑÑÐ ÐÐ Ð-ÐÐÑÐ"
+
+#. generic account prompt
+#: ../libedataserver/e-source-authenticator.c:178
+msgid "Authentication request"
+msgstr "ÐÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ"
+
+#: ../libedataserver/e-source-authenticator.c:188
+#, c-format
+msgid "Please enter the password for address book \"%s\"."
+msgstr "ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÐÐÐ â%sâ."
+
+#: ../libedataserver/e-source-authenticator.c:194
+#, c-format
+msgid "Please enter the password for calendar \"%s\"."
+msgstr "ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐÐÐÐÑÐ â%sâ."
+
+#: ../libedataserver/e-source-authenticator.c:200
+#, c-format
+msgid "Please enter the password for mail account \"%s\"."
+msgstr "ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐ ÑÐÐÐÑÑÑÐÑÐÑÑÐ ÐÐ Ð-ÐÐÑÐ â%sâ."
+
+#: ../libedataserver/e-source-authenticator.c:206
+#, c-format
+msgid "Please enter the password for mail transport \"%s\"."
+msgstr "ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐ ÐÐ ÐÑÐÐÐÑÑÐÐÑÐ ÐÐ ÐÐÑÐ ÑÑÐÐ â%sâ."
+
+#: ../libedataserver/e-source-authenticator.c:212
+#, c-format
+msgid "Please enter the password for memo list \"%s\"."
+msgstr "ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐ ÐÐ ÑÐÐÑÑÐÐ Ñ ÐÐÐÐÐÐÐ â%sâ."
+
+#: ../libedataserver/e-source-authenticator.c:218
+#, c-format
+msgid "Please enter the password for task list \"%s\"."
+msgstr "ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐ ÐÐ ÑÐÐÑÑÐÐ ÑÑÑ ÐÐÐÐÑÐ â%sâ."
+
+#: ../libedataserver/e-source-authenticator.c:224
+#, c-format
+msgid "Please enter the password for account \"%s\"."
+msgstr "ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐ ÐÐ ÑÐÐÐÑÑÑÐÑÐÑÑÐ â%sâ."
+
+#: ../libedataserver/e-source.c:604
+#, c-format
+msgid "Source file is missing a [%s] group"
+msgstr "Ð ÐÐÑÐÐÐÐÑ ÑÐÐÐ ÐÐÐÑÐÐ ÐÑÑÐÐÑÐ [%s]."
+
+#: ../libedataserver/e-source.c:883
+#, c-format
+msgid "Data source '%s' is not removable"
+msgstr "ÐÐÑÐÑÐÐÐÑÑ ÐÐ ÐÐÐÐÐ â%sâ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÑÑÐÐ."
+
+#: ../libedataserver/e-source.c:965
+#, c-format
+msgid "Data source '%s' is not writable"
+msgstr "Ð ÐÐÑÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÑÐ."
+
+#: ../libedataserver/e-source.c:1150
+msgid "Unnamed"
+msgstr "ÐÐÐ ÐÐÐ"
+
+#: ../libedataserver/e-source-mail-signature.c:485
+#, c-format
+msgid "Signature script must be a local file"
+msgstr "ÐÐÑÐÐÑÑÑ ÐÐ ÐÐÐÐÐÑ ÑÑÑÐÐÐ ÐÐ Ð ÐÐÐÐÐÐÐ ÑÐÐÐ"
+
+#: ../libedataserver/e-source-registry.c:1496
+msgid "The user declined to authenticate"
+msgstr "ÐÐÑÑÐÐÐÑÐÐÑÑ ÐÑÐÐÐÐÐ ÐÐ ÑÐ ÐÐÐÐÑÐÑÐÑÐÑÐ"
+
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1646 ../libedataserver/e-time-utils.c:1944
+#: ../libedataserver/e-time-utils.c:1647 ../libedataserver/e-time-utils.c:1945
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%d.%m.%Y, %a, %I:%M:%S %p"
 
@@ -4888,7 +5022,7 @@ msgstr "%d.%m.%Y, %a, %I:%M:%S %p"
 #. * in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1651 ../libedataserver/e-time-utils.c:1935
+#: ../libedataserver/e-time-utils.c:1652 ../libedataserver/e-time-utils.c:1936
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%d.%m.%Y, %a, %H:%M:%S"
 
@@ -4896,7 +5030,7 @@ msgstr "%d.%m.%Y, %a, %H:%M:%S"
 #. * in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1656 ../libedataserver/e-time-utils.c:1940
+#: ../libedataserver/e-time-utils.c:1657 ../libedataserver/e-time-utils.c:1941
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%d.%m.%Y, %a, %I:%M %p"
 
@@ -4904,78 +5038,78 @@ msgstr "%d.%m.%Y, %a, %I:%M %p"
 #. * in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1661 ../libedataserver/e-time-utils.c:1931
+#: ../libedataserver/e-time-utils.c:1662 ../libedataserver/e-time-utils.c:1932
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%d.%m.%Y, %a, %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1666
+#: ../libedataserver/e-time-utils.c:1667
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%d.%m.%Y, %a, %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1671
+#: ../libedataserver/e-time-utils.c:1672
 msgid "%a %m/%d/%Y %H"
 msgstr "%d.%m.%Y, %a, %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1674 ../libedataserver/e-time-utils.c:1794
-#: ../libedataserver/e-time-utils.c:1926
+#: ../libedataserver/e-time-utils.c:1675 ../libedataserver/e-time-utils.c:1795
+#: ../libedataserver/e-time-utils.c:1927
 msgid "%a %m/%d/%Y"
 msgstr "%d.%m.%Y, %a"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1681
+#: ../libedataserver/e-time-utils.c:1682
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d.%m.%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1685
+#: ../libedataserver/e-time-utils.c:1686
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d.%m.%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1690
+#: ../libedataserver/e-time-utils.c:1691
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d.%m.%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1695
+#: ../libedataserver/e-time-utils.c:1696
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d.%m.%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1700
+#: ../libedataserver/e-time-utils.c:1701
 msgid "%m/%d/%Y %I %p"
 msgstr "%d.%m.%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1705
+#: ../libedataserver/e-time-utils.c:1706
 msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1708 ../libedataserver/e-time-utils.c:1797
+#: ../libedataserver/e-time-utils.c:1709 ../libedataserver/e-time-utils.c:1798
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1868 ../libedataserver/e-time-utils.c:1988
+#: ../libedataserver/e-time-utils.c:1869 ../libedataserver/e-time-utils.c:1989
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1872 ../libedataserver/e-time-utils.c:1980
+#: ../libedataserver/e-time-utils.c:1873 ../libedataserver/e-time-utils.c:1981
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4983,322 +5117,263 @@ msgstr "%H:%M:%S"
 #. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1877 ../libedataserver/e-time-utils.c:1985
+#: ../libedataserver/e-time-utils.c:1878 ../libedataserver/e-time-utils.c:1986
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1881 ../libedataserver/e-time-utils.c:1977
+#: ../libedataserver/e-time-utils.c:1882 ../libedataserver/e-time-utils.c:1978
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1884
+#: ../libedataserver/e-time-utils.c:1885
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1888
+#: ../libedataserver/e-time-utils.c:1889
 msgid "%I %p"
 msgstr "%I %p"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
-msgid "Automatic proxy configuration URL"
-msgstr "ÐÐÑÐÐÐÑÐÑÐÐ ÐÐÑÑÑÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐ ÐÐ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ"
+msgid "Proxy type to use"
+msgstr "ÐÐÐ ÑÑÑÐÑÑ-ÐÐÑÑÐÐÐÐÐ"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2
-msgid "Host name for HTTP requests"
-msgstr "ÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ HTTP"
+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:3
-msgid "Host name for HTTPS requests"
-msgstr "ÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ HTTPS"
+msgid "Whether to use http-proxy"
+msgstr "ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐ ÑÑÑÐÑÑ-ÐÐÑÑÐÐÐÐÐ"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4
-msgid "Host name for SOCKS requests"
-msgstr "ÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ SOCKS"
+msgid "Whether to use proxy for HTTP requests."
+msgstr "ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐ ÑÑÑÐÑÑ-ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐÐÑÐ ÐÐ HTTP."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5
-msgid "Host name to use for HTTP requests."
-msgstr "ÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ HTTP."
+msgid "Whether proxy server requires authentication"
+msgstr "ÐÐÐÐ ÑÑÑÐÑÑÑÑ-ÐÐÑÑÐÐÐÐÐ ÐÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
-msgid "Host name to use for HTTPS requests."
-msgstr "ÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ HTTPS."
+msgid "Whether authentication is required to access proxy server."
+msgstr "ÐÐÐÐ ÑÑÑÐÑÑÑÑ-ÐÐÑÑÐÐÐÐÐ ÐÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7
-msgid "Host name to use for SOCKS requests."
-msgstr "ÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ SOCKS."
+msgid "Host name for HTTP requests"
+msgstr "ÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ HTTP"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8
-msgid "List of hosts for which do not use proxy."
-msgstr "ÐÐÐÑÑÐ ÐÐ ÐÐÑÐÐÐÑÐ, ÐÐ ÐÐÐÑÐ ÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐÐ ÑÑÑÐÑÑ-ÐÐÑÑÐÐÐÐÐ."
+msgid "Host name to use for HTTP requests."
+msgstr "ÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ HTTP."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9
-msgid "List of hosts to connect to without proxy"
-msgstr "ÐÐÐÑÑÐ ÐÐ ÐÐÑÐÐÐÑÐ, ÐÐ ÐÐÐÑÐ ÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐÐ ÑÑÑÐÑÑ-ÐÐÑÑÐÐÐÐÐ"
+msgid "Port number for HTTP requests"
+msgstr "ÐÐÐÐÑ ÐÐ ÐÐÑÑ ÐÐ ÐÐÑÐÐÐ ÐÐ HTTP"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10
-msgid "Password to use to authenticate against proxy server."
-msgstr "ÐÐÑÐÐÐ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÑÐÐ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ."
+msgid "Port number to use for HTTP requests."
+msgstr "ÐÐÐÐÑ ÐÐ ÐÐÑÑ ÐÐ ÐÐÑÐÐÐ ÐÐ HTTP."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
-msgid "Port number for HTTP requests"
-msgstr "ÐÐÐÐÑ ÐÐ ÐÐÑÑ ÐÐ ÐÐÑÐÐÐ ÐÐ HTTP"
+msgid "Proxy authentication user name"
+msgstr "ÐÐÑÑÐÐÐÑÐÐÑÐÐ ÐÐÐ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÑÐÐ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
-msgid "Port number for HTTPS requests"
-msgstr "ÐÐÐÐÑ ÐÐ ÐÐÑÑ ÐÐ ÐÐÑÐÐÐ ÐÐ HTTPS"
+msgid "User name to use to authenticate against proxy server."
+msgstr "ÐÐÑÑÐÐÐÑÐÐÑÐÐ ÐÐÐ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÑÐÐ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
-msgid "Port number for SOCKS requests"
-msgstr "ÐÐÐÐÑ ÐÐ ÐÐÑÑ ÐÐ ÐÐÑÐÐÐ ÐÐ SOCKS"
+msgid "Proxy authentication password"
+msgstr "ÐÐÑÐÐÐ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÑÐÐ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
-msgid "Port number to use for HTTP requests."
-msgstr "ÐÐÐÐÑ ÐÐ ÐÐÑÑ ÐÐ ÐÐÑÐÐÐ ÐÐ HTTP."
+msgid "Password to use to authenticate against proxy server."
+msgstr "ÐÐÑÐÐÐ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÑÐÐ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:15
-msgid "Port number to use for HTTPS requests."
-msgstr "ÐÐÐÐÑ ÐÐ ÐÐÑÑ ÐÐ ÐÐÑÐÐÐ ÐÐ HTTPS."
+msgid "List of hosts to connect to without proxy"
+msgstr "ÐÐÐÑÑÐ ÐÐ ÐÐÑÐÐÐÑÐ, ÐÐ ÐÐÐÑÐ ÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐÐ ÑÑÑÐÑÑ-ÐÐÑÑÐÐÐÐÐ"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:16
-msgid "Port number to use for SOCKS requests."
-msgstr "ÐÐÐÐÑ ÐÐ ÐÐÑÑ ÐÐ ÐÐÑÐÐÐ ÐÐ SOCKS."
+msgid "List of hosts for which do not use proxy."
+msgstr "ÐÐÐÑÑÐ ÐÐ ÐÐÑÐÐÐÑÐ, ÐÐ ÐÐÐÑÐ ÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐÐ ÑÑÑÐÑÑ-ÐÐÑÑÐÐÐÐÐ."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:17
-msgid "Proxy authentication password"
-msgstr "ÐÐÑÐÐÐ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÑÐÐ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ"
+msgid "Host name for HTTPS requests"
+msgstr "ÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ HTTPS"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:18
-msgid "Proxy authentication user name"
-msgstr "ÐÐÑÑÐÐÐÑÐÐÑÐÐ ÐÐÐ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÑÐÐ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ"
+msgid "Host name to use for HTTPS requests."
+msgstr "ÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ HTTPS."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:19
-msgid "Proxy type to use"
-msgstr "ÐÐÐ ÑÑÑÐÑÑ-ÐÐÑÑÐÐÐÐÐ"
+msgid "Port number for HTTPS requests"
+msgstr "ÐÐÐÐÑ ÐÐ ÐÐÑÑ ÐÐ ÐÐÑÐÐÐ ÐÐ HTTPS"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:20
-msgid "User name to use to authenticate against proxy server."
-msgstr "ÐÐÑÑÐÐÐÑÐÐÑÐÐ ÐÐÐ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÑÐÐ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ."
+msgid "Port number to use for HTTPS requests."
+msgstr "ÐÐÐÐÑ ÐÐ ÐÐÑÑ ÐÐ ÐÐÑÐÐÐ ÐÐ HTTPS."
 
 #: ../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â â ÑÑÑÐÐ ÐÐÑÑÑÐÐÐÐÐÐ."
+msgid "Host name for SOCKS requests"
+msgstr "ÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ SOCKS"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:22
-msgid "Where to read automatic proxy configuration from."
-msgstr "ÐÑÐÑÐÐ ÐÐ ÑÐ ÐÑÐÑÐÑÐÑ ÐÐÑÐÐÐÑÐÑÐÐÑÐ ÐÐÑÑÑÐÐÐÐ ÐÐ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ."
+msgid "Host name to use for SOCKS requests."
+msgstr "ÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ SOCKS."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:23
-msgid "Whether authentication is required to access proxy server."
-msgstr "ÐÐÐÐ ÑÑÑÐÑÑÑÑ-ÐÐÑÑÐÐÐÐÐ ÐÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ."
+msgid "Port number for SOCKS requests"
+msgstr "ÐÐÐÐÑ ÐÐ ÐÐÑÑ ÐÐ ÐÐÑÐÐÐ ÐÐ SOCKS"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:24
-msgid "Whether proxy server requires authentication"
-msgstr "ÐÐÐÐ ÑÑÑÐÑÑÑÑ-ÐÐÑÑÐÐÐÐÐ ÐÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ"
+msgid "Port number to use for SOCKS requests."
+msgstr "ÐÐÐÐÑ ÐÐ ÐÐÑÑ ÐÐ ÐÐÑÐÐÐ ÐÐ SOCKS."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:25
-msgid "Whether to use http-proxy"
-msgstr "ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐ ÑÑÑÐÑÑ-ÐÐÑÑÐÐÐÐÐ"
+msgid "Automatic proxy configuration URL"
+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:656
-msgid "Accessing LDAP Server anonymously"
-msgstr "ÐÐÐÐÐÐÐÐ ÐÐÑÑÑÐ ÐÐ ÑÑÑÐÑÑ ÐÐ LDAP"
-
-#: ../libedataserverui/e-book-auth-util.c:197
-#: ../libedataserverui/e-book-auth-util.c:423
-msgid "Failed to authenticate.\n"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ.\n"
+msgid "Where to read automatic proxy configuration from."
+msgstr "ÐÑÐÑÐÐ ÐÐ ÑÐ ÐÑÐÑÐÑÐÑ ÐÐÑÐÐÐÑÐÑÐÐÑÐ ÐÐÑÑÑÐÐÐÐ ÐÐ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ."
 
-#: ../libedataserverui/e-categories-editor.c:224
+#: ../libedataserverui/e-categories-editor.c:230
 msgid "Currently _used categories:"
 msgstr "_ÐÐÐÑÑÐ ÐÐÐÐÐÐÐÐ ÐÐÑÐÐÐÑÐÐ:"
 
-#: ../libedataserverui/e-categories-editor.c:233
+#: ../libedataserverui/e-categories-editor.c:239
 msgid "_Available Categories:"
 msgstr "_ÐÐÐÐÑÐÐ ÐÐÑÐÐÐÑÐÐ:"
 
-#: ../libedataserverui/e-categories-selector.c:320
+#: ../libedataserverui/e-categories-selector.c:324
 msgid "Icon"
 msgstr "ÐÐÐÐÐ"
 
-#: ../libedataserverui/e-categories-selector.c:325
+#: ../libedataserverui/e-categories-selector.c:329
 msgid "Category"
 msgstr "ÐÐÑÐÐÐÑÐÑ"
 
-#: ../libedataserverui/e-category-completion.c:294
+#: ../libedataserverui/e-category-completion.c:300
 #, c-format
 msgid "Create category \"%s\""
 msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐÐÐÑÐÑÑÐ â%sâ"
 
-#: ../libedataserverui/e-category-editor.c:132
+#: ../libedataserverui/e-category-editor.c:137
 msgid "Category Icon"
 msgstr "ÐÐÐÐÐ ÐÐ ÐÐÑÐÐÐÑÐÑÑÐ"
 
-#: ../libedataserverui/e-category-editor.c:136
+#: ../libedataserverui/e-category-editor.c:141
 msgid "_No Image"
 msgstr "_ÐÐÐ ÐÐÐÐÑÐÐÐÐÐÐ"
 
-#: ../libedataserverui/e-category-editor.c:173
+#: ../libedataserverui/e-category-editor.c:178
 msgid "Category _Name"
 msgstr "Ð_ÐÐ ÐÐ ÐÐÑÐÐÐÑÐÑÑÐ"
 
-#: ../libedataserverui/e-category-editor.c:181
+#: ../libedataserverui/e-category-editor.c:186
 msgid "Category _Icon"
 msgstr "_ÐÐÐÐÐ ÐÐ ÐÐÑÐÐÐÑÐÑÑÐ"
 
-#: ../libedataserverui/e-category-editor.c:221
+#: ../libedataserverui/e-category-editor.c:226
 msgid "Category Properties"
 msgstr "ÐÐÑÑÑÐÐÐÐ ÐÐ ÐÐÑÐÐÐÑÐÑÑÐ"
 
-#: ../libedataserverui/e-category-editor.c:282
+#: ../libedataserverui/e-category-editor.c:287
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "Ð ÑÐÐÐ ÐÐÐÑÐÐÑÑÐÑÐÑ ÐÐÑÐ ÐÐÐ ÐÐÑÐÐÐÑÐÑ â%sâ. ÐÐÐÐÑÐÑÐ ÐÑÑÐÐ ÐÐÐ"
 
-#: ../libedataserverui/e-client-utils.c:856
-#, c-format
-msgid ""
-"Enter password for calendar %s (user %s)\n"
-"Reason: %s"
-msgstr ""
-"ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐÑÐ %s (ÐÐÑÑÐÐÐÑÐÐ â%sâ)\n"
-"ÐÑÐÑÐÐÐ: %s"
-
-#: ../libedataserverui/e-client-utils.c:858
-#, c-format
-msgid "Enter password for calendar %s (user %s)"
-msgstr "ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐÑÐ %s (ÐÐÑÑÐÐÐÑÐÐ â%sâ)"
-
-#: ../libedataserverui/e-client-utils.c:862
-#, c-format
-msgid ""
-"Enter password for task list %s (user %s)\n"
-"Reason: %s"
-msgstr ""
-"ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐ ÐÐ ÑÐÐÑÑÐÐ ÑÑÑ ÐÐÐÐÑÐ %s (ÐÐÑÑÐÐÐÑÐÐ â%sâ)\n"
-"ÐÑÐÑÐÐÐ: %s"
-
-#: ../libedataserverui/e-client-utils.c:864
-#, c-format
-msgid "Enter password for task list %s (user %s)"
-msgstr "ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐ ÐÐ ÑÐÐÑÑÐÐ ÑÑÑ ÐÐÐÐÑÐ %s (ÐÐÑÑÐÐÐÑÐÐ â%sâ)"
-
-#: ../libedataserverui/e-client-utils.c:868
-#, c-format
-msgid ""
-"Enter password for memo list %s (user %s)\n"
-"Reason: %s"
-msgstr ""
-"ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐ ÐÐ ÑÐÐÑÑÐÐ Ñ ÐÐÐÐÐÐÐ %s (ÐÐÑÑÐÐÐÑÐÐ â%sâ)\n"
-"ÐÑÐÑÐÐÐ: %s"
-
-#: ../libedataserverui/e-client-utils.c:870
-#, c-format
-msgid "Enter password for memo list %s (user %s)"
-msgstr "ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐ ÐÐ ÑÐÐÑÑÐÐ Ñ ÐÐÐÐÐÐÐ %s (ÐÐÑÑÐÐÐÑÐÐ â%sâ)"
-
-#: ../libedataserverui/e-client-utils.c:981
-msgid "Enter Passphrase"
-msgstr "ÐÑÐÐÐÐÑÐ ÑÐÐÐÐ ÑÑÐÐÐ"
-
-#: ../libedataserverui/e-client-utils.c:983
-msgid "Enter Password"
-msgstr "ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐ"
-
-#: ../libedataserverui/e-name-selector-dialog.c:184
+#: ../libedataserverui/e-name-selector-dialog.c:278
 msgid "Show Contacts"
 msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÑÐÑÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:206
+#: ../libedataserverui/e-name-selector-dialog.c:300
 msgid "Address B_ook:"
 msgstr "ÐÐÑÐÑÐÐ_Ð:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:214
-msgid "Cate_gory:"
-msgstr "Ð_ÐÑÐÐÐÑÐÑ"
+#: ../libedataserverui/e-name-selector-dialog.c:308
+msgid "Cat_egory:"
+msgstr "Ð_ÐÑÐÐÐÑÐÑ:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:232
+#: ../libedataserverui/e-name-selector-dialog.c:326
 msgid "_Search:"
 msgstr "_ÐÑÑÑÐÐÐ:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:250
-#: ../libedataserverui/e-name-selector-dialog.c:1035
+#: ../libedataserverui/e-name-selector-dialog.c:344
+#: ../libedataserverui/e-name-selector-dialog.c:1141
 msgid "Any Category"
 msgstr "ÐÑÐÑÐÐ ÐÐÑÐÐÐÑÐÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:252
+#: ../libedataserverui/e-name-selector-dialog.c:346
 msgid "Co_ntacts"
 msgstr "_ÐÐÐÑÐÐÑÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:307
+#: ../libedataserverui/e-name-selector-dialog.c:401
 msgid "Search"
 msgstr "ÐÑÑÑÐÐÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:310
+#: ../libedataserverui/e-name-selector-dialog.c:404
 msgid "Address Book"
 msgstr "ÐÐÑÐÑÐÐÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:313
+#: ../libedataserverui/e-name-selector-dialog.c:407
+#: ../modules/google-backend/module-google-backend.c:183
 msgid "Contacts"
 msgstr "ÐÐÐÑÐÐÑÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:430
+#: ../libedataserverui/e-name-selector-dialog.c:522
 msgid "Select Contacts from Address Book"
 msgstr "ÐÐÐÐÑ ÐÐ ÐÐÐÑÐÐÑÐ ÐÑ ÐÐÑÐÑÐÐÐÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:778
+#: ../libedataserverui/e-name-selector-dialog.c:880
 msgid "_Add"
 msgstr "_ÐÐÐÐÐÑÐÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:782
+#: ../libedataserverui/e-name-selector-dialog.c:884
 msgid "_Remove"
 msgstr "_ÐÑÐÐÐÑÐÐÐÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:954
+#: ../libedataserverui/e-name-selector-dialog.c:1056
 #, c-format
 msgid "Error loading address book: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐÐ: %s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2819
+#: ../libedataserverui/e-name-selector-entry.c:2959
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "_ÐÑÑÑÐÑÐÐ ÑÐÐÑÐÑÑÐÐÐÐ ÐÐ %s"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2834
+#: ../libedataserverui/e-name-selector-entry.c:2974
 #, c-format
 msgid "Cop_y %s"
 msgstr "_ÐÐÐÐÑÐÐÐ ÐÐ %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2844
+#: ../libedataserverui/e-name-selector-entry.c:2984
 #, c-format
 msgid "C_ut %s"
 msgstr "ÐÑ_ÑÑÐÐÐÐÐ ÐÐ %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2861
+#: ../libedataserverui/e-name-selector-entry.c:3001
 #, c-format
 msgid "_Edit %s"
 msgstr "_ÐÐÐÐÐÑÐÑÐÐÐ ÐÐ %s"
 
-#: ../libedataserverui/e-name-selector-list.c:520
+#: ../libedataserverui/e-name-selector-list.c:521
 #, c-format
 msgid "_Delete %s"
 msgstr "_ÐÐÑÑÐÐÐÐÐ ÐÐ %s"
@@ -5334,14 +5409,60 @@ msgstr "_ÐÐÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐÐÑÐ"
 msgid "_Remember this password for the remainder of this session"
 msgstr "ÐÐÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐÐÑÐ ÐÐ _ÐÑÐÑ ÐÐ ÑÐÐÐ ÑÐÑÐÑ"
 
-#. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:99
+#: ../libedataserverui/e-source-selector-dialog.c:224
+msgid "_Destination"
+msgstr "_ÐÐÐ"
+
+#: ../libedataserverui/e-source-selector-dialog.c:326
 msgid "Select destination"
 msgstr "ÐÐÐÐÑ ÐÐ ÑÐÐ"
 
-#: ../libedataserverui/e-source-selector-dialog.c:174
-msgid "_Destination"
-msgstr "_ÐÐÐ"
+#: ../modules/google-backend/module-google-backend.c:118
+#: ../modules/yahoo-backend/module-yahoo-backend.c:200
+msgid "Calendar"
+msgstr "ÐÐÐÐÐÐÐÑ"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:184
+#, c-format
+msgid "Code: %u - Unexpected response from server"
+msgstr "ÐÐÐ: %u â ÐÐÐÑÐÐÐÐÐ ÐÑÐÐÐÐÑ ÐÑ ÑÑÑÐÑÑÐ"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:205
+#, c-format
+msgid "Failed to parse autodiscover response XML"
+msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐ XML ÐÑ ÐÑÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐÐÑÐÑÐÐÑÐ ÐÑÐÑÐÐÐÐÐ ÐÐ ÑÑÑÐÑÑ"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:214
+#, c-format
+msgid "Failed to find Autodiscover element"
+msgstr "ÐÐÐÐÐÐÑÑÑ ÐÐ ÐÐÑÐÐÐÑÐÑÐÐÑÐ ÐÑÐÑÐÐÐÐÐ ÐÐ ÑÑÑÐÑÑ ÐÐÐÑÐÐ"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:226
+#, c-format
+msgid "Failed to find Response element"
+msgstr "ÐÐÐÐÐÐÑÑÑ ÐÐ ÐÑÐÐÐÐÑÐ ÐÐÐÑÐÐ"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:238
+#, c-format
+msgid "Failed to find Account element"
+msgstr "ÐÐÐÐÐÐÑÑÑ ÐÐ ÑÐÐÐÑÑÑÐÑÐÑÑÐ ÐÐÐÑÐÐ"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:252
+#, c-format
+msgid "Failed to find ASUrl and OABUrl in autodiscover response"
+msgstr ""
+"ÐÐÐÐÐÐÑÐÑÐ ASUrl Ð OABUrl ÐÐÐÑÐÐÑ Ð ÐÑÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐÐÑÐÑÐÐÑÐ ÐÑÐÑÐÐÐÐÐ ÐÐ "
+"ÑÑÑÐÑÑ"
+
+#: ../modules/yahoo-backend/module-yahoo-backend.c:215
+msgid "Tasks"
+msgstr "ÐÐÐÐÑÐ"
 
 #: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:47
 #: ../services/evolution-calendar-factory/evolution-calendar-factory.c:51
@@ -5352,3 +5473,19 @@ msgstr "ÐÑÐÐÑÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐÑÐÑÐ ÐÐÑÐ, ÐÐÐÐÑÐ Ð
 #: ../services/evolution-calendar-factory/evolution-calendar-factory.c:53
 msgid "Wait running until at least one client is connected"
 msgstr "ÐÐÑÐÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÐÐ ÐÐÐÐÐÑ"
+
+#: ../tests/libedataserverui/evolution-source-viewer.c:458
+msgid "Evolution Source Viewer"
+msgstr "ÐÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐÐÐ ÐÐÐ"
+
+#: ../tests/libedataserverui/evolution-source-viewer.c:487
+msgid "Display Name"
+msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐÐ"
+
+#: ../tests/libedataserverui/evolution-source-viewer.c:496
+msgid "Flags"
+msgstr "ÐÐÐÐÐÐÐ"
+
+#: ../tests/libedataserverui/evolution-source-viewer.c:520
+msgid "Identity"
+msgstr "ÐÐÐÐÑÐÑÐÐÑÑ"



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