[evolution-data-server] Updated Bulgarian translation



commit 97cec16577fd8f413f53a2a8713301da01681e27
Author: Alexander Shopov <ash kambanaria org>
Date:   Mon Aug 22 00:07:52 2011 +0300

    Updated Bulgarian translation

 po/bg.po | 3324 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 1658 insertions(+), 1666 deletions(-)
---
diff --git a/po/bg.po b/po/bg.po
index a1b4648..0cea65a 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-30 00:41+0300\n"
-"PO-Revision-Date: 2011-03-30 00:41+0300\n"
+"POT-Creation-Date: 2011-08-19 19:53+0300\n"
+"PO-Revision-Date: 2011-08-19 19:53+0300\n"
 "Last-Translator: Alexander Shopov <ash kambanaria org>\n"
 "Language-Team: Bulgarian <dict fsa-bg org>\n"
 "Language: bg\n"
@@ -23,134 +23,124 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:570
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
+#: ../addressbook/backends/file/e-book-backend-file.c:823
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
 msgid "Loading..."
 msgstr "ÐÐÑÐÐÐÐÐÐâ"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:573
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4506
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
+#: ../addressbook/backends/file/e-book-backend-file.c: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:589
+#: ../addressbook/backends/google/e-book-backend-google.c:788
 msgid "Querying for updated contactsâ"
 msgstr "ÐÑÐÐÐÑÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:624
+#: ../addressbook/backends/google/e-book-backend-google.c:839
+#: ../addressbook/libebook/e-book.c:3483 ../calendar/libecal/e-cal.c:1318
+#: ../libedataserver/e-client.c:1851
 msgid "Personal"
 msgstr "ÐÐÑÐÐ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:626
+#: ../addressbook/backends/google/e-book-backend-google.c:841
 msgid "Friends"
 msgstr "ÐÑÐÑÑÐÐÐ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:628
+#: ../addressbook/backends/google/e-book-backend-google.c:843
 msgid "Family"
 msgstr "ÐÐÐÐÐÑÑÐÐ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:630
+#: ../addressbook/backends/google/e-book-backend-google.c:845
 msgid "Coworkers"
 msgstr "ÐÐÐÐÐÐ"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:707
+#: ../addressbook/backends/google/e-book-backend-google.c:924
 msgid "Querying for updated groupsâ"
 msgstr "ÐÑÐÐÐÑÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐ ÐÑÑÐÐâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:891
+#. 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:984
+#: ../addressbook/backends/google/e-book-backend-google.c:1433
 msgid "Deleting contactâ"
 msgstr "ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÑâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1092
+#. 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:1199
+#: ../addressbook/backends/google/e-book-backend-google.c:1892
 msgid "Loadingâ"
 msgstr "ÐÐÑÐÐÐÐÐÐâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1346
+#: ../addressbook/backends/google/e-book-backend-google.c:2047
 msgid "Authenticating with the serverâ"
 msgstr "ÐÐÐÐÑÐÑÐÑÐÑÐÐÐ ÐÑÐÐ ÑÑÑÐÑÑÐâ"
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2699
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4665
-#, c-format
-msgid "Downloading contacts (%d)... "
-msgstr "ÐÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÑÐÐÑÐ (%d)â"
-
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2849
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3030
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3077
-#, c-format
-msgid "Updating contacts cache (%d)... "
-msgstr "ÐÐÑÐÑÐÑÐÐÐÐ ÐÐ ÐÐÑÐ Ñ ÐÐÐÑÐÐÑÐ (%d)â"
-
 #. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
 msgid "Not connected"
 msgstr "ÐÑÐÐ ÐÑÑÐÐÐ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:764
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:776
 msgid "Using Distinguished Name (DN)"
 msgstr "ÐÑÐÐ ÐÑÐÐÑÐÑÐÐÐÐ ÐÐÐ (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:767
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:779
 msgid "Using Email Address"
 msgstr "ÐÑÐÐ Ð-ÐÐÑÐ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1033
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1048
 msgid "Reconnecting to LDAP server..."
 msgstr "ÐÐÐÑÐÑÐÐ ÑÐÑÑÐÐÐÐÐ ÑÑÑ ÑÑÑÐÑÑÐ ÐÐ LDAPâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1158
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1173
 msgid "Invalid DN syntax"
 msgstr "ÐÑÐÑÐÐ ÑÐÐÑÐÐÑÐÑ ÐÐ DN"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1675
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1688
 msgid "Adding contact to LDAP server..."
 msgstr "ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÐÑÐÐÑ ÐÐ ÑÑÑÐÑÑÐ ÐÐ LDAPâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1807
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1818
 msgid "Removing contact from LDAP server..."
 msgstr "ÐÑÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÑÐÐÑ ÐÑ ÑÑÑÐÑÑÐ ÐÐ LDAPâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2243
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2250
 msgid "Modifying contact from LDAP server..."
 msgstr "ÐÑÐÐÑÐÐ ÐÐ ÐÐÐÑÐÐÑ Ð ÑÑÑÐÑÑÐ ÐÐ LDAPâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4356
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4559
 msgid "Receiving LDAP search results..."
 msgstr "ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÑÐÐÑÐÑÐÑÐÑÐ ÐÑ ÑÑÑÑÐÐÐÑÐ Ð LDAPâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4528
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4729
 msgid "Error performing search"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÐÐÐÐÐÐÑÐ ÐÐ ÑÑÑÑÐÐÐÑÐ"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:273
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:881
-#: ../addressbook/libedata-book/e-data-book.c:441
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:523
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:552
-#: ../calendar/backends/http/e-cal-backend-http.c:435
-#: ../calendar/libecal/e-cal.c:4177
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:160
-#: ../camel/providers/imap/camel-imap-command.c:481
-#: ../camel/providers/imap/camel-imap-store.c:425
-#: ../camel/providers/pop3/camel-pop3-store.c:495
-#: ../camel/providers/smtp/camel-smtp-transport.c:497
-#: ../servers/groupwise/e-gw-connection.c:243
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4849
+#, c-format
+msgid "Downloading contacts (%d)... "
+msgstr "ÐÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÑÐÐÑÐ (%d)â"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:274
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:880
+#: ../addressbook/libedata-book/e-data-book.c: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:4420
+#: ../camel/providers/imap/camel-imap-command.c:484
+#: ../camel/providers/imap/camel-imap-store.c:409
+#: ../camel/providers/imapx/camel-imapx-server.c:2246
+#: ../camel/providers/smtp/camel-smtp-transport.c:439
 msgid "Unknown error"
 msgstr "ÐÐÐÐÐÐÑÑÐÐ ÐÑÐÑÐÐ"
 
@@ -159,28 +149,120 @@ msgstr "ÐÐÐÐÐÐÑÑÐÐ ÐÑÐÑÐÐ"
 msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÑÐÑÑÑÑ â%sâ Ñ ÐÐÐ ÐÑ HTTP: %d (%s)"
 
-#: ../addressbook/libebook/e-book.c:3160
+#: ../addressbook/libebook/e-book.c:3158
 #, c-format
 msgid "%s: there was no source for UID '%s' stored in GConf."
-msgstr ""
-"%s: ÐÐ ÑÑÑÐÑÑÐÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÑÐÐÐÑÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ â%sâ Ð GConf."
+msgstr "%s: ÐÐ ÑÑÑÐÑÑÐÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ â%sâ Ð GConf."
+
+#: ../addressbook/libebook/e-book.c:3466 ../calendar/libecal/e-cal.c:1298
+#: ../libedataserver/e-client.c:1846
+msgid "On This Computer"
+msgstr "ÐÐ ÑÐÐÐ ÐÐÐÐÑÑÑÑ"
 
-#: ../addressbook/libebook/e-book.c:3516
-#: ../addressbook/libedata-book/e-data-book.c:183
+#: ../addressbook/libebook/e-book.c:3592
+#: ../addressbook/libebook/e-book-client.c:634
+#: ../addressbook/libedata-book/e-data-book.c:310
 msgid "Address book does not exist"
 msgstr "ÐÐÑÐÑÐÐÐÑÑ ÐÐ ÑÑÑÐÑÑÐÑÐÐ"
 
+#: ../addressbook/libebook/e-book-client.c:85
+msgctxt "BookClientError"
+msgid "No such book"
+msgstr "ÐÑÐÐ ÑÐÐÑÐ ÐÐÑÐÑÐÐÐ"
+
+#: ../addressbook/libebook/e-book-client.c:87
+msgctxt "BookClientError"
+msgid "Contact not found"
+msgstr "ÐÐÐÑÐÐÑÑÑ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÐÐÑÐÐ"
+
+#: ../addressbook/libebook/e-book-client.c:89
+msgctxt "BookClientError"
+msgid "Contact ID already exists"
+msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑÑÑ ÐÐ ÐÐÐÑÐÐÑÐ ÐÐÑÐ ÑÑÑÐÑÑÐÑÐÐ"
+
+#: ../addressbook/libebook/e-book-client.c:91
+msgctxt "BookClientError"
+msgid "No such source"
+msgstr "ÐÑÐÐ ÑÐÐÑÐ ÐÐÑÐÑÐÐÐ"
+
+#: ../addressbook/libebook/e-book-client.c:93
+msgctxt "BookClientError"
+msgid "No space"
+msgstr "ÐÑÑÑÐÑÐ ÑÐÑÑÑÐ"
+
+#: ../addressbook/libebook/e-book-client.c:96
+msgctxt "BookClientError"
+msgid "Unknown error"
+msgstr "ÐÐÐÐÐÐÑÑÐÐ ÐÑÐÑÐÐ"
+
+#: ../addressbook/libebook/e-book-client.c:168
+msgid "D-Bus book proxy gone"
+msgstr "ÐÐÑÑÐÐÐÐÐÑÑ ÐÐ D-Bus ÐÐ ÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐÐÐ"
+
+#: ../addressbook/libebook/e-book-client.c:448
+msgid "Failed to run book factory"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÑÑÐÑÑÐÑÐÐÐ"
+
+#: ../addressbook/libebook/e-book-client.c:458
+#: ../addressbook/libedata-book/e-data-book-factory.c:375
+#: ../addressbook/libedata-book/e-data-book-factory.c:433
+#: ../calendar/libecal/e-cal-client.c:564
+#: ../calendar/libedata-cal/e-data-cal-factory.c:395
+#, c-format
+msgid "Invalid source"
+msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ"
+
+#: ../addressbook/libebook/e-book-client.c:559
+#: ../calendar/libecal/e-cal-client.c:677
+#, c-format
+msgid "Incorrect uri '%s'"
+msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑ â%sâ"
+
+#: ../addressbook/libebook/e-book-client.c:597
+msgid "Failed to find system book"
+msgstr "ÐÐÑÑÐÐÐÐÑÑ ÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÑÐÑÐÑ"
+
+#: ../addressbook/libebook/e-book-client.c:704
+#: ../calendar/libecal/e-cal-client.c:825
+#, c-format
+msgid "There was no source for UID '%s' stored in a source list."
+msgstr "ÐÐ ÑÑÑÐÑÑÐÑÐÐ ÐÐÑÐÑÐÐÐ Ñ ÐÐÐÐÑÐÑÐÐÐÑÐÑ â%sâ Ð ÑÐÐÑÑÐÐ Ñ ÐÐÑÐÑÐÐÑÐ."
+
+#: ../addressbook/libebook/e-book-client.c:2093
+#: ../calendar/libecal/e-cal-client.c:4091
+msgid "Cannot get connection to view"
+msgstr "ÐÑÐÐ ÐÑÑÐÐÐ ÐÑÐ ÐÐÐÐÐÐ"
+
+#: ../addressbook/libebook/e-book-client-view.c:218
+#: ../calendar/libecal/e-cal-client-view.c:456
+msgid "Cannot start view, D-Bus proxy gone"
+msgstr "ÐÐÐÐÐÐÑÑ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÐÐÐÐÐ, ÐÐÑÑÐÐÐÐÐÑÑ ÐÐ D-Bus ÐÐÑÐÐÐÐ"
+
+#: ../addressbook/libebook/e-book-client-view.c:247
+#: ../calendar/libecal/e-cal-client-view.c:485
+msgid "Cannot stop view, D-Bus proxy gone"
+msgstr "ÐÐÐÐÐÐÑÑ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÑÐÑÐÑ, ÐÐÑÑÐÐÐÐÐÑÑ ÐÐ D-Bus ÐÐÑÐÐÐÐ"
+
+#: ../addressbook/libebook/e-book-client-view.c:288
+#: ../calendar/libecal/e-cal-client-view.c:526
+msgid "Cannot set fields of interest, D-Bus proxy gone"
+msgstr ""
+"ÐÐÑÐÑÐÑÑÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÐÑÐÐÑ ÐÐÐÐÐÐÐÐ, ÐÐÑÑÐÐÐÐÐÑÑ ÐÐ D-Bus "
+"ÐÐÑÐÐÐÐ"
+
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:115
+#: ../addressbook/libebook/e-contact.c:116
 msgid "Unique ID"
 msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:116
+#. FILE_AS is not really a structured field - we use a getter/setter
+#. so we can generate its value if necessary in the getter
+#: ../addressbook/libebook/e-contact.c:119
 msgid "File Under"
 msgstr "ÐÐÐÐÑÐÐÐÐ Ð"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:118
+#: ../addressbook/libebook/e-contact.c:121
 msgid "Book URI"
 msgstr "ÐÐÑÐÑ ÐÐ ÐÐÐÐÐÑÐ"
 
@@ -188,751 +270,760 @@ msgstr "ÐÐÑÐÑ ÐÐ ÐÐÐÐÐÑÐ"
 #. FN isn't really a structured field - we use a getter/setter
 #. so we can set the N property (since evo 1.4 works fine with
 #. vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:127
 msgid "Full Name"
 msgstr "ÐÑÐÐÐ ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:128
 msgid "Given Name"
 msgstr "ÐÐÐÑÑÐÐÐÐ ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:126
+#: ../addressbook/libebook/e-contact.c:129
 msgid "Family Name"
 msgstr "ÐÐÐÐÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:127
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Nickname"
 msgstr "ÐÑÑÐÐÑ"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 1"
 msgstr "Ð-ÐÐÑÐ 1"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Email 2"
 msgstr "Ð-ÐÐÑÐ 2"
 
-#: ../addressbook/libebook/e-contact.c:132
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Email 3"
 msgstr "Ð-ÐÐÑÐ 3"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:136
 msgid "Email 4"
 msgstr "Ð-ÐÐÑÐ 4"
 
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Mailer"
 msgstr "ÐÐÑÐÐÑÐÐ ÐÑÐÐÑÐÐÐ"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:141
 msgid "Home Address Label"
 msgstr "ÐÑÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐÑ ÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:139
+#: ../addressbook/libebook/e-contact.c:142
 msgid "Work Address Label"
 msgstr "ÐÑÐÐÐÑ ÐÐ ÑÐÐÐÑÐÐÑ ÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:140
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Other Address Label"
 msgstr "ÐÑÐÐÐÑ ÐÐ ÐÑÑÐ ÐÐÑÐÑ"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Assistant Phone"
 msgstr "ÐÐÐÐÑÐÐ ÐÐ ÐÑÐÑÑÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Business Phone"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Business Phone 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÐÐ 2"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Business Fax"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Callback Phone"
 msgstr "ÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÑÐÐ ÐÑÑÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Car Phone"
 msgstr "ÐÐÐÐÑÐÐ Ð ÐÐÑÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Company Phone"
 msgstr "ÐÐÐÐÑÐÐ ÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Home Phone"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Home Phone 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÐÐ 2"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Home Fax"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:156
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Mobile Phone"
 msgstr "ÐÐÐÐÐÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Other Phone"
 msgstr "ÐÑÑÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Other Fax"
 msgstr "ÐÑÑÐ ÑÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Pager"
 msgstr "ÐÐÐÐÐÑÑ"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:161
 msgid "Primary Phone"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:162
 msgid "Radio"
 msgstr "ÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:163
 msgid "Telex"
 msgstr "ÐÐÐÐÐÑ"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:162
+#: ../addressbook/libebook/e-contact.c:165
 msgid "TTY"
 msgstr "ÐÐÐÐÑÐÐ"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Organization"
 msgstr "ÐÑÐÐÐÐÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Organizational Unit"
 msgstr "ÐÑÐÐÐÐÐÐÑÐÐÐÐÐ ÐÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Office"
 msgstr "ÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Title"
 msgstr "ÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:172
 msgid "Role"
 msgstr "ÐÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook/e-contact.c:173
 msgid "Manager"
 msgstr "ÐÑÐÐÐÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:171
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Assistant"
 msgstr "ÐÑÐÑÑÐÐÑ"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:174
+#: ../addressbook/libebook/e-contact.c:177
 msgid "Homepage URL"
 msgstr "ÐÐÑÐÑ ÐÐ ÐÐÐÐÑÐÐÑÐ ÑÑÑÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:175
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Weblog URL"
 msgstr "ÐÐÑÐÑ ÐÐ ÐÐÐÐ"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:757
+#: ../addressbook/libebook/e-contact.c:181
+#: ../libedataserverui/e-categories-dialog.c:85
 msgid "Categories"
 msgstr "ÐÐÑÐÐÐÑÐÐ"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Calendar URI"
 msgstr "ÐÐÑÐÑ ÐÐ ÐÐÐÐÐÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Free/Busy URL"
 msgstr "ÐÐÑÐÑ ÐÐ ÑÑÑÑÐÑÐÐÐ ÑÐÐÐÐÐÐÐ/ÐÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:183
+#: ../addressbook/libebook/e-contact.c:186
 msgid "ICS Calendar"
 msgstr "ÐÐÐÐÐÐÐÑ ICS"
 
-#: ../addressbook/libebook/e-contact.c:184
+#: ../addressbook/libebook/e-contact.c:187
 msgid "Video Conferencing URL"
 msgstr "ÐÐÑÐÑ ÐÐ ÐÐÐÐÐÐÐÐÑÐÑÐÐÑÐÐ ÐÑÑÐÐÐ"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:187
+#: ../addressbook/libebook/e-contact.c:190
 msgid "Spouse's Name"
 msgstr "ÐÐÐ ÐÐ ÑÑÐÑÑÐ(Ð)"
 
-#: ../addressbook/libebook/e-contact.c:188
+#: ../addressbook/libebook/e-contact.c:191
 msgid "Note"
 msgstr "ÐÐÐÐÐÐÐ"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:194
 msgid "AIM Home Screen Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ AIM 1"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Home Screen Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ AIM 2"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Home Screen Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ AIM 3"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:197
 msgid "AIM Work Screen Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ AIM 1"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:198
 msgid "AIM Work Screen Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ AIM 2"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:199
 msgid "AIM Work Screen Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ AIM 3"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:200
 msgid "GroupWise Home Screen Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ GroupWise 1"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Home Screen Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ GroupWise 2"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Home Screen Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ GroupWise 3"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:203
 msgid "GroupWise Work Screen Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ GroupWise 1"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:204
 msgid "GroupWise Work Screen Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ GroupWise 2"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:205
 msgid "GroupWise Work Screen Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ GroupWise 3"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:206
 msgid "Jabber Home ID 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Jabber 1"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:207
 msgid "Jabber Home ID 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Jabber 2"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:208
 msgid "Jabber Home ID 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Jabber 3"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:209
 msgid "Jabber Work ID 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Jabber 1"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Jabber Work ID 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Jabber 2"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Jabber Work ID 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Jabber 3"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Home Screen Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Yahoo! 1"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Home Screen Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Yahoo! 2"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Home Screen Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Yahoo! 3"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:215
 msgid "Yahoo! Work Screen Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Yahoo! 1"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:216
 msgid "Yahoo! Work Screen Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Yahoo! 2"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Yahoo! Work Screen Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Yahoo! 3"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:218
 msgid "MSN Home Screen Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ MSN 1"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Home Screen Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ MSN 2"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Home Screen Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ MSN 3"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:221
 msgid "MSN Work Screen Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ MSN 1"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:222
 msgid "MSN Work Screen Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ MSN 2"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:223
 msgid "MSN Work Screen Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ MSN 3"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:224
 msgid "ICQ Home ID 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ ICQ 1"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:225
 msgid "ICQ Home ID 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ ICQ 2"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:226
 msgid "ICQ Home ID 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ ICQ 3"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:227
 msgid "ICQ Work ID 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ ICQ 1"
 
-#: ../addressbook/libebook/e-contact.c:225
+#: ../addressbook/libebook/e-contact.c:228
 msgid "ICQ Work ID 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ ICQ 2"
 
-#: ../addressbook/libebook/e-contact.c:226
+#: ../addressbook/libebook/e-contact.c:229
 msgid "ICQ Work ID 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ ICQ 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook/e-contact.c:232
 msgid "Last Revision"
 msgstr "ÐÐÑÐÐÐÐÐ ÑÐÐÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:230
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Name or Org"
 msgstr "ÐÐÐ ÐÐÐ ÐÑÐ."
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:236
 msgid "Address List"
 msgstr "ÐÐÐÑÑÐ Ñ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:237
 msgid "Home Address"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:235
+#: ../addressbook/libebook/e-contact.c:238
 msgid "Work Address"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:236
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Other Address"
 msgstr "ÐÑÑÐ ÐÐÑÐÑ"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:239
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Category List"
 msgstr "ÐÐÐÑÑÐ Ñ ÐÐÑÐÐÐÑÐÐ"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:242
+#: ../addressbook/libebook/e-contact.c:245
 msgid "Photo"
 msgstr "ÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Logo"
 msgstr "ÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:245
+#: ../addressbook/libebook/e-contact.c:248
 msgid "Name"
 msgstr "ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:246
+#: ../addressbook/libebook/e-contact.c:249
 msgid "Email List"
 msgstr "ÐÐÐÑÑÐ Ñ ÐÐÑÐÑÐ ÐÐ Ð-ÐÐÑÐ"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:252
 msgid "AIM Screen Name List"
 msgstr "ÐÐÐÑÑÐ ÐÐ ÑÐÐÐÑÑÑÐÑÐÐÑÐ ÐÑÐ AIM"
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:253
 msgid "GroupWise ID List"
 msgstr "ÐÐÐÑÑÐ ÐÐ ÑÐÐÐÑÑÑÐÑÐÐÑÐ ÐÑÐ GroupWise"
 
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:254
 msgid "Jabber ID List"
 msgstr "ÐÐÐÑÑÐ ÐÐ ÑÐÐÐÑÑÑÐÑÐÐÑÐ ÐÑÐ Jabber"
 
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:255
 msgid "Yahoo! Screen Name List"
 msgstr "ÐÐÐÑÑÐ ÐÐ ÑÐÐÐÑÑÑÐÑÐÐÑÐ ÐÑÐ Yahoo!"
 
-#: ../addressbook/libebook/e-contact.c:253
+#: ../addressbook/libebook/e-contact.c:256
 msgid "MSN Screen Name List"
 msgstr "ÐÐÐÑÑÐ ÐÐ ÑÐÐÐÑÑÑÐÑÐÐÑÐ ÐÑÐ MSN"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:257
 msgid "ICQ ID List"
 msgstr "ÐÐÐÑÑÐ ÐÐ ÑÐÐÐÑÑÑÐÑÐÐÑÐ ÐÑÐ ICQ"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:259
 msgid "Wants HTML Mail"
 msgstr "ÐÐÐÐÐ ÐÐÑÐ ÐÑÐ ÑÐÑÐÐÑ HTML"
 
-#: ../addressbook/libebook/e-contact.c:258
+#: ../addressbook/libebook/e-contact.c:261
 msgid "List"
 msgstr "ÐÐÐÑÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:262
 msgid "List Show Addresses"
 msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÐ ÑÐÐÑÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:261
+#: ../addressbook/libebook/e-contact.c:264
 msgid "Birth Date"
 msgstr "ÐÐÑÐ ÐÐ ÑÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:262
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
+#: ../addressbook/libebook/e-contact.c:265
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:721
 msgid "Anniversary"
 msgstr "ÐÐÐÐÑÐÐÐÐ"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:265
+#: ../addressbook/libebook/e-contact.c:268
 msgid "X.509 Certificate"
 msgstr "ÐÐÑÑÐÑÐÐÐÑ X.509"
 
-#: ../addressbook/libebook/e-contact.c:267
+#: ../addressbook/libebook/e-contact.c:270
 msgid "Gadu-Gadu Home ID 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Gadu-Gadu 1"
 
-#: ../addressbook/libebook/e-contact.c:268
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Gadu-Gadu Home ID 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Gadu-Gadu 2"
 
-#: ../addressbook/libebook/e-contact.c:269
+#: ../addressbook/libebook/e-contact.c:272
 msgid "Gadu-Gadu Home ID 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Gadu-Gadu 3"
 
-#: ../addressbook/libebook/e-contact.c:270
+#: ../addressbook/libebook/e-contact.c:273
 msgid "Gadu-Gadu Work ID 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Gadu-Gadu 1"
 
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook/e-contact.c:274
 msgid "Gadu-Gadu Work ID 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Gadu-Gadu 2"
 
-#: ../addressbook/libebook/e-contact.c:272
+#: ../addressbook/libebook/e-contact.c:275
 msgid "Gadu-Gadu Work ID 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Gadu-Gadu 3"
 
-#: ../addressbook/libebook/e-contact.c:273
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Gadu-Gadu ID List"
 msgstr "ÐÐÐÑÑÐ Ñ ÑÐÐÐÑÑÑÐÑÐÐ ÐÑÐ Gadu-Gadu"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:279
 msgid "Geographic Information"
 msgstr "ÐÐÐÐÑÐÑÑÐÐ ÐÐÑÐÑÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Telephone"
 msgstr "ÐÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Home Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Skype 1"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Home Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Skype 2"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Home Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Skype 3"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Work Name 1"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Skype 1"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:287
 msgid "Skype Work Name 2"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Skype 2"
 
-#: ../addressbook/libebook/e-contact.c:285
+#: ../addressbook/libebook/e-contact.c:288
 msgid "Skype Work Name 3"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÑÑÑÐÑÐÑ ÐÑÐ Skype 3"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:289
 msgid "Skype Name List"
 msgstr "ÐÐÐÑÑÐ ÐÐ ÑÐÐÐÑÑÑÐÑÐÐÑÐ ÐÑÐ Skype"
 
-#: ../addressbook/libebook/e-contact.c:288
+#: ../addressbook/libebook/e-contact.c:291
 msgid "SIP address"
 msgstr "ÐÐÑÐÑ ÐÐ SIP"
 
-#: ../addressbook/libebook/e-contact.c:1517
-#: ../addressbook/libebook/e-destination.c:739
+#: ../addressbook/libebook/e-contact.c:1542
+#: ../addressbook/libebook/e-destination.c:868
 msgid "Unnamed List"
 msgstr "ÐÐÐÑÑÐ ÐÐÐ ÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:301
-#: ../addressbook/libedata-book/e-data-book-factory.c:334
-#: ../calendar/libedata-cal/e-data-cal-factory.c:362
+#: ../addressbook/libedata-book/e-book-backend.c:19
+msgid "Cannot process, book backend is opening"
+msgstr ""
+"ÐÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÑÐÐÐÑÐ, ÑÐÑÐÑÐ ÐÐ ÐÐÑÐÑÐÐÐÐ ÑÐÐÑÑÐÐ ÑÐ ÐÐÐÐÐÑÑÐÐ"
+
+#: ../addressbook/libedata-book/e-book-backend.c:92
 #, c-format
-msgid "Empty URI"
-msgstr "ÐÑÐÐÐÐ ÐÐÑÐÑ"
+msgid "Unknown book property '%s'"
+msgstr "ÐÐÐÐÐÐÐÑÐ ÑÐÐÐÑÑÐÐ ÐÐ ÐÐÑÐÑÐÐÐ: %s"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:320
-#: ../addressbook/libedata-book/e-data-book-factory.c:370
-#: ../calendar/libedata-cal/e-data-cal-factory.c:350
+#: ../addressbook/libedata-book/e-book-backend.c:104
 #, c-format
-msgid "Invalid source"
-msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ"
+msgid "Cannot change value of book property '%s'"
+msgstr "ÐÐÐÐÑÑÐÐÑÐ â%sâ ÐÐ ÐÐÑÐÑÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÑÐÐÐÐÐÐÐ"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:463
+#: ../camel/camel-db.c:470
+#, c-format
+msgid "Insufficient memory"
+msgstr "ÐÐÐÐÑÑÐÑÑÑÐÐ ÐÐÐÐÑ"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:196
+#: ../addressbook/libedata-book/e-data-book.c:209
+#: ../addressbook/libedata-book/e-data-book.c:694
+msgid "Invalid query: "
+msgstr "ÐÑÐÑÐÐ ÐÐÑÐÐÐ: "
 
-#: ../addressbook/libedata-book/e-data-book.c:173
-#: ../calendar/libedata-cal/e-data-cal.c:108
+#: ../addressbook/libedata-book/e-data-book.c:299
+#: ../calendar/libedata-cal/e-data-cal.c:414
 msgid "Success"
 msgstr "ÐÑÐÐÑ"
 
-#: ../addressbook/libedata-book/e-data-book.c:174
-#: ../calendar/libedata-cal/e-data-cal.c:109
+#: ../addressbook/libedata-book/e-data-book.c:300
+#: ../calendar/libecal/e-cal.c:4388 ../calendar/libedata-cal/e-data-cal.c:415
+msgid "Backend is busy"
+msgstr "ÐÐÑÐÑÐ ÐÐ ÐÐÑÐÐÐÑÐÐ Ð ÐÐÐÑÐ"
+
+#: ../addressbook/libedata-book/e-data-book.c:301
+#: ../calendar/libedata-cal/e-data-cal.c:416
 msgid "Repository offline"
 msgstr "ÐÑÐÐÐÐÐÑÐÑÐ ÐÐ Ð ÐÐÐÐÑÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:175
-#: ../calendar/libecal/e-cal.c:4159 ../calendar/libedata-cal/e-data-cal.c:110
+#: ../addressbook/libedata-book/e-data-book.c:302
+#: ../calendar/libecal/e-cal.c:4402 ../calendar/libedata-cal/e-data-cal.c:417
 msgid "Permission denied"
 msgstr "ÐÐÑÑÑÐÑÑ Ð ÐÑÐÐÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:176
+#: ../addressbook/libedata-book/e-data-book.c:303
 msgid "Contact not found"
 msgstr "ÐÐÐÑÐÐÑÑÑ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:177
+#: ../addressbook/libedata-book/e-data-book.c:304
 msgid "Contact ID already exists"
 msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑÑÑ ÐÐ ÐÐÐÑÐÐÑÐ ÐÐÑÐ ÑÑÑÐÑÑÐÑÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:178
-#: ../calendar/libedata-cal/e-data-cal.c:115
+#: ../addressbook/libedata-book/e-data-book.c:305
+#: ../calendar/libedata-cal/e-data-cal.c:422
 msgid "Authentication Failed"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:179
-#: ../calendar/libedata-cal/e-data-cal.c:116
+#: ../addressbook/libedata-book/e-data-book.c:306
+#: ../calendar/libedata-cal/e-data-cal.c:423
 msgid "Authentication Required"
 msgstr "ÐÐÐÑÐÐÐ ÑÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:180
-#: ../calendar/libedata-cal/e-data-cal.c:117
+#: ../addressbook/libedata-book/e-data-book.c:307
+#: ../calendar/libedata-cal/e-data-cal.c:424
 msgid "Unsupported field"
 msgstr "ÐÐÐÐÐÐÑÑÐÐÐÐ ÐÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:181
-#: ../calendar/libedata-cal/e-data-cal.c:119
+#: ../addressbook/libedata-book/e-data-book.c:308
+#: ../calendar/libedata-cal/e-data-cal.c:426
 msgid "Unsupported authentication method"
 msgstr "ÐÐÐÐÐÐÑÑÐÐÐ ÐÐÑÐÐ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:182
-#: ../calendar/libedata-cal/e-data-cal.c:120
+#: ../addressbook/libedata-book/e-data-book.c:309
+#: ../calendar/libedata-cal/e-data-cal.c:427
 msgid "TLS not available"
 msgstr "ÐÐÐÑÐÐ TLS"
 
-#: ../addressbook/libedata-book/e-data-book.c:184
+#: ../addressbook/libedata-book/e-data-book.c:311
 msgid "Book removed"
 msgstr "ÐÐÑÐÑÐÐÐÑÑ Ð ÐÐÑÑÐÑ"
 
-#: ../addressbook/libedata-book/e-data-book.c:185
-#: ../calendar/libedata-cal/e-data-cal.c:123
+#: ../addressbook/libedata-book/e-data-book.c:312
+#: ../calendar/libedata-cal/e-data-cal.c:430
 msgid "Not available in offline mode"
 msgstr "ÐÐ Ð ÐÐÐÐÑÐÐ Ð ÑÐÐÐÐ âÐÐÐÐÑÑÐÐâ."
 
-#: ../addressbook/libedata-book/e-data-book.c:186
-#: ../calendar/libedata-cal/e-data-cal.c:124
+#: ../addressbook/libedata-book/e-data-book.c:313
+#: ../calendar/libedata-cal/e-data-cal.c:431
 msgid "Search size limit exceeded"
 msgstr "ÐÐÐÑÐÐÐÐÐÐÑÑ ÑÐÐÐÐÑ ÐÐ ÑÑÑÑÐÐÐ Ð ÐÐÐÐÐÑÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:187
-#: ../calendar/libedata-cal/e-data-cal.c:125
+#: ../addressbook/libedata-book/e-data-book.c:314
+#: ../calendar/libedata-cal/e-data-cal.c:432
 msgid "Search time limit exceeded"
 msgstr "ÐÐÐÑÐÐÐÐÐÐÑÐ ÐÑÐÐÐ ÐÐ ÑÑÑÑÐÐÐ Ð ÐÐÐÐÐÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:188
-#: ../calendar/libedata-cal/e-data-cal.c:126
+#: ../addressbook/libedata-book/e-data-book.c:315
+#: ../calendar/libedata-cal/e-data-cal.c:433
 msgid "Invalid query"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:189
-#: ../calendar/libedata-cal/e-data-cal.c:127
+#: ../addressbook/libedata-book/e-data-book.c:316
+#: ../calendar/libedata-cal/e-data-cal.c:434
 msgid "Query refused"
 msgstr "ÐÐÑÐÐÐÑÐ Ð ÐÑÐÐÐÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:190
-#: ../calendar/libedata-cal/e-data-cal.c:128
+#: ../addressbook/libedata-book/e-data-book.c:317
+#: ../calendar/libedata-cal/e-data-cal.c:435
 msgid "Could not cancel"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÑÐÐ"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
 #. { OtherError,			N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:192
-#: ../calendar/libedata-cal/e-data-cal.c:130
+#: ../addressbook/libedata-book/e-data-book.c:319
+#: ../calendar/libedata-cal/e-data-cal.c:437
 msgid "Invalid server version"
 msgstr "ÐÑÐÑÐÐ ÐÐÑÑÐÑ ÐÐ ÑÑÑÐÑÑÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:193
+#: ../addressbook/libedata-book/e-data-book.c:320
 msgid "No space"
 msgstr "ÐÑÑÑÐÑÐ ÑÐÑÑÑÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:194
-#: ../calendar/libecal/e-cal.c:4143 ../calendar/libedata-cal/e-data-cal.c:131
+#: ../addressbook/libedata-book/e-data-book.c:321
+#: ../calendar/libecal/e-cal.c:4386 ../calendar/libedata-cal/e-data-cal.c:438
 msgid "Invalid argument"
 msgstr "ÐÑÐÑÐÐ ÐÑÐÑÐÐÐÑ"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:196
-#: ../calendar/libecal/e-cal.c:4182 ../calendar/libedata-cal/e-data-cal.c:133
+#: ../addressbook/libedata-book/e-data-book.c:323
+#: ../calendar/libecal/e-cal.c:4425 ../calendar/libedata-cal/e-data-cal.c:440
 msgid "Not supported"
 msgstr "ÐÐ ÑÐ ÐÐÐÐÑÑÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:204
-#: ../calendar/libedata-cal/e-data-cal.c:141
+#: ../addressbook/libedata-book/e-data-book.c:324
+#: ../calendar/libedata-cal/e-data-cal.c:441
+msgid "Backend is not opened yet"
+msgstr "ÐÐÑÐÑÐ ÐÑÐ ÐÑÐ ÐÐ Ð ÑÑÐÑÑÐÑÐÐÐ"
+
+#: ../addressbook/libedata-book/e-data-book.c:332
+#: ../calendar/libecal/e-cal-client.c:572
+#: ../calendar/libedata-cal/e-data-cal.c:449
 msgid "Other error"
 msgstr "ÐÑÑÐÐ ÐÑÐÑÐÐ"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:325
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c: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: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: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: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: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:779
+msgid "Cannot open book: "
+msgstr "ÐÐÑÐÑÐÐÐÑÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÑÐ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../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:818
+msgid "Cannot refresh address book: "
+msgstr "ÐÐÐÐÐÐÐÑÑÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../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: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:881
+msgid "Cannot get contact list: "
+msgstr "ÐÐÐÑÑÐÑÑ Ñ ÐÐÐÑÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:905
+msgid "Cannot get contact list uids: "
+msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑÑÑ ÐÐ ÑÐÐÑÑÐÐ Ñ ÐÐÐÑÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:969
+msgid "Cannot remove contacts: "
+msgstr "ÐÐÐÑÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÑÐ ÐÑÐÐÐÑÐÐÑ: "
+
+#: ../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 "Cannot open book: %s"
-msgstr "ÐÐÑÐÑÐÐÐÑÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÑÐ: %s"
+msgid "Empty URI"
+msgstr "ÐÑÐÐÐÐ ÐÐÑÐÑ"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:347
-#, c-format
-msgid "Cannot remove book: %s"
-msgstr "ÐÐÑÐÑÐÐÐÑÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÐÑÐÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:364
-#: ../addressbook/libedata-book/e-data-book.c:383
-#, c-format
-msgid "Cannot get contact: %s"
-msgstr "ÐÐÐÑÐÐÑÑÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:402
-#, c-format
-msgid "Empty query: %s"
-msgstr "ÐÑÐÐÐÐ ÐÐÑÐÐÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:418
-#, c-format
-msgid "Cannot get contact list: %s"
-msgstr "ÐÐÐÑÑÐÑÑ Ñ ÐÐÐÑÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:457
-#, c-format
-msgid "Cannot authenticate user: %s"
-msgstr "ÐÐÑÑÐÐÐÑÐÐÑÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÐÑÐÑÐÑÐÑÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:472
-#: ../addressbook/libedata-book/e-data-book.c:491
-#, c-format
-msgid "Cannot add contact: %s"
-msgstr "ÐÐÐÑÐÐÑÑÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:513
-#: ../addressbook/libedata-book/e-data-book.c:532
-#, c-format
-msgid "Cannot modify contact: %s"
-msgstr "ÐÐÐÑÐÐÑÑÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÐÐÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:571
-#, c-format
-msgid "Cannot remove contacts: %s"
-msgstr "ÐÐÐÑÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÑÐ ÐÑÐÐÐÑÐÐÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:610
-#, c-format
-msgid "Cannot get supported fields: %s"
-msgstr "ÐÐÐÐÑÑÐÐÐÐÑÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÑÐ ÐÐÐÑÑÐÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:625
-#, c-format
-msgid "Cannot get required fields: %s"
-msgstr "ÐÐÐÑÐÐÐÑÐÐÐÐÑÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÑÐ ÐÐÐÑÑÐÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:640
-#, c-format
-msgid "Cannot get supported authentication methods: %s"
-msgstr "ÐÐÐÐÑÑÐÐÐÐÑÐ ÐÐÑÐÐÐ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐÑ ÐÐ ÑÐ ÐÐÐÑÑÐÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:666
-#: ../addressbook/libedata-book/e-data-book.c:677
-#, c-format
-msgid "Invalid query: %s"
-msgstr "ÐÑÐÑÐÐ ÐÐÑÐÐÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:713
-#, c-format
-msgid "Cannot get changes: %s"
-msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÑÐ ÐÐÐÑÑÐÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:755
-#, c-format
-msgid "Cancel operation failed: %s"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÑÐÐ ÐÐ ÐÐÐÑÑÐÐÐÑÐ: %s"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:521
+#: ../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:549
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:546
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "ÐÐÐÑÑÐÐ Ð ÐÐÐÑÐÐÐÐÐ ÐÐÐ ÐÐ HTTP ÐÐ ÑÑÑÑÐÑÐÐÐ â %d (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2096
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2496
+#: ../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"
@@ -941,376 +1032,399 @@ msgstr ""
 "ÐÑÑÐÑÑÑÑ Ð ÐÐÐÐÑÑÑÐÐÐ Ð ÐÐÐÐÐÐÐÑÑÑ Ð ÐÑÐÐÑÐÐ Ð ÑÐÐÐÐ ÑÐÐÐ ÐÐ ÑÐÑÐÐÐ.\n"
 "ÐÑÐÐÑÐÐÐÐ ÐÐ ÐÑÐÑÐÐ: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4272
 msgid "Calendar doesn't support Free/Busy"
 msgstr "ÐÐÐÐÐÐÐÑÑÑ ÐÐ ÐÐÐÐÑÑÐÐ ÑÑÑÑÐÑÐÐÑÑÐ âÐÐÐÐÐÐÐÐâ/âÐÐÐÑâ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:725
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
 msgid "Birthday"
 msgstr "ÐÐÑÐ ÐÐ ÑÐÐÐÐÐÐ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:754
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:752
 #, c-format
 msgid "Birthday: %s"
 msgstr "ÐÐÑÐ ÐÐ ÑÐÐÐÐÐÐ: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:778
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:776
 #, c-format
 msgid "Anniversary: %s"
 msgstr "ÐÐÐÐÑÐÐÐÐ: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:251
+#: ../calendar/backends/file/e-cal-backend-file.c:241
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "ÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÐÑÐÐÑ ÐÐÐÐÐÐÐÐ: ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑ."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:258
-#: ../calendar/backends/file/e-cal-backend-file.c:264
+#: ../calendar/backends/file/e-cal-backend-file.c:248
+#: ../calendar/backends/file/e-cal-backend-file.c:254
 msgid "Cannot save calendar data"
 msgstr "ÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÐÑÐÐÑ ÐÐÐÐÐÐÐÐ"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2101
-msgid "Reply Requested: by "
-msgstr "ÐÐÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÑ: ÐÑÐÐÐ "
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2106
-msgid "Reply Requested: When convenient"
-msgstr "ÐÐÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÑ: ÐÐÐÐÑÐ Ð ÑÐÐÐÐÐ"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:329
-msgid "Loading Appointment items"
-msgstr "ÐÐÑÐÐÐÐÐÐ ÐÐ ÑÑÐÑÐÑÐ"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:331
-msgid "Loading Task items"
-msgstr "ÐÐÑÐÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐÑÐ"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:333
-msgid "Loading Note items"
-msgstr "ÐÐÑÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐÐÑÐ"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:335
-msgid "Loading items"
-msgstr "ÐÐÑÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐÐÑÐÐÐÐÐ ÐÐÐÐÑÐ"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:951
-msgid "Calendar"
-msgstr "ÐÐÐÐÐÐÐÑ"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1014
-msgid "Invalid server URI"
-msgstr "ÐÐÑÐÑÑÑ ÐÐ ÑÑÑÐÑÑÐ Ð ÐÐÐÑÐÐÐÐÐÐ"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1115
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1361
-#: ../calendar/backends/http/e-cal-backend-http.c:783
-#: ../calendar/backends/weather/e-cal-backend-weather.c:520
-msgid "Could not create cache file"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐ Ñ ÐÐÑ"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1127
-msgid "Could not create thread for populating cache"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐÐ ÐÐ ÐÑÑÐÐÐÐÑÐÐÐÐ ÐÐÐÑÐÐÐÐÐ ÐÐ ÐÐÑÐ"
-
-#: ../calendar/backends/http/e-cal-backend-http.c:423
+#: ../calendar/backends/http/e-cal-backend-http.c:405
 msgid "Redirected to Invalid URI"
 msgstr "ÐÑÐÐÐÑÐÑÐÐÐ ÐÑÐ ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑ"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:456
+#: ../calendar/backends/http/e-cal-backend-http.c:443
 msgid "Bad file format."
 msgstr "ÐÐÐÐ Ð ÐÐÐÑÐÐÐÐÐÐ ÑÐÑÐÐÑ."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:463
+#: ../calendar/backends/http/e-cal-backend-http.c:450
 msgid "Not a calendar."
 msgstr "ÐÐ Ð ÐÐÐÐÐÐÐÑ."
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:186
+#: ../calendar/backends/http/e-cal-backend-http.c:764
+#: ../calendar/backends/http/e-cal-backend-http.c:765
+#: ../calendar/backends/weather/e-cal-backend-weather.c:513
+msgid "Could not create cache file"
+msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐ Ñ ÐÐÑ"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:183
 msgid "Could not retrieve weather data"
 msgstr "ÐÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÐÑÐÐÑ ÐÐÐÑÑÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:286
+#: ../calendar/backends/weather/e-cal-backend-weather.c:285
 msgid "Weather: Fog"
 msgstr "ÐÑÐÐÐ: ÐÑÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:287
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
 msgid "Weather: Cloudy Night"
 msgstr "ÐÑÐÐÐ: ÐÐÐÐÑÐÐ ÐÐÑÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
 msgid "Weather: Cloudy"
 msgstr "ÐÑÐÐÐ: ÐÐÐÐÑÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:289
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
 msgid "Weather: Overcast"
 msgstr "ÐÑÐÐÐ: ÐÐÑÑÐÐ ÐÐÐÐÑÐÐÑÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:290
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
 msgid "Weather: Showers"
 msgstr "ÐÑÐÐÐ: ÐÐÐÐÐÐ Ñ ÐÑÐÐÑÑÐÐÐÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:291
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
 msgid "Weather: Snow"
 msgstr "ÐÑÐÐÐ: ÑÐÑÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:292
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
 msgid "Weather: Clear Night"
 msgstr "ÐÑÐÐÐ: ÑÑÐÐ ÐÐÑÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:293
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
 msgid "Weather: Sunny"
 msgstr "ÐÑÐÐÐ: ÑÐÑÐÑÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:294
+#: ../calendar/backends/weather/e-cal-backend-weather.c:293
 msgid "Weather: Thunderstorms"
 msgstr "ÐÑÐÐÐ: ÐÑÑÐÐÑÐÐÐÑÐÐ ÐÑÑÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:440
+#: ../calendar/backends/weather/e-cal-backend-weather.c:439
 msgid "Forecast"
 msgstr "ÐÑÐÐÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal-component.c:1299
+#: ../calendar/libecal/e-cal.c:851 ../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â)"
+
+#.
+#. 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:865
+#, c-format
+msgid "Enter password for %s to enable proxy for user %s"
+msgstr ""
+"ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐ ÐÐ %s, ÐÐ ÐÐ ÐÐÐÑÑÐÑÐ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÑÐÐÐÑÐÐÑ â%sâ"
+
+#: ../calendar/libecal/e-cal.c:4390
+msgid "Repository is offline"
+msgstr "ÐÑÐÐÐÐÐÑÐÑÐ ÐÐ Ð ÐÐÑÐÐÐÐ"
+
+#: ../calendar/libecal/e-cal.c:4392
+msgid "No such calendar"
+msgstr "ÐÑÐÐ ÑÐÐÑÐ ÐÐÐÐÐÐÐÑ"
+
+#: ../calendar/libecal/e-cal.c:4394 ../calendar/libedata-cal/e-data-cal.c:419
+msgid "Object not found"
+msgstr "ÐÐÐÐÑÑÑ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÐÐÑÐÐ"
+
+#: ../calendar/libecal/e-cal.c:4396 ../calendar/libedata-cal/e-data-cal.c:420
+msgid "Invalid object"
+msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÑ"
+
+#: ../calendar/libecal/e-cal.c:4398
+msgid "URI not loaded"
+msgstr "ÐÐÑÐÑÑÑ ÐÐ Ð ÐÐÑÐÐÐÐ"
+
+#: ../calendar/libecal/e-cal.c:4400
+msgid "URI already loaded"
+msgstr "ÐÐÑÐÑÑÑ ÐÐÑÐ Ð ÐÐÑÐÐÐÐ"
+
+#: ../calendar/libecal/e-cal.c:4404
+msgid "Unknown User"
+msgstr "ÐÐÐÐÐÐÑÑÐÐ ÐÐÑÑÐÐÐÑÐÐ"
+
+#: ../calendar/libecal/e-cal.c:4406 ../calendar/libedata-cal/e-data-cal.c:421
+msgid "Object ID already exists"
+msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑÑÑ ÐÐ ÐÐÐÐÑÐ ÐÐÑÐ ÑÑÑÐÑÑÐÑÐÐ"
+
+#: ../calendar/libecal/e-cal.c:4408
+msgid "Protocol not supported"
+msgstr "ÐÑÐÑÐÐÐÐÑÑ ÐÐ ÑÐ ÐÐÐÐÑÑÐÐ"
+
+#: ../calendar/libecal/e-cal.c:4410
+msgid "Operation has been canceled"
+msgstr "ÐÑÐÐÐÐÐÐ ÐÐÐÑÑÐÐÐ"
+
+#: ../calendar/libecal/e-cal.c:4412
+msgid "Could not cancel operation"
+msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÑÐÐ ÐÐ ÐÐÐÑÑÐÐÐÑÐ"
+
+#: ../calendar/libecal/e-cal.c:4414
+msgid "Authentication failed"
+msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ"
+
+#: ../calendar/libecal/e-cal.c:4416
+#: ../camel/providers/smtp/camel-smtp-transport.c:756
+msgid "Authentication required"
+msgstr "ÐÐÐÑÐÐÐ ÑÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ"
+
+#: ../calendar/libecal/e-cal.c:4418
+msgid "A D-Bus exception has occurred"
+msgstr "ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÑÐÐÐÐ ÐÐ D-Bus"
+
+#: ../calendar/libecal/e-cal.c:4422
+msgid "No error"
+msgstr "ÐÑÐÐ ÐÑÐÑÐÐ"
+
+#: ../calendar/libecal/e-cal-client.c:127
+msgctxt "CalClientError"
+msgid "No such calendar"
+msgstr "ÐÑÐÐ ÑÐÐÑÐ ÐÐÐÐÐÐÐÑ"
+
+#: ../calendar/libecal/e-cal-client.c:129
+msgctxt "CalClientError"
+msgid "Object not found"
+msgstr "ÐÐÐÐÑÑÑ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÐÐÑÐÐ"
+
+#: ../calendar/libecal/e-cal-client.c:131
+msgctxt "CalClientError"
+msgid "Invalid object"
+msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÑ"
+
+#: ../calendar/libecal/e-cal-client.c:133
+msgctxt "CalClientError"
+msgid "Unknown user"
+msgstr "ÐÐÐÐÐÐÑÑÐÐ ÐÐÑÑÐÐÐÑÐÐ"
+
+#: ../calendar/libecal/e-cal-client.c:135
+msgctxt "CalClientError"
+msgid "Object ID already exists"
+msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑÑÑ ÐÐ ÐÐÐÐÑÐ ÐÐÑÐ ÑÑÑÐÑÑÐÑÐÐ"
+
+#: ../calendar/libecal/e-cal-client.c:137
+msgctxt "CalClientError"
+msgid "Invalid range"
+msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐ"
+
+#: ../calendar/libecal/e-cal-client.c:140
+msgctxt "CalClientError"
+msgid "Unknown error"
+msgstr "ÐÐÐÐÐÐÑÑÐÐ ÐÑÐÑÐÐ"
+
+#: ../calendar/libecal/e-cal-client.c:214
+msgid "D-Bus calendar proxy gone"
+msgstr "ÐÐÑÑÐÐÐÐÐÑÑ ÐÐ D-Bus ÐÐ ÐÐÐÐÐÐÐÑ ÐÐÑÐÐÐÐ"
+
+#: ../calendar/libecal/e-cal-client.c:554
+msgid "Failed to run calendar factory"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÑÑÐÑÑÐÑÐ"
+
+#: ../calendar/libecal/e-cal-client.c:716
+msgid "Failed to find system calendar"
+msgstr "ÐÐÑÑÐÐÐÐÑÑ ÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÑÐÑÐÑ"
+
+#: ../calendar/libecal/e-cal-client.c:754
+#: ../calendar/libedata-cal/e-data-cal.c:428
+msgid "Calendar does not exist"
+msgstr "ÐÐÐÐÐÐÐÑÑÑ ÐÐ ÑÑÑÐÑÑÐÑÐÐ"
+
+#: ../calendar/libecal/e-cal-client.c:864
+msgid "Invalid source type"
+msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐ ÐÐÑÐÑÐÐÐ"
+
+#: ../calendar/libecal/e-cal-component.c:1298
 msgid "Untitled appointment"
 msgstr "ÐÑÐÑÐ ÐÐÐ ÐÐÐÐÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3986
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "1st"
 msgstr "1-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "2nd"
 msgstr "2-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "3rd"
 msgstr "3-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "4th"
 msgstr "4-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "5th"
 msgstr "5-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "6th"
 msgstr "6-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "7th"
 msgstr "7-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "8th"
 msgstr "8-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "9th"
 msgstr "9-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "10th"
 msgstr "10-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "11th"
 msgstr "11-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "12th"
 msgstr "12-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "13th"
 msgstr "13-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "14th"
 msgstr "14-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "15th"
 msgstr "15-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "16th"
 msgstr "16-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "17th"
 msgstr "17-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "18th"
 msgstr "18-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "19th"
 msgstr "19-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "20th"
 msgstr "20-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "21st"
 msgstr "21-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "22nd"
 msgstr "22-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "23rd"
 msgstr "23-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "24th"
 msgstr "24-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4010
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "25th"
 msgstr "25-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4011
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "26th"
 msgstr "26-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4012
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "27th"
 msgstr "27-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4013
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "28th"
 msgstr "28-ÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4014
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "29th"
 msgstr "29-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4015
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "30th"
 msgstr "30-ÑÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:4016
+#: ../calendar/libecal/e-cal-recur.c:4017
 msgid "31st"
 msgstr "31-ÐÐ"
 
-#: ../calendar/libecal/e-cal-util.c:678 ../calendar/libecal/e-cal-util.c:705
+#: ../calendar/libecal/e-cal-util.c:677 ../calendar/libecal/e-cal-util.c:704
+msgctxt "Priority"
 msgid "High"
 msgstr "ÐÐÑÐÐ"
 
-#: ../calendar/libecal/e-cal-util.c:680 ../calendar/libecal/e-cal-util.c:707
+#: ../calendar/libecal/e-cal-util.c:679 ../calendar/libecal/e-cal-util.c:706
+msgctxt "Priority"
 msgid "Normal"
 msgstr "ÐÐÑÐÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal-util.c:682 ../calendar/libecal/e-cal-util.c:709
+#: ../calendar/libecal/e-cal-util.c:681 ../calendar/libecal/e-cal-util.c:708
+msgctxt "Priority"
 msgid "Low"
 msgstr "ÐÐÑÑÐ"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:703
+#: ../calendar/libecal/e-cal-util.c:702
+msgctxt "Priority"
 msgid "Undefined"
 msgstr "ÐÐÐÐÑÐÐÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:1236 ../libedataserverui/e-book-auth-util.c:206
-#: ../libedataserverui/e-book-auth-util.c:440
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐ ÐÐ %s (ÐÐÑÑÐÐÐÑÐÐ â%sâ)"
+#: ../calendar/libedata-cal/e-cal-backend.c:34
+msgid "Cannot process, calendar backend is opening"
+msgstr "ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÑÐÐÐÑÐ, ÑÐÑÐÑÐ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÑÐ ÐÐ Ð ÑÑÐÑÑÐÑÐÐÐ"
 
-#.
-#. This password prompt will be prompted rarely. Since the key that is passed to
-#. the auth_func corresponds to the parent user.
-#.
-#: ../calendar/libecal/e-cal.c:1250
+#: ../calendar/libedata-cal/e-cal-backend.c:207
 #, c-format
-msgid "Enter password for %s to enable proxy for user %s"
-msgstr ""
-"ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐ ÐÐ %s, ÐÐ ÐÐ ÐÐÐÑÑÐÑÐ ÑÑÑÐÑÑÐ-ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÑÐÐÐÑÐÐÑ â%sâ"
-
-#: ../calendar/libecal/e-cal.c:4145
-msgid "Backend is busy"
-msgstr "ÐÐÑÐÑÐ ÐÐ ÐÐÑÐÐÐÑÐÐ Ð ÐÐÐÑÐ"
-
-#: ../calendar/libecal/e-cal.c:4147
-msgid "Repository is offline"
-msgstr "ÐÑÐÐÐÐÐÑÐÑÐ ÐÐ Ð ÐÐÑÐÐÐÐ"
-
-#: ../calendar/libecal/e-cal.c:4149
-msgid "No such calendar"
-msgstr "ÐÑÐÐ ÑÐÐÑÐ ÐÐÐÐÐÐÐÑ"
-
-#: ../calendar/libecal/e-cal.c:4151 ../calendar/libedata-cal/e-data-cal.c:112
-#: ../servers/groupwise/e-gw-connection.c:235
-msgid "Object not found"
-msgstr "ÐÐÐÐÑÑÑ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÐÐÑÐÐ"
-
-#: ../calendar/libecal/e-cal.c:4153 ../calendar/libedata-cal/e-data-cal.c:113
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid object"
-msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÑ"
-
-#: ../calendar/libecal/e-cal.c:4155
-msgid "URI not loaded"
-msgstr "ÐÐÑÐÑÑÑ ÐÐ Ð ÐÐÑÐÐÐÐ"
-
-#: ../calendar/libecal/e-cal.c:4157
-msgid "URI already loaded"
-msgstr "ÐÐÑÐÑÑÑ ÐÐÑÐ Ð ÐÐÑÐÐÐÐ"
-
-#: ../calendar/libecal/e-cal.c:4161 ../servers/groupwise/e-gw-connection.c:237
-msgid "Unknown User"
-msgstr "ÐÐÐÐÐÐÑÑÐÐ ÐÐÑÑÐÐÐÑÐÐ"
-
-#: ../calendar/libecal/e-cal.c:4163 ../calendar/libedata-cal/e-data-cal.c:114
-msgid "Object ID already exists"
-msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑÑÑ ÐÐ ÐÐÐÐÑÐ ÐÐÑÐ ÑÑÑÐÑÑÐÑÐÐ"
-
-#: ../calendar/libecal/e-cal.c:4165
-msgid "Protocol not supported"
-msgstr "ÐÑÐÑÐÐÐÐÑÑ ÐÐ ÑÐ ÐÐÐÐÑÑÐÐ"
-
-#: ../calendar/libecal/e-cal.c:4167
-msgid "Operation has been canceled"
-msgstr "ÐÑÐÐÐÐÐÐ ÐÐÐÑÑÐÐÐ"
-
-#: ../calendar/libecal/e-cal.c:4169
-msgid "Could not cancel operation"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÑÐÐ ÐÐ ÐÐÐÑÑÐÐÐÑÐ"
+msgid "Unknown calendar property '%s'"
+msgstr "ÐÐÐÐÐÐÐÑÐ ÑÐÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐÐÐÑ: â%sâ"
 
-#: ../calendar/libecal/e-cal.c:4171
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1306
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1324
-#: ../camel/providers/groupwise/camel-groupwise-store.c:628
-#: ../camel/providers/groupwise/camel-groupwise-store.c:810
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:87
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#: ../calendar/libedata-cal/e-cal-backend.c:219
 #, c-format
-msgid "Authentication failed"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ"
-
-#: ../calendar/libecal/e-cal.c:4173
-#: ../camel/providers/smtp/camel-smtp-transport.c:775
-msgid "Authentication required"
-msgstr "ÐÐÐÑÐÐÐ ÑÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ"
-
-#: ../calendar/libecal/e-cal.c:4175
-msgid "A D-Bus exception has occurred"
-msgstr "ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÑÐÐÐÐ ÐÐ D-Bus"
-
-#: ../calendar/libecal/e-cal.c:4179
-msgid "No error"
-msgstr "ÐÑÐÐ ÐÑÐÑÐÐ"
+msgid "Cannot change value of calendar property '%s'"
+msgstr "ÐÐÐÐÑÑÐÐÑÐ â%sâ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÑÐÐÐÐÐÐÐ"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:695
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:804
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1025
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1052
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:693
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:802
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1021
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1048
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "â%sâ ÐÐ ÐÑÐÐÐÐ ÐÑÐÑÐÐÐÑÐ"
@@ -1319,7 +1433,7 @@ msgstr "â%sâ ÐÐ ÐÑÐÐÐÐ ÐÑÐÑÐÐÐÑÐ"
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:212
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:290
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1090
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1086
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "â%sâ ÐÑÐÐÐÐ ÐÐÐÐ ÐÑÐÑÐÐÐÑ"
@@ -1327,7 +1441,7 @@ msgstr "â%sâ ÐÑÐÐÐÐ ÐÐÐÐ ÐÑÐÑÐÐÐÑ"
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:296
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:737
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:735
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "â%sâ ÐÑÐÐÐÐ ÐÑÑÐÐÑÑ ÐÑÐÑÐÐÐÑ ÐÐ ÐÑÐÐ ÐÐÐ"
@@ -1339,9 +1453,9 @@ msgstr "â%sâ ÐÑÐÐÐÐ ÐÑÑÐÐÑÑ ÐÑÐÑÐÐÐÑ ÐÐ ÐÑÐÐ ÐÐ
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:162
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:363
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:415
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:731
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:864
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "â%sâ ÐÑÐÐÐÐ ÐÐÐ ÐÑÐÑÐÐÐÑÐ"
@@ -1350,9 +1464,9 @@ msgstr "â%sâ ÐÑÐÐÐÐ ÐÐÐ ÐÑÐÑÐÐÐÑÐ"
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:218
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:260
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:369
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:421
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:870
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1096
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:419
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1092
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "â%sâ ÐÑÐÐÐÐ ÐÑÑÐÐÑÑ ÐÑÐÑÐÐÐÑ ÐÐ ÐÑÐÐ ÐÑ ÐÐÐÐ time_t"
@@ -1363,18 +1477,18 @@ msgid "\"%s\" expects the second argument to be an integer"
 msgstr "â%sâ ÐÑÐÐÐÐ ÐÑÐÑÐÑÑ ÐÑÐÑÐÐÐÑ ÐÐ ÐÑÐÐ ÐÑ ÐÐÐÐ integer"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:377
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:430
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "â%sâ ÐÑÐÐÐÐ ÐÑÐÑÐÑÑ ÐÑÐÑÐÐÐÑ ÐÐ ÐÑÐÐ ÐÑ ÐÐÐÐ time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:745
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:743
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "â%sâ ÐÑÐÐÐÐ ÐÑÐÑÐÑ ÐÑÐÑÐÐÐÑ ÐÐ ÐÑÐÐ ÐÐÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:773
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1386,12 +1500,12 @@ msgstr ""
 "âlocationâ (ÐÐÑÑÐÐÐÐÐÐÐÐÐÐ), âattendeeâ (ÑÑÐÑÑÐÐÐ), âattendeeâ (ÐÑÐÐÐÐÐÐÑÐÑ) "
 "ÐÐÐ âclassificationâ (ÐÐÐÑÐÑÐÐÐÑÐÑ)"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:923
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "â%sâ ÐÑÐÐÐÐ ÐÐÐÐ ÐÐÐÐ ÐÑÐÑÐÐÐÑ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:941
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:937
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1400,172 +1514,119 @@ msgstr ""
 "â%sâ ÐÑÐÐÐÐ ÐÑÐÑÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐ ÑÐ ÐÐÐÐÐÐ ÐÐÐ ÑÐÑÐÐ ÐÐÐÐ ÐÑÐÑÐÐÐÑ ÐÐ ÐÑÐÐ "
 "ÐÑÐÐÐÐÑÐ ÑÑÐÐÐÐÑÑ âÐÑÐÐâ (#f)"
 
-#: ../calendar/libedata-cal/e-data-cal.c:111
+#: ../calendar/libedata-cal/e-data-cal.c:418
 msgid "Invalid range"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐ"
 
-#: ../calendar/libedata-cal/e-data-cal.c:118
+#: ../calendar/libedata-cal/e-data-cal.c:425
 msgid "Unsupported method"
 msgstr "ÐÐÐÐÐÐÑÑÐÐÐ ÐÐÑÐÐ"
 
-#: ../calendar/libedata-cal/e-data-cal.c:121
-msgid "Calendar does not exist"
-msgstr "ÐÐÐÐÐÐÐÑÑÑ ÐÐ ÑÑÑÐÑÑÐÑÐÐ"
-
-#: ../calendar/libedata-cal/e-data-cal.c:122
+#: ../calendar/libedata-cal/e-data-cal.c:429
 msgid "Unknown user"
 msgstr "ÐÐÐÐÐÐÑÑÐÐ ÐÐÑÑÐÐÐÑÐÐ"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:608
-#, c-format
-msgid "Cannot retrieve calendar address: %s"
-msgstr "ÐÐÑÐÑÑÑ ÐÐ ÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:633
-#, c-format
-msgid "Cannot retrieve calendar alarm e-mail address: %s"
-msgstr "ÐÐÑÐÑÑÑ ÐÐ Ð-ÐÐÑÐ ÐÐ ÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:658
-#, c-format
-msgid "Cannot retrieve calendar's LDAP attribute: %s"
-msgstr "ÐÑÑÐÐÑÑÑÑ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ LDAP ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:683
-#, c-format
-msgid "Cannot retrieve calendar scheduling information: %s"
-msgstr ""
-"ÐÐÑÐÑÐÐÑÐÑÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐÑÐ ÑÑÐÐÑÐÑ Ð ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:707
-#, c-format
-msgid "Cannot open calendar: %s"
-msgstr "ÐÐÐÐÐÐÐÑÑÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÑÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:728
-#, c-format
-msgid "Cannot refresh calendar: %s"
-msgstr "ÐÐÐÐÐÐÐÑÑÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:747
-#, c-format
-msgid "Cannot remove calendar: %s"
-msgstr "ÐÐÐÐÐÐÐÑÑÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÐÑÐÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:768
-#, c-format
-msgid "Cannot create calendar object: %s"
-msgstr "ÐÐÐÐÑÑÑ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÑÑÐÐÐÐÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:796
-#, c-format
-msgid "Cannot modify calendar object: %s"
-msgstr "ÐÐÐÐÑÑÑ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÐÐÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:822
-#, c-format
-msgid "Cannot remove calendar object: %s"
-msgstr "ÐÐÐÐÑÑÑ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÐÑÐÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:843
-#, c-format
-msgid "Cannot receive calendar objects: %s"
-msgstr "ÐÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÑÐ ÐÐÐÑÑÐÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:862
-#, c-format
-msgid "Cannot discard calendar alarm: %s"
-msgstr "ÐÐÐÑÐÐÑÐ ÐÐ ÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÐÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:883
-#, c-format
-msgid "Cannot send calendar objects: %s"
-msgstr "ÐÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÑ ÐÐ ÑÐ ÐÐÐÑÐÑÑÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:910
-#, c-format
-msgid "Cannot retrieve default calendar object path: %s"
-msgstr "ÐÑÐÐÐÐÑÑÐÐÑÑ ÐÑÑ ÐÐ ÐÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:935
-#, c-format
-msgid "Cannot retrieve calendar object path: %s"
-msgstr "ÐÑÑÑÑ ÐÐ ÐÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:960
-#, c-format
-msgid "Cannot retrieve calendar object list: %s"
-msgstr "ÐÐÐÑÑÐÑÑ ÐÐ ÐÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:988
-#, c-format
-msgid "Could not retrieve attachment list: %s"
-msgstr "ÐÐÐÑÑÐÑÑ Ñ ÐÑÐÐÐÑÐÐÐ ÑÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1014
-#, c-format
-msgid "Could not complete calendar query: %s"
-msgstr "ÐÐÑÐÐÐÑÐ ÐÑÐ ÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐ ÐÐ ÐÐÐÑÑÑÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1039
-#, c-format
-msgid "Could not retrieve calendar time zone: %s"
-msgstr "ÐÐÑÐÐÐÑÑ ÐÐÑÑ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1064
-#, c-format
-msgid "Could not add calendar time zone: %s"
-msgstr "ÐÐÑÐÐÐÑÑ ÐÐÑÑ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1083
-#, c-format
-msgid "Could not set default calendar time zone: %s"
-msgstr "ÐÑÐÐÐÐÑÑÐÐÑÑ ÑÐÑÐÐÐ ÐÐÑÑ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1106
-#, c-format
-msgid "Cannot retrieve calendar changes: %s"
-msgstr "ÐÑÐÐÐÐÐÑÐ Ð ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÑÐ ÐÐÐÑÑÐÑ: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1137
-#, c-format
-msgid "Cannot retrieve calendar free/busy list: %s"
-msgstr "ÐÐÐÑÑÐÑÑ ÐÐ ÐÐÐÑÐÑÑÑÐ ÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: %s"
-
-#: ../calendar/libedata-cal/e-data-cal-factory.c:375
+#. Translators: This is prefix to a detailed error message
+#: ../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:930
+msgid "Cannot remove calendar: "
+msgstr "ÐÐÐÐÐÐÐÑÑÑ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÐÑÐÐ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../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:979
+msgid "Cannot retrieve backend property: "
+msgstr "ÐÐÐÐÑÑÐÐÑÐ ÐÐ ÑÐÑÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÐÑÐÐ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../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:1050
+msgid "Cannot retrieve calendar object list: "
+msgstr "ÐÐÐÑÑÐÑÑ ÐÐ ÐÐÐÐÐÐÐÑÐÐÑÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../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:1101
+msgid "Cannot create calendar object: "
+msgstr "ÐÐÐÐÑÑÑ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÑÑÐÐÐÐÐ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../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:1156
+msgid "Cannot remove calendar object: "
+msgstr "ÐÐÐÐÑÑÑ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÐÑÐÐ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../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:1204
+msgid "Cannot send calendar objects: "
+msgstr "ÐÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÑ ÐÐ ÑÐ ÐÐÐÑÐÑÑÑ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1231
+msgid "Could not retrieve attachment uris: "
+msgstr "ÐÐÐÑÑÐÑÑ Ñ ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐÑÐÐÐ ÑÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1255
+msgid "Could not discard reminder: "
+msgstr "ÐÐÐÐÐÐÑÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÑÑÐÑÐ: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../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: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:1326
+msgid "Could not add calendar time zone: "
+msgstr "ÐÐÑÐÐÐÑÑ ÐÐÑÑ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐ: "
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:383
+#, c-format
+msgid "Invalid call"
+msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐ"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:424
 #, c-format
 msgid "Invalid URI"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑ"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:393
+#: ../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:443
+#: ../calendar/libedata-cal/e-data-cal-factory.c:485
 #, c-format
 msgid "Could not instantiate backend"
 msgstr "ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÑÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑÑ ÐÐ ÑÐÑÐÑÐ ÐÐ ÐÐÑÐÐÐÑÐÐ"
@@ -1617,21 +1678,11 @@ msgstr "ÐÐÑÐÑÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐÑÐ"
 msgid "Unable to create cache path"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÑÑ ÐÐ ÐÐÑÐ"
 
-#: ../camel/camel-data-cache.c:496
+#: ../camel/camel-data-cache.c:495
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "ÐÐÐÐÑÑÑ Ð ÐÐÑÐ â%sâ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÑÑÐÑ: %s"
 
-#: ../camel/camel-data-wrapper.c:143
-#, c-format
-msgid "No stream available"
-msgstr "ÐÐÐÑÐÐ ÐÐÑÐÐ"
-
-#: ../camel/camel-db.c:455
-#, c-format
-msgid "Insufficient memory"
-msgstr "ÐÐÐÐÑÑÐÑÑÑÐÐ ÐÐÐÐÑ"
-
 #: ../camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
@@ -1659,37 +1710,36 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "ÐÐÐÑÑÐÐÐÐÐÑÐÐÐ ÑÑÑ ÑÑÑÐÑÑÐ"
 
-#: ../camel/camel-disco-folder.c:63 ../camel/camel-offline-folder.c:79
+#: ../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:398
+#: ../camel/camel-disco-folder.c:410
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "ÐÐÐÐÐÑÐÑÐÐ ÐÐ ÐÐÐÐÐÑÐ â%sâ ÐÐ ÑÐÐÐÐ âÐÐÐÐÑÑÐÐâ"
 
-#: ../camel/camel-disco-folder.c:464 ../camel/camel-offline-folder.c:312
+#: ../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:420
-#: ../camel/providers/groupwise/camel-groupwise-store.c:228
-#: ../camel/providers/imap/camel-imap-store.c:1250
-#: ../camel/providers/imap/camel-imap-store.c:1771
-#: ../camel/providers/imap/camel-imap-store.c:2244
-#: ../camel/providers/imap/camel-imap-store.c:3094
-#: ../camel/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:276
-#: ../camel/providers/imapx/camel-imapx-store.c:1298
-#: ../camel/providers/imapx/camel-imapx-store.c:1386
-#: ../camel/providers/imapx/camel-imapx-store.c:1421
+#: ../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 "ÐÑÑÐÐÐ ÐÐ ÑÑÐ Ð ÑÐÐÐÐ âÐÐÐÑÑÐÐâ, ÐÐ ÐÐ ÐÐÐÑÑÑÐÑÐ ÑÐÐÐ ÐÐÐÑÑÐÐÐ"
@@ -1699,87 +1749,132 @@ msgstr "ÐÑÑÐÐÐ ÐÐ ÑÑÐ Ð ÑÐÐÐÐ âÐÐÐÑÑÐÐâ, ÐÐ ÐÐ 
 msgid "Canceled"
 msgstr "ÐÑÐÐÐÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:817 ../camel/camel-filter-search.c:582
+#: ../camel/camel-filter-driver.c:818 ../camel/camel-filter-search.c:628
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÑÑÐÑÐÐ ÐÑÐÑÐÑ â%sâ: %s"
 
-#: ../camel/camel-filter-driver.c:864
+#: ../camel/camel-filter-driver.c:866
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "ÐÐÐÑÑÐÐ Ð ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÐ ÑÑÐÐÑÐÐÐÑ ÐÑ %s: %s"
 
-#: ../camel/camel-filter-driver.c:1051 ../camel/camel-filter-driver.c:1060
+#: ../camel/camel-filter-driver.c:1053 ../camel/camel-filter-driver.c:1062
 msgid "Syncing folders"
 msgstr "ÐÐÐÑÑÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1148 ../camel/camel-filter-driver.c:1598
+#: ../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:1159 ../camel/camel-filter-driver.c:1609
+#: ../camel/camel-filter-driver.c:1161 ../camel/camel-filter-driver.c:1605
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÐÐÐÐÐÐ ÐÐ ÑÐÐÑÑÑ: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1256
+#: ../camel/camel-filter-driver.c:1258
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐÑÐ-ÑÐÑÐÐÑ"
 
-#: ../camel/camel-filter-driver.c:1267
+#: ../camel/camel-filter-driver.c:1269
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐÑÐ-ÑÐÑÐÐÑ"
 
-#: ../camel/camel-filter-driver.c:1285
+#: ../camel/camel-filter-driver.c:1287
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1292 ../camel/camel-filter-driver.c:1314
+#: ../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:1329 ../camel/camel-filter-driver.c:1434
+#: ../camel/camel-filter-driver.c:1331 ../camel/camel-filter-driver.c:1432
 msgid "Syncing folder"
 msgstr "ÐÐÐÑÑÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1334 ../camel/camel-filter-driver.c:1440
+#: ../camel/camel-filter-driver.c:1336 ../camel/camel-filter-driver.c:1438
 msgid "Complete"
 msgstr "ÐÐÐÑÑÑÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1398
+#: ../camel/camel-filter-driver.c:1396
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ %d ÐÑ %d"
 
-#: ../camel/camel-filter-driver.c:1416
+#: ../camel/camel-filter-driver.c:1414
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÐ %d ÐÑ %d"
 
-#: ../camel/camel-filter-search.c:135
+#: ../camel/camel-filter-search.c:137
 msgid "Failed to retrieve message"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÑÐ"
 
-#: ../camel/camel-filter-search.c:401
+#: ../camel/camel-filter-search.c:403
 msgid "Invalid arguments to (system-flag)"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐÐÑÐ ÐÑÐ (system-flag)"
 
-#: ../camel/camel-filter-search.c:416
+#: ../camel/camel-filter-search.c:418
 msgid "Invalid arguments to (user-tag)"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐÐÑÐ ÐÑÐ (user-tag)"
 
-#: ../camel/camel-filter-search.c:744 ../camel/camel-filter-search.c:753
+#: ../camel/camel-filter-search.c:799 ../camel/camel-filter-search.c:808
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÑÑÑÐÐÐ ÑÑÐÐ ÑÐÐÑÑÑ: %s: %s"
 
-#: ../camel/camel-folder-search.c:342 ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:624
+#: ../camel/camel-folder.c:243
+#, c-format
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "ÐÐÐÑÐÑÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÐ Ð â%sâ ÐÐÑÐ ÑÐÐÐ"
+msgstr[1] "ÐÐÐÑÐÑÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÐ Ð â%sâ ÐÐÑÐ ÑÐÐÐ"
+
+#: ../camel/camel-folder.c:283
+#, c-format
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "ÐÐÐÑÐÑÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÐ Ð â%sâ, ÑÐ ÐÐ Ð ÑÐÐÐ"
+msgstr[1] "ÐÐÐÑÐÑÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÐ Ð â%sâ, ÑÐ ÐÐ ÑÐ ÑÐÐÐ"
+
+#: ../camel/camel-folder.c:331
+#, c-format
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "ÐÐÐÑÑÐÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÐ Ð â%sâ"
+msgstr[1] "ÐÐÐÑÑÐÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÐ Ð â%sâ"
+
+#: ../camel/camel-folder.c:898
+#: ../camel/providers/local/camel-maildir-folder.c:319
+msgid "Moving messages"
+msgstr "ÐÑÐÐÐÑÑÐÐÐÐ ÐÐ ÐÐÑÐÐ"
+
+#: ../camel/camel-folder.c:901
+msgid "Copying messages"
+msgstr "ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐ"
+
+#: ../camel/camel-folder.c:1156
+#, c-format
+msgid "Quota information not supported for folder '%s'"
+msgstr "ÐÐÐÐÐÑÐ â%sâ ÐÐ ÐÐÐÐÑÑÐÐ ÐÐÑÐÑÐÐÑÐÑ ÐÐ ÐÐÐÑÐ"
+
+#: ../camel/camel-folder.c:3265
+#, c-format
+msgid "Retrieving message '%s' in %s"
+msgstr "ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ â%sâ Ð %s"
+
+#: ../camel/camel-folder.c: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:627
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1788,8 +1883,8 @@ msgstr ""
 "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐ ÐÐ ÑÑÑÑÐÐÐ: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:354 ../camel/camel-folder-search.c:465
-#: ../camel/camel-folder-search.c:636
+#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:468
+#: ../camel/camel-folder-search.c:639
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1798,66 +1893,36 @@ msgstr ""
 "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÐÐÐÐÐÐ ÐÐ ÐÐÑÐÐa ÐÐ ÑÑÑÑÐÐÐ: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:840 ../camel/camel-folder-search.c:882
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:844 ../camel/camel-folder-search.c:887
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) ÐÐÐÑÐÐÐ ÐÐÐÐÐÑÐÐ ÐÑÐÐÐ ÑÐÐÑÐÑÐÑ"
 
-#: ../camel/camel-folder-search.c:935
+#. Translators: Each '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:941
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) ÐÐ Ð ÐÐÐÐÐÐÐÐ ÐÑÑÑÐ Ð â%sâ"
 
-#: ../camel/camel-folder-search.c:941 ../camel/camel-folder-search.c:948
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:948 ../camel/camel-folder-search.c:956
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) ÐÐÐÑÐÐÐ ÐÐÐ ÐÐ ÑÑÐÐÐÐÐÐÐ"
 
-#: ../camel/camel-folder-search.c:975
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:984
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) ÐÑÐÐÐÐ ÑÐÐÑÐÑÐÑ-ÐÐÑÐÐ"
 
-#: ../camel/camel-folder-search.c:984
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:994
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) ÐÐÐÑÐÐÐ ÐÐÐÐÐÑÐ ÐÐ Ð ÐÐÐÑÐÐÐ"
 
-#: ../camel/camel-folder.c:216
-#, c-format
-msgid "Learning new spam message in '%s'"
-msgid_plural "Learning new spam messages in '%s'"
-msgstr[0] "ÐÐÐÑÐÑÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÐ Ð â%sâ ÐÐÑÐ ÑÐÐÐ"
-msgstr[1] "ÐÐÐÑÐÑÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÐ Ð â%sâ ÐÐÑÐ ÑÐÐÐ"
-
-#: ../camel/camel-folder.c:240
-#, c-format
-msgid "Learning new ham message in '%s'"
-msgid_plural "Learning new ham messages in '%s'"
-msgstr[0] "ÐÐÐÑÐÑÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÐ Ð â%sâ, ÑÐ ÐÐ Ð ÑÐÐÐ"
-msgstr[1] "ÐÐÐÑÐÑÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÐ Ð â%sâ, ÑÐ ÐÐ ÑÐ ÑÐÐÐ"
-
-#: ../camel/camel-folder.c:266
-#, c-format
-msgid "Filtering new message in '%s'"
-msgid_plural "Filtering new messages in '%s'"
-msgstr[0] "ÐÐÐÑÑÐÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÐ Ð â%sâ"
-msgstr[1] "ÐÐÐÑÑÐÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÐ Ð â%sâ"
-
-#: ../camel/camel-folder.c:875
-#: ../camel/providers/local/camel-maildir-folder.c:293
-msgid "Moving messages"
-msgstr "ÐÑÐÐÐÑÑÐÐÐÐ ÐÐ ÐÐÑÐÐ"
-
-#: ../camel/camel-folder.c:878
-msgid "Copying messages"
-msgstr "ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐ"
-
-#: ../camel/camel-folder.c:3247
-#, c-format
-msgid "Retrieving message '%s'"
-msgstr "ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ â%sâ"
-
 #: ../camel/camel-gpg-context.c:642 ../camel/camel-gpg-context.c:647
 #: ../camel/camel-gpg-context.c:1272
 #, c-format
@@ -1865,8 +1930,7 @@ msgid "Failed to execute gpg: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÐÐÐÐÐÐ ÐÐ gpg: %s"
 
 #: ../camel/camel-gpg-context.c:647
-#: ../camel/providers/smtp/camel-smtp-transport.c:723
-#: ../camel/providers/smtp/camel-smtp-transport.c:778
+#: ../camel/providers/smtp/camel-smtp-transport.c:759
 msgid "Unknown"
 msgstr "ÐÐÐÐÐÐÑÑÐÐ"
 
@@ -1916,15 +1980,11 @@ msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐ ÐÑ GnuPG ÐÐ â%sâ"
 
 #: ../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:4892
-#: ../camel/providers/imapx/camel-imapx-server.c:4909
-#: ../camel/providers/imapx/camel-imapx-store.c:198
-#: ../camel/providers/nntp/camel-nntp-summary.c:405
-#: ../camel/providers/pop3/camel-pop3-folder.c:366
-#: ../camel/providers/pop3/camel-pop3-folder.c:431
-#: ../camel/providers/pop3/camel-pop3-folder.c:506
-#: ../camel/providers/pop3/camel-pop3-store.c:487
-#: ../libedataserverui/e-book-auth-util.c:229
+#: ../camel/providers/imapx/camel-imapx-server.c:4951
+#: ../camel/providers/imapx/camel-imapx-server.c:4968
+#: ../camel/providers/imapx/camel-imapx-store.c:159
+#: ../camel/providers/nntp/camel-nntp-summary.c:409
+#: ../libedataserverui/e-book-auth-util.c:221
 #, c-format
 msgid "Cancelled"
 msgstr "ÐÑÐÐÐÐÐÐ"
@@ -1948,66 +2008,51 @@ msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÑÐÐÐ: ÐÑÐÐ ÐÐÐÐÐÐÐÐ ÐÐÑ
 msgid "Could not generate signing data: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑ: "
 
-#: ../camel/camel-gpg-context.c:1582 ../camel/camel-gpg-context.c:1782
-#: ../camel/camel-gpg-context.c:1892 ../camel/camel-gpg-context.c:2038
-#: ../camel/camel-gpg-context.c:2137 ../camel/camel-gpg-context.c:2185
+#: ../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:1662 ../camel/camel-gpg-context.c:1670
-#: ../camel/camel-gpg-context.c:1678 ../camel/camel-gpg-context.c:1697
-#: ../camel/camel-smime-context.c:948 ../camel/camel-smime-context.c:962
-#: ../camel/camel-smime-context.c:971
+#: ../camel/camel-gpg-context.c:1663 ../camel/camel-gpg-context.c:1671
+#: ../camel/camel-gpg-context.c:1679 ../camel/camel-gpg-context.c:1699
+#: ../camel/camel-smime-context.c:950 ../camel/camel-smime-context.c:964
+#: ../camel/camel-smime-context.c:973
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐÑÐ: ÐÐÐÑÐÐÐÐÐÐ ÑÐÑÐÐÑ ÐÐ ÐÐÑÐÐÑÐ"
 
-#: ../camel/camel-gpg-context.c:1737
+#: ../camel/camel-gpg-context.c:1741
 msgid "Cannot verify message signature: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐÑÐ: "
 
-#: ../camel/camel-gpg-context.c:1858
+#: ../camel/camel-gpg-context.c:1864
 msgid "Could not generate encrypting data: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐÐ ÐÐ ÑÐÑÑÐÑÐÐÐ: "
 
-#: ../camel/camel-gpg-context.c:1911
+#: ../camel/camel-gpg-context.c:1917
 msgid "This is a digitally encrypted message part"
-msgstr "ÐÐÐÐ Ð ÑÐÑÑÐÐÐ ÑÐÑÑÐÑÐÐÐ ÑÐÑÑ ÐÑ ÐÐÑÐÐÑÐ"
-
-#: ../camel/camel-gpg-context.c:1969 ../camel/camel-gpg-context.c:1978
-#: ../camel/camel-gpg-context.c:2001
-#, c-format
-msgid "Cannot decrypt message: Incorrect message format"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐÑÐ: ÐÑÐÑÐÐ ÑÐÑÐÐÑ ÐÐ ÐÐÑÐÐÑÐ"
-
-#: ../camel/camel-gpg-context.c:1989
-#, c-format
-msgid "Failed to decrypt MIME part: protocol error"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÑÐÑÐÐÐ ÐÐ ÑÐÑÑ MIME: ÐÑÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐ"
-
-#: ../camel/camel-gpg-context.c:2078 ../camel/camel-smime-context.c:1255
-msgid "Encrypted content"
-msgstr "ÐÐÑÑÐÑÐÐÐ ÑÑÐÑÑÐÐÐÐÐ"
-
-#: ../camel/camel-lock-client.c:106
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐ ÐÑÐÐÑÐÐÐÐ ÐÐÐÐÐ ÐÐ ÐÐÐÐÑÑÐÐÐÐ: %s"
+msgstr "ÐÐÐÐ Ð ÑÐÑÑÐÐÐ ÑÐÑÑÐÑÐÐÐ ÑÐÑÑ ÐÑ ÐÐÑÐÐÑÐ"
 
-#: ../camel/camel-lock-client.c:130
+#: ../camel/camel-gpg-context.c:1975 ../camel/camel-gpg-context.c:1984
+#: ../camel/camel-gpg-context.c:2007
 #, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÑÐÑÐÑ ÐÐ ÐÐÐÐÑÑÐÐÐÐ: %s"
+msgid "Cannot decrypt message: Incorrect message format"
+msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐÑÐ: ÐÑÐÑÐÐ ÑÐÑÐÐÑ ÐÐ ÐÐÑÐÐÑÐ"
 
-#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
+#: ../camel/camel-gpg-context.c:1995
 #, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÑÑÐÐÐÐ ÐÐ â%sâ: ÐÑÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐ Ð lock-helper"
+msgid "Failed to decrypt MIME part: protocol error"
+msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÑÐÑÐÐÐ ÐÐ ÑÐÑÑ MIME: ÐÑÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐ"
 
-#: ../camel/camel-lock-client.c:227
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÑÑÐÐÐÐ ÐÐ â%sâ"
+#: ../camel/camel-gpg-context.c:2086 ../camel/camel-smime-context.c:1261
+msgid "Encrypted content"
+msgstr "ÐÐÑÑÐÑÐÐÐ ÑÑÐÑÑÐÐÐÐÐ"
+
+#: ../camel/camel-http-stream.c:546 ../camel/camel-stream-null.c:78
+msgid "Only reset to beginning is supported with CamelHttpStream"
+msgstr ""
+"ÐÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ CamelHttpStream ÑÐ ÐÐÐÐÑÑÐÐ ÐÐÐÐÑÑÐÐÐÐ ÐÑÑÑÐÐÐ Ð ÐÐÑÐÐÐÑÐ"
 
 #: ../camel/camel-lock.c:102
 #, c-format
@@ -2031,6 +2076,26 @@ msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ lock ÑÑÐÐ fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ lock ÑÑÐÐ flock(2): %s"
 
+#: ../camel/camel-lock-client.c:106
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐ ÐÑÐÐÑÐÐÐÐ ÐÐÐÐÐ ÐÐ ÐÐÐÐÑÑÐÐÐÐ: %s"
+
+#: ../camel/camel-lock-client.c:130
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÑÐÑÐÑ ÐÐ ÐÐÐÐÑÑÐÐÐÐ: %s"
+
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÑÑÐÐÐÐ ÐÐ â%sâ: ÐÑÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐ Ð lock-helper"
+
+#: ../camel/camel-lock-client.c:227
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÑÑÐÐÐÐ ÐÐ â%sâ"
+
 #: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -2085,21 +2150,35 @@ msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐ ÐÑÐ ÐÑÐÐÐÐ
 msgid "Error copying mail temp file: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐ ÐÑÐ ÐÑÐÐÐÐÐÐ ÑÐÐÐ: %s"
 
-#: ../camel/camel-multipart-signed.c:327
+#: ../camel/camel-multipart-signed.c:296
 #, c-format
 msgid "No content available"
 msgstr "ÐÐÐÑÐÐ ÑÑÐÑÑÐÐÐÐÐ"
 
-#: ../camel/camel-multipart-signed.c:335
+#: ../camel/camel-multipart-signed.c:304
 #, c-format
 msgid "No signature available"
 msgstr "ÐÐÐÑÐÐ ÐÐÐÐÐÑ"
 
-#: ../camel/camel-multipart-signed.c:663
+#: ../camel/camel-multipart-signed.c:688
 #, c-format
 msgid "parse error"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÐÐÑÐÐÐ"
 
+#: ../camel/camel-network-service.c:99
+#, c-format
+msgid "Could not connect to %s: %s"
+msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ Ñ %s: %s"
+
+#: ../camel/camel-network-service.c:100
+msgid "SSL unavailable"
+msgstr "ÐÐÐÑÐÐ SSL"
+
+#: ../camel/camel-network-service.c:123
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ Ñ %s: "
+
 #: ../camel/camel-net-utils.c:695
 #, c-format
 msgid "Resolving: %s"
@@ -2127,7 +2206,7 @@ msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÑÑÐÐÐ ÐÐ ÐÐÑÐÑ"
 msgid "Name lookup failed: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÑÑÐÐÐ ÐÐ ÐÐÑÐÑ: %s"
 
-#: ../camel/camel-offline-folder.c:189
+#: ../camel/camel-offline-folder.c:202
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "ÐÐÐÑÑÐÐÐÐÐÑÐÑ ÐÐ ÐÐÑÐÐÑÐ Ð ÐÐÐÐÐ â%sâ Ñ ÐÐÑÐÐ"
@@ -2164,7 +2243,7 @@ msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÐÐÐÐÐ ÐÐ %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÐÐÐÐÐ ÐÐ %s: ÐÑÐÐ ÐÐÐÑÐÐÐÐÐÐÑÐÑ ÐÐÐ Ð ÐÐÐÑÐÐ."
 
-#: ../camel/camel-provider.c:392 ../camel/camel-session.c:202
+#: ../camel/camel-provider.c:391 ../camel/camel-session.c:351
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "ÐÑÐÐ ÐÐÐÐÑÐÐ ÐÐÑÑÐÐÑÐÐ ÐÐ ÐÑÐÑÐÐÐÐ â%sâ"
@@ -2233,33 +2312,33 @@ msgstr ""
 "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐ ÐÐ ÑÐÑÑÐÐ ÑÑÑ ÑÑÑÐÑÑÐ ÑÑÐÐ ÑÐÐÑÑÐÐ ÐÐÑÐÐÐ ÑÐÐ DIGEST-MD5, "
 "ÐÐÐ ÑÐÐ Ñ ÐÐÐÐÑÑÐÐ."
 
-#: ../camel/camel-sasl-digest-md5.c:817
+#: ../camel/camel-sasl-digest-md5.c:820
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "ÐÑÐÐÐÐÐÐÐÐÑÐÐÑÑÐÐÑÐ ÐÑ ÑÑÑÐÑÑÐ Ð ÑÐÑÑÐÐ ÐÑÐÐÐ (>2048 ÐÐÑÐÑÐ)"
 
-#: ../camel/camel-sasl-digest-md5.c:828
+#: ../camel/camel-sasl-digest-md5.c:831
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "ÐÑÐÐÐÐÐÐÐÐÑÐÐÑÑÐÐÑÐ ÐÑ ÑÑÑÐÑÑÐ Ð ÐÐÐÑÐÐÐÐÐÐ\n"
 
-#: ../camel/camel-sasl-digest-md5.c:836
+#: ../camel/camel-sasl-digest-md5.c:839
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr ""
 "ÐÑÐÐÐÐÐÐÐÐÑÐÐÑÑÐÐÑÐ ÐÑ ÑÑÑÐÑÑÐ ÑÑÐÑÑÐÐ ÐÐÐÑÐÐÐÐÐÐ ÑÐÑÑ â âÐÐÑÐÑÑÐÐ ÐÐ ÐÐÑÐÑÐâ"
 
-#: ../camel/camel-sasl-digest-md5.c:871
+#: ../camel/camel-sasl-digest-md5.c:873
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "ÐÑÐÐÐÐÑÑÑ ÐÐ ÑÑÑÐÑÑÐ ÐÐ ÑÑÐÑÑÐÐ ÐÐÐÐÐ ÐÐ ÑÐÑÐÐÐÐÐÑÐÐÐÐÐ"
 
-#: ../camel/camel-sasl-digest-md5.c:892
+#: ../camel/camel-sasl-digest-md5.c:894
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "ÐÑÐÐÐÐÑÑÑ ÐÐ ÑÑÑÐÑÑÐ ÑÑÐÑÑÐÐ ÐÐÐÑÐÐÐ ÐÐÐÐÐ ÐÐ ÑÐÑÐÐÐÐÐÑÐÐÐÐÐ"
 
-#: ../camel/camel-sasl-digest-md5.c:905
+#: ../camel/camel-sasl-digest-md5.c:907
 #, c-format
 msgid "Server response does not match"
 msgstr "ÐÑÐÐÐÐÑÑÑ ÐÐ ÑÑÑÐÑÑÐ ÐÐ ÑÑÐÐÐÐÐ"
@@ -2332,14 +2411,14 @@ msgstr "ÐÑÐÐÐÑÐÐÑÐ ÐÐ ÐÐÑÐÐÐÐÐÐÑÐÐÐÐÑÑ ÐÐ ÐÐÑÐ
 msgid "The referenced credentials have expired."
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐÐ ÑÐ ÐÐÑÐÐÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:310
-#: ../camel/camel-sasl-gssapi.c:354 ../camel/camel-sasl-gssapi.c:371
-#: ../camel/providers/smtp/camel-smtp-transport.c:1256
+#: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:312
+#: ../camel/camel-sasl-gssapi.c:356 ../camel/camel-sasl-gssapi.c:373
+#: ../camel/providers/smtp/camel-smtp-transport.c:1228
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÑ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÑ ÑÑÑÐÑÑÐ."
 
-#: ../camel/camel-sasl-gssapi.c:383
+#: ../camel/camel-sasl-gssapi.c:385
 #, c-format
 msgid "Unsupported security layer."
 msgstr "ÐÐÐÐÐÐÑÑÐÐÐ ÑÐÐÐ ÐÐ ÑÐÐÑÑÐÐÑÑ."
@@ -2352,16 +2431,16 @@ msgstr "ÐÐÐÐÑÐÑÐÑÐÑÐÐÐ"
 msgid "This option will connect to the server using a simple password."
 msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐ ÐÐ ÑÐÑÑÐÐ ÑÑÑ ÑÑÑÐÑÑÐ ÑÑÐÐ ÐÐÑÐÑÑÐÑÐÐÐ ÐÐÑÐÐÐ."
 
-#: ../camel/camel-sasl-login.c:91
+#: ../camel/camel-sasl-login.c:92
 #, c-format
 msgid "Unknown authentication state."
 msgstr "ÐÐÐÐÐÐÑÑÐÐ ÑÑÑÑÐÑÐÐÐ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ."
 
-#: ../camel/camel-sasl-ntlm.c:37
+#: ../camel/camel-sasl-ntlm.c:42
 msgid "NTLM / SPA"
 msgstr "NTLM/SPA"
 
-#: ../camel/camel-sasl-ntlm.c:39
+#: ../camel/camel-sasl-ntlm.c:44
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -2381,55 +2460,51 @@ msgstr "POP ÐÑÐÐÐ SMTP"
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐ ÑÐÑÐÐÐÐÐÑÐ ÐÑÑÐÐÐ ÐÐ POP ÐÑÐÐÐ SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:79
-msgid "POP Source URI"
-msgstr "ÐÐÑÐÑ ÐÐ ÐÐÑÐÑÐÐÐÐ ÐÐ POP"
+#: ../camel/camel-sasl-popb4smtp.c:80
+msgid "POP Source UID"
+msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÐ ÐÐÑÐÑÐÐÐÐ ÐÐ POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:86
+#: ../camel/camel-sasl-popb4smtp.c:92
 #, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "POP ÐÑÐÐÐ ÑÐÑÐÐÐÐÐÑÐÐÐÐÐ ÐÐ SMTP ÑÑÐÐ ÐÐÐÐÐÐÑÑÐÐ ÑÑÐÐÑÐÐÑÑ"
 
-#: ../camel/camel-sasl-popb4smtp.c:94
+#: ../camel/camel-sasl-popb4smtp.c:104 ../camel/camel-sasl-popb4smtp.c:114
 #, c-format
-msgid "POP Before SMTP authentication using a non-POP source"
-msgstr "POP ÐÑÐÐÐ ÑÐÑÐÐÐÐÐÑÐÐÐÐÐ ÐÐ SMTP ÑÑÐÐ ÐÐÑÐÑÐÐÐ ÑÐÐÐÐÑÐÐ ÐÑ POP"
+msgid "POP Before SMTP authentication attempted with a %s service"
+msgstr "POP ÐÑÐÐÐ ÑÐÑÐÐÐÐÐÑÐÐÐÐÐ ÐÐ SMTP ÑÑÐÐ ÑÑÐÑÐÐ %s"
 
 #: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐÐÐ ÐÐ ÑÐÐÑÐÑÑÐÐ ÐÐÑÐÐ: %s: %s"
 
-#: ../camel/camel-service.c:85
+#: ../camel/camel-service.c:526
 #, c-format
-msgid "URL '%s' needs a username component"
+msgid "URL '%s' needs a user component"
 msgstr "ÐÐÑÐÑÑÑ â%sâ ÑÐ ÐÑÐÐÐÐ ÐÑ ÐÐÐÐÐÐÐÐÑ âÐÐÐ ÐÐ ÐÐÑÑÐÐÐÑÐÐâ"
 
-#: ../camel/camel-service.c:89
+#: ../camel/camel-service.c:537
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "ÐÐÑÐÑÑÑ â%sâ ÑÐ ÐÑÐÐÐÐ ÐÑ ÐÐÐÐÐÐÐÐÑ âÑÐÑÑâ"
 
-#: ../camel/camel-service.c:93
+#: ../camel/camel-service.c:548
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "ÐÐÑÐÑÑÑ â%sâ ÑÐ ÐÑÐÐÐÐ ÐÑ ÐÐÐÐÐÐÐÐÑ âÐÑÑâ"
 
-#: ../camel/camel-session.c:256
+#: ../camel/camel-session.c:361
 #, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ %s:\n"
-"%s"
+msgid "Invalid GType registered for protocol '%s'"
+msgstr "ÐÐÐÐÑÑÑÐÑÐÐ Ð Ð ÐÐÐÑÐÐÐÐÐÐ ÐÐÐ GType ÐÐ ÐÑÐÑÐÐÐÐÐ â%sâ"
 
-#: ../camel/camel-session.c:753
+#: ../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:1048
+#: ../camel/camel-smime-context.c:344 ../camel/camel-smime-context.c:1050
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ÑÐÑÑÐÑÐÐÐÑ ÐÐ â%sâ"
@@ -2565,7 +2640,7 @@ msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐ
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ÐÐÐÐÐÑÐÐÑ: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1121
+#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1123
 msgid "Cannot create encoder context"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÑÑ ÐÐ ÑÐÑÑÐÑÐÐÐ"
 
@@ -2573,88 +2648,117 @@ msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÑÑ ÐÐ ÑÐÑ
 msgid "Failed to add data to CMS encoder"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐ ÐÑÐ ÐÐÐÐÑÐÑ CMS"
 
-#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1138
+#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1140
 msgid "Failed to encode data"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐ"
 
-#: ../camel/camel-smime-context.c:987 ../camel/camel-smime-context.c:1233
+#: ../camel/camel-smime-context.c:989 ../camel/camel-smime-context.c:1236
 msgid "Decoder failed"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐÑÐÐÐ"
 
-#: ../camel/camel-smime-context.c:1056
+#: ../camel/camel-smime-context.c:1058
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÑÑ ÐÐÐÐÑÐÑÑÐ ÐÐ ÑÐÑÑÐÑÐÐÐ ÐÐ ÐÐÐÐÐ ÐÐÐÐÐ"
 
-#: ../camel/camel-smime-context.c:1064
+#: ../camel/camel-smime-context.c:1066
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÑÑÑÐ ÐÐ ÐÐÑÑ ÐÐ ÑÐÑÑÐÑÐÐÐ ÐÐ ÐÐÐÐÐ ÐÐÐÐÐ"
 
-#: ../camel/camel-smime-context.c:1075
+#: ../camel/camel-smime-context.c:1077
 msgid "Cannot create CMS Message"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÑÑÐÐÑÐÐÐÐ ÐÐ CMS"
 
-#: ../camel/camel-smime-context.c:1081
+#: ../camel/camel-smime-context.c:1083
 msgid "Cannot create CMS Enveloped data"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÐÐÐ ÐÐ CMS"
 
-#: ../camel/camel-smime-context.c:1087
+#: ../camel/camel-smime-context.c:1089
 msgid "Cannot attach CMS Enveloped data"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÐÐÐ ÐÐ CMS"
 
-#: ../camel/camel-smime-context.c:1093
+#: ../camel/camel-smime-context.c:1095
 msgid "Cannot attach CMS data object"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÑÐÐÑÐÐ ÐÐ ÐÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÐ CMS"
 
-#: ../camel/camel-smime-context.c:1102
+#: ../camel/camel-smime-context.c:1104
 msgid "Cannot create CMS Recipient information"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐÐÑÐÑ ÐÐ ÐÐÐÑÑÐÑÐÐ ÐÐ CMS"
 
-#: ../camel/camel-smime-context.c:1107
+#: ../camel/camel-smime-context.c:1109
 msgid "Cannot add CMS Recipient information"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÑÐÐÑÐÑ ÐÐ ÐÐÐÑÑÐÑÐÐ ÐÐ CMS"
 
-#: ../camel/camel-smime-context.c:1132
+#: ../camel/camel-smime-context.c:1134
 msgid "Failed to add data to encoder"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐ ÐÑÐ ÐÐÐÐÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:1240
+#: ../camel/camel-smime-context.c:1243
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "ÐÐÑÐÑÑÐÑÐÐÐ S/MIME: ÐÐ Ð ÐÑÐÑÐÑÐ ÑÐÑÑÐÑÐÐÐ ÑÑÐÑÑÐÐÐÐÐ"
 
-#: ../camel/camel-store.c:2181
+#: ../camel/camel-store.c:1814
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ: ÐÐÑÐ ÑÑÑÐÑÑÐÑÐÐ"
 
+#: ../camel/camel-store.c:1857
+#, c-format
+msgid "Opening folder '%s'"
+msgstr "ÐÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐÑÐ â%sâ"
+
+#: ../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:2372 ../camel/camel-store.c:2382
+#: ../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:2375 ../camel/camel-store.c:2386
+#: ../camel/camel-store.c:2059 ../camel/camel-store.c:2070
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "ÐÐÐÐ"
 
-#: ../camel/camel-store.c:2829
+#: ../camel/camel-store.c:2521
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ: %s: ÐÐÑÐ ÑÑÑÐÑÑÐÑÐÐ"
 
-#: ../camel/camel-store.c:2956 ../camel/camel-vee-store.c:367
+#: ../camel/camel-store.c:2535
+#, c-format
+msgid "Creating folder '%s'"
+msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐ â%sâ"
+
+#: ../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:3097 ../camel/camel-vee-store.c:417
-#: ../camel/providers/local/camel-maildir-store.c:668
+#: ../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"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐ: %s: ÐÑÐÑÐÐ ÐÐÐÑÐÑÐÑ"
 
+#: ../camel/camel-stream-filter.c:327
+msgid "Only reset to beginning is supported with CamelStreamFilter"
+msgstr "CamelStreamFilter ÐÐÐÐÑÑÐÐ ÑÐÐÐ ÐÑÑÑÐÐÐ Ð ÐÐÑÐÐÐÑÐ"
+
+#: ../camel/camel-stream-process.c:265
+#, c-format
+msgid "Connection cancelled"
+msgstr "ÐÑÑÐÐÐÑÐ Ð ÐÑÐÐÑÐÑÐÐÐ"
+
+#: ../camel/camel-stream-process.c:270
+#, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ Ñ ÐÐÐÐÐÐÐ â%sâ: %s"
+
 #: ../camel/camel-tcp-stream-raw.c:749 ../camel/camel-tcp-stream-raw.c:760
 #, c-format
 msgid "The proxy host does not support SOCKS4"
@@ -2806,37 +2910,38 @@ msgstr ""
 "ÐÐÐÑÑÐÑÑ ÐÐ ÐÑÐÑÐÐ ÐÐ ÑÐÑÑÐÑÐÐÐÑÐ Ð ÐÐÑÐÐÑÐ: %s\n"
 "ÐÐÐÐÑÐÐ: %s"
 
-#: ../camel/camel-url.c:316
+#: ../camel/camel-url.c:330
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÑÐ â%sâ"
 
-#: ../camel/camel-vee-folder.c:1235 ../camel/camel-vee-folder.c:1398
+#: ../camel/camel-vee-folder.c:1279 ../camel/camel-vee-folder.c:1442
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÑÑÐÐÐÐ ÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐ ÐÐÑÐÐÑÐ ÐÑÐ ÐÐÑÑÑÐÐÐÐÑÐ ÐÐÐÐÐ"
 
-#: ../camel/camel-vee-folder.c:1271
+#: ../camel/camel-vee-folder.c:1315
 #, c-format
 msgid "No such message %s in %s"
 msgstr "ÐÑÐÐ ÑÐÐÐÐÐ ÐÐÑÐÐ %s Ð %s"
 
-#: ../camel/camel-vee-folder.c:1339
+#: ../camel/camel-vee-folder.c:1383
 #, c-format
 msgid "Error storing '%s': "
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÐÐÐÐÑÐ ÐÐ â%sâ: "
 
-#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
-#: ../camel/camel-vee-store.c:322
+#. Translators: 'Unmatched' is a folder name under Search folders where are shown
+#. all messages not belonging into any other configured search folder
+#: ../camel/camel-vee-store.c:37
 msgid "Unmatched"
 msgstr "ÐÐÑÑÐÐÐÐÐÑÐ"
 
-#: ../camel/camel-vee-store.c:393
+#: ../camel/camel-vee-store.c:376
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÐ: %s: ÐÑÐÐ ÑÐÐÐÐÐ ÐÐÐÐÐ"
 
-#: ../camel/camel-vee-store.c:427
+#: ../camel/camel-vee-store.c:410
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐ: %s: ÐÑÐÐ ÑÐÐÐÐÐ ÐÐÐÐÐ"
@@ -2849,283 +2954,24 @@ msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÑÐ Ð ÐÐÑÑÐÑ
 msgid "Cannot copy messages to the Junk folder"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÑÐ Ð ÐÐÐÐÐÑÐ ÐÐ ÑÐÐÐ"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:954
-#: ../camel/providers/imap/camel-imap-folder.c:392
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐ â%sâ"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1030
-#, c-format
-msgid "Checking for deleted messages %s"
-msgstr "ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÑÑÐÑÐ ÐÐÑÐÐ %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1517
-#: ../camel/providers/groupwise/camel-groupwise-store.c:665
-#: ../camel/providers/groupwise/camel-groupwise-store.c:796
-#: ../camel/providers/imap/camel-imap-folder.c:3962
-#: ../camel/providers/imap/camel-imap-folder.c:4044
-#: ../camel/providers/imapx/camel-imapx-server.c:3871
-#: ../camel/providers/imapx/camel-imapx-server.c:4002
-#, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "ÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÑÐÑ ÐÐ ÐÐÐÐ ÐÐÑÐÐ Ð %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1987
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2040
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2704
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2714
-#, c-format
-msgid "Could not get message"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐÑÐ"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2424
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2474
-#, c-format
-msgid "Cannot append message to folder '%s': %s"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐÑÐ ÐÑÐ ÐÐÐÐÐÑÐ â%sâ: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2460
-#, c-format
-msgid "Cannot create message: %s"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐÐ: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ: %s\n"
-"  %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
-#: ../camel/providers/local/camel-maildir-folder.c:100
-#: ../camel/providers/local/camel-maildir-folder.c:307
-#: ../camel/providers/local/camel-mbox-folder.c:117
-#: ../camel/providers/local/camel-mbox-folder.c:325
-#: ../camel/providers/local/camel-mh-folder.c:156
-msgid "No such message"
-msgstr "ÐÑÐÐ ÑÐÐÐÐÐ ÐÐÑÐÐ"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2659
-#: ../camel/providers/nntp/camel-nntp-folder.c:246
-#: ../camel/providers/nntp/camel-nntp-folder.c:413
-#: ../camel/providers/pop3/camel-pop3-folder.c:457
-#, c-format
-msgid "Cannot get message %s: "
-msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ %s:"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2677
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2687
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2890
-#, c-format
-msgid "This message is not available in offline mode."
-msgstr "ÐÐÐÐ ÐÐÑÐÐ ÐÐ Ð ÐÐÐÐÑÐÐ Ð ÑÐÐÐÐ âÐÐÐÐÑÑÐÐâ."
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:248
-#, c-format
-msgid "Cannot get folder container %s"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐÑÐ %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:318
-#, c-format
-msgid "Cannot append message in offline mode: cache unavailable"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐ Ð ÑÐÐÐÐ âÐÐÐÐÑÑÐÐâ: ÐÑÐÐ ÐÐÐÐÑÐÐ ÐÐÑ"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:335
-msgid "Cannot append message in offline mode: "
-msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐ Ð ÑÐÐÐÐ âÐÐÐÐÑÑÐÐâ: "
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
-msgid "Checking for new mail"
-msgstr "ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐ"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
-#: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
-msgid "C_heck for new messages in all folders"
-msgstr "ÐÑÐÐÐÑÐÐ ÐÐ _ÐÐÐÐ ÐÐÑÐÐ ÐÑÐ ÐÑÐÑÐÐ ÐÐÐÐÐ"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imapx/camel-imapx-provider.c:72
-#: ../camel/providers/local/camel-local-provider.c:42
-#: ../camel/providers/local/camel-local-provider.c:84
-#: ../camel/providers/local/camel-local-provider.c:105
-msgid "Options"
-msgstr "ÐÐÑÑÑÐÐÐÐ"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
-msgid "_Apply filters to new messages in Inbox on this server"
-msgstr ""
-"_ÐÑÐÐÐÐÐÐÐ ÐÐ ÑÐÐÑÑÐ ÑÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐÑÐÐ Ð ÐÐÑÐÐÑÐÐÑÐ ÐÑÑÐÑ ÐÐ ÑÐÐÐ ÑÑÑÐÑÑ"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
-msgid "Check new messages for J_unk contents"
-msgstr "ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÑÐÐ ÐÐ _ÑÐÐÐ"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imapx/camel-imapx-provider.c:78
-msgid "Only check for Junk messages in the IN_BOX folder"
-msgstr "ÐÑÐÐÐÑÐÐ ÐÐ ÑÐÐÐ ÑÐÐÐ ÐÑÐ _ÐÑÐÐÑÑÐÑÐ ÐÐÑÐ (INBOX)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
-msgid "Automatically synchroni_ze account locally"
-msgstr "ÐÐÑÐÐÐÑÐÑÐÐ ÑÐÐ_ÑÑÐÐÐÐÐÑÐÐÐ ÐÐ ÑÐÐÐÑÑÑÐÑÐÑÑÐ ÐÐÐÐÐÐÐ"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
-msgid "SOAP Settings"
-msgstr "ÐÐÑÑÑÐÐÐÐ ÐÐ SOAP"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
-msgid "Post Office Agent SOAP _Port:"
-msgstr "_ÐÐÑÑ ÐÐ ÐÐÑÐÐÑÐÐÑ ÐÐÐÐÑ ÑÑÑ SOAP:"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:80
-msgid "Default GroupWise port"
-msgstr "ÐÑÐÐÐÐÑÑÐÐ ÐÐÑÑ ÐÐ GroupWise"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:86
-msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:88
-msgid "For accessing Novell GroupWise servers"
-msgstr "ÐÐ ÐÐÑÑÑÐ ÐÐ ÑÑÑÐÑÑÐ Novell GroupWise"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:105
-#: ../camel/providers/imap/camel-imap-provider.c:105
-#: ../camel/providers/imapx/camel-imapx-provider.c:113
-#: ../camel/providers/nntp/camel-nntp-provider.c:80
-#: ../camel/providers/pop3/camel-pop3-provider.c:81
-msgid "Password"
-msgstr "ÐÐÑÐÐÐ"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:107
-msgid ""
-"This option will connect to the GroupWise server using a plaintext password."
-msgstr ""
-"ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐ ÐÐ ÑÐÑÑÐÐ Ñ ÑÑÑÐÑÑ GroupWise ÑÑÐÐ ÐÐÑÐÑÑÐÑÐÐÐ ÐÐÑÐÐÐ."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:103
-#, c-format
-msgid "Host or user not available in url"
-msgstr "ÐÐÑÑÑÑ ÐÐÐ ÐÐÑÑÐÐÐÑÐÐÑÑ ÐÐ ÑÐ ÐÐÐÐÑÐÐ Ð ÐÐÑÐÑÐ"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:205
-#: ../camel/providers/imap/camel-imap-store.c:801
-#: ../camel/providers/imapx/camel-imapx-server.c:3085
-#, c-format
-msgid "You did not enter a password."
-msgstr "ÐÐ ÑÑÐ ÐÑÐÐÐÐ ÐÐÑÐÐÐ."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:328
-msgid "Some features may not work correctly with your current server version"
-msgstr ""
-"ÐÑÐÐÐÐÐÐ Ð ÐÑÐÐÐ ÑÑÐÐÑÐÐ ÐÐ ÐÐ ÑÐÐÐÑÑÑ ÐÑÐÐÐÐÐÐ Ñ ÑÐÐÑÑÐÑÐ ÐÐÑÑÐÑ ÐÐ ÑÑÑÐÑÑÐ"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:556
-#: ../camel/providers/imap/camel-imap-store.c:1808
-#: ../camel/providers/imap/camel-imap-store.c:2005
-#: ../camel/providers/imapx/camel-imapx-store.c:341
-#, c-format
-msgid "No such folder %s"
-msgstr "ÐÑÐÐ ÑÐÐÐÐÐ ÐÐÐÐÐ â%sâ"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1217
-#, c-format
-msgid "Cannot create GroupWise folders in offline mode."
-msgstr "ÐÐ ÐÐÐÐ ÐÐ ÑÑÐÐÐÐÐÑÐ ÐÐÐÐÐ Ð GroupWise ÐÐÐÐÑÐ ÑÑÐ Ð ÑÐÐÐÐ âÐÐÐÐÑÑÐÐâ."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1226
-#, c-format
-msgid "Cannot create a special system folder"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÑÐÐÑÐÐÐÐÐ, ÑÐÑÑÐÐÐÐ ÐÐÐÐÐ"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1236
-#: ../camel/providers/imap/camel-imap-store.c:1886
-#: ../camel/providers/imap/camel-imap-store.c:2323
-#: ../camel/providers/imapx/camel-imapx-store.c:1340
-#, c-format
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "ÐÐ ÑÐÐÐÑÐÐÑÐÐÑÐ ÐÐÐÐÐ ÐÐ Ð ÑÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐ ÐÐÐÐÐÐÐÐ"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1321
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1346
-#, c-format
-msgid "Cannot rename GroupWise folder '%s' to '%s'"
-msgstr "ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐÑÐÐÑÐ ÐÐÐÐÐÑÐ â%sâ Ð GroupWise ÐÐ â%sâ"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1380
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:47
-#, c-format
-msgid "GroupWise server %s"
-msgstr "ÐÑÑÐÑÑ ÐÐ GroupWise %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
-#, c-format
-msgid "GroupWise service for %s on %s"
-msgstr "ÐÑÐÑÐÐ ÐÐ GroupWise ÐÐ %s ÐÐ %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:51
-#, c-format
-msgid "GroupWise mail delivery via %s"
-msgstr "ÐÐÑÐ ÐÐ Groupwise ÐÑÐÐ %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:97
-msgid "Sending Message"
-msgstr "ÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐ"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:107
-#, c-format
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐ: ÐÑÐÑÐÐ ÐÐÐÑÐÑÐÑ ÐÐ ÑÐÐÐ ÑÑÐÐÐÐÐÑÐ"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
-#, c-format
-msgid ""
-"You have exceeded this account's storage limit. Your messages are queued in "
-"your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
-"of your mail.\n"
-msgstr ""
-"ÐÑÐÐÐÑÐÐÐ ÑÑÐ ÐÐÐÑÐÑÐ ÑÐ ÐÑ ÐÑÑÑÐ ÐÐ ÑÐÐÐ ÑÐÐÐÑÑÑÐÑÐÑ. ÐÐÑÐÐÑÐ ÐÐ ÑÐ Ð "
-"ÐÐÐÑÐÐÑÐ ÐÐ ÐÐÐÑÐÑÐÐÐ. ÐÐÐÑÐÐÑÐ ÑÐ ÐÐ ÐÐ ÐÑÐÑÐÑÐ ÑÐÐÐ ÐÐÑÐ ÐÐÑÑÐÐÑÐ ÐÐÐ "
-"ÐÑÑÐÐÐÑÐÑÐ ÑÐÑÑ ÐÑ ÐÐÑÐÐÑÐ.\n"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:159
-#, c-format
-msgid "Could not send message: %s"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐ: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:197
-#: ../camel/providers/imap/camel-imap-command.c:301
+#: ../camel/providers/imap/camel-imap-command.c:198
+#: ../camel/providers/imap/camel-imap-command.c:293
 #, c-format
 msgid "No output stream"
 msgstr "ÐÐÐÑÐÐ ÐÐÑÐÐÑÑ ÐÐÑÐÐ"
 
-#: ../camel/providers/imap/camel-imap-command.c:205
-#: ../camel/providers/imap/camel-imap-command.c:309
+#: ../camel/providers/imap/camel-imap-command.c:206
+#: ../camel/providers/imap/camel-imap-command.c:301
 #, c-format
 msgid "No input stream"
 msgstr "ÐÐÐÑÐÐ ÐÑÐÐÑÑ ÐÐÑÐÐ"
 
-#: ../camel/providers/imap/camel-imap-command.c:255
-#, c-format
-msgid "Operation cancelled"
-msgstr "ÐÐÐÑÑÐÐÐÑÐ Ð ÐÑÐÐÐÐÐÐ"
-
-#: ../camel/providers/imap/camel-imap-command.c:373
+#: ../camel/providers/imap/camel-imap-command.c:365
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "ÐÑÑÐÑÑÑÑ ÐÐÐÑÐÐÐÐÐÐ ÑÐ ÐÐÐÐÑÑÐ: %s"
 
-#. for imap ALERT codes, account user host
-#. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:394
+#: ../camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -3134,79 +2980,92 @@ msgstr ""
 "ÐÑÐÐÑÐÑÐÐÐÐÐÐÐ ÐÑ ÑÑÑÐÑÑÐ ÐÐ IMAP %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:468
+#: ../camel/providers/imap/camel-imap-command.c:471
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "ÐÐÐÑÐÐÐÐÐ ÐÑÐÐÐÐÑ ÐÑ ÑÑÑÐÑÑÐ ÐÐ IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:480
+#: ../camel/providers/imap/camel-imap-command.c:483
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐÐ ÐÐ IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:560
+#: ../camel/providers/imap/camel-imap-command.c:563
 #, c-format
 msgid "Server response ended too soon."
 msgstr "ÐÑÐÐÐÐÑÑÑ ÐÐ ÑÑÑÐÑÑÐ ÐÐÐÑÑÑÐ ÑÐÑÑÐÐ ÐÑÑÐÐ."
 
-#: ../camel/providers/imap/camel-imap-command.c:771
+#: ../camel/providers/imap/camel-imap-command.c:774
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "ÐÑÑÐÑÑÑÑ ÐÐ IMAP ÐÐ ÑÑÐÑÑÐÐ ÐÐÑÐÑÐÐÑÐÑ ÑÐÐ %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:809
+#: ../camel/providers/imap/camel-imap-command.c:812
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "ÐÐÐÑÐÐÐÐÐ ÐÑÐÐÐÐÑ OK ÐÑ ÑÑÑÐÑÑÐ ÐÐ IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:292
+#: ../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:369
+#: ../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:992
-#: ../camel/providers/imapx/camel-imapx-server.c:3915
+#: ../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:1049
+#: ../camel/providers/imapx/camel-imapx-server.c:4007
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "ÐÑÐÐÐÑÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐ ÐÐÑÐÐ Ð %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3369
+#: ../camel/providers/imap/camel-imap-folder.c:3454
 msgid "Unable to retrieve message: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐÑÐ: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:3404
-#: ../camel/providers/imapx/camel-imapx-server.c:5193
+#: ../camel/providers/imap/camel-imap-folder.c:3489
+#: ../camel/providers/imapx/camel-imapx-server.c:5280
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ Ñ ÐÐÐÐÑÐÑÐÐÐÑÐÑ %s: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3405
-#: ../camel/providers/imapx/camel-imapx-server.c:5194
+#: ../camel/providers/imap/camel-imap-folder.c:3490
+#: ../camel/providers/imapx/camel-imapx-server.c:5281
 msgid "No such message available."
 msgstr "ÐÑÐÐ ÑÐÐÐÐÐ ÐÐÑÐÐ."
 
-#: ../camel/providers/imap/camel-imap-folder.c:3480
-#: ../camel/providers/imap/camel-imap-folder.c:4375
-#: ../camel/providers/nntp/camel-nntp-folder.c:402
+#: ../camel/providers/imap/camel-imap-folder.c:3565
+#: ../camel/providers/imap/camel-imap-folder.c:4483
+#: ../camel/providers/nntp/camel-nntp-folder.c:407
 #, c-format
 msgid "This message is not currently available"
 msgstr "ÐÐÐÐ ÐÐÑÐÐ ÐÐ Ð ÐÐÐÐÑÐÐ Ð ÐÐÐÐÐÑÐ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4176
+#: ../camel/providers/imap/camel-imap-folder.c:4067
+#: ../camel/providers/imap/camel-imap-folder.c:4150
+#: ../camel/providers/imapx/camel-imapx-server.c:3965
+#: ../camel/providers/imapx/camel-imapx-server.c:4115
+#, c-format
+msgid "Fetching summary information for new messages in %s"
+msgstr "ÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÑÐÑ ÐÐ ÐÐÐÐ ÐÐÑÐÐ Ð %s"
+
+#: ../camel/providers/imap/camel-imap-folder.c:4284
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "ÐÐÐÑÐÐÐ ÐÑÐÐÐÐÑ ÐÑ ÑÑÑÐÑÑÐ: ÐÑÐÐ ÐÐÐÐÐ ÐÐ ÐÐÑÐÐ %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4186
+#: ../camel/providers/imap/camel-imap-folder.c:4294
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "ÐÐÐÑÐÐÐ ÐÑÐÐÐÐÑ ÐÑ ÑÑÑÐÑÑÐ: ÐÐÑÐÐ %d ÐÑÐÐ ÑÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4415
+#: ../camel/providers/imap/camel-imap-folder.c:4523
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ÑÑÐÐÑÐ ÐÐ ÐÐÑÐÐÑÐ Ð ÐÑÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÐÐÑÐ FETCH."
@@ -3226,7 +3085,7 @@ msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐ %s: %s"
 msgid "Failed to cache message %s: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐ %s: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:529
+#: ../camel/providers/imap/camel-imap-message-cache.c:531
 #, c-format
 msgid "Failed to cache %s: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐ %s: "
@@ -3236,6 +3095,11 @@ msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐ %s: "
 msgid "Checking for New Mail"
 msgstr "ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐ"
 
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
+msgid "C_heck for new messages in all folders"
+msgstr "ÐÑÐÐÐÑÐÐ ÐÐ _ÐÐÐÐ ÐÐÑÐÐ ÐÑÐ ÐÑÐÑÐÐ ÐÐÐÐÐ"
+
 #: ../camel/providers/imap/camel-imap-provider.c:44
 #: ../camel/providers/imapx/camel-imapx-provider.c:48
 msgid "Ch_eck for new messages in subscribed folders"
@@ -3275,11 +3139,30 @@ msgstr "Ð_ÑÐÑÐÐ ÐÐ ÐÑÐÑÑÑÐÐÑÑÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐ ÐÐ
 msgid "Names_pace:"
 msgstr "_ÐÑÐÑÑÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐ:"
 
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imapx/camel-imapx-provider.c:72
+#: ../camel/providers/local/camel-local-provider.c:42
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:105
+msgid "Options"
+msgstr "ÐÐÑÑÑÐÐÐÐ"
+
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
+msgid "_Apply filters to new messages in Inbox on this server"
+msgstr ""
+"_ÐÑÐÐÐÐÐÐÐ ÐÐ ÑÐÐÑÑÐ ÑÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐÑÐÐ Ð ÐÐÑÐÐÑÐÐÑÐ ÐÑÑÐÑ ÐÐ ÑÐÐÐ ÑÑÑÐÑÑ"
+
 #: ../camel/providers/imap/camel-imap-provider.c:68
 #: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "Check new messages for Jun_k contents"
 msgstr "ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÑÐÐ ÐÐ _ÑÐÐÐ"
 
+#: ../camel/providers/imap/camel-imap-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:78
+msgid "Only check for Junk messages in the IN_BOX folder"
+msgstr "ÐÑÐÐÐÑÐÐ ÐÐ ÑÐÐÐ ÑÐÐÐ ÐÑÐ _ÐÑÐÐÑÑÐÑÐ ÐÐÑÐ (INBOX)"
+
 #: ../camel/providers/imap/camel-imap-provider.c:72
 #: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Automatically synchroni_ze remote mail locally"
@@ -3303,86 +3186,85 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "ÐÐ ÑÐÑÐÐÐ Ð ÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐ ÐÐ ÑÑÑÐÑÑÐ ÐÐ IMAP."
 
+#: ../camel/providers/imap/camel-imap-provider.c:105
+#: ../camel/providers/imapx/camel-imapx-provider.c:113
+#: ../camel/providers/nntp/camel-nntp-provider.c:80
+#: ../camel/providers/pop3/camel-pop3-provider.c:81
+msgid "Password"
+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 ÑÑÐÐ ÐÐÑÐÑÑÐÑÐÐÐ ÐÐÑÐÐÐ."
 
-#: ../camel/providers/imap/camel-imap-store.c:243
-#: ../camel/providers/nntp/camel-nntp-store.c:342
-#: ../camel/providers/pop3/camel-pop3-store.c:135
-#: ../camel/providers/smtp/camel-smtp-transport.c:151
-#, c-format
-msgid "Could not connect to %s: %s"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ Ñ %s: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:244
-#: ../camel/providers/nntp/camel-nntp-store.c:343
-#: ../camel/providers/pop3/camel-pop3-store.c:136
-#: ../camel/providers/smtp/camel-smtp-transport.c:152
-msgid "SSL unavailable"
-msgstr "ÐÐÐÑÐÐ SSL"
-
-#: ../camel/providers/imap/camel-imap-store.c:264
-#: ../camel/providers/nntp/camel-nntp-store.c:362
-#, c-format
-msgid "Could not connect to %s: "
-msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ Ñ %s: "
+#. 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:370
-#: ../camel/providers/imap/camel-imap-store.c:390
-#: ../camel/providers/imap/camel-imap-store.c:397
-#: ../camel/providers/imap/camel-imap-store.c:424
-#: ../camel/providers/imapx/camel-imapx-server.c:2927
-#: ../camel/providers/imapx/camel-imapx-server.c:2967
+#: ../camel/providers/imap/camel-imap-store.c: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:371
-#: ../camel/providers/imapx/camel-imapx-server.c:2928
-#: ../camel/providers/smtp/camel-smtp-transport.c:238
+#: ../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:391
-#: ../camel/providers/imapx/camel-imapx-server.c:2968
-msgid "SSL negotiations failed"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐ SSL"
-
-#: ../camel/providers/imap/camel-imap-store.c:398
-#: ../camel/providers/smtp/camel-smtp-transport.c:285
-msgid "SSL is not available in this build"
-msgstr "Ð ÑÐÐÐ ÐÐÐÐÐÐÐÑ ÐÐÐÑÐÐ SSL"
-
-#: ../camel/providers/imap/camel-imap-store.c:549
-#: ../camel/providers/imapx/camel-imapx-server.c:2755
+#: ../camel/providers/imap/camel-imap-store.c:374
+#: ../camel/providers/imapx/camel-imapx-server.c:3038
 #, c-format
-msgid "Connection cancelled"
-msgstr "ÐÑÑÐÐÐÑÐ Ð ÐÑÐÐÑÐÑÐÐÐ"
+msgid "Failed to connect to IMAP server %s in secure mode: "
+msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ ÑÑÑ ÑÑÑÐÑÑÐ ÐÐ IMAP %s Ð ÑÐÐÑÑÐÐ ÑÐÐÐÐ: "
 
-#: ../camel/providers/imap/camel-imap-store.c:554
-#: ../camel/providers/imapx/camel-imapx-server.c:2760
-#, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ Ñ ÐÐÐÐÐÐÐ â%sâ: %s"
+#: ../camel/providers/imap/camel-imap-store.c: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:740
-#: ../camel/providers/imapx/camel-imapx-server.c:3041
+#: ../camel/providers/imap/camel-imap-store.c:707
+#: ../camel/providers/imapx/camel-imapx-server.c:3132
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "ÐÑÑÐÑÑÑÑ ÐÐ IMAP %s ÐÐ ÐÐÐÐÑÑÐÐ ÐÐÑÐÐÐÐÑ ÑÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:752
-#: ../camel/providers/imapx/camel-imapx-server.c:3053
-#: ../camel/providers/smtp/camel-smtp-transport.c:420
+#: ../camel/providers/imap/camel-imap-store.c:718
+#: ../camel/providers/imapx/camel-imapx-server.c:3144
+#: ../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:836
-#: ../camel/providers/imapx/camel-imapx-server.c:3129
+#: ../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:777
+#: ../camel/providers/imapx/camel-imapx-server.c:3188
+#, c-format
+msgid "You did not enter a password."
+msgstr "ÐÐ ÑÑÐ ÐÑÐÐÐÐ ÐÐÑÐÐÐ."
+
+#: ../camel/providers/imap/camel-imap-store.c:818
+#: ../camel/providers/imapx/camel-imapx-server.c:3233
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3393,69 +3275,69 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:997
-#: ../camel/providers/imapx/camel-imapx-store.c:182
+#: ../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:1001
-#: ../camel/providers/imapx/camel-imapx-store.c:184
+#: ../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:1367
-#: ../camel/providers/imap/camel-imap-store.c:2416
-#: ../camel/providers/imapx/camel-imapx-store.c:371
-#: ../camel/providers/imapx/camel-imapx-store.c:793
-#: ../camel/providers/local/camel-maildir-folder.c:409
-#: ../camel/providers/local/camel-maildir-store.c:273
-#: ../camel/providers/local/camel-maildir-store.c:615
-#: ../camel/providers/local/camel-maildir-store.c:621
-#: ../camel/providers/local/camel-maildir-store.c:669
-#: ../camel/providers/local/camel-spool-store.c:289
-msgid "Inbox"
-msgstr "ÐÐÑÐÐÑÐÐ ÐÑÑÐÑ"
+#: ../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:1822
-#: ../camel/providers/imap/camel-imap-store.c:2259
-#: ../camel/providers/imapx/camel-imapx-store.c:1319
+#: ../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\""
 msgstr "ÐÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐ â%sâ Ð ÐÐÐÑÐÐÐÐÐÐ, ÐÐÑÐÑÐ ÑÑÐÑÑÐÐ ÐÐÐÐÐ â%câ"
 
-#: ../camel/providers/imap/camel-imap-store.c:1939
+#: ../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:2093
 #: ../camel/providers/local/camel-maildir-store.c:244
-#: ../camel/providers/local/camel-mbox-store.c:407
-#: ../camel/providers/local/camel-mh-store.c:504
+#: ../camel/providers/local/camel-mbox-store.c:416
+#: ../camel/providers/local/camel-mh-store.c:547
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "ÐÐÐÐÐÑÐ â%sâ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÑÑÐÐÐÐÐÐÐ: ÐÐÑÐ ÑÑÑÐÑÑÐÑÐÐ."
 
-#: ../camel/providers/imap/camel-imap-store.c:2272
-#: ../camel/providers/imapx/camel-imapx-store.c:1330
+#: ../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:3137
+#: ../camel/providers/imap/camel-imap-store.c:3214
 #, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "ÐÑÑÐÑÑÑÑ ÐÐÐÑÐÐÐÐÐÐ ÐÑÐÐÑÐÑÐ ÐÑÑÐÐÐÑÐ"
 
-#: ../camel/providers/imap/camel-imap-store.c:3140
+#: ../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"
@@ -3489,31 +3371,26 @@ msgstr "ÐÑÐÐÐÐÑÑÐÐ ÐÐÑÑ ÐÐ IMAP"
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1404
+#: ../camel/providers/imapx/camel-imapx-server.c:1476
 msgid "Error writing to cache stream: "
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÐÐÑÐ Ð ÐÐÑÐÐÐ ÐÐ ÐÐÑÐ: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2083
+#: ../camel/providers/imapx/camel-imapx-server.c:2182
 #, c-format
 msgid "Not authenticated"
 msgstr "ÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2850
-#, c-format
-msgid "Could not connect to %s (port %s): "
-msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ Ñ %s (ÐÐÑÑ %s): "
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3311
+#: ../camel/providers/imapx/camel-imapx-server.c:3405
 msgid "Closing tmp stream failed: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÐÑÑÐÐ ÐÐ ÐÑÐÐÐÐÐÐÑ ÐÐÑÐÐ: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5343
-#: ../camel/providers/imapx/camel-imapx-server.c:5358
+#: ../camel/providers/imapx/camel-imapx-server.c:5426
+#: ../camel/providers/imapx/camel-imapx-server.c:5441
 msgid "Cannot create spool file: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐ-ÑÐÑÐÐÑ: "
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1135
-#: ../camel/providers/nntp/camel-nntp-store.c:1666
+#: ../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"
@@ -3544,7 +3421,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 "ÐÐÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐÐÑÐ ÐÐ ÑÑÐÐÑÐ ÐÐ ÐÐÑÐÐÑÐ"
 
@@ -3582,7 +3459,7 @@ 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 "ÐÑÐÐÐÐÐÐÐ ÐÐ _ÑÐÐÑÑÐ ÐÐ ÐÐÐÐ ÑÑÐÐÑÐÐÐÑ ÐÑÐ ÐÑÐÐÑÑÐÑÐ ÐÐÑÐ (INBOX)"
 
@@ -3594,17 +3471,17 @@ 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 "ÐÑÐÐÐÐÑÑÐÐ ÐÐ âÐÐÐÐÑâ ÐÐÑÐÐÑÐÐ ÑÐÐÐ (ÑÐÑÐÐÑ 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."
@@ -3614,76 +3491,84 @@ msgstr ""
 "ÐÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐÐ Ð ÐÐ ÐÑÐÑÐÑÐÐÐÑÐ ÐÐ ÐÑÑÐÐ ÐÑ ÐÐÐÐÐ ÐÑÐ ÑÐÑÐÐÑ 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:174
-#: ../camel/providers/local/camel-local-store.c:319
+#: ../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:204
+#, c-format
+msgid "Local mail file %s"
+msgstr "ÐÐÐÐÐÐÐ ÑÐÐÐ Ñ ÐÐÑÐ %s"
+
+#: ../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:526
-#: ../camel/providers/local/camel-spool-store.c:318
+#: ../camel/providers/local/camel-mbox-store.c:534
+#: ../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:183
+#: ../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:194
-#: ../camel/providers/local/camel-local-store.c:204
-#: ../camel/providers/local/camel-local-store.c:332
+#: ../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:220
+#: ../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:281
-#, c-format
-msgid "Local mail file %s"
-msgstr "ÐÐÐÐÐÐÐ ÑÐÐÐ Ñ ÐÐÑÐ %s"
-
-#: ../camel/providers/local/camel-local-store.c:393
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐ %s ÐÐ %s: %s"
-
-#: ../camel/providers/local/camel-local-store.c:467
-#, c-format
-msgid "Could not rename '%s': %s"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÐÐÑÐÐÐÐ ÐÐ â%sâ: %s"
-
-#: ../camel/providers/local/camel-local-store.c:498
-#: ../camel/providers/local/camel-mbox-store.c:695
+#: ../camel/providers/local/camel-local-store.c: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:526
-#: ../camel/providers/local/camel-mbox-store.c:724
+#: ../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:549
+#, c-format
+msgid "Could not rename '%s': %s"
+msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÐÐÑÐÐÐÐ ÐÐ â%sâ: %s"
+
 #: ../camel/providers/local/camel-local-summary.c:548
 #, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐ ÐÑÐ ÐÐÐÐÑÐÐÐÐ: ÐÐÐÐÐÐÑÑÐÐ ÐÑÐÑÐÐÐ"
 
-#: ../camel/providers/local/camel-maildir-folder.c:198
+#: ../camel/providers/local/camel-maildir-folder.c:100
+#: ../camel/providers/local/camel-maildir-folder.c: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
+msgid "No such message"
+msgstr "ÐÑÐÐ ÑÐÐÐÐÐ ÐÐÑÐÐ"
+
+#: ../camel/providers/local/camel-maildir-folder.c:223
 #, c-format
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐÑÐ Ð ÐÐÐÐÐ ÑÐÐ maildir: %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:246
-#: ../camel/providers/local/camel-maildir-folder.c:256
+#: ../camel/providers/local/camel-maildir-folder.c:271
+#: ../camel/providers/local/camel-maildir-folder.c:281
 #: ../camel/providers/local/camel-mbox-folder.c:386
 #: ../camel/providers/local/camel-mh-folder.c:168
 #: ../camel/providers/local/camel-mh-folder.c:178
@@ -3691,7 +3576,7 @@ msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐÑÐ Ð ÐÐÐÐÐ Ñ
 msgid "Cannot get message %s from folder %s: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ: %s ÐÑ ÐÐÐÐÐ %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:326
+#: ../camel/providers/local/camel-maildir-folder.c:351
 #, c-format
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "ÐÐÑÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÑÐÑÐÑÑÐÐ Ð ÑÐÐÐÐÐÑÐ ÐÐÐÐÐ: %s"
@@ -3703,29 +3588,29 @@ msgstr ""
 "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ: %s: ÐÐÐÑÐ ÐÐ ÐÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÑÑÐÑÑÐÐ â.â"
 
 #: ../camel/providers/local/camel-maildir-store.c:109
-#: ../camel/providers/local/camel-maildir-store.c:686
+#: ../camel/providers/local/camel-maildir-store.c:722
 #, c-format
 msgid "Folder %s already exists"
 msgstr "ÐÐÐÐÐÑÐ â%sâ ÐÐÑÐ ÑÑÑÐÑÑÐÑÐÐ"
 
 #: ../camel/providers/local/camel-maildir-store.c:191
 #: ../camel/providers/local/camel-maildir-store.c:222
-#: ../camel/providers/local/camel-mbox-store.c:375
-#: ../camel/providers/local/camel-mbox-store.c:389
+#: ../camel/providers/local/camel-mbox-store.c:384
+#: ../camel/providers/local/camel-mbox-store.c:398
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:206
-#: ../camel/providers/local/camel-mbox-store.c:341
-#: ../camel/providers/local/camel-mh-store.c:464
+#: ../camel/providers/local/camel-mbox-store.c:350
+#: ../camel/providers/local/camel-mh-store.c: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:351
-#: ../camel/providers/local/camel-mh-store.c:473
+#: ../camel/providers/local/camel-mbox-store.c:360
+#: ../camel/providers/local/camel-mh-store.c:511
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ: ÐÐÐÐÐÑÐ ÐÐ ÑÑÑÐÑÑÐÑÐÐ."
@@ -3737,7 +3622,7 @@ msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ: ÐÐ Ð
 
 #: ../camel/providers/local/camel-maildir-store.c:293
 #: ../camel/providers/local/camel-maildir-store.c:333
-#: ../camel/providers/local/camel-mh-store.c:584
+#: ../camel/providers/local/camel-mh-store.c:649
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ: %s"
@@ -3746,17 +3631,17 @@ msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ: %s"
 msgid "not a maildir directory"
 msgstr "ÐÐ Ð ÐÐÐÐÐ ÑÐÐ maildir"
 
-#: ../camel/providers/local/camel-maildir-store.c:508
-#: ../camel/providers/local/camel-maildir-store.c:825
-#: ../camel/providers/local/camel-spool-store.c:143
-#: ../camel/providers/local/camel-spool-store.c:159
+#: ../camel/providers/local/camel-maildir-store.c:510
+#: ../camel/providers/local/camel-maildir-store.c:874
+#: ../camel/providers/local/camel-spool-store.c:161
+#: ../camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr ""
 "ÐÐÑÑÐÐÑÐÐ ÑÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-maildir-store.c:677
+#: ../camel/providers/local/camel-maildir-store.c:713
 #, c-format
 msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
 msgstr ""
@@ -3778,8 +3663,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:690
-#: ../camel/providers/local/camel-mbox-summary.c:826
+#: ../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 "ÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ"
@@ -3799,39 +3684,39 @@ 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"
 
-#: ../camel/providers/local/camel-mbox-store.c:363
-#: ../camel/providers/local/camel-mbox-store.c:534
+#: ../camel/providers/local/camel-mbox-store.c:372
+#: ../camel/providers/local/camel-mbox-store.c:542
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐÐÐÐ Ñ ÑÐÐÐÐÐ ÐÐÐ."
 
-#: ../camel/providers/local/camel-mbox-store.c:400
+#: ../camel/providers/local/camel-mbox-store.c:409
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ: ÐÐ Ð ÐÐÐÐÐÐÐÐÐ ÑÐÐÐ."
 
-#: ../camel/providers/local/camel-mbox-store.c:550
+#: ../camel/providers/local/camel-mbox-store.c:558
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:566
+#: ../camel/providers/local/camel-mbox-store.c:574
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:568
+#: ../camel/providers/local/camel-mbox-store.c:576
 msgid "Folder already exists"
 msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐ ÑÑÑÐÑÑÐÑÐÐ"
 
-#: ../camel/providers/local/camel-mbox-store.c:609
-#: ../camel/providers/local/camel-mbox-store.c:622
-#: ../camel/providers/local/camel-mbox-store.c:651
+#: ../camel/providers/local/camel-mbox-store.c:619
+#: ../camel/providers/local/camel-mbox-store.c:632
+#: ../camel/providers/local/camel-mbox-store.c:661
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3840,89 +3725,89 @@ msgstr ""
 "ÐÐÑÑÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐ â%sâ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:632
+#: ../camel/providers/local/camel-mbox-store.c:642
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "â%sâ ÐÐ Ð ÐÐÐÐÐÐÐÐÐ ÑÐÐÐ."
 
-#: ../camel/providers/local/camel-mbox-store.c:641
+#: ../camel/providers/local/camel-mbox-store.c:651
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "ÐÐÐÐÐÑÐ â%sâ ÐÐ Ð ÐÑÐÐÐÐ. ÐÐ Ð ÐÐÑÑÐÑÐ."
 
-#: ../camel/providers/local/camel-mbox-store.c:667
-#: ../camel/providers/local/camel-mbox-store.c:681
+#: ../camel/providers/local/camel-mbox-store.c:678
+#: ../camel/providers/local/camel-mbox-store.c:693
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÑÐÐÐ Ñ ÐÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:761
+#: ../camel/providers/local/camel-mbox-store.c:775
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "ÐÐÐÐÑÐ ÐÐÐ ÐÐ ÐÐÐÐÐÑÐ Ð ÐÐÐÑÐÐÐÐÐÐ."
 
-#: ../camel/providers/local/camel-mbox-store.c:776
+#: ../camel/providers/local/camel-mbox-store.c:791
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÐÐÑÐÐÐÐ ÐÐ â%sâ: â%sâ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:859
+#: ../camel/providers/local/camel-mbox-store.c:874
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÐÐÑÐÐÐÐ ÐÑ â%sâ ÐÐ %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:476
+#: ../camel/providers/local/camel-mbox-summary.c:478
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐÑÐ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:537
+#: ../camel/providers/local/camel-mbox-summary.c:539
 #, c-format
 msgid "Fatal mail parser error near position %s in folder %s"
 msgstr "ÐÐÑÐÐÐÐ ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÐÐÑÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐ %s Ð ÐÐÐÐÐ %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:622
+#: ../camel/providers/local/camel-mbox-summary.c:628
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:697
-#: ../camel/providers/local/camel-mbox-summary.c:833
+#: ../camel/providers/local/camel-mbox-summary.c: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:711
+#: ../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:728
-#: ../camel/providers/local/camel-mbox-summary.c:949
+#: ../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:739
+#: ../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:756
+#: ../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:846
-#: ../camel/providers/local/camel-mbox-summary.c:1099
+#: ../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:886
-#: ../camel/providers/local/camel-mbox-summary.c:1131
+#: ../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 "
@@ -3931,25 +3816,25 @@ msgstr ""
 "ÐÐÐÐÑÑ MBOX Ð ÑÐÐÐÐÐÐÐ, ÐÐÐÑÐÐÐÑÐ ÐÐ. (ÐÑÐÐÐÐÑÐ ÑÐ ÑÐÐ ÐÐÐÐÑÐÐÑ Ñ "
 "âFromâ (ÐÑ), ÐÐ ÑÐÐÑÐ ÐÐ ÐÐ ÐÐÐÑÑÐÐ.)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:895
-#: ../camel/providers/local/camel-mbox-summary.c:1140
+#: ../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:1052
+#: ../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:1210
-#: ../camel/providers/local/camel-mbox-summary.c:1240
+#: ../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:1229
+#: ../camel/providers/local/camel-mbox-summary.c:1263
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐÐÐÐ ÐÑÐ ÐÑÐÐÐÐÐÐ ÐÑÑÐÑ: %s: %s"
@@ -3959,12 +3844,12 @@ msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐÐÐÐ ÐÑÐ ÐÑÐÐÐÐÐÐ ÐÑÑÐÑ
 msgid "Cannot append message to mh folder: %s: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐ ÐÑÐ ÐÐÐÐÐ MH: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:483
+#: ../camel/providers/local/camel-mh-store.c:522
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:497
+#: ../camel/providers/local/camel-mh-store.c:539
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ: ÐÐ Ð ÐÐÐÐÐ."
@@ -3974,22 +3859,12 @@ msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ: ÐÐ Ð
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐ ÑÐÐ MH: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:327
-#, c-format
-msgid "Spool '%s' cannot be opened: %s"
-msgstr "ÐÐÑÐÐÑÑÑ â%sâ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÑÐÐÑÐÐ: %s"
-
-#: ../camel/providers/local/camel-spool-store.c:341
-#, c-format
-msgid "Spool '%s' is not a regular file or directory"
-msgstr "ÐÐÑÐÐÑÑÑ â%sâ ÐÐ Ð ÐÐÐÐÐÐÐÐÐ ÑÐÐÐ ÐÐÐ ÐÐÐÐÐ"
-
-#: ../camel/providers/local/camel-spool-store.c:357
+#: ../camel/providers/local/camel-spool-store.c:347
 #, c-format
 msgid "Spool mail file %s"
 msgstr "ÐÐÐÐ-ÑÐÑÐÐÑ %s"
 
-#: ../camel/providers/local/camel-spool-store.c:357
+#: ../camel/providers/local/camel-spool-store.c:350
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "ÐÑÑÐÐ Ñ ÐÐÐÐÐ-ÑÐÑÐÐÑ %s"
@@ -3999,7 +3874,7 @@ msgstr "ÐÑÑÐÐ Ñ ÐÐÐÐÐ-ÑÐÑÐÐÑ %s"
 msgid "Folder '%s/%s' does not exist."
 msgstr "ÐÐÐÐÐÑÐ â%s/%sâ ÐÐ ÑÑÑÐÑÑÐÑÐÐ."
 
-#: ../camel/providers/local/camel-spool-store.c:403
+#: ../camel/providers/local/camel-spool-store.c:405
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -4008,12 +3883,12 @@ msgstr ""
 "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐÑÐ â%sâ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:409
+#: ../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:416
+#: ../camel/providers/local/camel-spool-store.c:418
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -4022,26 +3897,36 @@ msgstr ""
 "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ â%sâ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:426
+#: ../camel/providers/local/camel-spool-store.c:430
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "â%sâ Ð ÐÐÐÑÐÐÐÐÐÐ ÑÐÐÐ ÑÐÐ mailbox."
 
-#: ../camel/providers/local/camel-spool-store.c:462
+#: ../camel/providers/local/camel-spool-store.c:478
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "ÐÑÑÐÑÑÐ ÐÐ ÐÐÐÐÑÑÐÐ ÐÐÐÐÐ ÐÐ ÐÑÐÐÑÑÐ ÐÐÑÐÐ"
 
-#: ../camel/providers/local/camel-spool-store.c:476
+#: ../camel/providers/local/camel-spool-store.c:492
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "ÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÐÑÐÐÑ ÐÐÑÑÐÑÐ"
 
-#: ../camel/providers/local/camel-spool-store.c:491
+#: ../camel/providers/local/camel-spool-store.c:507
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "ÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÐÑÐÐÑ ÐÑÐÐÐÐÐÑÐÐÐÐ"
 
+#: ../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:596
+#, c-format
+msgid "Spool '%s' is not a regular file or directory"
+msgstr "ÐÐÑÐÐÑÑÑ â%sâ ÐÐ Ð ÐÐÐÐÐÐÐÐÐ ÑÐÐÐ ÐÐÐ ÐÐÐÐÐ"
+
 #: ../camel/providers/local/camel-spool-summary.c:169
 #: ../camel/providers/local/camel-spool-summary.c:181
 #: ../camel/providers/local/camel-spool-summary.c:193
@@ -4065,40 +3950,47 @@ msgstr ""
 "ÐÐÑÑÐÐÑÐÐ ÑÐÐÑÑÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÑÐ-ÑÐÑÐÐÑ â%sâ: %s\n"
 "ÐÐÐÐÐÑÐ ÐÐÐÐ ÐÐ Ð ÐÐÐÑÐÐÐÐÐ, ÐÐÐÐÐÑÐ Ð ÐÐÐÐÐÐÐÐ Ð â%sâ"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:195
-#: ../camel/providers/nntp/camel-nntp-folder.c:274
-#: ../camel/providers/nntp/camel-nntp-folder.c:388
+#: ../camel/providers/nntp/camel-nntp-folder.c:194
+#: ../camel/providers/nntp/camel-nntp-folder.c:279
+#: ../camel/providers/nntp/camel-nntp-folder.c:393
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "ÐÑÑÑÐÑÐÐ ÐÑÐÑÐÐ: ÑÐÐÐÐÐÐÐÑÑ ÐÐÐÐÑÐÑÐÐÐÑÐÑ Ð Ñ ÐÐÐÑÐÐÐÐÐÐ ÑÐÑÐÐÑ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:236
-#: ../camel/providers/nntp/camel-nntp-folder.c:240
-#: ../camel/providers/pop3/camel-pop3-folder.c:371
-#: ../camel/providers/pop3/camel-pop3-folder.c:436
-#: ../camel/providers/pop3/camel-pop3-folder.c:448
-#: ../camel/providers/pop3/camel-pop3-folder.c:697
+#: ../camel/providers/nntp/camel-nntp-folder.c:241
+#: ../camel/providers/nntp/camel-nntp-folder.c:245
+#: ../camel/providers/pop3/camel-pop3-folder.c:429
+#: ../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:472
-#: ../camel/providers/nntp/camel-nntp-folder.c:478
-#: ../camel/providers/nntp/camel-nntp-folder.c:525
+#: ../camel/providers/nntp/camel-nntp-folder.c:251
+#: ../camel/providers/nntp/camel-nntp-folder.c:418
+#: ../camel/providers/pop3/camel-pop3-folder.c:366
+#: ../camel/providers/pop3/camel-pop3-folder.c:418
+#: ../camel/providers/pop3/camel-pop3-folder.c:438
+#, c-format
+msgid "Cannot get message %s: "
+msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ %s:"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:477
+#: ../camel/providers/nntp/camel-nntp-folder.c:483
+#: ../camel/providers/nntp/camel-nntp-folder.c:530
 #, c-format
 msgid "Posting failed: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÐÑÐÐÐ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:520
+#: ../camel/providers/nntp/camel-nntp-folder.c:525
 msgid "Posting failed: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÐÑÐÐÐ: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:549
+#: ../camel/providers/nntp/camel-nntp-folder.c:554
 #, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "ÐÐ ÐÐÐÐ ÐÐ ÐÐÐÑÐÑÐÑÐ ÑÑÐÑÐÐ ÐÐ NNTP ÐÐÐÐÑÐ ÑÑÐ Ð ÑÐÐÐÐ âÐÐÐÐÑÑÐÐâ!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:569
+#: ../camel/providers/nntp/camel-nntp-folder.c:574
 #, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐÑÐ ÑÑÐÑÐÐ ÐÑ ÐÐÐÐÐ ÑÐÐ NNTP!"
@@ -4137,32 +4029,32 @@ msgid ""
 msgstr ""
 "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐ ÐÐ ÑÐÑÑÐÐ ÑÑÑ ÑÑÑÐÑÑ ÑÐÐ NNTP ÑÑÐÐ ÐÐÑÐÑÑÐÑÐÐÐ ÐÐÑÐÐÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:73
+#: ../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:85
+#: ../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:375
+#: ../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:388
+#: ../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:582
+#: ../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:1100
+#: ../camel/providers/nntp/camel-nntp-store.c:1053
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4173,7 +4065,26 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1215
+#: ../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"
@@ -4184,7 +4095,7 @@ msgstr ""
 "\n"
 "ÐÑÐÐ ÑÐÐÐÐÐ ÐÑÑÐÐ. ÐÐÐ-ÐÐÑÐÑÑÐÐ ÐÐÐÑÐÐÐÑÑ ÐÐÐÐÑ Ð ÑÐÐÐÑÐÐÑÐÐ ÐÐÐÐÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1257
+#: ../camel/providers/nntp/camel-nntp-store.c:1380
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4195,89 +4106,69 @@ msgstr ""
 "\n"
 "ÐÑÑÐÐÑÐ ÐÐ ÑÑÑÐÑÑÐÑÐÐ!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1290
-#, c-format
-msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr ""
-"ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÑÐÐÐÐÐÑÐ ÐÐÐÐÐ Ð ÑÑÐÐÐÐÐÑÐ ÐÐ ÐÑÑÐÐ ÐÐÐÐÐÐ. ÐÐÐÑÑÐ ÑÐÐÐ ÑÐ "
-"ÐÐÐÐÐÑÐÐÑÐ."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1306
-#, c-format
-msgid "You cannot rename a folder in a News store."
-msgstr "ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐÐÐÑÐÐÑÐ ÐÐÐÐÐ Ð ÑÑÐÐÐÐÐÑÐ ÐÐ ÐÑÑÐÐ ÐÐÐÐÐÐ."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1323
-#, c-format
-msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr ""
-"ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐÑÐÐÑÐ ÐÐÐÐÐ Ð ÑÑÐÐÐÐÐÑÐ ÐÐ ÐÑÑÐÐ ÐÐÐÐÐÐ. ÐÐÐÑÑÐ ÑÐÐÐ "
-"ÐÑÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐÐÐÑÐ ÑÐ."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1535
+#: ../camel/providers/nntp/camel-nntp-store.c:1573
 msgid "NNTP Command failed: "
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐÐ NNTP ÐÑÐÐÐÐÐÐ: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1609
+#: ../camel/providers/nntp/camel-nntp-store.c:1647
 #, c-format
 msgid "Not connected."
 msgstr "ÐÐ ÑÑÐ ÑÐÑÑÐÐÐÐ."
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:232
-#: ../camel/providers/nntp/camel-nntp-summary.c:348
+#: ../camel/providers/nntp/camel-nntp-summary.c:235
+#: ../camel/providers/nntp/camel-nntp-summary.c:353
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐ ÑÑÐÑÐÐ"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:249
+#: ../camel/providers/nntp/camel-nntp-summary.c:251
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "ÐÐÐÑÐÐÐÐÐ ÐÑÐÐÐÐÑ ÐÑ ÑÑÑÐÑÑ ÐÑ âxoverâ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:365
+#: ../camel/providers/nntp/camel-nntp-summary.c:369
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "ÐÐÐÑÐÐÐÐÐ ÐÑÐÐÐÐÑ ÐÑ ÑÑÑÐÑÑ ÐÑ âheadâ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:410
+#: ../camel/providers/nntp/camel-nntp-summary.c:414
 #, c-format
 msgid "Operation failed: %s"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐ: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:277
-#: ../camel/providers/pop3/camel-pop3-folder.c:336
+#: ../camel/providers/pop3/camel-pop3-folder.c:283
+#: ../camel/providers/pop3/camel-pop3-folder.c:342
 #, c-format
 msgid "No message with UID %s"
 msgstr "ÐÑÐÐ ÐÐÑÐÐ Ñ ÐÐÐÐÑÐÑÐÐÐÑÐÑ %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:344
+#: ../camel/providers/pop3/camel-pop3-folder.c:350
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ ÐÐ POP %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:449
+#: ../camel/providers/pop3/camel-pop3-folder.c:430
 msgid "Unknown reason"
 msgstr "ÐÐÐÐÐÐÑÑÐÐ ÐÑÐÑÐÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:488
+#: ../camel/providers/pop3/camel-pop3-folder.c:470
 msgid "Retrieving POP summary"
 msgstr "ÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐ POP"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:511
-#, c-format
-msgid "Cannot get POP summary: %s"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐÑÐ ÐÐ POP: %s"
+#: ../camel/providers/pop3/camel-pop3-folder.c:485
+msgid "Cannot get POP summary: "
+msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐÑÐ ÐÐ POP: "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:563
+#: ../camel/providers/pop3/camel-pop3-folder.c:555
 msgid "Expunging old messages"
 msgstr "ÐÑÑÑÑÐÐÑÐÐÐÐ ÐÐ ÑÑÐÑÐÑÐ ÐÐÑÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:577
+#: ../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"
 msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐ"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:41
@@ -4333,42 +4224,42 @@ msgstr ""
 "POP ÐÐÑÐ Ð ÐÑÐ ÑÑÑÐÑÑÐ, ÐÐÐÑÐ ÐÐÑÐÑÐÐÑ, ÑÐ ÐÐÐÐÑÑÐÐÑ ÑÐÐÐ ÑÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ."
 
 #. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:98
+#: ../camel/providers/pop3/camel-pop3-store.c:83
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:181
+#: ../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:199
-#: ../camel/providers/pop3/camel-pop3-store.c:230
-#: ../camel/providers/pop3/camel-pop3-store.c:237
+#: ../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:200
+#: ../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:218
+#: ../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:231
-msgid "TLS negotiations failed"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐ TLS"
+#: ../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:238
+#: ../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:317
-#: ../camel/providers/pop3/camel-pop3-store.c:472
+#: ../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 "
@@ -4378,22 +4269,22 @@ msgstr ""
 "ÐÐÑÐÐÐÐÑÐ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ."
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:340
+#: ../camel/providers/pop3/camel-pop3-store.c: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:357
+#: ../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:374
+#: ../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:439
+#: ../camel/providers/pop3/camel-pop3-store.c:380
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4403,17 +4294,17 @@ msgstr ""
 "ÐÐÐÐÑÐÑÐÐÐÑÐÑ ÐÐ APOP. ÐÐÐ ÐÐÑÐÑÑÐÐÑÑ ÑÐÐÐ ÐÐ Ð ÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐ ÐÐ "
 "ÐÐÐÐÑÐÑÐÐÑÑÑÐ, ÑÐÑÑÐÐÑÐ ÑÐ Ñ ÐÐÑÐÑ ÐÐÐÐÐÐÑÑÑÐÑÐÑ."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:492
+#: ../camel/providers/pop3/camel-pop3-store.c:427
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending password: %s"
+"Error sending password: "
 msgstr ""
 "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ ÐÑÐ ÑÑÑÐÑÑÐ ÐÐ POP %s.\n"
-"ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÐÑÐÐÐÑÐ ÐÐ ÐÐÑÐÐÐ: %s"
+"ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÐÑÐÐÐÑÐ ÐÐ ÐÐÑÐÐÐ: "
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:505
+#: ../camel/providers/pop3/camel-pop3-store.c:437
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4423,7 +4314,7 @@ msgstr ""
 "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÐÑÐÐÐÑÐ ÐÐ ÐÐÑÑÐÐÐÑÐÐÑÐÐ ÐÐÐ %s"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:518
+#: ../camel/providers/pop3/camel-pop3-store.c:449
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4432,27 +4323,27 @@ msgstr ""
 "ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ ÐÑÐ ÑÑÑÐÑÑÐ ÐÐ POP %s.\n"
 "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÐÑÐÐÐÑÐ ÐÐ ÐÐÑÐÐÐ %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:558
+#: ../camel/providers/pop3/camel-pop3-store.c:492
 #, c-format
 msgid "POP3 server %s"
 msgstr "ÐÑÑÐÑÑ ÐÐ POP %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:562
+#: ../camel/providers/pop3/camel-pop3-store.c:495
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "ÐÑÑÐÑÑ ÐÐ POP ÐÐ %s ÐÐ %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:693
+#: ../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:720
+#: ../camel/providers/pop3/camel-pop3-store.c:653
 #, c-format
 msgid "No such folder '%s'."
 msgstr "ÐÐÐÐÐÐ ÐÐÐÐÐ ÐÐÐÑÐÐ â â%sâ."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:737
+#: ../camel/providers/pop3/camel-pop3-store.c:670
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 ÐÐ ÐÐÐÐÑÑÐÐ ÐÐÑÐÑÑÐÑ ÐÑ ÐÐÐÐÐ"
@@ -4534,40 +4425,44 @@ msgstr ""
 "ÐÐ ÐÐÑÑÐÐÐÐ ÐÐ ÐÐÑÐ ÑÑÐÐ ÑÐÑÑÐÐÐÐÐ ÐÑÐ ÐÑÐÐÐÐÑÐÐ ÑÐÐÐÑÐÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐ ÐÑÐÐ "
 "SMTP."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:193
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../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:191
 #: ../camel/providers/smtp/camel-smtp-transport.c:237
-#: ../camel/providers/smtp/camel-smtp-transport.c:277
-#: ../camel/providers/smtp/camel-smtp-transport.c:284
 #, 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:246
-#: ../camel/providers/smtp/camel-smtp-transport.c:259
-#: ../camel/providers/smtp/camel-smtp-transport.c:266
+#: ../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:357
+#: ../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:280
 #, c-format
 msgid "SMTP server %s"
 msgstr "ÐÑÑÐÑÑ ÐÐ SMTP %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:361
+#: ../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:408
+#: ../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:495
+#: ../camel/providers/smtp/camel-smtp-transport.c:437
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4578,192 +4473,187 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:613
+#: ../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:620
+#: ../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:624
+#: ../camel/providers/smtp/camel-smtp-transport.c:565
 msgid "Sending message"
 msgstr "ÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:649
+#: ../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:662
+#: ../camel/providers/smtp/camel-smtp-transport.c:603
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "ÐÐÑÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÐÑÐÑÐÐÐ: ÐÐÐÐ ÐÐÐ ÐÐÐÐÑÐ ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐ "
 "ÐÐÐÑÑÐÑÐÐÐ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:725
+#: ../camel/providers/smtp/camel-smtp-transport.c:706
 msgid "Syntax error, command unrecognized"
 msgstr "ÐÐÐÑÐÐÑÐÑÐÐ ÐÑÐÑÐÐ, ÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:708
 msgid "Syntax error in parameters or arguments"
 msgstr "ÐÐÐÑÐÐÑÐÑÐÐ ÐÑÐÑÐÐ Ð ÐÐÑÐÐÐÑÑÐÑÐ ÐÐÐ ÐÑÐÑÐÐÐÑÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:729
+#: ../camel/providers/smtp/camel-smtp-transport.c:710
 msgid "Command not implemented"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐ Ð ÑÐÐÐÐÐÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:731
+#: ../camel/providers/smtp/camel-smtp-transport.c:712
 msgid "Command parameter not implemented"
 msgstr "ÐÐÑÐÐÐÑÑÑÑÑ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ Ð ÑÐÐÐÐÐÐÑÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:733
+#: ../camel/providers/smtp/camel-smtp-transport.c:714
 msgid "System status, or system help reply"
 msgstr "ÐÑÐÐÐÐÑ ÑÑÑ ÑÑÑÑÐÑÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÐÑÐ ÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐÐÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:735
+#: ../camel/providers/smtp/camel-smtp-transport.c:716
 msgid "Help message"
 msgstr "ÐÐÐÐÑÐÐ ÑÑÐÐÑÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:737
+#: ../camel/providers/smtp/camel-smtp-transport.c:718
 msgid "Service ready"
 msgstr "ÐÑÐÑÐÐÑÐ Ð ÐÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:739
+#: ../camel/providers/smtp/camel-smtp-transport.c:720
 msgid "Service closing transmission channel"
 msgstr "ÐÑÐÑÐÐÑÐ ÐÐÑÐÐÑÐ ÐÑÐÑÐÑÑÐÑÑÐÑ ÐÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:741
+#: ../camel/providers/smtp/camel-smtp-transport.c:722
 msgid "Service not available, closing transmission channel"
 msgstr "ÐÑÐÑÐÐÑÐ ÐÐÐÑÐÐ, ÐÐÑÐÐÑÑÐÐ ÐÐ ÐÑÐÑÐÑÑÐÑÑÐÑ ÐÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:743
+#: ../camel/providers/smtp/camel-smtp-transport.c:724
 msgid "Requested mail action okay, completed"
 msgstr "ÐÐÑÐÐÐÐÑÐ ÐÐÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐ Ð ÐÐÑÐÐ, ÐÐÐÑÑÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
+#: ../camel/providers/smtp/camel-smtp-transport.c:726
 msgid "User not local; will forward to <forward-path>"
 msgstr "ÐÐÑÑÐÐÐÑÐÐÑÑ ÐÐ Ð ÐÐÐÐÐÐÐ: ÐÑÐÐÑÐÑÐÐÐ ÐÑÐ <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:747
+#: ../camel/providers/smtp/camel-smtp-transport.c:728
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "ÐÐÑÐÐÐÐÑÐ ÐÐÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐ ÐÐ Ð ÐÐÐÑÑÑÐÐÐ: ÐÐÐÑÐÐ ÐÐÑÐÐÑÐÐ ÐÑÑÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:749
+#: ../camel/providers/smtp/camel-smtp-transport.c:730
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "ÐÐÑÐÐÐÐÑÐ ÐÐÐÑÑÐÐÐ ÐÐ Ð ÐÐÐÑÑÑÐÐÐ: ÐÐÐÑÐÐ ÐÐÑÐÐÑÐÐ ÐÑÑÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:751
+#: ../camel/providers/smtp/camel-smtp-transport.c:732
 msgid "Requested action aborted: error in processing"
 msgstr "ÐÐÑÐÐÐÐÑÐ ÐÐÐÑÑÐÐÐ Ð ÐÑÐÐÑÑÐÐÑÐ: ÐÑÐÑÐÐ Ð ÐÐÑÐÐÐÑÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:753
+#: ../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:755
+#: ../camel/providers/smtp/camel-smtp-transport.c:736
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 "ÐÐÑÐÐÐÐÑÐ ÐÐÐÑÑÐÐÐ ÐÐ Ð ÐÐÐÑÑÑÐÐÐ: ÐÐÐÑÐ ÐÐ ÐÐÑÑÐÑÑÑÐÐ ÐÐÐÑÐ ÐÐ ÐÐÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:757
+#: ../camel/providers/smtp/camel-smtp-transport.c:738
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 "ÐÐÑÐÐÐÐÑÐ ÐÐÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐ Ð ÐÑÐÐÑÑÐÐÑÐ: ÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐÐÐÐÐÐ Ð ÐÐÐÐÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:759
+#: ../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:761
+#: ../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:763
+#: ../camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Transaction failed"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÑÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:767
+#: ../camel/providers/smtp/camel-smtp-transport.c:748
 msgid "A password transition is needed"
 msgstr "ÐÐÐÐÑÐÐÐÐÐ Ð ÐÑÐÐÑÐÐ ÐÐ ÐÐÑÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:769
+#: ../camel/providers/smtp/camel-smtp-transport.c:750
 msgid "Authentication mechanism is too weak"
 msgstr "ÐÐÑÐÐÐÐÐÑÑ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ Ð ÑÐÑÑÐÐ ÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:771
+#: ../camel/providers/smtp/camel-smtp-transport.c:752
 msgid "Encryption required for requested authentication mechanism"
 msgstr "ÐÐÐÐÐÐÐÐÑÑ ÐÐÑÐÐÐÐÑÐ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÐÐÑÐÐÐ ÑÐÑÑÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:773
+#: ../camel/providers/smtp/camel-smtp-transport.c:754
 msgid "Temporary authentication failure"
 msgstr "ÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1030
+#: ../camel/providers/smtp/camel-smtp-transport.c:1004
 msgid "SMTP Greeting"
 msgstr "ÐÐÐÐÑÐÐ ÐÐ SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1057
-#: ../camel/providers/smtp/camel-smtp-transport.c:1074
-#: ../camel/providers/smtp/camel-smtp-transport.c:1082
+#: ../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:1150
+#: ../camel/providers/smtp/camel-smtp-transport.c:1125
 msgid "SMTP Authentication"
 msgstr "ÐÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÐ SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1157
-#, c-format
-msgid "Error creating SASL authentication object."
-msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÑ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ ÐÐ SASL."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1176
-#: ../camel/providers/smtp/camel-smtp-transport.c:1187
-#: ../camel/providers/smtp/camel-smtp-transport.c:1196
+#: ../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:1304
-#: ../camel/providers/smtp/camel-smtp-transport.c:1318
-#: ../camel/providers/smtp/camel-smtp-transport.c:1327
+#: ../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:1354
+#: ../camel/providers/smtp/camel-smtp-transport.c:1326
 msgid "RCPT TO command failed: "
 msgstr "ÐÐÐÐÐÐÐÑÐ RCPT TO Ð ÐÐÑÑÐÐÑÐÐ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1370
-#: ../camel/providers/smtp/camel-smtp-transport.c:1379
+#: ../camel/providers/smtp/camel-smtp-transport.c: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:1421
-#: ../camel/providers/smtp/camel-smtp-transport.c:1431
-#: ../camel/providers/smtp/camel-smtp-transport.c:1441
-#: ../camel/providers/smtp/camel-smtp-transport.c:1500
-#: ../camel/providers/smtp/camel-smtp-transport.c:1519
-#: ../camel/providers/smtp/camel-smtp-transport.c:1532
-#: ../camel/providers/smtp/camel-smtp-transport.c:1540
+#: ../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:1565
-#: ../camel/providers/smtp/camel-smtp-transport.c:1579
-#: ../camel/providers/smtp/camel-smtp-transport.c:1587
+#: ../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:1612
-#: ../camel/providers/smtp/camel-smtp-transport.c:1626
-#: ../camel/providers/smtp/camel-smtp-transport.c:1633
+#: ../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 Ð ÐÐÑÑÐÐÑÐÐ: "
 
@@ -4879,11 +4769,121 @@ msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "ÐÐÑÐÐÐÐÐÐ"
 
+#: ../libedataserver/e-client.c:109
+msgctxt "ClientError"
+msgid "Invalid argument"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÑÐÐÐÑ"
+
+#: ../libedataserver/e-client.c:111
+msgctxt "ClientError"
+msgid "Backend is busy"
+msgstr "ÐÐÑÐÑÐ Ð ÐÐÐÑÐ"
+
+#: ../libedataserver/e-client.c:113
+msgctxt "ClientError"
+msgid "Source not loaded"
+msgstr "ÐÐÑÐÑÑÑ ÐÐ Ð ÐÐÑÐÐÐÐ"
+
+#: ../libedataserver/e-client.c:115
+msgctxt "ClientError"
+msgid "Source already loaded"
+msgstr "ÐÐÑÐÑÑÑ ÐÐÑÐ Ð ÐÐÑÐÐÐÐ"
+
+#: ../libedataserver/e-client.c:117
+msgctxt "ClientError"
+msgid "Authentication failed"
+msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ"
+
+#: ../libedataserver/e-client.c:119
+msgctxt "ClientError"
+msgid "Authentication required"
+msgstr "ÐÐÐÑÐÐÐ ÑÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ"
+
+#: ../libedataserver/e-client.c:121
+msgctxt "ClientError"
+msgid "Repository offline"
+msgstr "ÐÑÐÐÐÐÐÑÐÑÐ ÐÐ Ð ÐÐÐÐÑÐÐ"
+
+#: ../libedataserver/e-client.c:123
+msgctxt "ClientError"
+msgid "Offline unavailable"
+msgstr "ÐÐÐÑÐÐ ÑÐÐÐÑÐ Ð ÑÐÐÐÐ âÐÐÐÐÑÑÐÐâ"
+
+#: ../libedataserver/e-client.c:125
+msgctxt "ClientError"
+msgid "Permission denied"
+msgstr "ÐÐÑÑÑÐÑÑ Ð ÐÑÐÐÐÐÐ"
+
+#: ../libedataserver/e-client.c:127
+msgctxt "ClientError"
+msgid "Cancelled"
+msgstr "ÐÑÐÐÐÐÐÐ"
+
+#: ../libedataserver/e-client.c:129
+msgctxt "ClientError"
+msgid "Could not cancel"
+msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÑÐÐ"
+
+#: ../libedataserver/e-client.c:131
+msgctxt "ClientError"
+msgid "Not supported"
+msgstr "ÐÐ ÑÐ ÐÐÐÐÑÑÐÐ"
+
+#: ../libedataserver/e-client.c:133
+msgctxt "ClientError"
+msgid "Unsupported authentication method"
+msgstr "ÐÐÐÐÐÐÑÑÐÐÐ ÐÐÑÐÐ ÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ"
+
+#: ../libedataserver/e-client.c:135
+msgctxt "ClientError"
+msgid "TLS not available"
+msgstr "ÐÐÐÑÐÐ TLS"
+
+#: ../libedataserver/e-client.c:137
+msgctxt "ClientError"
+msgid "Search size limit exceeded"
+msgstr "ÐÐÐÑÐÐÐÐÐÐÑÑ ÑÐÐÐÐÑ ÐÐ ÑÑÑÑÐÐÐ Ð ÐÐÐÐÐÑÐÐ"
+
+#: ../libedataserver/e-client.c:139
+msgctxt "ClientError"
+msgid "Search time limit exceeded"
+msgstr "ÐÐÐÑÐÐÐÐÐÐÑÐ ÐÑÐÐÐ ÐÐ ÑÑÑÑÐÐÐ Ð ÐÐÐÐÐÑÐÐÐ"
+
+#: ../libedataserver/e-client.c:141
+msgctxt "ClientError"
+msgid "Invalid query"
+msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐ"
+
+#: ../libedataserver/e-client.c:143
+msgctxt "ClientError"
+msgid "Query refused"
+msgstr "ÐÐÑÐÐÐÑÐ Ð ÐÑÐÐÐÐÐÐ"
+
+#: ../libedataserver/e-client.c:145
+msgctxt "ClientError"
+msgid "D-Bus error"
+msgstr "ÐÑÐÑÐÐ ÐÐ D-Bus"
+
+#: ../libedataserver/e-client.c:147
+msgctxt "ClientError"
+msgid "Other error"
+msgstr "ÐÑÑÐÐ ÐÑÐÑÐÐ"
+
+#: ../libedataserver/e-client.c:149
+msgctxt "ClientError"
+msgid "Backend is not opened yet"
+msgstr "ÐÐÑÐÑÐ ÐÑÐ ÐÐ Ð ÑÑÐÑÑÐÑÐÐÐ"
+
+#: ../libedataserver/e-client.c:152
+msgctxt "ClientError"
+msgid "Unknown error"
+msgstr "ÐÐÐÐÐÐÑÑÐÐ ÐÑÐÑÐÐ"
+
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1931
+#: ../libedataserver/e-time-utils.c:1634 ../libedataserver/e-time-utils.c:1930
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%d.%m.%Y, %a, %I:%M:%S %p"
 
@@ -4891,7 +4891,7 @@ msgstr "%d.%m.%Y, %a, %I:%M:%S %p"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1922
+#: ../libedataserver/e-time-utils.c:1639 ../libedataserver/e-time-utils.c:1921
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%d.%m.%Y, %a, %H:%M:%S"
 
@@ -4899,7 +4899,7 @@ msgstr "%d.%m.%Y, %a, %H:%M:%S"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1927
+#: ../libedataserver/e-time-utils.c:1644 ../libedataserver/e-time-utils.c:1926
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%d.%m.%Y, %a, %I:%M %p"
 
@@ -4907,78 +4907,78 @@ msgstr "%d.%m.%Y, %a, %I:%M %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1918
+#: ../libedataserver/e-time-utils.c:1649 ../libedataserver/e-time-utils.c:1917
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%d.%m.%Y, %a, %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1655
+#: ../libedataserver/e-time-utils.c:1654
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%d.%m.%Y, %a, %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1660
+#: ../libedataserver/e-time-utils.c:1659
 msgid "%a %m/%d/%Y %H"
 msgstr "%d.%m.%Y, %a, %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1783
-#: ../libedataserver/e-time-utils.c:1913
+#: ../libedataserver/e-time-utils.c:1662 ../libedataserver/e-time-utils.c:1782
+#: ../libedataserver/e-time-utils.c:1912
 msgid "%a %m/%d/%Y"
 msgstr "%d.%m.%Y, %a"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1670
+#: ../libedataserver/e-time-utils.c:1669
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d.%m.%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1674
+#: ../libedataserver/e-time-utils.c:1673
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d.%m.%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1679
+#: ../libedataserver/e-time-utils.c:1678
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d.%m.%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1684
+#: ../libedataserver/e-time-utils.c:1683
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d.%m.%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1689
+#: ../libedataserver/e-time-utils.c:1688
 msgid "%m/%d/%Y %I %p"
 msgstr "%d.%m.%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1694
+#: ../libedataserver/e-time-utils.c:1693
 msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1786
+#: ../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:1855 ../libedataserver/e-time-utils.c:1975
+#: ../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:1859 ../libedataserver/e-time-utils.c:1967
+#: ../libedataserver/e-time-utils.c:1858 ../libedataserver/e-time-utils.c:1966
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4986,163 +4986,176 @@ msgstr "%H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1864 ../libedataserver/e-time-utils.c:1972
+#: ../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:1868 ../libedataserver/e-time-utils.c:1964
+#: ../libedataserver/e-time-utils.c:1867 ../libedataserver/e-time-utils.c:1963
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1871
+#: ../libedataserver/e-time-utils.c:1870
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1875
+#: ../libedataserver/e-time-utils.c:1874
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-book-auth-util.c:93
-#: ../libedataserverui/e-book-auth-util.c:673
+#: ../libedataserverui/e-book-auth-util.c:94
+#: ../libedataserverui/e-book-auth-util.c:651
 msgid "Accessing LDAP Server anonymously"
 msgstr "ÐÐÐÐÐÐÐÐ ÐÐÑÑÑÐ ÐÐ ÑÑÑÐÑÑ ÐÐ LDAP"
 
-#: ../libedataserverui/e-book-auth-util.c:199
-#: ../libedataserverui/e-book-auth-util.c:435
+#: ../libedataserverui/e-book-auth-util.c:191
+#: ../libedataserverui/e-book-auth-util.c:412
 msgid "Failed to authenticate.\n"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÐÑÑÐÐÐÑÑÐÐÐÐ.\n"
 
-#: ../libedataserverui/e-categories-dialog.c:127
-msgid "Category Properties"
-msgstr "ÐÐÑÑÑÐÐÐÐ ÐÐ ÐÐÑÐÐÐÑÐÑÑÐ"
+#: ../libedataserverui/e-categories-editor.c:221
+msgid "Currently _used categories:"
+msgstr "_ÐÐÐÑÑÐ ÐÐÐÐÐÐÐÐ ÐÐÑÐÐÐÑÐÐ:"
 
-#: ../libedataserverui/e-categories-dialog.c:138
-msgid "Category _Name"
-msgstr "Ð_ÐÐ ÐÐ ÐÐÑÐÐÐÑÐÑÑÐ"
+#: ../libedataserverui/e-categories-editor.c:230
+msgid "_Available Categories:"
+msgstr "_ÐÐÐÐÑÐÐ ÐÐÑÐÐÐÑÐÐ:"
 
-#: ../libedataserverui/e-categories-dialog.c:144
-msgid "Category _Icon"
-msgstr "_ÐÐÐÐÐ ÐÐ ÐÐÑÐÐÐÑÐÑÑÐ"
+#: ../libedataserverui/e-categories-selector.c:320
+msgid "Icon"
+msgstr "ÐÐÐÐÐ"
+
+#: ../libedataserverui/e-categories-selector.c:325
+msgid "Category"
+msgstr "ÐÐÑÐÐÐÑÐÑ"
+
+#: ../libedataserverui/e-category-completion.c:294
+#, c-format
+msgid "Create category \"%s\""
+msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐÐÐÑÐÑÑÐ â%sâ"
 
-#: ../libedataserverui/e-categories-dialog.c:185
+#: ../libedataserverui/e-category-editor.c:132
 msgid "Category Icon"
 msgstr "ÐÐÐÐÐ ÐÐ ÐÐÑÐÐÐÑÐÑÑÐ"
 
-#: ../libedataserverui/e-categories-dialog.c:191
+#: ../libedataserverui/e-category-editor.c:136
 msgid "_No Image"
 msgstr "_ÐÐÐ ÐÐÐÐÑÐÐÐÐÐÐ"
 
-#: ../libedataserverui/e-categories-dialog.c:406
+#: ../libedataserverui/e-category-editor.c:173
+msgid "Category _Name"
+msgstr "Ð_ÐÐ ÐÐ ÐÐÑÐÐÐÑÐÑÑÐ"
+
+#: ../libedataserverui/e-category-editor.c:181
+msgid "Category _Icon"
+msgstr "_ÐÐÐÐÐ ÐÐ ÐÐÑÐÐÐÑÐÑÑÐ"
+
+#: ../libedataserverui/e-category-editor.c:221
+msgid "Category Properties"
+msgstr "ÐÐÑÑÑÐÐÐÐ ÐÐ ÐÐÑÐÐÐÑÐÑÑÐ"
+
+#: ../libedataserverui/e-category-editor.c:282
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "Ð ÑÐÐÐ ÐÐÐÑÐÐÑÑÐÑÐÑ ÐÐÑÐ ÐÐÐ ÐÐÑÐÐÐÑÐÑ â%sâ. ÐÐÐÐÑÐÑÐ ÐÑÑÐÐ ÐÐÐ"
 
-#: ../libedataserverui/e-categories-dialog.c:661
-msgid "Currently _used categories:"
-msgstr "_ÐÐÐÑÑÐ ÐÐÐÐÐÐÐÐ ÐÐÑÐÐÐÑÐÐ:"
-
-#: ../libedataserverui/e-categories-dialog.c:668
-msgid "_Available Categories:"
-msgstr "_ÐÐÐÐÑÐÐ ÐÐÑÐÐÐÑÐÐ:"
-
-#: ../libedataserverui/e-categories-dialog.c:711
-msgid "_Edit"
-msgstr "_ÐÐÐÐÐÑÐÑÐÐÐ"
-
-#: ../libedataserverui/e-categories-dialog.c:768
-msgid "Icon"
-msgstr "ÐÐÐÐÐ"
+#: ../libedataserverui/e-client-utils.c:793
+#, c-format
+msgid ""
+"Enter password for %s (user %s)\n"
+"Reason: %s"
+msgstr ""
+"ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐ ÐÐ %s (ÐÐÑÑÐÐÐÑÐÐ â%sâ)\n"
+"ÐÑÐÑÐÐÐ: %s"
 
-#: ../libedataserverui/e-categories-dialog.c:773
-msgid "Category"
-msgstr "ÐÐÑÐÐÐÑÐÑ"
+#: ../libedataserverui/e-client-utils.c:887
+msgid "Enter Passphrase"
+msgstr "ÐÑÐÐÐÐÑÐ ÑÐÐÐÐ ÑÑÐÐÐ"
 
-#: ../libedataserverui/e-category-completion.c:294
-#, c-format
-msgid "Create category \"%s\""
-msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐÐÐÑÐÑÑÐ â%sâ"
+#: ../libedataserverui/e-client-utils.c:889
+msgid "Enter Password"
+msgstr "ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:176
+#: ../libedataserverui/e-name-selector-dialog.c:184
 msgid "Show Contacts"
 msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÑÐÑÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:198
+#: ../libedataserverui/e-name-selector-dialog.c:206
 msgid "Address B_ook:"
 msgstr "ÐÐÑÐÑÐÐ_Ð:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:206
+#: ../libedataserverui/e-name-selector-dialog.c:214
 msgid "Cate_gory:"
 msgstr "Ð_ÐÑÐÐÐÑÐÑ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:224
+#: ../libedataserverui/e-name-selector-dialog.c:232
 msgid "_Search:"
 msgstr "_ÐÑÑÑÐÐÐ:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:242
-#: ../libedataserverui/e-name-selector-dialog.c:977
+#: ../libedataserverui/e-name-selector-dialog.c:250
+#: ../libedataserverui/e-name-selector-dialog.c:1011
 msgid "Any Category"
 msgstr "ÐÐÑÑÐ Ð ÐÐ Ð ÐÐÑÐÐÐÑÐÑ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:244
+#: ../libedataserverui/e-name-selector-dialog.c:252
 msgid "Co_ntacts"
 msgstr "_ÐÐÐÑÐÐÑÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:289
+#: ../libedataserverui/e-name-selector-dialog.c:307
 msgid "Search"
 msgstr "ÐÑÑÑÐÐÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:292
+#: ../libedataserverui/e-name-selector-dialog.c:310
 msgid "Address Book"
 msgstr "ÐÐÑÐÑÐÐÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:295
+#: ../libedataserverui/e-name-selector-dialog.c:313
 msgid "Contacts"
 msgstr "ÐÐÐÑÐÐÑÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:412
+#: ../libedataserverui/e-name-selector-dialog.c:430
 msgid "Select Contacts from Address Book"
 msgstr "ÐÐÐÐÑ ÐÐ ÐÐÐÑÐÐÑÐ ÐÑ ÐÐÑÐÑÐÐÐÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:747
+#: ../libedataserverui/e-name-selector-dialog.c:766
 msgid "_Add"
 msgstr "_ÐÐÐÐÐÑÐÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:751
+#: ../libedataserverui/e-name-selector-dialog.c:770
 msgid "_Remove"
 msgstr "_ÐÑÐÐÐÑÐÐÐÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:891
+#: ../libedataserverui/e-name-selector-dialog.c:930
 #, c-format
 msgid "Error loading address book: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐÐ: %s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2661
+#: ../libedataserverui/e-name-selector-entry.c:2704
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "_ÐÑÑÑÐÑÐÐ ÑÐÐÑÐÑÑÐÐÐÐ ÐÐ %s"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2676
+#: ../libedataserverui/e-name-selector-entry.c:2719
 #, c-format
 msgid "Cop_y %s"
 msgstr "_ÐÐÐÐÑÐÐÐ ÐÐ %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2686
+#: ../libedataserverui/e-name-selector-entry.c:2729
 #, c-format
 msgid "C_ut %s"
 msgstr "ÐÑ_ÑÑÐÐÐÐÐ ÐÐ %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2703
+#: ../libedataserverui/e-name-selector-entry.c:2746
 #, c-format
 msgid "_Edit %s"
 msgstr "_ÐÐÐÐÐÑÐÑÐÐÐ ÐÐ %s"
@@ -5152,63 +5165,42 @@ msgstr "_ÐÐÐÐÐÑÐÑÐÐÐ ÐÐ %s"
 msgid "_Delete %s"
 msgstr "_ÐÐÑÑÐÐÐÐÐ ÐÐ %s"
 
-#: ../libedataserverui/e-passwords.c:127
-#, c-format
+#: ../libedataserverui/e-passwords.c:126
 msgid "Keyring key is unusable: no user or host name"
 msgstr ""
 "ÐÐÑÑÑÑ ÐÑ ÐÐÑÑÐÐÑÑÐÐÑÐÐÑ Ð ÐÐÐÐÐÐÐÐÐÐÐÐ: ÐÐÐÑÐÐ ÐÐÑÑÐÐÐÑÐÐ ÐÐÐ ÐÐÐ ÐÐ ÑÐÑÑ"
 
 # Ð gdm Ð ÑÐÐÐ.
-#: ../libedataserverui/e-passwords.c:701
+#: ../libedataserverui/e-passwords.c:699
 #: ../libedataserverui/e-passwords-win32.c:612
 msgid "You have the Caps Lock key on."
 msgstr "ÐÐÐÐÐÑÑÑ âCaps Lockâ Ð ÐÐÑÐÑÐÐÑ."
 
-#: ../libedataserverui/e-passwords.c:821
+#: ../libedataserverui/e-passwords.c:819
 #: ../libedataserverui/e-passwords-win32.c:735
 msgid "_Remember this passphrase"
-msgstr "_ÐÐÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐÐÑÐ"
+msgstr "_ÐÐÐÐÐÐÑÐÐ ÐÐ ÑÐÐÐÐÑÐ ÑÑÐÐÐ"
 
-#: ../libedataserverui/e-passwords.c:822
+#: ../libedataserverui/e-passwords.c:820
 #: ../libedataserverui/e-passwords-win32.c:736
 msgid "_Remember this passphrase for the remainder of this session"
-msgstr "ÐÐÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐÐÑÐ ÐÐ _ÐÑÐÑ ÐÐ ÑÐÐÐ ÑÐÑÐÑ"
+msgstr "ÐÐÐÐÐÐÑÐÐ ÐÐ ÑÐÐÐÐÑÐ ÑÑÐÐÐ ÐÐ _ÐÑÐÑ ÐÐ ÑÐÐÐ ÑÐÑÐÑ"
 
-#: ../libedataserverui/e-passwords.c:827
+#: ../libedataserverui/e-passwords.c:825
 #: ../libedataserverui/e-passwords-win32.c:741
 msgid "_Remember this password"
 msgstr "_ÐÐÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐÐÑÐ"
 
-#: ../libedataserverui/e-passwords.c:828
+#: ../libedataserverui/e-passwords.c:826
 #: ../libedataserverui/e-passwords-win32.c:742
 msgid "_Remember this password for the remainder of this session"
 msgstr "ÐÐÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐÐÑÐ ÐÐ _ÐÑÐÑ ÐÐ ÑÐÐÐ ÑÐÑÐÑ"
 
 #. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:100
+#: ../libedataserverui/e-source-selector-dialog.c:99
 msgid "Select destination"
 msgstr "ÐÐÐÐÑ ÐÐ ÑÐÐ"
 
-#: ../libedataserverui/e-source-selector-dialog.c:170
+#: ../libedataserverui/e-source-selector-dialog.c:169
 msgid "_Destination"
 msgstr "_ÐÐÐ"
-
-#: ../servers/groupwise/e-gw-connection.c:227
-msgid "Invalid connection"
-msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÑÑÐÐÐ"
-
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "Invalid response from server"
-msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÑÐÐÐÐÑ ÐÑ ÑÑÑÐÑÑÐ"
-
-#: ../servers/groupwise/e-gw-connection.c:233
-msgid "No response from the server"
-msgstr "ÐÐÐÑÐÐ ÐÑÐÐÐÐÑ ÐÑ ÑÑÑÐÑÑÐ"
-
-#: ../servers/groupwise/e-gw-connection.c:239
-msgid "Bad parameter"
-msgstr "ÐÐÑ ÐÐÑÐÐÐÑÑÑ"
-
-#: ../calendar/libecal/e-cal.c:1049
-msgid "On This Computer"
-msgstr "ÐÐ ÑÐÐÐ ÐÐÐÐÑÑÑÑ"



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