[evolution-data-server] Updated Belarusian translation.



commit e09554d1e9681985dc6358f94fa83d9523c21fc1
Author: Ihar Hrachyshka <ihar hrachyshka gmail com>
Date:   Tue Jun 12 17:49:02 2012 +0300

    Updated Belarusian translation.

 po/be.po | 2412 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 1247 insertions(+), 1165 deletions(-)
---
diff --git a/po/be.po b/po/be.po
index a0d11f2..ba00f43 100644
--- a/po/be.po
+++ b/po/be.po
@@ -3,262 +3,223 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server.master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-02 12:11+0300\n"
-"PO-Revision-Date: 2012-03-02 12:11+0300\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
+"POT-Creation-Date: 2012-06-11 22:40+0000\n"
+"PO-Revision-Date: 2012-06-12 17:48+0300\n"
 "Last-Translator: Ihar Hrachyshka <ihar hrachyshka gmail com>\n"
 "Language-Team: Belarusian <i18n-bel-gnome googlegroups com>\n"
-"Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: be\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:129
+#: ../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:441
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:548
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:577
-#: ../calendar/backends/http/e-cal-backend-http.c:424
-#: ../calendar/libecal/e-cal.c:4596 ../calendar/libecal/e-cal-client.c:150
-#: ../camel/providers/imap/camel-imap-command.c:515
+#: ../addressbook/libebook/e-book-client.c:108
+#: ../addressbook/libedata-book/e-data-book.c:432
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:567
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:597
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:616
+#: ../calendar/libecal/e-cal.c:4029 ../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:166
+#: ../libedataserver/e-client.c:165
 msgid "Unknown error"
 msgstr "ÐÐÐÑÐÐÐÐÑ ÐÐÐÑÐÐÐ"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:154
+#: ../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:177
+#: ../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:472
+#: ../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:574
-#: ../addressbook/backends/file/e-book-backend-file.c:1129
+#: ../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 "ÐÐÐÑÐÐÑ ÐÐ ÐÐÐ UID"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1563
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:516
+#: ../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:1566
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4870
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:518
+#: ../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:2108
+#: ../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:874
+#: ../addressbook/backends/google/e-book-backend-google.c:879
 msgid "Querying for updated contactsâ"
 msgstr "ÐÐÐÑÑ ÐÐÐÐÑÐÐÐÑÑ ÐÐÐÑÐÐÑÐÑ..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:923
-#: ../addressbook/libebook/e-book.c:3531 ../calendar/libecal/e-cal.c:1380
-#: ../libedataserver/e-client.c:1920
+#: ../addressbook/backends/google/e-book-backend-google.c:928
 msgid "Personal"
 msgstr "ÐÑÐÐÑÑÑÑÑ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:925
+#. System Group: My Contacts
+#: ../addressbook/backends/google/e-book-backend-google.c:929
 msgid "Friends"
 msgstr "ÐÑÐÑÑ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:927
+#. System Group: Friends
+#: ../addressbook/backends/google/e-book-backend-google.c:930
 msgid "Family"
 msgstr "ÐÑÐ'Ñ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:929
+#. System Group: Family
+#: ../addressbook/backends/google/e-book-backend-google.c:931
 msgid "Coworkers"
 msgstr "ÐÐÐÐÐÑ"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1019
+#: ../addressbook/backends/google/e-book-backend-google.c:1071
 msgid "Querying for updated groupsâ"
 msgstr "ÐÐÐÑÑ ÐÐÐÐÑÐÐÐÑÑ ÐÑÑÐ..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1424
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1639
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:295
+#: ../addressbook/backends/google/e-book-backend-google.c:1495
+#: ../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:1451
+#: ../addressbook/backends/google/e-book-backend-google.c:1522
 msgid "Creating new contactâ"
 msgstr "ÐÑÐÐÑÑÐÐÐ ÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1540
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:327
+#: ../addressbook/backends/google/e-book-backend-google.c:1611
+#: ../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:1568
+#: ../addressbook/backends/google/e-book-backend-google.c:1639
 msgid "Deleting contactâ"
 msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1818
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2296
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:375
+#: ../addressbook/backends/google/e-book-backend-google.c:1889
+#: ../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:1851
+#: ../addressbook/backends/google/e-book-backend-google.c:1922
 msgid "Modifying contactâ"
 msgstr "ÐÐÑÐÐÐÐÐ ÐÐÐÑÐÐÑÐ..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2058
+#: ../addressbook/backends/google/e-book-backend-google.c:2130
 msgid "Loadingâ"
 msgstr "ÐÐÐÑÑÐÐÐ..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2187
-msgid "Authenticating with the serverâ"
-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:177
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:165
 msgid "Not connected"
 msgstr "ÐÑÐÐ ÐÐÑÑÑÐÐÑ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:797
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:793
 msgid "Using Distinguished Name (DN)"
 msgstr "ÐÑÐÐÑÑÑÑÐÑÐÐÐÑÑÐ Distinguished Name (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:800
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:796
 msgid "Using Email Address"
 msgstr "ÐÑÐÐÑÑÑÑÐÑÐÐÐÑÑÐ ÐÐÑÐÑ ÑÐÐÐÑÑÐÐÐÐÐ ÐÐÑÑÑ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1071
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1090
 msgid "Reconnecting to LDAP server..."
 msgstr "ÐÐÑÐÐÐÑÑÑÐÐÐ Ð LDAP-ÑÐÑÐÐÑÐÐ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1200
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1216
 msgid "Invalid DN syntax"
 msgstr "ÐÑÐÐÑ ÑÑÐÑÐÐÑÑÑ DN"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1738
+#: ../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:1869
+#: ../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:2318
+#: ../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:4720
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4736
 msgid "Receiving LDAP search results..."
 msgstr "ÐÑÑÑÐÐÐÐÐ ÐÑÐÑÐÐÑ ÐÐÑÑÐÑ ÐÐ LDAP-ÑÐÑÐÐÑÑ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4891
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4907
 msgid "Error performing search"
 msgstr "ÐÐÐÑÐÐÐ ÐÐÑÑÐÑ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5012
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5028
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "ÐÑÑÑÐÐÐÐÐ ÐÐÐÑÐÐÑÐÑ (%d)... "
 
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5567
+#, c-format
+msgid "Failed to get the DN for user '%s'"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÑÑÐÐÑÑ DN ÐÐÑ ÐÐÑÑÑÑÐÐÑÐÑÐÐ \"%s\""
+
 #: ../addressbook/backends/webdav/e-book-backend-webdav.c:354
 #, c-format
 msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÑÐÐÑÑÑÑ ÑÑÑÑÑÑ \"%s\", ÐÐÐÑÐÐÐ HTTP: %d (%s)"
 
-#: ../addressbook/libebook/e-book.c:3198
-#, c-format
-msgid "%s: there was no source for UID '%s' stored in GConf."
-msgstr "%s: ÐÑÑÐÑÑÐ ÐÐÑ UID \"%s\" ÐÐ ÐÐÑÐÐÐÐÐÑ Ñ GConf."
-
-#: ../addressbook/libebook/e-book.c:3514 ../calendar/libecal/e-cal.c:1360
-#: ../libedataserver/e-client.c:1915
-msgid "On This Computer"
-msgstr "ÐÐ ÐÑÑÑÐ ÐÐÐÐ'ÑÑÐÑÑ"
-
-#: ../addressbook/libebook/e-book.c:3640
-#: ../addressbook/libebook/e-book-client.c:702
-#: ../addressbook/libedata-book/e-data-book.c:322
-msgid "Address book does not exist"
-msgstr "ÐÐÑÐÑÐÐÑ ÐÐÑÐÐ ÐÐ ÑÑÐÑÐ"
-
-#: ../addressbook/libebook/e-book-client.c:95
+#: ../addressbook/libebook/e-book-client.c:97
 msgid "No such book"
 msgstr "ÐÐÐÐÐ ÐÐÑÐÑ ÐÑÐÐ"
 
-#: ../addressbook/libebook/e-book-client.c:97
-#: ../addressbook/libedata-book/e-data-book.c:315
+#: ../addressbook/libebook/e-book-client.c:99
+#: ../addressbook/libedata-book/e-data-book.c:306
 msgid "Contact not found"
 msgstr "ÐÐÐÑÐÐÑ ÐÐ ÐÐÐÐÐÐÐÐÑ"
 
-#: ../addressbook/libebook/e-book-client.c:99
-#: ../addressbook/libedata-book/e-data-book.c:316
+#: ../addressbook/libebook/e-book-client.c:101
+#: ../addressbook/libedata-book/e-data-book.c:307
 msgid "Contact ID already exists"
 msgstr "ÐÐÐÑ ÑÐÑÐÑÑÑÑÐÐÑÐÑ ÐÐÐÑÐÐÑÑ ÑÐÐ ÑÑÐÑÐ"
 
-#: ../addressbook/libebook/e-book-client.c:101
+#: ../addressbook/libebook/e-book-client.c:103
 msgid "No such source"
 msgstr "ÐÐÐÐÐ ÐÑÑÐÑÑÑ ÐÑÐÐ"
 
-#: ../addressbook/libebook/e-book-client.c:103
-#: ../addressbook/libedata-book/e-data-book.c:332
+#: ../addressbook/libebook/e-book-client.c:105
+#: ../addressbook/libedata-book/e-data-book.c:323
 msgid "No space"
 msgstr "ÐÑÐÐ ÐÑÑÐÐÐÐÐ ÐÑÐÑÑÐÑÑ"
 
-#: ../addressbook/libebook/e-book-client.c:515
+#: ../addressbook/libebook/e-book-client.c:490
 msgid "Failed to run book factory"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÑÑÑÑ ÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÐ ÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-book-client.c:525
-#: ../addressbook/libedata-book/e-data-book-factory.c:196
-#: ../addressbook/libedata-book/e-data-book-factory.c:228
-#: ../calendar/libecal/e-cal-client.c:613
-#: ../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:627
-#: ../calendar/libecal/e-cal-client.c:728
-#, c-format
-msgid "Incorrect uri '%s'"
-msgstr "ÐÐÐÑÐÐÐÐÑ URI-ÐÐÑÐÑ \"%s\""
-
-#: ../addressbook/libebook/e-book-client.c:665
-msgid "Failed to find system book"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÑÐÐÑÑ ÑÑÑÑÑÐÐÑÑ ÐÐÑÐÑÐÑÑ ÐÐÑÐÑ"
-
-#: ../addressbook/libebook/e-book-client.c:774
-#: ../calendar/libecal/e-cal-client.c:881
-#, c-format
-msgid "There was no source for UID '%s' stored in a source list."
-msgstr "ÐÑÑÐÑÑÐ ÐÐÑ UID \"%s\" ÐÐ ÐÐÑÐÐÐÐÐÑ Ñ ÐÐÐÐÐÐÐÐÑÐ ÑÐÑÑÐ."
-
-#: ../addressbook/libebook/e-book-client.c:2566
-#: ../calendar/libecal/e-cal-client.c:4536
+#: ../addressbook/libebook/e-book-client.c:2281
+#: ../calendar/libecal/e-cal-client.c:4616
 msgid "Cannot get connection to view"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÑÑÐÐÑÐÐÑÑ ÐÐÑÑÑÐÐÐ ÐÐÑ ÐÑÐÐÐÑÐÑ"
 
@@ -270,7 +231,7 @@ 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
 #. 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.
+#. * 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 "ÐÐÐÐÐ ÐÐÐÑÐÐÑÐ"
@@ -452,7 +413,7 @@ msgstr "ÐÐÐÐ"
 
 #. Contact categories
 #: ../addressbook/libebook/e-contact.c:188
-#: ../libedataserverui/e-categories-dialog.c:88
+#: ../libedataserverui/e-categories-dialog.c:90
 msgid "Categories"
 msgstr "ÐÐÑÑÐÐÑÑÑ"
 
@@ -633,8 +594,8 @@ msgid "Last Revision"
 msgstr "ÐÐÑÐ ÐÐÐÑÐÑÐÐ ÐÐÐÐÑÐÐÐÐÑ"
 
 #. 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.
+#. * 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 "ÐÐÑ ÑÑ ÑÑÑÐÐÐÐÐ"
@@ -671,7 +632,7 @@ msgid "Logo"
 msgstr "ÐÐÐÐÑÑÐ"
 
 #. 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
+#. * 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 "ÐÐÑ"
@@ -710,26 +671,26 @@ msgid "Wants HTML Mail"
 msgstr "ÐÐÐÐÐ ÐÐÑÐÐÐÐÑ HTML-ÐÑÑÑÐÐ"
 
 #. 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/...
+#. * 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 "ÐÐÑÑ"
 
 #. 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.
+#. * 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 Show Addresses"
-msgstr "ÐÐÐÐÐÑÑÐÐÑÑ ÑÐÑÑ ÐÐÑÐÑÐÑ"
+msgid "List Shows Addresses"
+msgstr "ÐÐÑÑ ÐÐÐÐÐÐÐÐ ÐÐÑÐÑÑ"
 
 #: ../addressbook/libebook/e-contact.c:283
 msgid "Birth Date"
 msgstr "ÐÐÑÐ ÐÐÑÐÐÐÑÐÐÑ"
 
 #: ../addressbook/libebook/e-contact.c:284
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1063
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:922
 msgid "Anniversary"
 msgstr "ÐÐÐÐÐÑÐÐ"
 
@@ -835,245 +796,276 @@ msgstr "ÐÑÐÑÐÑÐÑ Google Talk 3"
 msgid "Google Talk Name List"
 msgstr "ÐÐÑÑ ÐÐÐÑÐÐÑÐÑ Google Talk"
 
-#: ../addressbook/libebook/e-contact.c:1611
-#: ../addressbook/libebook/e-destination.c:878
+#: ../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:91
+#: ../addressbook/libedata-book/e-book-backend.c:90
 #, c-format
 msgid "Unknown book property '%s'"
 msgstr "ÐÐÐÑÐÐÐÐÑ ÑÐÐÑÑÑÐÐÑÑÑ ÐÐÑÐÑ: \"%s\""
 
-#: ../addressbook/libedata-book/e-book-backend.c:108
+#: ../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:501
+#: ../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:1093
+#: ../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:4564 ../calendar/libedata-cal/e-data-cal.c:428
-#: ../libedataserver/e-client.c:123
+#: ../addressbook/libedata-book/e-data-book.c:303
+#: ../calendar/libecal/e-cal.c:3997 ../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:133
+#: ../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:4578 ../calendar/libedata-cal/e-data-cal.c:430
-#: ../libedataserver/e-client.c:139
+#: ../addressbook/libedata-book/e-data-book.c:305
+#: ../calendar/libecal/e-cal.c:4011 ../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:147
+#: ../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:149
+#: ../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:151
+#: ../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:153
+#: ../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:155
+#: ../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:157
+#: ../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:143
+#: ../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:4562 ../calendar/libedata-cal/e-data-cal.c:451
-#: ../libedataserver/e-client.c:121
+#: ../addressbook/libedata-book/e-data-book.c:324
+#: ../calendar/libecal/e-cal.c:3995 ../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:4601 ../calendar/libedata-cal/e-data-cal.c:453
-#: ../libedataserver/e-client.c:145
+#: ../addressbook/libedata-book/e-data-book.c:326
+#: ../calendar/libecal/e-cal.c:4034 ../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:163
+#: ../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:621
-#: ../calendar/libedata-cal/e-data-cal.c:462 ../libedataserver/e-client.c:161
+#: ../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 "ÐÐ ÑÐÐÐÐÑÑ ÐÑÑÑÐÐÑÑ ÑÐÑÑ ÑÐÑÐÑÑÑÑÐÐÑÐÑÐÑ ÐÐÐÑÐÐÑÐÑ: "
 
 #. 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 "Empty URI"
-msgstr "ÐÑÑÑÑ URI-ÐÐÑÐÑ"
+msgid "No backend name in source '%s'"
+msgstr ""
+
+#: ../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 ""
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:546
+#: ../addressbook/libedata-book/e-data-book-factory.c:319
+#: ../calendar/libedata-cal/e-data-cal-factory.c:230
+msgid "Missing source UID"
+msgstr "ÐÐÑÑÑÐÑ UID ÐÑÑÐÑÑÑ"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:332
+#: ../calendar/libedata-cal/e-data-cal-factory.c:243
+#, c-format
+msgid "No such source for UID '%s'"
+msgstr "ÐÐÐÐÐ ÐÑÑÐÑÑÑ ÐÑÐÐ ÐÐÑ UID \"%s\""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:565
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "ÐÐÑÐÐÑ ÐÐÐÐÑÑÑÐÐÑ (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:574
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:595
+#, c-format
+msgid "Failed to connect to a server using SSL: %s"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÑÑÑÑÐ Ð ÑÐÑÐÐÑÐÐ Ð ÐÐÐÐÐÐÐÐÐ SSL: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:600
+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 ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:613
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "ÐÐÑÐÑÑÑ ÐÐÑÐÐÐÐÑ ÐÐÐ ÑÑÐÐÑ HTTP %d (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2212
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2567
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2303
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2673
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1082,469 +1074,445 @@ msgstr ""
 "ÐÐÑÐÐÑ ÐÐÐÐÑÑÐÐÐÑÐÑ, ÐÐÐÑÐÐÐÑ ÐÐÐÑÑÑÑ Ñ ÑÑÐÑÐÐ ÑÐÐÑÐÑ ÐÐÑ ÑÑÑÐÐÐÑ.\n"
 "ÐÑÐÑÑ ÐÐÐÑÐÐÑ: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4482
-msgid "Calendar doesn't support Free/Busy"
-msgstr "ÐÐÐÑÐÐÐÑ ÐÐ ÐÐÐÑÑÑÐÐÑÐÐÐ ÑÐÑÐÑÐÐÑÑÑ ÐÐ ÐÐÐÑÑÐÑÑÑ"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3669
+msgid "CalDAV does not support bulk additions"
+msgstr "CalDAV ÐÐ ÐÐÐÑÑÑÐÐÑÐÐÐ ÐÐÐÐÐÐÐÐÑ ÐÑÑÑÐÐ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:219
-#: ../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:3771
+msgid "CalDAV does not support bulk modifications"
+msgstr "CalDAV ÐÐ ÐÐÐÑÑÑÐÐÑÐÐÐ ÐÐÐÑÑÑÐÐÑÑÑ ÐÑÑÑÐÐ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:221
-#: ../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:3939
+msgid "CalDAV does not support bulk removals"
+msgstr "CalDAV ÐÐ ÐÐÐÑÑÑÐÐÑÐÐÐ ÐÑÐÐÐÐÐÐÑ ÐÑÑÑÐÐ"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4598
+msgid "Calendar doesn't support Free/Busy"
+msgstr "ÐÐÐÑÐÐÐÑ ÐÐ ÐÐÐÑÑÑÐÐÑÐÐÐ ÑÐÑÐÑÐÐÑÑÑ ÐÐ ÐÐÐÑÑÐÑÑÑ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1065
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:924
 msgid "Birthday"
 msgstr "ÐÐÐÐÑ ÐÐÑÐÐÐÑÐÐÑ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1101
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:960
 #, c-format
 msgid "Birthday: %s"
 msgstr "ÐÐÐÐÑ ÐÐÑÐÐÐÑÐÐÑ: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1132
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:991
 #, c-format
 msgid "Anniversary: %s"
 msgstr "ÐÐÐÐÐÑÐÐ: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:251
+#: ../calendar/backends/file/e-cal-backend-file.c:235
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÑÑ ÐÐÐÑÑ ÐÐÐÐÐÐÐÑÐ: ÑÑÐÐÑ URI-ÐÐÑÐÑ."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:258
-#: ../calendar/backends/file/e-cal-backend-file.c:264
+#: ../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:405
+#: ../calendar/backends/http/e-cal-backend-http.c:481
+#, c-format
+msgid "Malformed URI: %s"
+msgstr "ÐÑÐÐÑ URI-ÐÐÑÐÑ: %s"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:542
+#, c-format
 msgid "Redirected to Invalid URI"
 msgstr "ÐÐÑÐÐÐÐÑÑÐÐÐÐÐ ÐÐ ÑÑÐÐÑ URI-ÐÐÑÐÑ"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:446
+#: ../calendar/backends/http/e-cal-backend-http.c:579
+#, c-format
 msgid "Bad file format."
 msgstr "ÐÐÐÑÐÑ ÑÐÑÐÐÑ ÑÐÐÐÐ."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:454
+#: ../calendar/backends/http/e-cal-backend-http.c:589
+#, c-format
 msgid "Not a calendar."
 msgstr "ÐÑÑÐ ÐÐ ÐÐÐÑÐÐÐÑ."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:780
-#: ../calendar/backends/http/e-cal-backend-http.c:781
-#: ../calendar/backends/weather/e-cal-backend-weather.c:524
+#: ../calendar/backends/http/e-cal-backend-http.c:934
+#: ../calendar/backends/http/e-cal-backend-http.c:938
+#: ../calendar/backends/weather/e-cal-backend-weather.c:523
 msgid "Could not create cache file"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÑÐÐÑÑÑÑ ÐÑÑ-ÑÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:183
+#: ../calendar/backends/weather/e-cal-backend-weather.c:171
 msgid "Could not retrieve weather data"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÑÑÐÐÑÑ ÐÐÐÑÑ ÐÐ ÐÐÐÐÐÑ'Ñ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:279
+#: ../calendar/backends/weather/e-cal-backend-weather.c:276
 msgid "Weather: Fog"
 msgstr "ÐÐÐÐÐÑ'Ð: ÐÑÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:280
+#: ../calendar/backends/weather/e-cal-backend-weather.c:277
 msgid "Weather: Cloudy Night"
 msgstr "ÐÐÐÐÐÑ'Ð: ÐÐÐÐÐÑÐÐÑ ÐÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:281
+#: ../calendar/backends/weather/e-cal-backend-weather.c:278
 msgid "Weather: Cloudy"
 msgstr "ÐÐÐÐÐÑ'Ð: ÐÐÐÐÐÑÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:282
+#: ../calendar/backends/weather/e-cal-backend-weather.c:279
 msgid "Weather: Overcast"
 msgstr "ÐÐÐÐÐÑ'Ð: ÐÐÑÐÑÑÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:283
+#: ../calendar/backends/weather/e-cal-backend-weather.c:280
 msgid "Weather: Showers"
 msgstr "ÐÐÐÐÐÑ'Ð: ÐÑÑÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:284
+#: ../calendar/backends/weather/e-cal-backend-weather.c:281
 msgid "Weather: Snow"
 msgstr "ÐÐÐÐÐÑ'Ð: ÐÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:285
+#: ../calendar/backends/weather/e-cal-backend-weather.c:282
 msgid "Weather: Clear Night"
 msgstr "ÐÐÐÐÐÑ'Ð: ÐÑÐÐÑ ÐÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:286
+#: ../calendar/backends/weather/e-cal-backend-weather.c:283
 msgid "Weather: Sunny"
 msgstr "ÐÐÐÐÐÑ'Ð: ÐÐÐÐÑÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:287
+#: ../calendar/backends/weather/e-cal-backend-weather.c:284
 msgid "Weather: Thunderstorms"
 msgstr "ÐÐÐÐÐÑ'Ð: ÐÐÐÐÐÑÐÑÑÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:435
+#: ../calendar/backends/weather/e-cal-backend-weather.c:429
 msgid "Forecast"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÐÑ'Ñ"
 
-#: ../calendar/libecal/e-cal.c:891 ../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:905
-#, c-format
-msgid "Enter password for %s to enable proxy for user %s"
-msgstr "ÐÐÑÑÑÑÐ ÐÐÑÐÐÑ ÐÐÑ %s, ÐÐÐ ÑÐÐÑÑÑÑÑ ÐÑÐÐÑÑ-ÑÐÑÐÐÑ ÐÐÑ ÐÐÑÑÑÑÐÐÑÐÑÐÐ %s"
-
-#: ../calendar/libecal/e-cal.c:4566
+#: ../calendar/libecal/e-cal.c:3999
 msgid "Repository is offline"
 msgstr "ÐÑÐÐÑÑÑÐ ÐÐ-ÐÐ ÑÐÑÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4568 ../calendar/libecal/e-cal-client.c:137
+#: ../calendar/libecal/e-cal.c:4001 ../calendar/libecal/e-cal-client.c:135
 msgid "No such calendar"
 msgstr "ÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÑÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4570 ../calendar/libecal/e-cal-client.c:139
-#: ../calendar/libedata-cal/e-data-cal.c:432
+#: ../calendar/libecal/e-cal.c:4003 ../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:4572 ../calendar/libecal/e-cal-client.c:141
-#: ../calendar/libedata-cal/e-data-cal.c:433
+#: ../calendar/libecal/e-cal.c:4005 ../calendar/libecal/e-cal-client.c:139
+#: ../calendar/libedata-cal/e-data-cal.c:421
 msgid "Invalid object"
 msgstr "ÐÑÐÐÑ ÐÐ'ÐÐÑ"
 
-#: ../calendar/libecal/e-cal.c:4574
+#: ../calendar/libecal/e-cal.c:4007
 msgid "URI not loaded"
 msgstr "URI-ÐÐÑÐÑ ÐÐ ÐÐÐÑÑÐÐÐÑ"
 
-#: ../calendar/libecal/e-cal.c:4576
+#: ../calendar/libecal/e-cal.c:4009
 msgid "URI already loaded"
 msgstr "URI-ÐÐÑÐÑ ÑÐÐ ÐÐÐÑÑÐÐÐÑ"
 
-#: ../calendar/libecal/e-cal.c:4580
+#: ../calendar/libecal/e-cal.c:4013
 msgid "Unknown User"
 msgstr "ÐÐÐÑÐÐÐÑ ÐÐÑÑÑÑÐÐÑÐÑÐ"
 
-#: ../calendar/libecal/e-cal.c:4582 ../calendar/libecal/e-cal-client.c:145
-#: ../calendar/libedata-cal/e-data-cal.c:434
+#: ../calendar/libecal/e-cal.c:4015 ../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:4584
+#: ../calendar/libecal/e-cal.c:4017
 msgid "Protocol not supported"
 msgstr "ÐÑÐÑÐÐÐÐ ÐÐ ÐÐÐÑÑÑÐÐÑÐÐÐÑÑÐ"
 
-#: ../calendar/libecal/e-cal.c:4586
+#: ../calendar/libecal/e-cal.c:4019
 msgid "Operation has been canceled"
 msgstr "ÐÐÐÑÐÑÑÑ ÐÑÐÐ ÑÐÐÑÐÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4588
+#: ../calendar/libecal/e-cal.c:4021
 msgid "Could not cancel operation"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÑÐÐÐÑÑ ÐÐÐÑÐÑÑÑ"
 
-#: ../calendar/libecal/e-cal.c:4590 ../libedataserver/e-client.c:129
+#: ../calendar/libecal/e-cal.c:4023 ../libedataserver/e-client.c:128
 msgid "Authentication failed"
 msgstr "ÐÑÑÐÐÐÐÑ ÑÐÑÐÑÑÑÑÐÐÑÑÑ"
 
-#: ../calendar/libecal/e-cal.c:4592
-#: ../camel/providers/smtp/camel-smtp-transport.c:846
-#: ../libedataserver/e-client.c:131
+#: ../calendar/libecal/e-cal.c:4025
+#: ../camel/providers/smtp/camel-smtp-transport.c:845
+#: ../libedataserver/e-client.c:130
 msgid "Authentication required"
 msgstr "ÐÐÑÑÐÐÑÐÑÑÐ ÑÐÑÐÑÑÑÑÐÐÑÑÑ"
 
-#: ../calendar/libecal/e-cal.c:4594
+#: ../calendar/libecal/e-cal.c:4027
 msgid "A D-Bus exception has occurred"
 msgstr "ÐÐÐÑÐÐÐ ÐÑÐÐÑÑÑÐÐÐ D-Bus"
 
-#: ../calendar/libecal/e-cal.c:4598
+#: ../calendar/libecal/e-cal.c:4031
 msgid "No error"
 msgstr "ÐÐÐÑÐÐÐ ÐÐÑÑÑÐÑÑÐÐ"
 
-#: ../calendar/libecal/e-cal-client.c:143
-#: ../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:147
-#: ../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:603
+#: ../calendar/libecal/e-cal-client.c:610
 msgid "Failed to run calendar factory"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÑÑÑÑ ÑÐÐÑÑÐÑ ÐÐÐÐÐÐÐÑÐ"
 
-#: ../calendar/libecal/e-cal-client.c:768
-msgid "Failed to find system calendar"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÑÐÐÑÑ ÑÑÑÑÑÐÐÑ ÐÐÐÑÐÐÐÑ"
-
-#: ../calendar/libecal/e-cal-client.c:807
-#: ../calendar/libedata-cal/e-data-cal.c:441
-msgid "Calendar does not exist"
-msgstr "ÐÐÐÑÐÐÐÑ ÐÐ ÑÑÐÑÐ"
-
-#: ../calendar/libecal/e-cal-client.c:922
-msgid "Invalid source type"
-msgstr "ÐÑÐÐÑ ÑÑÐ ÐÑÑÐÑÑÑ"
-
-#: ../calendar/libecal/e-cal-component.c:1337
+#: ../calendar/libecal/e-cal-component.c:1339
 msgid "Untitled appointment"
 msgstr "ÐÑÑÑÑÑÑÐ ÐÐÐ ÐÐÐÐÑ"
 
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:3980
 msgid "1st"
 msgstr "1"
 
-#: ../calendar/libecal/e-cal-recur.c:3982
+#: ../calendar/libecal/e-cal-recur.c:3981
 msgid "2nd"
 msgstr "2"
 
-#: ../calendar/libecal/e-cal-recur.c:3983
+#: ../calendar/libecal/e-cal-recur.c:3982
 msgid "3rd"
 msgstr "3"
 
-#: ../calendar/libecal/e-cal-recur.c:3984
+#: ../calendar/libecal/e-cal-recur.c:3983
 msgid "4th"
 msgstr "4"
 
-#: ../calendar/libecal/e-cal-recur.c:3985
+#: ../calendar/libecal/e-cal-recur.c:3984
 msgid "5th"
 msgstr "5"
 
-#: ../calendar/libecal/e-cal-recur.c:3986
+#: ../calendar/libecal/e-cal-recur.c:3985
 msgid "6th"
 msgstr "6"
 
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "7th"
 msgstr "7"
 
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "8th"
 msgstr "8"
 
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "9th"
 msgstr "9"
 
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "10th"
 msgstr "10"
 
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/libecal/e-cal-recur.c:4010
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/libecal/e-cal-recur.c:4011
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "31st"
 msgstr "31"
 
-#: ../calendar/libecal/e-cal-util.c:691 ../calendar/libecal/e-cal-util.c:718
+#: ../calendar/libecal/e-cal-util.c:693 ../calendar/libecal/e-cal-util.c:720
 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:695 ../calendar/libecal/e-cal-util.c:722
 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:697 ../calendar/libecal/e-cal-util.c:724
 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:718
 msgctxt "Priority"
 msgid "Undefined"
 msgstr "ÐÑÐÑÐÐÐÑÐÐÑ"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:38
+#: ../calendar/libedata-cal/e-cal-backend.c:36
 msgid "Cannot process, calendar backend is opening"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÐÐÐÑÑ ÐÐÐÑÑ, ÐÑÐÐÐÐÑ ÐÐÐÐÐÐÐÑÐ ÐÐÐÑÑÐÐÐÑÑÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:146
+#: ../calendar/libedata-cal/e-cal-backend.c:135
 #, c-format
 msgid "Unknown calendar property '%s'"
 msgstr "ÐÐÐÑÐÐÐÐÑ ÑÐÐÑÑÑÐÐÑÑÑ ÐÐÐÐÐÐÐÑÐ \"%s\""
 
-#: ../calendar/libedata-cal/e-cal-backend.c:163
+#: ../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:79
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:819
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:841
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:956
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:987
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1187
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1217
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:77
+#: ../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\" ÐÐ ÑÐÐÐÐ ÐÑÐÑÐÐÐÑÐÑ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:231
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:276
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:315
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1258
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:229
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:274
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:313
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1256
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\" ÑÐÐÐÐ ÐÐÐÐÐÐ ÐÑÐÑÐÐÐÑÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:128
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:321
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:886
+#: ../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:884
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "\"%s\" ÑÐÐÐÐ Ñ ÑÐÐÑÑÑ ÐÐÑÑÐÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐÑ ÐÐÐÑÑÐÐÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:136
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:134
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr ""
 "\"%s\" ÑÐÐÐÐ Ñ ÑÐÐÑÑÑ ÐÐÑÑÐÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐÑ ÐÐÐÑÑÐÐÐ ÐÐÑÑ/ÑÐÑÑ ISO 8601"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:178
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:537
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:880
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1022
+#: ../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:878
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1020
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "\"%s\" ÑÐÐÐÐ ÐÐÐ ÐÑÐÑÐÐÐÑÑ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:184
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:237
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:282
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:403
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:486
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:543
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1028
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1264
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:182
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:235
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:280
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:401
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:484
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:541
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c: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-ÐÐÐÑÑÐÐÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:192
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:190
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "\"%s\" ÑÐÐÐÐ Ñ ÑÐÐÑÑÑ ÐÑÑÐÐÐÐ ÐÑÐÑÐÐÐÑÐ ÑÑÐÑ ÐÑÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:397
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:395
 #, c-format
 msgid "\"%s\" expects two or three arguments"
 msgstr "\"%s\" ÑÐÐÐÐ ÐÐÑÑ ÑÑ ÑÑÐÑ ÐÑÐÑÐÐÐÑÐÑ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:411
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:492
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:552
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1036
+#: ../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:1034
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "\"%s\" ÑÐÐÐÐ Ñ ÑÐÐÑÑÑ ÐÑÑÐÐÐÐ ÐÑÐÑÐÐÐÑÐ time_t-ÐÐÐÑÑÐÐÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:420
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:418
 #, c-format
 msgid "\"%s\" expects the third argument to be a string"
 msgstr "\"%s\" ÑÐÐÐÐ Ñ ÑÐÐÑÑÑ ÑÑÑÑÑÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐÑ ÐÐÐÑÑÐÐÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:480
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:478
 #, c-format
 msgid "\"%s\" expects none or two arguments"
 msgstr "\"%s\" ÑÐÐÐÐ ÐÐÐ ÐÑ ÐÐÐÐÐÐ, ÐÐÐ ÐÐÑÑ ÐÑÐÑÐÐÐÑÐÑ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:894
+#: ../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:924
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:922
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1556,12 +1524,12 @@ msgstr ""
 "\" (ÐÐÑÑÐÐÐÐÐÐÑÐÐÐ), \"attendee\" (ÑÐÐÐÐÑÐÑÐ), \"organizer\" (ÐÑÐÐÐÑÐÐÑÐÑ) "
 "ÑÑ \"classification\" (ÐÐÐÑÑÑÑÐÐÑÑÑ)"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1086
+#: ../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:1100
+#: ../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 "
@@ -1570,97 +1538,101 @@ msgstr ""
 "\"%s\" ÑÐÐÐÐ Ñ ÑÐÐÑÑÑ ÑÑÑÑ ÐÑÐÑÐÐÐÑÐÑ ÐÐÐÐÐÐÑÑ ÐÐÐÑÑÐÐÑ, ÐÐÐ ÑÐÐÑÐÑ ÐÐÐÑÐ "
 "ÐÑÐÑÐÐÐÑ ÐÑÑÑÑÑ ÐÑÑÑ ÐÑÐÐÐÑÐ ÐÐÐÑÑÐÐÐÐ ÐÑÐÑÐÑÐÑ (false, #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 "ÐÐ ÑÐÐÐÐÑÑ ÐÑÑÑÐÐÑÑ URI-ÐÐÑÐÑÑ ÐÑÑÑÑÐÐÐÐÑÑ ÑÐÐÐÐÑ: "
 
 #. 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 "ÐÑÐÐÑ ÐÑÐÐÑÐ"
@@ -1695,15 +1667,15 @@ msgstr "Ð ÐÑÑÑÐ ÑÑÑÑÐÐ ÐÐÐÐÐÑÑÐÐ ÑÐÐÐÑÑÐÐÐÑÑ Ð
 msgid "You may not export keys with this cipher"
 msgstr "Ð ÐÑÑÑÐ ÑÑÑÑÐÐ ÐÐÐÐÐÑÑÐÐ ÑÐÑÐÐÑÑÐÐÐÑÑ ÐÐÑÑÑ"
 
-#: ../camel/camel-cipher-context.c:805
+#: ../camel/camel-cipher-context.c:817
 msgid "Signing message"
 msgstr "ÐÐÐÐÑÑÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐÐÐÑ"
 
-#: ../camel/camel-cipher-context.c:1046
+#: ../camel/camel-cipher-context.c:1058
 msgid "Encrypting message"
 msgstr "ÐÑÑÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐÐÐÑ"
 
-#: ../camel/camel-cipher-context.c:1173
+#: ../camel/camel-cipher-context.c:1185
 msgid "Decrypting message"
 msgstr "ÐÐÑÑÑÑÑÐÑÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐÐÐÑ"
 
@@ -1753,33 +1725,27 @@ msgstr "ÐÑÑÐÐÐÐÐÐ ÐÐÐÑÑ ÐÐÐÐÐÐÐÐÐÐÐÑÑ ÐÐÑ ÐÐÐÐ
 msgid "Preparing folder '%s' for offline"
 msgstr "ÐÐÐÑÑÑÑÐÑÐÐ ÐÐÐÐÑ \"%s\" ÐÐÑ ÐÐÐÐÑÐÑÐÐÐÐÐ ÐÑÐÑÑ"
 
-#: ../camel/camel-disco-folder.c:482 ../camel/camel-offline-folder.c:327
+#: ../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/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:1244
+#: ../camel/providers/imap/camel-imap-store.c:2000
+#: ../camel/providers/imap/camel-imap-store.c:2467
+#: ../camel/providers/imap/camel-imap-store.c:3217
 #: ../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:393
-#: ../camel/providers/pop3/camel-pop3-store.c:805
+#: ../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 "ÐÐÐ ÐÑÐÑÑÐÐÑÑÑ ÐÑÑÑ ÐÐÐÑÐÑÑÑ, ÑÑÑÐÐ ÐÐÑÐÐÑÑÑ Ñ ÑÐÑÐÐÐÑ ÑÑÐÑÐ"
@@ -1868,7 +1834,7 @@ msgstr "ÐÑÐÐÑÑ ÐÑÐÑÐÐÐÑÑ ÐÐÑ \"user-tag\""
 msgid "Error executing filter search: %s: %s"
 msgstr "ÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐÐÑ ÐÐÑÑÐÑ ÐÐÑ ÑÑÐÑÑÑÐ: %s: %s"
 
-#: ../camel/camel-folder.c:262
+#: ../camel/camel-folder.c:270
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
@@ -1876,7 +1842,7 @@ msgstr[0] "ÐÑÐÑÑÑÐÐÐ ÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐ
 msgstr[1] "ÐÑÐÑÑÑÐÐÐ ÐÐÐÑÑ ÐÐÐÐÐÐÐÐÐÑÑ ÐÐÐÐÐÐÐÐÐÐÐÑÑ Ñ \"%s\""
 msgstr[2] "ÐÑÐÑÑÑÐÐÐ ÐÐÐÑÑ ÐÐÐÐÐÐÐÐÐÑÑ ÐÐÐÐÐÐÐÐÐÐÐÑÑ Ñ \"%s\""
 
-#: ../camel/camel-folder.c:302
+#: ../camel/camel-folder.c:310
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
@@ -1884,7 +1850,7 @@ msgstr[0] "ÐÑÐÑÑÑÐÐÐ ÐÐÐÐÐÐ ham-ÐÐÐÐÐÐÐÐÐÐÐÑ Ñ \"%s\
 msgstr[1] "ÐÑÐÑÑÑÐÐÐ ÐÐÐÑÑ ham-ÐÐÐÐÐÐÐÐÐÐÐÑÑ Ñ \"%s\""
 msgstr[2] "ÐÑÐÑÑÑÐÐÐ ÐÐÐÑÑ ham-ÐÐÐÐÐÐÐÐÐÐÐÑÑ Ñ \"%s\""
 
-#: ../camel/camel-folder.c:350
+#: ../camel/camel-folder.c:358
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
@@ -1892,32 +1858,31 @@ msgstr[0] "ÐÑÐÑÑÑÐÑÑÑ ÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐÐÐÑ Ñ \"%s\""
 msgstr[1] "ÐÑÐÑÑÑÐÑÑÑ ÐÐÐÑÑ ÐÐÐÐÐÐÐÐÐÐÐÑÑ Ñ \"%s\""
 msgstr[2] "ÐÑÐÑÑÑÐÑÑÑ ÐÐÐÑÑ ÐÐÐÐÐÐÐÐÐÐÐÑÑ Ñ \"%s\""
 
-#: ../camel/camel-folder.c:918
+#: ../camel/camel-folder.c:930
 #: ../camel/providers/local/camel-maildir-folder.c:322
 msgid "Moving messages"
 msgstr "ÐÐÑÐÐÑÑÑÑÐÐÐ ÐÐÐÐÐÐÐÐÐÐÐÑÑ"
 
-#: ../camel/camel-folder.c:921
+#: ../camel/camel-folder.c:933
 msgid "Copying messages"
 msgstr "ÐÐÐÑÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐÐÐÑÑ"
 
-#: ../camel/camel-folder.c:1233
+#: ../camel/camel-folder.c:1253
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr "ÐÐÐÐÐ \"%s\" ÐÐ ÐÐÐÑÑÑÐÐÑÐÐÐ ÑÐÑÐÑÐÐÑÑÑ ÐÐ ÐÐÐÑÐÑ"
 
-#: ../camel/camel-folder.c:3549
+#: ../camel/camel-folder.c:3586
 #, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "ÐÑÑÑÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐÐÐÑ \"%s\" Ð \"%s\""
 
-#: ../camel/camel-folder.c:3698
+#: ../camel/camel-folder.c:3735
 #, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "ÐÑÑÑÐÐÐÐÐ ÑÐÑÐÑÐÐÑÑÑ ÐÐ ÐÐÐÑÐÑ ÐÐÑ \"%s\""
 
-#: ../camel/camel-folder-search.c:365 ../camel/camel-folder-search.c:479
-#: ../camel/camel-folder-search.c:664
+#: ../camel/camel-folder-search.c:414 ../camel/camel-folder-search.c:575
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1926,8 +1891,7 @@ msgstr ""
 "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÐÑÑ ÑÑÐÑÐÑÑÐÑ ÐÑÑÐÐ: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:377 ../camel/camel-folder-search.c:491
-#: ../camel/camel-folder-search.c:676
+#: ../camel/camel-folder-search.c:426 ../camel/camel-folder-search.c:587
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1937,31 +1901,31 @@ msgstr ""
 "%s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:890 ../camel/camel-folder-search.c:933
+#: ../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:994
+#: ../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:1001 ../camel/camel-folder-search.c:1009
+#: ../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:1037
+#: ../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:1047
+#: ../camel/camel-folder-search.c:957
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) ÐÐÑÑÐÐÑÐ ÑÐÑÑ ÐÐÐÐÐ"
@@ -1973,7 +1937,7 @@ msgid "Failed to execute gpg: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÑÑÑÑ \"gpg\": %s"
 
 #: ../camel/camel-gpg-context.c:668
-#: ../camel/providers/smtp/camel-smtp-transport.c:849
+#: ../camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Unknown"
 msgstr "ÐÐÐÑÐÐÐÐ"
 
@@ -2032,7 +1996,7 @@ msgstr ""
 #: ../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:141 ../libedataserverui/e-book-auth-util.c:227
+#: ../libedataserver/e-client.c:140
 #, c-format
 msgid "Cancelled"
 msgstr "ÐÐÐÑÐÐÐÐÐ"
@@ -2101,60 +2065,327 @@ msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÑÑÑÑÑÐÐÐÑÑ MIME-ÑÐÑÑÐÑ: ÐÐÐÑ
 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-lock.c:102
+#: ../camel/camel-imapx-folder.c:101
 #, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÑÐÐÑÑÑÑ ÐÐÐÐ-ÑÐÐÐ ÐÐÑ %s: %s"
+msgid "Could not create folder summary for %s"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÑÐÐÑÑÑÑ ÑÑÐÑÐÑ ÐÐ ÐÐÐÐÐÑ ÐÐÑ %s"
 
-#: ../camel/camel-lock.c:145
+#: ../camel/camel-imapx-folder.c:109
 #, c-format
-msgid "Timed out trying to get lock file on %s.  Try again later."
-msgstr ""
-"ÐÑÑÐÑÐÐÐÑ ÑÑÑÐÑÐ ÑÐÐÐÐÐÑ ÐÐÑ ÐÑÑÑÐÐÐÐÑ ÐÐÐÐ-ÑÐÐÐÐ ÐÐ %s. ÐÐÑÑÐÑÑÑÐ ÑÐÑÐÐÑ "
-"ÐÐÐÐÐÐ."
+msgid "Could not create cache for %s: "
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÑÐÐÑÑÑÑ ÐÑÑ-ÑÑÐÐÑÑÑÐ ÐÐÑ %s: "
 
-#: ../camel/camel-lock.c:205
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÑÑÐÐÑÑ ÐÐÐÐÑÑÐÑÐÑ Ð ÐÐÐÐÐÐÐÐÐ fcntl(2): %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-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÑÑÐÐÑÑ ÐÐÐÐÑÑÐÑÐÑ Ð ÐÐÐÐÐÐÐÐÐ flock(2): %s"
+#: ../camel/camel-imapx-server.c:855
+msgid "Server disconnected"
+msgstr "ÐÐÑÐÐÑ ÐÐÐÑÑÑÑÑÑ"
 
-#: ../camel/camel-lock-client.c:106
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÑÐÐÑÑÑÑ ÐÐÐÐÐÐÐÐÑ ÐÐÐÐÐ ÐÐÐÐÑÑÐÑÐÑ: %s"
+#: ../camel/camel-imapx-server.c:1264
+msgid "Error writing to cache stream: "
+msgstr "ÐÐÐÑÐÐÐ ÐÐÐÑÑÑ Ñ ÐÑÑ-ÑÑÑÑÐÐÐÑ: "
 
-#: ../camel/camel-lock-client.c:130
+#: ../camel/camel-imapx-server.c:1997
 #, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÐÐÐÐÑÑ ÐÐÐÐÐÐÐÐÑ ÐÑÐÑÑÑ ÐÐÐÐÑÑÐÑÐÑ: %s"
+msgid "Not authenticated"
+msgstr "ÐÐ ÑÐÑÐÑÑÑÑÐÐÐÐÐÑ"
 
-#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr ""
-"ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑÐÐÐÑÑ \"%s\": ÐÐÐÑÐÐÐ ÐÑÐÑÐÐÐÐÐ Ñ ÐÐÐÐÐÐÐÐÑÐ ÐÑÐÑÑÑÐ "
-"ÐÐÐÐÑÑÐÑÐÑ"
+#: ../camel/camel-imapx-server.c:2066
+msgid "Error performing IDLE"
+msgstr "ÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐÐÑ IDLE"
 
-#: ../camel/camel-lock-client.c:227
+#: ../camel/camel-imapx-server.c:2910
+#: ../camel/providers/imap/camel-imap-store.c:409
+#: ../camel/providers/imap/camel-imap-store.c:463
 #, c-format
-msgid "Could not lock '%s'"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑÐÐÐÑÑ \"%s\""
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÑÑÑÑÐ Ð IMAP-ÑÐÑÐÐÑÐÐ %s Ñ ÐÑÑÐÐÑÐÑÐ ÑÑÐÑÐÐ: %s"
 
-#: ../camel/camel-movemail.c:105
+#: ../camel/camel-imapx-server.c:2911
+#: ../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:2950
+#: ../camel/providers/imap/camel-imap-store.c:435
 #, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÐÐÑÑÑÑ ÐÐÑÑÐÐÑ ÑÐÐÐ %s: %s"
+msgid "Failed to connect to IMAP server %s in secure mode: "
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÑÑÑÑÐ Ð IMAP-ÑÐÑÐÐÑÐÐ %s Ñ ÐÑÑÐÐÑÐÑÐ ÑÑÐÑÐÐ: "
 
-#: ../camel/camel-movemail.c:119
+#: ../camel/camel-imapx-server.c:3017
+#: ../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:3028 ../camel/camel-session.c:483
+#: ../camel/providers/imap/camel-imap-store.c:1148
+#: ../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:3047
+#: ../camel/providers/imap/camel-imap-store.c:1116
+#: ../camel/providers/nntp/camel-nntp-store.c:494
+msgid "Cannot authenticate without a username"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÑÐÑÑÑÑÐÐÐÐÑÑ ÑÑÐÐ ÐÐÐ ÑÐÑ ÐÐÑÑÑÑÐÐÑÐÑÐÐ"
+
+#: ../camel/camel-imapx-server.c:3056
+#: ../camel/providers/imap/camel-imap-store.c:1124
+#: ../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:3245
+msgid "Error fetching message"
+msgstr "ÐÐÐÑÐÐÐ ÐÑÑÑÐÐÐÐÑ ÐÐÐÐÐÐÐÐÐÐÐÑ"
+
+#: ../camel/camel-imapx-server.c:3317
+msgid "Closing tmp stream failed: "
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÑÑ ÑÐÑÐÐÑ ÑÑÑÑÐÐÐÑ: "
+
+#: ../camel/camel-imapx-server.c:3419
+msgid "Error copying messages"
+msgstr "ÐÐÐÑÐÐÐ ÐÐÐÑÑÐÐÐÐÐÑ ÐÐÐÐÐÐÐÐÐÐÐÑÑ"
+
+#: ../camel/camel-imapx-server.c:3554
+msgid "Error appending message"
+msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÐÑ ÐÐÐÐÐÐÐÐÐÐÐÑ Ñ ÐÐÐÐÑ"
+
+#: ../camel/camel-imapx-server.c:3741
+msgid "Error fetching message headers"
+msgstr "ÐÐÐÑÐÐÐ ÐÑÑÑÐÐÐÐÑ ÐÐÐÐÐÐÑÐÐÑ ÐÐÐÐÐÐÐÐÐÐÐÑÑ"
+
+#: ../camel/camel-imapx-server.c:3887
+msgid "Error retrieving message"
+msgstr "ÐÐÐÑÐÐÐ ÐÑÑÑÐÐÐÐÑ ÐÐÐÐÐÐÐÐÐÐÐÑ"
+
+#: ../camel/camel-imapx-server.c:4009 ../camel/camel-imapx-server.c:4214
+#: ../camel/providers/imap/camel-imap-folder.c:4002
+#: ../camel/providers/imap/camel-imap-folder.c:4082
+#, c-format
+msgid "Fetching summary information for new messages in %s"
+msgstr "ÐÑÑÑÐÐÐÐÐ ÑÑÐÑÐÑ ÐÐ ÐÐÐÑÑ ÐÐÐÐÐÐÐÐÐÐÐÑÑ Ñ %s"
+
+#: ../camel/camel-imapx-server.c:4068
+#: ../camel/providers/imap/camel-imap-folder.c:1124
+#, c-format
+msgid "Scanning for changed messages in %s"
+msgstr "ÐÐÑÑÐ ÐÐÐÐÐÐÑÑ ÐÐÐÐÐÐÐÐÐÐÐÑÑ Ñ %s"
+
+#: ../camel/camel-imapx-server.c:4110
+msgid "Error fetching new messages"
+msgstr "ÐÐÐÑÐÐÐ ÐÑÑÑÐÐÐÐÑ ÐÐÐÑÑ ÐÐÐÐÐÐÐÐÐÐÐÑÑ"
+
+#: ../camel/camel-imapx-server.c:4309
+msgid "Error while fetching messages"
+msgstr "ÐÐÐÑÐÐÐ ÐÐÐÑÐÑ ÐÑÑÑÐÐÐÐÑ ÐÐÐÐÐÐÐÐÐÐÐÑÑ"
+
+#: ../camel/camel-imapx-server.c:4317 ../camel/camel-imapx-server.c:4349
+#, 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"
+msgstr[2] "ÐÑÑÑÐÐÐÐÐ ÑÑÐÑÐÑ ÐÐÑ %d ÐÐÐÐÐÐÐÐÐÐÐÑÑ Ñ %s"
+
+#: ../camel/camel-imapx-server.c:4474 ../camel/camel-imapx-server.c:4510
+msgid "Error refreshing folder"
+msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐÐÑ ÐÐÐÐÑ"
+
+#: ../camel/camel-imapx-server.c:4603
+msgid "Error expunging message"
+msgstr "ÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐÐÑ ÐÐÐÐÐÐÐÐÐÐÐÑ"
+
+#: ../camel/camel-imapx-server.c:4692
+msgid "Error fetching folders"
+msgstr "ÐÐÐÑÐÐÐ ÐÑÑÑÐÐÐÐÑ ÐÐÐÐÐ"
+
+#: ../camel/camel-imapx-server.c:4771
+msgid "Error subscribing to folder"
+msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐÑÑÐÑ ÐÐ ÐÐÐÐÑ"
+
+#: ../camel/camel-imapx-server.c:4828
+msgid "Error creating folder"
+msgstr "ÐÐÐÑÐÐÐ ÑÑÐÐÑÑÐÐÑ ÐÐÐÐÑ"
+
+#: ../camel/camel-imapx-server.c:4877
+msgid "Error deleting folder"
+msgstr "ÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐÐÑ ÐÐÐÐÑ"
+
+#: ../camel/camel-imapx-server.c:4931
+msgid "Error renaming folder"
+msgstr "ÐÐÐÑÐÐÐ ÐÐÑÐÐÐÐÑÐÐÐÐÑ ÐÐÐÐÑ"
+
+#: ../camel/camel-imapx-server.c:4986
+msgid "Error performing NOOP"
+msgstr "ÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐÐÑ NOOP"
+
+#: ../camel/camel-imapx-server.c:5084
+msgid "Error syncing changes"
+msgstr "ÐÐÐÑÐÐÐ ÑÑÐÑÑÐÐÑÐÐÑÑÑ ÐÐÐÐÐÑ"
+
+#: ../camel/camel-imapx-server.c:5695
+#: ../camel/providers/imap/camel-imap-folder.c:3470
+#, c-format
+msgid "Cannot get message with message ID %s: %s"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÑÑÐÐÑÑ ÐÐÐÐÐÐÐÐÐÐÐÐ Ð ÑÐÑÐÑÑÑÑÐÐÑÐÑÐÐ %s: %s"
+
+#: ../camel/camel-imapx-server.c:5696
+#: ../camel/providers/imap/camel-imap-folder.c:3471
+msgid "No such message available."
+msgstr "ÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐÐÐÐ ÐÐÑÑÑÐÑÑÐÐ."
+
+#: ../camel/camel-imapx-server.c:5851 ../camel/camel-imapx-server.c:5866
+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:2031
+#: ../camel/providers/imap/camel-imap-store.c:2225
+#, 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:2638
+#: ../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:2044
+#: ../camel/providers/imap/camel-imap-store.c:2482
+#, 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:2495
+#, c-format
+msgid "Unknown parent folder: %s"
+msgstr "ÐÐÐÑÐÐÐÐÑ ÐÐÑÑÐÐÑÑÐÐÑ ÐÐÐÐÐ: %s"
+
+#: ../camel/camel-imapx-store.c:1405
+#: ../camel/providers/imap/camel-imap-store.c:2107
+#: ../camel/providers/imap/camel-imap-store.c:2546
+#, 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
+msgid "Could not create lock file for %s: %s"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÑÐÐÑÑÑÑ ÐÐÐÐ-ÑÐÐÐ ÐÐÑ %s: %s"
+
+#: ../camel/camel-lock.c:145
+#, c-format
+msgid "Timed out trying to get lock file on %s.  Try again later."
+msgstr ""
+"ÐÑÑÐÑÐÐÐÑ ÑÑÑÐÑÐ ÑÐÐÐÐÐÑ ÐÐÑ ÐÑÑÑÐÐÐÐÑ ÐÐÐÐ-ÑÐÐÐÐ ÐÐ %s. ÐÐÑÑÐÑÑÑÐ ÑÐÑÐÐÑ "
+"ÐÐÐÐÐÐ."
+
+#: ../camel/camel-lock.c:205
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÑÑÐÐÑÑ ÐÐÐÐÑÑÐÑÐÑ Ð ÐÐÐÐÐÐÐÐÐ fcntl(2): %s"
+
+#: ../camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÑÑÐÐÑÑ ÐÐÐÐÑÑÐÑÐÑ Ð ÐÐÐÐÐÐÐÐÐ flock(2): %s"
+
+#: ../camel/camel-lock-client.c:106
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÑÐÐÑÑÑÑ ÐÐÐÐÐÐÐÐÑ ÐÐÐÐÐ ÐÐÐÐÑÑÐÑÐÑ: %s"
+
+#: ../camel/camel-lock-client.c:130
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÐÐÐÐÑÑ ÐÐÐÐÐÐÐÐÑ ÐÑÐÑÑÑ ÐÐÐÐÑÑÐÑÐÑ: %s"
+
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+"ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑÐÐÐÑÑ \"%s\": ÐÐÐÑÐÐÐ ÐÑÐÑÐÐÐÐÐ Ñ ÐÐÐÐÐÐÐÐÑÐ ÐÑÐÑÑÑÐ "
+"ÐÐÐÐÑÑÐÑÐÑ"
+
+#: ../camel/camel-lock-client.c:227
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑÐÐÐÑÑ \"%s\""
+
+#: ../camel/camel-movemail.c:105
+#, c-format
+msgid "Could not check mail file %s: %s"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÐÐÑÑÑÑ ÐÐÑÑÐÐÑ ÑÐÐÐ %s: %s"
+
+#: ../camel/camel-movemail.c:119
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÑÑ ÐÐÑÑÐÐÑ ÑÐÐÐ %s: %s"
@@ -2284,7 +2515,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:402 ../camel/camel-session.c:395
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "ÐÐÑ ÐÑÐÑÐÐÐÐÐ \"%s\" ÐÐÑÑÑÐÑÑÐÐ ÐÐÐÐÐÐÐÐÑ ÐÑÐÐÐÐÐÐÑ"
@@ -2451,7 +2682,7 @@ msgstr "ÐÑÑÐÑÐ ÐÐÐÑÐÐÑ ÐÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÑÐ ÐÑÑ
 
 #: ../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:562
+#: ../camel/providers/smtp/camel-smtp-transport.c:563
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "ÐÑÑÑÐÐÐÑ ÐÐÐÑÐÑ ÑÐÑÐÑÑÑÑÐÐÑÑÐÐÑ ÐÐÐÐÐ ÐÐ ÑÐÑÐÐÑÐ."
@@ -2517,27 +2748,17 @@ msgstr "ÐÐÑÐÐÐ ÑÐÑÐÑÑÑÑÐÐÑÑÑ \"POP ÐÐÑÐÐ SMTP\" ÐÐÑ %
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÐÑÐÐÑÑ ÑÑÐÑÐÑÑÐÑ ÐÑÑÐÐ: %s: %s"
 
-#: ../camel/camel-session.c:393
+#: ../camel/camel-session.c:404
 #, c-format
 msgid "Invalid GType registered for protocol '%s'"
 msgstr "ÐÐÑ ÐÑÐÑÐÐÐÐÐ \"%s\" ÐÐÑÑÐÑÑÑÑÐÐÐÐÑ ÑÑÐÐÑ GType"
 
-#: ../camel/camel-session.c:472
-#: ../camel/providers/imap/camel-imap-store.c:1143
-#: ../camel/providers/imapx/camel-imapx-server.c:2936
-#: ../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:487
+#: ../camel/camel-session.c:498
 #, c-format
 msgid "%s authentication failed"
 msgstr "ÐÑÑÐÐÐÐÑ ÑÐÑÐÑÑÑÑÐÐÑÑÑ %s"
 
-#: ../camel/camel-session.c:1194
+#: ../camel/camel-session.c:1236
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "ÐÐÑÑÑÑÐ ÐÐÑÐÐÑ %s ÐÐÑ %s ÐÐ ÐÐÑÑÐÐ %s."
@@ -2736,51 +2957,51 @@ msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÑÑ ÐÐÐÑÑ ÐÐ ÐÐÐÐÐÐÐÑÐÑÐ
 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: ÑÑÐÐÐÑ ÐÐÐÑÐÑÑÑ"
@@ -2790,6 +3011,10 @@ 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"
@@ -2800,90 +3025,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 "ÐÐÑÐÑÐÐÑ ÐÐÐÑÐÐÐ SOCKS-ÑÐÑÐÐÑÐ"
 
-#: ../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 "SOCKS-ÑÐÑÐÐÑ ÐÐ ÐÐÐ ÐÐÑÑÑÐÑ ÐÐ ÑÐÐ ÑÐÑÐÑ"
 
-#: ../camel/camel-tcp-stream-raw.c:785
+#: ../camel/camel-tcp-stream-raw.c:792
 msgid "Host is unreachable from SOCKS server"
 msgstr "SOCKS-ÑÐÑÐÐÑ ÐÐ ÐÐÐ ÐÐÑÑÑÐÑ ÐÐ ÑÐÐ ÐÐÑÑÐÑ"
 
-#: ../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 "SOCKS-ÑÐÑÐÐÑ ÐÐ ÐÐÐÑÑÑÐÐÑÐÐÐ ÑÐÐÑ ÐÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:789
+#: ../camel/camel-tcp-stream-raw.c:796
 msgid "Address type not supported by SOCKS server"
 msgstr "SOCKS-ÑÐÑÐÐÑ ÐÐ ÐÐÐÑÑÑÐÐÑÐÐÐ ÑÐÐÐÐÐ ÑÑÐÑ ÐÐÑÐÑÑ"
 
-#: ../camel/camel-tcp-stream-raw.c:790
+#: ../camel/camel-tcp-stream-raw.c:797
 msgid "Unknown error from SOCKS server"
 msgstr "ÐÐÐÑÐÐÐÐÑ ÐÐÐÑÐÐÐ ÐÐ SOCKS-ÑÐÑÐÐÑÑ"
 
-#: ../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 "SOCKS-ÑÐÑÐÐÑ ÐÐÑÐÐÑ ÐÐÐÑÐÐÐÑ ÑÑÐ ÐÐÑÐÑÑ"
 
-#: ../camel/camel-tcp-stream-raw.c:841
+#: ../camel/camel-tcp-stream-raw.c:848
 #, c-format
 msgid "Incomplete reply from SOCKS server"
 msgstr "ÐÑÐÐÑÐÑ ÐÐÐÐÐ SOCKS-ÑÐÑÐÐÑÐ"
 
-#: ../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:474
+#: ../camel/camel-tcp-stream-ssl.c:502
 #, c-format
 msgid ""
 "   Issuer:       %s\n"
@@ -2896,16 +3121,16 @@ msgstr ""
 "   ÐÐÐÑÑÐÐ:      %s\n"
 "   ÐÐÐÐÑÑ:       %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:480
+#: ../camel/camel-tcp-stream-ssl.c:508
 msgid "GOOD"
 msgstr "ÐÐÐÑÐÑÐÐÑ"
 
-#: ../camel/camel-tcp-stream-ssl.c:480
+#: ../camel/camel-tcp-stream-ssl.c:508
 msgid "BAD"
 msgstr "ÐÐÑÐÐÑÐÑÐÐÑ"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:484
+#: ../camel/camel-tcp-stream-ssl.c:512
 #, c-format
 msgid ""
 "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
@@ -2918,19 +3143,19 @@ msgstr ""
 "ÐÐÐÑÐÐÑÐÐÑÑ ÐÐÐÑÑÐÑ ÐÐ ÑÐÑÑÑÑÑÐÐÑÐ:\n"
 "%s"
 
-#: ../camel/camel-tcp-stream-ssl.c:488
+#: ../camel/camel-tcp-stream-ssl.c:516
 msgid "_Reject"
 msgstr "_ÐÐÐÐÐÑÑÑ"
 
-#: ../camel/camel-tcp-stream-ssl.c:489
+#: ../camel/camel-tcp-stream-ssl.c:517
 msgid "Accept _Temporarily"
 msgstr "_ÐÐÑÐÐÐ ÐÑÑÐÑÑÑ"
 
-#: ../camel/camel-tcp-stream-ssl.c:490
+#: ../camel/camel-tcp-stream-ssl.c:518
 msgid "_Accept Permanently"
 msgstr "ÐÑÑÐÑÑÑ _ÐÐÐÐÑÑÑÐÑ"
 
-#: ../camel/camel-tcp-stream-ssl.c:548
+#: ../camel/camel-tcp-stream-ssl.c:579
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2939,7 +3164,7 @@ msgstr ""
 "ÐÑÐÐÐÐÐÐ ÑÐÑÑÑÑÑÐÐÑÐ: %s\n"
 "ÐÑÐÐÐÐÑ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:600
+#: ../camel/camel-tcp-stream-ssl.c:631
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2948,7 +3173,7 @@ msgstr ""
 "ÐÐÐÐÐ ÐÐÑÐÐÑÐÑÐÐÐÐÐ ÑÐÑÑÑÑÑÐÐÑÐ: %s\n"
 "ÐÑÐÐÐÐÑ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:618
+#: ../camel/camel-tcp-stream-ssl.c:649
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2957,7 +3182,7 @@ msgstr ""
 "ÐÐÑÑÑÑÑÐÐÑ ÑÐÑÑÐÑÑÑ: %s\n"
 "ÐÑÐÐÐÐÑ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:635
+#: ../camel/camel-tcp-stream-ssl.c:666
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2971,43 +3196,51 @@ msgstr ""
 msgid "Could not parse URL '%s'"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÐÑÑ URL-ÐÐÑÐÑ \"%s\""
 
-#: ../camel/camel-vee-folder.c:651
+#: ../camel/camel-vee-folder.c:485
 #, c-format
 msgid "Updating %s folder"
 msgstr "ÐÐÐÐÑÐÐÐÐÐ ÐÐÐÐÑ %s"
 
-#: ../camel/camel-vee-folder.c:1325 ../camel/camel-vee-folder.c:1482
+#: ../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:1358
+#: ../camel/camel-vee-folder.c:875
 #, c-format
 msgid "No such message %s in %s"
 msgstr "ÐÐÐÐÐÐÐÐÐÐÐÐ %s ÐÐÑÑÑÐÑÑÐÐ Ñ %s"
 
-#: ../camel/camel-vee-folder.c:1426
+#: ../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 "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÑÑÐÐÐÑÑ ÐÐÐÐÐÐÐÐÐÐÐÑ Ñ ÐÐÐÐÑ ÐÐÑ ÑÐÐÑÑÑ"
@@ -3017,23 +3250,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"
@@ -3042,7 +3275,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"
@@ -3051,27 +3284,27 @@ 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"
@@ -3080,69 +3313,38 @@ msgstr "ÐÐÑÐÐÐÐÑ OK-ÐÐÐÐÐ IMAP-ÑÐÑÐÐÑÐ: %s"
 msgid "Always check for _new mail in this folder"
 msgstr "ÐÐÑÑÑÐÑ ÐÑÐÐÑÑÐÑÑ ÐÑÑÑ ÐÐÐÐÑ ÐÐ ÐÐÑÑÐÐÑÑÑ _ÐÐÐÐÐ ÐÐÑÑÑ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:359
-#: ../camel/providers/imapx/camel-imapx-folder.c:747
-#: ../camel/providers/nntp/camel-nntp-folder.c:760
-msgid "Apply message _filters to this folder"
-msgstr "_ÐÐÑÑÑ ÑÑÐÑÑÑÑ ÐÐÐÐÐÐÐÐÐÐÐÑÑ ÐÐÑ ÐÑÑÐÐ ÐÐÐÐÑ"
-
-#: ../camel/providers/imap/camel-imap-folder.c:440
+#: ../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:461
+#: ../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:1119
-#: ../camel/providers/imapx/camel-imapx-server.c:3938
-#, c-format
-msgid "Scanning for changed messages in %s"
-msgstr "ÐÐÑÑÐ ÐÐÐÐÐÐÑÑ ÐÐÐÐÐÐÐÐÐÐÐÑÑ Ñ %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3478
+#: ../camel/providers/imap/camel-imap-folder.c:3433
 msgid "Unable to retrieve message: "
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÑÑÐÐÑÑ ÐÐÐÐÐÐÐÐÐÐÐÐ: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:3515
-#: ../camel/providers/imapx/camel-imapx-server.c:5497
-#, c-format
-msgid "Cannot get message with message ID %s: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÑÑÐÐÑÑ ÐÐÐÐÐÐÐÐÐÐÐÐ Ð ÑÐÑÐÑÑÑÑÐÐÑÐÑÐÐ %s: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3516
-#: ../camel/providers/imapx/camel-imapx-server.c:5498
-msgid "No such message available."
-msgstr "ÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐÐÐÐ ÐÐÑÑÑÐÑÑÐÐ."
-
-#: ../camel/providers/imap/camel-imap-folder.c:3591
-#: ../camel/providers/imap/camel-imap-folder.c:4469
-#: ../camel/providers/nntp/camel-nntp-folder.c:515
+#: ../camel/providers/imap/camel-imap-folder.c:3544
+#: ../camel/providers/imap/camel-imap-folder.c:4414
+#: ../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:4050
-#: ../camel/providers/imap/camel-imap-folder.c:4133
-#: ../camel/providers/imapx/camel-imapx-server.c:3890
-#: ../camel/providers/imapx/camel-imapx-server.c:4070
-#, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "ÐÑÑÑÐÐÐÐÐ ÑÑÐÑÐÑ ÐÐ ÐÐÐÑÑ ÐÐÐÐÐÐÐÐÐÐÐÑÑ Ñ %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:4267
+#: ../camel/providers/imap/camel-imap-folder.c:4213
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "ÐÑÐÐÑÐÑ ÐÐÐÐÐ ÑÐÑÐÐÑÐ: ÑÐÑÐÑÐÐÑÑÑ ÐÐ ÐÐÐÐÐÐÐÐÐÐÐÑ %d ÐÐÑÑÑÐÑÑÐÐ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4277
+#: ../camel/providers/imap/camel-imap-folder.c:4223
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "ÐÑÐÐÑÐÑ ÐÐÐÐÐ ÑÐÑÐÐÑÐ: UID ÐÐÐÐÐÐÐÐÐÐÐÑ %d ÐÐÑÑÑÐÑÑÐÐ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4509
+#: ../camel/providers/imap/camel-imap-folder.c:4451
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÑÐÐÑÑ ÑÐÐÐ ÐÐÐÐÐÐÐÐÐÐÐÑ Ñ FETCH-ÐÐÐÐÐÐ."
@@ -3168,207 +3370,94 @@ 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 "ÐÑÐÐÑÑÐÑÑ ÐÐÐÑÑ ÐÐÐÐÐÐÐÐÐÐÐÑ ÐÐ ÑÐÐÐ _ÑÐÐÑÐÑ ÐÐ \"ÐÐÐÑÐÐÐÐÐ ÐÐÑÑÐ\""
 
-#: ../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
-msgid "IMAP over SSL"
-msgstr "IMAP ÐÑÐÐ SSL"
-
-#: ../camel/providers/imap/camel-imap-provider.c:87
-msgid "IMAP"
-msgstr "IMAP"
-
-#: ../camel/providers/imap/camel-imap-provider.c:89
-#: ../camel/providers/imapx/camel-imapx-provider.c:98
-msgid "For reading and storing mail on IMAP servers."
-msgstr "ÐÐÑ ÑÑÑÐÐÐÑ Ñ ÐÐÑÐÐÐÐÐÑ ÐÐÑÑÑ ÐÐ IMAP-ÑÐÑÐÐÑÐÑ."
-
-#: ../camel/providers/imap/camel-imap-provider.c: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:2818
-#, 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:2819
-#: ../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:2858
-#, 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:2925
-#, 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:2955
-#: ../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:2964
-#: ../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-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
+msgid "IMAP over SSL"
+msgstr "IMAP ÐÑÐÐ SSL"
 
-#: ../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-provider.c:78
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../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-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-store.c:2196
+#: ../camel/providers/imap/camel-imap-store.c:2156
 #: ../camel/providers/local/camel-maildir-store.c:268
 #: ../camel/providers/local/camel-mbox-store.c:421
 #: ../camel/providers/local/camel-mh-store.c:558
@@ -3376,180 +3465,40 @@ 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:2919
 #, 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:3261
 #, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "ÐÐÑÐÐÑ ÐÐÑÐÐÐÐÐ ÐÐÐÑÑÑÑÑÑ"
 
-#: ../camel/providers/imap/camel-imap-store.c:3329
+#: ../camel/providers/imap/camel-imap-store.c:3264
 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:1203
-msgid "Error writing to cache stream: "
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÑÑÑ Ñ ÐÑÑ-ÑÑÑÑÐÐÐÑ: "
-
-#: ../camel/providers/imapx/camel-imapx-server.c:1930
-#, c-format
-msgid "Not authenticated"
-msgstr "ÐÐ ÑÐÑÐÑÑÑÑÐÐÐÐÐÑ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:1995
-msgid "Error performing IDLE"
-msgstr "ÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐÐÑ IDLE"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3150
-msgid "Error fetching message"
-msgstr "ÐÐÐÑÐÐÐ ÐÑÑÑÐÐÐÐÑ ÐÐÐÐÐÐÐÐÐÐÐÑ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3218
-msgid "Closing tmp stream failed: "
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÑÑ ÑÐÑÐÐÑ ÑÑÑÑÐÐÐÑ: "
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3317
-msgid "Error copying messages"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÑÑÐÐÐÐÐÑ ÐÐÐÐÐÐÐÐÐÐÐÑÑ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3447
-msgid "Error appending message"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÐÑ ÐÐÐÐÐÐÐÐÐÐÐÑ Ñ ÐÐÐÐÑ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3627
-msgid "Error fetching message headers"
-msgstr "ÐÐÐÑÐÐÐ ÐÑÑÑÐÐÐÐÑ ÐÐÐÐÐÐÑÐÐÑ ÐÐÐÐÐÐÐÐÐÐÐÑÑ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3768
-msgid "Error retrieving message"
-msgstr "ÐÐÐÑÐÐÐ ÐÑÑÑÐÐÐÐÑ ÐÐÐÐÐÐÐÐÐÐÐÑ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3971
-msgid "Error fetching new messages"
-msgstr "ÐÐÐÑÐÐÐ ÐÑÑÑÐÐÐÐÑ ÐÐÐÑÑ ÐÐÐÐÐÐÐÐÐÐÐÑÑ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4161
-msgid "Error while fetching messages"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÑÐÑ ÐÑÑÑÐÐÐÐÑ ÐÐÐÐÐÐÐÐÐÐÐÑÑ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4169
-#: ../camel/providers/imapx/camel-imapx-server.c:4199
-#, 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"
-msgstr[2] "ÐÑÑÑÐÐÐÐÐ ÑÑÐÑÐÑ ÐÐÑ %d ÐÐÐÐÐÐÐÐÐÐÐÑÑ Ñ %s"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4321
-#: ../camel/providers/imapx/camel-imapx-server.c:4355
-msgid "Error refreshing folder"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐÐÑ ÐÐÐÐÑ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4444
-msgid "Error expunging message"
-msgstr "ÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐÐÑ ÐÐÐÐÐÐÐÐÐÐÐÑ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4528
-msgid "Error fetching folders"
-msgstr "ÐÐÐÑÐÐÐ ÐÑÑÑÐÐÐÐÑ ÐÐÐÐÐ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4602
-msgid "Error subscribing to folder"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐÑÑÐÑ ÐÐ ÐÐÐÐÑ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4655
-msgid "Error creating folder"
-msgstr "ÐÐÐÑÐÐÐ ÑÑÐÐÑÑÐÐÑ ÐÐÐÐÑ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4700
-msgid "Error deleting folder"
-msgstr "ÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐÐÑ ÐÐÐÐÑ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4750
-msgid "Error renaming folder"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÑÐÐÐÐÑÐÐÐÐÑ ÐÐÐÐÑ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4801
-msgid "Error performing NOOP"
-msgstr "ÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐÐÑ NOOP"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4896
-msgid "Error syncing changes"
-msgstr "ÐÐÐÑÐÐÐ ÑÑÐÑÑÐÐÑÐÐÑÑÑ ÐÐÐÐÐÑ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:5652
-#: ../camel/providers/imapx/camel-imapx-server.c:5667
-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:191
 #, c-format
 msgid "~%s (%s)"
@@ -3566,11 +3515,11 @@ msgstr "ÐÐÑÑÐÐÐÐ ÑÑÐÐÑÑÑÐ: %s (%s)"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:483
+#: ../camel/providers/local/camel-local-folder.c:495
 msgid "_Index message body data"
 msgstr "Ð_ÐÐÑÐÑÐÐÐÑÑ ÐÐÐÑÑ ÐÐÐÐÐÐÐÐÐÐÐÑÑ"
 
-#: ../camel/providers/local/camel-local-folder.c:712
+#: ../camel/providers/local/camel-local-folder.c:723
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3579,52 +3528,52 @@ 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."
 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 "_ÐÐÑÐÐÑÑ ÑÑÐÑÑÑÑ ÐÐ ÐÐÐÑÑ ÐÐÐÐÐÐÐÐÐÐÐÑÑ ÐÐ \"ÐÐÐÑÐÐÐÐÐ ÐÐÑÑÐ\""
 
-#: ../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."
@@ -3633,7 +3582,7 @@ msgstr ""
 "Mbox.\n"
 "ÐÐÐÑÐÐÐ ÐÑÑÐÐÑÐÐ ÐÐÑ ÑÑÑÐÐÐÑ ÑÐÑÐÑÑÑÑ ÐÐÐÐÐ 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 "ÐÑÐÐÐÐÑÑÐÑ ÑÐÑÐ-ÐÐÑÐÐÐÐ Mbox"
 
@@ -3730,7 +3679,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 ÑÐÐ ÑÑÐÑÐ"
@@ -3774,34 +3723,34 @@ 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
 msgid "Could not scan folder '%s': %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÐÐÑÐÐÐÑÑ ÐÐÐÐÑ \"%s\": %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:416
-#: ../camel/providers/local/camel-maildir-summary.c:549
+#: ../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:540
+#: ../camel/providers/local/camel-maildir-summary.c:558
 msgid "Checking folder consistency"
 msgstr "ÐÑÐÐÐÑÐÐ ÑÐÐÐÐÐÐÐÐÑÑÑ ÐÐÐÑÑÑÐÐ ÐÐÐÐÑ"
 
-#: ../camel/providers/local/camel-maildir-summary.c:633
+#: ../camel/providers/local/camel-maildir-summary.c:651
 msgid "Checking for new messages"
 msgstr "ÐÑÐÐÐÑÐÐ ÐÐÑÑÐÐÑÑÑ ÐÐÐÐÐ ÐÐÑÑÑ"
 
-#: ../camel/providers/local/camel-maildir-summary.c:728
+#: ../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
@@ -4094,23 +4043,23 @@ msgstr ""
 "ÐÐ ÑÐÐÐÐÑÑ ÑÑÐÑÑÐÐÑÐÐÐÐÑÑ ÑÐÑÐ-ÐÐÐÐÑ %s: %s\n"
 "ÐÑÐÐÑÑ, ÐÐÐÐÐ ÐÐÑÐÐÐÐÐÐÐ, ÐÐÐÑÑ ÐÐÑÐÐÐÐÐ Ñ \"%s\""
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:290
-#: ../camel/providers/nntp/camel-nntp-folder.c:379
-#: ../camel/providers/nntp/camel-nntp-folder.c:501
+#: ../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 "ÐÐÑÑÑÐÐÐÑ ÐÐÐÑÐÐÐ: UID Ñ ÑÑÐÐÑÐ ÑÐÑÐÐÑÐ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:340
-#: ../camel/providers/nntp/camel-nntp-folder.c:344
+#: ../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:351
-#: ../camel/providers/nntp/camel-nntp-folder.c:526
+#: ../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
@@ -4118,23 +4067,23 @@ msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÑÑÐÐÑÑ ÐÐÐÐÐÐÐÐÐÐÐÐ %s: %s"
 msgid "Cannot get message %s: "
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÑÑÐÐÑÑ ÐÐÐÐÐÐÐÐÐÐÐÐ %s: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:585
-#: ../camel/providers/nntp/camel-nntp-folder.c:591
-#: ../camel/providers/nntp/camel-nntp-folder.c:638
+#: ../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:633
+#: ../camel/providers/nntp/camel-nntp-folder.c:606
 msgid "Posting failed: "
 msgstr "ÐÑÑÐÐÐÐÑ ÐÑÐÐÑÐÐÑÑÑ: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:662
+#: ../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:682
+#: ../camel/providers/nntp/camel-nntp-folder.c:653
 #, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "ÐÐÐÑÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐÐÐÑÑ Ð NNTP-ÐÐÐÐÐ ÐÐÐÐÐÑÑÐÐ!"
@@ -4171,22 +4120,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"
@@ -4197,26 +4146,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"
@@ -4227,7 +4176,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"
@@ -4238,11 +4187,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 "ÐÑÐÐ ÐÐÑÑÑÐÐÑ."
@@ -4396,17 +4345,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 "POP3-ÑÐÑÐÐÑ %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 "POP3-ÑÐÑÐÐÑ ÐÐÑ %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 "
@@ -4416,7 +4365,7 @@ msgstr ""
 "ÐÑÑÑ ÐÐÐÐÐÑÑÐÐÑ ÐÐÐÐÐÑ ÐÐÐÑÑÐÐÐ ÑÐÑÐÐÑ ÑÐÑÑÐÑÑÑ ÐÐÑÐÐ ÑÐÐÑÐÐÑÑÑ. ÐÐÑÑÐÑÑÐÑÑ "
 "ÐÐ ÐÐÑÐÐÐ ÐÐÐÑÐÑÑÑÑÐÑÐÑÐ."
 
-#: ../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"
@@ -4427,7 +4376,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"
@@ -4436,17 +4385,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-ÑÑÐÐÑÑÑÑ ÐÐ ÐÐÑÑÑ ÑÐÑÐÑÑÑÑ ÐÐÐÐÐ"
@@ -4533,358 +4482,485 @@ 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
+#: ../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:1307
+#: ../libebackend/e-authentication-session.c:1479
+#: ../libebackend/e-authentication-session.c:1658
+msgid "Keyring operation was cancelled"
+msgstr "ÐÐÐÑÐÑÑÑ Ð ÐÑÐÐÐÐ ÐÐÑÑÐÑ ÐÑÐÐ ÑÐÐÑÐÐÐÐÐ"
+
+#: ../libebackend/e-server-side-source.c:159
+#, c-format
+msgid "Data source is missing a [%s] group"
+msgstr "ÐÑÑÐÑÑÐ ÐÐÐÑÑ ÐÐ ÐÐÐ ÐÑÑÐÑ [%s]"
+
+#: ../libebackend/e-server-side-source.c:1004
+#, 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 "UID \"%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 "VIP"
 
-#: ../libedataserver/e-categories.c:70
+#: ../libedataserver/e-categories.c:69
 msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "Ð ÑÐÐÐÐÐÑ"
 
-#: ../libedataserver/e-client.c:125
+#: ../libedataserver/e-client.c:124
 msgid "Source not loaded"
 msgstr "ÐÑÑÐÑÑÐ ÐÐ ÐÐÐÑÑÐÐÐÐ"
 
-#: ../libedataserver/e-client.c:127
+#: ../libedataserver/e-client.c:126
 msgid "Source already loaded"
 msgstr "ÐÑÑÐÑÑÐ ÑÐÐ ÐÐÐÑÑÐÐÐÐ"
 
 #. 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:137
+#. * 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:159
+#: ../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:551
+#, c-format
+msgid "Source file is missing a [%s] group"
+msgstr "ÐÐÐÐ ÐÑÑÐÑÑÑ ÐÐ ÐÐÐ ÐÑÑÐÑ [%s]"
+
+#: ../libedataserver/e-source.c:827
+#, c-format
+msgid "Data source '%s' is not removable"
+msgstr "ÐÑÑÐÑÑÐ ÐÐÐÑÑ \"%s\" ÐÐ ÐÐÐÐ ÐÑÑÑ ÐÑÐÐÐÐÐÐ"
+
+#: ../libedataserver/e-source.c:909
+#, c-format
+msgid "Data source '%s' is not writable"
+msgstr "ÐÑÑÐÑÑÐ ÐÐÐÑÑ \"%s\" ÐÐ ÐÐÐÑÑÑÐÐÑÐÐÐ ÐÐÐÑÑ"
+
+#: ../libedataserver/e-source.c:1083
+msgid "Unnamed"
+msgstr "ÐÐÐ ÐÐÐÐÑ"
+
+#: ../libedataserver/e-source-mail-signature.c:480
+#, c-format
+msgid "Signature script must be a local file"
+msgstr "ÐÑÑÐÐÑÑÐ ÐÐÑ ÐÐÐÐÑÑÑ ÐÑÑÑÑÑ ÐÑÑÑ ÐÑÑÑÐÐÑÐ ÑÐÐÐÐÐ"
+
+#: ../libedataserver/e-source-registry.c:1479
+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 "%a, %d/%m/%Y %I:%M:%S %p"
 
@@ -4892,7 +4968,7 @@ msgstr "%a, %d/%m/%Y %I:%M:%S %p"
 #. * in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c: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 "%a, %d/%m/%Y %H:%M:%S"
 
@@ -4900,7 +4976,7 @@ msgstr "%a, %d/%m/%Y %H:%M:%S"
 #. * in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c: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 "%a, %d/%m/%Y %I:%M %p"
 
@@ -4908,78 +4984,78 @@ msgstr "%a, %d/%m/%Y %I:%M %p"
 #. * in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c: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 "%a, %d/%m/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1666
+#: ../libedataserver/e-time-utils.c:1667
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a, %d/%m/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1671
+#: ../libedataserver/e-time-utils.c:1672
 msgid "%a %m/%d/%Y %H"
 msgstr "%a, %d/%m/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c: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 "%a, %d/%m/%Y"
 
 #. 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"
 
@@ -4987,24 +5063,24 @@ msgstr "%H:%M:%S"
 #. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c: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"
 
@@ -5116,189 +5192,134 @@ msgstr "URL-ÐÐÑÐÑ ÐÐÑ ÐÑÑÐÐÐÑÑÑÐÐÐ ÐÐÑÑÑÐÐÐÑ ÐÑÐ
 msgid "Where to read automatic proxy configuration from."
 msgstr "ÐÐÑÐÑ, ÐÐÐÑÐÑ ÑÑÑÐÐ ÑÑÑÐÑÑ ÐÑÑÐÐÐÑÑÑÐÑÑ ÐÐÐÑÑÐÑÑÐÑÑÑ ÐÑÐÐÑÑ-ÑÐÑÐÐÑÐ."
 
-#: ../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"
-
-#: ../libedataserverui/e-categories-editor.c:228
+#: ../libedataserverui/e-categories-editor.c:230
 msgid "Currently _used categories:"
 msgstr "_ÐÐÑÑÑÑ ÐÐÑÑÐÐÑÑÑ:"
 
-#: ../libedataserverui/e-categories-editor.c:237
+#: ../libedataserverui/e-categories-editor.c:239
 msgid "_Available Categories:"
 msgstr "_ÐÐÑÑÐÑÑ ÐÐÑÑÐÐÑÑÑ:"
 
-#: ../libedataserverui/e-categories-selector.c:322
+#: ../libedataserverui/e-categories-selector.c:324
 msgid "Icon"
 msgstr "ÐÐÐÑÐÐ"
 
-#: ../libedataserverui/e-categories-selector.c:327
+#: ../libedataserverui/e-categories-selector.c:329
 msgid "Category"
 msgstr "ÐÐÑÑÐÐÑÑÑ"
 
-#: ../libedataserverui/e-category-completion.c:299
+#: ../libedataserverui/e-category-completion.c:300
 #, c-format
 msgid "Create category \"%s\""
 msgstr "ÐÑÐÐÑÑÑÑ ÐÐÑÑÐÐÑÑÑ \"%s\""
 
-#: ../libedataserverui/e-category-editor.c:135
+#: ../libedataserverui/e-category-editor.c:137
 msgid "Category Icon"
 msgstr "ÐÐÐÑÐÐ ÐÐÑÑÐÐÑÑÑ"
 
-#: ../libedataserverui/e-category-editor.c:139
+#: ../libedataserverui/e-category-editor.c:141
 msgid "_No Image"
 msgstr "_ÐÐÐ ÐÑÑÐÑ"
 
-#: ../libedataserverui/e-category-editor.c:176
+#: ../libedataserverui/e-category-editor.c:178
 msgid "Category _Name"
 msgstr "_ÐÐÐÐÐ ÐÐÑÑÐÐÑÑÑ"
 
-#: ../libedataserverui/e-category-editor.c:184
+#: ../libedataserverui/e-category-editor.c:186
 msgid "Category _Icon"
 msgstr "_ÐÐÐÑÐÐ ÐÐÑÑÐÐÑÑÑ"
 
-#: ../libedataserverui/e-category-editor.c:224
+#: ../libedataserverui/e-category-editor.c:226
 msgid "Category Properties"
 msgstr "ÐÐÐÑÑÑÐÐÑÑÑ ÐÐÑÑÐÐÑÑÑ"
 
-#: ../libedataserverui/e-category-editor.c:285
+#: ../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)ÐÑÑÑÑÐÐ: %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)ÐÑÑÑÑÐÐ: %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:187
+#: ../libedataserverui/e-name-selector-dialog.c:278
 msgid "Show Contacts"
 msgstr "ÐÐÐÐÐ ÐÐÐÑÐÐÑÐÑ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:209
+#: ../libedataserverui/e-name-selector-dialog.c:300
 msgid "Address B_ook:"
 msgstr "_ÐÐÑÐÑÐÐÑ ÐÐÑÐÐ:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:217
-msgid "Cate_gory:"
+#: ../libedataserverui/e-name-selector-dialog.c:308
+msgid "Cat_egory:"
 msgstr "_ÐÐÑÑÐÐÑÑÑ:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:235
+#: ../libedataserverui/e-name-selector-dialog.c:326
 msgid "_Search:"
 msgstr "ÐÐ_ÑÑÐ:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:253
-#: ../libedataserverui/e-name-selector-dialog.c:1038
+#: ../libedataserverui/e-name-selector-dialog.c:344
+#: ../libedataserverui/e-name-selector-dialog.c:1141
 msgid "Any Category"
 msgstr "ÐÑÐÐÑ ÐÐÑÑÐÐÑÑÑ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:255
+#: ../libedataserverui/e-name-selector-dialog.c:346
 msgid "Co_ntacts"
 msgstr "ÐÐ_ÐÑÐÐÑÑ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:310
+#: ../libedataserverui/e-name-selector-dialog.c:401
 msgid "Search"
 msgstr "ÐÐÑÑÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:313
+#: ../libedataserverui/e-name-selector-dialog.c:404
 msgid "Address Book"
 msgstr "ÐÐÑÐÑÐÐÑ ÐÐÑÐÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:316
+#: ../libedataserverui/e-name-selector-dialog.c:407
+#: ../modules/google-backend/module-google-backend.c:177
 msgid "Contacts"
 msgstr "ÐÐÐÑÐÐÑÑ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:433
+#: ../libedataserverui/e-name-selector-dialog.c:522
 msgid "Select Contacts from Address Book"
 msgstr "ÐÑÐÐÑ ÐÐÐÑÐÐÑÐÑ Ð ÐÐÑÐÑÐÐÐ ÐÐÑÐÑ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:781
+#: ../libedataserverui/e-name-selector-dialog.c:880
 msgid "_Add"
 msgstr "_ÐÐÐÐÑÑ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:785
+#: ../libedataserverui/e-name-selector-dialog.c:884
 msgid "_Remove"
 msgstr "_ÐÑÐÐÐÑÑÑ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:957
+#: ../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:2823
+#: ../libedataserverui/e-name-selector-entry.c:2907
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "_ÐÐÐÐÐÑÐÑÑÑ %s Ñ ÑÐÐÐÐ"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2838
+#: ../libedataserverui/e-name-selector-entry.c:2922
 #, c-format
 msgid "Cop_y %s"
 msgstr "_ÐÐÐÐÑÑÐÐÐÑÑ %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2848
+#: ../libedataserverui/e-name-selector-entry.c:2932
 #, c-format
 msgid "C_ut %s"
 msgstr "Ð_ÑÑÐÐÐÑÑ %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2865
+#: ../libedataserverui/e-name-selector-entry.c:2949
 #, c-format
 msgid "_Edit %s"
 msgstr "_ÐÑÐÐÐÐÐÐÑÑ %s"
 
-#: ../libedataserverui/e-name-selector-list.c:524
+#: ../libedataserverui/e-name-selector-list.c:521
 #, c-format
 msgid "_Delete %s"
 msgstr "_ÐÑÐÐÐÑÑÑ %s"
@@ -5333,21 +5354,82 @@ msgstr "_ÐÐÐÐÐÐÑÑÑ ÐÑÑÑ ÐÐÑÐÐÑ"
 msgid "_Remember this password for the remainder of this session"
 msgstr "_ÐÐÐÐÐÐÑÑÑ ÐÑÑÑ ÐÐÑÐÐÑ ÐÐ ÐÐÐÐÐÑÑÐÐÑ ÐÑÑÐÐÐ ÑÐÐÐÑÐ"
 
-#. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:91
+#: ../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:166
-msgid "_Destination"
-msgstr "_ÐÐÑÑÐ ÐÑÑÐÐÐÑÑÐÐÑ"
+#: ../modules/google-backend/module-google-backend.c:114
+#: ../modules/yahoo-backend/module-yahoo-backend.c:193
+msgid "Calendar"
+msgstr "ÐÐÐÑÐÐÐÑ"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:184
+#, c-format
+msgid "Code: %u - Unexpected response from server"
+msgstr "ÐÐÐ: %u - ÐÐÑÐÐÐÐÑ ÐÐÐÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:48
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:52
+#. 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 "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÑÐÐÑÑ ÑÐÐÐÐÐÑ Autodiscover"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:226
+#, c-format
+msgid "Failed to find Response element"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÑÐÐÑÑ ÑÐÐÐÐÐÑ Response"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:238
+#, c-format
+msgid "Failed to find Account element"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÑÐÐÑÑ ÑÐÐÐÐÐÑ Account"
+
+#. 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:207
+msgid "Tasks"
+msgstr "ÐÐÐÐÐÐÑ"
+
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:49
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:53
 msgid "Keep running after the last client is closed"
 msgstr "ÐÑÐÑÑÐÐÐÑÑ ÐÑÐÑÑ ÐÐÑÐÑ ÐÐÐÑÑÑÑÑ ÐÐÐÑÐÑÐÐ ÐÐÑÐÐÑÐ"
 
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:50
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:54
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:51
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:55
 msgid "Wait running until at least one client is connected"
 msgstr "ÐÐÑÐÐÐÑÑ Ð ÐÐÐÑÑÐÐÐ ÐÐ ÐÐÐÑÑÑÐÐÑ ÐÐÑÑÐÐÐ ÐÐÑÐÐÑÐ"
+
+#: ../tests/libedataserverui/evolution-source-viewer.c:458
+msgid "Evolution Source Viewer"
+msgstr "ÐÑÐÐÐÑÐÐÐÑÐÑÐ ÐÑÑÐÑÑ Evolution"
+
+#: ../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]