[evolution-data-server] Updated Russian translation



commit 4ef5961a2d0e28ce52de286c2fbe65b5f9ea84ce
Author: Yuri Myasoedov <omerta13 yandex ru>
Date:   Thu Aug 25 10:11:56 2011 +0400

    Updated Russian translation

 po/ru.po | 1771 +++++++++++++++++++++++++++++---------------------------------
 1 files changed, 825 insertions(+), 946 deletions(-)
---
diff --git a/po/ru.po b/po/ru.po
index 013f4eb..ede2dea 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,75 +10,76 @@
 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&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"
+"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-08-24 15:15+0000\n"
+"PO-Revision-Date: 2011-08-25 10:10+0300\n"
+"Last-Translator: Yuri Myasoedov <omerta13 yandex 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"
+"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:668
+#: ../addressbook/backends/file/e-book-backend-file.c:823
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
 msgid "Loading..."
 msgstr "ÐÐÐÑÑÐÐÐâ"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:671
+#: ../addressbook/backends/file/e-book-backend-file.c:826
 #: ../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:628
+#: ../addressbook/backends/google/e-book-backend-google.c:788
 msgid "Querying for updated contactsâ"
 msgstr "ÐÐÐÑÐÑ ÐÐÐÐÐÐÑÐÐÑÑ ÐÐÐÑÐÐÑÐÐâ"
 
-#: ../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
+#: ../addressbook/backends/google/e-book-backend-google.c:839
+#: ../addressbook/libebook/e-book.c:3483
+#: ../calendar/libecal/e-cal.c:1337
+#: ../libedataserver/e-client.c:1851
 msgid "Personal"
 msgstr "ÐÐÑÐÐÐ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:674
+#: ../addressbook/backends/google/e-book-backend-google.c:841
 msgid "Friends"
 msgstr "ÐÑÑÐÑÑ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:676
+#: ../addressbook/backends/google/e-book-backend-google.c:843
 msgid "Family"
 msgstr "ÐÐÐÑÑ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:678
+#: ../addressbook/backends/google/e-book-backend-google.c:845
 msgid "Coworkers"
 msgstr "ÐÐÑÑÑÐÐÐÐÐ"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:757
+#: ../addressbook/backends/google/e-book-backend-google.c:924
 msgid "Querying for updated groupsâ"
 msgstr "ÐÐÐÑÐÑ ÐÐÐÐÐÐÑÐÐÑÑ ÐÑÑÐÐâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1036
+#. Insert the entry on the server asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:1329
 msgid "Creating new contactâ"
 msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1128
+#: ../addressbook/backends/google/e-book-backend-google.c:1433
 msgid "Deleting contactâ"
 msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1240
+#. Update the contact on the server asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:1699
 msgid "Modifying contactâ"
 msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1387
+#: ../addressbook/backends/google/e-book-backend-google.c:1892
 msgid "Loadingâ"
 msgstr "ÐÐÐÑÑÐÐÐâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1540
+#: ../addressbook/backends/google/e-book-backend-google.c:2047
 msgid "Authenticating with the serverâ"
 msgstr "ÐÑÐÐÐÐÑÐÑÑÑ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑ ÐÐ ÑÐÑÐÐÑÐâ"
 
@@ -130,122 +131,104 @@ 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
+#: ../addressbook/libebook/e-book-client.c:96
+#: ../addressbook/libedata-book/e-data-book.c:442
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:520
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:549
 #: ../calendar/backends/http/e-cal-backend-http.c:422
-#: ../calendar/libecal/e-cal.c:4462
+#: ../calendar/libecal/e-cal.c:4439
+#: ../calendar/libecal/e-cal-client.c:140
 #: ../camel/providers/imap/camel-imap-command.c:484
-#: ../camel/providers/imap/camel-imap-store.c:385
-#: ../camel/providers/smtp/camel-smtp-transport.c:520
+#: ../camel/providers/imap/camel-imap-store.c:409
+#: ../camel/providers/imapx/camel-imapx-server.c:2246
+#: ../camel/providers/smtp/camel-smtp-transport.c:439
+#: ../libedataserver/e-client.c:152
 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:3247
+#: ../addressbook/libebook/e-book.c:3158
 #, c-format
 msgid "%s: there was no source for UID '%s' stored in GConf."
 msgstr "%s: ÐÑÑÐÑÐÐÐ ÐÐÑ UID Â%s ÐÐ ÐÑÐ ÑÐÑÑÐÐÑÐ Ð GConf."
 
-#: ../addressbook/libebook/e-book.c:3555 ../calendar/libecal/e-cal.c:1311
-#: ../libedataserver/e-client.c:1772
+#: ../addressbook/libebook/e-book.c:3466
+#: ../calendar/libecal/e-cal.c:1317
+#: ../libedataserver/e-client.c:1846
 msgid "On This Computer"
 msgstr "ÐÐ ÑÑÐÐ ÐÐÐÐÑÑÑÐÑÐ"
 
-#: ../addressbook/libebook/e-book.c:3681
-#: ../addressbook/libebook/e-book-client.c:613
+#: ../addressbook/libebook/e-book.c:3592
+#: ../addressbook/libebook/e-book-client.c:635
 #: ../addressbook/libedata-book/e-data-book.c:310
 msgid "Address book does not exist"
 msgstr "ÐÐÑÐÑÐÐÑ ÐÐÐÐÐ ÐÐ ÑÑÑÐÑÑÐÑÐÑ"
 
 #: ../addressbook/libebook/e-book-client.c:85
-msgctxt "BookClientError"
+#| msgctxt "BookClientError"
+#| msgid "No such book"
 msgid "No such book"
 msgstr "ÐÐÑ ÑÐÐÐÐ ÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-book-client.c:87
-msgctxt "BookClientError"
+#: ../addressbook/libedata-book/e-data-book.c:303
 msgid "Contact not found"
 msgstr "ÐÐÐÑÐÐÑ ÐÐ ÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-book-client.c:89
-msgctxt "BookClientError"
+#: ../addressbook/libedata-book/e-data-book.c:304
 msgid "Contact ID already exists"
 msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÐÐÑÐÐÑÐ ÑÐÐ ÑÑÑÐÑÑÐÑÐÑ"
 
 #: ../addressbook/libebook/e-book-client.c:91
-msgctxt "BookClientError"
+#| msgctxt "BookClientError"
+#| msgid "No such source"
 msgid "No such source"
 msgstr "ÐÐÑ ÑÐÐÐÐÐ ÐÑÑÐÑÐÐÐÐ"
 
 #: ../addressbook/libebook/e-book-client.c:93
-msgctxt "BookClientError"
+#: ../addressbook/libedata-book/e-data-book.c:320
 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
+#: ../addressbook/libebook/e-book-client.c:449
 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
+#: ../addressbook/libebook/e-book-client.c:459
+#: ../addressbook/libedata-book/e-data-book-factory.c:375
+#: ../addressbook/libedata-book/e-data-book-factory.c:433
+#: ../calendar/libecal/e-cal-client.c:565
+#: ../calendar/libedata-cal/e-data-cal-factory.c:395
 #, c-format
 msgid "Invalid source"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÑÑÐÑÐÐÐ"
 
-#: ../addressbook/libebook/e-book-client.c:538
-#: ../calendar/libecal/e-cal-client.c:656
+#: ../addressbook/libebook/e-book-client.c:560
+#: ../calendar/libecal/e-cal-client.c:678
 #, c-format
 msgid "Incorrect uri '%s'"
 msgstr "ÐÐÐÐÑÑÐÐÑÐÑÐ uri Â%sÂ"
 
-#: ../addressbook/libebook/e-book-client.c:576
+#: ../addressbook/libebook/e-book-client.c:598
 msgid "Failed to find system book"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÐ ÑÐÑÑÐÐÐÑÑ ÐÐÐÐÑ"
 
-#: ../addressbook/libebook/e-book-client.c:683
-#: ../calendar/libecal/e-cal-client.c:804
+#: ../addressbook/libebook/e-book-client.c:705
+#: ../calendar/libecal/e-cal-client.c:826
 #, 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
+#: ../addressbook/libebook/e-book-client.c:2094
+#: ../calendar/libecal/e-cal-client.c:4092
 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:116
 msgid "Unique ID"
@@ -467,51 +450,51 @@ msgstr "ÐÑÐÐÐÑÐÐÐÐ"
 #. Instant messaging fields
 #: ../addressbook/libebook/e-contact.c:194
 msgid "AIM Home Screen Name 1"
-msgstr "AIM - ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 1"
+msgstr "AIM â ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 1"
 
 #: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Home Screen Name 2"
-msgstr "AIM - ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 2"
+msgstr "AIM â ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 2"
 
 #: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Home Screen Name 3"
-msgstr "AIM - ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 3"
+msgstr "AIM â ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 3"
 
 #: ../addressbook/libebook/e-contact.c:197
 msgid "AIM Work Screen Name 1"
-msgstr "AIM - ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 1"
+msgstr "AIM â ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 1"
 
 #: ../addressbook/libebook/e-contact.c:198
 msgid "AIM Work Screen Name 2"
-msgstr "AIM - ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 2"
+msgstr "AIM â ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 2"
 
 #: ../addressbook/libebook/e-contact.c:199
 msgid "AIM Work Screen Name 3"
-msgstr "AIM - ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 3"
+msgstr "AIM â ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 3"
 
 #: ../addressbook/libebook/e-contact.c:200
 msgid "GroupWise Home Screen Name 1"
-msgstr "Groupwise - ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 1"
+msgstr "Groupwise â ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 1"
 
 #: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Home Screen Name 2"
-msgstr "Groupwise - ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 2"
+msgstr "Groupwise â ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 2"
 
 #: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Home Screen Name 3"
-msgstr "Groupwise - ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 3"
+msgstr "Groupwise â ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 3"
 
 #: ../addressbook/libebook/e-contact.c:203
 msgid "GroupWise Work Screen Name 1"
-msgstr "Groupwise - ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 1"
+msgstr "Groupwise â ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 1"
 
 #: ../addressbook/libebook/e-contact.c:204
 msgid "GroupWise Work Screen Name 2"
-msgstr "Groupwise - ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 2"
+msgstr "Groupwise â ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 2"
 
 #: ../addressbook/libebook/e-contact.c:205
 msgid "GroupWise Work Screen Name 3"
-msgstr "Groupwise - ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 3"
+msgstr "Groupwise â ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 3"
 
 #: ../addressbook/libebook/e-contact.c:206
 msgid "Jabber Home ID 1"
@@ -539,51 +522,51 @@ msgstr "Jabber â ÑÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ 3"
 
 #: ../addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Home Screen Name 1"
-msgstr "Yahoo! - ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 1"
+msgstr "Yahoo! â ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 1"
 
 #: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Home Screen Name 2"
-msgstr "Yahoo! - ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 2"
+msgstr "Yahoo! â ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 2"
 
 #: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Home Screen Name 3"
-msgstr "Yahoo! - ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 3"
+msgstr "Yahoo! â ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 3"
 
 #: ../addressbook/libebook/e-contact.c:215
 msgid "Yahoo! Work Screen Name 1"
-msgstr "Yahoo! - ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 1"
+msgstr "Yahoo! â ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 1"
 
 #: ../addressbook/libebook/e-contact.c:216
 msgid "Yahoo! Work Screen Name 2"
-msgstr "Yahoo! - ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 2"
+msgstr "Yahoo! â ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 2"
 
 #: ../addressbook/libebook/e-contact.c:217
 msgid "Yahoo! Work Screen Name 3"
-msgstr "Yahoo! - ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 3"
+msgstr "Yahoo! â ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 3"
 
 #: ../addressbook/libebook/e-contact.c:218
 msgid "MSN Home Screen Name 1"
-msgstr "MSN - ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 1"
+msgstr "MSN â ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 1"
 
 #: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Home Screen Name 2"
-msgstr "MSN - ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 2"
+msgstr "MSN â ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 2"
 
 #: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Home Screen Name 3"
-msgstr "MSN - ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 3"
+msgstr "MSN â ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 3"
 
 #: ../addressbook/libebook/e-contact.c:221
 msgid "MSN Work Screen Name 1"
-msgstr "MSN - ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 1"
+msgstr "MSN â ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 1"
 
 #: ../addressbook/libebook/e-contact.c:222
 msgid "MSN Work Screen Name 2"
-msgstr "MSN - ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 2"
+msgstr "MSN â ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 2"
 
 #: ../addressbook/libebook/e-contact.c:223
 msgid "MSN Work Screen Name 3"
-msgstr "MSN - ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 3"
+msgstr "MSN â ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 3"
 
 #: ../addressbook/libebook/e-contact.c:224
 msgid "ICQ Home ID 1"
@@ -633,7 +616,7 @@ msgstr "ÐÐÐÐÑÐÐ ÐÐÑÐÑ"
 
 #: ../addressbook/libebook/e-contact.c:239
 msgid "Other Address"
-msgstr "ÐÑÑÐÐÐ ÐÐÑÐÑÐ"
+msgstr "ÐÑÑÐÐÐ ÐÐÑÐÑ"
 
 #. Contact categories
 #: ../addressbook/libebook/e-contact.c:242
@@ -647,7 +630,7 @@ msgstr "ÐÐÑÐ"
 
 #: ../addressbook/libebook/e-contact.c:246
 msgid "Logo"
-msgstr "ÐÐÐÐ"
+msgstr "ÐÐÐÐÑÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:248
 msgid "Name"
@@ -777,8 +760,43 @@ msgstr "ÐÐÐÑÐÐ ÑÐÑÐÐÐÑÑ ÐÐÐÐ Skype"
 msgid "SIP address"
 msgstr "ÐÐÑÐÑ SIP"
 
-#: ../addressbook/libebook/e-contact.c:1542
-#: ../addressbook/libebook/e-destination.c:870
+#: ../addressbook/libebook/e-contact.c:293
+#| msgid "Skype Home Name 1"
+msgid "Google Talk Home Name 1"
+msgstr "Google Talk â ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 1"
+
+#: ../addressbook/libebook/e-contact.c:294
+#| msgid "Skype Home Name 2"
+msgid "Google Talk Home Name 2"
+msgstr "Google Talk â ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 2"
+
+#: ../addressbook/libebook/e-contact.c:295
+#| msgid "Skype Home Name 3"
+msgid "Google Talk Home Name 3"
+msgstr "Google Talk â ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 3"
+
+#: ../addressbook/libebook/e-contact.c:296
+#| msgid "Skype Work Name 1"
+msgid "Google Talk Work Name 1"
+msgstr "Google Talk â ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 1"
+
+#: ../addressbook/libebook/e-contact.c:297
+#| msgid "Skype Work Name 2"
+msgid "Google Talk Work Name 2"
+msgstr "Google Talk â ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 2"
+
+#: ../addressbook/libebook/e-contact.c:298
+#| msgid "Skype Work Name 3"
+msgid "Google Talk Work Name 3"
+msgstr "Google Talk â ÑÐÐÐÑÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑ 3"
+
+#: ../addressbook/libebook/e-contact.c:299
+#| msgid "Skype Name List"
+msgid "Google Talk Name List"
+msgstr "ÐÐÐÑÐÐ ÑÐÑÐÐÐÑÑ ÐÐÑÐ Google Talk"
+
+#: ../addressbook/libebook/e-contact.c:1550
+#: ../addressbook/libebook/e-destination.c:868
 msgid "Unnamed List"
 msgstr "ÐÐÐÑÐÑÐÐÑÐ ÑÐÐÑÐÐ"
 
@@ -786,17 +804,17 @@ msgstr "ÐÐÐÑÐÑÐÐÑÐ ÑÐÐÑÐÐ"
 msgid "Cannot process, book backend is opening"
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÑÐÐÐÑÐÑÑ, ÐÑÐÑÑÑ ÐÑÐÐÐÐÑ ÐÐÐÐÐ"
 
-#: ../addressbook/libedata-book/e-book-backend.c:91
+#: ../addressbook/libedata-book/e-book-backend.c:92
 #, c-format
 msgid "Unknown book property '%s'"
 msgstr "ÐÐÐÐÐÐÑÑÐÐÐ ÑÐÐÐÑÑÐÐ ÐÐÐÐÐ Â%sÂ"
 
-#: ../addressbook/libedata-book/e-book-backend.c:103
+#: ../addressbook/libedata-book/e-book-backend.c:104
 #, c-format
 msgid "Cannot change value of book property '%s'"
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÑÑ ÐÐÐÑÐÐÐÐ ÑÐÐÐÑÑÐÐ ÐÐÐÐÐ Â%sÂ"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:420
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:463
 #: ../camel/camel-db.c:470
 #, c-format
 msgid "Insufficient memory"
@@ -805,60 +823,59 @@ 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
+#: ../addressbook/libedata-book/e-data-book.c:694
 msgid "Invalid query: "
 msgstr "ÐÐÐÐÐÑÑÑÐÐÑÐ ÐÐÐÑÐÑ: "
 
 #: ../addressbook/libedata-book/e-data-book.c:299
-#: ../calendar/libedata-cal/e-data-cal.c:413
+#: ../calendar/libedata-cal/e-data-cal.c:414
 msgid "Success"
 msgstr "ÐÑÐÐÑÐÐ"
 
 #: ../addressbook/libedata-book/e-data-book.c:300
-#: ../calendar/libecal/e-cal.c:4430 ../calendar/libedata-cal/e-data-cal.c:414
+#: ../calendar/libecal/e-cal.c:4407
+#: ../calendar/libedata-cal/e-data-cal.c:415
+#: ../libedataserver/e-client.c:111
 msgid "Backend is busy"
 msgstr "ÐÑÐÐÐÐÑ ÐÐÐÑÑ"
 
 #: ../addressbook/libedata-book/e-data-book.c:301
-#: ../calendar/libedata-cal/e-data-cal.c:415
+#: ../calendar/libedata-cal/e-data-cal.c:416
+#: ../libedataserver/e-client.c:121
 msgid "Repository offline"
 msgstr "ÐÐÐÐÐÐÑÐÑÐÐ ÐÑÐÐÑÑÑÐ ÐÑ ÑÐÑÐ"
 
 #: ../addressbook/libedata-book/e-data-book.c:302
-#: ../calendar/libecal/e-cal.c:4444 ../calendar/libedata-cal/e-data-cal.c:416
+#: ../calendar/libecal/e-cal.c:4421
+#: ../calendar/libedata-cal/e-data-cal.c:417
+#: ../libedataserver/e-client.c:125
 msgid "Permission denied"
 msgstr "ÐÐÑÑÑÐ ÐÐÐÑÐÑÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:303
-msgid "Contact not found"
-msgstr "ÐÐÐÑÐÐÑ ÐÐ ÐÐÐÐÐÐ"
-
-#: ../addressbook/libedata-book/e-data-book.c:304
-msgid "Contact ID already exists"
-msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÐÐÑÐÐÑÐ ÑÐÐ ÑÑÑÐÑÑÐÑÐÑ"
-
 #: ../addressbook/libedata-book/e-data-book.c:305
-#: ../calendar/libedata-cal/e-data-cal.c:421
+#: ../calendar/libedata-cal/e-data-cal.c:422
 msgid "Authentication Failed"
 msgstr "ÐÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÐ"
 
 #: ../addressbook/libedata-book/e-data-book.c:306
-#: ../calendar/libedata-cal/e-data-cal.c:422
+#: ../calendar/libedata-cal/e-data-cal.c:423
 msgid "Authentication Required"
 msgstr "ÐÑÐÐÑÐÑÑÑ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑ"
 
 #: ../addressbook/libedata-book/e-data-book.c:307
-#: ../calendar/libedata-cal/e-data-cal.c:423
+#: ../calendar/libedata-cal/e-data-cal.c:424
 msgid "Unsupported field"
 msgstr "ÐÐÐÐÐÐÐÑÐÐÐÐÐÐÐÐ ÐÐÐÐ"
 
 #: ../addressbook/libedata-book/e-data-book.c:308
-#: ../calendar/libedata-cal/e-data-cal.c:425
+#: ../calendar/libedata-cal/e-data-cal.c:426
+#: ../libedataserver/e-client.c:133
 msgid "Unsupported authentication method"
 msgstr "ÐÐÐÐÐÐÐÑÐÐÐÐÐÐÑÐ ÐÐÑÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÐ"
 
 #: ../addressbook/libedata-book/e-data-book.c:309
-#: ../calendar/libedata-cal/e-data-cal.c:426
+#: ../calendar/libedata-cal/e-data-cal.c:427
+#: ../libedataserver/e-client.c:135
 msgid "TLS not available"
 msgstr "TLS ÐÐÐÐÑÑÑÐÐÐ"
 
@@ -867,153 +884,166 @@ msgid "Book removed"
 msgstr "ÐÐÐÐÐ ÑÐÐÐÐÐÐ"
 
 #: ../addressbook/libedata-book/e-data-book.c:312
-#: ../calendar/libedata-cal/e-data-cal.c:429
+#: ../calendar/libedata-cal/e-data-cal.c:430
 msgid "Not available in offline mode"
 msgstr "ÐÐÐÐÑÑÑÐÐÐ Ð ÐÐÑÐÐÐÐÐÐÐ ÑÐÐÐÐÐ"
 
 #: ../addressbook/libedata-book/e-data-book.c:313
-#: ../calendar/libedata-cal/e-data-cal.c:430
+#: ../calendar/libedata-cal/e-data-cal.c:431
+#: ../libedataserver/e-client.c:137
 msgid "Search size limit exceeded"
 msgstr "ÐÑÐÐÑÑÐÐÐ ÐÐÑÐÐÐÑÐÐÐÐ ÐÐ ÑÐÐÐÐÑ ÑÐÐÑÐÑÑÐÑÐÐ ÐÐÐÑÐÐ"
 
 #: ../addressbook/libedata-book/e-data-book.c:314
-#: ../calendar/libedata-cal/e-data-cal.c:431
+#: ../calendar/libedata-cal/e-data-cal.c:432
+#: ../libedataserver/e-client.c:139
 msgid "Search time limit exceeded"
 msgstr "ÐÑÐÐÑÑÐÐÐ ÐÐÑÐÐÐÑÐÐÐÐ ÐÐ ÐÑÐÐÑ ÐÐÐÑÐÐ"
 
 #: ../addressbook/libedata-book/e-data-book.c:315
-#: ../calendar/libedata-cal/e-data-cal.c:432
+#: ../calendar/libedata-cal/e-data-cal.c:433
+#: ../libedataserver/e-client.c:141
 msgid "Invalid query"
 msgstr "ÐÐÐÐÑÑÐÐÑÐÑÐ ÐÐÐÑÐÑ"
 
 #: ../addressbook/libedata-book/e-data-book.c:316
-#: ../calendar/libedata-cal/e-data-cal.c:433
+#: ../calendar/libedata-cal/e-data-cal.c:434
+#: ../libedataserver/e-client.c:143
 msgid "Query refused"
 msgstr "ÐÐÐÑÐÑ ÐÑÐÐÐÐÑÐ"
 
 #: ../addressbook/libedata-book/e-data-book.c:317
-#: ../calendar/libedata-cal/e-data-cal.c:434
+#: ../calendar/libedata-cal/e-data-cal.c:435
+#: ../libedataserver/e-client.c:129
 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:319
-#: ../calendar/libedata-cal/e-data-cal.c:436
+#: ../calendar/libedata-cal/e-data-cal.c:437
 msgid "Invalid server version"
 msgstr "ÐÐÐÐÐÑÑÑÐÐÐÑ ÐÐÑÑÐÑ ÑÐÑÐÐÑÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:320
-msgid "No space"
-msgstr "ÐÐÐÐÑÑÐÑÐÑÐÐ ÐÐÑÑÐ"
-
 #: ../addressbook/libedata-book/e-data-book.c:321
-#: ../calendar/libecal/e-cal.c:4428 ../calendar/libedata-cal/e-data-cal.c:437
+#: ../calendar/libecal/e-cal.c:4405
+#: ../calendar/libedata-cal/e-data-cal.c:438
+#: ../libedataserver/e-client.c:109
 msgid "Invalid argument"
 msgstr "ÐÐÐÐÐÑÑÑÐÐÑÐ ÐÑÐÑÐÐÐÑ"
 
 #. Translators: The string for NOT_SUPPORTED error
 #: ../addressbook/libedata-book/e-data-book.c:323
-#: ../calendar/libecal/e-cal.c:4467 ../calendar/libedata-cal/e-data-cal.c:439
+#: ../calendar/libecal/e-cal.c:4444
+#: ../calendar/libedata-cal/e-data-cal.c:440
+#: ../libedataserver/e-client.c:131
 msgid "Not supported"
 msgstr "ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ"
 
-#: ../addressbook/libedata-book/e-data-book.c:331
-#: ../calendar/libecal/e-cal-client.c:552
-#: ../calendar/libedata-cal/e-data-cal.c:447
+#: ../addressbook/libedata-book/e-data-book.c:324
+#: ../calendar/libedata-cal/e-data-cal.c:441
+#: ../libedataserver/e-client.c:149
+#| msgid "Backend is busy"
+msgid "Backend is not opened yet"
+msgstr "ÐÑÐÐÐÐÑ ÐÑÑ ÐÐ ÐÑÐÑÑÑ"
+
+#: ../addressbook/libedata-book/e-data-book.c:332
+#: ../calendar/libecal/e-cal-client.c:573
+#: ../calendar/libedata-cal/e-data-cal.c:449
+#: ../libedataserver/e-client.c:147
 msgid "Other error"
 msgstr "ÐÑÑÐÐÑ ÐÑÐÐÐÐ"
 
 #. 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
+#: ../addressbook/libedata-book/e-data-book.c:536
+#: ../addressbook/libedata-book/e-data-book.c:866
 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
+#: ../addressbook/libedata-book/e-data-book.c:558
+#: ../addressbook/libedata-book/e-data-book.c:580
 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
+#: ../addressbook/libedata-book/e-data-book.c:602
+#: ../addressbook/libedata-book/e-data-book.c:932
 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
+#: ../addressbook/libedata-book/e-data-book.c:624
+#: ../addressbook/libedata-book/e-data-book.c:951
 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
+#: ../addressbook/libedata-book/e-data-book.c:717
+#: ../calendar/libedata-cal/e-data-cal.c:824
 msgid "Cannot authenticate user: "
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐÑÑ ÐÐÐÐÐÐÐÐÑÑÑ ÐÐÐÑÐÐÐÐÑÐÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:777
+#: ../addressbook/libedata-book/e-data-book.c:779
 msgid "Cannot open book: "
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÑÐÑÑÑÑ ÐÐÐÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:791
+#: ../addressbook/libedata-book/e-data-book.c:793
 msgid "Cannot remove book: "
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:816
+#: ../addressbook/libedata-book/e-data-book.c:818
 msgid "Cannot refresh address book: "
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÑÑ ÐÐÑÐÑÐÑÑ ÐÐÐÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:832
+#: ../addressbook/libedata-book/e-data-book.c:834
 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
+#: ../addressbook/libedata-book/e-data-book.c:850
+#: ../calendar/libedata-cal/e-data-cal.c:1001
 msgid "Cannot set backend property: "
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÑÐÑÑ ÑÐÐÐÑÑÐÐ ÐÑÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:879
+#: ../addressbook/libedata-book/e-data-book.c:881
 msgid "Cannot get contact list: "
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÑÑ ÑÐÐÑÐÐ ÐÐÐÑÐÐÑÐÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:903
+#: ../addressbook/libedata-book/e-data-book.c:905
 msgid "Cannot get contact list uids: "
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÑÑ ÐÐÐÐÑÐÑÐÐÐÑÐÑÑ ÑÐÐÑÐÐ ÐÐÐÑÐÐÑÐÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:967
+#: ../addressbook/libedata-book/e-data-book.c:969
 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
+#: ../addressbook/libedata-book/e-data-book-factory.c:359
+#: ../addressbook/libedata-book/e-data-book-factory.c:392
+#: ../calendar/libedata-cal/e-data-cal-factory.c:410
 #, c-format
 msgid "Empty URI"
 msgstr "ÐÑÑÑÐÐ URI"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:517
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:518
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "ÐÐÑÐÐÑ ÐÐÐÐÑÑÑÐÐÐ (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:545
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:546
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÐÐÐÐÐÑÐ ÐÐÐ (%d) ÑÐÑÑÐÑÐÐÑ HTTP (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2097
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2445
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2133
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2481
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1022,7 +1052,7 @@ msgstr ""
 "ÐÐÑÐÐÑ ÐÐÐÐÑÑÑÐÐÐ, ÐÐÐÐÐÐÐÑÑ ÐÑÐÑÑÑ Ð ÑÐÐÐÐÐ ÂÑÐÐÑÐÐ ÑÑÐÐÐÐÂ.\n"
 "ÐÐÐÐÑÐÐÐÐ ÐÐ ÐÑÐÐÐÐ: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4187
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4272
 msgid "Calendar doesn't support Free/Busy"
 msgstr "ÐÐÐÐÐÐÐÑÑ ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑ ÐÐÑÐÑÐÐÑÐÑ Ð ÐÐÐÑÑÐÑÑÐ"
 
@@ -1111,9 +1141,10 @@ msgstr "ÐÐÐÐÐÐ: ÐÑÐÐÑ"
 msgid "Forecast"
 msgstr "ÐÑÐÐÐÐÐ"
 
-#: ../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
+#: ../calendar/libecal/e-cal.c:867
+#: ../libedataserverui/e-book-auth-util.c:198
+#: ../libedataserverui/e-book-auth-util.c:417
+#: ../libedataserverui/e-client-utils.c:795
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÐÑ ÐÐÑ %s (ÐÐÐÑÐÐÐÐÑÐÐÑ %s)"
@@ -1122,125 +1153,105 @@ 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
+#: ../calendar/libecal/e-cal.c:881
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÐÑ Ð %s ÐÐÑ ÐÐÐÑÑÐÐÐÑ ÐÑÐÐÑÐ ÐÐÑ ÐÐÐÑÐÐÐÐÑÐÐÑ %s"
 
-#: ../calendar/libecal/e-cal.c:4432
+#: ../calendar/libecal/e-cal.c:4409
 msgid "Repository is offline"
 msgstr "ÐÐÐÐÐÐÑÐÑÐÐ ÐÐÑÐÐÐÑÑÑ Ð ÐÐÑÐÐÐÐÐÐÐ ÑÐÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4434
+#: ../calendar/libecal/e-cal.c:4411
+#: ../calendar/libecal/e-cal-client.c:127
 msgid "No such calendar"
 msgstr "ÐÐÑ ÑÐÐÐÐÐ ÐÐÐÐÐÐÐÑÑ"
 
-#: ../calendar/libecal/e-cal.c:4436 ../calendar/libedata-cal/e-data-cal.c:418
+#: ../calendar/libecal/e-cal.c:4413
+#: ../calendar/libecal/e-cal-client.c:129
+#: ../calendar/libedata-cal/e-data-cal.c:419
 msgid "Object not found"
 msgstr "ÐÐÑÐÐÑ ÐÐ ÐÐÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4438 ../calendar/libedata-cal/e-data-cal.c:419
+#: ../calendar/libecal/e-cal.c:4415
+#: ../calendar/libecal/e-cal-client.c:131
+#: ../calendar/libedata-cal/e-data-cal.c:420
 msgid "Invalid object"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÐÑÐÐÑ"
 
-#: ../calendar/libecal/e-cal.c:4440
+#: ../calendar/libecal/e-cal.c:4417
 msgid "URI not loaded"
 msgstr "URI ÐÐ ÐÐÐÑÑÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4442
+#: ../calendar/libecal/e-cal.c:4419
 msgid "URI already loaded"
 msgstr "URI ÑÐÐ ÐÐÐÑÑÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4446
+#: ../calendar/libecal/e-cal.c:4423
 msgid "Unknown User"
 msgstr "ÐÐÐÐÐÐÑÑÐÑÐ ÐÐÐÑÐÐÐÐÑÐÐÑ"
 
-#: ../calendar/libecal/e-cal.c:4448 ../calendar/libedata-cal/e-data-cal.c:420
+#: ../calendar/libecal/e-cal.c:4425
+#: ../calendar/libecal/e-cal-client.c:135
+#: ../calendar/libedata-cal/e-data-cal.c:421
 msgid "Object ID already exists"
 msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÐÑÐÐÑÐ ÑÐÐ ÑÑÑÐÑÑÐÑÐÑ"
 
-#: ../calendar/libecal/e-cal.c:4450
+#: ../calendar/libecal/e-cal.c:4427
 msgid "Protocol not supported"
 msgstr "ÐÑÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ"
 
-#: ../calendar/libecal/e-cal.c:4452
+#: ../calendar/libecal/e-cal.c:4429
 msgid "Operation has been canceled"
 msgstr "ÐÐÐÑÐÑÐÑ ÐÑÐÐÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4454
+#: ../calendar/libecal/e-cal.c:4431
 msgid "Could not cancel operation"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÐÐÐÑÑ ÐÐÐÑÐÑÐÑ"
 
-#: ../calendar/libecal/e-cal.c:4456
+#: ../calendar/libecal/e-cal.c:4433
+#: ../libedataserver/e-client.c:117
 msgid "Authentication failed"
 msgstr "ÐÐÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÐÐÑÑÐ"
 
-#: ../calendar/libecal/e-cal.c:4458
-#: ../camel/providers/smtp/camel-smtp-transport.c:864
+#: ../calendar/libecal/e-cal.c:4435
+#: ../camel/providers/smtp/camel-smtp-transport.c:756
+#: ../libedataserver/e-client.c:119
 msgid "Authentication required"
 msgstr "ÐÑÐÐÑÐÑÑÑ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑ"
 
-#: ../calendar/libecal/e-cal.c:4460
+#: ../calendar/libecal/e-cal.c:4437
 msgid "A D-Bus exception has occurred"
 msgstr "ÐÑÐÐÐÐÑÐÐ ÐÑÐÐÑÑÐÐÐÐ D-Bus"
 
-#: ../calendar/libecal/e-cal.c:4464
+#: ../calendar/libecal/e-cal.c:4441
 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"
+#: ../calendar/libedata-cal/e-data-cal.c:429
 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"
+#: ../calendar/libedata-cal/e-data-cal.c:418
 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
+#: ../calendar/libecal/e-cal-client.c:555
 msgid "Failed to run calendar factory"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÑÐÑÑ ÑÐÐÑÐÐÑ ÐÐÐÐÐÐÐÑÐÐ"
 
-#: ../calendar/libecal/e-cal-client.c:695
+#: ../calendar/libecal/e-cal-client.c:717
 msgid "Failed to find system calendar"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÐ ÑÐÑÑÐÐÐÑÐ ÐÐÐÐÐÐÐÑÑ"
 
-#: ../calendar/libecal/e-cal-client.c:733
-#: ../calendar/libedata-cal/e-data-cal.c:427
+#: ../calendar/libecal/e-cal-client.c:755
+#: ../calendar/libedata-cal/e-data-cal.c:428
 msgid "Calendar does not exist"
 msgstr "ÐÐÐÐÐÐÐÑÑ ÐÐ ÑÑÑÐÑÑÐÑÐÑ"
 
-#: ../calendar/libecal/e-cal-client.c:843
+#: ../calendar/libecal/e-cal-client.c:865
 msgid "Invalid source type"
 msgstr "ÐÐÐÐÑÐÑÐ ÑÐÐ ÐÑÑÐÑÐÐÐÐ"
 
@@ -1248,141 +1259,144 @@ msgstr "ÐÐÐÐÑÐÑÐ ÑÐÐ ÐÑÑÐÑÐÐÐÐ"
 msgid "Untitled appointment"
 msgstr "ÐÐÐÐÐÐÐÐÐÐÐÐÐÐÑ ÐÑÑÑÐÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3985
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "1st"
 msgstr "1-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3986
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "2nd"
 msgstr "2-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "3rd"
 msgstr "3-Ð"
 
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "4th"
 msgstr "4-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "5th"
 msgstr "5-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "6th"
 msgstr "6-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "7th"
 msgstr "7-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "8th"
 msgstr "8-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "9th"
 msgstr "9-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "10th"
 msgstr "10-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "11th"
 msgstr "11-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "12th"
 msgstr "12-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "13th"
 msgstr "13-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "14th"
 msgstr "14-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "15th"
 msgstr "15-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "16th"
 msgstr "16-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "17th"
 msgstr "17-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "18th"
 msgstr "18-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "19th"
 msgstr "19-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "20th"
 msgstr "20-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "21st"
 msgstr "21-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "22nd"
 msgstr "22-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "23rd"
 msgstr "23-Ð"
 
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "24th"
 msgstr "24-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "25th"
 msgstr "25-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4010
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "26th"
 msgstr "26-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4011
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "27th"
 msgstr "27-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4012
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "28th"
 msgstr "28-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4013
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "29th"
 msgstr "29-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4014
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "30th"
 msgstr "30-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4015
+#: ../calendar/libecal/e-cal-recur.c:4017
 msgid "31st"
 msgstr "31-ÐÐ"
 
-#: ../calendar/libecal/e-cal-util.c:677 ../calendar/libecal/e-cal-util.c:704
+#: ../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:679 ../calendar/libecal/e-cal-util.c:706
+#: ../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:681 ../calendar/libecal/e-cal-util.c:708
+#: ../calendar/libecal/e-cal-util.c:681
+#: ../calendar/libecal/e-cal-util.c:708
 msgctxt "Priority"
 msgid "Low"
 msgstr "ÐÐÐÐÐÐ"
@@ -1397,12 +1411,12 @@ msgstr "ÐÐÐÐÑÐÐÐÐÑÐÐÑÐ"
 msgid "Cannot process, calendar backend is opening"
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÑÐÐÐÑÐÑÑ, ÐÑÐÑÑÑ ÐÑÐÐÐÐÑ ÐÐÐÐÐÐÐÑÑ"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:206
+#: ../calendar/libedata-cal/e-cal-backend.c:207
 #, c-format
 msgid "Unknown calendar property '%s'"
 msgstr "ÐÐÐÐÐÐÑÑÐÐÐ ÑÐÐÐÑÑÐÐ ÐÐÐÐÐÐÐÑÑ Â%sÂ"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:218
+#: ../calendar/libedata-cal/e-cal-backend.c:219
 #, c-format
 msgid "Cannot change value of calendar property '%s'"
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÑÑ ÐÐÐÑÐÐÐÐ ÑÐÐÐÑÑÐÐ ÐÐÐÐÐÐÐÑÑ Â%sÂ"
@@ -1438,9 +1452,7 @@ 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
@@ -1481,13 +1493,8 @@ msgstr "Â%s ÐÑÐÐÐÐÐÐÐÐÐÑ ÑÑÑÐÐÑ Ð ÐÐÑÐÑÑÐÐ ÐÑÐ
 
 #: ../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:923
 #, c-format
@@ -1496,126 +1503,115 @@ msgstr "Â%s ÐÑÐÐÐÐÐÐÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐ 1 ÐÑÐÑ
 
 #: ../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:417
-msgid "Invalid range"
-msgstr "ÐÐÐÐÐÑÑÑÐÐÑÐ ÐÐÐÐÐÐÐÐ"
-
-#: ../calendar/libedata-cal/e-data-cal.c:424
+#: ../calendar/libedata-cal/e-data-cal.c:425
 msgid "Unsupported method"
 msgstr "ÐÐÐÐÐÐÐÑÐÐÐÐÐÐÑÐ ÐÐÑÐÐ"
 
-#: ../calendar/libedata-cal/e-data-cal.c:428
-msgid "Unknown user"
-msgstr "ÐÐÐÐÐÐÑÑÐÑÐ ÐÐÐÑÐÐÐÐÑÐÐÑ"
-
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:907
+#: ../calendar/libedata-cal/e-data-cal.c:909
 msgid "Cannot open calendar: "
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÑÐÑÑÑÑ ÐÐÐÐÐÐÐÑÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:928
+#: ../calendar/libedata-cal/e-data-cal.c:930
 msgid "Cannot remove calendar: "
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÐÑÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:953
+#: ../calendar/libedata-cal/e-data-cal.c:955
 msgid "Cannot refresh calendar: "
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÑÑ ÐÐÐÐÐÐÐÑÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:977
+#: ../calendar/libedata-cal/e-data-cal.c:979
 msgid "Cannot retrieve backend property: "
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÑÑ ÑÐÐÐÑÑÐÐ ÐÑÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1023
+#: ../calendar/libedata-cal/e-data-cal.c:1025
 msgid "Cannot retrieve calendar object path: "
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÑÑ ÐÑÑÑ ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1048
+#: ../calendar/libedata-cal/e-data-cal.c:1050
 msgid "Cannot retrieve calendar object list: "
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÑÑ ÑÐÐÑÐÐ ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1073
+#: ../calendar/libedata-cal/e-data-cal.c:1075
 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
+#: ../calendar/libedata-cal/e-data-cal.c:1101
 msgid "Cannot create calendar object: "
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÑ ÐÐÐÐÐÐÐÑÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1126
+#: ../calendar/libedata-cal/e-data-cal.c:1128
 msgid "Cannot modify calendar object: "
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÑÑ ÐÐÑÐÐÑ ÐÐÐÐÐÐÐÑÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1154
+#: ../calendar/libedata-cal/e-data-cal.c:1156
 msgid "Cannot remove calendar object: "
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÑ ÐÐÐÐÐÐÐÑÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1177
+#: ../calendar/libedata-cal/e-data-cal.c:1179
 msgid "Cannot receive calendar objects: "
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÑÑ ÐÐÑÐÐÑÑ ÐÐÐÐÐÐÐÑÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1202
+#: ../calendar/libedata-cal/e-data-cal.c:1204
 msgid "Cannot send calendar objects: "
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÑÐÑÐÐÐÑÑ ÐÐÑÐÐÑÑ ÐÐÐÐÐÐÐÑÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1229
+#: ../calendar/libedata-cal/e-data-cal.c:1231
 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 "ÐÐÐÐÐÐÐÐÐÐ ÑÐÑÑÑ ÑÐÐÐÐÐÐÐÐÐÐ: "
+#: ../calendar/libedata-cal/e-data-cal.c:1255
+#| msgid "Could not discard alarm: "
+msgid "Could not discard reminder: "
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÑÑÑ ÑÐÐÐÐÐÐÐÐÐÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1277
+#: ../calendar/libedata-cal/e-data-cal.c:1279
 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
+#: ../calendar/libedata-cal/e-data-cal.c:1304
 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
+#: ../calendar/libedata-cal/e-data-cal.c:1326
 msgid "Could not add calendar time zone: "
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÑÑ ÑÐÑÐÐÐÐ ÐÐÑÑ ÐÐÐÐÐÐÐÑÑ: "
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:379
+#: ../calendar/libedata-cal/e-data-cal-factory.c:383
 #, c-format
 msgid "Invalid call"
 msgstr "ÐÐÐÐÑÑÐÐÑÐÑÐ ÐÑÐÐÐ"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:420
+#: ../calendar/libedata-cal/e-data-cal-factory.c:424
 #, c-format
 msgid "Invalid URI"
 msgstr "ÐÐÐÐÑÐÑÐ URI"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:438
+#: ../calendar/libedata-cal/e-data-cal-factory.c:442
 #, c-format
 msgid "No backend factory for '%s' of '%s'"
 msgstr "ÐÐ ÑÐÐÐÐÐ ÐÑÐÐÐÐÑ ÑÐÐÑÐÐÐ ÐÐÑ Â%sÂ Ñ Â%sÂ"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:481
+#: ../calendar/libedata-cal/e-data-cal-factory.c:485
 #, c-format
 msgid "Could not instantiate backend"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÑÐÐÑ ÐÑÐÐÐÐÑÐ"
@@ -1699,35 +1695,37 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "ÐÐÐÑÑÐÐÐÐÐÑÐÑ Ñ ÑÐÑÐÐÑÐÐ"
 
-#: ../camel/camel-disco-folder.c:71 ../camel/camel-offline-folder.c:89
+#: ../camel/camel-disco-folder.c:72
+#: ../camel/camel-offline-folder.c:89
 msgid "Downloading new messages for offline mode"
 msgstr "ÐÐÐÑÐ ÑÐÐÐÑÐÐÐÑ ÐÐÐÑÑÐÐÑÑÑÑ ÐÐÑ ÐÐÑÐÐÐÐÐÐÐ ÑÐÐÐÑÑ"
 
-#: ../camel/camel-disco-folder.c:406
+#: ../camel/camel-disco-folder.c:410
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "ÐÐÐÐÐÑÐÐÐÐ ÐÐÐÐÐ Â%s ÐÐÑ ÐÐÑÐÐÐÐÐÐÐ ÑÐÐÐÑÑ"
 
-#: ../camel/camel-disco-folder.c:472 ../camel/camel-offline-folder.c:321
+#: ../camel/camel-disco-folder.c:476
+#: ../camel/camel-offline-folder.c:325
 msgid "Copy folder content locally for offline operation"
 msgstr "ÐÐÐÐÐÑÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐÐ ÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐÑÑ ÐÐÑÐÐÑ ÐÐÑ ÐÐÑÐÐÐÐÐÐÐ ÑÐÐÐÑÑ"
 
-#: ../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
-#: ../camel/providers/imapx/camel-imapx-folder.c:431
-#: ../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: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
+#: ../camel/camel-disco-store.c:456
+#: ../camel/providers/imap/camel-imap-store.c:1153
+#: ../camel/providers/imap/camel-imap-store.c:1925
+#: ../camel/providers/imap/camel-imap-store.c:2416
+#: ../camel/providers/imap/camel-imap-store.c:3171
+#: ../camel/providers/imapx/camel-imapx-folder.c:311
+#: ../camel/providers/imapx/camel-imapx-folder.c:344
+#: ../camel/providers/imapx/camel-imapx-folder.c:398
+#: ../camel/providers/imapx/camel-imapx-folder.c:444
+#: ../camel/providers/imapx/camel-imapx-folder.c:478
+#: ../camel/providers/imapx/camel-imapx-folder.c:518
+#: ../camel/providers/imapx/camel-imapx-folder.c:554
+#: ../camel/providers/imapx/camel-imapx-store.c:238
+#: ../camel/providers/imapx/camel-imapx-store.c:1278
+#: ../camel/providers/imapx/camel-imapx-store.c:1366
+#: ../camel/providers/imapx/camel-imapx-store.c:1412
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "ÐÐÑ ÐÐÐÐÑÑÐÐÐÑ ÐÐÐÐÐÐ ÐÐÐÑÐÑÐÐ ÐÐÐÐÑÐÐÐÐÐ ÐÐÐÐÐÑÑÐÐÐÐ Ð ÑÐÑÐ"
@@ -1737,7 +1735,8 @@ msgstr "ÐÐÑ ÐÐÐÐÑÑÐÐÐÑ ÐÐÐÐÐÐ ÐÐÐÑÐÑÐÐ ÐÐÐÐÑÐÐ
 msgid "Canceled"
 msgstr "ÐÑÐÐÐÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:818 ../camel/camel-filter-search.c:628
+#: ../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"
@@ -1747,16 +1746,19 @@ msgstr "ÐÐÐÐ ÐÑÐ ÑÐÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐÐ ÐÑÐÑÐÑÑÐ Â%
 msgid "Invalid message stream received from %s: %s"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÐÑÐÐ ÑÐÐÐÑÐÐÐÐ ÐÐÐÑÑÐÐ ÐÐ %s: %s"
 
-#: ../camel/camel-filter-driver.c:1053 ../camel/camel-filter-driver.c:1062
+#: ../camel/camel-filter-driver.c:1053
+#: ../camel/camel-filter-driver.c:1062
 msgid "Syncing folders"
 msgstr "ÐÐÐÑÑÐÐÐÐÐÑÐÑ ÐÐÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1150 ../camel/camel-filter-driver.c:1594
+#: ../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:1161 ../camel/camel-filter-driver.c:1605
+#: ../camel/camel-filter-driver.c:1161
+#: ../camel/camel-filter-driver.c:1605
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "ÐÑÐÐÐÐ ÐÑÐÐÐÐÐÐÐÑ ÑÐÐÑÑÑÐ: %s: %s"
@@ -1776,16 +1778,19 @@ msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÑÐÑÑ ÐÐÐÐÑ ÑÐÑÐÐ"
 msgid "Getting message %d (%d%%)"
 msgstr "ÐÐÐÑÑÐÐÐÐ ÑÐÐÐÑÐÐÐÑ %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1294 ../camel/camel-filter-driver.c:1316
+#: ../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:1331 ../camel/camel-filter-driver.c:1432
+#: ../camel/camel-filter-driver.c:1331
+#: ../camel/camel-filter-driver.c:1432
 msgid "Syncing folder"
 msgstr "ÐÐÐÑÑÐÐÐÐÐÑÐÑ ÐÐÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1336 ../camel/camel-filter-driver.c:1438
+#: ../camel/camel-filter-driver.c:1336
+#: ../camel/camel-filter-driver.c:1438
 msgid "Complete"
 msgstr "ÐÐÐÐÑÑÐÐÐ"
 
@@ -1811,7 +1816,8 @@ msgstr "ÐÐÐÐÐÑÑÑÐÐÑÐ ÐÑÐÑÐÐÐÑÑ ÐÐÑ system-flag"
 msgid "Invalid arguments to (user-tag)"
 msgstr "ÐÐÐÐÐÑÑÑÐÐÑÐ ÐÑÐÑÐÐÐÑÑ ÐÐÑ user-tag"
 
-#: ../camel/camel-filter-search.c:799 ../camel/camel-filter-search.c:808
+#: ../camel/camel-filter-search.c:799
+#: ../camel/camel-filter-search.c:808
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "ÐÑÐÐÐÐ ÐÑÐÐÐÐÐÐÐÑ ÐÐÐÑÐÐ ÑÐÐÑÑÑÐ: %s: %s"
@@ -1841,7 +1847,7 @@ msgstr[1] "ÐÐÐÑÑÑÐÑÐÑ ÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ Ð Â%sÂ"
 msgstr[2] "ÐÐÐÑÑÑÐÑÐÑ ÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ Ð Â%sÂ"
 
 #: ../camel/camel-folder.c:898
-#: ../camel/providers/local/camel-maildir-folder.c:318
+#: ../camel/providers/local/camel-maildir-folder.c:319
 msgid "Moving messages"
 msgstr "ÐÐÑÐÐÐÑÐÐÐÐ ÑÐÐÐÑÐÐÐÐ"
 
@@ -1859,12 +1865,13 @@ msgstr "ÐÐÑÐÑÐÐÑÐÑ Ð ÐÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ Ð
 msgid "Retrieving message '%s' in %s"
 msgstr "ÐÐÐÑÑÐÐÐÐ ÑÐÐÐÑÐÐÐÑ Â%s Р%s"
 
-#: ../camel/camel-folder.c:3389
+#: ../camel/camel-folder.c:3390
 #, 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:345
+#: ../camel/camel-folder-search.c:456
 #: ../camel/camel-folder-search.c:627
 #, c-format
 msgid ""
@@ -1874,7 +1881,8 @@ 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 ""
@@ -1885,7 +1893,8 @@ msgstr ""
 "%s"
 
 #. 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
+#: ../camel/camel-folder-search.c:844
+#: ../camel/camel-folder-search.c:887
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) ÑÑÐÐÑÐÑ ÐÐÐÐÑÑÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐÐÐÐ ÑÐÐÑÐÑÑÐÑÐ"
@@ -1897,7 +1906,8 @@ msgid "(%s) not allowed inside %s"
 msgstr "(%s) ÐÐÐÑÐÑÐÐÐ Ð %s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:948 ../camel/camel-folder-search.c:956
+#: ../camel/camel-folder-search.c:948
+#: ../camel/camel-folder-search.c:956
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) ÑÑÐÐÑÐÑ ÑÑÑÐÐÑ ÑÐÐÑÐÐÑÑÑÐÐÑ"
@@ -1914,14 +1924,15 @@ msgstr "(%s) ÐÐÐÐÐÐÑ ÑÐÐÑÐÑÑÐÑ Ð ÐÐÐÐ ÐÐÑÑÐÐÐ"
 msgid "(%s) requires the folder set"
 msgstr "(%s) ÑÑÐÐÑÐÑ ÐÐÐÐÑ ÐÐÐÐÐ"
 
-#: ../camel/camel-gpg-context.c:642 ../camel/camel-gpg-context.c:647
+#: ../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:647
-#: ../camel/providers/smtp/camel-smtp-transport.c:867
+#: ../camel/providers/smtp/camel-smtp-transport.c:759
 msgid "Unknown"
 msgstr "ÐÐÐÐÐÐÑÑÐÐ"
 
@@ -1941,7 +1952,8 @@ msgstr ""
 msgid "Failed to parse gpg userid hint."
 msgstr "ÐÑÐÐÐÐ ÐÑÐ ÐÐÑÐÐÐÑÐÐ ÐÐÐÑÐÐÐÐÐ gpg userid."
 
-#: ../camel/camel-gpg-context.c:753 ../camel/camel-gpg-context.c:768
+#: ../camel/camel-gpg-context.c:753
+#: ../camel/camel-gpg-context.c:768
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "ÐÑÐÐÐÐ ÐÑÐ ÐÐÑÐÐÐÑÐÐ ÐÐÐÑÐÑÐ ÐÐÑÐÐÑÐÐÐ ÑÑÐÐÑ gpg."
@@ -1967,13 +1979,15 @@ msgstr ""
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "ÐÐÐÐÐÐÐÐÐÑÐ ÐÐÐÑÐÑ ÐÑ GnuPG ÐÐÑ Â%sÂ"
 
-#: ../camel/camel-gpg-context.c:828 ../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:4981
-#: ../camel/providers/imapx/camel-imapx-server.c:4998
-#: ../camel/providers/imapx/camel-imapx-store.c:269
+#: ../camel/providers/imapx/camel-imapx-server.c:4954
+#: ../camel/providers/imapx/camel-imapx-server.c:4971
+#: ../camel/providers/imapx/camel-imapx-store.c:159
 #: ../camel/providers/nntp/camel-nntp-summary.c:409
-#: ../libedataserverui/e-book-auth-util.c:227
+#: ../libedataserver/e-client.c:127
+#: ../libedataserverui/e-book-auth-util.c:221
 #, c-format
 msgid "Cancelled"
 msgstr "ÐÑÐÐÐÐÐÐ"
@@ -1981,9 +1995,7 @@ msgstr "ÐÑÐÐÐÐÐÐ"
 #: ../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:858
 #, c-format
@@ -1993,22 +2005,28 @@ msgstr "ÐÐÐÐÐÐÐÐÐÑÐ ÐÑÐÐÑ ÐÑ GnuPG: %s"
 #: ../camel/camel-gpg-context.c:989
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
-msgstr ""
-"ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÑÑÐÐÐÑÑ ÑÑÐ ÑÐÐÐÑÐÐÐÐ: ÐÐ ÐÐÑÐÐÐÐÐÐÑ ÐÐÑÑÐÐÑÐÑÐ ÐÐÐÑÑÐÑÐÐÐ"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÑÑÐÐÐÑÑ ÑÑÐ ÑÐÐÐÑÐÐÐÐ: ÐÐ ÐÐÑÐÐÐÐÐÐÑ ÐÐÑÑÐÐÑÐÑÐ ÐÐÐÑÑÐÑÐÐÐ"
 
-#: ../camel/camel-gpg-context.c:1535 ../camel/camel-smime-context.c:824
+#: ../camel/camel-gpg-context.c:1535
+#: ../camel/camel-smime-context.c:824
 msgid "Could not generate signing data: "
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÑÐ ÐÐÐÐÐÑÐ: "
 
-#: ../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
+#: ../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: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-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"
@@ -2026,7 +2044,8 @@ msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐÐÑ: "
 msgid "This is a digitally encrypted message part"
 msgstr "ÐÑÐ ÐÐÑÐÑÑÐÐÐÐÐÐÑ ÑÐÑÑÑ ÑÐÐÐÑÐÐÐÑ"
 
-#: ../camel/camel-gpg-context.c:1975 ../camel/camel-gpg-context.c:1984
+#: ../camel/camel-gpg-context.c:1975
+#: ../camel/camel-gpg-context.c:1984
 #: ../camel/camel-gpg-context.c:2007
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
@@ -2037,11 +2056,13 @@ msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ: ÐÐÐ
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "ÐÐÐÐ ÐÑÐ ÐÐÐÐÐÐÑÐÐÐÐÐÐ ÑÐÑÑÐ MIME: ÐÑÐÐÐÐ ÐÑÐÑÐÐÐÐÐ"
 
-#: ../camel/camel-gpg-context.c:2086 ../camel/camel-smime-context.c:1261
+#: ../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
+#: ../camel/camel-http-stream.c:546
+#: ../camel/camel-stream-null.c:78
 msgid "Only reset to beginning is supported with CamelHttpStream"
 msgstr "ÐÐÑ CamelHttpStream ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ ÑÐÐÑÐÐ ÐÐÑÐÑÐÐ Ð ÐÐÑÐÐÑ"
 
@@ -2075,7 +2096,8 @@ msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÐ Ð ÐÐÐÐÐÑÐÑÐÑÑ:
 msgid "Cannot fork locking helper: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÑÐÑÑ ÐÐÐÐÐÑÐÑÐÑ: %s"
 
-#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
+#: ../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Â: ÐÑÐÐÐÐ ÐÑÐÑÐÐÐÐÐ Ñ ÐÐÐÐÐÑÐÑÐÑÐÐ"
@@ -2134,36 +2156,37 @@ 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:296
+#: ../camel/camel-multipart-signed.c:297
 #, c-format
 msgid "No content available"
 msgstr "ÐÐÐÐÑÐÐÐÐÐ ÐÐÐÐÑÑÑÐÐÐ"
 
-#: ../camel/camel-multipart-signed.c:304
+#: ../camel/camel-multipart-signed.c:305
 #, c-format
 msgid "No signature available"
 msgstr "ÐÐÐÐÐÑÑ ÐÐÐÐÑÑÑÐÐÐ"
 
-#: ../camel/camel-multipart-signed.c:688
+#: ../camel/camel-multipart-signed.c:689
 #, c-format
 msgid "parse error"
 msgstr "ÐÑÐÐÐÐ ÐÐÑÐÐÐÑÐÐ"
 
-#: ../camel/camel-network-service.c:91
+#: ../camel/camel-network-service.c:99
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð %s: %s"
 
-#: ../camel/camel-network-service.c:92
+#: ../camel/camel-network-service.c:100
 msgid "SSL unavailable"
 msgstr "SSL ÐÐÐÐÑÑÑÐÐÐ"
 
-#: ../camel/camel-network-service.c:115
+#: ../camel/camel-network-service.c:123
 #, c-format
 msgid "Could not connect to %s: "
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð %s: "
@@ -2195,12 +2218,13 @@ msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÐÐÑÑ ÑÐÐÐ"
 msgid "Name lookup failed: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÐÐÑÑ ÑÐÐÐ: %s"
 
-#: ../camel/camel-offline-folder.c:198
+#: ../camel/camel-offline-folder.c:202
 #, 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"
@@ -2216,8 +2240,7 @@ msgstr "ÐÐÑ ÑÑÐÐÐÑ ÐÐÑÑÑ ÐÐ ÐÐÐÑÐÑÑ Ð ÐÑÑÐÐÐÑ Ð
 #: ../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:201
 #, c-format
@@ -2229,7 +2252,8 @@ msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÐÑÑ %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÐÑÑ %s: Ð ÐÐÐÑÐÐ ÐÐÑ ÐÐÐÑÐÐÐÐÐÐÑÑÑÑÐÐÐ ÐÐÐÐ."
 
-#: ../camel/camel-provider.c:391 ../camel/camel-session.c:351
+#: ../camel/camel-provider.c:391
+#: ../camel/camel-session.c:351
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "ÐÑÐÐÐÐÐÐÑ ÐÐÑ ÐÑÐÑÐÐÐÐÐ Â%s ÐÐ ÐÐÑÑÑÐÐÐ"
@@ -2279,24 +2303,16 @@ msgid "CRAM-MD5"
 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, ÐÑÐÐ ÑÐÑÐÐÑ ÐÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑ."
+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:54
 msgid "DIGEST-MD5"
 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, ÐÑÐÐ ÑÐÑÐÐÑ ÐÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑ."
+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:820
 #, c-format
@@ -2337,53 +2353,32 @@ msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "ÐÐÐÐÐÑÑÐÐÐÐ Ð ÑÐÑÐÐÑÑ ÐÑÐÐÑ ÐÑÐÐÐÐÐÐÐÑÑÑÑ Ñ ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ Kerberos 5."
 
 #: ../camel/camel-sasl-gssapi.c:129
-msgid ""
-"The specified mechanism is not supported by the provided credential, or is "
-"unrecognized by the implementation."
-msgstr ""
-"ÐÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ ÐÑÐÐÐÑÑÐÐÐÐÐÐÑÐÐ ÑÑÐÐÑÑÐÐÐÐ, ÐÐÐÐ ÐÐ "
-"ÑÐÑÐÐÐÐÐÐÑÑÑ Ð ÑÑÐÐ ÑÐÐÐÐÐÐÑÐÐ."
+msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation."
+msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ ÐÑÐÐÐÑÑÐÐÐÐÐÐÑÐÐ ÑÑÐÐÑÑÐÐÐÐ, ÐÐÐÐ ÐÐ ÑÐÑÐÐÐÐÐÐÑÑÑ Ð ÑÑÐÐ ÑÐÐÐÐÐÐÑÐÐ."
 
 #: ../camel/camel-sasl-gssapi.c:134
 msgid "The provided target_name parameter was ill-formed."
 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 ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÐÑÐ ÐÐÐ ÐÐÐÐÐÐÐÑÐÐÐÐÐÐÑÐ "
-"ÑÐÐ ÐÐÐÐÐ."
+msgid "The provided target_name parameter contained an invalid or unsupported type of name."
+msgstr "ÐÑÐÐÐÑÑÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÑ target_name ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÐÑÐ ÐÐÐ ÐÐÐÐÐÐÐÑÐÐÐÐÐÐÑÐ ÑÐÐ ÐÐÐÐÐ."
 
 #: ../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."
+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:146
-msgid ""
-"The input_token contains an invalid signature, or a signature that could not "
-"be verified."
-msgstr ""
-"input_token ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÐÑÑ ÐÐÐÐÐÑÑ, ÐÐÐ ÐÐÐÐÐÑÑ, ÐÐÑÐÑÐÑ ÐÐ ÐÐÐÐÑ ÐÑÑÑ "
-"ÐÑÐÐÐÑÐÐÐ."
+msgid "The input_token contains an invalid signature, or a signature that could not be verified."
+msgstr "input_token ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÐÑÑ ÐÐÐÐÐÑÑ, ÐÐÐ ÐÐÐÐÐÑÑ, ÐÐÑÐÑÐÑ ÐÐ ÐÐÐÐÑ ÐÑÑÑ ÐÑÐÐÐÑÐÐÐ."
 
 #: ../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 ""
-"ÐÑÐÐÐÑÑÐÐÐÐÐÐÑÐ ÑÐÐÑÑÐÐÐÑÐÐÐÑ ÐÑÐÐ ÐÐ ÐÐÐÑÑÐÐÑÐÐÑÐÑ ÐÐÑ ÐÐÐÑÐÐÐÐÐÐÑÐÐ "
-"ÐÐÐÑÐÐÑÑÐ, ÐÐÐÐ ÐÐÑÐÐÐÑÑÐÐ ÑÐÐÑÑÐÐÐÑÐÐÐÑ ÐÐ ÑÑÑÐÐÐÑÑÑ ÐÐ ÑÐÐÑÑÐÐÐÑÐÐÐÑ."
+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:155
 msgid "The supplied context handle did not refer to a valid context."
-msgstr ""
-"ÐÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÑÐÐ ÐÐÐÑÐÐÑÑÐ ÐÐ ÑÑÑÐÐÐÑÑÑ ÐÐ ÐÐÐÑÑÐÐÑÐÐÑÐÑÐ ÐÐÐÑÐÐÑÑ."
+msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÑÐÐ ÐÐÐÑÐÐÑÑÐ ÐÐ ÑÑÑÐÐÐÑÑÑ ÐÐ ÐÐÐÑÑÐÐÑÐÐÑÐÑÐ ÐÐÐÑÐÐÑÑ."
 
 #: ../camel/camel-sasl-gssapi.c:158
 msgid "The consistency checks performed on the input_token failed."
@@ -2397,9 +2392,11 @@ msgstr "ÐÐÐÐ ÐÑÐÐÐÑÐÐ ÑÐÐÐÑÑÐÐÑÑÐ ÑÐÐÑÑÐÐÐÑÐÐ
 msgid "The referenced credentials have expired."
 msgstr "ÐÑÐÐ ÐÐÐÑÑÐÐÑ ÑÐÐÐÑÐÑÑÑÑ ÑÐÐÑÑÐÐÐÑÐÐÐÐ ÐÑÑÑÐ."
 
-#: ../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
+#: ../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:1228
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐÑ ÐÑ ÑÐÑÐÐÑÐ ÐÑÐ ÐÐÐÐÑÐÑÐÐÐÑÐÐ."
@@ -2413,11 +2410,10 @@ msgstr "ÐÐÐÐÐÐÐÑÐÐÐÐÐÐÑÐ ÑÑÐÐÐÐÑ ÐÐÐÐÐÐÑÐÐÑÑÐ
 msgid "Login"
 msgstr "ÐÐÐÐÑÑÑÐÑÐÑ"
 
-#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
+#: ../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:92
 #, c-format
@@ -2429,12 +2425,8 @@ msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
 #: ../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."
+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:39
 msgid "PLAIN"
@@ -2457,7 +2449,8 @@ msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÑÑÐÑÐÐÐÐ POP"
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "ÐÑÑÐÐÑÐÑÐÐÐÑÐÑ POP ÐÐ SMTP, ÐÑÐÐÐÑÐÑÑ ÐÐÐÐÐÐÑÑÐÑÐ ÑÑÐÐÑÐÐÑÑ"
 
-#: ../camel/camel-sasl-popb4smtp.c:104 ../camel/camel-sasl-popb4smtp.c:114
+#: ../camel/camel-sasl-popb4smtp.c:104
+#: ../camel/camel-sasl-popb4smtp.c:114
 #, c-format
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "ÐÑÑÐÐÑÐÑÐÐÐÑÐÑ POP ÐÐ SMTP ÐÐÑÑÐÐÑÑÐÐÐ ÑÐÑÐÐÑ %s"
@@ -2467,17 +2460,17 @@ msgstr "ÐÑÑÐÐÑÐÑÐÐÐÑÐÑ POP ÐÐ SMTP ÐÐÑÑÐÐÑÑÐÐÐ ÑÐÑ
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑÑÐÐ ÑÐÐÑÐÑÑÐÐÐÐ ÐÑÑÐÐÐÐÐÑ: %s: %s"
 
-#: ../camel/camel-service.c:492
+#: ../camel/camel-service.c:526
 #, c-format
 msgid "URL '%s' needs a user component"
 msgstr "URL Â%s ÐÑÐÐÐÐÑÑÑ Ð ÐÐÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐÐÐÑÐÐÑ"
 
-#: ../camel/camel-service.c:503
+#: ../camel/camel-service.c:537
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL Â%s ÐÑÐÐÐÐÑÑÑ Ð ÐÐÐÐÐÐÐÐÑÐ ÑÐÐÐ"
 
-#: ../camel/camel-service.c:514
+#: ../camel/camel-service.c:548
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL Â%s ÐÑÐÐÐÐÑÑÑ Ð ÐÐÐÐÐÐÐÐÑÐ ÐÑÑÐ"
@@ -2487,12 +2480,13 @@ msgstr "URL Â%s ÐÑÐÐÐÐÑÑÑ Ð ÐÐÐÐÐÐÐÐÑÐ ÐÑÑÐ"
 msgid "Invalid GType registered for protocol '%s'"
 msgstr "ÐÐÐÐÑÑÐÐÑÐÑÐ ÐÐÑÐÐÐÑÑÑÐÑÐÐÐÐÐÑÐ GType ÐÐÑ ÐÑÐÑÐÐÐÐÐ Â%sÂ"
 
-#: ../camel/camel-session.c:907
+#: ../camel/camel-session.c:938
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÐÑ %s ÐÐÑ %s ÐÐ ÑÐÐÐ %s."
 
-#: ../camel/camel-smime-context.c:344 ../camel/camel-smime-context.c:1050
+#: ../camel/camel-smime-context.c:344
+#: ../camel/camel-smime-context.c:1050
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÐ ÑÐÑÑÐÑÐÐÐÑ ÐÐÑ Â%sÂ"
@@ -2525,7 +2519,8 @@ msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÐ ÑÐÐÐÑÐÑ ÑÐÑÑÐÑÐÐÐÑÐÐ"
 msgid "Cannot add CMS Signing time"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑ CMS SigningTime"
 
-#: ../camel/camel-smime-context.c:432 ../camel/camel-smime-context.c:447
+#: ../camel/camel-smime-context.c:432
+#: ../camel/camel-smime-context.c:447
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "ÐÐÑÑÐÑÐÐÐÑ ÑÐÑÑÐÐÐÐÐÑ ÐÐÑ Â%s ÐÐ ÑÑÑÐÑÑÐÑÐÑ"
@@ -2595,23 +2590,25 @@ msgstr "Ð ÐÐÐÐÐÑÐ ÐÑÑÑÑÑÑÐÑÑÑ ÐÐÐÐÑÐ ÐÐÐÐÐÑÐ"
 msgid "Digests missing from enveloped data"
 msgstr "Ð ÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐ ÐÑÑÑÑÑÑÐÑÐÑ ÑÐÐÐÐÐ"
 
-#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
+#: ../camel/camel-smime-context.c:584
+#: ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÑÐÑÐÐÑÑ ÐÐÐÐÐÐÑÑÑ"
 
-#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
+#: ../camel/camel-smime-context.c:602
+#: ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÑÑÐÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑÑ ÑÐÐÐÑÐÐÐÑ"
 
-#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
+#: ../camel/camel-smime-context.c:616
+#: ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
 msgstr "ÐÐÐÐ ÐÐÐÐÑÑÐ ÑÐÑÑÐÑÐÐÐÑÐ"
 
 #: ../camel/camel-smime-context.c:631
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
-msgstr ""
-"ÐÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÑ ÑÐÐÑÐÐ ÐÐ ÑÐÑÑÐÑÐÐÐÑÐÐ, ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÐÐÑÐÑÑ ÑÐÑÑÐÑÐÐÐÑÑ"
+msgstr "ÐÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÑ ÑÐÐÑÐÐ ÐÐ ÑÐÑÑÐÑÐÐÐÑÐÐ, ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÐÐÑÐÑÑ ÑÐÑÑÐÑÐÐÐÑÑ"
 
 #: ../camel/camel-smime-context.c:634
 #, c-format
@@ -2627,7 +2624,8 @@ msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÐ ÐÐÐÐÐÐÑÑÑ ÐÐÐÐÐÑÐ"
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ÐÐÐÐÐÑÐÐÐ: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1123
+#: ../camel/camel-smime-context.c:835
+#: ../camel/camel-smime-context.c:1123
 msgid "Cannot create encoder context"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÑÐÐÑÑ ÐÐÐÐÑÐÐÑÐÐÐ"
 
@@ -2635,11 +2633,13 @@ msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÑÐÐÑÑ ÐÐÐÐÑÐÐÑÐÐ
 msgid "Failed to add data to CMS encoder"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑ ÐÐÐÐÑÐ Ð ÐÐÐÐÑÐÐÑÐÐÑ CMS"
 
-#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1140
+#: ../camel/camel-smime-context.c:846
+#: ../camel/camel-smime-context.c:1140
 msgid "Failed to encode data"
 msgstr "ÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐÐÐÑ ÐÐÐÐÑÑ"
 
-#: ../camel/camel-smime-context.c:989 ../camel/camel-smime-context.c:1236
+#: ../camel/camel-smime-context.c:989
+#: ../camel/camel-smime-context.c:1236
 msgid "Decoder failed"
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑÐ"
 
@@ -2683,50 +2683,54 @@ msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑ ÐÐÐÐÑÐ Ð ÐÐÐÐÑÐÐÑÐ
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME Decrypt: ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÐÑÑÐÐÐÐÐÐÐÐ ÑÐÐÐÑÐÐÐÐÐÐ"
 
-#: ../camel/camel-store.c:2084
+#: ../camel/camel-store.c:1814
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÑ Â%sÂ: ÐÐÐÐÐ ÑÐÐ ÑÑÑÐÑÑÐÑÐÑ"
 
-#: ../camel/camel-store.c:2127
+#: ../camel/camel-store.c:1857
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "ÐÑÐÑÑÑÐÐ ÐÐÐÐÐ Â%sÂ"
 
-#: ../camel/camel-store.c:2314
+#: ../camel/camel-store.c:2044
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "ÐÐÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐ ÐÐ Â%sÂ"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2326 ../camel/camel-store.c:2336
+#: ../camel/camel-store.c:2056
+#: ../camel/camel-store.c:2066
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "ÐÐÑÐÐÐÐ"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2329 ../camel/camel-store.c:2340
+#: ../camel/camel-store.c:2059
+#: ../camel/camel-store.c:2070
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "ÐÐÐÐ"
 
-#: ../camel/camel-store.c:2791
+#: ../camel/camel-store.c:2521
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÑ: %s: ÐÐÐÐÐ ÑÑÑÐÑÑÐÑÐÑ"
 
-#: ../camel/camel-store.c:2805
+#: ../camel/camel-store.c:2535
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÐÐ Â%sÂ"
 
-#: ../camel/camel-store.c:2923 ../camel/camel-vee-store.c:350
+#: ../camel/camel-store.c:2653
+#: ../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:3066 ../camel/camel-vee-store.c:400
+#: ../camel/camel-store.c:2796
+#: ../camel/camel-vee-store.c:400
 #: ../camel/providers/local/camel-maildir-store.c:704
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
@@ -2746,7 +2750,8 @@ msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐ"
 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
+#: ../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"
@@ -2756,7 +2761,8 @@ 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"
@@ -2819,7 +2825,8 @@ 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 reply from proxy server"
 msgstr "ÐÐÐÐÐÑÑÑÐÐÑÐ ÐÑÐÐÑ ÐÑ ÐÑÐÐÑÐ-ÑÐÑÐÐÑÐ"
@@ -2902,17 +2909,18 @@ msgstr ""
 msgid "Could not parse URL '%s'"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÐÑÑ URL Â%sÂ"
 
-#: ../camel/camel-vee-folder.c:1279 ../camel/camel-vee-folder.c:1442
+#: ../camel/camel-vee-folder.c:1297
+#: ../camel/camel-vee-folder.c:1457
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÐÐÐÑÑ ÐÐÐ ÐÐÑÐÐÐÑÑÐÑÑ ÑÐÐÐÑÐÐÐÑ Ð ÐÐÑÑÑÐÐÑÐÑÑ ÐÐÐÐÑ"
 
-#: ../camel/camel-vee-folder.c:1315
+#: ../camel/camel-vee-folder.c:1330
 #, c-format
 msgid "No such message %s in %s"
 msgstr "ÐÐÑ ÑÐÐÐÑÐÐÐÑ %s Ð %s"
 
-#: ../camel/camel-vee-folder.c:1383
+#: ../camel/camel-vee-folder.c:1398
 #, c-format
 msgid "Error storing '%s': "
 msgstr "ÐÑÐÐÐÐ ÐÑÐ ÑÑÐÐÐÐÐÐ Â%sÂ: "
@@ -2992,67 +3000,67 @@ msgstr "ÐÑÐÐÑ ÑÐÑÐÐÑÐ IMAP ÐÐ ÑÐÐÐÑÐÐÑ ÐÐÑÐÑÐÐÑÐ
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "ÐÐÐÐÐÐÐÐÐÑÐ ÐÑÐÐÑ ÂOKÂ ÐÑ ÑÐÑÐÐÑÐ IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:293
+#: ../camel/providers/imap/camel-imap-folder.c:296
 msgid "Always check for new mail in this folder"
 msgstr "ÐÑÐÐÐÐ ÐÑÐÐÐÑÑÑÑ ÐÐÐÐÑÐÐ ÐÐÐÐÐ ÐÐÑÑÑ Ð ÑÑÐÐ ÐÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:368
+#: ../camel/providers/imap/camel-imap-folder.c:370
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÐ %s: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:391
+#: ../camel/providers/imap/camel-imap-folder.c:393
 #, 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:3984
+#: ../camel/providers/imap/camel-imap-folder.c:1049
+#: ../camel/providers/imapx/camel-imapx-server.c:4010
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "ÐÐÐÑÐ ÐÐÐÐÐÑÐÐÑÑ ÑÐÐÐÑÐÐÐÐ Ð %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3380
+#: ../camel/providers/imap/camel-imap-folder.c:3462
 msgid "Unable to retrieve message: "
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÑÐÐÐÑÐÐÐÐ: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:3415
-#: ../camel/providers/imapx/camel-imapx-server.c:5319
+#: ../camel/providers/imap/camel-imap-folder.c:3497
+#: ../camel/providers/imapx/camel-imapx-server.c:5283
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÑÐÐÐÑÐÐÐÐ Ñ ÐÐÐÐÑÐÑÐÐÐÑÐÑÐÐ %s: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3416
-#: ../camel/providers/imapx/camel-imapx-server.c:5320
+#: ../camel/providers/imap/camel-imap-folder.c:3498
+#: ../camel/providers/imapx/camel-imapx-server.c:5284
 msgid "No such message available."
 msgstr "ÐÐÑ ÑÐÐÐÐÐ ÑÐÐÐÑÐÐÐÑ."
 
-#: ../camel/providers/imap/camel-imap-folder.c:3491
-#: ../camel/providers/imap/camel-imap-folder.c:4391
-#: ../camel/providers/nntp/camel-nntp-folder.c:407
+#: ../camel/providers/imap/camel-imap-folder.c:3573
+#: ../camel/providers/imap/camel-imap-folder.c:4491
+#: ../camel/providers/nntp/camel-nntp-folder.c:424
 #, c-format
 msgid "This message is not currently available"
 msgstr "ÐÑÐ ÑÐÐÐÑÐÐÐÐ Ð ÐÐÑÑÐÑÑÐÐ ÐÐÐÐÐÑ ÐÐÐÐÑÑÑÐÐÐ"
 
-#: ../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
+#: ../camel/providers/imap/camel-imap-folder.c:4075
+#: ../camel/providers/imap/camel-imap-folder.c:4158
+#: ../camel/providers/imapx/camel-imapx-server.c:3968
+#: ../camel/providers/imapx/camel-imapx-server.c:4118
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "ÐÐÐÑÑÐÐÐÐ ÐÑÐÑÐÐÐ ÐÐÑÐÑÐÐÑÐÐ ÐÐ ÐÐÐÑÐ ÑÐÐÐÑÐÐÐÑÐ ÐÐ %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4192
+#: ../camel/providers/imap/camel-imap-folder.c:4292
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÑÐÐÑ ÑÐÑÐÐÑÐ: ÐÐ ÐÑÐÐÐÑÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÑÐÑ Ð ÑÐÐÐÑÐÐÐÐ %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4202
+#: ../camel/providers/imap/camel-imap-folder.c:4302
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÑÐÐÑ ÑÐÑÐÐÑÐ: ÐÑÑÑÑÑÑÐÑÐÑ UID ÐÐÑ ÑÐÐÐÑÐÐÐÑ %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4431
+#: ../camel/providers/imap/camel-imap-folder.c:4531
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÐ ÑÐÐÐ ÑÐÐÐÑÐÐÐÑ Ð ÐÑÐÐÑÐ ÐÐ ÐÐÐÐÐÐÑ FETCH."
@@ -3137,8 +3145,7 @@ 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 ""
-"_ÐÑÐÐÐÐÐÑÑ ÑÐÐÑÑÑÑ Ð ÐÐÐÑÐ ÑÐÐÐÑÐÐÐÑÐ Ð ÐÐÐÐÐ ÂÐÑÐÐÑÑÐÐÂ ÐÐ ÑÑÐÐ ÑÐÑÐÐÑÐ"
+msgstr "_ÐÑÐÐÐÐÐÑÑ ÑÐÐÑÑÑÑ Ð ÐÐÐÑÐ ÑÐÐÐÑÐÐÐÑÐ Ð ÐÐÐÐÐ ÂÐÑÐÐÑÑÐÐÂ ÐÐ ÑÑÐÐ ÑÐÑÐÐÑÐ"
 
 #: ../camel/providers/imap/camel-imap-provider.c:68
 #: ../camel/providers/imapx/camel-imapx-provider.c:76
@@ -3148,8 +3155,7 @@ 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 ""
-"ÐÑÐÐÐÑÑÑÑ, ÑÐÐÑÑÑÑÑ ÐÐ ÐÐÐÑÐ ÑÐÐÐÑÐÐÐÑ _ÑÐÐÐÐÐ, ÑÐÐÑÐÐ Ð ÐÐÐÐÐ ÂÐÑÐÐÑÑÐÐÂ"
+msgstr "ÐÑÐÐÐÑÑÑÑ, ÑÐÐÑÑÑÑÑ ÐÐ ÐÐÐÑÐ ÑÐÐÐÑÐÐÐÑ _ÑÐÐÐÐÐ, ÑÐÐÑÐÐ Ð ÐÐÐÐÐ ÂÐÑÐÐÑÑÐÐÂ"
 
 #: ../camel/providers/imap/camel-imap-provider.c:72
 #: ../camel/providers/imapx/camel-imapx-provider.c:80
@@ -3184,62 +3190,74 @@ msgstr "ÐÐÑÐÐÑ"
 #: ../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 ÐÑÐÐÑ ÐÑÐÐÐÐÐÐÐÑÑÑÑ Ñ ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ "
-"ÐÐÐÐÑÐÑÑÐÐÐÐÐÐÐÐ ÐÐÑÐÐÑ."
+msgstr "ÐÐÐÐÐÑÑÐÐÐÐ Ð ÑÐÑÐÐÑÑ IMAP ÐÑÐÐÑ ÐÑÐÐÐÐÐÐÐÑÑÑÑ Ñ ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÑÐÐÐÐÐÐÐÐ ÐÐÑÐÐÑ."
 
-#: ../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
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/providers/imap/camel-imap-store.c:222
+#: ../camel/providers/imap/camel-imap-store.c:2587
+#: ../camel/providers/imapx/camel-imapx-store.c:333
+#: ../camel/providers/imapx/camel-imapx-store.c:771
+#: ../camel/providers/local/camel-maildir-folder.c:458
+#: ../camel/providers/local/camel-maildir-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:619
+#: ../camel/providers/local/camel-maildir-store.c:625
+#: ../camel/providers/local/camel-maildir-store.c:705
+#: ../camel/providers/local/camel-spool-store.c:325
+msgid "Inbox"
+msgstr "ÐÑÐÐÑÑÐÐ"
+
+#: ../camel/providers/imap/camel-imap-store.c:354
+#: ../camel/providers/imap/camel-imap-store.c:381
+#: ../camel/providers/imap/camel-imap-store.c:408
+#: ../camel/providers/imapx/camel-imapx-server.c:2999
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð IMAP-ÑÐÑÐÐÑÑ %s Ð ÐÐÑÐÑÐÐÐÐÐ ÑÐÐÐÐÐ:%s"
 
-#: ../camel/providers/imap/camel-imap-store.c:331
-#: ../camel/providers/imapx/camel-imapx-server.c:2965
-#: ../camel/providers/smtp/camel-smtp-transport.c:198
+#: ../camel/providers/imap/camel-imap-store.c:355
+#: ../camel/providers/imapx/camel-imapx-server.c:3000
+#: ../camel/providers/smtp/camel-smtp-transport.c:192
 msgid "STARTTLS not supported"
 msgstr "STARTTLS ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ"
 
-#: ../camel/providers/imap/camel-imap-store.c:350
-#: ../camel/providers/imapx/camel-imapx-server.c:3003
+#: ../camel/providers/imap/camel-imap-store.c:374
+#: ../camel/providers/imapx/camel-imapx-server.c:3038
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: "
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð IMAP-ÑÐÑÐÐÑÑ %s Ð ÐÐÑÐÑÑÐÐÐÐ ÑÐÐÐÐÐ: "
 
-#: ../camel/providers/imap/camel-imap-store.c:358
-#: ../camel/providers/smtp/camel-smtp-transport.c:244
+#: ../camel/providers/imap/camel-imap-store.c:382
+#: ../camel/providers/smtp/camel-smtp-transport.c:238
 msgid "SSL is not available in this build"
 msgstr "SSL ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ Ð ÑÑÐÐ ÑÐÐÑÐÐ"
 
-#: ../camel/providers/imap/camel-imap-store.c:681
-#: ../camel/providers/imapx/camel-imapx-server.c:3087
+#: ../camel/providers/imap/camel-imap-store.c:707
+#: ../camel/providers/imapx/camel-imapx-server.c:3133
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "ÐÐÑÐÐÑ IMAP %s ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑ ÐÐÑÑÐÐÐÐÐÐÐÑÐ ÑÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÐ %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:692
-#: ../camel/providers/imapx/camel-imapx-server.c:3099
-#: ../camel/providers/smtp/camel-smtp-transport.c:428
+#: ../camel/providers/imap/camel-imap-store.c:718
+#: ../camel/providers/imapx/camel-imapx-server.c:3146
+#: ../camel/providers/smtp/camel-smtp-transport.c:347
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "ÐÑÑÐÐÑÐÑÐÐÐÑÐÑ %s ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ"
 
-#: ../camel/providers/imap/camel-imap-store.c:703
-#: ../camel/providers/smtp/camel-smtp-transport.c:441
+#: ../camel/providers/imap/camel-imap-store.c:729
+#: ../camel/providers/smtp/camel-smtp-transport.c:360
 #, 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
+#: ../camel/providers/imap/camel-imap-store.c:777
+#: ../camel/providers/imapx/camel-imapx-server.c:3191
 #, 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
+#: ../camel/providers/imap/camel-imap-store.c:818
+#: ../camel/providers/imapx/camel-imapx-server.c:3236
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3250,92 +3268,75 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:927
-#: ../camel/providers/imapx/camel-imapx-store.c:252
+#: ../camel/providers/imap/camel-imap-store.c:874
+#: ../camel/providers/imapx/camel-imapx-store.c:142
 #, c-format
 msgid "IMAP server %s"
 msgstr "ÐÐÑÐÐÑ IMAP %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:930
-#: ../camel/providers/imapx/camel-imapx-store.c:255
+#: ../camel/providers/imap/camel-imap-store.c:877
+#: ../camel/providers/imapx/camel-imapx-store.c:145
 #, 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: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: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:1938
-#: ../camel/providers/imap/camel-imap-store.c:2140
-#: ../camel/providers/imapx/camel-imapx-store.c:419
+#: ../camel/providers/imap/camel-imap-store.c:1962
+#: ../camel/providers/imap/camel-imap-store.c:2164
+#: ../camel/providers/imapx/camel-imapx-store.c:309
 #, 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
+#: ../camel/providers/imap/camel-imap-store.c:1976
+#: ../camel/providers/imap/camel-imap-store.c:2431
+#: ../camel/providers/imapx/camel-imapx-store.c:1299
 #, 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:2016
-#: ../camel/providers/imap/camel-imap-store.c:2463
-#: ../camel/providers/imapx/camel-imapx-store.c:1406
+#: ../camel/providers/imap/camel-imap-store.c:2040
+#: ../camel/providers/imap/camel-imap-store.c:2495
+#: ../camel/providers/imapx/camel-imapx-store.c:1320
 #, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "ÐÑÐ ÐÐÐÐÐ ÐÐ ÐÐÐÐÑ ÑÐÐÐÑÐÐÑÑ ÐÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-store.c:2069
+#: ../camel/providers/imap/camel-imap-store.c:2093
 #: ../camel/providers/local/camel-maildir-store.c:244
 #: ../camel/providers/local/camel-mbox-store.c:416
-#: ../camel/providers/local/camel-mh-store.c:566
+#: ../camel/providers/local/camel-mh-store.c:547
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÑ Â%sÂ: ÐÐÐÐÐ ÑÑÑÐÑÑÐÑÐÑ."
 
-#: ../camel/providers/imap/camel-imap-store.c:2412
-#: ../camel/providers/imapx/camel-imapx-store.c:1396
+#: ../camel/providers/imap/camel-imap-store.c:2444
+#: ../camel/providers/imapx/camel-imapx-store.c:1310
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "ÐÐÐÐÐÐÑÑÐÐÑ ÑÐÐÐÑÐÐÑÑÐÐÑ ÐÐÐÐÐ: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3248
+#: ../camel/providers/imap/camel-imap-store.c:3214
 #, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "ÐÐÑÐÐÑ ÐÐÐÐÐÐÐÐÐÐ ÐÑÐÐÑÑÐÐÑÑ"
 
-#: ../camel/providers/imap/camel-imap-store.c:3251
+#: ../camel/providers/imap/camel-imap-store.c:3217
 msgid "Server unexpectedly disconnected: "
 msgstr "ÐÐÑÐÐÑ ÐÐÐÐÐÐÐÐÐÐ ÐÑÐÐÑÑÐÐÑÑ: "
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:74
+#: ../camel/providers/imapx/camel-imapx-folder.c:88
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÑÐÑÐÑÑ ÐÐÑÐÑÐÐÑÐÑ ÐÐ ÐÐÐÐÐ %s"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:82
+#: ../camel/providers/imapx/camel-imapx-folder.c:96
 #, c-format
 msgid "Could not create cache for %s: "
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÑÑ ÐÐÑ %s:"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:42
 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"
@@ -3361,26 +3362,26 @@ msgstr "ÐÐÑÑ ÐÐ ÑÐÐÐÑÐÐÐÑ ÐÐÑ IMAP"
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1488
+#: ../camel/providers/imapx/camel-imapx-server.c:1476
 msgid "Error writing to cache stream: "
 msgstr "ÐÑÐÐÐÐ ÐÐÐÐÑÐ Ð ÐÐÑÐÐ ÐÑÑÐ: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2172
+#: ../camel/providers/imapx/camel-imapx-server.c:2182
 #, c-format
 msgid "Not authenticated"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÐÐÐÐÑÑ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑ"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3370
+#: ../camel/providers/imapx/camel-imapx-server.c:3408
 msgid "Closing tmp stream failed: "
 msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐÐÐ ÐÑÐ ÐÐÐÑÑÐÐ ÐÐÐÑÑÑÑ ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÐ: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5465
-#: ../camel/providers/imapx/camel-imapx-server.c:5480
+#: ../camel/providers/imapx/camel-imapx-server.c:5429
+#: ../camel/providers/imapx/camel-imapx-server.c:5444
 msgid "Cannot create spool file: "
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÑÐÐÐ ÑÐÑÐÐ: "
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1181
-#: ../camel/providers/nntp/camel-nntp-store.c:1778
+#: ../camel/providers/imapx/camel-imapx-store.c:1087
+#: ../camel/providers/nntp/camel-nntp-store.c:1704
 #, c-format
 msgid "No such folder: %s"
 msgstr "ÐÐÑ ÑÐÐÐÐ ÐÐÐÐÐ: %s"
@@ -3411,7 +3412,7 @@ msgstr "ÐÐÑÑÐÐÑÐ ÑÑÐÐ: %s: (%s)"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:466
+#: ../camel/providers/local/camel-local-folder.c:473
 msgid "Index message body data"
 msgstr "ÐÐÐÐÐÑÐÑÐÐÐÑÑ ÐÐÐÐÑÐ ÑÐÐÐ ÑÐÐÐÑÐÐÐÑ"
 
@@ -3441,15 +3442,11 @@ msgid "Local delivery"
 msgstr "ÐÐÐÐÐÑÐÐÑ ÐÐÑÑÐÐÐÐ"
 
 #: ../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."
+msgid "For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by Evolution."
+msgstr "ÐÐÑ ÐÐÐÑÑÐÐÐÑ (ÐÐÑÐÐÐÑÐÐÐÑ) ÐÐÐÐÐÑÐÐÐ ÐÐÑÑÑ ÐÐ ÐÑÐÑÐÐÐÐ Ð ÑÑÐÐÐÐÑÑÐÐÐ ÑÐÑÐÐÑÐ mbox Ð ÐÐÐÐÐ, ÑÐÑÐÐÐÑÐÐÑÐ Evolution."
 
 #: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:106
+#: ../camel/providers/local/camel-local-provider.c:107
 msgid "_Apply filters to new messages in INBOX"
 msgstr "_ÐÑÐÐÐÐÐÑÑ ÑÐÐÑÑÑÑ Ð ÐÐÐÑÐ ÑÐÐÐÑÐÐÐÑÐ Ð ÐÐÐÐÐ ÂÐÑÐÐÑÑÐÐÂ"
 
@@ -3461,16 +3458,16 @@ msgstr "ÐÐÑÑÐÐÑÐ ÐÐÑÐÐÐÐÐ Ð ÑÐÑÐÐÑÐ Maildir"
 msgid "For storing local mail in maildir directories."
 msgstr "ÐÐÑ ÑÑÐÐÐÐÐÑ ÐÐÐÐÐÑÐÐÐ ÐÐÑÑÑ Ð ÐÐÑÑÐÐÑÑ ÐÐÑÐÐÐÐÐÑ maildir."
 
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:108
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "_ÐÐÑÑÐÐÑÑÑ ÐÐÐÐÐÐÐÐÐ ÑÑÐÑÑÑÐ Ð ÑÐÑÐÐÑÐ Elm/Pine/Mutt"
 
-#: ../camel/providers/local/camel-local-provider.c:114
+#: ../camel/providers/local/camel-local-provider.c:115
 msgid "Standard Unix mbox spool file"
 msgstr "ÐÑÐÐÐÐÑÑÐÐÑ ÐÐÑ Unix ÐÑÐÑÐÐÑ ÑÐÐÐ mbox"
 
-#: ../camel/providers/local/camel-local-provider.c:115
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:116
+#: ../camel/providers/local/camel-local-provider.c:128
 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."
@@ -3479,60 +3476,60 @@ msgstr ""
 "ÑÐÑÐÐ Ð ÑÐÑÐÐÑÐ mbox. ÐÐÐÐÐ ÐÐÐÐÑ ÐÑÐÐÐÑÐÐÐÐÑÑÑÑ ÐÐÑ ÑÑÐÐÐÑ ÐÐÑÐÐÐ\n"
 "ÐÐÐÐÐ Ð ÑÑÐÐÐ Elm, Pine ÐÐÐ Mutt."
 
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:127
 msgid "Standard Unix mbox spool directory"
 msgstr "ÐÑÐÐÐÐÑÑÐÑÐ ÐÐÑ Unix ÐÐÑÐÐÐÐ ÐÑÐÑÐÐÐÐ ÑÐÐÐ mbox"
 
-#: ../camel/providers/local/camel-local-store.c:79
+#: ../camel/providers/local/camel-local-store.c:92
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÐÐÐÐÐÑÑ ÐÐÐÐÑ %s Ð %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:156
+#: ../camel/providers/local/camel-local-store.c:204
 #, 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-local-store.c:235
+#: ../camel/providers/local/camel-local-store.c:377
 #: ../camel/providers/local/camel-maildir-store.c:92
 #: ../camel/providers/local/camel-mbox-store.c:534
-#: ../camel/providers/local/camel-spool-store.c:570
+#: ../camel/providers/local/camel-spool-store.c:571
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "ÐÑÐÐÑÐÑÐÐÑÐÑÐ ÐÑÑÑ Ð ÑÑÐÐÐÐÐÑÑ %s"
 
-#: ../camel/providers/local/camel-local-store.c:196
+#: ../camel/providers/local/camel-local-store.c:244
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "ÐÑÐÐÐÐÐÑÐ %s ÐÐ ÑÐÐÑÐÑÑÑ ÐÐÑÐÐÐÐÐÐ"
 
-#: ../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-local-store.c:255
+#: ../camel/providers/local/camel-local-store.c:265
+#: ../camel/providers/local/camel-local-store.c:390
 #: ../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:249
+#: ../camel/providers/local/camel-local-store.c:297
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "ÐÐÐÐÐÑÐÐÐ ÑÑÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐÐÐÐ ÐÑÐÐÑÑÐÐ"
 
-#: ../camel/providers/local/camel-local-store.c:387
+#: ../camel/providers/local/camel-local-store.c:435
 #: ../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:415
+#: ../camel/providers/local/camel-local-store.c:463
 #: ../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
+#: ../camel/providers/local/camel-local-store.c:549
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÐÐÐÐÐÑÑ Â%sÂ: %s"
@@ -3543,7 +3540,7 @@ msgid "Unable to add message to summary: unknown reason"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ Ð ÐÑÐÑÐÐÐ ÐÐÑÐÑÐÐÑÐÐ: ÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑÑÐÐ"
 
 #: ../camel/providers/local/camel-maildir-folder.c:100
-#: ../camel/providers/local/camel-maildir-folder.c:332
+#: ../camel/providers/local/camel-maildir-folder.c:333
 #: ../camel/providers/local/camel-mbox-folder.c:117
 #: ../camel/providers/local/camel-mbox-folder.c:325
 #: ../camel/providers/local/camel-mh-folder.c:156
@@ -3590,14 +3587,14 @@ msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÑ: Â%sÂ: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:206
 #: ../camel/providers/local/camel-mbox-store.c:350
-#: ../camel/providers/local/camel-mh-store.c:521
+#: ../camel/providers/local/camel-mh-store.c:502
 #, 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:360
-#: ../camel/providers/local/camel-mh-store.c:530
+#: ../camel/providers/local/camel-mh-store.c:511
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÐÐÐÑ Â%sÂ: ÐÐÐÐÐ ÐÐ ÑÑÑÐÑÑÐÑÐÑ."
@@ -3609,7 +3606,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:656
+#: ../camel/providers/local/camel-mh-store.c:649
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÑ Â%sÂ: %s"
@@ -3620,8 +3617,8 @@ msgstr "ÐÐ ÑÐÐÑÐÑÑÑ ÐÐÑÑÐÐÑÐ ÐÐÑÐÐÐÐÐÐ"
 
 #: ../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
+#: ../camel/providers/local/camel-spool-store.c:161
+#: ../camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÐÐÐÐÑÐÐÐÑÑ ÐÐÐÐÑ Â%sÂ: %s"
@@ -3629,8 +3626,7 @@ msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÐÐÐÐÑÐÐÐÑÑ ÐÐÐÐÑ Â%sÂ: %s"
 #: ../camel/providers/local/camel-maildir-store.c:713
 #, c-format
 msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
-msgstr ""
-"ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÐÐÐÐÐÑÑ ÐÐÐÐÑ: %s. ÐÐÑ ÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐ ÑÐÐÐÑÐÐÑÑ ÑÐÑÐÐ"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÐÐÐÐÐÑÑ ÐÐÐÐÑ: %s. ÐÐÑ ÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐ ÑÐÐÐÑÐÐÑÑ ÑÐÑÐÐ"
 
 #: ../camel/providers/local/camel-maildir-summary.c:436
 #: ../camel/providers/local/camel-maildir-summary.c:566
@@ -3648,8 +3644,8 @@ msgstr "ÐÑÐÐÐÑÐÐ ÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ"
 
 #: ../camel/providers/local/camel-maildir-summary.c:743
 #: ../camel/providers/local/camel-mbox-summary.c:468
-#: ../camel/providers/local/camel-mbox-summary.c:699
-#: ../camel/providers/local/camel-mbox-summary.c:839
+#: ../camel/providers/local/camel-mbox-summary.c:700
+#: ../camel/providers/local/camel-mbox-summary.c:844
 #: ../camel/providers/local/camel-spool-summary.c:131
 msgid "Storing folder"
 msgstr "ÐÐÑÑÐÐÐÐÐÐ ÐÐÐÐÐ"
@@ -3669,7 +3665,7 @@ msgid "The folder appears to be irrecoverably corrupted."
 msgstr "ÐÐÐÐÐÐ, ÐÐÐÐÐ ÐÐÐÐÑÑÐÐÐÐÐÐÐ ÐÑÐÐÑÑÐÐÐ."
 
 #: ../camel/providers/local/camel-mbox-folder.c:436
-#: ../camel/providers/local/camel-spool-folder.c:70
+#: ../camel/providers/local/camel-spool-folder.c:71
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÐÑÐÐÐÑÑ ÐÐÐÐÑ %s: %s"
@@ -3756,70 +3752,66 @@ msgstr "ÐÐÑÐÐÑÐÐÑ ÐÑÐÐÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐÑ
 msgid "Cannot check folder: %s: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÐÐÑÐÑÑ ÐÐÐÐÑ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:708
-#: ../camel/providers/local/camel-mbox-summary.c:848
+#: ../camel/providers/local/camel-mbox-summary.c:713
+#: ../camel/providers/local/camel-mbox-summary.c:853
 #: ../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:722
+#: ../camel/providers/local/camel-mbox-summary.c:727
 #: ../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:739
-#: ../camel/providers/local/camel-mbox-summary.c:964
+#: ../camel/providers/local/camel-mbox-summary.c:744
+#: ../camel/providers/local/camel-mbox-summary.c:969
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÑÑ ÐÑÑÐÐÐÑÑ ÐÐÐÐÑ %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:750
+#: ../camel/providers/local/camel-mbox-summary.c:755
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÑÑ ÐÑÐÐÐÐÐÑÑ ÐÐÐÐÑ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:767
+#: ../camel/providers/local/camel-mbox-summary.c:772
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÐÐÐÐÐÑÑ ÐÐÐÐÑ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:862
-#: ../camel/providers/local/camel-mbox-summary.c:1129
+#: ../camel/providers/local/camel-mbox-summary.c:867
+#: ../camel/providers/local/camel-mbox-summary.c:1134
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÑÑÐÐÐÑÑ ÐÐÐÐÑ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:901
-#: ../camel/providers/local/camel-mbox-summary.c:1160
+#: ../camel/providers/local/camel-mbox-summary.c:906
+#: ../camel/providers/local/camel-mbox-summary.c:1165
 #, 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:910
-#: ../camel/providers/local/camel-mbox-summary.c:1169
+#: ../camel/providers/local/camel-mbox-summary.c:915
+#: ../camel/providers/local/camel-mbox-summary.c:1174
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "ÐÐÐÐÐÐ Ð ÐÐÐÐÐ ÑÐÑÑÐÐÑÑÑÑ ÐÐÐÐ ÐÐÑÐÐ ÑÐÐÑÑÐÐÐÐÐÑÐÐ"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1075
+#: ../camel/providers/local/camel-mbox-summary.c:1080
 #: ../camel/providers/local/camel-spool-summary.c:343
 #, c-format
 msgid "Unknown error: %s"
 msgstr "ÐÐÐÐÐÐÑÑÐÐÑ ÐÑÐÐÐÐ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1239
-#: ../camel/providers/local/camel-mbox-summary.c:1269
+#: ../camel/providers/local/camel-mbox-summary.c:1244
+#: ../camel/providers/local/camel-mbox-summary.c:1274
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "ÐÐÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐÑÑÐÐÑÐ ÑÑÐÐ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1258
+#: ../camel/providers/local/camel-mbox-summary.c:1263
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "ÐÐÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐÑÑÐÐÑÐ ÑÑÐÐ: %s: %s"
@@ -3829,12 +3821,12 @@ msgstr "ÐÐÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐÑÑÐÐÑÐ ÑÑÐÐ:
 msgid "Cannot append message to mh folder: %s: "
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ Ð ÐÐÐÐÑ mh: %s:"
 
-#: ../camel/providers/local/camel-mh-store.c:541
+#: ../camel/providers/local/camel-mh-store.c:522
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÑ Â%sÂ: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:558
+#: ../camel/providers/local/camel-mh-store.c:539
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÐÐÐÑ Â%sÂ: ÐÐ ÑÐÐÑÐÑÑÑ ÐÐÑÐÐÐÐÐÐ."
@@ -3844,22 +3836,22 @@ msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÐÐÐÑ Â%sÂ: ÐÐ ÑÐÐÑÐ
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÑÑÑ MH ÐÐÑÐÐÐÐ: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:346
+#: ../camel/providers/local/camel-spool-store.c:347
 #, c-format
 msgid "Spool mail file %s"
 msgstr "ÐÐÐÐ ÐÐÑÑÐÐÐÐÐ ÑÐÑÐÐ %s"
 
-#: ../camel/providers/local/camel-spool-store.c:349
+#: ../camel/providers/local/camel-spool-store.c:350
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "ÐÐÑÐÐÐ ÐÐÐÐÐ ÑÐÑÐÐ %s"
 
-#: ../camel/providers/local/camel-spool-store.c:390
+#: ../camel/providers/local/camel-spool-store.c:391
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "ÐÐÐÐÐ Â%s/%s ÐÐ ÑÑÑÐÑÑÐÑÐÑ."
 
-#: ../camel/providers/local/camel-spool-store.c:404
+#: ../camel/providers/local/camel-spool-store.c:405
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3868,12 +3860,12 @@ msgstr ""
 "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÑÑÑ ÐÐÐÐÑ Â%sÂ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:410
+#: ../camel/providers/local/camel-spool-store.c:411
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "ÐÐÐÐÐ Â%s ÐÐ ÑÑÑÐÑÑÐÑÐÑ."
 
-#: ../camel/providers/local/camel-spool-store.c:417
+#: ../camel/providers/local/camel-spool-store.c:418
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -3882,32 +3874,32 @@ msgstr ""
 "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÐÐÐÐÑ Â%sÂ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:429
+#: ../camel/providers/local/camel-spool-store.c:430
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "Â%s ÐÐ ÑÐÐÑÐÑÑÑ ÑÐÐÐÐÐ ÐÐÑÑÐÐÐÐÐ ÑÑÐÐÐ."
 
-#: ../camel/providers/local/camel-spool-store.c:477
+#: ../camel/providers/local/camel-spool-store.c:478
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑ INBOX"
 
-#: ../camel/providers/local/camel-spool-store.c:491
+#: ../camel/providers/local/camel-spool-store.c:492
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "ÐÐÐÐÐ ÑÐÑÐÐ ÐÐ ÐÐÐÑÑ ÐÑÑÑ ÑÐÐÐÐÐÑ"
 
-#: ../camel/providers/local/camel-spool-store.c:506
+#: ../camel/providers/local/camel-spool-store.c:507
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "ÐÐÐÐÐ ÑÐÑÐÐ ÐÐ ÐÐÐÑÑ ÐÑÑÑ ÐÐÑÐÐÐÐÐÐÐÐÐÑ"
 
-#: ../camel/providers/local/camel-spool-store.c:579
+#: ../camel/providers/local/camel-spool-store.c:580
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÑÑÑ ÑÐÐÐ ÐÐÐÐÐÐÐÐÐÑ Â%sÂ: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:595
+#: ../camel/providers/local/camel-spool-store.c:596
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "ÐÐÐÐÐÐÑÐÐÑ Â%s ÐÐ ÑÐÐÑÐÑÑÑ ÐÐÑÑÐÑÐ ÑÐÐÐÐÐ ÐÐÐ ÐÐÑÐÐÐÐÐÐ"
@@ -3935,23 +3927,23 @@ msgstr ""
 "ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÑÑÐÐÐÐÐÑÐÐÐÑÑ ÐÐÐÐÑ ÑÐÑÐÐ %s: %s\n"
 "ÐÐÐÐÐ ÐÐÐÐÑ ÐÑÑÑ ÐÐÐÑÐÐÐÐÐÐ, ÐÐÐÐÑ ÑÐÑÑÐÐÐÐÐ Ð Â%sÂ"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:194
-#: ../camel/providers/nntp/camel-nntp-folder.c:279
-#: ../camel/providers/nntp/camel-nntp-folder.c:393
+#: ../camel/providers/nntp/camel-nntp-folder.c:207
+#: ../camel/providers/nntp/camel-nntp-folder.c:296
+#: ../camel/providers/nntp/camel-nntp-folder.c:410
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "ÐÐÑÑÑÐÐÐÑÑ ÐÑÐÐÐÐ: UID Ð ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÑÐ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:241
-#: ../camel/providers/nntp/camel-nntp-folder.c:245
+#: ../camel/providers/nntp/camel-nntp-folder.c:257
+#: ../camel/providers/nntp/camel-nntp-folder.c:261
 #: ../camel/providers/pop3/camel-pop3-folder.c:429
-#: ../camel/providers/pop3/camel-pop3-folder.c:681
+#: ../camel/providers/pop3/camel-pop3-folder.c:692
 #, 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/nntp/camel-nntp-folder.c:268
+#: ../camel/providers/nntp/camel-nntp-folder.c:435
 #: ../camel/providers/pop3/camel-pop3-folder.c:366
 #: ../camel/providers/pop3/camel-pop3-folder.c:418
 #: ../camel/providers/pop3/camel-pop3-folder.c:438
@@ -3959,33 +3951,30 @@ msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÑÐÐÐÑÐÐÐÐ %s: %s"
 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
+#: ../camel/providers/nntp/camel-nntp-folder.c:494
+#: ../camel/providers/nntp/camel-nntp-folder.c:500
+#: ../camel/providers/nntp/camel-nntp-folder.c:547
 #, c-format
 msgid "Posting failed: %s"
 msgstr "ÐÑÐÐÐÐ ÐÑÐÑÐÐÐÐ ÑÐÐÐÑÐÐÐÑ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:525
+#: ../camel/providers/nntp/camel-nntp-folder.c:542
 msgid "Posting failed: "
 msgstr "ÐÑÐÐÐÐ ÐÑÐÑÐÐÐÐ ÑÐÐÐÑÐÐÐÑ: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:554
+#: ../camel/providers/nntp/camel-nntp-folder.c:571
 #, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "ÐÑ ÐÐ ÐÐÐÐÑÐ ÐÑÐÑÐÐÐÑÑÑ ÑÐÐÐÑÐÐÐÑ NNTP ÐÐ ÐÑÐÐÑ ÐÐÑÐÐÐÐÐÐÐ ÑÐÐÐÑÑ!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:574
+#: ../camel/providers/nntp/camel-nntp-folder.c:591
 #, c-format
 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"
@@ -4005,43 +3994,38 @@ msgstr "ÐÐÐÐÑÑÐ USENET"
 
 #: ../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:82
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-"ÐÐÐÐÐÑÑÐÐÐÐ Ð ÑÐÑÐÐÑÑ NNTP ÐÑÐÐÑ ÐÑÐÐÐÐÐÐÐÑÑÑÑ Ñ ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ "
-"ÐÐÐÐÑÐÑÑÐÐÐÐÐÐÐÐ ÐÐÑÐÐÑ."
+msgid "This option will authenticate with the NNTP server using a plaintext password."
+msgstr "ÐÐÐÐÐÑÑÐÐÐÐ Ð ÑÐÑÐÐÑÑ NNTP ÐÑÐÐÑ ÐÑÐÐÐÐÐÐÐÑÑÑÑ Ñ ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÑÐÐÐÐÐÐÐÐ ÐÐÑÐÐÑ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:107
+#: ../camel/providers/nntp/camel-nntp-store.c:97
 #, c-format
 msgid "Authentication requested but no username provided"
 msgstr "ÐÑÐÐÑÐÑÑÑ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÐÐÑÑÐ, ÐÐ ÐÐÑ ÐÐÐÑÐÐÐÐÑÐÐÑ ÐÐ ÑÐÐÐÐÐÐ"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:119
+#: ../camel/providers/nntp/camel-nntp-store.c:109
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÐÑÐ ÐÑÐÐÐÑÐÑ ÐÐÐÐÐÐÐÐÑÑÐ ÐÐ ÑÐÑÐÐÑÐ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:442
+#: ../camel/providers/nntp/camel-nntp-store.c:357
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÐÑÐÑÑ ÐÑÐÐÐÑÑÑÐÐÐ ÐÐ %s: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:455
+#: ../camel/providers/nntp/camel-nntp-store.c:370
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "ÐÐÑÐÐÑ NNTP %s ÐÐÑÐÑÐ ÐÐÐ ÐÑÐÐÐÐ %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:612
+#: ../camel/providers/nntp/camel-nntp-store.c:527
 #, c-format
 msgid "USENET News via %s"
 msgstr "ÐÐÐÐÑÑÐ USENET ÑÐÑÐÐ %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1119
+#: ../camel/providers/nntp/camel-nntp-store.c:1053
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4052,7 +4036,22 @@ msgstr ""
 "\n"
 " %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1234
+#: ../camel/providers/nntp/camel-nntp-store.c:1146
+#, c-format
+msgid "You cannot create a folder in a News store: subscribe instead."
+msgstr "ÐÑ ÐÐ ÐÐÐÐÑÐ ÑÐÐÐÐÑÑ ÐÐÐÐÑ Ð ÐÑÑÐÐÐÑ ÐÐÐÐÑÑÐÐ: ÐÐÐÑÑÐ ÑÑÐÐÐ ÑÐÐÐÑÐÑ ÐÐÐÐÐÑÐÑÑÑÑ."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1162
+#, c-format
+msgid "You cannot rename a folder in a News store."
+msgstr "ÐÑ ÐÐ ÐÐÐÐÑÐ ÐÐÑÐÐÐÐÐÐÐÐÑÑ ÐÐÐÐÑ Ð ÐÑÑÐÐÐÑ ÐÐÐÐÑÑÐÐ."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1185
+#, c-format
+msgid "You cannot remove a folder in a News store: unsubscribe instead."
+msgstr "ÐÑ ÐÐ ÐÐÐÐÑÐ ÑÐÐÐÐÑÑ ÐÐÐÐÑ Ð ÐÑÑÐÐÐÑ ÐÐÐÐÑÑÐÐ: ÐÐÐÑÑÐ ÑÑÐÐÐ ÑÐÐÐÑÐÑ ÐÑÐÐÑÐÑÑÑÑ."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1329
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4061,10 +4060,9 @@ msgid ""
 msgstr ""
 "ÐÑ ÐÐ ÐÐÐÐÑÐ ÐÐÐÐÐÑÐÑÑÑÑ ÐÐ ÑÑÑ ÐÑÑÐÐÑ ÐÐÐÐÑÑÐÐ:\n"
 "\n"
-"ÐÐÑ ÑÐÐÐÐ ÐÑÑÐÐÑ ÐÐÐÐÑÑÐÐ. ÐÑÐÑÐÐÐÑÐ ÑÐÐÐÐÐÑ ÑÐÐÑÐÐ ÐÑÐÐÐ ÑÐÐÑÐÑÑÑ "
-"ÑÐÐÐÑÐÐÑÑÐÐÐ ÐÐÐÐÐÐ."
+"ÐÐÑ ÑÐÐÐÐ ÐÑÑÐÐÑ ÐÐÐÐÑÑÐÐ. ÐÑÐÑÐÐÐÑÐ ÑÐÐÐÐÐÑ ÑÐÐÑÐÐ ÐÑÐÐÐ ÑÐÐÑÐÑÑÑ ÑÐÐÐÑÐÐÑÑÐÐÐ ÐÐÐÐÐÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1276
+#: ../camel/providers/nntp/camel-nntp-store.c:1380
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4075,30 +4073,11 @@ msgstr ""
 "\n"
 "ÐÑÑÐÐÐ ÐÐÐÐÑÑÐÐ ÐÐ ÑÑÑÐÑÑÐÑÐÑ!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1309
-#, c-format
-msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr ""
-"ÐÑ ÐÐ ÐÐÐÐÑÐ ÑÐÐÐÐÑÑ ÐÐÐÐÑ Ð ÐÑÑÐÐÐÑ ÐÐÐÐÑÑÐÐ: ÐÐÐÑÑÐ ÑÑÐÐÐ ÑÐÐÐÑÐÑ "
-"ÐÐÐÐÐÑÐÑÑÑÑ."
-
-#: ../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:1342
-#, c-format
-msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr ""
-"ÐÑ ÐÐ ÐÐÐÐÑÐ ÑÐÐÐÐÑÑ ÐÐÐÐÑ Ð ÐÑÑÐÐÐÑ ÐÐÐÐÑÑÐÐ: ÐÐÐÑÑÐ ÑÑÐÐÐ ÑÐÐÐÑÐÑ "
-"ÐÑÐÐÑÐÑÑÑÑ."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1647
+#: ../camel/providers/nntp/camel-nntp-store.c:1573
 msgid "NNTP Command failed: "
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑ NNTP: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1721
+#: ../camel/providers/nntp/camel-nntp-store.c:1647
 #, c-format
 msgid "Not connected."
 msgstr "ÐÐ ÐÐÐÐÐÑÑÐÐ."
@@ -4147,16 +4126,17 @@ msgstr "ÐÐÐÑÑÐÐÐÐ ÐÑÐÑÐÐÐ ÐÐÑÐÑÐÐÑÐÐ ÐÑ ÑÐÑÐÐÑ
 msgid "Cannot get POP summary: "
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÑÑ ÐÐÑÐÐ ÐÐÐÐÑÐ POP: "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:542
+#: ../camel/providers/pop3/camel-pop3-folder.c:555
 msgid "Expunging old messages"
 msgstr "ÐÐÐÑÑÐÐÐÐÐÐ ÑÑÐÑÑÑ ÑÐÐÐÑÐÐÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:556
+#: ../camel/providers/pop3/camel-pop3-folder.c:567
 msgid "Expunging deleted messages"
 msgstr "ÐÐÐÑÑÐÐÐÐÐÐ ÑÐÐÐÑÐÐÐÐ, ÐÐÐÐÑÐÐÐÑÑ ÐÐÐ ÑÐÐÐÑÐÐÑÐ"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:39
-msgid "Message storage"
+#| msgid "Message storage"
+msgid "Message Storage"
 msgstr "ÐÑÐÐÐÐÐÑÐ ÑÐÐÐÑÐÐÐÐ"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:41
@@ -4194,96 +4174,76 @@ msgid "For connecting to and downloading mail from POP servers."
 msgstr "ÐÐÑ ÐÐÐÐÐÑÑÐÐÐÑ Ð ÐÑÐÐÑÑÐÑ ÐÐÑÑÑ Ñ ÑÐÑÐÐÑÐÐ 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 ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ ÑÐÐÑÐÐ "
-"ÑÑÐÑ ÐÐÑÐÐÐÑ."
+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: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. ÐÑÐ ÐÐÐÐÑ ÑÐÐÐÑÐÑÑ ÐÐ ÐÐÑ ÐÑÐÑ ÐÐÐÑÐÐÐÐÑÐÐÐÐ ÐÐÐÐ "
-"ÐÐ ÑÐÑÐÐÑÐÑ, ÑÐÐÐÑ ÐÐÐÐÐÑÐÐÐÐÑÑÐÑ ÐÐÐ."
+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:97
+#: ../camel/providers/pop3/camel-pop3-store.c:83
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:151
+#: ../camel/providers/pop3/camel-pop3-store.c:130
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑ ÐÑÐÐÐÐÑÐÐÐÐ ÐÑ POP-ÑÐÑÐÐÑÐ %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:169
-#: ../camel/providers/pop3/camel-pop3-store.c:208
+#: ../camel/providers/pop3/camel-pop3-store.c:150
+#: ../camel/providers/pop3/camel-pop3-store.c:189
 #, 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:170
+#: ../camel/providers/pop3/camel-pop3-store.c:151
 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:188
+#: ../camel/providers/pop3/camel-pop3-store.c:169
 #, 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:201
+#: ../camel/providers/pop3/camel-pop3-store.c:182
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð POP-ÑÐÑÐÐÑÑ %s Ð ÐÐÑÐÑÑÐÐÐÐ ÑÐÐÐÐÐ: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:209
+#: ../camel/providers/pop3/camel-pop3-store.c:190
 msgid "TLS is not available in this build"
 msgstr "TLS ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÑÑ Ð ÑÑÐÐ ÑÐÐÑÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:260
-#: ../camel/providers/pop3/camel-pop3-store.c:433
+#: ../camel/providers/pop3/camel-pop3-store.c:241
+#: ../camel/providers/pop3/camel-pop3-store.c:414
 #, 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:288
+#: ../camel/providers/pop3/camel-pop3-store.c:269
 #, c-format
 msgid "SASL '%s' Login failed for POP server %s%s"
 msgstr "SASL Â%s ÐÑÐÐÐÐ ÑÐÐÐÑÑÑÐÑÐÐ ÐÐ ÑÐÑÐÐÑÐ POP %s%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:305
+#: ../camel/providers/pop3/camel-pop3-store.c:286
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÐÑÑÑÐÑÐÐÐÑÑÑÑ ÐÐ ÑÐÑÐÐÑÐ POP %s: ÐÑÐÐÐÐ ÐÑÐÑÐÐÐÐÐ SASL"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:327
+#: ../camel/providers/pop3/camel-pop3-store.c:308
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "ÐÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÐ ÐÐ ÑÐÑÐÐÑÐ POP %s: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:399
+#: ../camel/providers/pop3/camel-pop3-store.c:380
 #, 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:446
+#: ../camel/providers/pop3/camel-pop3-store.c:427
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4293,7 +4253,7 @@ msgstr ""
 "ÐÑÐÐÐÐ ÐÑÐÑÐÐÐÐ ÐÐÑÐÐÑ: "
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:456
+#: ../camel/providers/pop3/camel-pop3-store.c:437
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4303,7 +4263,7 @@ msgstr ""
 "ÐÑÐÐÐÐ ÐÑÐÑÐÐÐÐ ÐÐÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÑ%s"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:468
+#: ../camel/providers/pop3/camel-pop3-store.c:449
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4312,27 +4272,27 @@ msgstr ""
 "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð POP-ÑÐÑÐÐÑÑ %s.\n"
 "ÐÑÐÐÐÐ ÐÑÐÑÐÐÐÐ ÐÐÑÐÐÑ%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:586
+#: ../camel/providers/pop3/camel-pop3-store.c:492
 #, c-format
 msgid "POP3 server %s"
 msgstr "ÐÐÑÐÐÑ POP3 %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:589
+#: ../camel/providers/pop3/camel-pop3-store.c:495
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "ÐÐÑÐÐÑ POP3 ÐÐÑ %s ÐÐ %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:720
+#: ../camel/providers/pop3/camel-pop3-store.c:626
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð POP-ÑÐÑÐÐÑÑ %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:747
+#: ../camel/providers/pop3/camel-pop3-store.c:653
 #, c-format
 msgid "No such folder '%s'."
 msgstr "ÐÐÑ ÑÐÐÐÐ ÐÐÐÐÐ Â%sÂ."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:764
+#: ../camel/providers/pop3/camel-pop3-store.c:670
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "Ð ÑÑÐÐÐÐÐÑÐÑ POP3 ÐÑÑÑÑÑÑÐÑÐÑ ÐÐÑÐÑÑÐÑ ÐÐÐÐÐ"
@@ -4342,9 +4302,7 @@ 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
@@ -4407,48 +4365,46 @@ msgstr "SMTP"
 
 #: ../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:155
-#: ../camel/providers/smtp/camel-smtp-transport.c:162
+#: ../camel/providers/smtp/camel-smtp-transport.c:149
+#: ../camel/providers/smtp/camel-smtp-transport.c:156
 msgid "Welcome response error: "
 msgstr "ÐÑÐÐÐÐ ÐÑÐÐÑÐ ÐÐ ÐÑÐÐÐÑÑÑÐÐÐ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:197
-#: ../camel/providers/smtp/camel-smtp-transport.c:243
+#: ../camel/providers/smtp/camel-smtp-transport.c:191
+#: ../camel/providers/smtp/camel-smtp-transport.c:237
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð SMTP-ÑÐÑÐÐÑÑ %s Ð ÐÐÑÐÑÐÐÐÐÐ ÑÐÐÐÐÐ: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:206
-#: ../camel/providers/smtp/camel-smtp-transport.c:219
-#: ../camel/providers/smtp/camel-smtp-transport.c:226
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/smtp/camel-smtp-transport.c:220
 msgid "STARTTLS command failed: "
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑ STARTTLS: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:236
+#: ../camel/providers/smtp/camel-smtp-transport.c:230
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑÑÑ Ð SMTP-ÑÐÑÐÐÑÑ %s Ð ÐÐÑÐÑÑÐÐÐÐ ÑÐÐÐÐÐ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:361
+#: ../camel/providers/smtp/camel-smtp-transport.c:280
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-ÑÐÑÐÐÑ %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:365
+#: ../camel/providers/smtp/camel-smtp-transport.c:284
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-ÐÐÑÑÐÐÐÐ ÐÐÑÑÑ ÑÐÑÐÐ %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:416
+#: ../camel/providers/smtp/camel-smtp-transport.c:335
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP-ÑÐÑÐÐÑ  %s ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑ ÐÐÑÑÐÐÐÐÐÐÐÑÐ ÑÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÐ %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:518
+#: ../camel/providers/smtp/camel-smtp-transport.c:437
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4459,185 +4415,181 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:635
+#: ../camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ: ÑÐÑÐÐÑ ÐÐ ÐÐÐÐÐÑÑÑÐ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:642
+#: ../camel/providers/smtp/camel-smtp-transport.c:561
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ: ÐÐÐÐÑÐÑÐ ÐÐÑÐÑ ÐÑÐÑÐÐÐÑÐÐÑ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:646
+#: ../camel/providers/smtp/camel-smtp-transport.c:565
 msgid "Sending message"
 msgstr "ÐÑÐÑÐÐÐÐ ÑÐÐÐÑÐÐÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:671
+#: ../camel/providers/smtp/camel-smtp-transport.c:590
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ: ÐÐ ÐÐÑÐÐÐÐÐÐÑ ÐÐÐÑÑÐÑÐÐÐ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:684
+#: ../camel/providers/smtp/camel-smtp-transport.c:603
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
-msgstr ""
-"ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ: ÑÐÐÐÐÐ ÐÐÐÐ ÐÐÐ  ÐÐÑÐÐÐÑÐÐ ÐÐÐÐÑÑÐÐÑÐÑÑ "
-"ÐÐÐÑÑÐÑÐÐÐÐ"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ: ÑÐÐÐÐÐ ÐÐÐÐ ÐÐÐ  ÐÐÑÐÐÐÑÐÐ ÐÐÐÐÑÑÐÐÑÐÑÑ ÐÐÐÑÑÐÑÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:814
+#: ../camel/providers/smtp/camel-smtp-transport.c:706
 msgid "Syntax error, command unrecognized"
 msgstr "ÐÐÐÑÐÐÑÐÑÐÑÐÐÑ ÐÑÐÐÐÐ, ÐÐÐÐÐÐÐ ÐÐ ÑÐÑÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:816
+#: ../camel/providers/smtp/camel-smtp-transport.c:708
 msgid "Syntax error in parameters or arguments"
 msgstr "ÐÐÐÑÐÐÑÐÑÐÑÐÐÑ ÐÑÐÐÐÐ Ð ÐÐÑÐÐÐÑÑÐÑ ÐÐÐ ÐÑÐÑÐÐÐÑÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:818
+#: ../camel/providers/smtp/camel-smtp-transport.c:710
 msgid "Command not implemented"
 msgstr "ÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:820
+#: ../camel/providers/smtp/camel-smtp-transport.c:712
 msgid "Command parameter not implemented"
 msgstr "ÐÐÑÐÐÐÑÑ ÐÐÐÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:822
+#: ../camel/providers/smtp/camel-smtp-transport.c:714
 msgid "System status, or system help reply"
 msgstr "ÐÐÑÑÐÑÐÐÐ ÑÐÑÑÐÐÑ ÐÐÐ ÐÑÐÐÑ ÑÐÑÑÐÐÐÐÐ ÑÐÑÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:824
+#: ../camel/providers/smtp/camel-smtp-transport.c:716
 msgid "Help message"
 msgstr "ÐÐÑÐÐÐÑÐÐÐ ÑÐÐÐÑÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:826
+#: ../camel/providers/smtp/camel-smtp-transport.c:718
 msgid "Service ready"
 msgstr "ÐÐÑÐÐÑ ÐÐÑÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:828
+#: ../camel/providers/smtp/camel-smtp-transport.c:720
 msgid "Service closing transmission channel"
 msgstr "ÐÐÑÐÐÑ ÐÐÐÑÑÐÐÐÑ ÐÐÐÐÐ ÐÐÑÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:830
+#: ../camel/providers/smtp/camel-smtp-transport.c:722
 msgid "Service not available, closing transmission channel"
 msgstr "ÐÐÑÐÐÑ ÐÐ ÐÐÑÑÑÐÐÐ, ÐÐÐÑÑÑÐÐ ÐÐÐÐÐÐ ÐÐÑÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:832
+#: ../camel/providers/smtp/camel-smtp-transport.c:724
 msgid "Requested mail action okay, completed"
 msgstr "ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÑÑÐÐÐÐ ÐÐÐÑÑÐÐÐ ÐÑÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:834
+#: ../camel/providers/smtp/camel-smtp-transport.c:726
 msgid "User not local; will forward to <forward-path>"
-msgstr ""
-"ÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐÐÑÐÐÐÐÑÐÐÑ; ÐÑÐÐÑ ÐÑÐÑÐÐÐÐÐÐ Ð ÑÐÐÑÐÐÑÑÑÐÐÐ Ñ <forward-path>"
+msgstr "ÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐÐÑÐÐÐÐÑÐÐÑ; ÐÑÐÐÑ ÐÑÐÑÐÐÐÐÐÐ Ð ÑÐÐÑÐÐÑÑÑÐÐÐ Ñ <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:836
+#: ../camel/providers/smtp/camel-smtp-transport.c:728
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÑÑÐÐÐ Ñ ÐÐÑÑÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐ: ÐÐÑÑÐÐÑÐ ÑÑÐÐ ÐÐÐÐÑÑÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:838
+#: ../camel/providers/smtp/camel-smtp-transport.c:730
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÑÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐ: ÐÐÑÑÐÐÑÐ ÑÑÐÐ ÐÐÐÐÑÑÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:840
+#: ../camel/providers/smtp/camel-smtp-transport.c:732
 msgid "Requested action aborted: error in processing"
 msgstr "ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÑÑÐÐÐ ÐÑÐÑÐÐÐÐ: ÐÑÐÐÐÐ ÐÑÐ ÐÐÑÐÐÐÑÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:842
+#: ../camel/providers/smtp/camel-smtp-transport.c:734
 msgid "User not local; please try <forward-path>"
 msgstr "ÐÐÐÑÐÐÐÐÑÐÐÑ ÐÐ ÐÐÐÐÐÑÐÑÐ; ÑÑÑÐÐÐÐÐÑÐ <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:844
+#: ../camel/providers/smtp/camel-smtp-transport.c:736
 msgid "Requested action not taken: insufficient system storage"
-msgstr ""
-"ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÑÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐ: ÐÐÐÐÑÑÐÑÐÑÐÐ ÐÐÑÑÐ Ð ÑÐÑÑÐÐÐÐÐ ÑÑÐÐÐÐÐÑÐ"
+msgstr "ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÑÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐ: ÐÐÐÐÑÑÐÑÐÑÐÐ ÐÐÑÑÐ Ð ÑÐÑÑÐÐÐÐÐ ÑÑÐÐÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:846
+#: ../camel/providers/smtp/camel-smtp-transport.c:738
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÑÑÐÐÐ ÐÑÐÑÐÐÐÐ: ÐÑÑÐÑÐÐÐÐ ÐÐÑÑÐ Ð ÑÑÐÐÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:848
+#: ../camel/providers/smtp/camel-smtp-transport.c:740
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÑÑÐÐÐ ÐÑÐÑÐÐÐÐ: ÐÐÑ ÐÐÑÑÐÐÐÐÐ ÑÑÐÐÐ ÐÐÐÐÐÑÑÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:850
+#: ../camel/providers/smtp/camel-smtp-transport.c:742
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "ÐÐÑÐÐÐ ÐÐÐÐÐ ÐÐÑÑÑ; ÐÐÐÐÑÐÐÐÐ ÐÐÑÐÐ <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:852
+#: ../camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Transaction failed"
 msgstr "ÐÐÐÐ ÑÑÐÐÐÐÐÑÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:856
+#: ../camel/providers/smtp/camel-smtp-transport.c:748
 msgid "A password transition is needed"
 msgstr "ÐÐÐÐÑÐÐÐÐÐ ÐÐÑÐÐÐÑÐ ÐÐÑÐÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:858
+#: ../camel/providers/smtp/camel-smtp-transport.c:750
 msgid "Authentication mechanism is too weak"
 msgstr "ÐÐÐÑÐÐÐ ÑÐÐÐÑÐ ÐÐÑÐÐÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:860
+#: ../camel/providers/smtp/camel-smtp-transport.c:752
 msgid "Encryption required for requested authentication mechanism"
 msgstr "ÐÐÑ ÐÐÐÑÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÐ ÑÑÐÐÑÐÑÑÑ ÑÐÑÑÐÐÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:862
+#: ../camel/providers/smtp/camel-smtp-transport.c:754
 msgid "Temporary authentication failure"
 msgstr "ÐÑÐÐÐÐÐÑÐ ÑÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1112
+#: ../camel/providers/smtp/camel-smtp-transport.c:1004
 msgid "SMTP Greeting"
 msgstr "ÐÑÐÐÐÑÑÑÐÐÐ SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1139
-#: ../camel/providers/smtp/camel-smtp-transport.c:1156
-#: ../camel/providers/smtp/camel-smtp-transport.c:1164
+#: ../camel/providers/smtp/camel-smtp-transport.c:1031
+#: ../camel/providers/smtp/camel-smtp-transport.c:1048
+#: ../camel/providers/smtp/camel-smtp-transport.c:1056
 msgid "HELO command failed: "
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑ HELO: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1233
+#: ../camel/providers/smtp/camel-smtp-transport.c:1125
 msgid "SMTP Authentication"
 msgstr "ÐÑÑÐÐÑÐÑÐÐÐÑÐÑ SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1252
-#: ../camel/providers/smtp/camel-smtp-transport.c:1263
-#: ../camel/providers/smtp/camel-smtp-transport.c:1276
+#: ../camel/providers/smtp/camel-smtp-transport.c:1144
+#: ../camel/providers/smtp/camel-smtp-transport.c:1155
+#: ../camel/providers/smtp/camel-smtp-transport.c:1168
 msgid "AUTH command failed: "
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑ AUTH: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1384
-#: ../camel/providers/smtp/camel-smtp-transport.c:1398
-#: ../camel/providers/smtp/camel-smtp-transport.c:1407
+#: ../camel/providers/smtp/camel-smtp-transport.c:1276
+#: ../camel/providers/smtp/camel-smtp-transport.c:1290
+#: ../camel/providers/smtp/camel-smtp-transport.c:1299
 msgid "MAIL FROM command failed: "
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑ MAIL FROM: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1434
+#: ../camel/providers/smtp/camel-smtp-transport.c:1326
 msgid "RCPT TO command failed: "
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑ RCPT TO: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1450
-#: ../camel/providers/smtp/camel-smtp-transport.c:1459
+#: ../camel/providers/smtp/camel-smtp-transport.c:1342
+#: ../camel/providers/smtp/camel-smtp-transport.c:1351
 #, c-format
 msgid "RCPT TO <%s> failed: "
-msgstr "ÐÐÐÐ RCPT TO <%s>: "
-
-#: ../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
+msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑ RCPT TO <%s>: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1393
+#: ../camel/providers/smtp/camel-smtp-transport.c:1403
+#: ../camel/providers/smtp/camel-smtp-transport.c:1413
+#: ../camel/providers/smtp/camel-smtp-transport.c:1472
+#: ../camel/providers/smtp/camel-smtp-transport.c:1491
+#: ../camel/providers/smtp/camel-smtp-transport.c:1504
+#: ../camel/providers/smtp/camel-smtp-transport.c:1512
 msgid "DATA command failed: "
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑ DATA: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1645
-#: ../camel/providers/smtp/camel-smtp-transport.c:1659
-#: ../camel/providers/smtp/camel-smtp-transport.c:1667
+#: ../camel/providers/smtp/camel-smtp-transport.c:1537
+#: ../camel/providers/smtp/camel-smtp-transport.c:1551
+#: ../camel/providers/smtp/camel-smtp-transport.c:1559
 msgid "RSET command failed: "
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑ RSET: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1692
-#: ../camel/providers/smtp/camel-smtp-transport.c:1706
-#: ../camel/providers/smtp/camel-smtp-transport.c:1713
+#: ../camel/providers/smtp/camel-smtp-transport.c:1584
+#: ../camel/providers/smtp/camel-smtp-transport.c:1598
+#: ../camel/providers/smtp/camel-smtp-transport.c:1605
 msgid "QUIT command failed: "
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑ QUIT: "
 
@@ -4753,116 +4705,36 @@ 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"
+#: ../libedataserver/e-client.c:113
+#| msgctxt "ClientError"
+#| msgid "Source not loaded"
 msgid "Source not loaded"
 msgstr "ÐÑÑÐÑÐÐÐ ÐÐ ÐÐÐÑÑÐÐÐ"
 
-#: ../libedataserver/e-client.c:112
-msgctxt "ClientError"
+#: ../libedataserver/e-client.c:115
+#| msgctxt "ClientError"
+#| msgid "Source already loaded"
 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"
+#: ../libedataserver/e-client.c:123
+#| msgctxt "ClientError"
+#| msgid "Offline unavailable"
 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"
+#: ../libedataserver/e-client.c:145
+#| msgctxt "ClientError"
+#| msgid "D-Bus error"
 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:1634 ../libedataserver/e-time-utils.c:1930
+#: ../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"
 
@@ -4870,7 +4742,8 @@ 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:1639 ../libedataserver/e-time-utils.c:1921
+#: ../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"
 
@@ -4878,7 +4751,8 @@ 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:1644 ../libedataserver/e-time-utils.c:1926
+#: ../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"
 
@@ -4886,7 +4760,8 @@ 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:1649 ../libedataserver/e-time-utils.c:1917
+#: ../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"
 
@@ -4904,7 +4779,8 @@ 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:1662 ../libedataserver/e-time-utils.c:1782
+#: ../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"
@@ -4945,19 +4821,22 @@ 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:1696 ../libedataserver/e-time-utils.c:1785
+#: ../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:1854 ../libedataserver/e-time-utils.c:1974
+#: ../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:1858 ../libedataserver/e-time-utils.c:1966
+#: ../libedataserver/e-time-utils.c:1858
+#: ../libedataserver/e-time-utils.c:1966
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4965,14 +4844,16 @@ msgstr "%H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1863 ../libedataserver/e-time-utils.c:1971
+#: ../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:1867 ../libedataserver/e-time-utils.c:1963
+#: ../libedataserver/e-time-utils.c:1867
+#: ../libedataserver/e-time-utils.c:1963
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -4986,13 +4867,13 @@ msgstr "%H%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-book-auth-util.c:98
-#: ../libedataserverui/e-book-auth-util.c:661
+#: ../libedataserverui/e-book-auth-util.c:94
+#: ../libedataserverui/e-book-auth-util.c:651
 msgid "Accessing LDAP Server anonymously"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÑÑÑÐ Ð ÑÐÑÐÐÑÑ LDAP"
 
-#: ../libedataserverui/e-book-auth-util.c:197
-#: ../libedataserverui/e-book-auth-util.c:422
+#: ../libedataserverui/e-book-auth-util.c:191
+#: ../libedataserverui/e-book-auth-util.c:412
 msgid "Failed to authenticate.\n"
 msgstr "ÐÑÐÐÐÐ ÐÐÑÐÑÐÐÐÑÐÐ.\n"
 
@@ -5039,12 +4920,10 @@ msgstr "ÐÐÐÐÑÑÐÐ ÐÐÑÐÐÐÑÐÐ"
 
 #: ../libedataserverui/e-category-editor.c:282
 #, c-format
-msgid ""
-"There is already a category '%s' in the configuration. Please use another "
-"name"
+msgid "There is already a category '%s' in the configuration. Please use another name"
 msgstr "ÐÐÑÐÐÐÑÐÑ Ñ ÐÐÐÐÐÐ Â%s ÑÐÐ ÐÑÑÑ. ÐÑÐÐÐÑÐÑÐÑÐ ÐÑÑÐÐÐ ÐÐÑ"
 
-#: ../libedataserverui/e-client-utils.c:756
+#: ../libedataserverui/e-client-utils.c:793
 #, c-format
 msgid ""
 "Enter password for %s (user %s)\n"
@@ -5053,11 +4932,11 @@ msgstr ""
 "ÐÐÐÐÐÑÐ ÐÐÑÐÐÑ ÐÐÑ %s (ÐÐÐÑÐÐÐÐÑÐÐÑ %s)\n"
 "ÐÑÐÑÐÐÐ: %s"
 
-#: ../libedataserverui/e-client-utils.c:850
+#: ../libedataserverui/e-client-utils.c:887
 msgid "Enter Passphrase"
 msgstr "ÐÐÐÐÐÑÐ ÐÐÑÑÐÐÑÑ ÑÑÐÐÑ"
 
-#: ../libedataserverui/e-client-utils.c:852
+#: ../libedataserverui/e-client-utils.c:889
 msgid "Enter Password"
 msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÐÑ"
 
@@ -5116,25 +4995,25 @@ msgid "Error loading address book: %s"
 msgstr "ÐÑÐÐÐÐ ÐÐÐÑÑÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÐ: %s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2704
+#: ../libedataserverui/e-name-selector-entry.c:2741
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "_ÐÐÐÐÐÑÐÑÑÑ %s"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2719
+#: ../libedataserverui/e-name-selector-entry.c:2756
 #, c-format
 msgid "Cop_y %s"
 msgstr "Ð_ÐÐÐÑÐÐÐÑÑ %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2729
+#: ../libedataserverui/e-name-selector-entry.c:2766
 #, c-format
 msgid "C_ut %s"
 msgstr "Ð_ÑÑÐÐÐÑÑ %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2746
+#: ../libedataserverui/e-name-selector-entry.c:2783
 #, c-format
 msgid "_Edit %s"
 msgstr "_ÐÑÐÐÐÐ %s"



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