[evolution-data-server] Updated Russian translation



commit d9b79ed42ce3f98fd9a09ca11ecb226287d9ae98
Author: Yuri Kozlov <yuray komyakino ru>
Date:   Sun Jul 31 13:16:10 2011 +0400

    Updated Russian translation

 po/ru.po | 4029 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 1957 insertions(+), 2072 deletions(-)
---
diff --git a/po/ru.po b/po/ru.po
index ac8bad3..013f4eb 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,188 +6,259 @@
 # Dmitry Mastrukov  <dmitry taurussoft org>, 2001-2003.
 # Leonid Kanter <leon asplinux ru com>, 2004-2006, 2007.
 # Michael Yakhontov <mvy asplinux ru>, 2003.
-# Yuri Kozlov <yuray komyakino ru>, 2010.
+# Yuri Kozlov <yuray komyakino ru>, 2010, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server trunk\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-data-server&component=Misc.\n";
-"POT-Creation-Date: 2011-02-17 18:29+0000\n"
-"PO-Revision-Date: 2011-03-05 21:18+0400\n"
-"Last-Translator: Yuri Myaseodov <omerta13 yandex ru>\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: 2011-07-29 17:59+0000\n"
+"PO-Revision-Date: 2011-07-31 13:04+0400\n"
+"Last-Translator: Yuri Kozlov <yuray komyakino ru>\n"
 "Language-Team: Russian <gnome-cyr gnome org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Lokalize 1.0\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:570
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
+#: ../addressbook/backends/file/e-book-backend-file.c:668
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
 msgid "Loading..."
 msgstr "ÐÐÐÑÑÐÐÐâ"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:573
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4506
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
+#: ../addressbook/backends/file/e-book-backend-file.c:671
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4708
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
 msgid "Searching..."
 msgstr "ÐÐÐÑÐâ"
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:589
+#: ../addressbook/backends/google/e-book-backend-google.c:628
 msgid "Querying for updated contactsâ"
 msgstr "ÐÐÐÑÐÑ ÐÐÐÐÐÐÑÐÐÑÑ ÐÐÐÑÐÐÑÐÐâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:624
+#: ../addressbook/backends/google/e-book-backend-google.c:672
+#: ../addressbook/libebook/e-book.c:3572 ../calendar/libecal/e-cal.c:1331
+#: ../libedataserver/e-client.c:1777
 msgid "Personal"
 msgstr "ÐÐÑÐÐÐ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:626
-#| msgid "Favorites"
+#: ../addressbook/backends/google/e-book-backend-google.c:674
 msgid "Friends"
 msgstr "ÐÑÑÐÑÑ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:628
-#| msgid "Family Name"
+#: ../addressbook/backends/google/e-book-backend-google.c:676
 msgid "Family"
 msgstr "ÐÐÐÑÑ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:630
+#: ../addressbook/backends/google/e-book-backend-google.c:678
 msgid "Coworkers"
 msgstr "ÐÐÑÑÑÐÐÐÐÐ"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:707
+#: ../addressbook/backends/google/e-book-backend-google.c:757
 msgid "Querying for updated groupsâ"
 msgstr "ÐÐÐÑÐÑ ÐÐÐÐÐÐÑÐÐÑÑ ÐÑÑÐÐâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:891
-#| msgid "Cannot get contact"
+#: ../addressbook/backends/google/e-book-backend-google.c:1036
 msgid "Creating new contactâ"
 msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:984
+#: ../addressbook/backends/google/e-book-backend-google.c:1128
 msgid "Deleting contactâ"
 msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1092
-#| msgid "Cannot modify contact"
+#: ../addressbook/backends/google/e-book-backend-google.c:1240
 msgid "Modifying contactâ"
 msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1199
-#| msgid "Loading..."
+#: ../addressbook/backends/google/e-book-backend-google.c:1387
 msgid "Loadingâ"
 msgstr "ÐÐÐÑÑÐÐÐâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1346
-#| msgid "Authentication required"
+#: ../addressbook/backends/google/e-book-backend-google.c:1540
 msgid "Authenticating with the serverâ"
 msgstr "ÐÑÐÐÐÐÑÐÑÑÑ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑ ÐÐ ÑÐÑÐÐÑÐâ"
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2699
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4665
-#, c-format
-msgid "Downloading contacts (%d)... "
-msgstr "ÐÐÐÑÑÐÐÐ ÐÐÐÑÐÐÑÐÐ (%d)â"
-
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2847
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3028
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3075
-#, c-format
-msgid "Updating contacts cache (%d)... "
-msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÑÑÐ ÐÐÐÑÐÐÑÐÐ (%d)â"
-
 #. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
-#| msgid "Not connected."
 msgid "Not connected"
 msgstr "ÐÐ ÐÐÐÐÐÑÑÑÐ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:764
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:776
 msgid "Using Distinguished Name (DN)"
 msgstr "ÐÑÐÐÐÑÐÑÑ ÐÑÐÐÑÐÑÐÐÑÐÐÐ ÐÐÑ (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:767
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:779
 msgid "Using Email Address"
 msgstr "ÐÑÐÐÐÑÐÑÑ ÐÐÑÐÑ ÑÐ. ÐÐÑÑÑ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1033
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1048
 msgid "Reconnecting to LDAP server..."
 msgstr "ÐÐÐÑÐÑÐÐÐ ÐÐÐÐÐÑÑÐÐÐÐ Ð ÑÐÑÐÐÑÑ LDAPâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1158
-#| msgid "Invalid argument"
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1173
 msgid "Invalid DN syntax"
 msgstr "ÐÐÐÐÐÑÑÑÐÐÑÐ ÑÐÐÑÐÐÑÐÑ Ð ÐÑÐÐÑÐÑÐÐÑÐÐÐ ÐÐÐÐÐ (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1675
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1688
 msgid "Adding contact to LDAP server..."
 msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐ ÑÐÑÐÐÑÐ LDAPâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1807
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1818
 msgid "Removing contact from LDAP server..."
 msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ Ñ ÑÐÑÐÐÑÐ LDAPâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2243
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2250
 msgid "Modifying contact from LDAP server..."
 msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐ ÑÐÑÐÐÑÐ LDAPâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4356
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4559
 msgid "Receiving LDAP search results..."
 msgstr "ÐÐÐÑÑÐÐÐÐ ÑÐÐÑÐÑÑÐÑÐÐ ÐÐÐÑÐÐ Ñ ÑÐÑÐÐÑÐ LDAPâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4528
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4729
 msgid "Error performing search"
 msgstr "ÐÑÐÐÐÐ ÐÑÐÐÐÐÐÐÐÑ ÐÐÐÑÐÐ"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:273
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:881
-#: ../addressbook/libedata-book/e-data-book.c:441
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:523
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:552
-#: ../calendar/backends/http/e-cal-backend-http.c:435
-#: ../calendar/libecal/e-cal.c:4177
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:160
-#: ../camel/providers/imap/camel-imap-command.c:481
-#: ../camel/providers/imap/camel-imap-store.c:425
-#: ../camel/providers/pop3/camel-pop3-store.c:495
-#: ../camel/providers/smtp/camel-smtp-transport.c:497
-#: ../servers/groupwise/e-gw-connection.c:243
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4849
+#, c-format
+msgid "Downloading contacts (%d)... "
+msgstr "ÐÐÐÑÑÐÐÐ ÐÐÐÑÐÐÑÐÐ (%d)â"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:274
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:880
+#: ../addressbook/libedata-book/e-data-book.c:440
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:519
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:548
+#: ../calendar/backends/http/e-cal-backend-http.c:422
+#: ../calendar/libecal/e-cal.c:4462
+#: ../camel/providers/imap/camel-imap-command.c:484
+#: ../camel/providers/imap/camel-imap-store.c:385
+#: ../camel/providers/smtp/camel-smtp-transport.c:520
 msgid "Unknown error"
 msgstr "ÐÐÐÐÐÐÑÑÐÐÑ ÐÑÐÐÐÐ"
 
 #: ../addressbook/backends/webdav/e-book-backend-webdav.c:335
 #, c-format
 msgid "Create resource '%s' failed with HTTP status: %d (%s)"
-msgstr "ÐÑÐ ÑÐÐÐÐÐÐÐ ÑÐÑÑÑÑÐ Â%s ÐÑÐÐÐÐÑÑÐ ÑÐÐÐ Ñ ÐÐÐÐÐ ÑÐÑÑÐÑÐÐÑ HTTP: %d (%s)"
+msgstr ""
+"ÐÑÐ ÑÐÐÐÐÐÐÐ ÑÐÑÑÑÑÐ Â%s ÐÑÐÐÐÐÑÑÐ ÑÐÐÐ Ñ ÐÐÐÐÐ ÑÐÑÑÐÑÐÐÑ HTTP: %d (%s)"
 
-#: ../addressbook/libebook/e-book.c:3064
+#: ../addressbook/libebook/e-book.c:3247
 #, c-format
-#| msgid "%s: there was no source for uid `%s' stored in gconf."
 msgid "%s: there was no source for UID '%s' stored in GConf."
 msgstr "%s: ÐÑÑÐÑÐÐÐ ÐÐÑ UID Â%s ÐÐ ÐÑÐ ÑÐÑÑÐÐÑÐ Ð GConf."
 
-#: ../addressbook/libebook/e-book.c:3420
-#: ../addressbook/libedata-book/e-data-book.c:183
-#| msgid "Folder '%s/%s' does not exist."
+#: ../addressbook/libebook/e-book.c:3555 ../calendar/libecal/e-cal.c:1311
+#: ../libedataserver/e-client.c:1772
+msgid "On This Computer"
+msgstr "ÐÐ ÑÑÐÐ ÐÐÐÐÑÑÑÐÑÐ"
+
+#: ../addressbook/libebook/e-book.c:3681
+#: ../addressbook/libebook/e-book-client.c:613
+#: ../addressbook/libedata-book/e-data-book.c:310
 msgid "Address book does not exist"
 msgstr "ÐÐÑÐÑÐÐÑ ÐÐÐÐÐ ÐÐ ÑÑÑÐÑÑÐÑÐÑ"
 
+#: ../addressbook/libebook/e-book-client.c:85
+msgctxt "BookClientError"
+msgid "No such book"
+msgstr "ÐÐÑ ÑÐÐÐÐ ÐÐÐÐÐ"
+
+#: ../addressbook/libebook/e-book-client.c:87
+msgctxt "BookClientError"
+msgid "Contact not found"
+msgstr "ÐÐÐÑÐÐÑ ÐÐ ÐÐÐÐÐÐ"
+
+#: ../addressbook/libebook/e-book-client.c:89
+msgctxt "BookClientError"
+msgid "Contact ID already exists"
+msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÐÐÑÐÐÑÐ ÑÐÐ ÑÑÑÐÑÑÐÑÐÑ"
+
+#: ../addressbook/libebook/e-book-client.c:91
+msgctxt "BookClientError"
+msgid "No such source"
+msgstr "ÐÐÑ ÑÐÐÐÐÐ ÐÑÑÐÑÐÐÐÐ"
+
+#: ../addressbook/libebook/e-book-client.c:93
+msgctxt "BookClientError"
+msgid "No space"
+msgstr "ÐÐÐÐÑÑÐÑÐÑÐÐ ÐÐÑÑÐ"
+
+#: ../addressbook/libebook/e-book-client.c:96
+msgctxt "BookClientError"
+msgid "Unknown error"
+msgstr "ÐÐÐÐÐÐÑÑÐÐÑ ÐÑÐÐÐÐ"
+
+#: ../addressbook/libebook/e-book-client.c:167
+msgid "D-Bus book proxy gone"
+msgstr "ÐÑÑÐÐ ÐÑÐÐÑÐ D-Bus ÐÐÑ ÐÐÐÐ"
+
+#: ../addressbook/libebook/e-book-client.c:428
+msgid "Failed to run book factory"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÑÐÑÑ ÑÐÐÑÐÐÑ ÐÐÐÐ"
+
+#: ../addressbook/libebook/e-book-client.c:438
+#: ../addressbook/libedata-book/e-data-book-factory.c:371
+#: ../addressbook/libedata-book/e-data-book-factory.c:429
+#: ../calendar/libecal/e-cal-client.c:544
+#: ../calendar/libedata-cal/e-data-cal-factory.c:391
+#, c-format
+msgid "Invalid source"
+msgstr "ÐÐÐÐÑÐÑÐ ÐÑÑÐÑÐÐÐ"
+
+#: ../addressbook/libebook/e-book-client.c:538
+#: ../calendar/libecal/e-cal-client.c:656
+#, c-format
+msgid "Incorrect uri '%s'"
+msgstr "ÐÐÐÐÑÑÐÐÑÐÑÐ uri Â%sÂ"
+
+#: ../addressbook/libebook/e-book-client.c:576
+msgid "Failed to find system book"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÐ ÑÐÑÑÐÐÐÑÑ ÐÐÐÐÑ"
+
+#: ../addressbook/libebook/e-book-client.c:683
+#: ../calendar/libecal/e-cal-client.c:804
+#, c-format
+msgid "There was no source for UID '%s' stored in a source list."
+msgstr "ÐÐÐÑÑ ÐÐÑ ÐÑÑÐÑÐÐÐÐ ÐÐÑ UID Â%sÂ, ÑÐÑÑÐÐÑÐÐÐÐÐ Ð ÑÐÐÑÐÐ ÐÑÑÐÑÐÐÐÐÐ."
+
+#: ../addressbook/libebook/e-book-client.c:2006
+#: ../calendar/libecal/e-cal-client.c:3611
+msgid "Cannot get connection to view"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ ÐÐÑ ÐÑÐÑÐÐÑÑÐ"
+
+#: ../addressbook/libebook/e-book-client-view.c:218
+#: ../calendar/libecal/e-cal-client-view.c:456
+msgid "Cannot start view, D-Bus proxy gone"
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÑÑÑÐÑÑ ÐÑÐÑÐÐÑÑ, ÐÑÑÐÐ ÐÑÐÐÑÐ D-Bus"
+
+#: ../addressbook/libebook/e-book-client-view.c:247
+#: ../calendar/libecal/e-cal-client-view.c:485
+msgid "Cannot stop view, D-Bus proxy gone"
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÑÑÐÐÐÐÐÑÑ ÐÑÐÑÐÐÑÑ, ÐÑÑÐÐ ÐÑÐÐÑÐ D-Bus"
+
+#: ../addressbook/libebook/e-book-client-view.c:288
+#: ../calendar/libecal/e-cal-client-view.c:526
+msgid "Cannot set fields of interest, D-Bus proxy gone"
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÑÑ ÐÑÐÐÑÐ ÐÐÐÑ, ÐÑÑÐÐ ÐÑÐÐÑÐ D-Bus"
+
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:115
+#: ../addressbook/libebook/e-contact.c:116
 msgid "Unique ID"
 msgstr "ÐÐÐÐÐÐÑÐÑÐ ID"
 
-#: ../addressbook/libebook/e-contact.c:116
+#. FILE_AS is not really a structured field - we use a getter/setter
+#. so we can generate its value if necessary in the getter
+#: ../addressbook/libebook/e-contact.c:119
 msgid "File Under"
 msgstr "ÐÐÑÑÐÐÐÑÑ ÐÐÐ"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:118
+#: ../addressbook/libebook/e-contact.c:121
 msgid "Book URI"
 msgstr "ÐÐÑÐÑ (URI) ÐÐÐÐÐ"
 
@@ -195,804 +266,754 @@ msgstr "ÐÐÑÐÑ (URI) ÐÐÐÐÐ"
 #. FN isn't really a structured field - we use a getter/setter
 #. so we can set the N property (since evo 1.4 works fine with
 #. vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:127
 msgid "Full Name"
 msgstr "ÐÐÐÐÐÐ ÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:128
 msgid "Given Name"
 msgstr "ÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:126
+#: ../addressbook/libebook/e-contact.c:129
 msgid "Family Name"
 msgstr "ÐÐÐÐÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:127
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Nickname"
 msgstr "ÐÑÐÐÐÐÐÐÐ"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 1"
 msgstr "ÐÐ. ÐÐÑÑÐ 1"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Email 2"
 msgstr "ÐÐ. ÐÐÑÑÐ 2"
 
-#: ../addressbook/libebook/e-contact.c:132
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Email 3"
 msgstr "ÐÐ. ÐÐÑÑÐ 3"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:136
 msgid "Email 4"
 msgstr "ÐÐ. ÐÐÑÑÐ 4"
 
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Mailer"
 msgstr "ÐÐÑÑÐÐÑÐ ÐÐÐÐÐÑ"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:141
 msgid "Home Address Label"
 msgstr "ÐÑÐÑÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:139
+#: ../addressbook/libebook/e-contact.c:142
 msgid "Work Address Label"
 msgstr "ÐÑÐÑÐ ÑÐÐÐÑÐÐÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:140
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Other Address Label"
 msgstr "ÐÑÐÑÐ ÐÑÑÐÐÐÐ ÐÐÑÐÑÐ"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Assistant Phone"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Business Phone"
 msgstr "ÐÐÑÐÐÐÐÑÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Business Phone 2"
 msgstr "ÐÐÑÐÐÐÐÑÐ ÑÐÐÐÑÐÐ 2"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Business Fax"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Callback Phone"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÑ ÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Car Phone"
 msgstr "ÐÐÐÐÑÐÐ Ð ÐÐÑÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Company Phone"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Home Phone"
 msgstr "ÐÐÐÐÑÐÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Home Phone 2"
 msgstr "ÐÐÐÐÑÐÐÐ ÑÐÐÐÑÐÐ 2"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Home Fax"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:156
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Mobile Phone"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Other Phone"
 msgstr "ÐÑÑÐÐÐ ÑÐÐÐÑÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Other Fax"
 msgstr "ÐÑÑÐÐÐ ÑÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Pager"
 msgstr "ÐÐÐÐÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:161
 msgid "Primary Phone"
 msgstr "ÐÑÐÐÐÐÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:162
 msgid "Radio"
 msgstr "ÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:163
 msgid "Telex"
 msgstr "ÐÐÐÐÐÑ"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:162
+#: ../addressbook/libebook/e-contact.c:165
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Organization"
 msgstr "ÐÑÐÐÐÐÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Organizational Unit"
 msgstr "ÐÐÐÑÐÐÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Office"
 msgstr "ÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Title"
 msgstr "ÐÐÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:172
 msgid "Role"
 msgstr "ÐÐÐÐÐÐÑÑÑ"
 
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook/e-contact.c:173
 msgid "Manager"
 msgstr "ÐeÐÐÐÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:171
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Assistant"
 msgstr "ÐÐÐÐÑÐÐÐ"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:174
+#: ../addressbook/libebook/e-contact.c:177
 msgid "Homepage URL"
 msgstr "URL ÐÐÐÐÑÐÐÐ ÑÑÑÐÐÐÑÑ"
 
-#: ../addressbook/libebook/e-contact.c:175
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Weblog URL"
 msgstr "URL ÐÐÐÐÐÐÐ"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:756
+#: ../addressbook/libebook/e-contact.c:181
+#: ../libedataserverui/e-categories-dialog.c:85
 msgid "Categories"
 msgstr "ÐÐÑÐÐÐÑÐÐ"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Calendar URI"
 msgstr "URI ÐÐÐÐÐÐÐÑÑ"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Free/Busy URL"
 msgstr "ÐÑÑÐÐÐ (URL) ÂÑÐÐÐÐÐÐÐ/ÐÐÐÑÑÂ"
 
-#: ../addressbook/libebook/e-contact.c:183
+#: ../addressbook/libebook/e-contact.c:186
 msgid "ICS Calendar"
 msgstr "ÐÐÐÐÐÐÐÑÑ ÑÐÑÐÐÑÐ ICS"
 
-#: ../addressbook/libebook/e-contact.c:184
+#: ../addressbook/libebook/e-contact.c:187
 msgid "Video Conferencing URL"
 msgstr "URL ÐÐÐÐÐÐÐÐÑÐÑÐÐÑÐÐ"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:187
+#: ../addressbook/libebook/e-contact.c:190
 msgid "Spouse's Name"
 msgstr "ÐÐÑ ÑÑÐÑÑÐÐ(Ð)"
 
-#: ../addressbook/libebook/e-contact.c:188
+#: ../addressbook/libebook/e-contact.c:191
 msgid "Note"
 msgstr "ÐÑÐÐÐÑÐÐÐÐ"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:194
 msgid "AIM Home Screen Name 1"
 msgstr "AIM - ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 1"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Home Screen Name 2"
 msgstr "AIM - ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 2"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Home Screen Name 3"
 msgstr "AIM - ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 3"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:197
 msgid "AIM Work Screen Name 1"
 msgstr "AIM - ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 1"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:198
 msgid "AIM Work Screen Name 2"
 msgstr "AIM - ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 2"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:199
 msgid "AIM Work Screen Name 3"
 msgstr "AIM - ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 3"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:200
 msgid "GroupWise Home Screen Name 1"
 msgstr "Groupwise - ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 1"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Home Screen Name 2"
 msgstr "Groupwise - ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 2"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Home Screen Name 3"
 msgstr "Groupwise - ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 3"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:203
 msgid "GroupWise Work Screen Name 1"
 msgstr "Groupwise - ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 1"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:204
 msgid "GroupWise Work Screen Name 2"
 msgstr "Groupwise - ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 2"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:205
 msgid "GroupWise Work Screen Name 3"
 msgstr "Groupwise - ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 3"
 
-#: ../addressbook/libebook/e-contact.c:203
-#| msgid "Jabber Home Id 1"
+#: ../addressbook/libebook/e-contact.c:206
 msgid "Jabber Home ID 1"
 msgstr "Jabber â ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ 1"
 
-#: ../addressbook/libebook/e-contact.c:204
-#| msgid "Jabber Home Id 2"
+#: ../addressbook/libebook/e-contact.c:207
 msgid "Jabber Home ID 2"
 msgstr "Jabber â ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ 2"
 
-#: ../addressbook/libebook/e-contact.c:205
-#| msgid "Jabber Home Id 3"
+#: ../addressbook/libebook/e-contact.c:208
 msgid "Jabber Home ID 3"
 msgstr "Jabber â ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ 3"
 
-#: ../addressbook/libebook/e-contact.c:206
-#| msgid "Jabber Work Id 1"
+#: ../addressbook/libebook/e-contact.c:209
 msgid "Jabber Work ID 1"
 msgstr "Jabber â ÑÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ 1"
 
-#: ../addressbook/libebook/e-contact.c:207
-#| msgid "Jabber Work Id 2"
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Jabber Work ID 2"
 msgstr "Jabber â ÑÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ 2"
 
-#: ../addressbook/libebook/e-contact.c:208
-#| msgid "Jabber Work Id 3"
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Jabber Work ID 3"
 msgstr "Jabber â ÑÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ 3"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo! - ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 1"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo! - ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 2"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo! - ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 3"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:215
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo! - ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 1"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:216
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo! - ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 2"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo! - ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 3"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:218
 msgid "MSN Home Screen Name 1"
 msgstr "MSN - ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 1"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Home Screen Name 2"
 msgstr "MSN - ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 2"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Home Screen Name 3"
 msgstr "MSN - ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 3"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:221
 msgid "MSN Work Screen Name 1"
 msgstr "MSN - ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 1"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:222
 msgid "MSN Work Screen Name 2"
 msgstr "MSN - ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 2"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:223
 msgid "MSN Work Screen Name 3"
 msgstr "MSN - ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 3"
 
-#: ../addressbook/libebook/e-contact.c:221
-#| msgid "ICQ Home Id 1"
+#: ../addressbook/libebook/e-contact.c:224
 msgid "ICQ Home ID 1"
 msgstr "ICQ â ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ 1"
 
-#: ../addressbook/libebook/e-contact.c:222
-#| msgid "ICQ Home Id 2"
+#: ../addressbook/libebook/e-contact.c:225
 msgid "ICQ Home ID 2"
 msgstr "ICQ â ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ 2"
 
-#: ../addressbook/libebook/e-contact.c:223
-#| msgid "ICQ Home Id 3"
+#: ../addressbook/libebook/e-contact.c:226
 msgid "ICQ Home ID 3"
 msgstr "ICQ â ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ 3"
 
-#: ../addressbook/libebook/e-contact.c:224
-#| msgid "ICQ Work Id 1"
+#: ../addressbook/libebook/e-contact.c:227
 msgid "ICQ Work ID 1"
 msgstr "ICQ â ÑÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ 1"
 
-#: ../addressbook/libebook/e-contact.c:225
-#| msgid "ICQ Work Id 2"
+#: ../addressbook/libebook/e-contact.c:228
 msgid "ICQ Work ID 2"
 msgstr "ICQ â ÑÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ 2"
 
-#: ../addressbook/libebook/e-contact.c:226
-#| msgid "ICQ Work Id 3"
+#: ../addressbook/libebook/e-contact.c:229
 msgid "ICQ Work ID 3"
 msgstr "ICQ â ÑÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook/e-contact.c:232
 msgid "Last Revision"
 msgstr "ÐÐÑÐÐÐÐÑÑ ÐÐÑÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:230
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Name or Org"
 msgstr "ÐÐÑ ÐÐÐ ÐÑÐ"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:236
 msgid "Address List"
 msgstr "ÐÐÐÑÐÐ ÐÐÑÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:237
 msgid "Home Address"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:235
+#: ../addressbook/libebook/e-contact.c:238
 msgid "Work Address"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:236
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Other Address"
 msgstr "ÐÑÑÐÐÐ ÐÐÑÐÑÐ"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:239
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Category List"
 msgstr "ÐÐÐÑÐÐ ÐÐÑÐÐÐÑÐÐ"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:242
+#: ../addressbook/libebook/e-contact.c:245
 msgid "Photo"
 msgstr "ÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Logo"
 msgstr "ÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:245
+#: ../addressbook/libebook/e-contact.c:248
 msgid "Name"
 msgstr "ÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:246
+#: ../addressbook/libebook/e-contact.c:249
 msgid "Email List"
 msgstr "ÐÐÐÑÐÐ ÐÐÑÐÑÐÐ ÑÐ. ÐÐÑÑÑ"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:252
 msgid "AIM Screen Name List"
 msgstr "ÐÐÐÑÐÐ ÑÐÑÐÐÐÑÑ ÐÐÐÐ AIM"
 
-#: ../addressbook/libebook/e-contact.c:250
-#| msgid "GroupWise Id List"
+#: ../addressbook/libebook/e-contact.c:253
 msgid "GroupWise ID List"
 msgstr "ÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑÐÐ Groupwise"
 
-#: ../addressbook/libebook/e-contact.c:251
-#| msgid "Jabber Id List"
+#: ../addressbook/libebook/e-contact.c:254
 msgid "Jabber ID List"
 msgstr "ÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑÐÐ Jabber"
 
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:255
 msgid "Yahoo! Screen Name List"
 msgstr "ÐÐÐÑÐÐ ÑÐÑÐÐÐÑÑ ÐÐÐÐ Yahoo!"
 
-#: ../addressbook/libebook/e-contact.c:253
+#: ../addressbook/libebook/e-contact.c:256
 msgid "MSN Screen Name List"
 msgstr "ÐÐÐÑÐÐ ÑÐÑÐÐÐÑÑ ÐÐÐÐ MSN"
 
-#: ../addressbook/libebook/e-contact.c:254
-#| msgid "ICQ Id List"
+#: ../addressbook/libebook/e-contact.c:257
 msgid "ICQ ID List"
 msgstr "ÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑÐÐ ICQ"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:259
 msgid "Wants HTML Mail"
 msgstr "ÐÑÐÐÐÐÑÐÑÐÐÑ ÐÐÑÑÑ Ð HTML"
 
-#: ../addressbook/libebook/e-contact.c:258
+#: ../addressbook/libebook/e-contact.c:261
 msgid "List"
 msgstr "ÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:262
 msgid "List Show Addresses"
 msgstr "ÐÐÐÑÐÐ ÐÐÐÐÐÑÐÐÐÑ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:261
+#: ../addressbook/libebook/e-contact.c:264
 msgid "Birth Date"
 msgstr "ÐÐÑÐ ÑÐÐÐÐÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:262
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
+#: ../addressbook/libebook/e-contact.c:265
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:721
 msgid "Anniversary"
 msgstr "ÐÐÐÐÐÑÐÐÐ"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:265
+#: ../addressbook/libebook/e-contact.c:268
 msgid "X.509 Certificate"
 msgstr "ÐÐÑÑÐÑÐÐÐÑ X.509"
 
-#: ../addressbook/libebook/e-contact.c:267
-#| msgid "Gadu-Gadu Home Id 1"
+#: ../addressbook/libebook/e-contact.c:270
 msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu â ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ 1"
 
-#: ../addressbook/libebook/e-contact.c:268
-#| msgid "Gadu-Gadu Home Id 2"
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu â ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ 2"
 
-#: ../addressbook/libebook/e-contact.c:269
-#| msgid "Gadu-Gadu Home Id 3"
+#: ../addressbook/libebook/e-contact.c:272
 msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu â ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ 3"
 
-#: ../addressbook/libebook/e-contact.c:270
-#| msgid "Gadu-Gadu Work Id 1"
+#: ../addressbook/libebook/e-contact.c:273
 msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu â ÑÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ 1"
 
-#: ../addressbook/libebook/e-contact.c:271
-#| msgid "Gadu-Gadu Work Id 2"
+#: ../addressbook/libebook/e-contact.c:274
 msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu â ÑÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ 2"
 
-#: ../addressbook/libebook/e-contact.c:272
-#| msgid "Gadu-Gadu Work Id 3"
+#: ../addressbook/libebook/e-contact.c:275
 msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu â ÑÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ 3"
 
-#: ../addressbook/libebook/e-contact.c:273
-#| msgid "Gadu-Gadu Id List"
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Gadu-Gadu ID List"
 msgstr "ÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑÐÐ Gadu-Gadu"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:279
 msgid "Geographic Information"
 msgstr "ÐÐÐÐÑÐÑÐÑÐÑÐÐÑ ÐÐÑÐÑÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Telephone"
 msgstr "ÐÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Home Name 1"
 msgstr "Skype - ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 1"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Home Name 2"
 msgstr "Skype - ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 2"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Home Name 3"
 msgstr "Skype - ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 3"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Work Name 1"
 msgstr "Skype - ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 1"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:287
 msgid "Skype Work Name 2"
 msgstr "Skype - ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 2"
 
-#: ../addressbook/libebook/e-contact.c:285
+#: ../addressbook/libebook/e-contact.c:288
 msgid "Skype Work Name 3"
 msgstr "Skype - ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 3"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:289
 msgid "Skype Name List"
 msgstr "ÐÐÐÑÐÐ ÑÐÑÐÐÐÑÑ ÐÐÐÐ Skype"
 
-#: ../addressbook/libebook/e-contact.c:288
+#: ../addressbook/libebook/e-contact.c:291
 msgid "SIP address"
 msgstr "ÐÐÑÐÑ SIP"
 
-#: ../addressbook/libebook/e-contact.c:1517
-#: ../addressbook/libebook/e-destination.c:739
+#: ../addressbook/libebook/e-contact.c:1542
+#: ../addressbook/libebook/e-destination.c:870
 msgid "Unnamed List"
 msgstr "ÐÐÐÑÐÑÐÐÑÐ ÑÐÐÑÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:304
+#: ../addressbook/libedata-book/e-book-backend.c:19
+msgid "Cannot process, book backend is opening"
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÑÐÐÐÑÐÑÑ, ÐÑÐÑÑÑ ÐÑÐÐÐÐÑ ÐÐÐÐÐ"
+
+#: ../addressbook/libedata-book/e-book-backend.c:91
 #, c-format
-msgid "Empty URI"
-msgstr "ÐÑÑÑÐÐ URI"
+msgid "Unknown book property '%s'"
+msgstr "ÐÐÐÐÐÐÑÑÐÐÐ ÑÐÐÐÑÑÐÐ ÐÐÐÐÐ Â%sÂ"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:323
-#: ../addressbook/libedata-book/e-data-book-factory.c:361
-#: ../calendar/libedata-cal/e-data-cal-factory.c:352
-#: ../calendar/libedata-cal/e-data-cal-factory.c:364
+#: ../addressbook/libedata-book/e-book-backend.c:103
 #, c-format
-msgid "Invalid source"
-msgstr "ÐÐÐÐÑÐÑÐ ÐÑÑÐÑÐÐÐ"
+msgid "Cannot change value of book property '%s'"
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÑÑ ÐÐÐÑÐÐÐÐ ÑÐÐÐÑÑÐÐ ÐÐÐÐÐ Â%sÂ"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:420
+#: ../camel/camel-db.c:470
+#, c-format
+msgid "Insufficient memory"
+msgstr "ÐÐÐÐÑÑÐÑÐÑÐÐ ÐÐÐÑÑÐ"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:196
+#: ../addressbook/libedata-book/e-data-book.c:209
+#: ../addressbook/libedata-book/e-data-book.c:692
+msgid "Invalid query: "
+msgstr "ÐÐÐÐÐÑÑÑÐÐÑÐ ÐÐÐÑÐÑ: "
 
-#: ../addressbook/libedata-book/e-data-book.c:173
-#: ../calendar/libedata-cal/e-data-cal.c:110
+#: ../addressbook/libedata-book/e-data-book.c:299
+#: ../calendar/libedata-cal/e-data-cal.c:413
 msgid "Success"
 msgstr "ÐÑÐÐÑÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:174
-#: ../calendar/libedata-cal/e-data-cal.c:111
-#| msgid "Repository is offline"
+#: ../addressbook/libedata-book/e-data-book.c:300
+#: ../calendar/libecal/e-cal.c:4430 ../calendar/libedata-cal/e-data-cal.c:414
+msgid "Backend is busy"
+msgstr "ÐÑÐÐÐÐÑ ÐÐÐÑÑ"
+
+#: ../addressbook/libedata-book/e-data-book.c:301
+#: ../calendar/libedata-cal/e-data-cal.c:415
 msgid "Repository offline"
 msgstr "ÐÐÐÐÐÐÑÐÑÐÐ ÐÑÐÐÑÑÑÐ ÐÑ ÑÐÑÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:175
-#: ../calendar/libecal/e-cal.c:4159
-#: ../calendar/libedata-cal/e-data-cal.c:112
+#: ../addressbook/libedata-book/e-data-book.c:302
+#: ../calendar/libecal/e-cal.c:4444 ../calendar/libedata-cal/e-data-cal.c:416
 msgid "Permission denied"
 msgstr "ÐÐÑÑÑÐ ÐÐÐÑÐÑÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:176
-#| msgid "Object not found"
+#: ../addressbook/libedata-book/e-data-book.c:303
 msgid "Contact not found"
 msgstr "ÐÐÐÑÐÐÑ ÐÐ ÐÐÐÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:177
-#| msgid "Object ID already exists"
+#: ../addressbook/libedata-book/e-data-book.c:304
 msgid "Contact ID already exists"
 msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÐÐÑÐÐÑÐ ÑÐÐ ÑÑÑÐÑÑÐÑÐÑ"
 
-#: ../addressbook/libedata-book/e-data-book.c:178
-#: ../calendar/libedata-cal/e-data-cal.c:117
-#| msgid "Authentication failed"
+#: ../addressbook/libedata-book/e-data-book.c:305
+#: ../calendar/libedata-cal/e-data-cal.c:421
 msgid "Authentication Failed"
 msgstr "ÐÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:179
-#: ../calendar/libedata-cal/e-data-cal.c:118
-#| msgid "Authentication required"
+#: ../addressbook/libedata-book/e-data-book.c:306
+#: ../calendar/libedata-cal/e-data-cal.c:422
 msgid "Authentication Required"
 msgstr "ÐÑÐÐÑÐÑÑÑ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑ"
 
-#: ../addressbook/libedata-book/e-data-book.c:180
-#: ../calendar/libedata-cal/e-data-cal.c:119
+#: ../addressbook/libedata-book/e-data-book.c:307
+#: ../calendar/libedata-cal/e-data-cal.c:423
 msgid "Unsupported field"
 msgstr "ÐÐÐÐÐÐÐÑÐÐÐÐÐÐÐÐ ÐÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:181
-#: ../calendar/libedata-cal/e-data-cal.c:121
+#: ../addressbook/libedata-book/e-data-book.c:308
+#: ../calendar/libedata-cal/e-data-cal.c:425
 msgid "Unsupported authentication method"
 msgstr "ÐÐÐÐÐÐÐÑÐÐÐÐÐÐÑÐ ÐÐÑÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:182
-#: ../calendar/libedata-cal/e-data-cal.c:122
+#: ../addressbook/libedata-book/e-data-book.c:309
+#: ../calendar/libedata-cal/e-data-cal.c:426
 msgid "TLS not available"
 msgstr "TLS ÐÐÐÐÑÑÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:184
+#: ../addressbook/libedata-book/e-data-book.c:311
 msgid "Book removed"
 msgstr "ÐÐÐÐÐ ÑÐÐÐÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:185
-#: ../calendar/libedata-cal/e-data-cal.c:125
-#| msgid "This message is not available in offline mode."
+#: ../addressbook/libedata-book/e-data-book.c:312
+#: ../calendar/libedata-cal/e-data-cal.c:429
 msgid "Not available in offline mode"
 msgstr "ÐÐÐÐÑÑÑÐÐÐ Ð ÐÐÑÐÐÐÐÐÐÐ ÑÐÐÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:186
-#: ../calendar/libedata-cal/e-data-cal.c:126
+#: ../addressbook/libedata-book/e-data-book.c:313
+#: ../calendar/libedata-cal/e-data-cal.c:430
 msgid "Search size limit exceeded"
 msgstr "ÐÑÐÐÑÑÐÐÐ ÐÐÑÐÐÐÑÐÐÐÐ ÐÐ ÑÐÐÐÐÑ ÑÐÐÑÐÑÑÐÑÐÐ ÐÐÐÑÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:187
-#: ../calendar/libedata-cal/e-data-cal.c:127
+#: ../addressbook/libedata-book/e-data-book.c:314
+#: ../calendar/libedata-cal/e-data-cal.c:431
 msgid "Search time limit exceeded"
 msgstr "ÐÑÐÐÑÑÐÐÐ ÐÐÑÐÐÐÑÐÐÐÐ ÐÐ ÐÑÐÐÑ ÐÐÐÑÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:188
-#: ../calendar/libedata-cal/e-data-cal.c:128
+#: ../addressbook/libedata-book/e-data-book.c:315
+#: ../calendar/libedata-cal/e-data-cal.c:432
 msgid "Invalid query"
 msgstr "ÐÐÐÐÑÑÐÐÑÐÑÐ ÐÐÐÑÐÑ"
 
-#: ../addressbook/libedata-book/e-data-book.c:189
-#: ../calendar/libedata-cal/e-data-cal.c:129
+#: ../addressbook/libedata-book/e-data-book.c:316
+#: ../calendar/libedata-cal/e-data-cal.c:433
 msgid "Query refused"
 msgstr "ÐÐÐÑÐÑ ÐÑÐÐÐÐÑÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:190
-#: ../calendar/libedata-cal/e-data-cal.c:130
-#| msgid "Could not cancel operation"
+#: ../addressbook/libedata-book/e-data-book.c:317
+#: ../calendar/libedata-cal/e-data-cal.c:434
 msgid "Could not cancel"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÐÐÐÑÑ"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
 #. { OtherError,			N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:192
-#: ../calendar/libedata-cal/e-data-cal.c:132
+#: ../addressbook/libedata-book/e-data-book.c:319
+#: ../calendar/libedata-cal/e-data-cal.c:436
 msgid "Invalid server version"
 msgstr "ÐÐÐÐÐÑÑÑÐÐÐÑ ÐÐÑÑÐÑ ÑÐÑÐÐÑÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:193
-#| msgid "Namespace"
+#: ../addressbook/libedata-book/e-data-book.c:320
 msgid "No space"
 msgstr "ÐÐÐÐÑÑÐÑÐÑÐÐ ÐÐÑÑÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:194
-#: ../calendar/libecal/e-cal.c:4143
-#: ../calendar/libedata-cal/e-data-cal.c:133
+#: ../addressbook/libedata-book/e-data-book.c:321
+#: ../calendar/libecal/e-cal.c:4428 ../calendar/libedata-cal/e-data-cal.c:437
 msgid "Invalid argument"
 msgstr "ÐÐÐÐÐÑÑÑÐÐÑÐ ÐÑÐÑÐÐÐÑ"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:196
-#: ../calendar/libecal/e-cal.c:4182
-#: ../calendar/libedata-cal/e-data-cal.c:135
-#| msgid "Protocol not supported"
+#: ../addressbook/libedata-book/e-data-book.c:323
+#: ../calendar/libecal/e-cal.c:4467 ../calendar/libedata-cal/e-data-cal.c:439
 msgid "Not supported"
 msgstr "ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ"
 
-#: ../addressbook/libedata-book/e-data-book.c:204
-#: ../calendar/libedata-cal/e-data-cal.c:143
-#| msgid "Other Phone"
+#: ../addressbook/libedata-book/e-data-book.c:331
+#: ../calendar/libecal/e-cal-client.c:552
+#: ../calendar/libedata-cal/e-data-cal.c:447
 msgid "Other error"
 msgstr "ÐÑÑÐÐÑ ÐÑÐÐÐÐ"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:325
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:534
+#: ../addressbook/libedata-book/e-data-book.c:864
+msgid "Cannot get contact: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÑÑ ÐÐÐÑÐÐÑ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:556
+#: ../addressbook/libedata-book/e-data-book.c:578
+msgid "Empty query: "
+msgstr "ÐÑÑÑÐÐ ÐÐÐÑÐÑ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:600
+#: ../addressbook/libedata-book/e-data-book.c:930
+msgid "Cannot add contact: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÑÑ ÐÐÐÑÐÐÑ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:622
+#: ../addressbook/libedata-book/e-data-book.c:949
+msgid "Cannot modify contact: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÑÑ ÐÐÐÑÐÐÑ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:715
+#: ../calendar/libedata-cal/e-data-cal.c:822
+msgid "Cannot authenticate user: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐÑÑ ÐÐÐÐÐÐÐÐÑÑÑ ÐÐÐÑÐÐÐÐÑÐÐÑ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:777
+msgid "Cannot open book: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÑÐÑÑÑÑ ÐÐÐÐÑ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:791
+msgid "Cannot remove book: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÑ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:816
+msgid "Cannot refresh address book: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÑÑ ÐÐÑÐÑÐÑÑ ÐÐÐÐÑ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:832
+msgid "Cannot get backend property: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÑÑ ÑÐÐÐÑÑÐÐ ÐÑÐÐÐÐÑÐ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:848
+#: ../calendar/libedata-cal/e-data-cal.c:999
+msgid "Cannot set backend property: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÑÐÑÑ ÑÐÐÐÑÑÐÐ ÐÑÐÐÐÐÑÐ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:879
+msgid "Cannot get contact list: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÑÑ ÑÐÐÑÐÐ ÐÐÐÑÐÐÑÐÐ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:903
+msgid "Cannot get contact list uids: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÑÑ ÐÐÐÐÑÐÑÐÐÐÑÐÑÑ ÑÐÐÑÐÐ ÐÐÐÑÐÐÑÐÐ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:967
+msgid "Cannot remove contacts: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÐÐÑÑ: "
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:355
+#: ../addressbook/libedata-book/e-data-book-factory.c:388
+#: ../calendar/libedata-cal/e-data-cal-factory.c:406
 #, c-format
-#| msgid "Cannot open book"
-msgid "Cannot open book: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÑÑÑ ÐÐÐÐÑ: %s"
+msgid "Empty URI"
+msgstr "ÐÑÑÑÐÐ URI"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:347
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:517
 #, c-format
-#| msgid "Cannot remove book"
-msgid "Cannot remove book: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÑÑÑ ÐÐÐÐÑ: %s"
+msgid "Server is unreachable (%s)"
+msgstr "ÐÐÑÐÐÑ ÐÐÐÐÑÑÑÐÐÐ (%s)"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:364
-#: ../addressbook/libedata-book/e-data-book.c:383
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:545
 #, c-format
-#| msgid "Cannot get contact"
-msgid "Cannot get contact: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÐÐÑÐÐÑ: %s"
+msgid "Unexpected HTTP status code %d returned (%s)"
+msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÐÐÐÐÐÑÐ ÐÐÐ (%d) ÑÐÑÑÐÑÐÐÑ HTTP (%s)"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:402
-#, c-format
-#| msgid "Empty query"
-msgid "Empty query: %s"
-msgstr "ÐÑÑÑÐÐ ÐÐÐÑÐÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:418
-#, c-format
-#| msgid "Cannot get contact"
-msgid "Cannot get contact list: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÑÐÐÑÐÐ ÐÐÐÑÐÐÑÐÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:457
-#, c-format
-#| msgid "Cannot authenticate user"
-msgid "Cannot authenticate user: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÑÐÐÑÐÑÐÑÐÑÐÐÐÑÑ ÐÐÐÑÐÐÐÐÑÐÐÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:472
-#: ../addressbook/libedata-book/e-data-book.c:491
-#, c-format
-#| msgid "Cannot add contact"
-msgid "Cannot add contact: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑ ÐÐÐÑÐÐÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:513
-#: ../addressbook/libedata-book/e-data-book.c:532
-#, c-format
-#| msgid "Cannot modify contact"
-msgid "Cannot modify contact: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑ ÐÐÐÑÐÐÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:571
-#, c-format
-#| msgid "Cannot remove contacts"
-msgid "Cannot remove contacts: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÑÐÐÑÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:610
-#, c-format
-#| msgid "Cannot get message %s: %s"
-msgid "Cannot get supported fields: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÐÐÐÐÑÐÐÐÐÐÐÑÐ ÐÐÐÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:625
-#, c-format
-#| msgid "Cannot get message %s: %s"
-msgid "Cannot get required fields: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÐÐÐÑÐÐÐÐÑÐ ÐÐÐÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:640
-#, c-format
-#| msgid "Unsupported authentication method"
-msgid "Cannot get supported authentication methods: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÐÐÐÐÑÐÐÐÐÐÐÑÐ ÐÐÑÐÐÑ ÐÑÑÐÐÑÐÑÐÐÐÑÐÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:666
-#: ../addressbook/libedata-book/e-data-book.c:677
-#, c-format
-#| msgid "Invalid query"
-msgid "Invalid query: %s"
-msgstr "ÐÐÐÐÐÑÑÑÐÐÑÐ ÐÐÐÑÐÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:713
-#, c-format
-#| msgid "Cannot get changes"
-msgid "Cannot get changes: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÐÐÐÐÐÐÐÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:755
-#, c-format
-#| msgid "Operation failed: %s"
-msgid "Cancel operation failed: %s"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐÐÐ ÐÑÐ ÐÑÐÐÐÐ ÐÐÐÑÐÑÐÐ: %s"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:521
-#, c-format
-msgid "Server is unreachable (%s)"
-msgstr "ÐÐÑÐÐÑ ÐÐÐÐÑÑÑÐÐÐ (%s)"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:549
-#, c-format
-#| msgid ""
-#| "Unexpected GnuPG status message encountered:\n"
-#| "\n"
-#| "%s"
-msgid "Unexpected HTTP status code %d returned (%s)"
-msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÐÐÐÐÐÑÐ ÐÐÐ (%d) ÑÐÑÑÐÑÐÐÑ HTTP (%s)"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2090
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2490
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2097
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2445
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1001,388 +1022,398 @@ msgstr ""
 "ÐÐÑÐÐÑ ÐÐÐÐÑÑÑÐÐÐ, ÐÐÐÐÐÐÐÑÑ ÐÑÐÑÑÑ Ð ÑÐÐÐÐÐ ÂÑÐÐÑÐÐ ÑÑÐÐÐÐÂ.\n"
 "ÐÐÐÐÑÐÐÐÐ ÐÐ ÐÑÐÐÐÐ: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4241
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4187
 msgid "Calendar doesn't support Free/Busy"
 msgstr "ÐÐÐÐÐÐÐÑÑ ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑ ÐÐÑÐÑÐÐÑÐÑ Ð ÐÐÐÑÑÐÑÑÐ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:725
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
 msgid "Birthday"
 msgstr "ÐÐÐÑ ÑÐÐÐÐÐÐÑ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:754
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:752
 #, c-format
 msgid "Birthday: %s"
 msgstr "ÐÐÐÑ ÑÐÐÐÐÐÐÑ: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:778
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:776
 #, c-format
 msgid "Anniversary: %s"
 msgstr "ÐÐÐÐÐÑÐÐÐ: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:251
+#: ../calendar/backends/file/e-cal-backend-file.c:241
 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:248
+#: ../calendar/backends/file/e-cal-backend-file.c:254
 msgid "Cannot save calendar data"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÑÑÐÐÐÑÑ ÐÐÐÐÑÐ ÐÐÐÐÐÐÐÑÑ"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2105
-msgid "Reply Requested: by "
-msgstr "ÐÐÐÑÐÑÐÐ ÐÑÐÐÑ: "
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2110
-msgid "Reply Requested: When convenient"
-msgstr "ÐÐÐÑÐÑÐÐ ÐÑÐÐÑ: ÐÐÐÐÐ ÑÐÐÐÐÐ"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:329
-#| msgid "Loading %s items"
-msgid "Loading Appointment items"
-msgstr "ÐÐÐÑÑÐÐÐ ÑÐÐÐÐÐÑÐÐ ÂÐÑÑÑÐÑÐÂ"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:331
-#| msgid "Loading %s items"
-msgid "Loading Task items"
-msgstr "ÐÐÐÑÑÐÐÐ ÑÐÐÐÐÐÑÐÐ ÂÐÐÐÐÑÐÂ"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:333
-#| msgid "Loading %s items"
-msgid "Loading Note items"
-msgstr "ÐÐÐÑÑÐÐÐ ÑÐÐÐÐÐÑÐÐ ÂÐÑÐÐÐÑÐÐÐÐÂ"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:335
-#| msgid "Loading %s items"
-msgid "Loading items"
-msgstr "ÐÐÐÑÑÐÐÐ ÑÐÐÐÐÐÑÐÐ"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:951
-msgid "Calendar"
-msgstr "ÐÐÐÐÐÐÐÑÑ"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1014
-msgid "Invalid server URI"
-msgstr "ÐÐÐÐÑÐÑÐ URI ÑÐÑÐÐÑÐ"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1115
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1361
-#: ../calendar/backends/http/e-cal-backend-http.c:783
-#: ../calendar/backends/weather/e-cal-backend-weather.c:520
-msgid "Could not create cache file"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÑÐÐÐ ÐÑÑÐ"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1127
-msgid "Could not create thread for populating cache"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÑÐÐ ÐÐÑ ÐÐÐÐÐÐÐÐÐÑ ÐÑÑÐ"
-
-#: ../calendar/backends/http/e-cal-backend-http.c:423
+#: ../calendar/backends/http/e-cal-backend-http.c:405
 msgid "Redirected to Invalid URI"
 msgstr "ÐÐÑÐÐÐÑÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐÑÑÑÐÐÑÐ URI"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:456
+#: ../calendar/backends/http/e-cal-backend-http.c:443
 msgid "Bad file format."
 msgstr "ÐÐÐÐÑÐÑÐ ÑÐÑÐÐÑ ÑÐÐÐÐ."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:463
+#: ../calendar/backends/http/e-cal-backend-http.c:450
 msgid "Not a calendar."
 msgstr "ÐÐ ÑÐÐÑÐÑÑÑ ÐÐÐÐÐÐÐÑÑÐ."
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:186
+#: ../calendar/backends/http/e-cal-backend-http.c:764
+#: ../calendar/backends/http/e-cal-backend-http.c:765
+#: ../calendar/backends/weather/e-cal-backend-weather.c:513
+msgid "Could not create cache file"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÑÐÐÐ ÐÑÑÐ"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:183
 msgid "Could not retrieve weather data"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÐÑÐÑÐÐÑÐÑ Ð ÐÐÐÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:286
+#: ../calendar/backends/weather/e-cal-backend-weather.c:285
 msgid "Weather: Fog"
 msgstr "ÐÐÐÐÐÐ: ÐÑÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:287
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
 msgid "Weather: Cloudy Night"
 msgstr "ÐÐÐÐÐÐ: ÐÐÐÐÑÐÐÑ ÐÐÑÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
 msgid "Weather: Cloudy"
 msgstr "ÐÐÐÐÐÐ: ÐÐÐÐÑÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:289
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
 msgid "Weather: Overcast"
 msgstr "ÐÐÐÐÐÐ: ÐÐÑÐÑÑÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:290
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
 msgid "Weather: Showers"
 msgstr "ÐÐÐÐÐÐ: ÐÐÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:291
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
 msgid "Weather: Snow"
 msgstr "ÐÐÐÐÐÐ: ÐÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:292
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
 msgid "Weather: Clear Night"
 msgstr "ÐÐÐÐÐÐ: ÐÑÐÐÑ ÐÐÑÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:293
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
 msgid "Weather: Sunny"
 msgstr "ÐÐÐÐÐÐ: ÐÐÐÐÐÑÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:294
+#: ../calendar/backends/weather/e-cal-backend-weather.c:293
 msgid "Weather: Thunderstorms"
 msgstr "ÐÐÐÐÐÐ: ÐÑÐÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:440
+#: ../calendar/backends/weather/e-cal-backend-weather.c:439
 msgid "Forecast"
 msgstr "ÐÑÐÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal-component.c:1299
+#: ../calendar/libecal/e-cal.c:860 ../libedataserverui/e-book-auth-util.c:204
+#: ../libedataserverui/e-book-auth-util.c:427
+#: ../libedataserverui/e-client-utils.c:758
+#, 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:874
+#, c-format
+msgid "Enter password for %s to enable proxy for user %s"
+msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÐÑ Ð %s ÐÐÑ ÐÐÐÑÑÐÐÐÑ ÐÑÐÐÑÐ ÐÐÑ ÐÐÐÑÐÐÐÐÑÐÐÑ %s"
+
+#: ../calendar/libecal/e-cal.c:4432
+msgid "Repository is offline"
+msgstr "ÐÐÐÐÐÐÑÐÑÐÐ ÐÐÑÐÐÐÑÑÑ Ð ÐÐÑÐÐÐÐÐÐÐ ÑÐÐÐÐÐ"
+
+#: ../calendar/libecal/e-cal.c:4434
+msgid "No such calendar"
+msgstr "ÐÐÑ ÑÐÐÐÐÐ ÐÐÐÐÐÐÐÑÑ"
+
+#: ../calendar/libecal/e-cal.c:4436 ../calendar/libedata-cal/e-data-cal.c:418
+msgid "Object not found"
+msgstr "ÐÐÑÐÐÑ ÐÐ ÐÐÐÐÐÐ"
+
+#: ../calendar/libecal/e-cal.c:4438 ../calendar/libedata-cal/e-data-cal.c:419
+msgid "Invalid object"
+msgstr "ÐÐÐÐÑÐÑÐ ÐÐÑÐÐÑ"
+
+#: ../calendar/libecal/e-cal.c:4440
+msgid "URI not loaded"
+msgstr "URI ÐÐ ÐÐÐÑÑÐÐÐ"
+
+#: ../calendar/libecal/e-cal.c:4442
+msgid "URI already loaded"
+msgstr "URI ÑÐÐ ÐÐÐÑÑÐÐÐ"
+
+#: ../calendar/libecal/e-cal.c:4446
+msgid "Unknown User"
+msgstr "ÐÐÐÐÐÐÑÑÐÑÐ ÐÐÐÑÐÐÐÐÑÐÐÑ"
+
+#: ../calendar/libecal/e-cal.c:4448 ../calendar/libedata-cal/e-data-cal.c:420
+msgid "Object ID already exists"
+msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÐÑÐÐÑÐ ÑÐÐ ÑÑÑÐÑÑÐÑÐÑ"
+
+#: ../calendar/libecal/e-cal.c:4450
+msgid "Protocol not supported"
+msgstr "ÐÑÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ"
+
+#: ../calendar/libecal/e-cal.c:4452
+msgid "Operation has been canceled"
+msgstr "ÐÐÐÑÐÑÐÑ ÐÑÐÐÐÐÐÐ"
+
+#: ../calendar/libecal/e-cal.c:4454
+msgid "Could not cancel operation"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÐÐÐÑÑ ÐÐÐÑÐÑÐÑ"
+
+#: ../calendar/libecal/e-cal.c:4456
+msgid "Authentication failed"
+msgstr "ÐÐÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÐÐÑÑÐ"
+
+#: ../calendar/libecal/e-cal.c:4458
+#: ../camel/providers/smtp/camel-smtp-transport.c:864
+msgid "Authentication required"
+msgstr "ÐÑÐÐÑÐÑÑÑ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑ"
+
+#: ../calendar/libecal/e-cal.c:4460
+msgid "A D-Bus exception has occurred"
+msgstr "ÐÑÐÐÐÐÑÐÐ ÐÑÐÐÑÑÐÐÐÐ D-Bus"
+
+#: ../calendar/libecal/e-cal.c:4464
+msgid "No error"
+msgstr "ÐÐÑ ÐÑÐÐÐÐ"
+
+#: ../calendar/libecal/e-cal-client.c:127
+msgctxt "CalClientError"
+msgid "No such calendar"
+msgstr "ÐÐÑ ÑÐÐÐÐÐ ÐÐÐÐÐÐÐÑÑ"
+
+#: ../calendar/libecal/e-cal-client.c:129
+msgctxt "CalClientError"
+msgid "Object not found"
+msgstr "ÐÐÑÐÐÑ ÐÐ ÐÐÐÐÐÐ"
+
+#: ../calendar/libecal/e-cal-client.c:131
+msgctxt "CalClientError"
+msgid "Invalid object"
+msgstr "ÐÐÐÐÑÐÑÐ ÐÐÑÐÐÑ"
+
+#: ../calendar/libecal/e-cal-client.c:133
+msgctxt "CalClientError"
+msgid "Unknown user"
+msgstr "ÐÐÐÐÐÐÑÑÐÑÐ ÐÐÐÑÐÐÐÐÑÐÐÑ"
+
+#: ../calendar/libecal/e-cal-client.c:135
+msgctxt "CalClientError"
+msgid "Object ID already exists"
+msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÐÑÐÐÑÐ ÑÐÐ ÑÑÑÐÑÑÐÑÐÑ"
+
+#: ../calendar/libecal/e-cal-client.c:137
+msgctxt "CalClientError"
+msgid "Invalid range"
+msgstr "ÐÐÐÐÐÑÑÑÐÐÑÐ ÐÐÐÐÐÐÐÐ"
+
+#: ../calendar/libecal/e-cal-client.c:140
+msgctxt "CalClientError"
+msgid "Unknown error"
+msgstr "ÐÐÐÐÐÐÑÑÐÐÑ ÐÑÐÐÐÐ"
+
+#: ../calendar/libecal/e-cal-client.c:213
+msgid "D-Bus calendar proxy gone"
+msgstr "ÐÑÑÐÐ ÐÑÐÐÑÐ D-Bus ÐÐÑ ÐÐÐÐÐÐÐÑÑ"
+
+#: ../calendar/libecal/e-cal-client.c:534
+msgid "Failed to run calendar factory"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÑÐÑÑ ÑÐÐÑÐÐÑ ÐÐÐÐÐÐÐÑÐÐ"
+
+#: ../calendar/libecal/e-cal-client.c:695
+msgid "Failed to find system calendar"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÐ ÑÐÑÑÐÐÐÑÐ ÐÐÐÐÐÐÐÑÑ"
+
+#: ../calendar/libecal/e-cal-client.c:733
+#: ../calendar/libedata-cal/e-data-cal.c:427
+msgid "Calendar does not exist"
+msgstr "ÐÐÐÐÐÐÐÑÑ ÐÐ ÑÑÑÐÑÑÐÑÐÑ"
+
+#: ../calendar/libecal/e-cal-client.c:843
+msgid "Invalid source type"
+msgstr "ÐÐÐÐÑÐÑÐ ÑÐÐ ÐÑÑÐÑÐÐÐÐ"
+
+#: ../calendar/libecal/e-cal-component.c:1298
 msgid "Untitled appointment"
 msgstr "ÐÐÐÐÐÐÐÐÐÐÐÐÐÐÑ ÐÑÑÑÐÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3979
+#: ../calendar/libecal/e-cal-recur.c:3985
 msgid "1st"
 msgstr "1-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3980
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "2nd"
 msgstr "2-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "3rd"
 msgstr "3-Ð"
 
-#: ../calendar/libecal/e-cal-recur.c:3982
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "4th"
 msgstr "4-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3983
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "5th"
 msgstr "5-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3984
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "6th"
 msgstr "6-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3985
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "7th"
 msgstr "7-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3986
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "8th"
 msgstr "8-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "9th"
 msgstr "9-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "10th"
 msgstr "10-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "11th"
 msgstr "11-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "12th"
 msgstr "12-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "13th"
 msgstr "13-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "14th"
 msgstr "14-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "15th"
 msgstr "15-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "16th"
 msgstr "16-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "17th"
 msgstr "17-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "18th"
 msgstr "18-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "19th"
 msgstr "19-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "20th"
 msgstr "20-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "21st"
 msgstr "21-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "22nd"
 msgstr "22-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "23rd"
 msgstr "23-Ð"
 
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "24th"
 msgstr "24-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "25th"
 msgstr "25-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "26th"
 msgstr "26-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "27th"
 msgstr "27-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "28th"
 msgstr "28-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "29th"
 msgstr "29-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "30th"
 msgstr "30-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "31st"
 msgstr "31-ÐÐ"
 
-#: ../calendar/libecal/e-cal-util.c:678
-#: ../calendar/libecal/e-cal-util.c:705
+#: ../calendar/libecal/e-cal-util.c:677 ../calendar/libecal/e-cal-util.c:704
+msgctxt "Priority"
 msgid "High"
 msgstr "ÐÑÑÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal-util.c:680
-#: ../calendar/libecal/e-cal-util.c:707
+#: ../calendar/libecal/e-cal-util.c:679 ../calendar/libecal/e-cal-util.c:706
+msgctxt "Priority"
 msgid "Normal"
 msgstr "ÐÐÑÐÐÐÑÐÑÐ"
 
-#: ../calendar/libecal/e-cal-util.c:682
-#: ../calendar/libecal/e-cal-util.c:709
+#: ../calendar/libecal/e-cal-util.c:681 ../calendar/libecal/e-cal-util.c:708
+msgctxt "Priority"
 msgid "Low"
 msgstr "ÐÐÐÐÐÐ"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:703
+#: ../calendar/libecal/e-cal-util.c:702
+msgctxt "Priority"
 msgid "Undefined"
 msgstr "ÐÐÐÐÑÐÐÐÐÑÐÐÑÐ"
 
-#: ../calendar/libecal/e-cal.c:1236
-#: ../libedataserverui/e-book-auth-util.c:206
-#: ../libedataserverui/e-book-auth-util.c:440
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÐÑ ÐÐÑ %s (ÐÐÐÑÐÐÐÐÑÐÐÑ %s)"
+#: ../calendar/libedata-cal/e-cal-backend.c:34
+msgid "Cannot process, calendar backend is opening"
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÑÐÐÐÑÐÑÑ, ÐÑÐÑÑÑ ÐÑÐÐÐÐÑ ÐÐÐÐÐÐÐÑÑ"
 
-#.
-#. 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:1250
+#: ../calendar/libedata-cal/e-cal-backend.c:206
 #, c-format
-msgid "Enter password for %s to enable proxy for user %s"
-msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÐÑ Ð %s ÐÐÑ ÐÐÐÑÑÐÐÐÑ ÐÑÐÐÑÐ ÐÐÑ ÐÐÐÑÐÐÐÐÑÐÐÑ %s"
+msgid "Unknown calendar property '%s'"
+msgstr "ÐÐÐÐÐÐÑÑÐÐÐ ÑÐÐÐÑÑÐÐ ÐÐÐÐÐÐÐÑÑ Â%sÂ"
 
-#: ../calendar/libecal/e-cal.c:4145
-msgid "Backend is busy"
-msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐÐÑÑ"
-
-#: ../calendar/libecal/e-cal.c:4147
-msgid "Repository is offline"
-msgstr "ÐÐÐÐÐÐÑÐÑÐÐ ÐÐÑÐÐÐÑÑÑ Ð ÐÐÑÐÐÐÐÐÐÐ ÑÐÐÐÐÐ"
-
-#: ../calendar/libecal/e-cal.c:4149
-msgid "No such calendar"
-msgstr "ÐÐÑ ÑÐÐÐÐÐ ÐÐÐÐÐÐÐÑÑ"
-
-#: ../calendar/libecal/e-cal.c:4151
-#: ../calendar/libedata-cal/e-data-cal.c:114
-#: ../servers/groupwise/e-gw-connection.c:235
-msgid "Object not found"
-msgstr "ÐÐÑÐÐÑ ÐÐ ÐÐÐÐÐÐ"
-
-#: ../calendar/libecal/e-cal.c:4153
-#: ../calendar/libedata-cal/e-data-cal.c:115
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid object"
-msgstr "ÐÐÐÐÑÐÑÐ ÐÐÑÐÐÑ"
-
-#: ../calendar/libecal/e-cal.c:4155
-msgid "URI not loaded"
-msgstr "URI ÐÐ ÐÐÐÑÑÐÐÐ"
-
-#: ../calendar/libecal/e-cal.c:4157
-msgid "URI already loaded"
-msgstr "URI ÑÐÐ ÐÐÐÑÑÐÐÐ"
-
-#: ../calendar/libecal/e-cal.c:4161
-#: ../servers/groupwise/e-gw-connection.c:237
-msgid "Unknown User"
-msgstr "ÐÐÐÐÐÐÑÑÐÑÐ ÐÐÐÑÐÐÐÐÑÐÐÑ"
-
-#: ../calendar/libecal/e-cal.c:4163
-#: ../calendar/libedata-cal/e-data-cal.c:116
-msgid "Object ID already exists"
-msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÐÑÐÐÑÐ ÑÐÐ ÑÑÑÐÑÑÐÑÐÑ"
-
-#: ../calendar/libecal/e-cal.c:4165
-msgid "Protocol not supported"
-msgstr "ÐÑÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ"
-
-#: ../calendar/libecal/e-cal.c:4167
-msgid "Operation has been canceled"
-msgstr "ÐÐÐÑÐÑÐÑ ÐÑÐÐÐÐÐÐ"
-
-#: ../calendar/libecal/e-cal.c:4169
-msgid "Could not cancel operation"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÐÐÐÑÑ ÐÐÐÑÐÑÐÑ"
-
-#: ../calendar/libecal/e-cal.c:4171
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1310
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1328
-#: ../camel/providers/groupwise/camel-groupwise-store.c:632
-#: ../camel/providers/groupwise/camel-groupwise-store.c:814
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:87
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#: ../calendar/libedata-cal/e-cal-backend.c:218
 #, c-format
-msgid "Authentication failed"
-msgstr "ÐÐÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÐÐÑÑÐ"
-
-#: ../calendar/libecal/e-cal.c:4173
-#: ../camel/providers/smtp/camel-smtp-transport.c:775
-msgid "Authentication required"
-msgstr "ÐÑÐÐÑÐÑÑÑ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑ"
-
-#: ../calendar/libecal/e-cal.c:4175
-#| msgid "A CORBA exception has occurred"
-msgid "A D-Bus exception has occurred"
-msgstr "ÐÑÐÐÐÐÑÐÐ ÐÑÐÐÑÑÐÐÐÐ D-Bus"
-
-#: ../calendar/libecal/e-cal.c:4179
-msgid "No error"
-msgstr "ÐÐÑ ÐÑÐÐÐÐ"
+msgid "Cannot change value of calendar property '%s'"
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÑÑ ÐÐÐÑÐÐÐÐ ÑÐÐÐÑÑÐÐ ÐÐÐÐÐÐÐÑÑ Â%sÂ"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:695
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:804
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1025
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1052
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:693
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:802
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1021
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1048
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "Â%s ÐÐ ÐÑÐÐÐÐÐÐÐÐÐÑ ÐÑÐÑÐÐÐÑÐÐ"
@@ -1391,7 +1422,7 @@ msgstr "Â%s ÐÐ ÐÑÐÐÐÐÐÐÐÐÐÑ ÐÑÐÑÐÐÐÑÐÐ"
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:212
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:290
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1090
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1086
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "Â%s ÐÑÐÐÐÐÐÐÐÐÐÑ ÐÐÐÐ ÐÑÐÑÐÐÐÑ"
@@ -1399,7 +1430,7 @@ msgstr "Â%s ÐÑÐÐÐÐÐÐÐÐÐÑ ÐÐÐÐ ÐÑÐÑÐÐÐÑ"
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:296
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:737
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:735
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "Â%s ÐÑÐÐÐÐÐÐÐÐÐÑ ÑÑÑÐÐÑ Ð ÐÐÑÐÑÑÐÐ ÐÑÐÑÐÐÐÑÐ 1"
@@ -1407,13 +1438,15 @@ msgstr "Â%s ÐÑÐÐÐÐÐÐÐÐÐÑ ÑÑÑÐÐÑ Ð ÐÐÑÐÑÑÐÐ ÐÑÐ
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
-msgstr "Â%s ÐÑÐÐÑÑÐÐÑÑÐÐÐÐÑ, ÑÑÐ ÐÑÐÑÐÐÐÑ 1 ÐÐÐÐÐÐ ÐÑÑÑ ÑÑÑÐÐÐÐ ÐÐÑÑ Ð ÑÐÑÐÐÑÐ ISO 8601"
+msgstr ""
+"Â%s ÐÑÐÐÑÑÐÐÑÑÐÐÐÐÑ, ÑÑÐ ÐÑÐÑÐÐÐÑ 1 ÐÐÐÐÐÐ ÐÑÑÑ ÑÑÑÐÐÐÐ ÐÐÑÑ Ð ÑÐÑÐÐÑÐ ISO "
+"8601"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:162
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:363
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:415
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:731
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:864
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "Â%s ÐÑÐÐÐÐÐÐÐÐÐÑ ÐÐÐ ÐÑÐÑÐÐÐÑÐ"
@@ -1422,9 +1455,9 @@ msgstr "Â%s ÐÑÐÐÐÐÐÐÐÐÐÑ ÐÐÐ ÐÑÐÑÐÐÐÑÐ"
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:218
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:260
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:369
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:421
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:870
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1096
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:419
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1092
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "Â%s ÐÑÐÐÐÐÐÐÐÐÐÑ ÑÐÐ time_t Ð ÐÐÑÐÑÑÐÐ ÐÑÐÑÐÐÐÑÐ 1"
@@ -1435,289 +1468,210 @@ msgid "\"%s\" expects the second argument to be an integer"
 msgstr "Â%s ÐÑÐÐÐÐÐÐÐÐÐÑ ÑÐÐÐÐ ÑÐÑÐÐ Ð ÐÐÑÐÑÑÐÐ ÐÑÐÑÐÐÐÑÐ 2"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:377
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:430
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "Â%s ÐÑÐÐÐÐÐÐÐÐÐÑ ÑÐÐ time_t Ð ÐÐÑÐÑÑÐÐ ÐÑÐÑÐÐÐÑÐ 1"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:745
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:743
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "Â%s ÐÑÐÐÐÐÐÐÐÐÐÑ ÑÑÑÐÐÑ Ð ÐÐÑÐÑÑÐÐ ÐÑÐÑÐÐÐÑÐ 2"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:773
 #, c-format
-msgid "\"%s\" expects the first argument to be either \"any\", \"summary\", or \"description\", or \"location\", or \"attendee\", or \"organizer\", or \"classification\""
-msgstr "Â%s ÐÑÐÐÐÐÐÐÐÐÐÑ ÐÐÐÐ ÐÐ ÂanyÂ, ÂsummaryÂ, ÂdescriptionÂ, ÂlocationÂ, ÂattendeeÂ, Âorganizer ÐÐÐ Âclassification РÐÐÑÐÑÑÐÐ ÐÑÐÑÐÐÐÑÐ 1"
+msgid ""
+"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
+"\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
+"\"classification\""
+msgstr ""
+"Â%s ÐÑÐÐÐÐÐÐÐÐÐÑ ÐÐÐÐ ÐÐ ÂanyÂ, ÂsummaryÂ, ÂdescriptionÂ, ÂlocationÂ, ÂattendeeÂ, "
+"Âorganizer ÐÐÐ Âclassification РÐÐÑÐÑÑÐÐ ÐÑÐÑÐÐÐÑÐ 1"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:923
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "Â%s ÐÑÐÐÐÐÐÐÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐ 1 ÐÑÐÑÐÐÐÑ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:941
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:937
 #, c-format
-msgid "\"%s\" expects all arguments to be strings or one and only one argument to be a boolean false (#f)"
-msgstr "Â%s ÐÑÐÐÐÐÐÐÐÐÐÑ, ÑÑÐ ÐÑÐ ÐÑÐÑÐÐÐÑÑ - ÑÑÑÐÐÐ ÐÐÐ ÐÐÐÐÑÑÐÐÐÐÑÐ ÐÑÐÑÐÐÐÑ - ÐÐÐÐÑÐÑÐÐÑ ÐÐÐÑ (#f)"
+msgid ""
+"\"%s\" expects all arguments to be strings or one and only one argument to "
+"be a boolean false (#f)"
+msgstr ""
+"Â%s ÐÑÐÐÐÐÐÐÐÐÐÑ, ÑÑÐ ÐÑÐ ÐÑÐÑÐÐÐÑÑ - ÑÑÑÐÐÐ ÐÐÐ ÐÐÐÐÑÑÐÐÐÐÑÐ ÐÑÐÑÐÐÐÑ - "
+"ÐÐÐÐÑÐÑÐÐÑ ÐÐÐÑ (#f)"
 
-#: ../calendar/libedata-cal/e-data-cal.c:113
+#: ../calendar/libedata-cal/e-data-cal.c:417
 msgid "Invalid range"
 msgstr "ÐÐÐÐÐÑÑÑÐÐÑÐ ÐÐÐÐÐÐÐÐ"
 
-#: ../calendar/libedata-cal/e-data-cal.c:120
+#: ../calendar/libedata-cal/e-data-cal.c:424
 msgid "Unsupported method"
 msgstr "ÐÐÐÐÐÐÐÑÐÐÐÐÐÐÑÐ ÐÐÑÐÐ"
 
-#: ../calendar/libedata-cal/e-data-cal.c:123
-#| msgid "Folder '%s' does not exist."
-msgid "Calendar does not exist"
-msgstr "ÐÐÐÐÐÐÐÑÑ ÐÐ ÑÑÑÐÑÑÐÑÐÑ"
-
-#: ../calendar/libedata-cal/e-data-cal.c:124
-#| msgid "Unknown User"
+#: ../calendar/libedata-cal/e-data-cal.c:428
 msgid "Unknown user"
 msgstr "ÐÐÐÐÐÐÑÑÐÑÐ ÐÐÐÑÐÐÐÐÑÐÐÑ"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:610
-#, c-format
-#| msgid "Cannot retrieve calendar address"
-msgid "Cannot retrieve calendar address: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÐÑÐÑ ÐÐÐÐÐÐÐÑÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:635
-#, c-format
-#| msgid "Cannot retrieve calendar alarm e-mail address"
-msgid "Cannot retrieve calendar alarm e-mail address: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÐÑÐÑ ÑÐ. ÐÐÑÑÑ ÐÐÑ ÐÑÐÑÐÐÐÐ ÑÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:660
-#, c-format
-#| msgid "Cannot retrieve calendar's ldap attribute"
-msgid "Cannot retrieve calendar's LDAP attribute: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÑÑÐÐÑÑ LDAP: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:685
-#, c-format
-#| msgid "Cannot retrieve calendar scheduling information"
-msgid "Cannot retrieve calendar scheduling information: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÑÐÑÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÑÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:709
-#, c-format
-#| msgid "Cannot open calendar"
-msgid "Cannot open calendar: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÑÑÑ ÐÐÐÐÐÐÐÑÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:730
-#, c-format
-#| msgid "Cannot refresh calendar"
-msgid "Cannot refresh calendar: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑ ÐÐÐÐÑÐ ÐÐÐÐÐÐÐÑÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:749
-#, c-format
-#| msgid "Cannot remove calendar"
-msgid "Cannot remove calendar: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÐÑÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:770
-#, c-format
-#| msgid "Cannot create calendar object"
-msgid "Cannot create calendar object: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÑÐÐÑ ÐÐÐÐÐÐÐÑÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:798
-#, c-format
-#| msgid "Cannot modify calendar object"
-msgid "Cannot modify calendar object: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑ ÐÐÑÐÐÑ ÐÐÐÐÐÐÐÑÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:824
-#, c-format
-#| msgid "Cannot remove calendar object"
-msgid "Cannot remove calendar object: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÑÐÐÑ ÐÐÐÐÐÐÐÑÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:845
-#, c-format
-#| msgid "Cannot receive calendar objects"
-msgid "Cannot receive calendar objects: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÐÑÐÐÑÑ ÐÐÐÐÐÐÐÑÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:864
-#, c-format
-#| msgid "Cannot discard calendar alarm"
-msgid "Cannot discard calendar alarm: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÑÑÑ ÑÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:885
-#, c-format
-#| msgid "Cannot send calendar objects"
-msgid "Cannot send calendar objects: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÐÐÐÑÑ ÐÐÑÐÐÑÑ ÐÐÐÐÐÐÐÑÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:912
-#, c-format
-#| msgid "Cannot retrieve default calendar object path"
-msgid "Cannot retrieve default calendar object path: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÑÑÑ Ð ÐÐÑÐÐÑÑ ÐÐÐÐÐÐÐÑÑ ÐÐ ÑÐÐÐÑÐÐÐÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:937
-#, c-format
-#| msgid "Cannot retrieve calendar object path"
-msgid "Cannot retrieve calendar object path: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÑÑÑ Ð ÐÐÑÐÐÑÑ ÐÐÐÐÐÐÐÑÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:962
-#, c-format
-#| msgid "Cannot retrieve calendar object list"
-msgid "Cannot retrieve calendar object list: %s"
-msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÑÑ ÑÐÐÑÐÐ ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:990
-#, c-format
-#| msgid "Could not retrieve attachment list"
-msgid "Could not retrieve attachment list: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÑÐÐÑÐÐ ÐÐÐÐÐÐÐÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1016
-#, c-format
-#| msgid "Could not complete calendar query"
-msgid "Could not complete calendar query: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÑÑÐÑÑ ÐÐÐÑÐÑ ÐÐÐÐÐÐÐÑÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1041
-#, c-format
-#| msgid "Could not retrieve calendar time zone"
-msgid "Could not retrieve calendar time zone: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÑÐÑÐÐÐÐ ÐÐÑÑ ÐÐÐÐÐÐÐÑÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1066
-#, c-format
-#| msgid "Could not add calendar time zone"
-msgid "Could not add calendar time zone: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑ ÑÐÑÐÐÐÐ ÐÐÑÑ ÐÐÐÐÐÐÐÑÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1085
-#, c-format
-#| msgid "Could not set default calendar time zone"
-msgid "Could not set default calendar time zone: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÑÑ ÑÐÑÐÐÐÐ ÐÐÑÑ ÐÐÐÐÐÐÐÑÑ ÐÐ ÑÐÐÐÑÐÐÐÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1108
-#, c-format
-#| msgid "Cannot retrieve calendar changes"
-msgid "Cannot retrieve calendar changes: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÐÐÐÐÐÐÐÑ ÐÐÐÐÐÐÐÑÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1139
-#, c-format
-#| msgid "Cannot retrieve calendar free/busy list"
-msgid "Cannot retrieve calendar free/busy list: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÑÐÐÑÐÐ ÐÐÐÑÑÐÑÑÐ ÐÐÐÐ: %s"
-
-#: ../calendar/libedata-cal/e-data-cal-factory.c:374
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:907
+msgid "Cannot open calendar: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÑÐÑÑÑÑ ÐÐÐÐÐÐÐÑÑ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:928
+msgid "Cannot remove calendar: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÐÑÑ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:953
+msgid "Cannot refresh calendar: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÑÑ ÐÐÐÐÐÐÐÑÑ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:977
+msgid "Cannot retrieve backend property: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÑÑ ÑÐÐÐÑÑÐÐ ÐÑÐÐÐÐÑÐ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1023
+msgid "Cannot retrieve calendar object path: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÑÑ ÐÑÑÑ ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑÑ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1048
+msgid "Cannot retrieve calendar object list: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÑÑ ÑÐÐÑÐÐ ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑÑ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1073
+msgid "Cannot retrieve calendar free/busy list: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÑÑ ÑÐÐÑÐÐ ÑÐÐÐÐÐÐÑÑ/ÐÐÐÑÑÑÑ ÐÐÐÐ ÐÐÐÐÐÐÐÑÑ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1099
+msgid "Cannot create calendar object: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÑ ÐÐÐÐÐÐÐÑÑ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1126
+msgid "Cannot modify calendar object: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÑÑ ÐÐÑÐÐÑ ÐÐÐÐÐÐÐÑÑ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1154
+msgid "Cannot remove calendar object: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÑ ÐÐÐÐÐÐÐÑÑ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1177
+msgid "Cannot receive calendar objects: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÑÑ ÐÐÑÐÐÑÑ ÐÐÐÐÐÐÐÑÑ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1202
+msgid "Cannot send calendar objects: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÑÐÑÐÐÐÑÑ ÐÐÑÐÐÑÑ ÐÐÐÐÐÐÐÑÑ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1229
+msgid "Could not retrieve attachment uris: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÑÑ uri ÐÐÐÐÐÐÐÐ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1253
+msgid "Could not discard alarm: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÑÐÑÑÑ ÑÐÐÐÐÐÐÐÐÐÐ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1277
+msgid "Could not get calendar view path: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÑÑ ÐÑÑÑ ÐÑÐÑÐÐÑÑÐ ÐÐÐÐÐÐÐÑÑ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1302
+msgid "Could not retrieve calendar time zone: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÑÑ ÑÐÑÐÐÐÐ ÐÐÑÑ ÐÐÐÐÐÐÐÑÑ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1324
+msgid "Could not add calendar time zone: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÑÑ ÑÐÑÐÐÐÐ ÐÐÑÑ ÐÐÐÐÐÐÐÑÑ: "
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:379
+#, c-format
+msgid "Invalid call"
+msgstr "ÐÐÐÐÑÑÐÐÑÐÑÐ ÐÑÐÐÐ"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:420
 #, c-format
 msgid "Invalid URI"
 msgstr "ÐÐÐÐÑÐÑÐ URI"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:392
+#: ../calendar/libedata-cal/e-data-cal-factory.c:438
 #, c-format
 msgid "No backend factory for '%s' of '%s'"
 msgstr "ÐÐ ÑÐÐÐÐÐ ÐÑÐÐÐÐÑ ÑÐÐÑÐÐÐ ÐÐÑ Â%sÂ Ñ Â%sÂ"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:442
+#: ../calendar/libedata-cal/e-data-cal-factory.c:481
 #, c-format
 msgid "Could not instantiate backend"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÑÐÐÑ ÐÑÐÐÐÐÑÐ"
 
-#: ../camel/camel-cipher-context.c:204
+#: ../camel/camel-cipher-context.c:200
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "ÐÐÐÐÐÑÑ ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ ÑÑÐÐ ÑÐÑÑÐÐ"
 
-#: ../camel/camel-cipher-context.c:217
+#: ../camel/camel-cipher-context.c:213
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ ÑÑÐÐ ÑÐÑÑÐÐ"
 
-#: ../camel/camel-cipher-context.c:233
+#: ../camel/camel-cipher-context.c:229
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "ÐÐÑÑÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ ÑÑÐÐ ÑÐÑÑÐÐ"
 
-#: ../camel/camel-cipher-context.c:247
+#: ../camel/camel-cipher-context.c:243
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "ÐÐÑÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ ÑÑÐÐ ÑÐÑÑÐÐ"
 
-#: ../camel/camel-cipher-context.c:260
+#: ../camel/camel-cipher-context.c:256
 #, c-format
 msgid "You may not import keys with this cipher"
 msgstr "ÐÐÐÐÑÑ ÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ ÑÑÐÐ ÑÐÑÑÐÐ"
 
-#: ../camel/camel-cipher-context.c:274
+#: ../camel/camel-cipher-context.c:270
 #, c-format
 msgid "You may not export keys with this cipher"
 msgstr "ÐÐÑÐÐÑÑ ÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ ÑÑÐÐ ÑÐÑÑÐÐ"
 
-#: ../camel/camel-cipher-context.c:815
+#: ../camel/camel-cipher-context.c:812
 msgid "Signing message"
 msgstr "ÐÐÐÐÑÐÐÐÐ ÐÐÐÐÐÑÑÐÐÐÑÑÑ"
 
-#: ../camel/camel-cipher-context.c:1056
+#: ../camel/camel-cipher-context.c:1053
 msgid "Encrypting message"
 msgstr "ÐÐÐÐÑÐÐÐÐ ÑÐÑÑÑÐÑÑÑ"
 
-#: ../camel/camel-cipher-context.c:1183
+#: ../camel/camel-cipher-context.c:1180
 msgid "Decrypting message"
 msgstr "ÐÐÐÐÑÐÐÐÐ ÑÐÑÑÐÑÑÐÐÑÐÐÐÑÑÑ"
 
-#: ../camel/camel-data-cache.c:181
+#: ../camel/camel-data-cache.c:178
 #, c-format
 msgid "Unable to create cache path"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÑÑÑ ÐÐÑ ÐÑÑÐ"
 
-#: ../camel/camel-data-cache.c:499
+#: ../camel/camel-data-cache.c:495
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÑÑÐÑÐÐÐÐÐÑÐ ÑÐÐÐÐÐÑ: %s: %s"
 
-#: ../camel/camel-data-wrapper.c:147
-#, c-format
-#| msgid "No such message available."
-msgid "No stream available"
-msgstr "ÐÐÑÐÐ ÐÐÐÐÑÑÑÐÐÐ"
-
-#: ../camel/camel-db.c:455
-#, c-format
-msgid "Insufficient memory"
-msgstr "ÐÐÐÐÑÑÐÑÐÑÐÐ ÐÐÐÑÑÐ"
-
 #: ../camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
@@ -1745,27 +1699,24 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "ÐÐÐÑÑÐÐÐÐÐÑÐÑ Ñ ÑÐÑÐÐÑÐÐ"
 
-#: ../camel/camel-disco-folder.c:67
-#: ../camel/camel-offline-folder.c:83
+#: ../camel/camel-disco-folder.c:71 ../camel/camel-offline-folder.c:89
 msgid "Downloading new messages for offline mode"
 msgstr "ÐÐÐÑÐ ÑÐÐÐÑÐÐÐÑ ÐÐÐÑÑÐÐÑÑÑÑ ÐÐÑ ÐÐÑÐÐÐÐÐÐÐ ÑÐÐÐÑÑ"
 
-#: ../camel/camel-disco-folder.c:402
+#: ../camel/camel-disco-folder.c:406
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "ÐÐÐÐÐÑÐÐÐÐ ÐÐÐÐÐ Â%s ÐÐÑ ÐÐÑÐÐÐÐÐÐÐ ÑÐÐÐÑÑ"
 
-#: ../camel/camel-disco-folder.c:468
-#: ../camel/camel-offline-folder.c:316
+#: ../camel/camel-disco-folder.c:472 ../camel/camel-offline-folder.c:321
 msgid "Copy folder content locally for offline operation"
 msgstr "ÐÐÐÐÐÑÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐÐ ÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐÑÑ ÐÐÑÐÐÑ ÐÐÑ ÐÐÑÐÐÐÐÐÐÐ ÑÐÐÐÑÑ"
 
-#: ../camel/camel-disco-store.c:420
-#: ../camel/providers/groupwise/camel-groupwise-store.c:232
-#: ../camel/providers/imap/camel-imap-store.c:1250
-#: ../camel/providers/imap/camel-imap-store.c:1771
-#: ../camel/providers/imap/camel-imap-store.c:2244
-#: ../camel/providers/imap/camel-imap-store.c:3094
+#: ../camel/camel-disco-store.c:436
+#: ../camel/providers/imap/camel-imap-store.c:1179
+#: ../camel/providers/imap/camel-imap-store.c:1901
+#: ../camel/providers/imap/camel-imap-store.c:2384
+#: ../camel/providers/imap/camel-imap-store.c:3205
 #: ../camel/providers/imapx/camel-imapx-folder.c:298
 #: ../camel/providers/imapx/camel-imapx-folder.c:331
 #: ../camel/providers/imapx/camel-imapx-folder.c:385
@@ -1773,108 +1724,147 @@ msgstr "ÐÐÐÐÐÑÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐÐ ÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑ
 #: ../camel/providers/imapx/camel-imapx-folder.c:465
 #: ../camel/providers/imapx/camel-imapx-folder.c:505
 #: ../camel/providers/imapx/camel-imapx-folder.c:541
-#: ../camel/providers/imapx/camel-imapx-store.c:277
-#: ../camel/providers/imapx/camel-imapx-store.c:1299
-#: ../camel/providers/imapx/camel-imapx-store.c:1387
-#: ../camel/providers/imapx/camel-imapx-store.c:1422
+#: ../camel/providers/imapx/camel-imapx-store.c:348
+#: ../camel/providers/imapx/camel-imapx-store.c:1364
+#: ../camel/providers/imapx/camel-imapx-store.c:1452
+#: ../camel/providers/imapx/camel-imapx-store.c:1492
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "ÐÐÑ ÐÐÐÐÑÑÐÐÐÑ ÐÐÐÐÐÐ ÐÐÐÑÐÑÐÐ ÐÐÐÐÑÐÐÐÐÐ ÐÐÐÐÐÑÑÐÐÐÐ Ð ÑÐÑÐ"
 
-#: ../camel/camel-file-utils.c:719
+#: ../camel/camel-file-utils.c:722
 #, c-format
 msgid "Canceled"
 msgstr "ÐÑÐÐÐÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:839
-#: ../camel/camel-filter-search.c:582
+#: ../camel/camel-filter-driver.c:818 ../camel/camel-filter-search.c:628
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "ÐÐÐÐ ÐÑÐ ÑÐÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐÐ ÐÑÐÑÐÑÑÐ Â%sÂ: %s"
 
-#: ../camel/camel-filter-driver.c:886
+#: ../camel/camel-filter-driver.c:866
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÐÑÐÐ ÑÐÐÐÑÐÐÐÐ ÐÐÐÑÑÐÐ ÐÐ %s: %s"
 
-#: ../camel/camel-filter-driver.c:1073
-#: ../camel/camel-filter-driver.c:1082
+#: ../camel/camel-filter-driver.c:1053 ../camel/camel-filter-driver.c:1062
 msgid "Syncing folders"
 msgstr "ÐÐÐÑÑÐÐÐÐÐÑÐÑ ÐÐÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1170
-#: ../camel/camel-filter-driver.c:1620
+#: ../camel/camel-filter-driver.c:1150 ../camel/camel-filter-driver.c:1594
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÐÑÑ ÑÐÐÑÑÑ: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1181
-#: ../camel/camel-filter-driver.c:1631
+#: ../camel/camel-filter-driver.c:1161 ../camel/camel-filter-driver.c:1605
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "ÐÑÐÐÐÐ ÐÑÐÐÐÐÐÐÐÑ ÑÐÐÑÑÑÐ: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1278
+#: ../camel/camel-filter-driver.c:1258
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÑÑÑ ÐÐÐÐÑ ÑÐÑÐÐ"
 
-#: ../camel/camel-filter-driver.c:1289
+#: ../camel/camel-filter-driver.c:1269
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÑÐÑÑ ÐÐÐÐÑ ÑÐÑÐÐ"
 
-#: ../camel/camel-filter-driver.c:1307
+#: ../camel/camel-filter-driver.c:1287
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "ÐÐÐÑÑÐÐÐÐ ÑÐÐÐÑÐÐÐÑ %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1314
-#: ../camel/camel-filter-driver.c:1336
+#: ../camel/camel-filter-driver.c:1294 ../camel/camel-filter-driver.c:1316
 #, c-format
 msgid "Failed on message %d"
 msgstr "ÐÐÐÐ ÐÐ ÑÐÐÐÑÐÐÐÐ %d"
 
-#: ../camel/camel-filter-driver.c:1351
-#: ../camel/camel-filter-driver.c:1456
+#: ../camel/camel-filter-driver.c:1331 ../camel/camel-filter-driver.c:1432
 msgid "Syncing folder"
 msgstr "ÐÐÐÑÑÐÐÐÐÐÑÐÑ ÐÐÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1356
-#: ../camel/camel-filter-driver.c:1462
+#: ../camel/camel-filter-driver.c:1336 ../camel/camel-filter-driver.c:1438
 msgid "Complete"
 msgstr "ÐÐÐÐÑÑÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1420
+#: ../camel/camel-filter-driver.c:1396
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "ÐÐÐÑÑÐÐÐÐ ÑÐÐÐÑÐÐÐÑ %d ÐÐ %d"
 
-#: ../camel/camel-filter-driver.c:1438
+#: ../camel/camel-filter-driver.c:1414
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "ÐÐÐÐ ÐÐ ÑÐÐÐÑÐÐÐÐ %d ÐÐ %d"
 
-#: ../camel/camel-filter-search.c:135
+#: ../camel/camel-filter-search.c:137
 msgid "Failed to retrieve message"
 msgstr "ÐÐÐÐ ÐÑÐ ÐÐÐÑÑÐÐÐÐ ÑÐÐÐÑÐÐÐÑ"
 
-#: ../camel/camel-filter-search.c:401
+#: ../camel/camel-filter-search.c:403
 msgid "Invalid arguments to (system-flag)"
 msgstr "ÐÐÐÐÐÑÑÑÐÐÑÐ ÐÑÐÑÐÐÐÑÑ ÐÐÑ system-flag"
 
-#: ../camel/camel-filter-search.c:416
+#: ../camel/camel-filter-search.c:418
 msgid "Invalid arguments to (user-tag)"
 msgstr "ÐÐÐÐÐÑÑÑÐÐÑÐ ÐÑÐÑÐÐÐÑÑ ÐÐÑ user-tag"
 
-#: ../camel/camel-filter-search.c:744
-#: ../camel/camel-filter-search.c:753
+#: ../camel/camel-filter-search.c:799 ../camel/camel-filter-search.c:808
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "ÐÑÐÐÐÐ ÐÑÐÐÐÐÐÐÐÑ ÐÐÐÑÐÐ ÑÐÐÑÑÑÐ: %s: %s"
 
-#: ../camel/camel-folder-search.c:345
-#: ../camel/camel-folder-search.c:456
+#: ../camel/camel-folder.c:243
+#, c-format
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐ ÑÐÐÐ-ÑÐÐÐÑÐÐÐÑ Ð Â%sÂ"
+msgstr[1] "ÐÐÑÑÐÐÐÐ ÐÐÐÑÑ ÑÐÐÐ-ÑÐÐÐÑÐÐÐÐ Ð Â%sÂ"
+msgstr[2] "ÐÐÑÑÐÐÐÐ ÐÐÐÑÑ ÑÐÐÐ-ÑÐÐÐÑÐÐÐÐ Ð Â%sÂ"
+
+#: ../camel/camel-folder.c:283
+#, c-format
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐ ÑÐÐÐÑÐÐÐÑ Ð Â%sÂ"
+msgstr[1] "ÐÐÑÑÐÐÐÐ ÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ Ð Â%sÂ"
+msgstr[2] "ÐÐÑÑÐÐÐÐ ÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ Ð Â%sÂ"
+
+#: ../camel/camel-folder.c:331
+#, c-format
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "ÐÐÐÑÑÑÐÑÐÑ ÐÐÐÐÐÐ ÑÐÐÐÑÐÐÐÑ Ð Â%sÂ"
+msgstr[1] "ÐÐÐÑÑÑÐÑÐÑ ÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ Ð Â%sÂ"
+msgstr[2] "ÐÐÐÑÑÑÐÑÐÑ ÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ Ð Â%sÂ"
+
+#: ../camel/camel-folder.c:898
+#: ../camel/providers/local/camel-maildir-folder.c:318
+msgid "Moving messages"
+msgstr "ÐÐÑÐÐÐÑÐÐÐÐ ÑÐÐÐÑÐÐÐÐ"
+
+#: ../camel/camel-folder.c:901
+msgid "Copying messages"
+msgstr "ÐÐÐÐÑÐÐÐÐÐÐ ÑÐÐÐÑÐÐÐÐ"
+
+#: ../camel/camel-folder.c:1156
+#, c-format
+msgid "Quota information not supported for folder '%s'"
+msgstr "ÐÐÑÐÑÐÐÑÐÑ Ð ÐÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ ÐÐÑ ÐÐÐÐÐ Â%sÂ"
+
+#: ../camel/camel-folder.c:3265
+#, c-format
+msgid "Retrieving message '%s' in %s"
+msgstr "ÐÐÐÑÑÐÐÐÐ ÑÐÐÐÑÐÐÐÑ Â%s Р%s"
+
+#: ../camel/camel-folder.c:3389
+#, c-format
+msgid "Retrieving quota information for '%s'"
+msgstr "ÐÐÐÑÑÐÐÐÐ ÐÐÑÐÑÐÐÑÐÐ Ð ÐÐÐÑÐ ÐÐÑ Â%sÂ"
+
+#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
 #: ../camel/camel-folder-search.c:627
 #, c-format
 msgid ""
@@ -1884,8 +1874,7 @@ msgstr ""
 "ÐÑÐÐÐÐ Ð ÑÐÐÑÐÑÑÐÐÐ ÐÑÑÐÐÐÐÐÐ Â%sÂ:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:357
-#: ../camel/camel-folder-search.c:468
+#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:468
 #: ../camel/camel-folder-search.c:639
 #, c-format
 msgid ""
@@ -1895,89 +1884,48 @@ msgstr ""
 "ÐÑÐÐÐÐ ÐÑÐ ÐÑÐÐÐÐÐÐÐÐ ÐÑÑÐÐÐÐÐÑ ÐÐÐÑÐÐ Â%sÂ:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:843
-#: ../camel/camel-folder-search.c:885
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:844 ../camel/camel-folder-search.c:887
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) ÑÑÐÐÑÐÑ ÐÐÐÐÑÑÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐÐÐÐ ÑÐÐÑÐÑÑÐÑÐ"
 
-#: ../camel/camel-folder-search.c:938
+#. Translators: Each '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:941
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) ÐÐÐÑÐÑÐÐÐ Ð %s"
 
-#: ../camel/camel-folder-search.c:944
-#: ../camel/camel-folder-search.c:951
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:948 ../camel/camel-folder-search.c:956
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) ÑÑÐÐÑÐÑ ÑÑÑÐÐÑ ÑÐÐÑÐÐÑÑÑÐÐÑ"
 
-#: ../camel/camel-folder-search.c:978
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:984
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) ÐÐÐÐÐÐÑ ÑÐÐÑÐÑÑÐÑ Ð ÐÐÐÐ ÐÐÑÑÐÐÐ"
 
-#: ../camel/camel-folder-search.c:987
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:994
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) ÑÑÐÐÑÐÑ ÐÐÐÐÑ ÐÐÐÐÐ"
 
-#: ../camel/camel-folder.c:220
-#, c-format
-#| msgid "Scanning for changed messages in %s"
-msgid "Learning new spam message in '%s'"
-msgid_plural "Learning new spam messages in '%s'"
-msgstr[0] "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐ ÑÐÐÐ-ÑÐÐÐÑÐÐÐÑ Ð Â%sÂ"
-msgstr[1] "ÐÐÑÑÐÐÐÐ ÐÐÐÑÑ ÑÐÐÐ-ÑÐÐÐÑÐÐÐÐ Ð Â%sÂ"
-msgstr[2] "ÐÐÑÑÐÐÐÐ ÐÐÐÑÑ ÑÐÐÐ-ÑÐÐÐÑÐÐÐÐ Ð Â%sÂ"
-
-#: ../camel/camel-folder.c:244
-#, c-format
-#| msgid "Scanning for changed messages in %s"
-msgid "Learning new ham message in '%s'"
-msgid_plural "Learning new ham messages in '%s'"
-msgstr[0] "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐ ÑÐÐÐÑÐÐÐÑ Ð Â%sÂ"
-msgstr[1] "ÐÐÑÑÐÐÐÐ ÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ Ð Â%sÂ"
-msgstr[2] "ÐÐÑÑÐÐÐÐ ÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ Ð Â%sÂ"
-
-#: ../camel/camel-folder.c:270
-#, c-format
-#| msgid "Filtering new message(s)"
-msgid "Filtering new message in '%s'"
-msgid_plural "Filtering new messages in '%s'"
-msgstr[0] "ÐÐÐÑÑÑÐÑÐÑ ÐÐÐÐÐÐ ÑÐÐÐÑÐÐÐÑ Ð Â%sÂ"
-msgstr[1] "ÐÐÐÑÑÑÐÑÐÑ ÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ Ð Â%sÂ"
-msgstr[2] "ÐÐÐÑÑÑÐÑÐÑ ÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ Ð Â%sÂ"
-
-#: ../camel/camel-folder.c:879
-#: ../camel/providers/local/camel-maildir-folder.c:293
-msgid "Moving messages"
-msgstr "ÐÐÑÐÐÐÑÐÐÐÐ ÑÐÐÐÑÐÐÐÐ"
-
-#: ../camel/camel-folder.c:882
-msgid "Copying messages"
-msgstr "ÐÐÐÐÑÐÐÐÐÐÐ ÑÐÐÐÑÐÐÐÐ"
-
-#: ../camel/camel-folder.c:3251
-#, c-format
-#| msgid "Retrieving POP message %d"
-msgid "Retrieving message '%s'"
-msgstr "ÐÐÐÑÑÐÐÐÐ ÑÐÐÐÑÐÐÐÑ Â%sÂ"
-
-#: ../camel/camel-gpg-context.c:646
-#: ../camel/camel-gpg-context.c:651
-#: ../camel/camel-gpg-context.c:1276
+#: ../camel/camel-gpg-context.c:642 ../camel/camel-gpg-context.c:647
+#: ../camel/camel-gpg-context.c:1272
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "ÐÐÐÐ ÐÑÐ ÐÑÐÐÐÐÐÐÐÐ gpg: %s"
 
-#: ../camel/camel-gpg-context.c:651
-#: ../camel/providers/smtp/camel-smtp-transport.c:723
-#: ../camel/providers/smtp/camel-smtp-transport.c:778
+#: ../camel/camel-gpg-context.c:647
+#: ../camel/providers/smtp/camel-smtp-transport.c:867
 msgid "Unknown"
 msgstr "ÐÐÐÐÐÐÑÑÐÐ"
 
-#: ../camel/camel-gpg-context.c:715
+#: ../camel/camel-gpg-context.c:711
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1988,25 +1936,24 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:732
+#: ../camel/camel-gpg-context.c:728
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "ÐÑÐÐÐÐ ÐÑÐ ÐÐÑÐÐÐÑÐÐ ÐÐÐÑÐÐÐÐÐ gpg userid."
 
-#: ../camel/camel-gpg-context.c:757
-#: ../camel/camel-gpg-context.c:772
+#: ../camel/camel-gpg-context.c:753 ../camel/camel-gpg-context.c:768
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "ÐÑÐÐÐÐ ÐÑÐ ÐÐÑÐÐÐÑÐÐ ÐÐÐÑÐÑÐ ÐÐÑÐÐÑÐÐÐ ÑÑÐÐÑ gpg."
 
-#: ../camel/camel-gpg-context.c:793
+#: ../camel/camel-gpg-context.c:789
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
 "SmartCard: \"%s\""
 msgstr "ÐÐÑ ÑÐÐÐÐÐÐÐÑÐÐÐÐÐÑ ÑÐÐÑÑÐÐÑÑÑ ÐÐÐÐÑÐÐÐÐÐ ÐÐÐÑÑÐ PIN: Â%sÂ"
 
-#: ../camel/camel-gpg-context.c:797
+#: ../camel/camel-gpg-context.c:793
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2015,120 +1962,88 @@ msgstr ""
 "ÐÐÐÐÐÑÐ ÐÐÑÑÐÐÑÑ ÑÑÐÐÑ, ÑÑÐÐÑ ÑÐÐÐÐÐÐÐÑÐÐÐÑÑ\n"
 "ÐÐÑÑ ÐÐÐÑÐÐÐÐÑÐÐÑ: Â%sÂ"
 
-#: ../camel/camel-gpg-context.c:803
+#: ../camel/camel-gpg-context.c:799
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "ÐÐÐÐÐÐÐÐÐÑÐ ÐÐÐÑÐÑ ÐÑ GnuPG ÐÐÑ Â%sÂ"
 
-#: ../camel/camel-gpg-context.c:832
-#: ../camel/camel-net-utils.c:515
+#: ../camel/camel-gpg-context.c:828 ../camel/camel-net-utils.c:515
 #: ../camel/camel-tcp-stream-raw.c:255
-#: ../camel/providers/imapx/camel-imapx-server.c:4894
-#: ../camel/providers/imapx/camel-imapx-server.c:4911
-#: ../camel/providers/imapx/camel-imapx-store.c:199
-#: ../camel/providers/nntp/camel-nntp-summary.c:402
-#: ../camel/providers/pop3/camel-pop3-folder.c:364
-#: ../camel/providers/pop3/camel-pop3-folder.c:429
-#: ../camel/providers/pop3/camel-pop3-folder.c:504
-#: ../camel/providers/pop3/camel-pop3-store.c:487
-#: ../libedataserverui/e-book-auth-util.c:229
+#: ../camel/providers/imapx/camel-imapx-server.c:4981
+#: ../camel/providers/imapx/camel-imapx-server.c:4998
+#: ../camel/providers/imapx/camel-imapx-store.c:269
+#: ../camel/providers/nntp/camel-nntp-summary.c:409
+#: ../libedataserverui/e-book-auth-util.c:227
 #, c-format
-#| msgid "Canceled"
 msgid "Cancelled"
 msgstr "ÐÑÐÐÐÐÐÐ"
 
-#: ../camel/camel-gpg-context.c:850
+#: ../camel/camel-gpg-context.c:846
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr "ÐÐÐÐ ÐÑÐ ÑÐÐÐÐÐÐÐÑÐÐÐÐÐÐ ÑÐÐÑÐÑÐÐÐÐ ÐÐÑÑÐ: ÑÐÐÐÐÐÐ 3 ÐÐÐÐÑÑÐÐÑÐÑÑ ÐÐÑÐÐÑÐÑÑ ÑÑÐÐÑ."
+msgstr ""
+"ÐÐÐÐ ÐÑÐ ÑÐÐÐÐÐÐÐÑÐÐÐÐÐÐ ÑÐÐÑÐÑÐÐÐÐ ÐÐÑÑÐ: ÑÐÐÐÐÐÐ 3 ÐÐÐÐÑÑÐÐÑÐÑÑ ÐÐÑÐÐÑÐÑÑ "
+"ÑÑÐÐÑ."
 
-#: ../camel/camel-gpg-context.c:862
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "ÐÐÐÐÐÐÐÐÐÑÐ ÐÑÐÐÑ ÐÑ GnuPG: %s"
 
-#: ../camel/camel-gpg-context.c:993
+#: ../camel/camel-gpg-context.c:989
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÑÑÐÐÐÑÑ ÑÑÐ ÑÐÐÐÑÐÐÐÐ: ÐÐ ÐÐÑÐÐÐÐÐÐÑ ÐÐÑÑÐÐÑÐÑÐ ÐÐÐÑÑÐÑÐÐÐ"
+msgstr ""
+"ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÑÑÐÐÐÑÑ ÑÑÐ ÑÐÐÐÑÐÐÐÐ: ÐÐ ÐÐÑÐÐÐÐÐÐÑ ÐÐÑÑÐÐÑÐÑÐ ÐÐÐÑÑÐÑÐÐÐ"
 
-#: ../camel/camel-gpg-context.c:1539
-#: ../camel/camel-smime-context.c:828
-#| msgid "Could not generate signing data: %s"
+#: ../camel/camel-gpg-context.c:1535 ../camel/camel-smime-context.c:824
 msgid "Could not generate signing data: "
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÑÐ ÐÐÐÐÐÑÐ: "
 
-#: ../camel/camel-gpg-context.c:1586
-#: ../camel/camel-gpg-context.c:1786
-#: ../camel/camel-gpg-context.c:1896
-#: ../camel/camel-gpg-context.c:2042
-#: ../camel/camel-gpg-context.c:2141
-#: ../camel/camel-gpg-context.c:2189
+#: ../camel/camel-gpg-context.c:1584 ../camel/camel-gpg-context.c:1788
+#: ../camel/camel-gpg-context.c:1898 ../camel/camel-gpg-context.c:2045
+#: ../camel/camel-gpg-context.c:2145 ../camel/camel-gpg-context.c:2193
 msgid "Failed to execute gpg."
 msgstr "ÐÐÐÐ ÐÑÐ ÐÑÐÐÐÐÐÐÐÐ gpg."
 
-#: ../camel/camel-gpg-context.c:1666
-#: ../camel/camel-gpg-context.c:1674
-#: ../camel/camel-gpg-context.c:1682
-#: ../camel/camel-gpg-context.c:1701
-#: ../camel/camel-smime-context.c:952
-#: ../camel/camel-smime-context.c:966
-#: ../camel/camel-smime-context.c:975
+#: ../camel/camel-gpg-context.c:1663 ../camel/camel-gpg-context.c:1671
+#: ../camel/camel-gpg-context.c:1679 ../camel/camel-gpg-context.c:1699
+#: ../camel/camel-smime-context.c:950 ../camel/camel-smime-context.c:964
+#: ../camel/camel-smime-context.c:973
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÐÐÑÐÑÑ ÐÐÐÐÐÑÑ ÑÐÐÐÑÐÐÐÑ: ÐÐÐÐÑÐÑÐ ÑÐÑÐÐÑ ÑÐÐÐÑÐÐÐÑ"
 
 #: ../camel/camel-gpg-context.c:1741
-#| msgid "Cannot verify message signature: Incorrect message format"
 msgid "Cannot verify message signature: "
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÐÐÑÐÑÑ ÐÐÐÐÐÑÑ ÑÐÐÐÑÐÐÐÑ: "
 
-#: ../camel/camel-gpg-context.c:1862
-#| msgid "Could not generate encrypting data: %s"
+#: ../camel/camel-gpg-context.c:1864
 msgid "Could not generate encrypting data: "
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐÐÑ: "
 
-#: ../camel/camel-gpg-context.c:1915
+#: ../camel/camel-gpg-context.c:1917
 msgid "This is a digitally encrypted message part"
-msgstr "ÐÑÐ ÐÐÑÐÑÑÐÐÐÐÐÐÑ ÑÐÑÑÑ ÑÐÐÐÑÐÐÐÑ"
-
-#: ../camel/camel-gpg-context.c:1973
-#: ../camel/camel-gpg-context.c:1982
-#: ../camel/camel-gpg-context.c:2005
-#, c-format
-msgid "Cannot decrypt message: Incorrect message format"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ: ÐÐÐÐÑÐÑÐ ÑÐÑÐÐÑ ÑÐÐÐÑÐÐÐÑ"
-
-#: ../camel/camel-gpg-context.c:1993
-#, c-format
-msgid "Failed to decrypt MIME part: protocol error"
-msgstr "ÐÐÐÐ ÐÑÐ ÐÐÐÐÐÐÑÐÐÐÐÐÐ ÑÐÑÑÐ MIME: ÐÑÐÐÐÐ ÐÑÐÑÐÐÐÐÐ"
-
-#: ../camel/camel-gpg-context.c:2082
-#: ../camel/camel-smime-context.c:1259
-msgid "Encrypted content"
-msgstr "ÐÐÑÐÑÑÐÐÐÐÐÐÐ ÑÐÐÐÑÐÐÐÐÐ"
-
-#: ../camel/camel-lock-client.c:106
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÐ Ð ÐÐÐÐÐÑÐÑÐÑÑ: %s"
+msgstr "ÐÑÐ ÐÐÑÐÑÑÐÐÐÐÐÐÑ ÑÐÑÑÑ ÑÐÐÐÑÐÐÐÑ"
 
-#: ../camel/camel-lock-client.c:130
+#: ../camel/camel-gpg-context.c:1975 ../camel/camel-gpg-context.c:1984
+#: ../camel/camel-gpg-context.c:2007
 #, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÑÐÑÑ ÐÐÐÐÐÑÐÑÐÑ: %s"
+msgid "Cannot decrypt message: Incorrect message format"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ: ÐÐÐÐÑÐÑÐ ÑÐÑÐÐÑ ÑÐÐÐÑÐÐÐÑ"
 
-#: ../camel/camel-lock-client.c:211
-#: ../camel/camel-lock-client.c:239
+#: ../camel/camel-gpg-context.c:1995
 #, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÐÑÐÐÐÑÑ Â%sÂ: ÐÑÐÐÐÐ ÐÑÐÑÐÐÐÐÐ Ñ ÐÐÐÐÐÑÐÑÐÑÐÐ"
+msgid "Failed to decrypt MIME part: protocol error"
+msgstr "ÐÐÐÐ ÐÑÐ ÐÐÐÐÐÐÑÐÐÐÐÐÐ ÑÐÑÑÐ MIME: ÐÑÐÐÐÐ ÐÑÐÑÐÐÐÐÐ"
 
-#: ../camel/camel-lock-client.c:227
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÐÑÐÐÐÑÑ Â%sÂ"
+#: ../camel/camel-gpg-context.c:2086 ../camel/camel-smime-context.c:1261
+msgid "Encrypted content"
+msgstr "ÐÐÑÐÑÑÐÐÐÐÐÐÐ ÑÐÐÐÑÐÐÐÐÐ"
+
+#: ../camel/camel-http-stream.c:546 ../camel/camel-stream-null.c:78
+msgid "Only reset to beginning is supported with CamelHttpStream"
+msgstr "ÐÐÑ CamelHttpStream ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ ÑÐÐÑÐÐ ÐÐÑÐÑÐÐ Ð ÐÐÑÐÐÑ"
 
 #: ../camel/camel-lock.c:102
 #, c-format
@@ -2137,7 +2052,6 @@ msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÑÐÐÐ ÐÐÐÐÐÑÐÐÐÐ ÐÐÑ
 
 #: ../camel/camel-lock.c:145
 #, c-format
-#| msgid "Timed out trying to get lock file on %s. Try again later."
 msgid "Timed out trying to get lock file on %s.  Try again later."
 msgstr "ÐÑÐÐÑÑÐÐÐ ÐÑÐÐÑ ÐÐÐÐÐÐÐÑ  ÐÐÐÐÐÑÐÐÐÐ ÑÐÐÐÐ %s. ÐÐÐÑÐÐÑÐÑÐ ÐÐÐÐÐ."
 
@@ -2151,6 +2065,26 @@ msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÐÐÐÐÑÐÐÐÑ ÐÑÐÐÐÑÐ
 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"
@@ -2200,29 +2134,40 @@ msgstr "ÐÑÐÐÐÐ ÐÑÐ ÑÑÐÐÐÐ ÐÐÑÑÐÐÐÐÐ ÑÐÐÐÐ: %s"
 msgid "Error writing mail temp file: %s"
 msgstr "ÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐÐÑ ÐÑÐÐÐÐÐÐÐÐ ÐÐÑÑÐÐÐÐÐ ÑÐÐÐÐ: %s"
 
-#: ../camel/camel-movemail.c:483
-#: ../camel/camel-movemail.c:552
+#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "ÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐÐÐÑ ÐÑÐÐÐÐÐÐÐÐ ÐÐÑÑÐÐÐÐÐ ÑÐÐÐÐ: %s"
 
-#: ../camel/camel-multipart-signed.c:322
+#: ../camel/camel-multipart-signed.c:296
 #, c-format
-#| msgid "No description available"
 msgid "No content available"
 msgstr "ÐÐÐÐÑÐÐÐÐÐ ÐÐÐÐÑÑÑÐÐÐ"
 
-#: ../camel/camel-multipart-signed.c:330
+#: ../camel/camel-multipart-signed.c:304
 #, c-format
-#| msgid "No description available"
 msgid "No signature available"
 msgstr "ÐÐÐÐÐÑÑ ÐÐÐÐÑÑÑÐÐÐ"
 
-#: ../camel/camel-multipart-signed.c:658
+#: ../camel/camel-multipart-signed.c:688
 #, c-format
 msgid "parse error"
 msgstr "ÐÑÐÐÐÐ ÐÐÑÐÐÐÑÐÐ"
 
+#: ../camel/camel-network-service.c:91
+#, c-format
+msgid "Could not connect to %s: %s"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð %s: %s"
+
+#: ../camel/camel-network-service.c:92
+msgid "SSL unavailable"
+msgstr "SSL ÐÐÐÐÑÑÑÐÐÐ"
+
+#: ../camel/camel-network-service.c:115
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð %s: "
+
 #: ../camel/camel-net-utils.c:695
 #, c-format
 msgid "Resolving: %s"
@@ -2250,13 +2195,12 @@ msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÐÐÑÑ ÑÐÐÐ"
 msgid "Name lookup failed: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÐÐÑÑ ÑÐÐÐ: %s"
 
-#: ../camel/camel-offline-folder.c:193
+#: ../camel/camel-offline-folder.c:198
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "ÐÐÐÑÑÐÐÐÐÐÑÐÑ ÑÐÐÐÑÐÐÐÐ Ð ÐÐÐÐÐ Â%s ÐÐ ÐÐÑÐ"
 
-#: ../camel/camel-offline-journal.c:144
-#: ../camel/camel-offline-journal.c:174
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:174
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÑÐÑÑ ÐÑÑÐÐÐ ÐÐÑÐÐÐÐÐÐÐ ÑÐÐÐÑÑ ÐÐÑ ÐÐÐÐÐ Â%sÂ: %s"
@@ -2269,23 +2213,23 @@ msgstr "ÐÑÐÐÐÐÐÐÑ ÐÐÑÑÑÐÐÑÐÑÑ ÐÐÐÐÐ ÑÐ. ÐÐÑÑÑ"
 msgid "For reading mail as a query of another set of folders"
 msgstr "ÐÐÑ ÑÑÐÐÐÑ ÐÐÑÑÑ ÐÐ ÐÐÐÑÐÑÑ Ð ÐÑÑÐÐÐÑ ÐÐÐÐÑÑ ÐÐÐÐÐ"
 
-#: ../camel/camel-provider.c:188
+#: ../camel/camel-provider.c:192
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÐÑÑ %s: ÐÐÐÑÑÐÐÐ ÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ Ð ÑÑÐÐ ÑÐÑÑÐÐÐ."
+msgstr ""
+"ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÐÑÑ %s: ÐÐÐÑÑÐÐÐ ÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ Ð ÑÑÐÐ ÑÐÑÑÐÐÐ."
 
-#: ../camel/camel-provider.c:197
+#: ../camel/camel-provider.c:201
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÐÑÑ %s: %s"
 
-#: ../camel/camel-provider.c:206
+#: ../camel/camel-provider.c:210
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÐÑÑ %s: Ð ÐÐÐÑÐÐ ÐÐÑ ÐÐÐÑÐÐÐÐÐÐÑÑÑÑÐÐÐ ÐÐÐÐ."
 
-#: ../camel/camel-provider.c:388
-#: ../camel/camel-session.c:206
+#: ../camel/camel-provider.c:391 ../camel/camel-session.c:351
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "ÐÑÐÐÐÐÐÐÑ ÐÐÑ ÐÑÐÑÐÐÐÐÐ Â%s ÐÐ ÐÐÑÑÑÐÐÐ"
@@ -2330,436 +2274,479 @@ msgstr ""
 "ÐÐÐÐÑÐÐÑ ÑÑÐÑÑÐÑÐÐÐÑÐÐÑ ÐÐÑÐÑÐÐÑÐÑ:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:45
+#: ../camel/camel-sasl-cram-md5.c:41
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:47
-msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
-msgstr "ÐÐÐÐÐÑÑÐÐÐÐ Ð ÑÐÑÐÐÑÑ ÐÑÐÐÑ ÐÑÐÐÐÐÐÐÐÑÑÑÑ Ñ ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ ÐÐÑ ÐÐÐÐÑÐÑÐÐÐÑÐÐ ÐÑÐÑÐÐÐÐÐ CRAM-MD5, ÐÑÐÐ ÑÐÑÐÐÑ ÐÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑ."
+#: ../camel/camel-sasl-cram-md5.c:43
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+"ÐÐÐÐÐÑÑÐÐÐÐ Ð ÑÐÑÐÐÑÑ ÐÑÐÐÑ ÐÑÐÐÐÐÐÐÐÑÑÑÑ Ñ ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ ÐÐÑ ÐÐÐÐÑÐÑÐÐÐÑÐÐ "
+"ÐÑÐÑÐÐÐÐÐ CRAM-MD5, ÐÑÐÐ ÑÐÑÐÐÑ ÐÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑ."
 
-#: ../camel/camel-sasl-digest-md5.c:58
+#: ../camel/camel-sasl-digest-md5.c:54
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:60
-msgid "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it."
-msgstr "ÐÐÐÐÐÑÑÐÐÐÐ Ð ÑÐÑÐÐÑÑ ÐÑÐÐÑ ÐÑÐÐÐÐÐÐÐÑÑÑÑ Ñ ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ ÐÐÑÐÑÑÐÐÐÐÐÐÐÐ ÐÐÑÐÐÑ DIGEST-MD5, ÐÑÐÐ ÑÐÑÐÐÑ ÐÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑ."
+#: ../camel/camel-sasl-digest-md5.c:56
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"ÐÐÐÐÐÑÑÐÐÐÐ Ð ÑÐÑÐÐÑÑ ÐÑÐÐÑ ÐÑÐÐÐÐÐÐÐÑÑÑÑ Ñ ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ ÐÐÑÐÑÑÐÐÐÐÐÐÐÐ "
+"ÐÐÑÐÐÑ DIGEST-MD5, ÐÑÐÐ ÑÐÑÐÐÑ ÐÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑ."
 
-#: ../camel/camel-sasl-digest-md5.c:821
+#: ../camel/camel-sasl-digest-md5.c:820
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐÐÑÐ ÐÑÐÐÑ ÐÑ ÑÐÑÐÐÑÐ (>2048 ÐÐÐÑ)"
 
-#: ../camel/camel-sasl-digest-md5.c:832
+#: ../camel/camel-sasl-digest-md5.c:831
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "ÐÐÐÐÐÑÑÑÐÐÑÐ ÐÑÐÐÑ ÑÐÑÐÐÑÐ\n"
 
-#: ../camel/camel-sasl-digest-md5.c:840
+#: ../camel/camel-sasl-digest-md5.c:839
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "ÐÑÐÐÑ ÑÐÑÐÐÑÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÐÑÑÑÐÐÑÐ ÐÐÑÐÐ ÂÐÐÑÐÑÑÐÐ ÐÐÑÐÑÑÂ"
 
-#: ../camel/camel-sasl-digest-md5.c:875
+#: ../camel/camel-sasl-digest-md5.c:873
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "ÐÑÐÐÑ ÑÐÑÐÐÑÐ ÐÐ ÑÐÐÐÑÐÐÑ ÐÐÑÐÑÐÐÑÐÐ ÐÐ ÐÐÑÐÑÐÐÐÑÐÐ"
 
-#: ../camel/camel-sasl-digest-md5.c:896
+#: ../camel/camel-sasl-digest-md5.c:894
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "ÐÑÐÐÑ ÑÐÑÐÐÑÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÐÐÑÑ ÐÐÑÐÑÐÐÑÐÑ ÐÐ ÐÐÑÐÑÐÐÐÑÐÐ"
 
-#: ../camel/camel-sasl-digest-md5.c:909
+#: ../camel/camel-sasl-digest-md5.c:907
 #, c-format
 msgid "Server response does not match"
 msgstr "ÐÑÐÐÑ ÑÐÑÐÐÑÐ ÐÐ ÑÐÐÐÐÐÐÐÑ"
 
-#: ../camel/camel-sasl-gssapi.c:85
+#: ../camel/camel-sasl-gssapi.c:86
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:87
+#: ../camel/camel-sasl-gssapi.c:88
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "ÐÐÐÐÐÑÑÐÐÐÐ Ð ÑÐÑÐÐÑÑ ÐÑÐÐÑ ÐÑÐÐÐÐÐÐÐÑÑÑÑ Ñ ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ Kerberos 5."
 
-#: ../camel/camel-sasl-gssapi.c:128
-msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation."
-msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ ÐÑÐÐÐÑÑÐÐÐÐÐÐÑÐÐ ÑÑÐÐÑÑÐÐÐÐ, ÐÐÐÐ ÐÐ ÑÐÑÐÐÐÐÐÐÑÑÑ Ð ÑÑÐÐ ÑÐÐÐÐÐÐÑÐÐ."
+#: ../camel/camel-sasl-gssapi.c:129
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
+msgstr ""
+"ÐÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ ÐÑÐÐÐÑÑÐÐÐÐÐÐÑÐÐ ÑÑÐÐÑÑÐÐÐÐ, ÐÐÐÐ ÐÐ "
+"ÑÐÑÐÐÐÐÐÐÑÑÑ Ð ÑÑÐÐ ÑÐÐÐÐÐÐÑÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:133
+#: ../camel/camel-sasl-gssapi.c:134
 msgid "The provided target_name parameter was ill-formed."
 msgstr "ÐÑÐÐÐÑÑÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÑ target_name ÑÑÐÑÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:136
-msgid "The provided target_name parameter contained an invalid or unsupported type of name."
-msgstr "ÐÑÐÐÐÑÑÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÑ target_name ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÐÑÐ ÐÐÐ ÐÐÐÐÐÐÐÑÐÐÐÐÐÐÑÐ ÑÐÐ ÐÐÐÐÐ."
+#: ../camel/camel-sasl-gssapi.c:137
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
+msgstr ""
+"ÐÑÐÐÐÑÑÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÑ target_name ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÐÑÐ ÐÐÐ ÐÐÐÐÐÐÐÑÐÐÐÐÐÐÑÐ "
+"ÑÐÐ ÐÐÐÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:140
-msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
-msgstr "input_token ÑÐÐÐÑÐÐÑ ÐÐ ÑÐÐÑÑ ÐÑÐÐÑÐÐÑ Ð ÐÐÐÐÐÐÐ, ÐÐÐ ÑÐÐÐÐÐÐ Ð ÐÐÑÐÐÐÑÑÐ input_chan_bindings."
+#: ../camel/camel-sasl-gssapi.c:141
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
+msgstr ""
+"input_token ÑÐÐÐÑÐÐÑ ÐÐ ÑÐÐÑÑ ÐÑÐÐÑÐÐÑ Ð ÐÐÐÐÐÐÐ, ÐÐÐ ÑÐÐÐÐÐÐ Ð ÐÐÑÐÐÐÑÑÐ "
+"input_chan_bindings."
 
-#: ../camel/camel-sasl-gssapi.c:145
-msgid "The input_token contains an invalid signature, or a signature that could not be verified."
-msgstr "input_token ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÐÑÑ ÐÐÐÐÐÑÑ, ÐÐÐ ÐÐÐÐÐÑÑ, ÐÐÑÐÑÐÑ ÐÐ ÐÐÐÐÑ ÐÑÑÑ ÐÑÐÐÐÑÐÐÐ."
+#: ../camel/camel-sasl-gssapi.c:146
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
+msgstr ""
+"input_token ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÐÑÑ ÐÐÐÐÐÑÑ, ÐÐÐ ÐÐÐÐÐÑÑ, ÐÐÑÐÑÐÑ ÐÐ ÐÐÐÐÑ ÐÑÑÑ "
+"ÐÑÐÐÐÑÐÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:149
-msgid "The supplied credentials were not valid for context initiation, or the credential handle did not reference any credentials."
-msgstr "ÐÑÐÐÐÑÑÐÐÐÐÐÐÑÐ ÑÐÐÑÑÐÐÐÑÐÐÐÑ ÐÑÐÐ ÐÐ ÐÐÐÑÑÐÐÑÐÐÑÐÑ ÐÐÑ ÐÐÐÑÐÐÐÐÐÐÑÐÐ ÐÐÐÑÐÐÑÑÐ, ÐÐÐÐ ÐÐÑÐÐÐÑÑÐÐ ÑÐÐÑÑÐÐÐÑÐÐÐÑ ÐÐ ÑÑÑÐÐÐÑÑÑ ÐÐ ÑÐÐÑÑÐÐÐÑÐÐÐÑ."
+#: ../camel/camel-sasl-gssapi.c:150
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
+msgstr ""
+"ÐÑÐÐÐÑÑÐÐÐÐÐÐÑÐ ÑÐÐÑÑÐÐÐÑÐÐÐÑ ÐÑÐÐ ÐÐ ÐÐÐÑÑÐÐÑÐÐÑÐÑ ÐÐÑ ÐÐÐÑÐÐÐÐÐÐÑÐÐ "
+"ÐÐÐÑÐÐÑÑÐ, ÐÐÐÐ ÐÐÑÐÐÐÑÑÐÐ ÑÐÐÑÑÐÐÐÑÐÐÐÑ ÐÐ ÑÑÑÐÐÐÑÑÑ ÐÐ ÑÐÐÑÑÐÐÐÑÐÐÐÑ."
 
-#: ../camel/camel-sasl-gssapi.c:154
+#: ../camel/camel-sasl-gssapi.c:155
 msgid "The supplied context handle did not refer to a valid context."
-msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÑÐÐ ÐÐÐÑÐÐÑÑÐ ÐÐ ÑÑÑÐÐÐÑÑÑ ÐÐ ÐÐÐÑÑÐÐÑÐÐÑÐÑÐ ÐÐÐÑÐÐÑÑ."
+msgstr ""
+"ÐÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÑÐÐ ÐÐÐÑÐÐÑÑÐ ÐÐ ÑÑÑÐÐÐÑÑÑ ÐÐ ÐÐÐÑÑÐÐÑÐÐÑÐÑÐ ÐÐÐÑÐÐÑÑ."
 
-#: ../camel/camel-sasl-gssapi.c:157
+#: ../camel/camel-sasl-gssapi.c:158
 msgid "The consistency checks performed on the input_token failed."
 msgstr "ÐÐÐÐ ÐÑÐÐÐÑÐÐ ÑÐÐÐÑÑÐÐÑÑÐ ÑÐÐÐÐÐÑÐ input_token."
 
-#: ../camel/camel-sasl-gssapi.c:160
+#: ../camel/camel-sasl-gssapi.c:161
 msgid "The consistency checks performed on the credential failed."
 msgstr "ÐÐÐÐ ÐÑÐÐÐÑÐÐ ÑÐÐÐÑÑÐÐÑÑÐ ÑÐÐÑÑÐÐÐÑÐÐÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:163
+#: ../camel/camel-sasl-gssapi.c:164
 msgid "The referenced credentials have expired."
 msgstr "ÐÑÐÐ ÐÐÐÑÑÐÐÑ ÑÐÐÐÑÐÑÑÑÑ ÑÐÐÑÑÐÐÐÑÐÐÐÐ ÐÑÑÑÐ."
 
-#: ../camel/camel-sasl-gssapi.c:169
-#: ../camel/camel-sasl-gssapi.c:309
-#: ../camel/camel-sasl-gssapi.c:353
-#: ../camel/camel-sasl-gssapi.c:370
-#: ../camel/providers/smtp/camel-smtp-transport.c:1256
+#: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:312
+#: ../camel/camel-sasl-gssapi.c:356 ../camel/camel-sasl-gssapi.c:373
+#: ../camel/providers/smtp/camel-smtp-transport.c:1336
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐÑ ÐÑ ÑÐÑÐÐÑÐ ÐÑÐ ÐÐÐÐÑÐÑÐÐÐÑÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:382
+#: ../camel/camel-sasl-gssapi.c:385
 #, c-format
 msgid "Unsupported security layer."
 msgstr "ÐÐÐÐÐÐÐÑÐÐÐÐÐÐÑÐ ÑÑÐÐÐÐÑ ÐÐÐÐÐÐÑÐÐÑÑÐ."
 
-#: ../camel/camel-sasl-login.c:39
+#: ../camel/camel-sasl-login.c:35
 msgid "Login"
 msgstr "ÐÐÐÐÑÑÑÐÑÐÑ"
 
-#: ../camel/camel-sasl-login.c:41
-#: ../camel/camel-sasl-plain.c:45
+#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
 msgid "This option will connect to the server using a simple password."
-msgstr "ÐÐÐÐÐÑÑÐÐÐÐ Ð ÑÐÑÐÐÑÑ ÐÑÐÐÑ ÐÑÐÐÐÐÐÐÐÑÑÑÑ Ñ ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÑÐÐÐÐÐÐÐÐ ÐÐÑÐÐÑ."
+msgstr ""
+"ÐÐÐÐÐÑÑÐÐÐÐ Ð ÑÐÑÐÐÑÑ ÐÑÐÐÑ ÐÑÐÐÐÐÐÐÐÑÑÑÑ Ñ ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÑÐÐÐÐÐÐÐÐ "
+"ÐÐÑÐÐÑ."
 
-#: ../camel/camel-sasl-login.c:95
+#: ../camel/camel-sasl-login.c:92
 #, c-format
 msgid "Unknown authentication state."
 msgstr "ÐÐÐÐÐÐÑÑÐÐÐ ÑÐÑÑÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÐ."
 
-#: ../camel/camel-sasl-ntlm.c:41
+#: ../camel/camel-sasl-ntlm.c:42
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:43
-msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
-msgstr "ÐÑÐ ÐÐÑÐÑ ÐÐÐÐÐÑÑÐÐÑ Ð ÑÐÑÐÐÑÑ, ÐÑÐÐÐÐÐÐÐÐÑ ÐÐ Windows, ÐÑÐÐÐÑÐÑÑ ÐÐÑ ÐÑÑÐÐÑÐÑÐÐÐÑÐÐ NTLM / Secure Password Authentication."
+#: ../camel/camel-sasl-ntlm.c:44
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr ""
+"ÐÑÐ ÐÐÑÐÑ ÐÐÐÐÐÑÑÐÐÑ Ð ÑÐÑÐÐÑÑ, ÐÑÐÐÐÐÐÐÐÐÑ ÐÐ Windows, ÐÑÐÐÐÑÐÑÑ ÐÐÑ "
+"ÐÑÑÐÐÑÐÑÐÐÐÑÐÐ NTLM / Secure Password Authentication."
 
-#: ../camel/camel-sasl-plain.c:43
+#: ../camel/camel-sasl-plain.c:39
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:46
+#: ../camel/camel-sasl-popb4smtp.c:42
 msgid "POP before SMTP"
 msgstr "POP ÐÐ SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:48
+#: ../camel/camel-sasl-popb4smtp.c:44
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "ÐÑÐÐÑ ÐÑÐÐÐÐÐÐÐÑÑÑÑ ÐÐÑÐÑÐÐÐÑÐÑ POP ÐÐ ÐÐÐÑÑÐÐ ÐÐÑÐÐÐÑÐ ÐÐÑÑÑ ÐÐ SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:83
-msgid "POP Source URI"
-msgstr "URL ÐÑÑÐÑÐÐÐÐ ÐÐÑÑÑ POP"
+#: ../camel/camel-sasl-popb4smtp.c:80
+msgid "POP Source UID"
+msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÑÑÐÑÐÐÐÐ POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:90
+#: ../camel/camel-sasl-popb4smtp.c:92
 #, c-format
-#| msgid "POP Before SMTP auth using an unknown transport"
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "ÐÑÑÐÐÑÐÑÐÐÐÑÐÑ POP ÐÐ SMTP, ÐÑÐÐÐÑÐÑÑ ÐÐÐÐÐÐÑÑÐÑÐ ÑÑÐÐÑÐÐÑÑ"
 
-#: ../camel/camel-sasl-popb4smtp.c:98
+#: ../camel/camel-sasl-popb4smtp.c:104 ../camel/camel-sasl-popb4smtp.c:114
 #, c-format
-#| msgid "POP Before SMTP auth using a non-pop source"
-msgid "POP Before SMTP authentication using a non-POP source"
-msgstr "ÐÑÑÐÐÑÐÑÐÐÐÑÐÑ POP ÐÐ SMTP, ÐÑÐÐÐÑÐÑÑ ÐÐ-POP ÐÑÑÐÑÐÐÐ"
+msgid "POP Before SMTP authentication attempted with a %s service"
+msgstr "ÐÑÑÐÐÑÐÑÐÐÐÑÐÑ POP ÐÐ SMTP ÐÐÑÑÐÐÑÑÐÐÐ ÑÐÑÐÐÑ %s"
 
 #: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑÑÐÐ ÑÐÐÑÐÑÑÐÐÐÐ ÐÑÑÐÐÐÐÐÑ: %s: %s"
 
-#: ../camel/camel-service.c:89
+#: ../camel/camel-service.c:492
 #, c-format
-msgid "URL '%s' needs a username component"
-msgstr "URL Â%s ÐÑÐÐÐÐÑÑÑ Ð ÐÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÑ"
+msgid "URL '%s' needs a user component"
+msgstr "URL Â%s ÐÑÐÐÐÐÑÑÑ Ð ÐÐÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐÐÐÑÐÐÑ"
 
-#: ../camel/camel-service.c:93
+#: ../camel/camel-service.c:503
 #, c-format
 msgid "URL '%s' needs a host component"
-msgstr "URL Â%s ÐÑÐÐÐÐÑÑÑ Ð ÐÐÐÐÐÐÐÐÑÐ ÑÐÑÑÐ"
+msgstr "URL Â%s ÐÑÐÐÐÐÑÑÑ Ð ÐÐÐÐÐÐÐÐÑÐ ÑÐÐÐ"
 
-#: ../camel/camel-service.c:97
+#: ../camel/camel-service.c:514
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL Â%s ÐÑÐÐÐÐÑÑÑ Ð ÐÐÐÐÐÐÐÐÑÐ ÐÑÑÐ"
 
-#: ../camel/camel-session.c:260
+#: ../camel/camel-session.c:361
 #, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÐ %s:\n"
-"%s"
+msgid "Invalid GType registered for protocol '%s'"
+msgstr "ÐÐÐÐÑÑÐÐÑÐÑÐ ÐÐÑÐÐÐÑÑÑÐÑÐÐÐÐÐÑÐ GType ÐÐÑ ÐÑÐÑÐÐÐÐÐ Â%sÂ"
 
-#: ../camel/camel-session.c:757
+#: ../camel/camel-session.c:907
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÐÑ %s ÐÐÑ %s ÐÐ ÑÐÐÐ %s."
 
-#: ../camel/camel-smime-context.c:348
-#: ../camel/camel-smime-context.c:1052
+#: ../camel/camel-smime-context.c:344 ../camel/camel-smime-context.c:1050
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÐ ÑÐÑÑÐÑÐÐÐÑ ÐÐÑ Â%sÂ"
 
-#: ../camel/camel-smime-context.c:376
+#: ../camel/camel-smime-context.c:372
 msgid "Cannot create CMS message"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ CMS"
 
-#: ../camel/camel-smime-context.c:381
+#: ../camel/camel-smime-context.c:377
 msgid "Cannot create CMS signed data"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ CMS signedData"
 
-#: ../camel/camel-smime-context.c:387
+#: ../camel/camel-smime-context.c:383
 msgid "Cannot attach CMS signed data"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑ CMS signedData"
 
-#: ../camel/camel-smime-context.c:394
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS data"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑ CMS data"
 
-#: ../camel/camel-smime-context.c:400
+#: ../camel/camel-smime-context.c:396
 msgid "Cannot create CMS Signer information"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ CMS SignerInfo"
 
-#: ../camel/camel-smime-context.c:406
+#: ../camel/camel-smime-context.c:402
 msgid "Cannot find certificate chain"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÐ ÑÐÐÐÑÐÑ ÑÐÑÑÐÑÐÐÐÑÐÐ"
 
-#: ../camel/camel-smime-context.c:412
+#: ../camel/camel-smime-context.c:408
 msgid "Cannot add CMS Signing time"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑ CMS SigningTime"
 
-#: ../camel/camel-smime-context.c:436
-#: ../camel/camel-smime-context.c:451
+#: ../camel/camel-smime-context.c:432 ../camel/camel-smime-context.c:447
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "ÐÐÑÑÐÑÐÐÐÑ ÑÐÑÑÐÐÐÐÐÑ ÐÐÑ Â%s ÐÐ ÑÑÑÐÑÑÐÑÐÑ"
 
-#: ../camel/camel-smime-context.c:458
+#: ../camel/camel-smime-context.c:454
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑ ÐÑÑÐÐÑÑ SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:463
+#: ../camel/camel-smime-context.c:459
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑ ÐÑÑÐÐÑÑ MS SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot add encryption certificate"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑ ÑÐÑÑÐÑÐÐÐÑ ÑÐÑÑÐÐÐÐÐÑ"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:470
 msgid "Cannot add CMS Signer information"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑ CMS SignerInfo"
 
 #. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../camel/camel-smime-context.c:507
+#: ../camel/camel-smime-context.c:503
 msgid "Unverified"
 msgstr "ÐÐÐÑÐÐÐÑÐÐÐ"
 
-#: ../camel/camel-smime-context.c:509
+#: ../camel/camel-smime-context.c:505
 msgid "Good signature"
 msgstr "ÐÐÐÐÐÑÑ ÐÐÑÐÐ"
 
-#: ../camel/camel-smime-context.c:511
+#: ../camel/camel-smime-context.c:507
 msgid "Bad signature"
 msgstr "ÐÐÐÐÐÑÑ ÐÐÐÐÑÐÐ"
 
-#: ../camel/camel-smime-context.c:513
+#: ../camel/camel-smime-context.c:509
 msgid "Content tampered with or altered in transit"
 msgstr "ÐÐÐÐÑÐÐÐÐ ÐÑÐÐ ÐÐÐÐÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐÐ ÐÐ ÐÑÑÐ"
 
-#: ../camel/camel-smime-context.c:515
+#: ../camel/camel-smime-context.c:511
 msgid "Signing certificate not found"
 msgstr "ÐÐÑÑÐÑÐÐÐÑ ÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÐ"
 
-#: ../camel/camel-smime-context.c:517
+#: ../camel/camel-smime-context.c:513
 msgid "Signing certificate not trusted"
 msgstr "ÐÐÑÑÐÑÐÐÐÑ ÐÐÐÐÐÑÐ ÐÐÐÐÑÑÐÐÐÑÐÐ"
 
-#: ../camel/camel-smime-context.c:519
+#: ../camel/camel-smime-context.c:515
 msgid "Signature algorithm unknown"
 msgstr "ÐÐÐÐÐÐÑÑÐÑÐ ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:521
+#: ../camel/camel-smime-context.c:517
 msgid "Signature algorithm unsupported"
 msgstr "ÐÐÐÐÐÐÐÑÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:523
+#: ../camel/camel-smime-context.c:519
 msgid "Malformed signature"
 msgstr "ÐÐÐÐÑÐÐ ÑÑÐÑÐÐÑÐÐÐÐÐÐÑ ÐÐÐÐÐÑÑ"
 
-#: ../camel/camel-smime-context.c:525
+#: ../camel/camel-smime-context.c:521
 msgid "Processing error"
 msgstr "ÐÑÐÐÐÐ ÐÐÑÐÐÐÑÐÐ"
 
-#: ../camel/camel-smime-context.c:570
+#: ../camel/camel-smime-context.c:566
 msgid "No signed data in signature"
 msgstr "Ð ÐÐÐÐÐÑÐ ÐÑÑÑÑÑÑÐÑÑÑ ÐÐÐÐÑÐ ÐÐÐÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:575
+#: ../camel/camel-smime-context.c:571
 msgid "Digests missing from enveloped data"
 msgstr "Ð ÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐ ÐÑÑÑÑÑÑÐÑÐÑ ÑÐÐÐÐÐ"
 
-#: ../camel/camel-smime-context.c:588
-#: ../camel/camel-smime-context.c:599
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÑÐÑÐÐÑÑ ÐÐÐÐÐÐÑÑÑ"
 
-#: ../camel/camel-smime-context.c:606
-#: ../camel/camel-smime-context.c:610
+#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÑÑÐÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑÑ ÑÐÐÐÑÐÐÐÑ"
 
-#: ../camel/camel-smime-context.c:620
-#: ../camel/camel-smime-context.c:625
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
 msgstr "ÐÐÐÐ ÐÐÐÐÑÑÐ ÑÐÑÑÐÑÐÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:635
+#: ../camel/camel-smime-context.c:631
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
-msgstr "ÐÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÑ ÑÐÐÑÐÐ ÐÐ ÑÐÑÑÐÑÐÐÐÑÐÐ, ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÐÐÑÐÑÑ ÑÐÑÑÐÑÐÐÐÑÑ"
+msgstr ""
+"ÐÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÑ ÑÐÐÑÐÐ ÐÐ ÑÐÑÑÐÑÐÐÐÑÐÐ, ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÐÐÑÐÑÑ ÑÐÑÑÐÑÐÐÐÑÑ"
 
-#: ../camel/camel-smime-context.c:638
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "Ð ÑÐÐÐÑÐÐÐÐ ÑÐÐÑÐÐ ÑÐÑÑÐÑÐÐÐÑÑ, ÑÐÑÑÐÑÐÐÐÑÑ ÐÐÐÐÑÑÐÑÐÐÐÐÑ Ð ÐÑÐÐÐÑÐÐÑ"
 
-#: ../camel/camel-smime-context.c:642
+#: ../camel/camel-smime-context.c:638
 msgid "Cannot find signature digests"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÐ ÐÐÐÐÐÐÑÑÑ ÐÐÐÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:658
+#: ../camel/camel-smime-context.c:654
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ÐÐÐÐÐÑÐÐÐ: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:839
-#: ../camel/camel-smime-context.c:1125
+#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1123
 msgid "Cannot create encoder context"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÑÐÐÑÑ ÐÐÐÐÑÐÐÑÐÐÐ"
 
-#: ../camel/camel-smime-context.c:845
+#: ../camel/camel-smime-context.c:841
 msgid "Failed to add data to CMS encoder"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑ ÐÐÐÐÑÐ Ð ÐÐÐÐÑÐÐÑÐÐÑ CMS"
 
-#: ../camel/camel-smime-context.c:850
-#: ../camel/camel-smime-context.c:1142
+#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1140
 msgid "Failed to encode data"
 msgstr "ÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐÐÐÑ ÐÐÐÐÑÑ"
 
-#: ../camel/camel-smime-context.c:991
-#: ../camel/camel-smime-context.c:1237
+#: ../camel/camel-smime-context.c:989 ../camel/camel-smime-context.c:1236
 msgid "Decoder failed"
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:1060
+#: ../camel/camel-smime-context.c:1058
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÐ ÐÐÑÐÐ ÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐÐÑ"
 
-#: ../camel/camel-smime-context.c:1068
+#: ../camel/camel-smime-context.c:1066
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÑÐÑÐÐÐÐÐÑÑ ÑÐÐÑ ÐÐÑ ÐÐÑÑÐ ÐÐÑÐÐÐ ÑÐÑÑÐÐÐÐÐÑ"
 
-#: ../camel/camel-smime-context.c:1079
+#: ../camel/camel-smime-context.c:1077
 msgid "Cannot create CMS Message"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ CMS"
 
-#: ../camel/camel-smime-context.c:1085
+#: ../camel/camel-smime-context.c:1083
 msgid "Cannot create CMS Enveloped data"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ CMS EnvelopedData"
 
-#: ../camel/camel-smime-context.c:1091
+#: ../camel/camel-smime-context.c:1089
 msgid "Cannot attach CMS Enveloped data"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑ CMS EnvelopedData"
 
-#: ../camel/camel-smime-context.c:1097
+#: ../camel/camel-smime-context.c:1095
 msgid "Cannot attach CMS data object"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑ ÐÐÑÐÐÑ CMS data"
 
-#: ../camel/camel-smime-context.c:1106
+#: ../camel/camel-smime-context.c:1104
 msgid "Cannot create CMS Recipient information"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÑÐÐÐÐÐÐÑ CMS RecipientInfo"
 
-#: ../camel/camel-smime-context.c:1111
+#: ../camel/camel-smime-context.c:1109
 msgid "Cannot add CMS Recipient information"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑ ÑÐÐÐÐÐÐÑ CMS RecipientInfo"
 
-#: ../camel/camel-smime-context.c:1136
+#: ../camel/camel-smime-context.c:1134
 msgid "Failed to add data to encoder"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑ ÐÐÐÐÑÐ Ð ÐÐÐÐÑÐÐÑÐÐÑ"
 
-#: ../camel/camel-smime-context.c:1244
+#: ../camel/camel-smime-context.c:1243
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME Decrypt: ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÐÑÑÐÐÐÐÐÐÐÐ ÑÐÐÐÑÐÐÐÐÐÐ"
 
-#: ../camel/camel-store.c:2184
+#: ../camel/camel-store.c:2084
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÑ Â%sÂ: ÐÐÐÐÐ ÑÐÐ ÑÑÑÐÑÑÐÑÐÑ"
 
+#: ../camel/camel-store.c:2127
+#, c-format
+msgid "Opening folder '%s'"
+msgstr "ÐÑÐÑÑÑÐÐ ÐÐÐÐÐ Â%sÂ"
+
+#: ../camel/camel-store.c:2314
+#, c-format
+msgid "Scanning folders in '%s'"
+msgstr "ÐÐÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐ ÐÐ Â%sÂ"
+
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2375
-#: ../camel/camel-store.c:2385
+#: ../camel/camel-store.c:2326 ../camel/camel-store.c:2336
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "ÐÐÑÐÐÐÐ"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2378
-#: ../camel/camel-store.c:2389
+#: ../camel/camel-store.c:2329 ../camel/camel-store.c:2340
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "ÐÐÐÐ"
 
-#: ../camel/camel-store.c:2832
+#: ../camel/camel-store.c:2791
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÑ: %s: ÐÐÐÐÐ ÑÑÑÐÑÑÐÑÐÑ"
 
-#: ../camel/camel-store.c:2959
-#: ../camel/camel-vee-store.c:367
+#: ../camel/camel-store.c:2805
+#, c-format
+msgid "Creating folder '%s'"
+msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÐÐ Â%sÂ"
+
+#: ../camel/camel-store.c:2923 ../camel/camel-vee-store.c:350
 #: ../camel/providers/local/camel-maildir-store.c:272
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÑ: %s: ÐÐÐÐÐÑÑÑÐÐÐÑ ÐÐÐÑÐÑÐÑ"
 
-#: ../camel/camel-store.c:3100
-#: ../camel/camel-vee-store.c:417
-#: ../camel/providers/local/camel-maildir-store.c:668
+#: ../camel/camel-store.c:3066 ../camel/camel-vee-store.c:400
+#: ../camel/providers/local/camel-maildir-store.c:704
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÐÐÐÐÐÑÑ ÐÐÐÐÑ: %s: ÐÐÐÐÐÑÑÑÐÐÐÑ ÐÐÐÑÐÑÐÑ"
 
-#: ../camel/camel-tcp-stream-raw.c:749
-#: ../camel/camel-tcp-stream-raw.c:760
+#: ../camel/camel-stream-filter.c:327
+msgid "Only reset to beginning is supported with CamelStreamFilter"
+msgstr "ÐÐÑ CamelStreamFilter ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ ÑÐÐÑÐÐ ÐÐÑÐÑÐÐ Ð ÐÐÑÐÐÑ"
+
+#: ../camel/camel-stream-process.c:265
+#, c-format
+msgid "Connection cancelled"
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐ"
+
+#: ../camel/camel-stream-process.c:270
+#, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ ÐÐÐÐÐÐÐÐ Â%sÂ: %s"
+
+#: ../camel/camel-tcp-stream-raw.c:749 ../camel/camel-tcp-stream-raw.c:760
 #, c-format
 msgid "The proxy host does not support SOCKS4"
 msgstr "ÐÐÐÐ ÐÑÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑ SOCKS4"
@@ -2769,15 +2756,13 @@ msgstr "ÐÐÐÐ ÐÑÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑ SOCKS4"
 msgid "The proxy host denied our request: code %d"
 msgstr "ÐÐÐÐ ÐÑÐÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÑÐÑ: ÐÐÐ %d"
 
-#: ../camel/camel-tcp-stream-raw.c:867
-#: ../camel/camel-tcp-stream-raw.c:873
+#: ../camel/camel-tcp-stream-raw.c:867 ../camel/camel-tcp-stream-raw.c:873
 #, c-format
 msgid "The proxy host does not support SOCKS5"
 msgstr "ÐÐÐÐ ÐÑÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑ SOCKS5"
 
 #: ../camel/camel-tcp-stream-raw.c:879
 #, c-format
-#| msgid "No support for authentication type %s"
 msgid "Could not find a suitable authentication type: code 0x%x"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÐ ÐÐÐÑÐÐÑÑÐÐ ÑÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÐ: ÐÐÐ 0x%x"
 
@@ -2798,7 +2783,6 @@ msgid "Host is unreachable from SOCKS server"
 msgstr "ÐÐÐÐ ÐÐÐÐÑÑÑÐÐÐ ÑÐÑÐÐ ÑÐÑÐÐÑ SOCKS"
 
 #: ../camel/camel-tcp-stream-raw.c:895
-#| msgid "Connection canceled"
 msgid "Connection refused"
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÐ"
 
@@ -2807,17 +2791,14 @@ msgid "Time-to-live expired"
 msgstr "ÐÑÐÐÑÑÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÐ ÐÑÐÐÑ ÐÐÐÐÐÐÐÑ"
 
 #: ../camel/camel-tcp-stream-raw.c:897
-#| msgid "STLS not supported by server"
 msgid "Command not supported by SOCKS server"
 msgstr "ÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ ÑÐÑÐÐÑÐÐ SOCKS"
 
 #: ../camel/camel-tcp-stream-raw.c:898
-#| msgid "STLS not supported by server"
 msgid "Address type not supported by SOCKS server"
 msgstr "ÐÐÐ ÐÐÑÐÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ ÑÐÑÐÐÑÐÐ SOCKS"
 
 #: ../camel/camel-tcp-stream-raw.c:899
-#| msgid "Unknown error: %s"
 msgid "Unknown error from SOCKS server"
 msgstr "ÐÐÐÑÑÐÐÐ ÐÐÐÐÐÐÑÑÐÐÑ ÐÑÐÐÐÐ ÐÑ ÑÐÑÐÐÑÐ SOCKS"
 
@@ -2828,7 +2809,6 @@ msgstr "ÐÑ ÑÐÑÐÐÑÐ SOCKS ÐÐÐÑÑÐÐ ÐÐÑÐÑ ÐÐÐÐÐÐÑÑÐÐ
 
 #: ../camel/camel-tcp-stream-raw.c:950
 #, c-format
-#| msgid "Invalid response from server"
 msgid "Incomplete reply from SOCKS server"
 msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÐÐÑÐ ÐÑÐÐÑ ÐÑ ÑÐÑÐÐÑÐ SOCKS"
 
@@ -2839,14 +2819,12 @@ msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐ ÐÐÑ ÑÐÐÐ (ÐÐÐÑÐÐÐÐÑÐÐÐ
 
 #. SOCKS5
 #. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:1002
-#: ../camel/camel-tcp-stream-raw.c:1012
+#: ../camel/camel-tcp-stream-raw.c:1002 ../camel/camel-tcp-stream-raw.c:1012
 #, c-format
-#| msgid "Invalid response from server"
 msgid "Invalid reply from proxy server"
 msgstr "ÐÐÐÐÐÑÑÑÐÐÑÐ ÐÑÐÐÑ ÐÑ ÐÑÐÐÑÐ-ÑÐÑÐÐÑÐ"
 
-#: ../camel/camel-tcp-stream-ssl.c:457
+#: ../camel/camel-tcp-stream-ssl.c:453
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2859,16 +2837,16 @@ msgstr ""
 "ÐÑÐÐÑÐÑÐÐ:         %s\n"
 "ÐÐÐÐÐÑÑ:           %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:463
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "GOOD"
 msgstr "GOOD"
 
-#: ../camel/camel-tcp-stream-ssl.c:463
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "BAD"
 msgstr "BAD"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:467
+#: ../camel/camel-tcp-stream-ssl.c:463
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2883,7 +2861,7 @@ msgstr ""
 "\n"
 "ÐÑÑ ÑÐÐÐÐ ÐÑÐÐÑÑÑ?"
 
-#: ../camel/camel-tcp-stream-ssl.c:511
+#: ../camel/camel-tcp-stream-ssl.c:507
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2892,7 +2870,7 @@ msgstr ""
 "ÐÑÐÐÐÐÐÐ Ñ ÑÐÑÑÐÑÐÐÐÑÐÐ: %s\n"
 "ÐÐÑÑÐÐÑÐÐ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:563
+#: ../camel/camel-tcp-stream-ssl.c:559
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2901,7 +2879,7 @@ msgstr ""
 "ÐÐÐÐÑÑÐÐÑÐÑÐ ÐÐÐÐÐ ÑÐÑÑÐÑÐÐÐÑÐ: %s\n"
 "ÐÐÑÑÐÐÑÐÐ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:581
+#: ../camel/camel-tcp-stream-ssl.c:577
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2910,7 +2888,7 @@ msgstr ""
 "ÐÑÑÐÐ ÑÑÐÐ ÐÐÐÑÑÐÐÑ ÑÐÑÑÐÑÐÐÐÑÐ: %s\n"
 "ÐÐÑÑÐÐÑÐÐ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:598
+#: ../camel/camel-tcp-stream-ssl.c:594
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2919,40 +2897,38 @@ msgstr ""
 "ÐÑÑÐÐ ÑÑÐÐ ÐÐÐÑÑÐÐÑ ÑÐÐÑÐÐ ÐÐÐÑÐÐÑÐÐÐÐÐÑÑ ÑÐÑÑÐÑÐÐÐÑÐÐ: %s\n"
 "ÐÐÑÑÐÐÑÐÐ: %s"
 
-#: ../camel/camel-url.c:316
+#: ../camel/camel-url.c:330
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÐÑÑ URL Â%sÂ"
 
-#: ../camel/camel-vee-folder.c:1240
-#: ../camel/camel-vee-folder.c:1403
+#: ../camel/camel-vee-folder.c:1279 ../camel/camel-vee-folder.c:1442
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÐÐÐÑÑ ÐÐÐ ÐÐÑÐÐÐÑÑÐÑÑ ÑÐÐÐÑÐÐÐÑ Ð ÐÐÑÑÑÐÐÑÐÑÑ ÐÐÐÐÑ"
 
-#: ../camel/camel-vee-folder.c:1276
+#: ../camel/camel-vee-folder.c:1315
 #, c-format
 msgid "No such message %s in %s"
 msgstr "ÐÐÑ ÑÐÐÐÑÐÐÐÑ %s Ð %s"
 
-#: ../camel/camel-vee-folder.c:1344
+#: ../camel/camel-vee-folder.c:1383
 #, c-format
-#| msgid "Error storing '%s': %s"
 msgid "Error storing '%s': "
 msgstr "ÐÑÐÐÐÐ ÐÑÐ ÑÑÐÐÐÐÐÐ Â%sÂ: "
 
-#: ../camel/camel-vee-store.c:141
-#: ../camel/camel-vee-store.c:143
-#: ../camel/camel-vee-store.c:322
+#. 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
 msgid "Unmatched"
 msgstr "ÐÑÐÑÐÐ"
 
-#: ../camel/camel-vee-store.c:393
+#: ../camel/camel-vee-store.c:376
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÑ: %s: ÐÐÑ ÑÐÐÐÐ ÐÐÐÐÐ"
 
-#: ../camel/camel-vee-store.c:427
+#: ../camel/camel-vee-store.c:410
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÐÐÐÐÐÑÑ ÐÐÐÐÑ: %s: ÐÐÑ ÑÐÐÐÐ ÐÐÐÐÐ"
@@ -2965,272 +2941,24 @@ msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÑÑÐÑÑ ÑÐÐÐÑÐÐÐÑ Ð ÐÐÑ
 msgid "Cannot copy messages to the Junk folder"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÑÑÐÑÑ ÑÐÐÐÑÐÐÐÑ Ð ÐÐÐÐÑ ÂÐÐÐÐÂ"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:958
-#: ../camel/providers/imap/camel-imap-folder.c:395
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÐÑÑ ÐÑÐÑÐÑÑ ÐÐÑÐÑÐÐÑÐÑ Ð %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1034
-#, c-format
-msgid "Checking for deleted messages %s"
-msgstr "ÐÑÐÐÐÑÐÐ ÑÐÐÐÑÐÐÑÑ ÑÐÐÐÑÐÐÐÐ %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1521
-#: ../camel/providers/groupwise/camel-groupwise-store.c:669
-#: ../camel/providers/groupwise/camel-groupwise-store.c:800
-#: ../camel/providers/imap/camel-imap-folder.c:3965
-#: ../camel/providers/imap/camel-imap-folder.c:4047
-#: ../camel/providers/imapx/camel-imapx-server.c:3871
-#: ../camel/providers/imapx/camel-imapx-server.c:4002
-#, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "ÐÐÐÑÑÐÐÐÐ ÐÑÐÑÐÐÐ ÐÐÑÐÑÐÐÑÐÐ ÐÐ ÐÐÐÑÐ ÑÐÐÐÑÐÐÐÑÐ ÐÐ %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1991
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2044
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2708
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2718
-#, c-format
-msgid "Could not get message"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÑÐÐÐÑÐÐÐÐ"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2428
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2478
-#, c-format
-msgid "Cannot append message to folder '%s': %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ Ð ÐÐÐÐÐ Â%sÂ: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2464
-#, c-format
-msgid "Cannot create message: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2644
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÑÐÐÐÑÐÐÐÐ: %s\n"
-"  %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2644
-#: ../camel/providers/local/camel-maildir-folder.c:100
-#: ../camel/providers/local/camel-maildir-folder.c:307
-#: ../camel/providers/local/camel-mbox-folder.c:117
-#: ../camel/providers/local/camel-mbox-folder.c:325
-#: ../camel/providers/local/camel-mh-folder.c:156
-msgid "No such message"
-msgstr "ÐÐÑ ÑÐÐÐÐÐ ÑÐÐÐÑÐÐÐÑ"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2663
-#: ../camel/providers/nntp/camel-nntp-folder.c:251
-#: ../camel/providers/nntp/camel-nntp-folder.c:418
-#: ../camel/providers/pop3/camel-pop3-folder.c:455
-#, c-format
-#| msgid "Cannot get message %s: %s"
-msgid "Cannot get message %s: "
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÑÐÐÐÑÐÐÐÐ %s: "
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2681
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2691
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2894
-#, c-format
-msgid "This message is not available in offline mode."
-msgstr "ÐÑÐ ÑÐÐÐÑÐÐÐÐ ÐÐÐÐÑÑÑÐÐÐ Ð ÐÐÑÐÐÐÐÐÐÐ ÑÐÐÐÐÐ."
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:248
-#, c-format
-msgid "Cannot get folder container %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÐÐÑÐÐÐÐÑ ÐÐÐÐÐ %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:318
-#, c-format
-msgid "Cannot append message in offline mode: cache unavailable"
-msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ Ð ÐÐÑÐÐÐÐÐÐÐ ÑÐÐÐÐÐ: ÐÑÑ ÐÐÐÐÑÑÑÐÐÐ"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:335
-#| msgid "Cannot append message in offline mode: %s"
-msgid "Cannot append message in offline mode: "
-msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ Ð ÐÐÑÐÐÐÐÐÐÐ ÑÐÐÐÐÐ: "
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
-msgid "Checking for new mail"
-msgstr "ÐÑÐÐÐÑÐÐ ÐÐÐÐÐ ÐÐÑÑÑ"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
-#: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
-msgid "C_heck for new messages in all folders"
-msgstr "Ð_ÑÐÐÐÑÑÑÑ ÐÐÐÑÑ ÐÐÑÑÑ ÐÐ ÐÑÐÑ ÐÐÐÐÐÑ"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
-#: ../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:82
-#: ../camel/providers/local/camel-local-provider.c:102
-msgid "Options"
-msgstr "ÐÐÑÐÐÐÑÑÑ"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
-msgid "_Apply filters to new messages in Inbox on this server"
-msgstr "_ÐÑÐÐÐÐÐÑÑ ÑÐÐÑÑÑÑ Ð ÐÐÐÑÐ ÑÐÐÐÑÐÐÐÑÐ Ð ÐÐÐÐÐ ÂÐÑÐÐÑÑÐÐÂ ÐÐ ÑÑÐÐ ÑÐÑÐÐÑÐ"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
-msgid "Check new messages for J_unk contents"
-msgstr "ÐÑÐÐÐÑÑÑÑ, ÑÐÐÑÑÑÑÑ ÐÐ ÐÐÐÑÐ ÑÐÐÐÑÐÐÐÑ ÑÐÐÐÐÐ"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imapx/camel-imapx-provider.c:78
-msgid "Only check for Junk messages in the IN_BOX folder"
-msgstr "ÐÑÐÐÐÑÑÑÑ, ÑÐÐÑÑÑÑÑ ÐÐ ÐÐÐÑÐ ÑÐÐÐÑÐÐÐÑ _ÑÐÐÐÐÐ, ÑÐÐÑÐÐ Ð ÐÐÐÐÐ ÂÐÑÐÐÑÑÐÐÂ"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
-msgid "Automatically synchroni_ze account locally"
-msgstr "ÐÐÑÐÐÐÑÐÑÐÑÐÐ ÑÐÐÑÑÐÐÐ_ÐÐÑÐÐÐÑÑ ÑÑÑÑÐÑÑ ÐÐÐÐÑÑ ÐÐÐÐÐÑÐÐ"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
-msgid "SOAP Settings"
-msgstr "ÐÐÑÐÐÐÑÑÑ SOAP"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
-msgid "Post Office Agent SOAP _Port:"
-msgstr "_ÐÐÑÑ SOAP ÐÐÐÐÑÐ Post Office:"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
-msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
-msgid "For accessing Novell GroupWise servers"
-msgstr "ÐÐÑ ÐÐÑÑÑÐÐ Ð ÑÐÑÐÐÑÐÐ Novell Groupwise"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:98
-#: ../camel/providers/imap/camel-imap-provider.c:97
-#: ../camel/providers/imapx/camel-imapx-provider.c:104
-#: ../camel/providers/nntp/camel-nntp-provider.c:72
-#: ../camel/providers/pop3/camel-pop3-provider.c:73
-msgid "Password"
-msgstr "ÐÐÑÐÐÑ"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:100
-msgid "This option will connect to the GroupWise server using a plaintext password."
-msgstr "ÐÐÐÐÐÑÑÐÐÐÐ Ð ÑÐÑÐÐÑÑ IMAP ÐÑÐÐÑ ÐÑÐÐÐÐÐÐÐÑÑÑÑ Ñ ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÑÐÐÐÐÐÐÐÐ ÐÐÑÐÐÑ."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:107
-#, c-format
-msgid "Host or user not available in url"
-msgstr "ÐÐÐÐ ÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÑ ÐÐÐÐÑÑÑÐÐÑ Ð url"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:209
-#: ../camel/providers/imap/camel-imap-store.c:801
-#: ../camel/providers/imapx/camel-imapx-server.c:3085
-#, c-format
-msgid "You did not enter a password."
-msgstr "ÐÑ ÐÐ ÐÐÐÐÐ ÐÐÑÐÐÑ."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:332
-msgid "Some features may not work correctly with your current server version"
-msgstr "ÐÐÐÐÑÐÑÑÐ ÑÑÐÐÑÐÐ ÐÐÐÑÑ ÐÐÐÐÑÑÐÐÑÐÐ ÑÐÐÐÑÐÑÑ Ñ ÐÐÑÐÐ ÐÐÑÑÐÐÐ ÑÐÑÐÐÑÐ"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:560
-#: ../camel/providers/imap/camel-imap-store.c:1808
-#: ../camel/providers/imap/camel-imap-store.c:2005
-#: ../camel/providers/imapx/camel-imapx-store.c:342
-#, c-format
-msgid "No such folder %s"
-msgstr "ÐÐÑ ÑÐÐÐÐ ÐÐÐÐÐ %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1221
-#, c-format
-msgid "Cannot create GroupWise folders in offline mode."
-msgstr "ÐÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐ GroupWise Ð ÐÐÑÐÐÐÐÐÐÐ ÑÐÐÐÐÐ."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1230
-#, c-format
-#| msgid "Cannot delete folder '%s': Special folder"
-msgid "Cannot create a special system folder"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÑÐÐÑÑ ÑÐÑÑÐÐÐÑÑ ÐÐÐÐÑ"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1240
-#: ../camel/providers/imap/camel-imap-store.c:1886
-#: ../camel/providers/imap/camel-imap-store.c:2323
-#: ../camel/providers/imapx/camel-imapx-store.c:1341
-#, c-format
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "ÐÑÐ ÐÐÐÐÐ ÐÐ ÐÐÐÐÑ ÑÐÐÐÑÐÐÑÑ ÐÐÐÐÐÐÐÐ"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1325
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1350
-#, c-format
-msgid "Cannot rename GroupWise folder '%s' to '%s'"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÐÐÐÐÐÑÑ ÐÐÐÐÑ Groupwise Â%s РÂ%sÂ"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1384
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:47
-#, c-format
-msgid "GroupWise server %s"
-msgstr "ÐÐÑÐÐÑ GroupWise %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1386
-#, c-format
-msgid "GroupWise service for %s on %s"
-msgstr "ÐÐÑÐÐÑ GroupWise ÐÐÑ %s ÐÐ %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:51
-#, c-format
-msgid "GroupWise mail delivery via %s"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÑÑ Groupwise Ñ ÐÐÐÐÑÑÑ %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:97
-msgid "Sending Message"
-msgstr "ÐÑÐÑÐÐÐÐ ÑÐÐÐÑÐÐÐÑ"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:107
-#, c-format
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÐÐÐÑ: ÐÐÐÐÐÑÑÑÐÐÐÑ ÐÐÐÑÐÑÐÑ Ð ÑÑÐÐ ÑÑÐÐÐÐÐÑÐ"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
-#, c-format
-msgid "You have exceeded this account's storage limit. Your messages are queued in your Outbox. Resend by pressing Send/Receive after deleting/archiving some of your mail.\n"
-msgstr "ÐÑ ÐÑÐÐÑÑÐÐÐ ÐÐÑÐÐÐÑÐÐÐÐ ÐÐÑÑÐ ÐÐÑ ÑÑÐÐ ÑÑÐÑÐÐÐ ÐÐÐÐÑÐ. ÐÐÑÐ ÑÐÐÐÑÐÐÐÑ ÐÐÑÑÐÐÐÐÐÑ Ð ÐÑÐÑÐÐÑ Ð ÐÐÐÐÐ ÂÐÑÑÐÐÑÑÐÐÂ. ÐÐÐÑÐÑÐÑÐ ÐÑÐÑÐÐÐÑ, ÐÐÐÐÐ ÐÐÐÐÐÑ ÂÐÑÐÑÐÐÐÑÑ/ÐÐÐÑÑÐÑÑÂ, ÐÐÑÐÐ ÑÐÐÐÐÐÐÑ ÐÐÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÑÑÐÐ ÐÐÑÐÑ ÑÐÐÐÑÐÐÐÐ.\n"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:159
-#, c-format
-msgid "Could not send message: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:197
-#: ../camel/providers/imap/camel-imap-command.c:301
+#: ../camel/providers/imap/camel-imap-command.c:198
+#: ../camel/providers/imap/camel-imap-command.c:293
 #, c-format
 msgid "No output stream"
 msgstr "ÐÑÑÑÑÑÑÐÑÐÑ ÐÐÑÐÐÐ ÐÑÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-command.c:205
-#: ../camel/providers/imap/camel-imap-command.c:309
+#: ../camel/providers/imap/camel-imap-command.c:206
+#: ../camel/providers/imap/camel-imap-command.c:301
 #, c-format
 msgid "No input stream"
 msgstr "ÐÑÑÑÑÑÑÐÑÐÑ ÐÐÑÐÐ ÐÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-command.c:255
-#, c-format
-msgid "Operation cancelled"
-msgstr "ÐÐÐÑÐÑÐÑ ÐÑÐÐÐÐÐÐ"
-
-#: ../camel/providers/imap/camel-imap-command.c:373
+#: ../camel/providers/imap/camel-imap-command.c:365
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "ÐÐÑÐÐÑ ÐÐÐÐÐÐÐÐÐÐ ÐÑÐÐÑÑÐÐÑÑ: %s"
 
-#. for imap ALERT codes, account user host
-#. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:394
+#: ../camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -3239,87 +2967,98 @@ msgstr ""
 "ÐÑÐÐÐÐÐÐÐ ÑÐÐÐÑÐÐÐÐ ÐÑ ÑÐÑÐÐÑÐ IMAP %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:468
+#: ../camel/providers/imap/camel-imap-command.c:471
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "ÐÐÐÐÐÐÐÐÐÑÐ ÐÑÐÐÑ ÐÑ ÑÐÑÐÐÑÐ IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:480
+#: ../camel/providers/imap/camel-imap-command.c:483
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑ IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:560
+#: ../camel/providers/imap/camel-imap-command.c:563
 #, c-format
 msgid "Server response ended too soon."
 msgstr "ÐÐ ÐÐÐÐÑÐ ÐÑÐÐÑ ÑÐÑÐÐÑÐ."
 
-#: ../camel/providers/imap/camel-imap-command.c:771
+#: ../camel/providers/imap/camel-imap-command.c:774
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "ÐÑÐÐÑ ÑÐÑÐÐÑÐ IMAP ÐÐ ÑÐÐÐÑÐÐÑ ÐÐÑÐÑÐÐÑÐÐ Ð %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:809
+#: ../camel/providers/imap/camel-imap-command.c:812
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "ÐÐÐÐÐÐÐÐÐÑÐ ÐÑÐÐÑ ÂOKÂ ÐÑ ÑÐÑÐÐÑÐ IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:296
+#: ../camel/providers/imap/camel-imap-folder.c:293
 msgid "Always check for new mail in this folder"
 msgstr "ÐÑÐÐÐÐ ÐÑÐÐÐÑÑÑÑ ÐÐÐÐÑÐÐ ÐÐÐÐÐ ÐÐÑÑÑ Ð ÑÑÐÐ ÐÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:372
+#: ../camel/providers/imap/camel-imap-folder.c:368
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÐ %s: %s"
 
+#: ../camel/providers/imap/camel-imap-folder.c:391
+#, c-format
+msgid "Could not load summary for %s"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÐÑÑ ÐÑÐÑÐÑÑ ÐÐÑÐÑÐÐÑÐÑ Ð %s"
+
 #: ../camel/providers/imap/camel-imap-folder.c:995
-#: ../camel/providers/imapx/camel-imapx-server.c:3915
+#: ../camel/providers/imapx/camel-imapx-server.c:3984
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "ÐÐÐÑÐ ÐÐÐÐÐÑÐÐÑÑ ÑÐÐÐÑÐÐÐÐ Ð %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3372
-#| msgid "Unable to retrieve message: %s"
+#: ../camel/providers/imap/camel-imap-folder.c:3380
 msgid "Unable to retrieve message: "
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÑÐÐÐÑÐÐÐÐ: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:3407
-#: ../camel/providers/imapx/camel-imapx-server.c:5195
+#: ../camel/providers/imap/camel-imap-folder.c:3415
+#: ../camel/providers/imapx/camel-imapx-server.c:5319
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÑÐÐÐÑÐÐÐÐ Ñ ÐÐÐÐÑÐÑÐÐÐÑÐÑÐÐ %s: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3408
-#: ../camel/providers/imapx/camel-imapx-server.c:5196
+#: ../camel/providers/imap/camel-imap-folder.c:3416
+#: ../camel/providers/imapx/camel-imapx-server.c:5320
 msgid "No such message available."
 msgstr "ÐÐÑ ÑÐÐÐÐÐ ÑÐÐÐÑÐÐÐÑ."
 
-#: ../camel/providers/imap/camel-imap-folder.c:3483
-#: ../camel/providers/imap/camel-imap-folder.c:4378
+#: ../camel/providers/imap/camel-imap-folder.c:3491
+#: ../camel/providers/imap/camel-imap-folder.c:4391
 #: ../camel/providers/nntp/camel-nntp-folder.c:407
 #, c-format
 msgid "This message is not currently available"
 msgstr "ÐÑÐ ÑÐÐÐÑÐÐÐÐ Ð ÐÐÑÑÐÑÑÐÐ ÐÐÐÐÐÑ ÐÐÐÐÑÑÑÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4179
+#: ../camel/providers/imap/camel-imap-folder.c:3975
+#: ../camel/providers/imap/camel-imap-folder.c:4058
+#: ../camel/providers/imapx/camel-imapx-server.c:3940
+#: ../camel/providers/imapx/camel-imapx-server.c:4082
+#, c-format
+msgid "Fetching summary information for new messages in %s"
+msgstr "ÐÐÐÑÑÐÐÐÐ ÐÑÐÑÐÐÐ ÐÐÑÐÑÐÐÑÐÐ ÐÐ ÐÐÐÑÐ ÑÐÐÐÑÐÐÐÑÐ ÐÐ %s"
+
+#: ../camel/providers/imap/camel-imap-folder.c:4192
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÑÐÐÑ ÑÐÑÐÐÑÐ: ÐÐ ÐÑÐÐÐÑÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÑÐÑ Ð ÑÐÐÐÑÐÐÐÐ %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4189
+#: ../camel/providers/imap/camel-imap-folder.c:4202
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÑÐÐÑ ÑÐÑÐÐÑÐ: ÐÑÑÑÑÑÑÐÑÐÑ UID ÐÐÑ ÑÐÐÐÑÐÐÐÑ %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4418
+#: ../camel/providers/imap/camel-imap-folder.c:4431
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÐ ÑÐÐÐ ÑÐÐÐÑÐÐÐÑ Ð ÐÑÐÐÑÐ ÐÐ ÐÐÐÐÐÐÑ FETCH."
 
 #: ../camel/providers/imap/camel-imap-message-cache.c:193
 #: ../camel/providers/imap/camel-imap-message-cache.c:253
-#| msgid "Could not open cache directory: %s"
 msgid "Could not open cache directory: "
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÑÑÑ ÐÐÑÐÐÐÐ ÐÑÑÐ: "
 
@@ -3330,13 +3069,11 @@ msgstr "ÐÐÐÐ ÐÑÐ ÐÑÑÐÑÐÐÐÐÐÐ ÑÐÐÐÑÐÐÐÑ %s: %s"
 
 #: ../camel/providers/imap/camel-imap-message-cache.c:391
 #, c-format
-#| msgid "Failed to cache message %s: %s"
 msgid "Failed to cache message %s: "
 msgstr "ÐÐÐÐ ÐÑÐ ÐÑÑÐÑÐÐÐÐÐÐ ÑÐÐÐÑÐÐÐÑ %s: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:529
+#: ../camel/providers/imap/camel-imap-message-cache.c:531
 #, c-format
-#| msgid "Failed to cache %s: %s"
 msgid "Failed to cache %s: "
 msgstr "ÐÐÐÐ ÐÑÐ ÐÑÑÐÑÐÐÐÐÐÐ %s: "
 
@@ -3345,6 +3082,11 @@ msgstr "ÐÐÐÐ ÐÑÐ ÐÑÑÐÑÐÐÐÐÐÐ %s: "
 msgid "Checking for New Mail"
 msgstr "ÐÑÐÐÐÑÐÐ ÐÐÐÐÐ ÐÐÑÑÑ"
 
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
+msgid "C_heck for new messages in all folders"
+msgstr "Ð_ÑÐÐÐÑÑÑÑ ÐÐÐÑÑ ÐÐÑÑÑ ÐÐ ÐÑÐÑ ÐÐÐÐÐÑ"
+
 #: ../camel/providers/imap/camel-imap-provider.c:44
 #: ../camel/providers/imapx/camel-imapx-provider.c:48
 msgid "Ch_eck for new messages in subscribed folders"
@@ -3361,7 +3103,6 @@ msgid "_Use custom command to connect to server"
 msgstr "_ÐÑÐÐÐÑÐÐÐÐÑÑ ÑÐÐÑ ÑÑÑÐÐÑ ÐÐÑ ÐÐÐÐÐÑÑÐÐÐÑ Ð ÑÐÑÐÐÑÑ"
 
 #: ../camel/providers/imap/camel-imap-provider.c:52
-#| msgid "Command:"
 msgid "Co_mmand:"
 msgstr "ÐÐ_ÐÐÐÐÐ:"
 
@@ -3382,109 +3123,123 @@ msgid "O_verride server-supplied folder namespace"
 msgstr "ÐÐ_ÑÐÐÐÑÐÐÐÐÑÑÑ ÐÑÐÐÐÐÐÐÐÐÐÐ ÑÐÑÐÐÑÐÐ ÐÑÐÑÑÑÐÐÑÑÐÐ ÐÐÑÐ ÐÐÐÐÐ"
 
 #: ../camel/providers/imap/camel-imap-provider.c:62
-#| msgid "Namespace:"
 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
+msgid "Options"
+msgstr "ÐÐÑÐÐÐÑÑÑ"
+
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
+msgid "_Apply filters to new messages in Inbox on this server"
+msgstr ""
+"_ÐÑÐÐÐÐÐÑÑ ÑÐÐÑÑÑÑ Ð ÐÐÐÑÐ ÑÐÐÐÑÐÐÐÑÐ Ð ÐÐÐÐÐ ÂÐÑÐÐÑÑÐÐÂ ÐÐ ÑÑÐÐ ÑÐÑÐÐÑÐ"
+
 #: ../camel/providers/imap/camel-imap-provider.c:68
 #: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "Check new messages for Jun_k contents"
 msgstr "ÐÑÐÐÐÑÑÑÑ, ÑÐÐÑÑÑÑÑ ÐÐ ÐÐÐÑÐ ÑÐÐÐÑÐÐÐÑ _ÑÐÐÐÐÐ"
 
+#: ../camel/providers/imap/camel-imap-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:78
+msgid "Only check for Junk messages in the IN_BOX folder"
+msgstr ""
+"ÐÑÐÐÐÑÑÑÑ, ÑÐÐÑÑÑÑÑ ÐÐ ÐÐÐÑÐ ÑÐÐÐÑÐÐÐÑ _ÑÐÐÐÐÐ, ÑÐÐÑÐÐ Ð ÐÐÐÐÐ ÂÐÑÐÐÑÑÐÐÂ"
+
 #: ../camel/providers/imap/camel-imap-provider.c:72
 #: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "ÐÐÑÐÐÐÑÐÑÐÑÐÐ ÑÐÐÑÑÐÐÐ_ÐÐÑÐÐÐÑÑ ÑÐÐÐÐÐÐÑÑ ÐÐÑÑÑ ÐÐÐÐÐÑÐÐ"
 
+#: ../camel/providers/imap/camel-imap-provider.c:78
+msgid "IMAP default port"
+msgstr "ÐÐÑÑ ÐÐ ÑÐÐÐÑÐÐÐÑ ÐÐÑ IMAP"
+
 #: ../camel/providers/imap/camel-imap-provider.c:79
+#: ../camel/providers/imapx/camel-imapx-provider.c:87
+msgid "IMAP over SSL"
+msgstr "IMAP ÐÐÐÐÑÑ SSL"
+
+#: ../camel/providers/imap/camel-imap-provider.c:85
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:81
-#: ../camel/providers/imapx/camel-imapx-provider.c:90
+#: ../camel/providers/imap/camel-imap-provider.c:87
+#: ../camel/providers/imapx/camel-imapx-provider.c:96
 msgid "For reading and storing mail on IMAP servers."
 msgstr "ÐÐÑ ÑÑÐÐÐÑ Ð ÑÑÐÐÐÐÐÑ ÐÐÑÑÑ ÐÐ ÑÐÑÐÐÑÐÑ IMAP."
 
-#: ../camel/providers/imap/camel-imap-provider.c:99
-#: ../camel/providers/imapx/camel-imapx-provider.c:106
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "ÐÐÐÐÐÑÑÐÐÐÐ Ð ÑÐÑÐÐÑÑ IMAP ÐÑÐÐÑ ÐÑÐÐÐÐÐÐÐÑÑÑÑ Ñ ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÑÐÐÐÐÐÐÐÐ ÐÐÑÐÐÑ."
-
-#: ../camel/providers/imap/camel-imap-store.c:243
-#: ../camel/providers/nntp/camel-nntp-store.c:313
-#: ../camel/providers/pop3/camel-pop3-store.c:135
-#: ../camel/providers/smtp/camel-smtp-transport.c:151
-#, c-format
-msgid "Could not connect to %s: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð %s: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:244
-#: ../camel/providers/nntp/camel-nntp-store.c:314
-#: ../camel/providers/pop3/camel-pop3-store.c:136
-#: ../camel/providers/smtp/camel-smtp-transport.c:152
-msgid "SSL unavailable"
-msgstr "SSL ÐÐÐÐÑÑÑÐÐÐ"
+#: ../camel/providers/imap/camel-imap-provider.c:105
+#: ../camel/providers/imapx/camel-imapx-provider.c:113
+#: ../camel/providers/nntp/camel-nntp-provider.c:80
+#: ../camel/providers/pop3/camel-pop3-provider.c:81
+msgid "Password"
+msgstr "ÐÐÑÐÐÑ"
 
-#: ../camel/providers/imap/camel-imap-store.c:264
-#: ../camel/providers/nntp/camel-nntp-store.c:333
-#, c-format
-#| msgid "Could not connect to %s: %s"
-msgid "Could not connect to %s: "
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð %s: "
+#: ../camel/providers/imap/camel-imap-provider.c:107
+#: ../camel/providers/imapx/camel-imapx-provider.c:115
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr ""
+"ÐÐÐÐÐÑÑÐÐÐÐ Ð ÑÐÑÐÐÑÑ IMAP ÐÑÐÐÑ ÐÑÐÐÐÐÐÐÐÑÑÑÑ Ñ ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ "
+"ÐÐÐÐÑÐÑÑÐÐÐÐÐÐÐÐ ÐÐÑÐÐÑ."
 
-#: ../camel/providers/imap/camel-imap-store.c:370
-#: ../camel/providers/imap/camel-imap-store.c:390
-#: ../camel/providers/imap/camel-imap-store.c:397
-#: ../camel/providers/imap/camel-imap-store.c:424
-#: ../camel/providers/imapx/camel-imapx-server.c:2927
-#: ../camel/providers/imapx/camel-imapx-server.c:2967
+#: ../camel/providers/imap/camel-imap-store.c:330
+#: ../camel/providers/imap/camel-imap-store.c:357
+#: ../camel/providers/imap/camel-imap-store.c:384
+#: ../camel/providers/imapx/camel-imapx-server.c:2964
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð ÑÐÑÐÐÑÑ IMAP %s Ð ÐÐÑÐÑÐÐÐÐÐ ÑÐÐÐÐÐ:%s"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð IMAP-ÑÐÑÐÐÑÑ %s Ð ÐÐÑÐÑÐÐÐÐÐ ÑÐÐÐÐÐ:%s"
 
-#: ../camel/providers/imap/camel-imap-store.c:371
-#: ../camel/providers/imapx/camel-imapx-server.c:2928
-#: ../camel/providers/smtp/camel-smtp-transport.c:238
+#: ../camel/providers/imap/camel-imap-store.c:331
+#: ../camel/providers/imapx/camel-imapx-server.c:2965
+#: ../camel/providers/smtp/camel-smtp-transport.c:198
 msgid "STARTTLS not supported"
 msgstr "STARTTLS ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ"
 
-#: ../camel/providers/imap/camel-imap-store.c:391
-#: ../camel/providers/imapx/camel-imapx-server.c:2968
-msgid "SSL negotiations failed"
-msgstr "ÐÐÐÐ ÑÐÐÐÐÑÐÐÐÐÐÐ SSL"
+#: ../camel/providers/imap/camel-imap-store.c:350
+#: ../camel/providers/imapx/camel-imapx-server.c:3003
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: "
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð IMAP-ÑÐÑÐÐÑÑ %s Ð ÐÐÑÐÑÑÐÐÐÐ ÑÐÐÐÐÐ: "
 
-#: ../camel/providers/imap/camel-imap-store.c:398
-#: ../camel/providers/smtp/camel-smtp-transport.c:285
+#: ../camel/providers/imap/camel-imap-store.c:358
+#: ../camel/providers/smtp/camel-smtp-transport.c:244
 msgid "SSL is not available in this build"
 msgstr "SSL ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ Ð ÑÑÐÐ ÑÐÐÑÐÐ"
 
-#: ../camel/providers/imap/camel-imap-store.c:549
-#: ../camel/providers/imapx/camel-imapx-server.c:2755
-#, c-format
-msgid "Connection cancelled"
-msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐ"
-
-#: ../camel/providers/imap/camel-imap-store.c:554
-#: ../camel/providers/imapx/camel-imapx-server.c:2760
-#, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ ÐÐÐÐÐÐÐÐ Â%sÂ: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:740
-#: ../camel/providers/imapx/camel-imapx-server.c:3041
+#: ../camel/providers/imap/camel-imap-store.c:681
+#: ../camel/providers/imapx/camel-imapx-server.c:3087
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "ÐÐÑÐÐÑ IMAP %s ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑ ÐÐÑÑÐÐÐÐÐÐÐÑÐ ÑÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÐ %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:752
-#: ../camel/providers/imapx/camel-imapx-server.c:3053
-#: ../camel/providers/smtp/camel-smtp-transport.c:420
+#: ../camel/providers/imap/camel-imap-store.c:692
+#: ../camel/providers/imapx/camel-imapx-server.c:3099
+#: ../camel/providers/smtp/camel-smtp-transport.c:428
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "ÐÑÑÐÐÑÐÑÐÐÐÑÐÑ %s ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ"
 
-#: ../camel/providers/imap/camel-imap-store.c:836
-#: ../camel/providers/imapx/camel-imapx-server.c:3129
+#: ../camel/providers/imap/camel-imap-store.c:703
+#: ../camel/providers/smtp/camel-smtp-transport.c:441
+#, c-format
+msgid "Error creating SASL authentication object."
+msgstr "ÐÑÐÐÐÐ ÐÑÐ ÑÐÐÐÐÐÐÐ ÐÐÑÐÐÑÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÐ SASL."
+
+#: ../camel/providers/imap/camel-imap-store.c:751
+#: ../camel/providers/imapx/camel-imapx-server.c:3143
+#, c-format
+msgid "You did not enter a password."
+msgstr "ÐÑ ÐÐ ÐÐÐÐÐ ÐÐÑÐÐÑ."
+
+#: ../camel/providers/imap/camel-imap-store.c:792
+#: ../camel/providers/imapx/camel-imapx-server.c:3188
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3495,60 +3250,74 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:997
-#: ../camel/providers/imapx/camel-imapx-store.c:183
+#: ../camel/providers/imap/camel-imap-store.c:927
+#: ../camel/providers/imapx/camel-imapx-store.c:252
 #, c-format
 msgid "IMAP server %s"
 msgstr "ÐÐÑÐÐÑ IMAP %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1001
-#: ../camel/providers/imapx/camel-imapx-store.c:185
+#: ../camel/providers/imap/camel-imap-store.c:930
+#: ../camel/providers/imapx/camel-imapx-store.c:255
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "ÐÐÑÐÐÑ IMAP ÐÐÑ %s ÐÐ %s"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1367
-#: ../camel/providers/imap/camel-imap-store.c:2416
-#: ../camel/providers/imapx/camel-imapx-store.c:372
-#: ../camel/providers/imapx/camel-imapx-store.c:794
-#: ../camel/providers/local/camel-maildir-folder.c:409
+#: ../camel/providers/imap/camel-imap-store.c:1471
+#: ../camel/providers/imap/camel-imap-store.c:2555
+#: ../camel/providers/imapx/camel-imapx-store.c:443
+#: ../camel/providers/imapx/camel-imapx-store.c:860
+#: ../camel/providers/local/camel-maildir-folder.c:434
 #: ../camel/providers/local/camel-maildir-store.c:273
-#: ../camel/providers/local/camel-maildir-store.c:615
-#: ../camel/providers/local/camel-maildir-store.c:621
-#: ../camel/providers/local/camel-maildir-store.c:669
-#: ../camel/providers/local/camel-spool-store.c:289
+#: ../camel/providers/local/camel-maildir-store.c:619
+#: ../camel/providers/local/camel-maildir-store.c:625
+#: ../camel/providers/local/camel-maildir-store.c:705
+#: ../camel/providers/local/camel-spool-store.c:324
 msgid "Inbox"
 msgstr "ÐÑÐÐÑÑÐÐ"
 
-#: ../camel/providers/imap/camel-imap-store.c:1822
-#: ../camel/providers/imap/camel-imap-store.c:2259
-#: ../camel/providers/imapx/camel-imapx-store.c:1320
+#: ../camel/providers/imap/camel-imap-store.c:1938
+#: ../camel/providers/imap/camel-imap-store.c:2140
+#: ../camel/providers/imapx/camel-imapx-store.c:419
+#, c-format
+msgid "No such folder %s"
+msgstr "ÐÐÑ ÑÐÐÐÐ ÐÐÐÐÐ %s"
+
+#: ../camel/providers/imap/camel-imap-store.c:1952
+#: ../camel/providers/imap/camel-imap-store.c:2399
+#: ../camel/providers/imapx/camel-imapx-store.c:1385
 #, c-format
-msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "ÐÐÐÐÐÑÑÑÐÐÐÐ ÐÐÑ ÐÐÐÐÐ Â%sÂ: ÐÐÑ ÑÐÐÐÑÐÐÑ ÑÐÐÐÐÐ Â%cÂ"
 
-#: ../camel/providers/imap/camel-imap-store.c:1939
+#: ../camel/providers/imap/camel-imap-store.c:2016
+#: ../camel/providers/imap/camel-imap-store.c:2463
+#: ../camel/providers/imapx/camel-imapx-store.c:1406
+#, c-format
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "ÐÑÐ ÐÐÐÐÐ ÐÐ ÐÐÐÐÑ ÑÐÐÐÑÐÐÑÑ ÐÐÐÐÐÐÐÐ"
+
+#: ../camel/providers/imap/camel-imap-store.c:2069
 #: ../camel/providers/local/camel-maildir-store.c:244
-#: ../camel/providers/local/camel-mbox-store.c:407
-#: ../camel/providers/local/camel-mh-store.c:504
+#: ../camel/providers/local/camel-mbox-store.c:416
+#: ../camel/providers/local/camel-mh-store.c:566
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÑ Â%sÂ: ÐÐÐÐÐ ÑÑÑÐÑÑÐÑÐÑ."
 
-#: ../camel/providers/imap/camel-imap-store.c:2272
-#: ../camel/providers/imapx/camel-imapx-store.c:1331
+#: ../camel/providers/imap/camel-imap-store.c:2412
+#: ../camel/providers/imapx/camel-imapx-store.c:1396
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "ÐÐÐÐÐÐÑÑÐÐÑ ÑÐÐÐÑÐÐÑÑÐÐÑ ÐÐÐÐÐ: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3137
+#: ../camel/providers/imap/camel-imap-store.c:3248
 #, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "ÐÐÑÐÐÑ ÐÐÐÐÐÐÐÐÐÐ ÐÑÐÐÑÑÐÐÑÑ"
 
-#: ../camel/providers/imap/camel-imap-store.c:3140
-#| msgid "Server unexpectedly disconnected: %s"
+#: ../camel/providers/imap/camel-imap-store.c:3251
 msgid "Server unexpectedly disconnected: "
 msgstr "ÐÐÑÐÐÑ ÐÐÐÐÐÐÐÐÐÐ ÐÑÐÐÑÑÐÐÑÑ: "
 
@@ -3559,14 +3328,14 @@ msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÑÐÑÐÑÑ ÐÐÑÐÑÐÐÑÐÑ 
 
 #: ../camel/providers/imapx/camel-imapx-folder.c:82
 #, c-format
-#| msgid "Could not create cache for %s"
 msgid "Could not create cache for %s: "
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÑÑ ÐÐÑ %s:"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:42
-#| msgid "Use I_dle if the server supports it"
 msgid "Use _Quick Resync if the server supports it"
-msgstr "ÐÑÐÐÐÑÐÐÐÐÑÑ _ÐÑÑÑÑÑÑ ÑÐÐÑÑÐÐÐÐÐÑÐÑ, ÐÑÐÐ ÑÐÑÐÐÑ ÐÐÐÐÐÑÐÐÐÐÐÑ ÑÐÐÑÑ ÐÐÐÐÐÐÐÐÑÑÑ"
+msgstr ""
+"ÐÑÐÐÐÑÐÐÐÐÑÑ _ÐÑÑÑÑÑÑ ÑÐÐÑÑÐÐÐÐÐÑÐÑ, ÐÑÐÐ ÑÐÑÐÐÑ ÐÐÐÐÐÑÐÐÐÐÐÑ ÑÐÐÑÑ "
+"ÐÐÐÐÐÐÐÐÑÑÑ"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:44
 msgid "Use I_dle if the server supports it"
@@ -3584,40 +3353,34 @@ msgstr "ÐÑÐÐÐÑÐÑÐÐÐÐ _ÐÐÐÐÑÐÑÑÐÐ ÐÑÑÐÑÑÐÐÑÑ ÑÐ
 msgid "Namespace:"
 msgstr "ÐÑÐÑÑÑÐÐÑÑÐÐ ÐÐÑÐ:"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
+#: ../camel/providers/imapx/camel-imapx-provider.c:86
+msgid "Default IMAP port"
+msgstr "ÐÐÑÑ ÐÐ ÑÐÐÐÑÐÐÐÑ ÐÐÑ IMAP"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:94
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1404
-#| msgid "Error writing mail temp file: %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:1488
 msgid "Error writing to cache stream: "
 msgstr "ÐÑÐÐÐÐ ÐÐÐÐÑÐ Ð ÐÐÑÐÐ ÐÑÑÐ: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2083
+#: ../camel/providers/imapx/camel-imapx-server.c:2172
 #, c-format
-#| msgid "Cannot authenticate user"
 msgid "Not authenticated"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÐÐÐÐÑÑ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑ"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2850
-#, c-format
-#| msgid "Could not connect to %s (port %s): %s"
-msgid "Could not connect to %s (port %s): "
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð %s (ÐÐÑÑ %s): "
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3311
-#| msgid "Posting failed: %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:3370
 msgid "Closing tmp stream failed: "
 msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐÐÐ ÐÑÐ ÐÐÐÑÑÐÐ ÐÐÐÑÑÑÑ ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÐ: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5345
-#: ../camel/providers/imapx/camel-imapx-server.c:5360
-#| msgid "Cannot create message: %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:5465
+#: ../camel/providers/imapx/camel-imapx-server.c:5480
 msgid "Cannot create spool file: "
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÑÐÐÐ ÑÐÑÐÐ: "
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1136
-#: ../camel/providers/nntp/camel-nntp-store.c:1610
+#: ../camel/providers/imapx/camel-imapx-store.c:1181
+#: ../camel/providers/nntp/camel-nntp-store.c:1778
 #, c-format
 msgid "No such folder: %s"
 msgstr "ÐÐÑ ÑÐÐÐÐ ÐÐÐÐÐ: %s"
@@ -3629,35 +3392,31 @@ msgstr "ÐÐÑÐÐ ÐÐ ÐÐÑÐÑÐ ÐÐÐÐÑÐ"
 
 #: ../camel/providers/imapx/camel-imapx-stream.c:79
 #, c-format
-#| msgid "service unavailable"
 msgid "Source stream unavailable"
 msgstr "ÐÐÑÐÐ ÐÐÐÐÑÑÑÐÐÐ"
 
-#: ../camel/providers/local/camel-local-folder.c:182
+#: ../camel/providers/local/camel-local-folder.c:178
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:192
-#: ../camel/providers/local/camel-local-folder.c:201
+#: ../camel/providers/local/camel-local-folder.c:188
+#: ../camel/providers/local/camel-local-folder.c:197
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "ÐÐÑÑÐÐÑÐ ÑÑÐÐ: %s: (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:210
+#: ../camel/providers/local/camel-local-folder.c:206
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:470
+#: ../camel/providers/local/camel-local-folder.c:466
 msgid "Index message body data"
 msgstr "ÐÐÐÐÐÑÐÑÐÐÐÑÑ ÐÐÐÐÑÐ ÑÐÐÐ ÑÐÐÐÑÐÐÐÑ"
 
-#: ../camel/providers/local/camel-local-folder.c:683
+#: ../camel/providers/local/camel-local-folder.c:700
 #, c-format
-#| msgid ""
-#| "Cannot get message: %s from folder %s\n"
-#| "  %s"
 msgid ""
 "Cannot get message %s from folder %s\n"
 "%s"
@@ -3677,37 +3436,41 @@ msgstr "ÐÐÑÑÐÐÑÐ ÐÐÑÐÐÐÐÐ Ð ÑÐÑÐÐÑÐ UNIX MH"
 msgid "For storing local mail in MH-like mail directories."
 msgstr "ÐÐÑ ÑÑÐÐÐÐÐÑ ÐÐÐÐÐÑÐÐÐ ÐÐÑÑÑ Ð ÐÐÑÑÐÐÑÑ ÐÐÑÐÐÐÐÐÑ ÑÐÐÐ MH."
 
-#: ../camel/providers/local/camel-local-provider.c:69
+#: ../camel/providers/local/camel-local-provider.c:70
 msgid "Local delivery"
 msgstr "ÐÐÐÐÐÑÐÐÑ ÐÐÑÑÐÐÐÐ"
 
-#: ../camel/providers/local/camel-local-provider.c:70
-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:71
+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:84
-#: ../camel/providers/local/camel-local-provider.c:103
+#: ../camel/providers/local/camel-local-provider.c:86
+#: ../camel/providers/local/camel-local-provider.c:106
 msgid "_Apply filters to new messages in INBOX"
 msgstr "_ÐÑÐÐÐÐÐÑÑ ÑÐÐÑÑÑÑ Ð ÐÐÐÑÐ ÑÐÐÐÑÐÐÐÑÐ Ð ÐÐÐÐÐ ÂÐÑÐÐÑÑÐÐÂ"
 
-#: ../camel/providers/local/camel-local-provider.c:91
+#: ../camel/providers/local/camel-local-provider.c:93
 msgid "Maildir-format mail directories"
 msgstr "ÐÐÑÑÐÐÑÐ ÐÐÑÐÐÐÐÐ Ð ÑÐÑÐÐÑÐ Maildir"
 
-#: ../camel/providers/local/camel-local-provider.c:92
+#: ../camel/providers/local/camel-local-provider.c:94
 msgid "For storing local mail in maildir directories."
 msgstr "ÐÐÑ ÑÑÐÐÐÐÐÑ ÐÐÐÐÐÑÐÐÐ ÐÐÑÑÑ Ð ÐÐÑÑÐÐÑÑ ÐÐÑÐÐÐÐÐÑ maildir."
 
-#: ../camel/providers/local/camel-local-provider.c:104
+#: ../camel/providers/local/camel-local-provider.c:107
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "_ÐÐÑÑÐÐÑÑÑ ÐÐÐÐÐÐÐÐÐ ÑÑÐÑÑÑÐ Ð ÑÐÑÐÐÑÐ Elm/Pine/Mutt"
 
-#: ../camel/providers/local/camel-local-provider.c:111
+#: ../camel/providers/local/camel-local-provider.c:114
 msgid "Standard Unix mbox spool file"
 msgstr "ÐÑÐÐÐÐÑÑÐÐÑ ÐÐÑ Unix ÐÑÐÑÐÐÑ ÑÐÐÐ mbox"
 
-#: ../camel/providers/local/camel-local-provider.c:112
-#: ../camel/providers/local/camel-local-provider.c:123
+#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:127
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -3716,124 +3479,125 @@ msgstr ""
 "ÑÐÑÐÐ Ð ÑÐÑÐÐÑÐ mbox. ÐÐÐÐÐ ÐÐÐÐÑ ÐÑÐÐÐÑÐÐÐÐÑÑÑÑ ÐÐÑ ÑÑÐÐÐÑ ÐÐÑÐÐÐ\n"
 "ÐÐÐÐÐ Ð ÑÑÐÐÐ Elm, Pine ÐÐÐ Mutt."
 
-#: ../camel/providers/local/camel-local-provider.c:122
+#: ../camel/providers/local/camel-local-provider.c:126
 msgid "Standard Unix mbox spool directory"
 msgstr "ÐÑÐÐÐÐÑÑÐÑÐ ÐÐÑ Unix ÐÐÑÐÐÐÐ ÐÑÐÑÐÐÐÐ ÑÐÐÐ mbox"
 
-#: ../camel/providers/local/camel-local-store.c:174
-#: ../camel/providers/local/camel-local-store.c:319
+#: ../camel/providers/local/camel-local-store.c:79
+#, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÐÐÐÐÐÑÑ ÐÐÐÐÑ %s Ð %s: %s"
+
+#: ../camel/providers/local/camel-local-store.c:156
+#, c-format
+msgid "Local mail file %s"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÑÐÐÑÐ ÑÐÐÐ %s"
+
+#: ../camel/providers/local/camel-local-store.c:187
+#: ../camel/providers/local/camel-local-store.c:329
 #: ../camel/providers/local/camel-maildir-store.c:92
-#: ../camel/providers/local/camel-mbox-store.c:526
-#: ../camel/providers/local/camel-spool-store.c:318
+#: ../camel/providers/local/camel-mbox-store.c:534
+#: ../camel/providers/local/camel-spool-store.c:570
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "ÐÑÐÐÑÐÑÐÐÑÐÑÐ ÐÑÑÑ Ð ÑÑÐÐÐÐÐÑÑ %s"
 
-#: ../camel/providers/local/camel-local-store.c:183
+#: ../camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "ÐÑÐÐÐÐÐÑÐ %s ÐÐ ÑÐÐÑÐÑÑÑ ÐÐÑÐÐÐÐÐÐ"
 
-#: ../camel/providers/local/camel-local-store.c:194
-#: ../camel/providers/local/camel-local-store.c:204
-#: ../camel/providers/local/camel-local-store.c:332
+#: ../camel/providers/local/camel-local-store.c:207
+#: ../camel/providers/local/camel-local-store.c:217
+#: ../camel/providers/local/camel-local-store.c:342
 #: ../camel/providers/local/camel-maildir-store.c:124
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÐÐÐÑ: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:220
+#: ../camel/providers/local/camel-local-store.c:249
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "ÐÐÐÐÐÑÐÐÐ ÑÑÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐÐÐÐ ÐÑÐÐÑÑÐÐ"
 
-#: ../camel/providers/local/camel-local-store.c:281
-#, c-format
-msgid "Local mail file %s"
-msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÑÐÐÑÐ ÑÐÐÐ %s"
-
-#: ../camel/providers/local/camel-local-store.c:393
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÐÐÐÐÐÑÑ ÐÐÐÐÑ %s Ð %s: %s"
-
-#: ../camel/providers/local/camel-local-store.c:467
-#, c-format
-msgid "Could not rename '%s': %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÐÐÐÐÐÑÑ Â%sÂ: %s"
-
-#: ../camel/providers/local/camel-local-store.c:498
-#: ../camel/providers/local/camel-mbox-store.c:695
+#: ../camel/providers/local/camel-local-store.c:387
+#: ../camel/providers/local/camel-mbox-store.c:708
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÐÑÐ ÑÐÐÐ ÐÐÐÐÐ Â%sÂ: %s"
 
-#: ../camel/providers/local/camel-local-store.c:526
-#: ../camel/providers/local/camel-mbox-store.c:724
+#: ../camel/providers/local/camel-local-store.c:415
+#: ../camel/providers/local/camel-mbox-store.c:738
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÑÐ-ÑÐÐÐ ÐÐÐÐÐ Â%sÂ: %s"
 
+#: ../camel/providers/local/camel-local-store.c:501
+#, c-format
+msgid "Could not rename '%s': %s"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÐÐÐÐÐÑÑ Â%sÂ: %s"
+
 #: ../camel/providers/local/camel-local-summary.c:548
 #, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ Ð ÐÑÐÑÐÐÐ ÐÐÑÐÑÐÐÑÐÐ: ÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑÑÐÐ"
 
-#: ../camel/providers/local/camel-maildir-folder.c:198
+#: ../camel/providers/local/camel-maildir-folder.c:100
+#: ../camel/providers/local/camel-maildir-folder.c:332
+#: ../camel/providers/local/camel-mbox-folder.c:117
+#: ../camel/providers/local/camel-mbox-folder.c:325
+#: ../camel/providers/local/camel-mh-folder.c:156
+msgid "No such message"
+msgstr "ÐÐÑ ÑÐÐÐÐÐ ÑÐÐÐÑÐÐÐÑ"
+
+#: ../camel/providers/local/camel-maildir-folder.c:223
 #, c-format
-#| msgid "Cannot append message to maildir folder: %s: %s"
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ Ð ÐÐÐÐÑ ÐÐÑÑÐÐÐÐÐ ÐÐÑÐÐÐÐÐ: %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:246
-#: ../camel/providers/local/camel-maildir-folder.c:256
+#: ../camel/providers/local/camel-maildir-folder.c:271
+#: ../camel/providers/local/camel-maildir-folder.c:281
 #: ../camel/providers/local/camel-mbox-folder.c:386
 #: ../camel/providers/local/camel-mh-folder.c:168
 #: ../camel/providers/local/camel-mh-folder.c:178
 #, c-format
-#| msgid ""
-#| "Cannot get message: %s from folder %s\n"
-#| "  %s"
 msgid "Cannot get message %s from folder %s: "
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÑÐÐÐÑÐÐÐÐ %s ÐÐ ÐÐÐÐÐ %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:326
+#: ../camel/providers/local/camel-maildir-folder.c:351
 #, c-format
-#| msgid "Cannot transfer message to destination folder"
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÑÑÐÑÑ ÑÐÐÐÑÐÐÐÐ Ð ÐÐÐÐÑ: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:100
 #, c-format
-#| msgid "Cannot create folder: %s: folder exists"
 msgid "Cannot create folder: %s : Folder name cannot contain a dot"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÑ: %s. ÐÐÑ ÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐ ÑÐÐÐÑÐÐÑÑ ÑÐÑÐÐ"
 
 #: ../camel/providers/local/camel-maildir-store.c:109
-#: ../camel/providers/local/camel-maildir-store.c:686
+#: ../camel/providers/local/camel-maildir-store.c:722
 #, c-format
-#| msgid "Folder already exists"
 msgid "Folder %s already exists"
 msgstr "ÐÐÐÐÐ %s ÑÐÐ ÑÑÑÐÑÑÐÑÐÑ"
 
 #: ../camel/providers/local/camel-maildir-store.c:191
 #: ../camel/providers/local/camel-maildir-store.c:222
-#: ../camel/providers/local/camel-mbox-store.c:375
-#: ../camel/providers/local/camel-mbox-store.c:389
+#: ../camel/providers/local/camel-mbox-store.c:384
+#: ../camel/providers/local/camel-mbox-store.c:398
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÑ: Â%sÂ: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:206
-#: ../camel/providers/local/camel-mbox-store.c:341
-#: ../camel/providers/local/camel-mh-store.c:464
+#: ../camel/providers/local/camel-mbox-store.c:350
+#: ../camel/providers/local/camel-mh-store.c:521
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÐÐÐÑ: Â%sÂ: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:212
-#: ../camel/providers/local/camel-mbox-store.c:351
-#: ../camel/providers/local/camel-mh-store.c:473
+#: ../camel/providers/local/camel-mbox-store.c:360
+#: ../camel/providers/local/camel-mh-store.c:530
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÐÐÐÑ Â%sÂ: ÐÐÐÐÐ ÐÐ ÑÑÑÐÑÑÐÑÐÑ."
@@ -3845,7 +3609,7 @@ msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÐÐÐÑ Â%sÂ: ÐÐ ÑÐÐÑÐ
 
 #: ../camel/providers/local/camel-maildir-store.c:293
 #: ../camel/providers/local/camel-maildir-store.c:333
-#: ../camel/providers/local/camel-mh-store.c:584
+#: ../camel/providers/local/camel-mh-store.c:656
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÑ Â%sÂ: %s"
@@ -3854,51 +3618,49 @@ msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÑ Â%sÂ: %s"
 msgid "not a maildir directory"
 msgstr "ÐÐ ÑÐÐÑÐÑÑÑ ÐÐÑÑÐÐÑÐ ÐÐÑÐÐÐÐÐÐ"
 
-#: ../camel/providers/local/camel-maildir-store.c:508
-#: ../camel/providers/local/camel-maildir-store.c:825
-#: ../camel/providers/local/camel-spool-store.c:143
-#: ../camel/providers/local/camel-spool-store.c:159
+#: ../camel/providers/local/camel-maildir-store.c:510
+#: ../camel/providers/local/camel-maildir-store.c:874
+#: ../camel/providers/local/camel-spool-store.c:160
+#: ../camel/providers/local/camel-spool-store.c:179
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÐÐÐÐÑÐÐÐÑÑ ÐÐÐÐÑ Â%sÂ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:677
+#: ../camel/providers/local/camel-maildir-store.c:713
 #, c-format
-#| msgid "Cannot create folder: %s: folder exists"
 msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÐÐÐÐÐÑÑ ÐÐÐÐÑ: %s. ÐÐÑ ÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐ ÑÐÐÐÑÐÐÑÑ ÑÐÑÐÐ"
+msgstr ""
+"ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÐÐÐÐÐÑÑ ÐÐÐÐÑ: %s. ÐÐÑ ÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐ ÑÐÐÐÑÐÐÑÑ ÑÐÑÐÐ"
 
-#: ../camel/providers/local/camel-maildir-summary.c:435
-#: ../camel/providers/local/camel-maildir-summary.c:565
+#: ../camel/providers/local/camel-maildir-summary.c:436
+#: ../camel/providers/local/camel-maildir-summary.c:566
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÑÑÑ ÐÑÑÑ Ð ÐÐÐÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐÑÐÐÐÐÐ: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:556
+#: ../camel/providers/local/camel-maildir-summary.c:557
 msgid "Checking folder consistency"
 msgstr "ÐÑÐÐÐÑÐÐ ÑÐÐÐÑÐÐÐÐÑ ÐÐÑÐÐÐÐÐÐ"
 
-#: ../camel/providers/local/camel-maildir-summary.c:649
+#: ../camel/providers/local/camel-maildir-summary.c:650
 msgid "Checking for new messages"
 msgstr "ÐÑÐÐÐÑÐÐ ÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ"
 
-#: ../camel/providers/local/camel-maildir-summary.c:742
+#: ../camel/providers/local/camel-maildir-summary.c:743
 #: ../camel/providers/local/camel-mbox-summary.c:468
-#: ../camel/providers/local/camel-mbox-summary.c:690
-#: ../camel/providers/local/camel-mbox-summary.c:826
+#: ../camel/providers/local/camel-mbox-summary.c:699
+#: ../camel/providers/local/camel-mbox-summary.c:839
 #: ../camel/providers/local/camel-spool-summary.c:131
 msgid "Storing folder"
 msgstr "ÐÐÑÑÐÐÐÐÐÐ ÐÐÐÐÐ"
 
 #: ../camel/providers/local/camel-mbox-folder.c:183
 #, c-format
-#| msgid "Cannot open mailbox: %s: %s\n"
 msgid "Cannot open mailbox: %s: "
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÑÑÑ ÐÐÑÑÐÐÑÐ ÑÑÐÐ: %s:"
 
 #: ../camel/providers/local/camel-mbox-folder.c:249
 #, c-format
-#| msgid "Cannot append message to mbox file: %s: %s"
 msgid "Cannot append message to mbox file: %s: "
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ Ð ÑÐÐÐ ÐÐÑÑÐÐÐÐÐ ÑÑÐÐÐ: %s:"
 
@@ -3912,34 +3674,34 @@ msgstr "ÐÐÐÐÐÐ, ÐÐÐÐÐ ÐÐÐÐÑÑÐÐÐÐÐÐÐ ÐÑÐÐÑÑÐÐÐ."
 msgid "Cannot create folder lock on %s: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÐÑÐÐÐÑÑ ÐÐÐÐÑ %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:363
-#: ../camel/providers/local/camel-mbox-store.c:534
+#: ../camel/providers/local/camel-mbox-store.c:372
+#: ../camel/providers/local/camel-mbox-store.c:542
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÑ Ñ ÑÐÐÐÐ ÐÐÐÐÐÐ."
 
-#: ../camel/providers/local/camel-mbox-store.c:400
+#: ../camel/providers/local/camel-mbox-store.c:409
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÐÐÐÑ Â%sÂ: ÐÐ ÑÐÐÑÐÑÑÑ ÐÐÑÑÐÑÐ ÑÐÐÐÐÐ."
 
-#: ../camel/providers/local/camel-mbox-store.c:550
+#: ../camel/providers/local/camel-mbox-store.c:558
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÐ Â%sÂ: %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:566
+#: ../camel/providers/local/camel-mbox-store.c:574
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÑ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:568
+#: ../camel/providers/local/camel-mbox-store.c:576
 msgid "Folder already exists"
 msgstr "ÐÐÐÐÐ ÑÐÐ ÑÑÑÐÑÑÐÑÐÑ"
 
-#: ../camel/providers/local/camel-mbox-store.c:609
-#: ../camel/providers/local/camel-mbox-store.c:622
-#: ../camel/providers/local/camel-mbox-store.c:651
+#: ../camel/providers/local/camel-mbox-store.c:619
+#: ../camel/providers/local/camel-mbox-store.c:632
+#: ../camel/providers/local/camel-mbox-store.c:661
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3948,164 +3710,156 @@ msgstr ""
 "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÑ Â%sÂ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:632
+#: ../camel/providers/local/camel-mbox-store.c:642
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "Â%s ÐÐ ÑÐÐÑÐÑÑÑ ÐÐÑÑÐÑÐ ÑÐÐÐÐÐ."
 
-#: ../camel/providers/local/camel-mbox-store.c:641
+#: ../camel/providers/local/camel-mbox-store.c:651
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "ÐÐÐÐÐ Â%s ÐÐ ÐÑÑÑÐ. ÐÐ ÑÐÐÐÐÐÐ."
 
-#: ../camel/providers/local/camel-mbox-store.c:667
-#: ../camel/providers/local/camel-mbox-store.c:681
+#: ../camel/providers/local/camel-mbox-store.c:678
+#: ../camel/providers/local/camel-mbox-store.c:693
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÑÐÐÐ ÐÑÐÑÐÐÐ ÐÐÑÐÑÐÐÑÐÐ Â%sÂ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:761
+#: ../camel/providers/local/camel-mbox-store.c:775
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "ÐÐÑ ÐÐÐÐÐ ÐÐÐÐÐ ÐÐÐÐÐÑÑÑÐÐÐ."
 
-#: ../camel/providers/local/camel-mbox-store.c:776
+#: ../camel/providers/local/camel-mbox-store.c:791
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÐÐÐÐÐÑÑ Â%sÂ: Â%sÂ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:859
+#: ../camel/providers/local/camel-mbox-store.c:874
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÐÐÐÐÐÑÑ Â%s Р%s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:476
+#: ../camel/providers/local/camel-mbox-summary.c:478
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÑÑÑ ÐÐÐÐÑ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:537
+#: ../camel/providers/local/camel-mbox-summary.c:539
 #, c-format
-#| msgid "Fatal mail parser error near position %ld in folder %s"
 msgid "Fatal mail parser error near position %s in folder %s"
 msgstr "ÐÐÑÐÐÑÐÐÑ ÐÑÐÐÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐÐÐÑÐÐ %s Ð ÐÐÐÐÐ %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:622
+#: ../camel/providers/local/camel-mbox-summary.c:628
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÐÐÑÐÑÑ ÐÐÐÐÑ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:697
-#: ../camel/providers/local/camel-mbox-summary.c:833
+#: ../camel/providers/local/camel-mbox-summary.c:708
+#: ../camel/providers/local/camel-mbox-summary.c:848
 #: ../camel/providers/local/camel-spool-summary.c:138
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÑÑÑ ÑÐÐÐ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:711
+#: ../camel/providers/local/camel-mbox-summary.c:722
 #: ../camel/providers/local/camel-spool-summary.c:153
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÑÑÑ ÐÑÐÐÐÐÐÑÐ ÐÐÑÑÐÐÑÐ ÑÑÐÐ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:728
-#: ../camel/providers/local/camel-mbox-summary.c:949
+#: ../camel/providers/local/camel-mbox-summary.c:739
+#: ../camel/providers/local/camel-mbox-summary.c:964
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÑÑ ÐÑÑÐÐÐÑÑ ÐÐÐÐÑ %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:739
+#: ../camel/providers/local/camel-mbox-summary.c:750
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÑÑ ÐÑÐÐÐÐÐÑÑ ÐÐÐÐÑ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:756
+#: ../camel/providers/local/camel-mbox-summary.c:767
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÐÐÐÐÐÑÑ ÐÐÐÐÑ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:846
-#: ../camel/providers/local/camel-mbox-summary.c:1099
+#: ../camel/providers/local/camel-mbox-summary.c:862
+#: ../camel/providers/local/camel-mbox-summary.c:1129
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÑÑÐÐÐÑÑ ÐÐÐÐÑ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:886
-#: ../camel/providers/local/camel-mbox-summary.c:1131
+#: ../camel/providers/local/camel-mbox-summary.c:901
+#: ../camel/providers/local/camel-mbox-summary.c:1160
 #, c-format
-msgid "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get it.)"
-msgstr "ÐÐÐÐ ÐÐÑÑÐÐÐÐÐ ÑÑÐÐÐ ÐÐÐÑÐÐÐÑÐ, ÐÑÐÑÐÐÑÑÐ ÐÐÐ. (ÐÐÐÐÐÐÐÑÑ ÑÑÑÐÐÐ ÂÐÑÂ, ÐÐ ÐÐÐ ÐÐ ÐÑÐÐ ÐÐÐÑÑÐÐÐ.)"
+msgid ""
+"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
+"it.)"
+msgstr ""
+"ÐÐÐÐ ÐÐÑÑÐÐÐÐÐ ÑÑÐÐÐ ÐÐÐÑÐÐÐÑÐ, ÐÑÐÑÐÐÑÑÐ ÐÐÐ. (ÐÐÐÐÐÐÐÑÑ ÑÑÑÐÐÐ ÂÐÑÂ, ÐÐ ÐÐÐ "
+"ÐÐ ÐÑÐÐ ÐÐÐÑÑÐÐÐ.)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:895
-#: ../camel/providers/local/camel-mbox-summary.c:1140
+#: ../camel/providers/local/camel-mbox-summary.c:910
+#: ../camel/providers/local/camel-mbox-summary.c:1169
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "ÐÐÐÐÐÐ Ð ÐÐÐÐÐ ÑÐÑÑÐÐÑÑÑÑ ÐÐÐÐ ÐÐÑÐÐ ÑÐÐÑÑÐÐÐÐÐÑÐÐ"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1052
+#: ../camel/providers/local/camel-mbox-summary.c:1075
 #: ../camel/providers/local/camel-spool-summary.c:343
 #, c-format
 msgid "Unknown error: %s"
 msgstr "ÐÐÐÐÐÐÑÑÐÐÑ ÐÑÐÐÐÐ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1210
-#: ../camel/providers/local/camel-mbox-summary.c:1240
+#: ../camel/providers/local/camel-mbox-summary.c:1239
+#: ../camel/providers/local/camel-mbox-summary.c:1269
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "ÐÐÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐÑÑÐÐÑÐ ÑÑÐÐ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1229
+#: ../camel/providers/local/camel-mbox-summary.c:1258
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "ÐÐÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐÑÑÐÐÑÐ ÑÑÐÐ: %s: %s"
 
 #: ../camel/providers/local/camel-mh-folder.c:115
 #, c-format
-#| msgid "Cannot append message to mh folder: %s: %s"
 msgid "Cannot append message to mh folder: %s: "
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ Ð ÐÐÐÐÑ mh: %s:"
 
-#: ../camel/providers/local/camel-mh-store.c:483
+#: ../camel/providers/local/camel-mh-store.c:541
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÑ Â%sÂ: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:497
+#: ../camel/providers/local/camel-mh-store.c:558
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÐÐÐÑ Â%sÂ: ÐÐ ÑÐÐÑÐÑÑÑ ÐÐÑÐÐÐÐÐÐ."
 
-#: ../camel/providers/local/camel-mh-summary.c:230
+#: ../camel/providers/local/camel-mh-summary.c:227
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÑÑÑ MH ÐÐÑÐÐÐÐ: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:327
-#, c-format
-msgid "Spool '%s' cannot be opened: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÑÑÑ ÑÐÐÐ ÐÐÐÐÐÐÐÐÐÑ Â%sÂ: %s"
-
-#: ../camel/providers/local/camel-spool-store.c:341
-#, c-format
-msgid "Spool '%s' is not a regular file or directory"
-msgstr "ÐÐÐÐÐÐÑÐÐÑ Â%s ÐÐ ÑÐÐÑÐÑÑÑ ÐÐÑÑÐÑÐ ÑÐÐÐÐÐ ÐÐÐ ÐÐÑÐÐÐÐÐÐ"
-
-#: ../camel/providers/local/camel-spool-store.c:357
+#: ../camel/providers/local/camel-spool-store.c:346
 #, c-format
 msgid "Spool mail file %s"
 msgstr "ÐÐÐÐ ÐÐÑÑÐÐÐÐÐ ÑÐÑÐÐ %s"
 
-#: ../camel/providers/local/camel-spool-store.c:357
+#: ../camel/providers/local/camel-spool-store.c:349
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "ÐÐÑÐÐÐ ÐÐÐÐÐ ÑÐÑÐÐ %s"
 
-#: ../camel/providers/local/camel-spool-store.c:391
+#: ../camel/providers/local/camel-spool-store.c:390
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "ÐÐÐÐÐ Â%s/%s ÐÐ ÑÑÑÐÑÑÐÑÐÑ."
 
-#: ../camel/providers/local/camel-spool-store.c:403
+#: ../camel/providers/local/camel-spool-store.c:404
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -4114,12 +3868,12 @@ msgstr ""
 "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÑÑÑ ÐÐÐÐÑ Â%sÂ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:409
+#: ../camel/providers/local/camel-spool-store.c:410
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "ÐÐÐÐÐ Â%s ÐÐ ÑÑÑÐÑÑÐÑÐÑ."
 
-#: ../camel/providers/local/camel-spool-store.c:416
+#: ../camel/providers/local/camel-spool-store.c:417
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -4128,37 +3882,45 @@ msgstr ""
 "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÑ Â%sÂ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:426
+#: ../camel/providers/local/camel-spool-store.c:429
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "Â%s ÐÐ ÑÐÐÑÐÑÑÑ ÑÐÐÐÐÐ ÐÐÑÑÐÐÐÐÐ ÑÑÐÐÐ."
 
-#: ../camel/providers/local/camel-spool-store.c:462
+#: ../camel/providers/local/camel-spool-store.c:477
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑ INBOX"
 
-#: ../camel/providers/local/camel-spool-store.c:476
+#: ../camel/providers/local/camel-spool-store.c:491
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "ÐÐÐÐÐ ÑÐÑÐÐ ÐÐ ÐÐÐÑÑ ÐÑÑÑ ÑÐÐÐÐÐÑ"
 
-#: ../camel/providers/local/camel-spool-store.c:491
+#: ../camel/providers/local/camel-spool-store.c:506
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "ÐÐÐÐÐ ÑÐÑÐÐ ÐÐ ÐÐÐÑÑ ÐÑÑÑ ÐÐÑÐÐÐÐÐÐÐÐÐÑ"
 
+#: ../camel/providers/local/camel-spool-store.c:579
+#, c-format
+msgid "Spool '%s' cannot be opened: %s"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÑÑÑ ÑÐÐÐ ÐÐÐÐÐÐÐÐÐÑ Â%sÂ: %s"
+
+#: ../camel/providers/local/camel-spool-store.c:595
+#, c-format
+msgid "Spool '%s' is not a regular file or directory"
+msgstr "ÐÐÐÐÐÐÑÐÐÑ Â%s ÐÐ ÑÐÐÑÐÑÑÑ ÐÐÑÑÐÑÐ ÑÐÐÐÐÐ ÐÐÐ ÐÐÑÐÐÐÐÐÐ"
+
 #: ../camel/providers/local/camel-spool-summary.c:169
 #: ../camel/providers/local/camel-spool-summary.c:181
 #: ../camel/providers/local/camel-spool-summary.c:193
 #, c-format
-#| msgid "Could not sync temporary folder %s: %s"
 msgid "Could not synchronize temporary folder %s: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÑÑÐÐÐÐÐÑÐÐÐÑÑ ÐÑÐÐÐÐÐÑÑ ÐÐÐÐÑ %s: %s"
 
 #: ../camel/providers/local/camel-spool-summary.c:211
 #, c-format
-#| msgid "Could not sync spool folder %s: %s"
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÑÑÐÐÐÐÐÑÐÐÐÑÑ ÐÐÐÐÑ ÑÐÑÐÐ %s: %s"
 
@@ -4166,9 +3928,6 @@ msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÑÑÐÐÐÐÐÑÐÐÐÑÑ ÐÐÐÐÑ ÑÐÑÐ
 #: ../camel/providers/local/camel-spool-summary.c:262
 #: ../camel/providers/local/camel-spool-summary.c:275
 #, c-format
-#| msgid ""
-#| "Could not sync spool folder %s: %s\n"
-#| "Folder may be corrupt, copy saved in '%s'"
 msgid ""
 "Could not synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in '%s'"
@@ -4176,7 +3935,7 @@ msgstr ""
 "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÑÑÐÐÐÐÐÑÐÐÐÑÑ ÐÐÐÐÑ ÑÐÑÐÐ %s: %s\n"
 "ÐÐÐÐÐ ÐÐÐÐÑ ÐÑÑÑ ÐÐÐÑÐÐÐÐÐÐ, ÐÐÐÐÑ ÑÐÑÑÐÐÐÐÐ Ð Â%sÂ"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:200
+#: ../camel/providers/nntp/camel-nntp-folder.c:194
 #: ../camel/providers/nntp/camel-nntp-folder.c:279
 #: ../camel/providers/nntp/camel-nntp-folder.c:393
 #, c-format
@@ -4185,14 +3944,21 @@ msgstr "ÐÐÑÑÑÐÐÐÑÑ ÐÑÐÐÐÐ: UID Ð ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÑ
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:241
 #: ../camel/providers/nntp/camel-nntp-folder.c:245
-#: ../camel/providers/pop3/camel-pop3-folder.c:369
-#: ../camel/providers/pop3/camel-pop3-folder.c:434
-#: ../camel/providers/pop3/camel-pop3-folder.c:446
-#: ../camel/providers/pop3/camel-pop3-folder.c:695
+#: ../camel/providers/pop3/camel-pop3-folder.c:429
+#: ../camel/providers/pop3/camel-pop3-folder.c:681
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÑÐÐÐÑÐÐÐÐ %s: %s"
 
+#: ../camel/providers/nntp/camel-nntp-folder.c:251
+#: ../camel/providers/nntp/camel-nntp-folder.c:418
+#: ../camel/providers/pop3/camel-pop3-folder.c:366
+#: ../camel/providers/pop3/camel-pop3-folder.c:418
+#: ../camel/providers/pop3/camel-pop3-folder.c:438
+#, c-format
+msgid "Cannot get message %s: "
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÑÐÐÐÑÐÐÐÐ %s: "
+
 #: ../camel/providers/nntp/camel-nntp-folder.c:477
 #: ../camel/providers/nntp/camel-nntp-folder.c:483
 #: ../camel/providers/nntp/camel-nntp-folder.c:530
@@ -4201,7 +3967,6 @@ msgid "Posting failed: %s"
 msgstr "ÐÑÐÐÐÐ ÐÑÐÑÐÐÐÐ ÑÐÐÐÑÐÐÐÑ: %s"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:525
-#| msgid "Posting failed: %s"
 msgid "Posting failed: "
 msgstr "ÐÑÐÐÐÐ ÐÑÐÑÐÐÐÐ ÑÐÐÐÑÐÐÐÑ: "
 
@@ -4216,52 +3981,67 @@ msgid "You cannot copy messages from a NNTP folder!"
 msgstr "ÐÑ ÐÐ ÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐÑÑ ÑÐÐÐÑÐÐÐÑ ÐÐ ÐÐÐÐÐ NNTP!"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr "_ÐÐÐÐÐÑÐÐÑÑ ÐÐÐÐÐ Ð ÑÐÐÑÐÑÑÐÐÐÐ ÑÐÑÐÐ (ÑÐ ÐÑÑÑ c.o.linux ÐÐÐÑÑÐ comp.os.linux)"
+msgid ""
+"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr ""
+"_ÐÐÐÐÐÑÐÐÑÑ ÐÐÐÐÐ Ð ÑÐÐÑÐÑÑÐÐÐÐ ÑÐÑÐÐ (ÑÐ ÐÑÑÑ c.o.linux ÐÐÐÑÑÐ comp.os."
+"linux)"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "ÐÐ_ÐÐÐÑÐÐÑÑ ÐÑÐÐÑÐÑÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐÐÐÐ Ð ÐÐÐÐÐÐÐ ÐÐÐÐÐÑÐÐ"
 
+#: ../camel/providers/nntp/camel-nntp-provider.c:52
+msgid "Default NNTP port"
+msgstr "ÐÐÑÑ ÐÐ ÑÐÐÐÑÐÐÐÑ ÐÐÑ NNTP"
+
 #: ../camel/providers/nntp/camel-nntp-provider.c:53
+msgid "NNTP over SSL"
+msgstr "NNTP ÐÐÐÐÑÑ SSL"
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:59
 msgid "USENET news"
 msgstr "ÐÐÐÐÑÑÐ USENET"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:61
 msgid "This is a provider for reading from and posting to USENET newsgroups."
-msgstr "ÐÑÐ ÐÑÐÐÐÐÐÐÐ ÐÐÑ ÑÑÐÐÐÑ Ð ÐÑÐÑÐÐÐÐ ÑÐÐÐÑÐÐÐÐ Ð ÐÑÑÐÐÑ ÐÐÐÐÑÑÐÐ USENET."
+msgstr ""
+"ÐÑÐ ÐÑÐÐÐÐÐÐÐ ÐÐÑ ÑÑÐÐÐÑ Ð ÐÑÐÑÐÐÐÐ ÑÐÐÐÑÐÐÐÐ Ð ÐÑÑÐÐÑ ÐÐÐÐÑÑÐÐ USENET."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
-msgid "This option will authenticate with the NNTP server using a plaintext password."
-msgstr "ÐÐÐÐÐÑÑÐÐÐÐ Ð ÑÐÑÐÐÑÑ NNTP ÐÑÐÐÑ ÐÑÐÐÐÐÐÐÐÑÑÑÑ Ñ ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÑÐÐÐÐÐÐÐÐ ÐÐÑÐÐÑ."
+#: ../camel/providers/nntp/camel-nntp-provider.c:82
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr ""
+"ÐÐÐÐÐÑÑÐÐÐÐ Ð ÑÐÑÐÐÑÑ NNTP ÐÑÐÐÑ ÐÑÐÐÐÐÐÐÐÑÑÑÑ Ñ ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ "
+"ÐÐÐÐÑÐÑÑÐÐÐÐÐÐÐÐ ÐÐÑÐÐÑ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:77
+#: ../camel/providers/nntp/camel-nntp-store.c:107
 #, c-format
 msgid "Authentication requested but no username provided"
 msgstr "ÐÑÐÐÑÐÑÑÑ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÐÐÑÑÐ, ÐÐ ÐÐÑ ÐÐÐÑÐÐÐÐÑÐÐÑ ÐÐ ÑÐÐÐÐÐÐ"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:89
+#: ../camel/providers/nntp/camel-nntp-store.c:119
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÐÑÐ ÐÑÐÐÐÑÐÑ ÐÐÐÐÐÐÐÐÑÑÐ ÐÐ ÑÐÑÐÐÑÐ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:346
+#: ../camel/providers/nntp/camel-nntp-store.c:442
 #, c-format
-#| msgid "Could not read greeting from %s: %s"
 msgid "Could not read greeting from %s: "
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÐÑÐÑÑ ÐÑÐÐÐÑÑÑÐÐÐ ÐÐ %s: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:359
+#: ../camel/providers/nntp/camel-nntp-store.c:455
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "ÐÐÑÐÐÑ NNTP %s ÐÐÑÐÑÐ ÐÐÐ ÐÑÐÐÐÐ %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:527
+#: ../camel/providers/nntp/camel-nntp-store.c:612
 #, c-format
 msgid "USENET News via %s"
 msgstr "ÐÐÐÐÑÑÐ USENET ÑÐÑÐÐ %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1045
+#: ../camel/providers/nntp/camel-nntp-store.c:1119
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4272,7 +4052,7 @@ msgstr ""
 "\n"
 " %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1160
+#: ../camel/providers/nntp/camel-nntp-store.c:1234
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4281,9 +4061,10 @@ msgid ""
 msgstr ""
 "ÐÑ ÐÐ ÐÐÐÐÑÐ ÐÐÐÐÐÑÐÑÑÑÑ ÐÐ ÑÑÑ ÐÑÑÐÐÑ ÐÐÐÐÑÑÐÐ:\n"
 "\n"
-"ÐÐÑ ÑÐÐÐÐ ÐÑÑÐÐÑ ÐÐÐÐÑÑÐÐ. ÐÑÐÑÐÐÐÑÐ ÑÐÐÐÐÐÑ ÑÐÐÑÐÐ ÐÑÐÐÐ ÑÐÐÑÐÑÑÑ ÑÐÐÐÑÐÐÑÑÐÐÐ ÐÐÐÐÐÐ."
+"ÐÐÑ ÑÐÐÐÐ ÐÑÑÐÐÑ ÐÐÐÐÑÑÐÐ. ÐÑÐÑÐÐÐÑÐ ÑÐÐÐÐÐÑ ÑÐÐÑÐÐ ÐÑÐÐÐ ÑÐÐÑÐÑÑÑ "
+"ÑÐÐÐÑÐÐÑÑÐÐÐ ÐÐÐÐÐÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1202
+#: ../camel/providers/nntp/camel-nntp-store.c:1276
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4294,81 +4075,83 @@ msgstr ""
 "\n"
 "ÐÑÑÐÐÐ ÐÐÐÐÑÑÐÐ ÐÐ ÑÑÑÐÑÑÐÑÐÑ!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1235
+#: ../camel/providers/nntp/camel-nntp-store.c:1309
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr "ÐÑ ÐÐ ÐÐÐÐÑÐ ÑÐÐÐÐÑÑ ÐÐÐÐÑ Ð ÐÑÑÐÐÐÑ ÐÐÐÐÑÑÐÐ: ÐÐÐÑÑÐ ÑÑÐÐÐ ÑÐÐÐÑÐÑ ÐÐÐÐÐÑÐÑÑÑÑ."
+msgstr ""
+"ÐÑ ÐÐ ÐÐÐÐÑÐ ÑÐÐÐÐÑÑ ÐÐÐÐÑ Ð ÐÑÑÐÐÐÑ ÐÐÐÐÑÑÐÐ: ÐÐÐÑÑÐ ÑÑÐÐÐ ÑÐÐÐÑÐÑ "
+"ÐÐÐÐÐÑÐÑÑÑÑ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1251
+#: ../camel/providers/nntp/camel-nntp-store.c:1325
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "ÐÑ ÐÐ ÐÐÐÐÑÐ ÐÐÑÐÐÐÐÐÐÐÐÑÑ ÐÐÐÐÑ Ð ÐÑÑÐÐÐÑ ÐÐÐÐÑÑÐÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1268
+#: ../camel/providers/nntp/camel-nntp-store.c:1342
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr "ÐÑ ÐÐ ÐÐÐÐÑÐ ÑÐÐÐÐÑÑ ÐÐÐÐÑ Ð ÐÑÑÐÐÐÑ ÐÐÐÐÑÑÐÐ: ÐÐÐÑÑÐ ÑÑÐÐÐ ÑÐÐÐÑÐÑ ÐÑÐÐÑÐÑÑÑÑ."
+msgstr ""
+"ÐÑ ÐÐ ÐÐÐÐÑÐ ÑÐÐÐÐÑÑ ÐÐÐÐÑ Ð ÐÑÑÐÐÐÑ ÐÐÐÐÑÑÐÐ: ÐÐÐÑÑÐ ÑÑÐÐÐ ÑÐÐÐÑÐÑ "
+"ÐÑÐÐÑÐÑÑÑÑ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1479
-#| msgid "NNTP Command failed: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1647
 msgid "NNTP Command failed: "
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑ NNTP: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1553
+#: ../camel/providers/nntp/camel-nntp-store.c:1721
 #, c-format
 msgid "Not connected."
 msgstr "ÐÐ ÐÐÐÐÐÑÑÐÐ."
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:234
-#: ../camel/providers/nntp/camel-nntp-summary.c:345
+#: ../camel/providers/nntp/camel-nntp-summary.c:235
+#: ../camel/providers/nntp/camel-nntp-summary.c:353
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: ÐÐÐÑÐ ÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:246
+#: ../camel/providers/nntp/camel-nntp-summary.c:251
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "ÐÐÐÐÐÐÐÐÐÑÐ ÐÑÐÐÑ ÑÐÑÐÐÑÐ ÐÑ xover: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:362
+#: ../camel/providers/nntp/camel-nntp-summary.c:369
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "ÐÐÐÐÐÐÐÐÐÑÐ ÐÑÐÐÑ ÑÐÑÐÐÑÐ ÐÑ head: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:407
+#: ../camel/providers/nntp/camel-nntp-summary.c:414
 #, c-format
 msgid "Operation failed: %s"
 msgstr "ÐÐÐÐ ÐÐÐÑÐÑÐÐ: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:277
-#: ../camel/providers/pop3/camel-pop3-folder.c:334
+#: ../camel/providers/pop3/camel-pop3-folder.c:283
+#: ../camel/providers/pop3/camel-pop3-folder.c:342
 #, c-format
 msgid "No message with UID %s"
 msgstr "ÐÐÑ ÑÐÐÐÑÐÐÐÑ Ñ UID %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:342
+#: ../camel/providers/pop3/camel-pop3-folder.c:350
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "ÐÐÐÑÑÐÐÐÐ ÑÐÐÐÑÐÐÐÑ %d ÐÐ POP"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:447
+#: ../camel/providers/pop3/camel-pop3-folder.c:430
 msgid "Unknown reason"
 msgstr "ÐÐÐÐÐÐÑÑÐÐÑ ÐÑÐÑÐÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:486
+#: ../camel/providers/pop3/camel-pop3-folder.c:470
 msgid "Retrieving POP summary"
 msgstr "ÐÐÐÑÑÐÐÐÐ ÐÑÐÑÐÐÐ ÐÐÑÐÑÐÐÑÐÐ ÐÑ ÑÐÑÐÐÑÐ POP"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:509
-#, c-format
-msgid "Cannot get POP summary: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÐÑÐÐ ÐÐÐÐÑÐ POP: %s"
+#: ../camel/providers/pop3/camel-pop3-folder.c:485
+msgid "Cannot get POP summary: "
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÑÑ ÐÐÑÐÐ ÐÐÐÐÑÐ POP: "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:561
+#: ../camel/providers/pop3/camel-pop3-folder.c:542
 msgid "Expunging old messages"
 msgstr "ÐÐÐÑÑÐÐÐÐÐÐ ÑÑÐÑÑÑ ÑÐÐÐÑÐÐÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:575
+#: ../camel/providers/pop3/camel-pop3-folder.c:556
 msgid "Expunging deleted messages"
 msgstr "ÐÐÐÑÑÐÐÐÐÐÐ ÑÐÐÐÑÐÐÐÐ, ÐÐÐÐÑÐÐÐÑÑ ÐÐÐ ÑÐÐÐÑÐÐÑÐ"
 
@@ -4394,137 +4177,162 @@ msgstr "_ÐÐÐÐÐÑÑ ÑÐÐÐÑÐÐÐÑ, ÑÐÐÐÑÐÐÑÐ ÐÐ ÐÐÐÐÐÑ
 msgid "Disable _support for all POP3 extensions"
 msgstr "ÐÐÐÑÐÑÐÑÑ _ÐÐÐÐÐÑÐÐÑ ÐÑÐÑ ÑÐÑÑÐÑÐÐÐÐ POP3"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:56
+#: ../camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Default POP3 port"
+msgstr "ÐÐÑÑ ÐÐ ÑÐÐÐÑÐÐÐÑ ÐÐÑ POP3"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
+msgid "POP3 over SSL"
+msgstr "POP3 ÐÐÐÐÑÑ SSL"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:62
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:58
+#: ../camel/providers/pop3/camel-pop3-provider.c:64
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "ÐÐÑ ÐÐÐÐÐÑÑÐÐÐÑ Ð ÐÑÐÐÑÑÐÑ ÐÐÑÑÑ Ñ ÑÐÑÐÐÑÐÐ POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:75
-msgid "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers."
-msgstr "ÐÐÐÐÐÑÑÐÐÐÐ Ð ÑÐÑÐÐÑÑ POP ÐÑÐÐÑ ÐÑÐÐÐÐÐÐÐÑÑÑÑ Ñ ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÑÐÐÐÐÐÐÐÐ ÐÐÑÐÐÑ. ÐÐÐÑÑÐÐÑÑÐÐÐ ÑÐÑÐÐÑÐÐ POP ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ ÑÐÐÑÐÐ ÑÑÐÑ ÐÐÑÐÐÐÑ."
+#: ../camel/providers/pop3/camel-pop3-provider.c:83
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
+msgstr ""
+"ÐÐÐÐÐÑÑÐÐÐÐ Ð ÑÐÑÐÐÑÑ POP ÐÑÐÐÑ ÐÑÐÐÐÐÐÐÐÑÑÑÑ Ñ ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ "
+"ÐÐÐÐÑÐÑÑÐÐÐÐÐÐÐÐ ÐÐÑÐÐÑ. ÐÐÐÑÑÐÐÑÑÐÐÐ ÑÐÑÐÐÑÐÐ POP ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ ÑÐÐÑÐÐ "
+"ÑÑÐÑ ÐÐÑÐÐÐÑ."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:85
-msgid "This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for all users even on servers that claim to support it."
-msgstr "ÐÐÐÐÐÑÑÐÐÐÐ Ð ÑÐÑÐÐÑÑ POP ÐÑÐÐÑ ÐÑÐÐÐÐÐÐÐÑÑÑÑ Ñ ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐÐÐÐÐ ÐÐÑÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐÑ APOP. ÐÑÐ ÐÐÐÐÑ ÑÐÐÐÑÐÑÑ ÐÐ ÐÐÑ ÐÑÐÑ ÐÐÐÑÐÐÐÐÑÐÐÐÐ ÐÐÐÐ ÐÐ ÑÐÑÐÐÑÐÑ, ÑÐÐÐÑ ÐÐÐÐÐÑÐÐÐÐÑÑÐÑ ÐÐÐ."
+#: ../camel/providers/pop3/camel-pop3-provider.c:93
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
+msgstr ""
+"ÐÐÐÐÐÑÑÐÐÐÐ Ð ÑÐÑÐÐÑÑ POP ÐÑÐÐÑ ÐÑÐÐÐÐÐÐÐÑÑÑÑ Ñ ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐÐÐÐÐ "
+"ÐÐÑÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐÑ APOP. ÐÑÐ ÐÐÐÐÑ ÑÐÐÐÑÐÑÑ ÐÐ ÐÐÑ ÐÑÐÑ ÐÐÐÑÐÐÐÐÑÐÐÐÐ ÐÐÐÐ "
+"ÐÐ ÑÐÑÐÐÑÐÑ, ÑÐÐÐÑ ÐÐÐÐÐÑÐÐÐÐÑÑÐÑ ÐÐÐ."
 
 #. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:98
+#: ../camel/providers/pop3/camel-pop3-store.c:97
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:181
+#: ../camel/providers/pop3/camel-pop3-store.c:151
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÑÐÐÐÐÑÐÐÐÐ ÐÑ POP-ÑÐÑÐÐÑÐ %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/pop3/camel-pop3-store.c:230
-#: ../camel/providers/pop3/camel-pop3-store.c:237
+#: ../camel/providers/pop3/camel-pop3-store.c:169
+#: ../camel/providers/pop3/camel-pop3-store.c:208
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "ÐÐÐÐ ÐÑÐ ÐÐÐÐÐÑÑÐÐÐÐ Ð ÑÐÑÐÐÑÑ POP %s Ð ÐÐÑÐÑÐÐÐÐÐ ÑÐÐÐÐÐ: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:200
+#: ../camel/providers/pop3/camel-pop3-store.c:170
 msgid "STLS not supported by server"
 msgstr "STLS ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ ÑÐÑÐÐÑÐÐ"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:218
+#: ../camel/providers/pop3/camel-pop3-store.c:188
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr "ÐÐÐÐ ÐÑÐ ÐÐÐÐÐÑÑÐÐÐÐ Ð ÑÐÑÐÐÑÑ POP %s Ð ÐÐÑÐÑÑÐÐÐÐ ÑÐÐÐÐÐ%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:231
-msgid "TLS negotiations failed"
-msgstr "ÐÐÐÐ ÑÐÐÐÐÑÐÐÐÐÐÑ TLS"
+#: ../camel/providers/pop3/camel-pop3-store.c:201
+#, c-format
+msgid "Failed to connect to POP server %s in secure mode: "
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð POP-ÑÐÑÐÐÑÑ %s Ð ÐÐÑÐÑÑÐÐÐÐ ÑÐÐÐÐÐ: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:238
+#: ../camel/providers/pop3/camel-pop3-store.c:209
 msgid "TLS is not available in this build"
 msgstr "TLS ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ Ð ÑÑÐÐ ÑÐÐÑÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:317
-#: ../camel/providers/pop3/camel-pop3-store.c:472
+#: ../camel/providers/pop3/camel-pop3-store.c:260
+#: ../camel/providers/pop3/camel-pop3-store.c:433
 #, c-format
-msgid "Unable to connect to POP server %s: No support for requested authentication mechanism."
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð ÑÐÑÐÐÑÑ POP %s: ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ ÐÐÑÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÐ."
+msgid ""
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
+msgstr ""
+"ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð POP-ÑÐÑÐÐÑÑ %s: ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ ÐÐÑÑÐÐÐÐÐÐÐÑÐ "
+"ÐÐÑÐÐÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÐ."
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:340
+#: ../camel/providers/pop3/camel-pop3-store.c:288
 #, c-format
 msgid "SASL '%s' Login failed for POP server %s%s"
 msgstr "SASL Â%s ÐÑÐÐÐÐ ÑÐÐÐÑÑÑÐÑÐÐ ÐÐ ÑÐÑÐÐÑÐ POP %s%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:357
+#: ../camel/providers/pop3/camel-pop3-store.c:305
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÑÑÑÐÑÐÐÐÑÑÑÑ ÐÐ ÑÐÑÐÐÑÐ POP %s: ÐÑÐÐÐÐ ÐÑÐÑÐÐÐÐÐ SASL"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:374
+#: ../camel/providers/pop3/camel-pop3-store.c:327
 #, c-format
-#| msgid "Failed to authenticate on POP server %s: %s"
 msgid "Failed to authenticate on POP server %s: "
 msgstr "ÐÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÐ ÐÐ ÑÐÑÐÐÑÐ POP %s: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:439
+#: ../camel/providers/pop3/camel-pop3-store.c:399
 #, c-format
-msgid "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation attack suspected. Please contact your admin."
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÐÐÑÑÑÑ Ñ ÑÐÑÐÐÑÐÐ %s ÐÐ ÐÑÐÑÐÐÐÐÑ POP:\t  ÐÐÐÑÑÐÐ ÐÐÐÐÑÑÐÐÑÐÑÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ APOP. ÐÐÐÐÐÐÐÐÑ ÐÐÐÐÐÑÐÐÐÐ Ð ÐÑÐÐÐÐÐÐÐÐ ÐÑÐÐÐ ÐÐ ÐÐÑÑÐÐÐÑÐÐÐÑÐÑ. ÐÐÐÐÐÑÐÑÑÐ, ÑÐÑÐÐÑÐÑÑ Ñ ÐÐÐÐÐÐÑÑÑÐÑÐÑÐÐ."
+msgid ""
+"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
+"attack suspected. Please contact your admin."
+msgstr ""
+"ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÐÐÑÑÑÑ Ñ ÑÐÑÐÐÑÐÐ %s ÐÐ ÐÑÐÑÐÐÐÐÑ POP:\t  ÐÐÐÑÑÐÐ "
+"ÐÐÐÐÑÑÐÐÑÐÑÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ APOP. ÐÐÐÐÐÐÐÐÑ ÐÐÐÐÐÑÐÐÐÐ Ð ÐÑÐÐÐÐÐÐÐÐ ÐÑÐÐÐ ÐÐ "
+"ÐÐÑÑÐÐÐÑÐÐÐÑÐÑ. ÐÐÐÐÐÑÐÑÑÐ, ÑÐÑÐÐÑÐÑÑ Ñ ÐÐÐÐÐÐÑÑÑÐÑÐÑÐÐ."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:492
+#: ../camel/providers/pop3/camel-pop3-store.c:446
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending password: %s"
+"Error sending password: "
 msgstr ""
-"ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð ÑÐÑÐÐÑÑ POP%s.\n"
-"ÐÑÐÐÐÐ ÐÑÐÑÐÐÐÐ ÐÐÑÐÐÑ: %s"
+"ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð POP-ÑÐÑÐÐÑÑ %s.\n"
+"ÐÑÐÐÐÐ ÐÑÐÑÐÐÐÐ ÐÐÑÐÐÑ: "
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:505
+#: ../camel/providers/pop3/camel-pop3-store.c:456
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending username%s"
 msgstr ""
-"ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð ÑÐÑÐÐÑÑ POP %s.\n"
+"ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð POP-ÑÐÑÐÐÑÑ %s.\n"
 "ÐÑÐÐÐÐ ÐÑÐÑÐÐÐÐ ÐÐÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÑ%s"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:518
+#: ../camel/providers/pop3/camel-pop3-store.c:468
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password%s"
 msgstr ""
-"ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð ÑÐÑÐÐÑÑ POP%s.\n"
+"ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð POP-ÑÐÑÐÐÑÑ %s.\n"
 "ÐÑÐÐÐÐ ÐÑÐÑÐÐÐÐ ÐÐÑÐÐÑ%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:558
+#: ../camel/providers/pop3/camel-pop3-store.c:586
 #, c-format
-#| msgid "IMAP server %s"
 msgid "POP3 server %s"
 msgstr "ÐÐÑÐÐÑ POP3 %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:562
+#: ../camel/providers/pop3/camel-pop3-store.c:589
 #, c-format
-#| msgid "IMAP service for %s on %s"
 msgid "POP3 server for %s on %s"
-msgstr "ÐÐÑÐÐÑ POP3 ÐÐÑ %s ÐÐ %s"
+msgstr "ÐÐÑÐÐÑ POP3 ÐÐÑ %s ÐÐ %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:693
+#: ../camel/providers/pop3/camel-pop3-store.c:720
 #, c-format
 msgid "Could not connect to POP server %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð ÑÐÑÐÐÑÑ POP %s"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð POP-ÑÐÑÐÐÑÑ %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:720
+#: ../camel/providers/pop3/camel-pop3-store.c:747
 #, c-format
 msgid "No such folder '%s'."
 msgstr "ÐÐÑ ÑÐÐÐÐ ÐÐÐÐÐ Â%sÂ."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:737
+#: ../camel/providers/pop3/camel-pop3-store.c:764
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "Ð ÑÑÐÐÐÐÐÑÐÑ POP3 ÐÑÑÑÑÑÑÐÑÐÑ ÐÐÑÐÑÑÐÑ ÐÐÐÐÐ"
@@ -4534,7 +4342,9 @@ msgid "Sendmail"
 msgstr "Sendmail"
 
 #: ../camel/providers/sendmail/camel-sendmail-provider.c:38
-msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÑÑ Ñ ÐÐÐÐÑÑÑ ÐÑÐÐÑÐÐÐÑ Âsendmail ÐÐ ÐÐÐÐÐÑÐÐÐ ÑÐÑÑÐÐÐ."
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:49
@@ -4561,7 +4371,6 @@ msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÑÐÑÑ Sendmail: %s: ÐÐÑÑÐ ÐÐ ÐÑÐÑÐÐÐÐÐÐ"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:182
-#| msgid "Could not send message: %s"
 msgid "Could not send message: "
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ:"
 
@@ -4580,391 +4389,480 @@ msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÐÐÐÐÑÑ %s: ÐÐÑÑÐ ÐÐ ÐÑÐÑÐÐ
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "Sendmail ÐÐÐÐÑÑÐÐÐ ÑÐÐÐÑÑ Ñ ÑÐÐÑÐÑÑÐÑÐÐ %d: ÐÐÑÑÐ ÐÐ ÐÑÐÑÐÐÐÐÐÐ."
 
+#: ../camel/providers/smtp/camel-smtp-provider.c:42
+msgid "Default SMTP port"
+msgstr "ÐÐÑÑ ÐÐ ÑÐÐÐÑÐÐÐÑ ÐÐÑ SMTP"
+
 #: ../camel/providers/smtp/camel-smtp-provider.c:43
+msgid "SMTP over SSL"
+msgstr "SMTP ÐÐÐÐÑÑ SSL"
+
+#: ../camel/providers/smtp/camel-smtp-provider.c:44
+msgid "Message submission port"
+msgstr "ÐÐÑÑ ÐÑÑÑÐÐÐ ÑÐÐÐÑÐÐÐÐ"
+
+#: ../camel/providers/smtp/camel-smtp-provider.c:50
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:45
+#: ../camel/providers/smtp/camel-smtp-provider.c:52
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr "ÐÐÑ ÐÐÑÑÐÐÐÐ ÐÐÑÑÑ ÐÑÑÐÐ ÐÐÐÐÐÑÑÐÐÐÑ Ð ÑÐÐÐÑÐÐÐÐÑ ÐÐÑÑÐÐÐÐÑ ÐÐÐÑÐÐÑÑÐÑÐÑÑ ÐÐ ÐÑÐÑÐÐÐÐÑ SMTP."
+msgstr ""
+"ÐÐÑ ÐÐÑÑÐÐÐÐ ÐÐÑÑÑ ÐÑÑÐÐ ÐÐÐÐÐÑÑÐÐÐÑ Ð ÑÐÐÐÑÐÐÐÐÑ ÐÐÑÑÐÐÐÐÑ ÐÐÐÑÐÐÑÑÐÑÐÑÑ ÐÐ "
+"ÐÑÐÑÐÐÐÐÑ SMTP."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:193
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
-#| msgid "Welcome response error"
+#: ../camel/providers/smtp/camel-smtp-transport.c:155
+#: ../camel/providers/smtp/camel-smtp-transport.c:162
 msgid "Welcome response error: "
 msgstr "ÐÑÐÐÐÐ ÐÑÐÐÑÐ ÐÐ ÐÑÐÐÐÑÑÑÐÐÐ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:237
-#: ../camel/providers/smtp/camel-smtp-transport.c:277
-#: ../camel/providers/smtp/camel-smtp-transport.c:284
+#: ../camel/providers/smtp/camel-smtp-transport.c:197
+#: ../camel/providers/smtp/camel-smtp-transport.c:243
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð ÑÐÑÐÐÑÑ SMTP %s Ð ÐÐÑÐÑÐÐÐÐÐ ÑÐÐÐÐÐ: %s"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð SMTP-ÑÐÑÐÐÑÑ %s Ð ÐÐÑÐÑÐÐÐÐÐ ÑÐÐÐÐÐ: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:246
-#: ../camel/providers/smtp/camel-smtp-transport.c:259
-#: ../camel/providers/smtp/camel-smtp-transport.c:266
-#| msgid "STARTTLS command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:206
+#: ../camel/providers/smtp/camel-smtp-transport.c:219
+#: ../camel/providers/smtp/camel-smtp-transport.c:226
 msgid "STARTTLS command failed: "
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑ STARTTLS: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:357
+#: ../camel/providers/smtp/camel-smtp-transport.c:236
 #, c-format
-msgid "SMTP server %s"
-msgstr "SMTP ÑÐÑÐÐÑ %s"
+msgid "Failed to connect to SMTP server %s in secure mode: "
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð SMTP-ÑÐÑÐÐÑÑ %s Ð ÐÐÑÐÑÑÐÐÐÐ ÑÐÐÐÐÐ: "
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:361
 #, c-format
+msgid "SMTP server %s"
+msgstr "SMTP-ÑÐÑÐÐÑ %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:365
+#, c-format
 msgid "SMTP mail delivery via %s"
-msgstr "ÐÐÑÑÐÐÐÐ SMTP ÐÐÑÑÑ ÑÐÑÐÐ %s"
+msgstr "SMTP-ÐÐÑÑÐÐÐÐ ÐÐÑÑÑ ÑÐÑÐÐ %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:408
+#: ../camel/providers/smtp/camel-smtp-transport.c:416
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "ÐÐÑÐÐÑ SMTP %s ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑ ÐÐÑÑÐÐÐÐÐÐÐÑÐ ÑÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÐ %s"
+msgstr "SMTP-ÑÐÑÐÐÑ  %s ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑ ÐÐÑÑÐÐÐÐÐÐÐÑÐ ÑÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÐ %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:495
+#: ../camel/providers/smtp/camel-smtp-transport.c:518
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
 "%s\n"
 "\n"
 msgstr ""
-"ÐÐ ÑÐÐÐÐÑÑ ÐÑÑÐÐÑÐÑÐÑÐÑÐÐÐÑÑÑÑ ÐÐ ÑÐÑÐÐÑÐ SMTP.\n"
+"ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÐÑÐ ÐÑÐÐÐÑÐÑ ÐÐÐÐÐÐÐÐÑÑÐ ÐÐ ÑÐÑÐÐÑÐ SMTP.\n"
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:613
+#: ../camel/providers/smtp/camel-smtp-transport.c:635
 #, c-format
 msgid "Cannot send message: service not connected."
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ: ÑÐÑÐÐÑ ÐÐ ÐÐÐÐÐÑÑÐÐ."
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ: ÑÐÑÐÐÑ ÐÐ ÐÐÐÐÐÑÑÑÐ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:620
+#: ../camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ: ÐÐÐÐÑÐÑÐ ÐÐÑÐÑ ÐÑÐÑÐÐÐÑÐÐÑ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:624
+#: ../camel/providers/smtp/camel-smtp-transport.c:646
 msgid "Sending message"
 msgstr "ÐÑÐÑÐÐÐÐ ÑÐÐÐÑÐÐÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:649
+#: ../camel/providers/smtp/camel-smtp-transport.c:671
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ: ÐÐ ÐÐÑÐÐÐÐÐÐÑ ÐÐÐÑÑÐÑÐÐÐ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:662
+#: ../camel/providers/smtp/camel-smtp-transport.c:684
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ: ÑÐÐÐÐÐ ÐÐÐÐ ÐÐÐ  ÐÐÑÐÐÐÑÐÐ ÐÐÐÐÑÑÐÐÑÐÑÑ ÐÐÐÑÑÐÑÐÐÐÐ"
+msgstr ""
+"ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ: ÑÐÐÐÐÐ ÐÐÐÐ ÐÐÐ  ÐÐÑÐÐÐÑÐÐ ÐÐÐÐÑÑÐÐÑÐÑÑ "
+"ÐÐÐÑÑÐÑÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:725
+#: ../camel/providers/smtp/camel-smtp-transport.c:814
 msgid "Syntax error, command unrecognized"
 msgstr "ÐÐÐÑÐÐÑÐÑÐÑÐÐÑ ÐÑÐÐÐÐ, ÐÐÐÐÐÐÐ ÐÐ ÑÐÑÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:816
 msgid "Syntax error in parameters or arguments"
 msgstr "ÐÐÐÑÐÐÑÐÑÐÑÐÐÑ ÐÑÐÐÐÐ Ð ÐÐÑÐÐÐÑÑÐÑ ÐÐÐ ÐÑÐÑÐÐÐÑÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:729
+#: ../camel/providers/smtp/camel-smtp-transport.c:818
 msgid "Command not implemented"
 msgstr "ÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:731
+#: ../camel/providers/smtp/camel-smtp-transport.c:820
 msgid "Command parameter not implemented"
 msgstr "ÐÐÑÐÐÐÑÑ ÐÐÐÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:733
+#: ../camel/providers/smtp/camel-smtp-transport.c:822
 msgid "System status, or system help reply"
 msgstr "ÐÐÑÑÐÑÐÐÐ ÑÐÑÑÐÐÑ ÐÐÐ ÐÑÐÐÑ ÑÐÑÑÐÐÐÐÐ ÑÐÑÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:735
+#: ../camel/providers/smtp/camel-smtp-transport.c:824
 msgid "Help message"
 msgstr "ÐÐÑÐÐÐÑÐÐÐ ÑÐÐÐÑÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:737
+#: ../camel/providers/smtp/camel-smtp-transport.c:826
 msgid "Service ready"
 msgstr "ÐÐÑÐÐÑ ÐÐÑÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:739
+#: ../camel/providers/smtp/camel-smtp-transport.c:828
 msgid "Service closing transmission channel"
 msgstr "ÐÐÑÐÐÑ ÐÐÐÑÑÐÐÐÑ ÐÐÐÐÐ ÐÐÑÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:741
+#: ../camel/providers/smtp/camel-smtp-transport.c:830
 msgid "Service not available, closing transmission channel"
 msgstr "ÐÐÑÐÐÑ ÐÐ ÐÐÑÑÑÐÐÐ, ÐÐÐÑÑÑÐÐ ÐÐÐÐÐÐ ÐÐÑÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:743
+#: ../camel/providers/smtp/camel-smtp-transport.c:832
 msgid "Requested mail action okay, completed"
 msgstr "ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÑÑÐÐÐÐ ÐÐÐÑÑÐÐÐ ÐÑÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
+#: ../camel/providers/smtp/camel-smtp-transport.c:834
 msgid "User not local; will forward to <forward-path>"
-msgstr "ÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐÐÑÐÐÐÐÑÐÐÑ; ÐÑÐÐÑ ÐÑÐÑÐÐÐÐÐÐ Ð ÑÐÐÑÐÐÑÑÑÐÐÐ Ñ <forward-path>"
+msgstr ""
+"ÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐÐÑÐÐÐÐÑÐÐÑ; ÐÑÐÐÑ ÐÑÐÑÐÐÐÐÐÐ Ð ÑÐÐÑÐÐÑÑÑÐÐÐ Ñ <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:747
+#: ../camel/providers/smtp/camel-smtp-transport.c:836
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÑÑÐÐÐ Ñ ÐÐÑÑÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐ: ÐÐÑÑÐÐÑÐ ÑÑÐÐ ÐÐÐÐÑÑÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:749
+#: ../camel/providers/smtp/camel-smtp-transport.c:838
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÑÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐ: ÐÐÑÑÐÐÑÐ ÑÑÐÐ ÐÐÐÐÑÑÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:751
+#: ../camel/providers/smtp/camel-smtp-transport.c:840
 msgid "Requested action aborted: error in processing"
 msgstr "ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÑÑÐÐÐ ÐÑÐÑÐÐÐÐ: ÐÑÐÐÐÐ ÐÑÐ ÐÐÑÐÐÐÑÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:753
+#: ../camel/providers/smtp/camel-smtp-transport.c:842
 msgid "User not local; please try <forward-path>"
 msgstr "ÐÐÐÑÐÐÐÐÑÐÐÑ ÐÐ ÐÐÐÐÐÑÐÑÐ; ÑÑÑÐÐÐÐÐÑÐ <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:755
+#: ../camel/providers/smtp/camel-smtp-transport.c:844
 msgid "Requested action not taken: insufficient system storage"
-msgstr "ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÑÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐ: ÐÐÐÐÑÑÐÑÐÑÐÐ ÐÐÑÑÐ Ð ÑÐÑÑÐÐÐÐÐ ÑÑÐÐÐÐÐÑÐ"
+msgstr ""
+"ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÑÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐ: ÐÐÐÐÑÑÐÑÐÑÐÐ ÐÐÑÑÐ Ð ÑÐÑÑÐÐÐÐÐ ÑÑÐÐÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:757
+#: ../camel/providers/smtp/camel-smtp-transport.c:846
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÑÑÐÐÐ ÐÑÐÑÐÐÐÐ: ÐÑÑÐÑÐÐÐÐ ÐÐÑÑÐ Ð ÑÑÐÐÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:759
+#: ../camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÑÑÐÐÐ ÐÑÐÑÐÐÐÐ: ÐÐÑ ÐÐÑÑÐÐÐÐÐ ÑÑÐÐÐ ÐÐÐÐÐÑÑÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:761
+#: ../camel/providers/smtp/camel-smtp-transport.c:850
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "ÐÐÑÐÐÐ ÐÐÐÐÐ ÐÐÑÑÑ; ÐÐÐÐÑÐÐÐÐ ÐÐÑÐÐ <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:763
+#: ../camel/providers/smtp/camel-smtp-transport.c:852
 msgid "Transaction failed"
 msgstr "ÐÐÐÐ ÑÑÐÐÐÐÐÑÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:767
+#: ../camel/providers/smtp/camel-smtp-transport.c:856
 msgid "A password transition is needed"
 msgstr "ÐÐÐÐÑÐÐÐÐÐ ÐÐÑÐÐÐÑÐ ÐÐÑÐÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:769
+#: ../camel/providers/smtp/camel-smtp-transport.c:858
 msgid "Authentication mechanism is too weak"
 msgstr "ÐÐÐÑÐÐÐ ÑÐÐÐÑÐ ÐÐÑÐÐÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:771
+#: ../camel/providers/smtp/camel-smtp-transport.c:860
 msgid "Encryption required for requested authentication mechanism"
 msgstr "ÐÐÑ ÐÐÐÑÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÐ ÑÑÐÐÑÐÑÑÑ ÑÐÑÑÐÐÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:773
+#: ../camel/providers/smtp/camel-smtp-transport.c:862
 msgid "Temporary authentication failure"
 msgstr "ÐÑÐÐÐÐÐÑÐ ÑÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1030
+#: ../camel/providers/smtp/camel-smtp-transport.c:1112
 msgid "SMTP Greeting"
 msgstr "ÐÑÐÐÐÑÑÑÐÐÐ SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1057
-#: ../camel/providers/smtp/camel-smtp-transport.c:1074
-#: ../camel/providers/smtp/camel-smtp-transport.c:1082
-#| msgid "HELO command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1139
+#: ../camel/providers/smtp/camel-smtp-transport.c:1156
+#: ../camel/providers/smtp/camel-smtp-transport.c:1164
 msgid "HELO command failed: "
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑ HELO: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1150
+#: ../camel/providers/smtp/camel-smtp-transport.c:1233
 msgid "SMTP Authentication"
 msgstr "ÐÑÑÐÐÑÐÑÐÐÐÑÐÑ SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1157
-#, c-format
-msgid "Error creating SASL authentication object."
-msgstr "ÐÑÐÐÐÐ ÐÑÐ ÑÐÐÐÐÐÐÐ ÐÐÑÐÐÑÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÐ SASL."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1176
-#: ../camel/providers/smtp/camel-smtp-transport.c:1187
-#: ../camel/providers/smtp/camel-smtp-transport.c:1196
-#| msgid "AUTH command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1252
+#: ../camel/providers/smtp/camel-smtp-transport.c:1263
+#: ../camel/providers/smtp/camel-smtp-transport.c:1276
 msgid "AUTH command failed: "
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑ AUTH: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1304
-#: ../camel/providers/smtp/camel-smtp-transport.c:1318
-#: ../camel/providers/smtp/camel-smtp-transport.c:1327
-#| msgid "MAIL FROM command failed"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1384
+#: ../camel/providers/smtp/camel-smtp-transport.c:1398
+#: ../camel/providers/smtp/camel-smtp-transport.c:1407
 msgid "MAIL FROM command failed: "
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑ MAIL FROM: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1354
-#| msgid "RSET command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1434
 msgid "RCPT TO command failed: "
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑ RCPT TO: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1370
-#: ../camel/providers/smtp/camel-smtp-transport.c:1379
+#: ../camel/providers/smtp/camel-smtp-transport.c:1450
+#: ../camel/providers/smtp/camel-smtp-transport.c:1459
 #, c-format
-#| msgid "RCPT TO <%s> failed"
 msgid "RCPT TO <%s> failed: "
 msgstr "ÐÐÐÐ RCPT TO <%s>: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1421
-#: ../camel/providers/smtp/camel-smtp-transport.c:1431
-#: ../camel/providers/smtp/camel-smtp-transport.c:1441
-#: ../camel/providers/smtp/camel-smtp-transport.c:1500
-#: ../camel/providers/smtp/camel-smtp-transport.c:1519
-#: ../camel/providers/smtp/camel-smtp-transport.c:1532
-#: ../camel/providers/smtp/camel-smtp-transport.c:1540
-#| msgid "DATA command failed"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1501
+#: ../camel/providers/smtp/camel-smtp-transport.c:1511
+#: ../camel/providers/smtp/camel-smtp-transport.c:1521
+#: ../camel/providers/smtp/camel-smtp-transport.c:1580
+#: ../camel/providers/smtp/camel-smtp-transport.c:1599
+#: ../camel/providers/smtp/camel-smtp-transport.c:1612
+#: ../camel/providers/smtp/camel-smtp-transport.c:1620
 msgid "DATA command failed: "
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑ DATA: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1565
-#: ../camel/providers/smtp/camel-smtp-transport.c:1579
-#: ../camel/providers/smtp/camel-smtp-transport.c:1587
-#| msgid "RSET command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1645
+#: ../camel/providers/smtp/camel-smtp-transport.c:1659
+#: ../camel/providers/smtp/camel-smtp-transport.c:1667
 msgid "RSET command failed: "
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑ RSET: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1612
-#: ../camel/providers/smtp/camel-smtp-transport.c:1626
-#: ../camel/providers/smtp/camel-smtp-transport.c:1633
-#| msgid "QUIT command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1692
+#: ../camel/providers/smtp/camel-smtp-transport.c:1706
+#: ../camel/providers/smtp/camel-smtp-transport.c:1713
 msgid "QUIT command failed: "
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑ QUIT: "
 
 #: ../libedataserver/e-categories.c:47
-#| msgid "Anniversary"
 msgctxt "CategoryName"
 msgid "Anniversary"
 msgstr "ÐÐÐÐÐÑÐÐÐ"
 
 #: ../libedataserver/e-categories.c:48
-#| msgid "Birthday"
 msgctxt "CategoryName"
 msgid "Birthday"
 msgstr "ÐÐÐÑ ÑÐÐÐÐÐÐÑ"
 
 #: ../libedataserver/e-categories.c:49
-#| msgid "Business"
 msgctxt "CategoryName"
 msgid "Business"
 msgstr "ÐÐÐÐÐÑ"
 
 #: ../libedataserver/e-categories.c:50
-#| msgid "Competition"
 msgctxt "CategoryName"
 msgid "Competition"
 msgstr "ÐÐÐÐÑÑÐÐÑÐÑ"
 
 #: ../libedataserver/e-categories.c:51
-#| msgid "Favorites"
 msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "ÐÐÐÑÐÐÐÑÐ"
 
 #: ../libedataserver/e-categories.c:52
-#| msgid "Gifts"
 msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "ÐÐÐÐÑÐÐ"
 
 #: ../libedataserver/e-categories.c:53
-#| msgid "Goals/Objectives"
 msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "ÐÐÐÐ Ð ÐÐÐÐÑÐ"
 
 #: ../libedataserver/e-categories.c:54
-#| msgid "Holiday"
 msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "ÐÑÐÐÐÐÐÐ (ÐÑÑÐÐÐÐÐ)"
 
 #: ../libedataserver/e-categories.c:55
-#| msgid "Holiday Cards"
 msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "ÐÐÐÐÑÐÐÐÑÐÐÑÐÑÐ ÐÑÐÑÑÑÐÐ"
 
 #. important people (e.g. new business partners)
 #: ../libedataserver/e-categories.c:57
-#| msgid "Hot Contacts"
 msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "ÐÐÐÐÑÐ ÐÐÐÑÐÐÑÑ"
 
 #: ../libedataserver/e-categories.c:58
-#| msgid "Ideas"
 msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "ÐÐÐÐ"
 
 #: ../libedataserver/e-categories.c:59
-#| msgid "International"
 msgctxt "CategoryName"
 msgid "International"
 msgstr "ÐÐÐÐÑÐÐÑÐÐÐÑÐ"
 
 #: ../libedataserver/e-categories.c:60
-#| msgid "Key Customer"
 msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÑÐÐÐÑÐÐÑ"
 
 #: ../libedataserver/e-categories.c:61
-#| msgid "Miscellaneous"
 msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "ÐÐÐÐÐÐ"
 
 #: ../libedataserver/e-categories.c:62
-#| msgid "Personal"
 msgctxt "CategoryName"
 msgid "Personal"
 msgstr "ÐÐÑÐÐÐ"
 
 #: ../libedataserver/e-categories.c:63
-#| msgid "Phone Calls"
 msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "ÐÐÐÐÑÐÐÐÑÐ ÐÐÐÐÐÐ"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
 #: ../libedataserver/e-categories.c:65
-#| msgid "Status"
 msgctxt "CategoryName"
 msgid "Status"
 msgstr "ÐÐÑÑÐÑÐÐÐ"
 
 #: ../libedataserver/e-categories.c:66
-#| msgid "Strategies"
 msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "ÐÑÑÐÑÐÐÐÐ"
 
 #: ../libedataserver/e-categories.c:67
-#| msgid "Suppliers"
 msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "ÐÐÑÑÐÐÑÐÐÐ"
 
 #: ../libedataserver/e-categories.c:68
-#| msgid "Time & Expenses"
 msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "ÐÑÐÐÑ Ð ÑÐÑÑÐÐÑ"
 
 #: ../libedataserver/e-categories.c:69
-#| msgid "VIP"
 msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
 #: ../libedataserver/e-categories.c:70
-#| msgid "Waiting"
 msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "ÐÐÐÐÐÐÐÐ"
 
+#: ../libedataserver/e-client.c:106
+msgctxt "ClientError"
+msgid "Invalid argument"
+msgstr "ÐÐÐÐÐÑÑÑÐÐÑÐ ÐÑÐÑÐÐÐÑ"
+
+#: ../libedataserver/e-client.c:108
+msgctxt "ClientError"
+msgid "Backend is busy"
+msgstr "ÐÑÐÐÐÐÑ ÐÐÐÑÑ"
+
+#: ../libedataserver/e-client.c:110
+msgctxt "ClientError"
+msgid "Source not loaded"
+msgstr "ÐÑÑÐÑÐÐÐ ÐÐ ÐÐÐÑÑÐÐÐ"
+
+#: ../libedataserver/e-client.c:112
+msgctxt "ClientError"
+msgid "Source already loaded"
+msgstr "ÐÑÑÐÑÐÐÐ ÑÐÐ ÐÐÐÑÑÐÐÐ"
+
+#: ../libedataserver/e-client.c:114
+msgctxt "ClientError"
+msgid "Authentication failed"
+msgstr "ÐÐÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÐÐÑÑÐ"
+
+#: ../libedataserver/e-client.c:116
+msgctxt "ClientError"
+msgid "Authentication required"
+msgstr "ÐÑÐÐÑÐÑÑÑ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÐÐÑÑÐ"
+
+#: ../libedataserver/e-client.c:118
+msgctxt "ClientError"
+msgid "Repository offline"
+msgstr "ÐÐÐÐÐÐÑÐÑÐÐ ÐÑÐÐÑÑÑÐ ÐÑ ÑÐÑÐ"
+
+#: ../libedataserver/e-client.c:120
+msgctxt "ClientError"
+msgid "Offline unavailable"
+msgstr "ÐÐÐÐÐ ÂÐÐÐ ÑÐÑÐÂ ÐÐÐÐÑÑÑÐÐÐ"
+
+#: ../libedataserver/e-client.c:122
+msgctxt "ClientError"
+msgid "Permission denied"
+msgstr "ÐÐÑÑÑÐ ÐÐÐÑÐÑÑÐ"
+
+#: ../libedataserver/e-client.c:124
+msgctxt "ClientError"
+msgid "Cancelled"
+msgstr "ÐÑÐÐÐÐÐÐ"
+
+#: ../libedataserver/e-client.c:126
+msgctxt "ClientError"
+msgid "Could not cancel"
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÑÐÐÐÐÑÑ"
+
+#: ../libedataserver/e-client.c:128
+msgctxt "ClientError"
+msgid "Not supported"
+msgstr "ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ"
+
+#: ../libedataserver/e-client.c:130
+msgctxt "ClientError"
+msgid "Unsupported authentication method"
+msgstr "ÐÐÐÐÐÐÐÑÐÐÐÐÐÐÑÐ ÐÐÑÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÐÐÑÑÐ"
+
+#: ../libedataserver/e-client.c:132
+msgctxt "ClientError"
+msgid "TLS not available"
+msgstr "TLS ÐÐÐÐÑÑÑÐÐÐ"
+
+#: ../libedataserver/e-client.c:134
+msgctxt "ClientError"
+msgid "Search size limit exceeded"
+msgstr "ÐÑÐÐÑÑÐÐÐ ÐÐÑÐÐÐÑÐÐÐÐ ÐÐ ÑÐÐÐÐÑ ÑÐÐÑÐÑÑÐÑÐÐ ÐÐÐÑÐÐ"
+
+#: ../libedataserver/e-client.c:136
+msgctxt "ClientError"
+msgid "Search time limit exceeded"
+msgstr "ÐÑÐÐÑÑÐÐÐ ÐÐÑÐÐÐÑÐÐÐÐ ÐÐ ÐÑÐÐÑ ÐÐÐÑÐÐ"
+
+#: ../libedataserver/e-client.c:138
+msgctxt "ClientError"
+msgid "Invalid query"
+msgstr "ÐÐÐÐÑÑÐÐÑÐÑÐ ÐÐÐÑÐÑ"
+
+#: ../libedataserver/e-client.c:140
+msgctxt "ClientError"
+msgid "Query refused"
+msgstr "ÐÐÐÑÐÑ ÐÑÐÐÐÐÑÐ"
+
+#: ../libedataserver/e-client.c:142
+msgctxt "ClientError"
+msgid "D-Bus error"
+msgstr "ÐÑÐÐÐÐ D-Bus"
+
+#: ../libedataserver/e-client.c:144
+msgctxt "ClientError"
+msgid "Other error"
+msgstr "ÐÑÑÐÐÑ ÐÑÐÐÐÐ"
+
+#: ../libedataserver/e-client.c:147
+msgctxt "ClientError"
+msgid "Unknown error"
+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:1635
-#: ../libedataserver/e-time-utils.c:1902
+#: ../libedataserver/e-time-utils.c:1634 ../libedataserver/e-time-utils.c:1930
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
@@ -4972,8 +4870,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:1640
-#: ../libedataserver/e-time-utils.c:1893
+#: ../libedataserver/e-time-utils.c:1639 ../libedataserver/e-time-utils.c:1921
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
@@ -4981,8 +4878,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:1645
-#: ../libedataserver/e-time-utils.c:1898
+#: ../libedataserver/e-time-utils.c:1644 ../libedataserver/e-time-utils.c:1926
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
@@ -4990,83 +4886,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:1650
-#: ../libedataserver/e-time-utils.c:1889
+#: ../libedataserver/e-time-utils.c:1649 ../libedataserver/e-time-utils.c:1917
 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:1655
+#: ../libedataserver/e-time-utils.c:1654
 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:1660
+#: ../libedataserver/e-time-utils.c:1659
 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:1663
-#: ../libedataserver/e-time-utils.c:1765
-#: ../libedataserver/e-time-utils.c:1884
+#: ../libedataserver/e-time-utils.c:1662 ../libedataserver/e-time-utils.c:1782
+#: ../libedataserver/e-time-utils.c:1912
 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:1670
+#: ../libedataserver/e-time-utils.c:1669
 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:1674
+#: ../libedataserver/e-time-utils.c:1673
 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:1679
+#: ../libedataserver/e-time-utils.c:1678
 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:1684
+#: ../libedataserver/e-time-utils.c:1683
 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:1689
+#: ../libedataserver/e-time-utils.c:1688
 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:1694
+#: ../libedataserver/e-time-utils.c:1693
 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:1697
-#: ../libedataserver/e-time-utils.c:1768
+#: ../libedataserver/e-time-utils.c:1696 ../libedataserver/e-time-utils.c:1785
 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:1826
-#: ../libedataserver/e-time-utils.c:1946
+#: ../libedataserver/e-time-utils.c:1854 ../libedataserver/e-time-utils.c:1974
 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:1830
-#: ../libedataserver/e-time-utils.c:1938
+#: ../libedataserver/e-time-utils.c:1858 ../libedataserver/e-time-utils.c:1966
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -5074,226 +4965,220 @@ msgstr "%H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1835
-#: ../libedataserver/e-time-utils.c:1943
+#: ../libedataserver/e-time-utils.c:1863 ../libedataserver/e-time-utils.c:1971
 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:1839
-#: ../libedataserver/e-time-utils.c:1935
+#: ../libedataserver/e-time-utils.c:1867 ../libedataserver/e-time-utils.c:1963
 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:1842
+#: ../libedataserver/e-time-utils.c:1870
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1846
+#: ../libedataserver/e-time-utils.c:1874
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-book-auth-util.c:93
-#: ../libedataserverui/e-book-auth-util.c:673
+#: ../libedataserverui/e-book-auth-util.c:98
+#: ../libedataserverui/e-book-auth-util.c:661
 msgid "Accessing LDAP Server anonymously"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÑÑÑÐ Ð ÑÐÑÐÐÑÑ LDAP"
 
-#: ../libedataserverui/e-book-auth-util.c:199
-#: ../libedataserverui/e-book-auth-util.c:435
+#: ../libedataserverui/e-book-auth-util.c:197
+#: ../libedataserverui/e-book-auth-util.c:422
 msgid "Failed to authenticate.\n"
 msgstr "ÐÑÐÐÐÐ ÐÐÑÐÑÐÐÐÑÐÐ.\n"
 
-#: ../libedataserverui/e-categories-dialog.c:131
-msgid "Category Properties"
-msgstr "ÐÐÐÐÑÑÐÐ ÐÐÑÐÐÐÑÐÐ"
-
-#: ../libedataserverui/e-categories-dialog.c:142
-msgid "Category _Name"
-msgstr "_ÐÐÑ ÐÐÑÐÐÐÑÐÐ"
-
-#: ../libedataserverui/e-categories-dialog.c:148
-msgid "Category _Icon"
-msgstr "_ÐÐÐÑÐÐ ÐÐÑÐÐÐÑÐÐ"
-
-#: ../libedataserverui/e-categories-dialog.c:189
-msgid "Category Icon"
-msgstr "ÐÐÐÑÐÐ ÐÐÑÐÐÐÑÐÐ"
-
-#: ../libedataserverui/e-categories-dialog.c:195
-msgid "_No Image"
-msgstr "ÐÐÑ _ÐÐÐÐÑÐÐÐÐÐÑ"
-
-#: ../libedataserverui/e-categories-dialog.c:406
-#, c-format
-msgid "There is already a category '%s' in the configuration. Please use another name"
-msgstr "ÐÐÑÐÐÐÑÐÑ Ñ ÐÐÐÐÐÐ Â%s ÑÐÐ ÐÑÑÑ. ÐÑÐÐÐÑÐÑÐÑÐ ÐÑÑÐÐÐ ÐÐÑ"
-
-#: ../libedataserverui/e-categories-dialog.c:661
+#: ../libedataserverui/e-categories-editor.c:221
 msgid "Currently _used categories:"
 msgstr "_ÐÑÐÐÐÑÐÑÐÐÑÐ ÐÐÑÐÐÐÑÐÐ:"
 
-#: ../libedataserverui/e-categories-dialog.c:668
+#: ../libedataserverui/e-categories-editor.c:230
 msgid "_Available Categories:"
 msgstr "_ÐÑÑÑÐÐÑÐ ÐÐÑÐÐÐÑÐÐ:"
 
-#: ../libedataserverui/e-categories-dialog.c:711
-msgid "_Edit"
-msgstr "_ÐÑÐÐÐÐ"
-
-#: ../libedataserverui/e-categories-dialog.c:767
+#: ../libedataserverui/e-categories-selector.c:320
 msgid "Icon"
 msgstr "ÐÐÐÑÐÐ"
 
-#: ../libedataserverui/e-categories-dialog.c:772
+#: ../libedataserverui/e-categories-selector.c:325
 msgid "Category"
 msgstr "ÐÐÑÐÐÐÑÐÑ"
 
-#: ../libedataserverui/e-category-completion.c:292
+#: ../libedataserverui/e-category-completion.c:294
 #, c-format
 msgid "Create category \"%s\""
 msgstr "ÐÐÐÐÐÑÑ ÐÐÑÐÐÐÑÐÑ Â%sÂ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:169
-#| msgid "Hot Contacts"
+#: ../libedataserverui/e-category-editor.c:132
+msgid "Category Icon"
+msgstr "ÐÐÐÑÐÐ ÐÐÑÐÐÐÑÐÐ"
+
+#: ../libedataserverui/e-category-editor.c:136
+msgid "_No Image"
+msgstr "ÐÐÑ _ÐÐÐÐÑÐÐÐÐÐÑ"
+
+#: ../libedataserverui/e-category-editor.c:173
+msgid "Category _Name"
+msgstr "_ÐÐÑ ÐÐÑÐÐÐÑÐÐ"
+
+#: ../libedataserverui/e-category-editor.c:181
+msgid "Category _Icon"
+msgstr "_ÐÐÐÑÐÐ ÐÐÑÐÐÐÑÐÐ"
+
+#: ../libedataserverui/e-category-editor.c:221
+msgid "Category Properties"
+msgstr "ÐÐÐÐÑÑÐÐ ÐÐÑÐÐÐÑÐÐ"
+
+#: ../libedataserverui/e-category-editor.c:282
+#, c-format
+msgid ""
+"There is already a category '%s' in the configuration. Please use another "
+"name"
+msgstr "ÐÐÑÐÐÐÑÐÑ Ñ ÐÐÐÐÐÐ Â%s ÑÐÐ ÐÑÑÑ. ÐÑÐÐÐÑÐÑÐÑÐ ÐÑÑÐÐÐ ÐÐÑ"
+
+#: ../libedataserverui/e-client-utils.c:756
+#, c-format
+msgid ""
+"Enter password for %s (user %s)\n"
+"Reason: %s"
+msgstr ""
+"ÐÐÐÐÐÑÐ ÐÐÑÐÐÑ ÐÐÑ %s (ÐÐÐÑÐÐÐÐÑÐÐÑ %s)\n"
+"ÐÑÐÑÐÐÐ: %s"
+
+#: ../libedataserverui/e-client-utils.c:850
+msgid "Enter Passphrase"
+msgstr "ÐÐÐÐÐÑÐ ÐÐÑÑÐÐÑÑ ÑÑÐÐÑ"
+
+#: ../libedataserverui/e-client-utils.c:852
+msgid "Enter Password"
+msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÐÑ"
+
+#: ../libedataserverui/e-name-selector-dialog.c:184
 msgid "Show Contacts"
 msgstr "ÐÐÐÐÐÐÑÑ ÐÐÐÑÐÐÑÑ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:191
+#: ../libedataserverui/e-name-selector-dialog.c:206
 msgid "Address B_ook:"
 msgstr "ÐÐÑÐÑÐÐÑ Ð_ÐÐÐÐ:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:199
+#: ../libedataserverui/e-name-selector-dialog.c:214
 msgid "Cate_gory:"
 msgstr "Ð_ÐÑÐÐÐÑÐÑ:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:217
+#: ../libedataserverui/e-name-selector-dialog.c:232
 msgid "_Search:"
 msgstr "_ÐÑÐÐÑÑ:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:235
-#: ../libedataserverui/e-name-selector-dialog.c:970
+#: ../libedataserverui/e-name-selector-dialog.c:250
+#: ../libedataserverui/e-name-selector-dialog.c:1011
 msgid "Any Category"
 msgstr "ÐÑÐÐÑ ÐÐÑÐÐÐÑÐÑ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:237
-#| msgid "Contacts"
+#: ../libedataserverui/e-name-selector-dialog.c:252
 msgid "Co_ntacts"
 msgstr "ÐÐ_ÐÑÐÐÑÑ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:282
+#: ../libedataserverui/e-name-selector-dialog.c:307
 msgid "Search"
 msgstr "ÐÐÐÑÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:285
+#: ../libedataserverui/e-name-selector-dialog.c:310
 msgid "Address Book"
 msgstr "ÐÐÑÐÑÐÐÑ ÐÐÐÐÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:288
+#: ../libedataserverui/e-name-selector-dialog.c:313
 msgid "Contacts"
 msgstr "ÐÐÐÑÐÐÑÑ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:405
+#: ../libedataserverui/e-name-selector-dialog.c:430
 msgid "Select Contacts from Address Book"
 msgstr "ÐÑÐÐÑ ÐÐÐÑÐÐÑÐÐ ÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:740
+#: ../libedataserverui/e-name-selector-dialog.c:766
 msgid "_Add"
 msgstr "_ÐÐÐÐÐÐÑÑ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:744
+#: ../libedataserverui/e-name-selector-dialog.c:770
 msgid "_Remove"
 msgstr "_ÐÐÐÐÐÑÑ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:884
+#: ../libedataserverui/e-name-selector-dialog.c:930
 #, c-format
-#| msgid "Error reading mail file: %s"
 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:2665
+#: ../libedataserverui/e-name-selector-entry.c:2704
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "_ÐÐÐÐÐÑÐÑÑÑ %s"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2680
+#: ../libedataserverui/e-name-selector-entry.c:2719
 #, c-format
 msgid "Cop_y %s"
 msgstr "Ð_ÐÐÐÑÐÐÐÑÑ %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2690
+#: ../libedataserverui/e-name-selector-entry.c:2729
 #, c-format
 msgid "C_ut %s"
 msgstr "Ð_ÑÑÐÐÐÑÑ %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2707
+#: ../libedataserverui/e-name-selector-entry.c:2746
 #, c-format
 msgid "_Edit %s"
 msgstr "_ÐÑÐÐÐÐ %s"
 
-#: ../libedataserverui/e-name-selector-list.c:513
+#: ../libedataserverui/e-name-selector-list.c:509
 #, c-format
 msgid "_Delete %s"
 msgstr "_ÐÐÐÐÐÑÑ %s"
 
-#: ../libedataserverui/e-passwords.c:127
-#, c-format
+#: ../libedataserverui/e-passwords.c:126
 msgid "Keyring key is unusable: no user or host name"
 msgstr "ÐÐÑÑ ÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÑÐÐÑÐÐ: ÐÑÑÑÑÑÑÐÑÐÑ ÐÐÑ ÐÐÐÑÐÐÐÐÑÐÐÑ ÐÐÐ ÑÐÐÐ"
 
-#: ../libedataserverui/e-passwords.c:701
+#: ../libedataserverui/e-passwords.c:699
+#: ../libedataserverui/e-passwords-win32.c:612
 msgid "You have the Caps Lock key on."
 msgstr "ÐÐ ÐÐÐÐÐÐÑÑÑÐ ÐÐÐÑÑÑÐ Caps Lock."
 
-#: ../libedataserverui/e-passwords.c:821
+#: ../libedataserverui/e-passwords.c:819
+#: ../libedataserverui/e-passwords-win32.c:735
 msgid "_Remember this passphrase"
 msgstr "_ÐÐÐÐÐÐÐÑÑ ÑÑÑ ÐÐÑÑÐÐÑÑ ÑÑÐÐÑ"
 
-#: ../libedataserverui/e-passwords.c:822
+#: ../libedataserverui/e-passwords.c:820
+#: ../libedataserverui/e-passwords-win32.c:736
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "_ÐÐÐÐÐÐÐÑÑ ÑÑÐÑ ÐÐÑÐÐÑ ÐÐ ÐÐÐÐÑÐÐÐÑ ÑÑÐÐÐ ÑÐÐÐÑÐ"
 
-#: ../libedataserverui/e-passwords.c:827
+#: ../libedataserverui/e-passwords.c:825
+#: ../libedataserverui/e-passwords-win32.c:741
 msgid "_Remember this password"
 msgstr "_ÐÐÐÐÐÐÐÑÑ ÑÑÐÑ ÐÐÑÐÐÑ"
 
-#: ../libedataserverui/e-passwords.c:828
+#: ../libedataserverui/e-passwords.c:826
+#: ../libedataserverui/e-passwords-win32.c:742
 msgid "_Remember this password for the remainder of this session"
 msgstr "_ÐÐÐÐÐÐÐÑÑ ÑÑÐÑ ÐÐÑÐÐÑ ÐÐ ÐÐÐÑÐ ÑÐÐÐÑÐ"
 
 #. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:100
+#: ../libedataserverui/e-source-selector-dialog.c:99
 msgid "Select destination"
 msgstr "ÐÑÐÐÑÐÑÐ ÐÐÐÐÐÑÐÐÐÐ"
 
-#: ../libedataserverui/e-source-selector-dialog.c:170
+#: ../libedataserverui/e-source-selector-dialog.c:169
 msgid "_Destination"
 msgstr "_ÐÐÐÐÐÑÐÐÐÐ"
 
-#: ../servers/groupwise/e-gw-connection.c:227
-msgid "Invalid connection"
-msgstr "ÐÐÐÐÐÑÑÑÐÐÐÐ ÑÐÐÐÐÐÐÐÐÐ"
-
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "Invalid response from server"
-msgstr "ÐÐÐÐÐÑÑÑÐÐÑÐ ÐÑÐÐÑ ÐÑ ÑÐÑÐÐÑÐ"
-
-#: ../servers/groupwise/e-gw-connection.c:233
-msgid "No response from the server"
-msgstr "ÐÐÑ ÐÑÐÐÑÐ ÐÑ ÑÐÑÐÐÑÐ"
-
-#: ../servers/groupwise/e-gw-connection.c:239
-msgid "Bad parameter"
-msgstr "ÐÐÐÐÑÐÑÐ ÐÐÑÐÐÐÑÑ"
-
-
-#: ../calendar/libecal/e-cal.c:1049
-msgid "On This Computer"
-msgstr "ÐÐ ÑÑÐÐ ÐÐÐÐÑÑÑÐÑÐ"



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