[evolution-data-server] Updated Russian translation



commit 892fc0d95fdaff58644115979ec7958e48f0a706
Author: Yuri Myasoedov <ymyasoedov yandex ru>
Date:   Sun Feb 15 16:53:00 2015 +0300

    Updated Russian translation

 po/ru.po | 2553 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 1335 insertions(+), 1218 deletions(-)
---
diff --git a/po/ru.po b/po/ru.po
index 0727766..62460d0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,15 +7,15 @@
 # Leonid Kanter <leon asplinux ru com>, 2004-2006, 2007.
 # Michael Yakhontov <mvy asplinux ru>, 2003.
 # Yuri Kozlov <yuray komyakino ru>, 2010, 2011, 2012.
-# Yuri Myasoedov <omerta13 yandex ru>, 2012, 2013.
+# Yuri Myasoedov <ymyasoedov yandex ru>, 2012, 2013, 2015.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server trunk\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
-"POT-Creation-Date: 2014-09-17 15:15+0000\n"
-"PO-Revision-Date: 2014-09-17 21:53+0400\n"
+"POT-Creation-Date: 2015-02-15 05:32+0000\n"
+"PO-Revision-Date: 2015-02-15 16:52+0300\n"
 "Last-Translator: Yuri Myasoedov <ymyasoedov yandex ru>\n"
 "Language-Team: русский <gnome-cyr gnome org>\n"
 "Language: ru\n"
@@ -23,8 +23,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 1.6.9\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"X-Generator: Gtranslator 2.91.6\n"
 
 #: ../addressbook/backends/file/e-book-backend-file.c:120
 #, c-format
@@ -42,7 +42,7 @@ msgid "Failed to create hardlink for resource '%s': %s"
 msgstr "Не удалось создать жёсткую ссылку для ресурса «%s»: %s"
 
 #: ../addressbook/backends/file/e-book-backend-file.c:524
-#: ../addressbook/backends/file/e-book-backend-file.c:1253
+#: ../addressbook/backends/file/e-book-backend-file.c:1256
 msgid "No UID in the contact"
 msgstr "В контакте нет UID"
 
@@ -56,121 +56,122 @@ msgid "Loading..."
 msgstr "Загрузка…"
 
 #: ../addressbook/backends/file/e-book-backend-file.c:992
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4360
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4350
 msgid "Searching..."
 msgstr "Поиск…"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1281
+#: ../addressbook/backends/file/e-book-backend-file.c:1284
 #, c-format
 msgid "Tried to modify contact '%s' with out of sync revision"
 msgstr "Попытка изменить контакт «%s» с рассинхронизированной ревизией"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1472
-#: ../addressbook/backends/file/e-book-backend-file.c:1555
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3077
-#: ../addressbook/libedata-book/e-book-sqlite.c:6742
+#: ../addressbook/backends/file/e-book-backend-file.c:1475
+#: ../addressbook/backends/file/e-book-backend-file.c:1560
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3083
+#: ../addressbook/libedata-book/e-book-sqlite.c:7270
+#: ../addressbook/libedata-book/e-book-sqlite.c:7339
 #, c-format
 msgid "Contact '%s' not found"
 msgstr "Контакт «%s» не найден"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1615
-#: ../addressbook/backends/file/e-book-backend-file.c:1696
+#: ../addressbook/backends/file/e-book-backend-file.c:1620
+#: ../addressbook/backends/file/e-book-backend-file.c:1701
 #, c-format
 msgid "Query '%s' not supported"
 msgstr "Запрос «%s» не поддерживается"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1624
-#: ../addressbook/backends/file/e-book-backend-file.c:1705
+#: ../addressbook/backends/file/e-book-backend-file.c:1629
+#: ../addressbook/backends/file/e-book-backend-file.c:1710
 #, c-format
 msgid "Invalid Query '%s'"
 msgstr "Недопустимый запрос «%s»"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1970
+#: ../addressbook/backends/file/e-book-backend-file.c:1975
 msgid "Requested to delete an unrelated cursor"
 msgstr "Запрошено удаление несвязанного курсора"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:2041
+#: ../addressbook/backends/file/e-book-backend-file.c:2046
 #, c-format
 msgid "Failed to rename old database from '%s' to '%s': %s"
 msgstr "Не удалось переименовать базу данных из «%s» в «%s»: %s"
 
 #: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1174
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4250
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:419
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:887
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:35
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1164
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4240
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:381
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:849
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:49
 #: ../addressbook/libebook-contacts/e-phone-number.c:56
 #: ../addressbook/libebook/e-book.c:1078
-#: ../addressbook/libebook/e-book-client.c:1882
-#: ../addressbook/libebook/e-book-client.c:2054
-#: ../addressbook/libebook/e-book-client.c:2267
-#: ../addressbook/libebook/e-book-client.c:2398
-#: ../addressbook/libebook/e-book-client.c:2557
-#: ../addressbook/libebook/e-book-client.c:2691
-#: ../addressbook/libebook/e-book-client.c:2822
-#: ../addressbook/libebook/e-book-client.c:2980
-#: ../addressbook/libebook/e-book-client.c:3175
-#: ../addressbook/libebook/e-book-client.c:3393
-#: ../addressbook/libedata-book/e-book-backend-sexp.c:878
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:583
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:614
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:626
+#: ../addressbook/libebook/e-book-client.c:2131
+#: ../addressbook/libebook/e-book-client.c:2303
+#: ../addressbook/libebook/e-book-client.c:2516
+#: ../addressbook/libebook/e-book-client.c:2647
+#: ../addressbook/libebook/e-book-client.c:2806
+#: ../addressbook/libebook/e-book-client.c:2940
+#: ../addressbook/libebook/e-book-client.c:3071
+#: ../addressbook/libebook/e-book-client.c:3229
+#: ../addressbook/libebook/e-book-client.c:3424
+#: ../addressbook/libebook/e-book-client.c:3642
+#: ../addressbook/libedata-book/e-book-backend-sexp.c:877
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:581
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:612
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:628
 #: ../calendar/backends/contacts/e-cal-backend-contacts.c:270
 #: ../calendar/libecal/e-cal.c:2334 ../calendar/libecal/e-cal-client.c:276
-#: ../calendar/libecal/e-cal-client.c:3239
-#: ../calendar/libecal/e-cal-client.c:3412
-#: ../calendar/libecal/e-cal-client.c:3676
-#: ../calendar/libecal/e-cal-client.c:3917
-#: ../calendar/libecal/e-cal-client.c:4107
-#: ../calendar/libecal/e-cal-client.c:4299
-#: ../calendar/libecal/e-cal-client.c:4469
-#: ../calendar/libecal/e-cal-client.c:4638
-#: ../calendar/libecal/e-cal-client.c:4841
-#: ../calendar/libecal/e-cal-client.c:4991
-#: ../calendar/libecal/e-cal-client.c:5185
-#: ../calendar/libecal/e-cal-client.c:5338
-#: ../calendar/libecal/e-cal-client.c:5555
-#: ../calendar/libecal/e-cal-client.c:5709
-#: ../calendar/libecal/e-cal-client.c:5935
-#: ../calendar/libecal/e-cal-client.c:6131
-#: ../calendar/libecal/e-cal-client.c:6494
-#: ../calendar/libecal/e-cal-client.c:6708
+#: ../calendar/libecal/e-cal-client.c:3479
+#: ../calendar/libecal/e-cal-client.c:3652
+#: ../calendar/libecal/e-cal-client.c:3916
+#: ../calendar/libecal/e-cal-client.c:4157
+#: ../calendar/libecal/e-cal-client.c:4347
+#: ../calendar/libecal/e-cal-client.c:4539
+#: ../calendar/libecal/e-cal-client.c:4709
+#: ../calendar/libecal/e-cal-client.c:4878
+#: ../calendar/libecal/e-cal-client.c:5081
+#: ../calendar/libecal/e-cal-client.c:5231
+#: ../calendar/libecal/e-cal-client.c:5425
+#: ../calendar/libecal/e-cal-client.c:5578
+#: ../calendar/libecal/e-cal-client.c:5795
+#: ../calendar/libecal/e-cal-client.c:5949
+#: ../calendar/libecal/e-cal-client.c:6175
+#: ../calendar/libecal/e-cal-client.c:6371
+#: ../calendar/libecal/e-cal-client.c:6734
+#: ../calendar/libecal/e-cal-client.c:6956
 #: ../camel/providers/imapx/camel-imapx-command.c:645
-#: ../camel/providers/imapx/camel-imapx-server.c:4784
-#: ../camel/providers/imapx/camel-imapx-server.c:4793
-#: ../libedataserver/e-client.c:185
+#: ../camel/providers/imapx/camel-imapx-server.c:4831
+#: ../camel/providers/imapx/camel-imapx-server.c:4840
+#: ../libedataserver/e-client.c:187
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:828
+#: ../addressbook/backends/google/e-book-backend-google.c:818
 msgid "Querying for updated contacts…"
 msgstr "Запрос обновлённых контактов…"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1010
+#: ../addressbook/backends/google/e-book-backend-google.c:1000
 msgid "Querying for updated groups…"
 msgstr "Запрос обновлённых групп…"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1757
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4997
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1433
+#: ../addressbook/backends/google/e-book-backend-google.c:1792
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4992
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1460
 msgid "The backend does not support bulk additions"
 msgstr "Драйвер не поддерживает общие добавления"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1912
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5133
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1545
+#: ../addressbook/backends/google/e-book-backend-google.c:1947
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5128
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1572
 msgid "The backend does not support bulk modifications"
 msgstr "Драйвер не поддерживает общие изменения"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2119
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1645
+#: ../addressbook/backends/google/e-book-backend-google.c:2154
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1672
 msgid "The backend does not support bulk removals"
 msgstr "Драйвер не поддерживает общие удаления"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2239
+#: ../addressbook/backends/google/e-book-backend-google.c:2274
 msgid "Loading…"
 msgstr "Загрузка…"
 
@@ -204,141 +205,141 @@ msgstr "Сотрудники"
 msgid "Not connected"
 msgstr "Не подключён"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:901
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:891
 msgid "Failed to bind using either v3 or v2 binds"
 msgstr "Сбой связывания при использовании модуля 2 или 3 версии"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1024
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1014
 msgid "Reconnecting to LDAP server..."
 msgstr "Повторное подключение к серверу LDAP…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1155
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1145
 msgid "Invalid DN syntax"
 msgstr "Недопустимый синтаксис в отличительном имени (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1171
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4249
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1161
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4239
 #, c-format
 msgid "LDAP error 0x%x (%s)"
 msgstr "Ошибка в LDAP 0x%x (%s)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1783
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2106
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1773
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2096
 #, c-format
 msgid "%s: NULL returned from ldap_first_entry"
 msgstr "%s: из ldap_first_entry возвращено значение NULL"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2036
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2164
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2026
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2154
 #, c-format
 msgid "%s: Unhandled result type %d returned"
 msgstr "%s: возвращён необработанный тип результата %d"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2297
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2424
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2287
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2414
 #, c-format
 msgid "%s: Unhandled search result type %d returned"
 msgstr "%s: возвращён необработанный тип результата поиска %d"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4198
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4188
 msgid "Receiving LDAP search results..."
 msgstr "Получение результатов поиска с сервера LDAP…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4382
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4372
 msgid "Error performing search"
 msgstr "Ошибка выполнения поиска"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4515
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4505
 #, c-format
 msgid "Downloading contacts (%d)..."
 msgstr "Загрузка контактов (%d)…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5080
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5075
 msgid "Adding contact to LDAP server..."
 msgstr "Создание контакта на сервере LDAP…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5155
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5150
 msgid "Modifying contact from LDAP server..."
 msgstr "Изменение контакта на сервере LDAP…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5221
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5216
 msgid "Removing contact from LDAP server..."
 msgstr "Удаление контакта с сервера LDAP…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5610
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5611
 #, c-format
 msgid "Failed to get the DN for user '%s'"
 msgstr "Не удалось получить DN для пользователя «%s»"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:864
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:826
 msgid "Loading Addressbook summary..."
 msgstr "Загрузка сводки об адресной книге…"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:884
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:846
 #, c-format
 msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
 msgstr "Метод PROPFIND завершился с ошибкой с кодом состояния HTTP: %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:903
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:865
 msgid "No response body in webdav PROPFIND result"
 msgstr "Тело ответа отсутствует в результатах работы метода webdav PROPFIND"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:964
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:926
 #, c-format
 msgid "Loading Contacts (%d%%)"
 msgstr "Загрузка контактов (%d%%)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1353
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1338
 msgid "Cannot transform SoupURI to string"
 msgstr "Не удалось преобразовать SoupURI в строку"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1474
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1501
 #, c-format
 msgid "Create resource '%s' failed with HTTP status %d (%s)"
 msgstr ""
 "При создании ресурса «%s» произошёл сбой с кодом состояния HTTP: %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1576
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1603
 msgid "Contact on server changed -> not modifying"
 msgstr "Контакт на сервере изменён -> нет изменения"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1584
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1611
 #, c-format
 msgid "Modify contact failed with HTTP status %d (%s)"
 msgstr ""
 "При изменении контакта произошла ошибка с кодом состояния HTTP: %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1677
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1693
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1704
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1720
 #, c-format
 msgid "DELETE failed with HTTP status %d"
 msgstr "Ошибка метода DELETE с кодом HTTP %d"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:24
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:38
 msgid "No such book"
 msgstr "Нет такой книги"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:26
-#: ../addressbook/libedata-book/e-data-book.c:371
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:40
+#: ../addressbook/libedata-book/e-data-book.c:379
 msgid "Contact not found"
 msgstr "Контакт не найден"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:28
-#: ../addressbook/libedata-book/e-data-book.c:372
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:42
+#: ../addressbook/libedata-book/e-data-book.c:380
 msgid "Contact ID already exists"
 msgstr "Идентификатор контакта уже существует"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:30
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:44
 msgid "No such source"
 msgstr "Нет такого источника"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:32
-#: ../addressbook/libedata-book/e-data-book.c:388
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:46
+#: ../addressbook/libedata-book/e-data-book.c:396
 msgid "No space"
 msgstr "Недостаточно места"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook-contacts/e-contact.c:131
+#: ../addressbook/libebook-contacts/e-contact.c:130
 msgid "Unique ID"
 msgstr "Уникальный ID"
 
@@ -346,12 +347,12 @@ msgstr "Уникальный ID"
 #. * so we can generate its value if necessary in the getter
 #. Translators: This is an EContact field description, in this case it's a
 #. * preferred user's description (or display name) of the contact. Note 'File' is a verb here.
-#: ../addressbook/libebook-contacts/e-contact.c:136
+#: ../addressbook/libebook-contacts/e-contact.c:135
 msgid "File Under"
 msgstr "Сохранить под"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook-contacts/e-contact.c:138
+#: ../addressbook/libebook-contacts/e-contact.c:137
 msgid "Book UID"
 msgstr "UID книги"
 
@@ -359,434 +360,434 @@ msgstr "UID книги"
 #. 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-contacts/e-contact.c:144
+#: ../addressbook/libebook-contacts/e-contact.c:143
 msgid "Full Name"
 msgstr "Полное имя"
 
-#: ../addressbook/libebook-contacts/e-contact.c:145
+#: ../addressbook/libebook-contacts/e-contact.c:144
 msgid "Given Name"
 msgstr "Имя"
 
-#: ../addressbook/libebook-contacts/e-contact.c:146
+#: ../addressbook/libebook-contacts/e-contact.c:145
 msgid "Family Name"
 msgstr "Фамилия"
 
-#: ../addressbook/libebook-contacts/e-contact.c:147
+#: ../addressbook/libebook-contacts/e-contact.c:146
 msgid "Nickname"
 msgstr "Псевдоним"
 
 #. Email fields
-#: ../addressbook/libebook-contacts/e-contact.c:150
+#: ../addressbook/libebook-contacts/e-contact.c:149
 msgid "Email 1"
 msgstr "Эл. почта 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:151
+#: ../addressbook/libebook-contacts/e-contact.c:150
 msgid "Email 2"
 msgstr "Эл. почта 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:152
+#: ../addressbook/libebook-contacts/e-contact.c:151
 msgid "Email 3"
 msgstr "Эл. почта 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:153
+#: ../addressbook/libebook-contacts/e-contact.c:152
 msgid "Email 4"
 msgstr "Эл. почта 4"
 
-#: ../addressbook/libebook-contacts/e-contact.c:155
+#: ../addressbook/libebook-contacts/e-contact.c:154
 msgid "Mailer"
 msgstr "Почтовый клиент"
 
 #. Address Labels
-#: ../addressbook/libebook-contacts/e-contact.c:158
+#: ../addressbook/libebook-contacts/e-contact.c:157
 msgid "Home Address Label"
 msgstr "Ярлык домашнего адреса"
 
-#: ../addressbook/libebook-contacts/e-contact.c:159
+#: ../addressbook/libebook-contacts/e-contact.c:158
 msgid "Work Address Label"
 msgstr "Ярлык рабочего адреса"
 
-#: ../addressbook/libebook-contacts/e-contact.c:160
+#: ../addressbook/libebook-contacts/e-contact.c:159
 msgid "Other Address Label"
 msgstr "Ярлык другого адреса"
 
 #. Phone fields
-#: ../addressbook/libebook-contacts/e-contact.c:163
+#: ../addressbook/libebook-contacts/e-contact.c:162
 msgid "Assistant Phone"
 msgstr "Телефон помощника"
 
-#: ../addressbook/libebook-contacts/e-contact.c:164
+#: ../addressbook/libebook-contacts/e-contact.c:163
 msgid "Business Phone"
 msgstr "Служебный телефон"
 
-#: ../addressbook/libebook-contacts/e-contact.c:165
+#: ../addressbook/libebook-contacts/e-contact.c:164
 msgid "Business Phone 2"
 msgstr "Служебный телефон 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:166
+#: ../addressbook/libebook-contacts/e-contact.c:165
 msgid "Business Fax"
 msgstr "Рабочий факс"
 
-#: ../addressbook/libebook-contacts/e-contact.c:167
+#: ../addressbook/libebook-contacts/e-contact.c:166
 msgid "Callback Phone"
 msgstr "Телефон для обратного звонка"
 
-#: ../addressbook/libebook-contacts/e-contact.c:168
+#: ../addressbook/libebook-contacts/e-contact.c:167
 msgid "Car Phone"
 msgstr "Телефон в машине"
 
-#: ../addressbook/libebook-contacts/e-contact.c:169
+#: ../addressbook/libebook-contacts/e-contact.c:168
 msgid "Company Phone"
 msgstr "Телефон компании"
 
-#: ../addressbook/libebook-contacts/e-contact.c:170
+#: ../addressbook/libebook-contacts/e-contact.c:169
 msgid "Home Phone"
 msgstr "Домашний телефон"
 
-#: ../addressbook/libebook-contacts/e-contact.c:171
+#: ../addressbook/libebook-contacts/e-contact.c:170
 msgid "Home Phone 2"
 msgstr "Домашний телефон 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:172
+#: ../addressbook/libebook-contacts/e-contact.c:171
 msgid "Home Fax"
 msgstr "Домашний Факс"
 
-#: ../addressbook/libebook-contacts/e-contact.c:173
+#: ../addressbook/libebook-contacts/e-contact.c:172
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook-contacts/e-contact.c:174
+#: ../addressbook/libebook-contacts/e-contact.c:173
 msgid "Mobile Phone"
 msgstr "Мобильный телефон"
 
-#: ../addressbook/libebook-contacts/e-contact.c:175
+#: ../addressbook/libebook-contacts/e-contact.c:174
 msgid "Other Phone"
 msgstr "Другие телефоны"
 
-#: ../addressbook/libebook-contacts/e-contact.c:176
+#: ../addressbook/libebook-contacts/e-contact.c:175
 msgid "Other Fax"
 msgstr "Другой факс"
 
-#: ../addressbook/libebook-contacts/e-contact.c:177
+#: ../addressbook/libebook-contacts/e-contact.c:176
 msgid "Pager"
 msgstr "Пейджер"
 
-#: ../addressbook/libebook-contacts/e-contact.c:178
+#: ../addressbook/libebook-contacts/e-contact.c:177
 msgid "Primary Phone"
 msgstr "Основной телефон"
 
-#: ../addressbook/libebook-contacts/e-contact.c:179
+#: ../addressbook/libebook-contacts/e-contact.c:178
 msgid "Radio"
 msgstr "Радио"
 
-#: ../addressbook/libebook-contacts/e-contact.c:180
+#: ../addressbook/libebook-contacts/e-contact.c:179
 msgid "Telex"
 msgstr "Телекс"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook-contacts/e-contact.c:182
+#: ../addressbook/libebook-contacts/e-contact.c:181
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook-contacts/e-contact.c:185
+#: ../addressbook/libebook-contacts/e-contact.c:184
 msgid "Organization"
 msgstr "Организация"
 
-#: ../addressbook/libebook-contacts/e-contact.c:186
+#: ../addressbook/libebook-contacts/e-contact.c:185
 msgid "Organizational Unit"
 msgstr "Подразделение организации"
 
-#: ../addressbook/libebook-contacts/e-contact.c:187
+#: ../addressbook/libebook-contacts/e-contact.c:186
 msgid "Office"
 msgstr "Офис"
 
-#: ../addressbook/libebook-contacts/e-contact.c:188
+#: ../addressbook/libebook-contacts/e-contact.c:187
 msgid "Title"
 msgstr "Заголовок"
 
-#: ../addressbook/libebook-contacts/e-contact.c:189
+#: ../addressbook/libebook-contacts/e-contact.c:188
 msgid "Role"
 msgstr "Должность"
 
-#: ../addressbook/libebook-contacts/e-contact.c:190
+#: ../addressbook/libebook-contacts/e-contact.c:189
 msgid "Manager"
 msgstr "Мeнеджер"
 
-#: ../addressbook/libebook-contacts/e-contact.c:191
+#: ../addressbook/libebook-contacts/e-contact.c:190
 msgid "Assistant"
 msgstr "Помощник"
 
 #. Web fields
-#: ../addressbook/libebook-contacts/e-contact.c:194
+#: ../addressbook/libebook-contacts/e-contact.c:193
 msgid "Homepage URL"
 msgstr "URL домашней страницы"
 
-#: ../addressbook/libebook-contacts/e-contact.c:195
+#: ../addressbook/libebook-contacts/e-contact.c:194
 msgid "Weblog URL"
 msgstr "URL веблога"
 
 #. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:198
+#: ../addressbook/libebook-contacts/e-contact.c:197
 msgid "Categories"
 msgstr "Категории"
 
 #. Collaboration fields
-#: ../addressbook/libebook-contacts/e-contact.c:201
+#: ../addressbook/libebook-contacts/e-contact.c:200
 msgid "Calendar URI"
 msgstr "URI календаря"
 
-#: ../addressbook/libebook-contacts/e-contact.c:202
+#: ../addressbook/libebook-contacts/e-contact.c:201
 msgid "Free/Busy URL"
 msgstr "Ссылка (URL) «свободен/занят»"
 
-#: ../addressbook/libebook-contacts/e-contact.c:203
+#: ../addressbook/libebook-contacts/e-contact.c:202
 msgid "ICS Calendar"
 msgstr "Календарь формата ICS"
 
-#: ../addressbook/libebook-contacts/e-contact.c:204
+#: ../addressbook/libebook-contacts/e-contact.c:203
 msgid "Video Conferencing URL"
 msgstr "URL видеоконференций"
 
 #. Misc fields
-#: ../addressbook/libebook-contacts/e-contact.c:207
+#: ../addressbook/libebook-contacts/e-contact.c:206
 msgid "Spouse's Name"
 msgstr "Имя супруга(и)"
 
-#: ../addressbook/libebook-contacts/e-contact.c:208
+#: ../addressbook/libebook-contacts/e-contact.c:207
 msgid "Note"
 msgstr "Примечание"
 
 #. Instant messaging fields
-#: ../addressbook/libebook-contacts/e-contact.c:211
+#: ../addressbook/libebook-contacts/e-contact.c:210
 msgid "AIM Home Screen Name 1"
 msgstr "AIM — домашнее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:212
+#: ../addressbook/libebook-contacts/e-contact.c:211
 msgid "AIM Home Screen Name 2"
 msgstr "AIM — домашнее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:213
+#: ../addressbook/libebook-contacts/e-contact.c:212
 msgid "AIM Home Screen Name 3"
 msgstr "AIM — домашнее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:214
+#: ../addressbook/libebook-contacts/e-contact.c:213
 msgid "AIM Work Screen Name 1"
 msgstr "AIM — рабочее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:215
+#: ../addressbook/libebook-contacts/e-contact.c:214
 msgid "AIM Work Screen Name 2"
 msgstr "AIM — рабочее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:216
+#: ../addressbook/libebook-contacts/e-contact.c:215
 msgid "AIM Work Screen Name 3"
 msgstr "AIM — рабочее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:217
+#: ../addressbook/libebook-contacts/e-contact.c:216
 msgid "GroupWise Home Screen Name 1"
 msgstr "Groupwise — домашнее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:218
+#: ../addressbook/libebook-contacts/e-contact.c:217
 msgid "GroupWise Home Screen Name 2"
 msgstr "Groupwise — домашнее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:219
+#: ../addressbook/libebook-contacts/e-contact.c:218
 msgid "GroupWise Home Screen Name 3"
 msgstr "Groupwise — домашнее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:220
+#: ../addressbook/libebook-contacts/e-contact.c:219
 msgid "GroupWise Work Screen Name 1"
 msgstr "Groupwise — рабочее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:221
+#: ../addressbook/libebook-contacts/e-contact.c:220
 msgid "GroupWise Work Screen Name 2"
 msgstr "Groupwise — рабочее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:222
+#: ../addressbook/libebook-contacts/e-contact.c:221
 msgid "GroupWise Work Screen Name 3"
 msgstr "Groupwise — рабочее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:223
+#: ../addressbook/libebook-contacts/e-contact.c:222
 msgid "Jabber Home ID 1"
 msgstr "Jabber — домашний идентификатор 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:224
+#: ../addressbook/libebook-contacts/e-contact.c:223
 msgid "Jabber Home ID 2"
 msgstr "Jabber — домашний идентификатор 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:225
+#: ../addressbook/libebook-contacts/e-contact.c:224
 msgid "Jabber Home ID 3"
 msgstr "Jabber — домашний идентификатор 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:226
+#: ../addressbook/libebook-contacts/e-contact.c:225
 msgid "Jabber Work ID 1"
 msgstr "Jabber — рабочий идентификатор 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:227
+#: ../addressbook/libebook-contacts/e-contact.c:226
 msgid "Jabber Work ID 2"
 msgstr "Jabber — рабочий идентификатор 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:228
+#: ../addressbook/libebook-contacts/e-contact.c:227
 msgid "Jabber Work ID 3"
 msgstr "Jabber — рабочий идентификатор 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:229
+#: ../addressbook/libebook-contacts/e-contact.c:228
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo! — домашнее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:230
+#: ../addressbook/libebook-contacts/e-contact.c:229
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo! — домашнее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:231
+#: ../addressbook/libebook-contacts/e-contact.c:230
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo! — домашнее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:232
+#: ../addressbook/libebook-contacts/e-contact.c:231
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo! — рабочее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:233
+#: ../addressbook/libebook-contacts/e-contact.c:232
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo! — рабочее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:234
+#: ../addressbook/libebook-contacts/e-contact.c:233
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo! — рабочее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:235
+#: ../addressbook/libebook-contacts/e-contact.c:234
 msgid "MSN Home Screen Name 1"
 msgstr "MSN — домашнее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:236
+#: ../addressbook/libebook-contacts/e-contact.c:235
 msgid "MSN Home Screen Name 2"
 msgstr "MSN — домашнее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:237
+#: ../addressbook/libebook-contacts/e-contact.c:236
 msgid "MSN Home Screen Name 3"
 msgstr "MSN — домашнее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:238
+#: ../addressbook/libebook-contacts/e-contact.c:237
 msgid "MSN Work Screen Name 1"
 msgstr "MSN — рабочее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:239
+#: ../addressbook/libebook-contacts/e-contact.c:238
 msgid "MSN Work Screen Name 2"
 msgstr "MSN — рабочее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:240
+#: ../addressbook/libebook-contacts/e-contact.c:239
 msgid "MSN Work Screen Name 3"
 msgstr "MSN — рабочее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:241
+#: ../addressbook/libebook-contacts/e-contact.c:240
 msgid "ICQ Home ID 1"
 msgstr "ICQ — домашний идентификатор 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:242
+#: ../addressbook/libebook-contacts/e-contact.c:241
 msgid "ICQ Home ID 2"
 msgstr "ICQ — домашний идентификатор 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:243
+#: ../addressbook/libebook-contacts/e-contact.c:242
 msgid "ICQ Home ID 3"
 msgstr "ICQ — домашний идентификатор 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:244
+#: ../addressbook/libebook-contacts/e-contact.c:243
 msgid "ICQ Work ID 1"
 msgstr "ICQ — рабочий идентификатор 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:245
+#: ../addressbook/libebook-contacts/e-contact.c:244
 msgid "ICQ Work ID 2"
 msgstr "ICQ — рабочий идентификатор 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:246
+#: ../addressbook/libebook-contacts/e-contact.c:245
 msgid "ICQ Work ID 3"
 msgstr "ICQ — рабочий идентификатор 3"
 
 #. Last modified time
-#: ../addressbook/libebook-contacts/e-contact.c:249
+#: ../addressbook/libebook-contacts/e-contact.c:248
 msgid "Last Revision"
 msgstr "Последняя версия"
 
 #. Translators: This is an EContact field description, in this case it's a
 #. * virtual field, which returns either name of the contact or the organization
 #. * name, recognized by multiple other fields, where the first filled is used.
-#: ../addressbook/libebook-contacts/e-contact.c:253
+#: ../addressbook/libebook-contacts/e-contact.c:252
 msgid "Name or Org"
 msgstr "Имя или Орг"
 
 #. Address fields
-#: ../addressbook/libebook-contacts/e-contact.c:256
+#: ../addressbook/libebook-contacts/e-contact.c:255
 msgid "Address List"
 msgstr "Список адресов"
 
-#: ../addressbook/libebook-contacts/e-contact.c:257
+#: ../addressbook/libebook-contacts/e-contact.c:256
 msgid "Home Address"
 msgstr "Домашний адрес"
 
-#: ../addressbook/libebook-contacts/e-contact.c:258
+#: ../addressbook/libebook-contacts/e-contact.c:257
 msgid "Work Address"
 msgstr "Рабочий адрес"
 
-#: ../addressbook/libebook-contacts/e-contact.c:259
+#: ../addressbook/libebook-contacts/e-contact.c:258
 msgid "Other Address"
 msgstr "Другой адрес"
 
 #. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:262
+#: ../addressbook/libebook-contacts/e-contact.c:261
 msgid "Category List"
 msgstr "Список категорий"
 
 #. Photo/Logo
-#: ../addressbook/libebook-contacts/e-contact.c:265
+#: ../addressbook/libebook-contacts/e-contact.c:264
 msgid "Photo"
 msgstr "Фото"
 
-#: ../addressbook/libebook-contacts/e-contact.c:266
+#: ../addressbook/libebook-contacts/e-contact.c:265
 msgid "Logo"
 msgstr "Логотип"
 
 #. Translators: This is an EContact field description, in this case it's a name
 #. * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2
-#: ../addressbook/libebook-contacts/e-contact.c:270
+#: ../addressbook/libebook-contacts/e-contact.c:269
 msgid "Name"
 msgstr "Имя"
 
-#: ../addressbook/libebook-contacts/e-contact.c:271
+#: ../addressbook/libebook-contacts/e-contact.c:270
 msgid "Email List"
 msgstr "Список адресов эл. почты"
 
 #. Instant messaging fields
-#: ../addressbook/libebook-contacts/e-contact.c:274
+#: ../addressbook/libebook-contacts/e-contact.c:273
 msgid "AIM Screen Name List"
 msgstr "Список экранных имён AIM"
 
-#: ../addressbook/libebook-contacts/e-contact.c:275
+#: ../addressbook/libebook-contacts/e-contact.c:274
 msgid "GroupWise ID List"
 msgstr "Список идентификаторов Groupwise"
 
-#: ../addressbook/libebook-contacts/e-contact.c:276
+#: ../addressbook/libebook-contacts/e-contact.c:275
 msgid "Jabber ID List"
 msgstr "Список идентификаторов Jabber"
 
-#: ../addressbook/libebook-contacts/e-contact.c:277
+#: ../addressbook/libebook-contacts/e-contact.c:276
 msgid "Yahoo! Screen Name List"
 msgstr "Список экранных имён Yahoo!"
 
-#: ../addressbook/libebook-contacts/e-contact.c:278
+#: ../addressbook/libebook-contacts/e-contact.c:277
 msgid "MSN Screen Name List"
 msgstr "Список экранных имён MSN"
 
-#: ../addressbook/libebook-contacts/e-contact.c:279
+#: ../addressbook/libebook-contacts/e-contact.c:278
 msgid "ICQ ID List"
 msgstr "Список идентификаторов ICQ"
 
-#: ../addressbook/libebook-contacts/e-contact.c:281
+#: ../addressbook/libebook-contacts/e-contact.c:280
 msgid "Wants HTML Mail"
 msgstr "Предпочитает почту в HTML"
 
 #. Translators: This is an EContact field description, in this case it's a
 #. * field describing whether it's a Contact list (list of email addresses) or a
 #. * regular contact for one person/organization/...
-#: ../addressbook/libebook-contacts/e-contact.c:286
+#: ../addressbook/libebook-contacts/e-contact.c:285
 msgid "List"
 msgstr "Список"
 
@@ -794,127 +795,127 @@ msgstr "Список"
 #. * used to determine whether when sending to Contact lists the addresses should be
 #. * shown or not to other recipients - basically whether to use BCC field or CC
 #. * message header when sending messages to this Contact list.
-#: ../addressbook/libebook-contacts/e-contact.c:291
+#: ../addressbook/libebook-contacts/e-contact.c:290
 msgid "List Shows Addresses"
 msgstr "Список показывает адреса"
 
-#: ../addressbook/libebook-contacts/e-contact.c:293
+#: ../addressbook/libebook-contacts/e-contact.c:292
 msgid "Birth Date"
 msgstr "Дата рождения"
 
-#: ../addressbook/libebook-contacts/e-contact.c:294
+#: ../addressbook/libebook-contacts/e-contact.c:293
 #: ../calendar/backends/contacts/e-cal-backend-contacts.c:893
 msgid "Anniversary"
 msgstr "Годовщина"
 
 #. Security fields
-#: ../addressbook/libebook-contacts/e-contact.c:297
+#: ../addressbook/libebook-contacts/e-contact.c:296
 msgid "X.509 Certificate"
 msgstr "Сертификат X.509"
 
-#: ../addressbook/libebook-contacts/e-contact.c:299
+#: ../addressbook/libebook-contacts/e-contact.c:298
 msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu — домашний идентификатор 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:300
+#: ../addressbook/libebook-contacts/e-contact.c:299
 msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu — домашний идентификатор 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:301
+#: ../addressbook/libebook-contacts/e-contact.c:300
 msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu — домашний идентификатор 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:302
+#: ../addressbook/libebook-contacts/e-contact.c:301
 msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu — рабочий идентификатор 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:303
+#: ../addressbook/libebook-contacts/e-contact.c:302
 msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu — рабочий идентификатор 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:304
+#: ../addressbook/libebook-contacts/e-contact.c:303
 msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu — рабочий идентификатор 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:305
+#: ../addressbook/libebook-contacts/e-contact.c:304
 msgid "Gadu-Gadu ID List"
 msgstr "Список идентификаторов Gadu-Gadu"
 
 #. Geo information
-#: ../addressbook/libebook-contacts/e-contact.c:308
+#: ../addressbook/libebook-contacts/e-contact.c:307
 msgid "Geographic Information"
 msgstr "Географическая информация"
 
-#: ../addressbook/libebook-contacts/e-contact.c:310
+#: ../addressbook/libebook-contacts/e-contact.c:309
 msgid "Telephone"
 msgstr "Телефон"
 
-#: ../addressbook/libebook-contacts/e-contact.c:312
+#: ../addressbook/libebook-contacts/e-contact.c:311
 msgid "Skype Home Name 1"
 msgstr "Skype - домашнее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:313
+#: ../addressbook/libebook-contacts/e-contact.c:312
 msgid "Skype Home Name 2"
 msgstr "Skype - домашнее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:314
+#: ../addressbook/libebook-contacts/e-contact.c:313
 msgid "Skype Home Name 3"
 msgstr "Skype - домашнее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:315
+#: ../addressbook/libebook-contacts/e-contact.c:314
 msgid "Skype Work Name 1"
 msgstr "Skype - рабочее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:316
+#: ../addressbook/libebook-contacts/e-contact.c:315
 msgid "Skype Work Name 2"
 msgstr "Skype - рабочее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:317
+#: ../addressbook/libebook-contacts/e-contact.c:316
 msgid "Skype Work Name 3"
 msgstr "Skype - рабочее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:318
+#: ../addressbook/libebook-contacts/e-contact.c:317
 msgid "Skype Name List"
 msgstr "Список экранных имён Skype"
 
-#: ../addressbook/libebook-contacts/e-contact.c:320
+#: ../addressbook/libebook-contacts/e-contact.c:319
 msgid "SIP address"
 msgstr "Адрес SIP"
 
-#: ../addressbook/libebook-contacts/e-contact.c:322
+#: ../addressbook/libebook-contacts/e-contact.c:321
 msgid "Google Talk Home Name 1"
 msgstr "Google Talk — домашнее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:323
+#: ../addressbook/libebook-contacts/e-contact.c:322
 msgid "Google Talk Home Name 2"
 msgstr "Google Talk — домашнее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:324
+#: ../addressbook/libebook-contacts/e-contact.c:323
 msgid "Google Talk Home Name 3"
 msgstr "Google Talk — домашнее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:325
+#: ../addressbook/libebook-contacts/e-contact.c:324
 msgid "Google Talk Work Name 1"
 msgstr "Google Talk — рабочее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:326
+#: ../addressbook/libebook-contacts/e-contact.c:325
 msgid "Google Talk Work Name 2"
 msgstr "Google Talk — рабочее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:327
+#: ../addressbook/libebook-contacts/e-contact.c:326
 msgid "Google Talk Work Name 3"
 msgstr "Google Talk — рабочее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:328
+#: ../addressbook/libebook-contacts/e-contact.c:327
 msgid "Google Talk Name List"
 msgstr "Список экранных имён Google Talk"
 
-#: ../addressbook/libebook-contacts/e-contact.c:330
+#: ../addressbook/libebook-contacts/e-contact.c:329
 msgid "Twitter Name List"
 msgstr "Список имён Twitter"
 
-#: ../addressbook/libebook-contacts/e-contact.c:1654
-#: ../addressbook/libebook/e-destination.c:920
+#: ../addressbook/libebook-contacts/e-contact.c:1659
+#: ../addressbook/libebook/e-destination.c:918
 msgid "Unnamed List"
 msgstr "Безымянный список"
 
@@ -923,7 +924,8 @@ msgid "The library was built without phone number support."
 msgstr "Библиотека собрана без поддержки телефонных номеров."
 
 #: ../addressbook/libebook-contacts/e-phone-number.c:43
-msgid "The phone number parser reported an yet unkown error code."
+#| msgid "The phone number parser reported an yet unkown error code."
+msgid "The phone number parser reported a yet unknown error code."
 msgstr "Анализатор телефонных номеров выдал неизвестный код ошибки."
 
 #: ../addressbook/libebook-contacts/e-phone-number.c:45
@@ -947,49 +949,55 @@ msgstr "Текст слишком короткий для телефонного
 msgid "Text is too long for a phone number"
 msgstr "Текст слишком длинный для телефонного номера"
 
-#: ../addressbook/libebook/e-book-client.c:807
+#: ../addressbook/libebook/e-book-client.c:931
 #, c-format
 msgid "Unknown book property '%s'"
 msgstr "Неизвестное свойство книги «%s»"
 
-#: ../addressbook/libebook/e-book-client.c:822
+#: ../addressbook/libebook/e-book-client.c:946
 #, c-format
 msgid "Cannot change value of book property '%s'"
 msgstr "Невозможно изменить значение свойства книги «%s»"
 
-#: ../addressbook/libebook/e-book-client.c:1207
-#: ../addressbook/libebook/e-book-client.c:1382
-#: ../addressbook/libebook/e-book-client.c:1649
-#: ../calendar/libecal/e-cal-client.c:1530
-#: ../calendar/libecal/e-cal-client.c:1712
+#: ../addressbook/libebook/e-book-client.c:1390
+#: ../addressbook/libebook/e-book-client.c:1621
+#: ../addressbook/libebook/e-book-client.c:1898
+#: ../calendar/libecal/e-cal-client.c:1714
+#: ../calendar/libecal/e-cal-client.c:1952
 #, c-format
 msgid "Unable to connect to '%s': "
 msgstr "Не удалось подключиться к «%s»: "
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:899
-#: ../addressbook/libedata-book/e-book-sqlite.c:2178
+#: ../addressbook/libebook/e-book-client-view.c:892
+#: ../calendar/libecal/e-cal-client-view.c:705
+#, c-format
+msgid "Client disappeared"
+msgstr "Клиент исчез"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:905
+#: ../addressbook/libedata-book/e-book-sqlite.c:2212
 #, c-format
 msgid "Error introspecting unknown summary field '%s'"
 msgstr "Ошибка при интроспекции неизвестного поля сводки «%s»"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1509
-#: ../addressbook/libedata-book/e-book-sqlite.c:1334
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1515
+#: ../addressbook/libedata-book/e-book-sqlite.c:1368
 msgid "Error parsing regular expression"
 msgstr "Ошибка разбора регулярного выражения"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1554
-#: ../addressbook/libedata-book/e-book-sqlite.c:1818 ../camel/camel-db.c:545
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1560
+#: ../addressbook/libedata-book/e-book-sqlite.c:1852 ../camel/camel-db.c:721
 #, c-format
 msgid "Insufficient memory"
 msgstr "Недостаточно памяти"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1691
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1697
 #, c-format
 msgid "Invalid contact field '%d' specified in summary"
 msgstr "В сводке указано неверное поле контакта «%d»"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1725
-#: ../addressbook/libedata-book/e-book-sqlite.c:559
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1731
+#: ../addressbook/libedata-book/e-book-sqlite.c:579
 #, c-format
 msgid ""
 "Contact field '%s' of type '%s' specified in summary, but only boolean, "
@@ -998,8 +1006,8 @@ msgstr ""
 "В сводке указано поле контакта «%s», имеющее тип данных «%s», но "
 "поддерживается только логический тип, строковый тип или список строк."
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3065
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4161
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3071
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4167
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. vcards cannot be returned."
@@ -1007,19 +1015,19 @@ msgstr ""
 "Полные данные search_contact не хранятся в кэше. Невозможно возвратить "
 "данные vcards."
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4292
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4385
-#: ../addressbook/libedata-book/e-book-sqlite.c:5400
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4298
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4391
+#: ../addressbook/libedata-book/e-book-sqlite.c:5747
 #, c-format
 msgid "Query contained unsupported elements"
 msgstr "Запрос содержит неподдерживаемые элементы"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4296
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4302
 #, c-format
 msgid "Invalid Query"
 msgstr "Некорректный запрос"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4320
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4326
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. Hence only summary query is "
@@ -1028,16 +1036,16 @@ msgstr ""
 "Полные данные search_contact не хранятся в кэше. Поэтому поддерживается "
 "только запрос для сводки."
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4389
-#: ../addressbook/libedata-book/e-data-book.c:383
-#: ../addressbook/libedata-book/e-data-book.c:1028
-#: ../calendar/libedata-cal/e-data-cal.c:420
-#: ../calendar/libedata-cal/e-data-cal.c:1307 ../libedataserver/e-client.c:172
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4395
+#: ../addressbook/libedata-book/e-data-book.c:391
+#: ../addressbook/libedata-book/e-data-book.c:1131
+#: ../calendar/libedata-cal/e-data-cal.c:428
+#: ../calendar/libedata-cal/e-data-cal.c:1410 ../libedataserver/e-client.c:174
 #, c-format
 msgid "Invalid query"
 msgstr "Некорректный запрос"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4432
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4438
 #, c-format
 msgid ""
 "Full vcards are not stored in cache. Hence only summary query is supported."
@@ -1045,36 +1053,36 @@ msgstr ""
 "Полные данные vcard не хранятся в кэше. Поэтому поддерживается только запрос "
 "для сводки."
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5255
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5261
 #, c-format
 msgid "Unable to remove the db file: errno %d"
 msgstr "Не удалось удалить файл базы данных: код ошибки %d"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6042
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6442
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6048
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6448
 #, c-format
 msgid "Only summary queries are supported by EbSdbCursor"
 msgstr "EbSdbCursor поддерживает только запросы по сводкам"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6049
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6055
 #, c-format
 msgid "At least one sort field must be specified to use an EbSdbCursor"
 msgstr ""
 "Для использования EbSdbCursor должно быть указано по крайней мере одно поле "
 "сортировки"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6063
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6069
 #, c-format
 msgid "Cannot sort by a field that is not in the summary"
 msgstr "Невозможно отсортировать по полю, которое не является сводкой"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6070
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6076
 #, c-format
 msgid "Cannot sort by a field which may have multiple values"
 msgstr "Невозможно отсортировать по полю, которое имеет несколько значений"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6203
-#: ../addressbook/libedata-book/e-book-sqlite.c:7412
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6209
+#: ../addressbook/libedata-book/e-book-sqlite.c:8044
 #, c-format
 msgid ""
 "Tried to step a cursor in reverse, but cursor is already at the beginning of "
@@ -1083,8 +1091,8 @@ msgstr ""
 "Попытка перевести курсор на шаг назад, но курсор уже находится в начале "
 "списка контактов"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211
-#: ../addressbook/libedata-book/e-book-sqlite.c:7420
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6217
+#: ../addressbook/libedata-book/e-book-sqlite.c:8052
 #, c-format
 msgid ""
 "Tried to step a cursor forwards, but cursor is already at the end of the "
@@ -1093,12 +1101,12 @@ msgstr ""
 "Попытка перевести курсор на шаг вперёд, но курсор уже находится в конце "
 "списка контактов"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:526
+#: ../addressbook/libedata-book/e-book-sqlite.c:545
 #, c-format
 msgid "Unsupported contact field '%d' specified in summary"
 msgstr "В сводке указано неподдерживаемое поле контакта «%d»"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:1891
+#: ../addressbook/libedata-book/e-book-sqlite.c:1925
 msgid ""
 "Cannot upgrade contacts database from a legacy database with more than one "
 "addressbook. Delete one of the entries in the 'folders' table first."
@@ -1107,184 +1115,184 @@ msgstr ""
 "больше одной адресной книги. Сначала удалите одну из записей в таблице "
 "«папки»."
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:5393
+#: ../addressbook/libedata-book/e-book-sqlite.c:5740
 #, c-format
 msgid "Invalid query: %s"
 msgstr "Недопустимый запрос: %s"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:5568
+#: ../addressbook/libedata-book/e-book-sqlite.c:5915
 msgid "Invalid query for EbSqlCursor"
 msgstr "Недопустимый запрос для EbSqlCursor"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:7234
+#: ../addressbook/libedata-book/e-book-sqlite.c:7866
 msgid "At least one sort field must be specified to use an EbSqlCursor"
 msgstr ""
 "Для использования EbSqlCursor должно быть указано по крайней мере одно поле "
 "сортировки"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:7252
+#: ../addressbook/libedata-book/e-book-sqlite.c:7884
 msgid "Cannot sort by a field that is not a string type"
 msgstr "Невозможно отсортировать по полю, которое имеет нестроковый тип"
 
-#: ../addressbook/libedata-book/e-data-book.c:367
-#: ../calendar/libedata-cal/e-data-cal.c:401
+#: ../addressbook/libedata-book/e-data-book.c:375
+#: ../calendar/libedata-cal/e-data-cal.c:409
 msgid "Success"
 msgstr "Успешно"
 
-#: ../addressbook/libedata-book/e-data-book.c:368
-#: ../calendar/libecal/e-cal.c:2302 ../calendar/libedata-cal/e-data-cal.c:402
-#: ../libedataserver/e-client.c:139
+#: ../addressbook/libedata-book/e-data-book.c:376
+#: ../calendar/libecal/e-cal.c:2302 ../calendar/libedata-cal/e-data-cal.c:410
+#: ../libedataserver/e-client.c:141
 msgid "Backend is busy"
 msgstr "Драйвер занят"
 
-#: ../addressbook/libedata-book/e-data-book.c:369
-#: ../calendar/libedata-cal/e-data-cal.c:403 ../libedataserver/e-client.c:149
+#: ../addressbook/libedata-book/e-data-book.c:377
+#: ../calendar/libedata-cal/e-data-cal.c:411 ../libedataserver/e-client.c:151
 msgid "Repository offline"
 msgstr "Репозиторий отключён от сети"
 
-#: ../addressbook/libedata-book/e-data-book.c:370
-#: ../calendar/libecal/e-cal.c:2316 ../calendar/libedata-cal/e-data-cal.c:404
-#: ../libedataserver/e-client.c:156
+#: ../addressbook/libedata-book/e-data-book.c:378
+#: ../calendar/libecal/e-cal.c:2316 ../calendar/libedata-cal/e-data-cal.c:412
+#: ../libedataserver/e-client.c:158
 msgid "Permission denied"
 msgstr "Доступ запрещён"
 
-#: ../addressbook/libedata-book/e-data-book.c:373
-#: ../calendar/libedata-cal/e-data-cal.c:409
+#: ../addressbook/libedata-book/e-data-book.c:381
+#: ../calendar/libedata-cal/e-data-cal.c:417
 msgid "Authentication Failed"
 msgstr "Сбой аутентификации"
 
-#: ../addressbook/libedata-book/e-data-book.c:374
-#: ../calendar/libedata-cal/e-data-cal.c:410
+#: ../addressbook/libedata-book/e-data-book.c:382
+#: ../calendar/libedata-cal/e-data-cal.c:418
 msgid "Authentication Required"
 msgstr "Требуется аутентификация"
 
-#: ../addressbook/libedata-book/e-data-book.c:375
-#: ../calendar/libedata-cal/e-data-cal.c:411
+#: ../addressbook/libedata-book/e-data-book.c:383
+#: ../calendar/libedata-cal/e-data-cal.c:419
 msgid "Unsupported field"
 msgstr "Неподдерживаемое поле"
 
-#: ../addressbook/libedata-book/e-data-book.c:376
-#: ../calendar/libedata-cal/e-data-cal.c:413 ../libedataserver/e-client.c:164
+#: ../addressbook/libedata-book/e-data-book.c:384
+#: ../calendar/libedata-cal/e-data-cal.c:421 ../libedataserver/e-client.c:166
 msgid "Unsupported authentication method"
 msgstr "Неподдерживаемый метод аутентификации"
 
-#: ../addressbook/libedata-book/e-data-book.c:377
-#: ../calendar/libedata-cal/e-data-cal.c:414 ../libedataserver/e-client.c:166
+#: ../addressbook/libedata-book/e-data-book.c:385
+#: ../calendar/libedata-cal/e-data-cal.c:422 ../libedataserver/e-client.c:168
 msgid "TLS not available"
 msgstr "TLS недоступен"
 
-#: ../addressbook/libedata-book/e-data-book.c:378
+#: ../addressbook/libedata-book/e-data-book.c:386
 msgid "Address book does not exist"
 msgstr "Адресная книга не существует"
 
-#: ../addressbook/libedata-book/e-data-book.c:379
+#: ../addressbook/libedata-book/e-data-book.c:387
 msgid "Book removed"
 msgstr "Книга удалена"
 
-#: ../addressbook/libedata-book/e-data-book.c:380
-#: ../calendar/libedata-cal/e-data-cal.c:417
+#: ../addressbook/libedata-book/e-data-book.c:388
+#: ../calendar/libedata-cal/e-data-cal.c:425
 msgid "Not available in offline mode"
 msgstr "Недоступно в автономном режиме"
 
-#: ../addressbook/libedata-book/e-data-book.c:381
-#: ../calendar/libedata-cal/e-data-cal.c:418 ../libedataserver/e-client.c:168
+#: ../addressbook/libedata-book/e-data-book.c:389
+#: ../calendar/libedata-cal/e-data-cal.c:426 ../libedataserver/e-client.c:170
 msgid "Search size limit exceeded"
 msgstr "Превышено ограничение на размер результатов поиска"
 
-#: ../addressbook/libedata-book/e-data-book.c:382
-#: ../calendar/libedata-cal/e-data-cal.c:419 ../libedataserver/e-client.c:170
+#: ../addressbook/libedata-book/e-data-book.c:390
+#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:172
 msgid "Search time limit exceeded"
 msgstr "Превышено ограничение на время поиска"
 
-#: ../addressbook/libedata-book/e-data-book.c:384
-#: ../calendar/libedata-cal/e-data-cal.c:421 ../libedataserver/e-client.c:174
+#: ../addressbook/libedata-book/e-data-book.c:392
+#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:176
 msgid "Query refused"
 msgstr "Запрос отклонён"
 
-#: ../addressbook/libedata-book/e-data-book.c:385
-#: ../calendar/libedata-cal/e-data-cal.c:422 ../libedataserver/e-client.c:160
+#: ../addressbook/libedata-book/e-data-book.c:393
+#: ../calendar/libedata-cal/e-data-cal.c:430 ../libedataserver/e-client.c:162
 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:387
-#: ../calendar/libedata-cal/e-data-cal.c:424
+#: ../addressbook/libedata-book/e-data-book.c:395
+#: ../calendar/libedata-cal/e-data-cal.c:432
 msgid "Invalid server version"
 msgstr "Недопустимая версия сервера"
 
-#: ../addressbook/libedata-book/e-data-book.c:389
-#: ../calendar/libecal/e-cal.c:2300 ../calendar/libedata-cal/e-data-cal.c:425
-#: ../libedataserver/e-client.c:137
+#: ../addressbook/libedata-book/e-data-book.c:397
+#: ../calendar/libecal/e-cal.c:2300 ../calendar/libedata-cal/e-data-cal.c:433
+#: ../libedataserver/e-client.c:139
 msgid "Invalid argument"
 msgstr "Недопустимый аргумент"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:391
+#: ../addressbook/libedata-book/e-data-book.c:399
 #: ../calendar/libecal/e-cal.c:1059 ../calendar/libecal/e-cal.c:1427
 #: ../calendar/libecal/e-cal.c:1907 ../calendar/libecal/e-cal.c:2339
-#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:162
+#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:164
 #, c-format
 msgid "Not supported"
 msgstr "Не поддерживается"
 
-#: ../addressbook/libedata-book/e-data-book.c:392
-#: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:180
+#: ../addressbook/libedata-book/e-data-book.c:400
+#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:182
 msgid "Backend is not opened yet"
 msgstr "Драйвер ещё не открыт"
 
-#: ../addressbook/libedata-book/e-data-book.c:393
-#: ../libedataserver/e-client.c:182
+#: ../addressbook/libedata-book/e-data-book.c:401
+#: ../libedataserver/e-client.c:184
 msgid "Object is out of sync"
 msgstr "Объект рассинхронизирован"
 
-#: ../addressbook/libedata-book/e-data-book.c:401
-#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:178
+#: ../addressbook/libedata-book/e-data-book.c:409
+#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:180
 msgid "Other error"
 msgstr "Другая ошибка"
 
-#: ../addressbook/libedata-book/e-data-book.c:1053
-#: ../calendar/libedata-cal/e-data-cal.c:1332
+#: ../addressbook/libedata-book/e-data-book.c:1156
+#: ../calendar/libedata-cal/e-data-cal.c:1435
 msgid "Invalid query: "
 msgstr "Недопустимый запрос: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1272
+#: ../addressbook/libedata-book/e-data-book.c:1375
 msgid "Cannot open book: "
 msgstr "Невозможно открыть книгу: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1309
+#: ../addressbook/libedata-book/e-data-book.c:1412
 msgid "Cannot refresh address book: "
 msgstr "Невозможно обновить адресную книгу: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1340
+#: ../addressbook/libedata-book/e-data-book.c:1443
 msgid "Cannot get contact: "
 msgstr "Невозможно получить контакт: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1378
+#: ../addressbook/libedata-book/e-data-book.c:1481
 msgid "Cannot get contact list: "
 msgstr "Невозможно получить список контактов: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1430
+#: ../addressbook/libedata-book/e-data-book.c:1533
 msgid "Cannot get contact list uids: "
 msgstr "Невозможно получить идентификаторы списка контактов: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1477
+#: ../addressbook/libedata-book/e-data-book.c:1580
 msgid "Cannot add contact: "
 msgstr "Невозможно добавить контакт: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1526
+#: ../addressbook/libedata-book/e-data-book.c:1629
 msgid "Cannot modify contacts: "
 msgstr "Невозможно изменить контакты:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1568
+#: ../addressbook/libedata-book/e-data-book.c:1671
 msgid "Cannot remove contacts: "
 msgstr "Невозможно удалить контакты: "
 
@@ -1312,53 +1320,35 @@ msgstr "Ревизия рассинхронизировалась во врем
 msgid "Alphabetic index was set for incorrect locale"
 msgstr "Алфавитный индекс был установлен для неверной локали"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:289
-#: ../calendar/libedata-cal/e-data-cal-factory.c:285
-#, c-format
-msgid "No backend name in source '%s'"
-msgstr "В источнике «%s» не указано имя драйвера"
-
-#: ../addressbook/libedata-book/e-data-book-factory.c:377
-#: ../calendar/libedata-cal/e-data-cal-factory.c:339
-#, c-format
-msgid "Missing source UID"
-msgstr "Отсутствует UID источника"
-
-#: ../addressbook/libedata-book/e-data-book-factory.c:388
-#: ../calendar/libedata-cal/e-data-cal-factory.c:349
-#, c-format
-msgid "No such source for UID '%s'"
-msgstr "Нет такого источника для UID «%s»"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:581
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:579
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "Сервер недоступен (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:612
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:610
 #, c-format
 msgid "Failed to connect to a server using SSL: %s"
 msgstr "Сбой при подключении к серверу с использованием SSL: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:623
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:625
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "Получен неожиданный код (%d) состояния HTTP (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:642
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:644
 msgid "CalDAV backend is not loaded yet"
 msgstr "Драйвер CalDAV ещё не загружен"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1084
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1091
 msgid "Invalid Redirect URL"
 msgstr "Неверный перенаправляющий URL"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2887
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2886
 #, c-format
 msgid "Cannot create local cache folder '%s'"
 msgstr "Не удалось создать локальную кэш-папку «%s»"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2939
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2944
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1367,27 +1357,27 @@ msgstr ""
 "Сервер недоступен, календарь открыт в режиме «только чтение».\n"
 "Сообщение об ошибке: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3973
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4016
 msgid "CalDAV does not support bulk additions"
 msgstr "CalDAV не поддерживает пакетные добавления"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4076
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4119
 msgid "CalDAV does not support bulk modifications"
 msgstr "CalDAV не поддерживает пакетные изменения"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4252
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4400
 msgid "CalDAV does not support bulk removals"
 msgstr "CalDAV не поддерживает пакетные удаления"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4919
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5082
 msgid "Calendar doesn't support Free/Busy"
 msgstr "Календарь не поддерживает информацию о занятости"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4928
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5091
 msgid "Schedule outbox url not found"
 msgstr "Не найден url исходящего расписания"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5025
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5188
 msgid "Unexpected result in schedule-response"
 msgstr "Неожиданный результат в ответе-расписании"
 
@@ -1414,27 +1404,27 @@ msgstr "Не удалось сохранить данные календаря:
 msgid "Cannot save calendar data"
 msgstr "Не удалось сохранить данные календаря"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:491
+#: ../calendar/backends/http/e-cal-backend-http.c:512
 #, c-format
 msgid "Malformed URI: %s"
 msgstr "Некорректный URI: %s"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:582
+#: ../calendar/backends/http/e-cal-backend-http.c:581
 #, c-format
 msgid "Redirected to Invalid URI"
 msgstr "Переадресован на недопустимый URI"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:625
+#: ../calendar/backends/http/e-cal-backend-http.c:643
 #, c-format
 msgid "Bad file format."
 msgstr "Неверный формат файла."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:635
+#: ../calendar/backends/http/e-cal-backend-http.c:653
 #, c-format
 msgid "Not a calendar."
 msgstr "Не является календарём."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:925
+#: ../calendar/backends/http/e-cal-backend-http.c:955
 #: ../calendar/backends/weather/e-cal-backend-weather.c:536
 msgid "Could not create cache file"
 msgstr "Не удалось создать файл кэша"
@@ -1515,12 +1505,12 @@ msgid "No such calendar"
 msgstr "Нет такого календаря"
 
 #: ../calendar/libecal/e-cal.c:2308 ../calendar/libecal/e-cal-client.c:265
-#: ../calendar/libedata-cal/e-data-cal.c:406
+#: ../calendar/libedata-cal/e-data-cal.c:414
 msgid "Object not found"
 msgstr "Объект не найден"
 
 #: ../calendar/libecal/e-cal.c:2310 ../calendar/libecal/e-cal-client.c:267
-#: ../calendar/libedata-cal/e-data-cal.c:407
+#: ../calendar/libedata-cal/e-data-cal.c:415
 msgid "Invalid object"
 msgstr "Неверный объект"
 
@@ -1537,7 +1527,7 @@ msgid "Unknown User"
 msgstr "Неизвестный пользователь"
 
 #: ../calendar/libecal/e-cal.c:2320 ../calendar/libecal/e-cal-client.c:271
-#: ../calendar/libedata-cal/e-data-cal.c:408
+#: ../calendar/libedata-cal/e-data-cal.c:416
 msgid "Object ID already exists"
 msgstr "Идентификатор объекта уже существует"
 
@@ -1553,13 +1543,13 @@ msgstr "Операция отменена"
 msgid "Could not cancel operation"
 msgstr "Не удалось отменить операцию"
 
-#: ../calendar/libecal/e-cal.c:2328 ../libedataserver/e-client.c:145
+#: ../calendar/libecal/e-cal.c:2328 ../libedataserver/e-client.c:147
 msgid "Authentication failed"
 msgstr "Сбой проверки подлинности"
 
 #: ../calendar/libecal/e-cal.c:2330
-#: ../camel/providers/smtp/camel-smtp-transport.c:921
-#: ../libedataserver/e-client.c:147
+#: ../camel/providers/smtp/camel-smtp-transport.c:959
+#: ../libedataserver/e-client.c:149
 msgid "Authentication required"
 msgstr "Требуется аутентификация"
 
@@ -1572,150 +1562,150 @@ msgid "No error"
 msgstr "Нет ошибки"
 
 #: ../calendar/libecal/e-cal-client.c:269
-#: ../calendar/libedata-cal/e-data-cal.c:416
+#: ../calendar/libedata-cal/e-data-cal.c:424
 msgid "Unknown user"
 msgstr "Неизвестный пользователь"
 
 #: ../calendar/libecal/e-cal-client.c:273
-#: ../calendar/libedata-cal/e-data-cal.c:405
+#: ../calendar/libedata-cal/e-data-cal.c:413
 msgid "Invalid range"
 msgstr "Недопустимый диапазон"
 
-#: ../calendar/libecal/e-cal-client.c:936
+#: ../calendar/libecal/e-cal-client.c:1062
 #, c-format
 msgid "Unknown calendar property '%s'"
 msgstr "Неизвестное свойство календаря «%s»"
 
-#: ../calendar/libecal/e-cal-client.c:951
+#: ../calendar/libecal/e-cal-client.c:1077
 #, c-format
 msgid "Cannot change value of calendar property '%s'"
 msgstr "Невозможно изменить значение свойства календаря «%s»"
 
-#: ../calendar/libecal/e-cal-component.c:1348
+#: ../calendar/libecal/e-cal-component.c:1349
 msgid "Untitled appointment"
 msgstr "Неозаглавленная встреча"
 
-#: ../calendar/libecal/e-cal-recur.c:4037
+#: ../calendar/libecal/e-cal-recur.c:4040
 msgid "1st"
 msgstr "1-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4038
+#: ../calendar/libecal/e-cal-recur.c:4041
 msgid "2nd"
 msgstr "2-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4039
+#: ../calendar/libecal/e-cal-recur.c:4042
 msgid "3rd"
 msgstr "3-е"
 
-#: ../calendar/libecal/e-cal-recur.c:4040
+#: ../calendar/libecal/e-cal-recur.c:4043
 msgid "4th"
 msgstr "4-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4041
+#: ../calendar/libecal/e-cal-recur.c:4044
 msgid "5th"
 msgstr "5-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4042
+#: ../calendar/libecal/e-cal-recur.c:4045
 msgid "6th"
 msgstr "6-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4043
+#: ../calendar/libecal/e-cal-recur.c:4046
 msgid "7th"
 msgstr "7-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4044
+#: ../calendar/libecal/e-cal-recur.c:4047
 msgid "8th"
 msgstr "8-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4045
+#: ../calendar/libecal/e-cal-recur.c:4048
 msgid "9th"
 msgstr "9-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:4049
 msgid "10th"
 msgstr "10-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:4050
 msgid "11th"
 msgstr "11-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:4051
 msgid "12th"
 msgstr "12-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:4052
 msgid "13th"
 msgstr "13-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:4053
 msgid "14th"
 msgstr "14-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:4054
 msgid "15th"
 msgstr "15-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:4055
 msgid "16th"
 msgstr "16-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:4056
 msgid "17th"
 msgstr "17-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:4057
 msgid "18th"
 msgstr "18-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:4058
 msgid "19th"
 msgstr "19-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:4059
 msgid "20th"
 msgstr "20-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:4060
 msgid "21st"
 msgstr "21-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:4061
 msgid "22nd"
 msgstr "22-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:4062
 msgid "23rd"
 msgstr "23-е"
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:4063
 msgid "24th"
 msgstr "24-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:4064
 msgid "25th"
 msgstr "25-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:4065
 msgid "26th"
 msgstr "26-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:4066
 msgid "27th"
 msgstr "27-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:4067
 msgid "28th"
 msgstr "28-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:4068
 msgid "29th"
 msgstr "29-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:4069
 msgid "30th"
 msgstr "30-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4067
+#: ../calendar/libecal/e-cal-recur.c:4070
 msgid "31st"
 msgstr "31-ое"
 
@@ -1740,83 +1730,83 @@ msgctxt "Priority"
 msgid "Undefined"
 msgstr "Неопределённый"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:84
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1062
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1371
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1498
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1547
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:85
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1063
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1379
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1506
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1555
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "«%s» предполагает один аргумент"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:91
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:673
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1378
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:92
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:1386
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1394
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "«%s» предполагает строку в качестве аргумента 1"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:167
 #, c-format
 msgid "\"%s\" expects two or three arguments"
 msgstr "«%s» предполагает два или три аргумента"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:173
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:262
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:324
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:823
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1069
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1447
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1505
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1554
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:263
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:325
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:824
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1070
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1455
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1513
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1562
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "«%s» предполагает тип time_t в качестве аргумента 1"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:182
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:270
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:334
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:183
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:271
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:335
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:833
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "«%s» предполагает тип time_t в качестве аргумента 1"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:192
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:193
 #, c-format
 msgid "\"%s\" expects the third argument to be a string"
 msgstr "«%s» предполагает строку в качестве третьего аргумента"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:255
 #, c-format
 msgid "\"%s\" expects none or two arguments"
 msgstr "«%s» предполагает два аргумента или ни одного"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:317
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:666
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:816
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1440
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:318
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:667
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1448
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "«%s» предполагает два аргумента"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:602
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:625
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:748
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:780
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:987
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1020
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1332
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:603
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:626
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:749
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:781
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:988
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1021
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1340
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "«%s» не предполагает аргументов"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:682
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:683
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "«%s» предполагает строку в качестве аргумента 2"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:713
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:714
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1826,12 +1816,12 @@ msgstr ""
 "«%s» предполагает одно из «any», «summary», «description», «location», "
 "«attendee», «organizer» или «classification» в качестве аргумента 1"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:884
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:885
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "«%s» предполагает по крайней мере 1 аргумент"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:899
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:900
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1840,125 +1830,125 @@ msgstr ""
 "«%s» предполагает, что все аргументы - строки или единственный аргумент - "
 "логическая ложь (#f)"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1395
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1403
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr ""
 "«%s» предусматривает, что аргумент 1 должен быть строкой даты в формате ISO "
 "8601"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1456
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1464
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "«%s» предполагает целое число в качестве аргумента 2"
 
-#: ../calendar/libedata-cal/e-data-cal.c:412
+#: ../calendar/libedata-cal/e-data-cal.c:420
 msgid "Unsupported method"
 msgstr "Неподдерживаемый метод"
 
-#: ../calendar/libedata-cal/e-data-cal.c:415
+#: ../calendar/libedata-cal/e-data-cal.c:423
 msgid "Calendar does not exist"
 msgstr "Календарь не существует"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1503
+#: ../calendar/libedata-cal/e-data-cal.c:1606
 msgid "Cannot open calendar: "
 msgstr "Невозможно открыть календарь: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1540
+#: ../calendar/libedata-cal/e-data-cal.c:1643
 msgid "Cannot refresh calendar: "
 msgstr "Невозможно обновить календарь: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1581
+#: ../calendar/libedata-cal/e-data-cal.c:1684
 msgid "Cannot retrieve calendar object path: "
 msgstr "Невозможно получить путь объекта календаря: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1633
+#: ../calendar/libedata-cal/e-data-cal.c:1736
 msgid "Cannot retrieve calendar object list: "
 msgstr "Невозможно получить список объектов календаря: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1684
+#: ../calendar/libedata-cal/e-data-cal.c:1787
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "Невозможно получить список свободных/занятых дней календаря: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1727
+#: ../calendar/libedata-cal/e-data-cal.c:1830
 msgid "Cannot create calendar object: "
 msgstr "Невозможно создать объект календаря: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1795
+#: ../calendar/libedata-cal/e-data-cal.c:1898
 msgid "Cannot modify calendar object: "
 msgstr "Невозможно изменить объект календаря: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1873
+#: ../calendar/libedata-cal/e-data-cal.c:1976
 msgid "Cannot remove calendar object: "
 msgstr "Невозможно удалить объект календаря: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1959
+#: ../calendar/libedata-cal/e-data-cal.c:2062
 msgid "Cannot receive calendar objects: "
 msgstr "Невозможно получить объекты календаря: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2002
+#: ../calendar/libedata-cal/e-data-cal.c:2105
 msgid "Cannot send calendar objects: "
 msgstr "Невозможно отправить объекты календаря: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2054
+#: ../calendar/libedata-cal/e-data-cal.c:2157
 msgid "Could not retrieve attachment uris: "
 msgstr "Невозможно получить uri вложений: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2099
+#: ../calendar/libedata-cal/e-data-cal.c:2202
 msgid "Could not discard reminder: "
 msgstr "Не удалось снять уведомление: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2140
+#: ../calendar/libedata-cal/e-data-cal.c:2243
 msgid "Could not retrieve calendar time zone: "
 msgstr "Невозможно получить часовой пояс календаря: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2180
+#: ../calendar/libedata-cal/e-data-cal.c:2283
 msgid "Could not add calendar time zone: "
 msgstr "Невозможно добавить часовой пояс календаря: "
 
-#: ../camel/camel-cipher-context.c:200
+#: ../camel/camel-cipher-context.c:199
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "Подпись не поддерживается этим шифром"
 
-#: ../camel/camel-cipher-context.c:213
+#: ../camel/camel-cipher-context.c:212
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "Проверка не поддерживается этим шифром"
 
-#: ../camel/camel-cipher-context.c:229
+#: ../camel/camel-cipher-context.c:228
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "Шифрование не поддерживается этим шифром"
 
-#: ../camel/camel-cipher-context.c:243
+#: ../camel/camel-cipher-context.c:242
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "Расшифровка не поддерживается этим шифром"
 
-#: ../camel/camel-cipher-context.c:359
+#: ../camel/camel-cipher-context.c:358
 msgid "Signing message"
 msgstr "Сообщение подписывается"
 
-#: ../camel/camel-cipher-context.c:649
+#: ../camel/camel-cipher-context.c:648
 msgid "Encrypting message"
 msgstr "Сообщение шифруется"
 
-#: ../camel/camel-cipher-context.c:821
+#: ../camel/camel-cipher-context.c:820
 msgid "Decrypting message"
 msgstr "Сообщение расшифровывается"
 
@@ -1976,7 +1966,7 @@ msgstr "Кэш-файл пуст"
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Не удалось удалить кэшированный элемент: %s: %s"
 
-#: ../camel/camel-filter-driver.c:914 ../camel/camel-filter-search.c:795
+#: ../camel/camel-filter-driver.c:914 ../camel/camel-filter-search.c:797
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Сбой при создании дочернего процесса «%s»: %s"
@@ -2053,24 +2043,29 @@ msgstr "Ошибка разбора фильтра «%s»: %s; %s"
 msgid "Error executing filter '%s': %s: %s"
 msgstr "Ошибка выполнения фильтра «%s»: %s; %s"
 
-#: ../camel/camel-filter-search.c:136
+#: ../camel/camel-filter-search.c:138
 msgid "Failed to retrieve message"
 msgstr "Сбой при получении сообщения"
 
-#: ../camel/camel-filter-search.c:535
+#: ../camel/camel-filter-search.c:537
 msgid "Invalid arguments to (system-flag)"
-msgstr "Недопустимые аргументы для system-flag"
+msgstr "Недопустимые аргументы для (system-flag)"
 
-#: ../camel/camel-filter-search.c:553
+#: ../camel/camel-filter-search.c:555
 msgid "Invalid arguments to (user-tag)"
-msgstr "Недопустимые аргументы для user-tag"
+msgstr "Недопустимые аргументы для (user-tag)"
+
+#: ../camel/camel-filter-search.c:1064
+#| msgid "Invalid arguments to (system-flag)"
+msgid "Invalid arguments to (message-location)"
+msgstr "Недопустимые аргументы для (message-location)"
 
-#: ../camel/camel-filter-search.c:1075 ../camel/camel-filter-search.c:1086
+#: ../camel/camel-filter-search.c:1142 ../camel/camel-filter-search.c:1153
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Ошибка выполнения поиска фильтра: %s: %s"
 
-#: ../camel/camel-folder.c:323
+#: ../camel/camel-folder.c:321
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
@@ -2078,7 +2073,7 @@ msgstr[0] "Изучение нового спам-сообщения в «%s»"
 msgstr[1] "Изучение новых спам-сообщений в «%s»"
 msgstr[2] "Изучение новых спам-сообщений в «%s»"
 
-#: ../camel/camel-folder.c:363
+#: ../camel/camel-folder.c:361
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
@@ -2086,7 +2081,7 @@ msgstr[0] "Изучение нового сообщения в «%s»"
 msgstr[1] "Изучение новых сообщений в «%s»"
 msgstr[2] "Изучение новых сообщений в «%s»"
 
-#: ../camel/camel-folder.c:411
+#: ../camel/camel-folder.c:409
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
@@ -2094,36 +2089,42 @@ msgstr[0] "Фильтрация нового сообщения в «%s»"
 msgstr[1] "Фильтрация новых сообщений в «%s»"
 msgstr[2] "Фильтрация новых сообщений в «%s»"
 
-#: ../camel/camel-folder.c:1011
+#: ../camel/camel-folder.c:1015
 #: ../camel/providers/local/camel-maildir-folder.c:330
 msgid "Moving messages"
 msgstr "Перемещение сообщений"
 
-#: ../camel/camel-folder.c:1014
+#: ../camel/camel-folder.c:1018
 msgid "Copying messages"
 msgstr "Копирование сообщений"
 
-#: ../camel/camel-folder.c:1056
+#: ../camel/camel-folder.c:1060
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr "Информация о квоте не поддерживается для папки «%s»"
 
-#: ../camel/camel-folder.c:2862
+#: ../camel/camel-folder.c:1152
+#, c-format
+#| msgid "Opening folder '%s'"
+msgid "Filtering folder '%s'"
+msgstr "Фильтрация папки «%s»"
+
+#: ../camel/camel-folder.c:2878
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Уничтожение папки «%s»"
 
-#: ../camel/camel-folder.c:2990
+#: ../camel/camel-folder.c:3009
 #, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "Получение сообщения «%s» в %s"
 
-#: ../camel/camel-folder.c:3181
+#: ../camel/camel-folder.c:3200
 #, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "Получение информации о квоте для «%s»"
 
-#: ../camel/camel-folder.c:3478
+#: ../camel/camel-folder.c:3497
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Обновление папки «%s»"
@@ -2176,18 +2177,29 @@ msgstr ""
 "Ошибка при выполнении выражения поиска «%s»:\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:721 ../camel/camel-gpg-context.c:726
-#: ../camel/camel-gpg-context.c:1383
+#: ../camel/camel-folder-summary.c:2139
+#, c-format
+msgid "Release unused memory for folder '%s'"
+msgstr "Освобождение неиспользуемой памяти для папки «%s»"
+
+#: ../camel/camel-folder-summary.c:2351
+#, c-format
+#| msgid "Updating folder '%s'"
+msgid "Update preview data for folder '%s'"
+msgstr "Обновление данных для предварительного просмотра папки «%s»"
+
+#: ../camel/camel-gpg-context.c:724 ../camel/camel-gpg-context.c:729
+#: ../camel/camel-gpg-context.c:1386
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Сбой при исполнении gpg: %s"
 
-#: ../camel/camel-gpg-context.c:726
-#: ../camel/providers/smtp/camel-smtp-transport.c:924
+#: ../camel/camel-gpg-context.c:729
+#: ../camel/providers/smtp/camel-smtp-transport.c:962
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: ../camel/camel-gpg-context.c:791
+#: ../camel/camel-gpg-context.c:794
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -2198,24 +2210,24 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:827
+#: ../camel/camel-gpg-context.c:830
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "Ошибка при обработке подсказки gpg userid."
 
-#: ../camel/camel-gpg-context.c:852 ../camel/camel-gpg-context.c:867
+#: ../camel/camel-gpg-context.c:855 ../camel/camel-gpg-context.c:870
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "Ошибка при обработке запроса парольной фразы gpg."
 
-#: ../camel/camel-gpg-context.c:888
+#: ../camel/camel-gpg-context.c:891
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
 "SmartCard: \"%s\""
 msgstr "Для разблокирования смарткарты необходимо ввести PIN: «%s»"
 
-#: ../camel/camel-gpg-context.c:892
+#: ../camel/camel-gpg-context.c:895
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2224,12 +2236,12 @@ msgstr ""
 "Введите ключевую фразу, чтобы разблокировать\n"
 "ключ пользователя: «%s»"
 
-#: ../camel/camel-gpg-context.c:898
+#: ../camel/camel-gpg-context.c:901
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "Неожиданный запрос от GnuPG для «%s»"
 
-#: ../camel/camel-gpg-context.c:910
+#: ../camel/camel-gpg-context.c:913
 msgid ""
 "Note the encrypted content doesn't contain information about a recipient, "
 "thus there will be a password prompt for each of stored private key."
@@ -2237,72 +2249,72 @@ msgstr ""
 "Зашифрованные данные не содержат сведений о получателе. Для каждого "
 "закрытого ключа будет предложено ввести пароль."
 
-#: ../camel/camel-gpg-context.c:941 ../camel/camel-net-utils.c:524
+#: ../camel/camel-gpg-context.c:944 ../camel/camel-net-utils.c:524
 #: ../camel/providers/nntp/camel-nntp-summary.c:401
-#: ../libedataserver/e-client.c:158
+#: ../libedataserver/e-client.c:160
 #, c-format
 msgid "Cancelled"
 msgstr "Отменено"
 
-#: ../camel/camel-gpg-context.c:962
+#: ../camel/camel-gpg-context.c:965
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Сбой при разблокировании секретного ключа: указано 3 некорректных парольных "
 "фразы."
 
-#: ../camel/camel-gpg-context.c:975
+#: ../camel/camel-gpg-context.c:978
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Неожиданный ответ от GnuPG: %s"
 
-#: ../camel/camel-gpg-context.c:1106
+#: ../camel/camel-gpg-context.c:1109
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 "Не удалось зашифровать это сообщение: Не определены корректные получатели"
 
-#: ../camel/camel-gpg-context.c:1658 ../camel/camel-smime-context.c:844
+#: ../camel/camel-gpg-context.c:1661 ../camel/camel-smime-context.c:843
 msgid "Could not generate signing data: "
 msgstr "Не удалось создать данные подписи: "
 
-#: ../camel/camel-gpg-context.c:1708 ../camel/camel-gpg-context.c:1920
-#: ../camel/camel-gpg-context.c:2030 ../camel/camel-gpg-context.c:2179
+#: ../camel/camel-gpg-context.c:1711 ../camel/camel-gpg-context.c:1923
+#: ../camel/camel-gpg-context.c:2033 ../camel/camel-gpg-context.c:2182
 msgid "Failed to execute gpg."
 msgstr "Сбой при исполнении gpg."
 
-#: ../camel/camel-gpg-context.c:1791 ../camel/camel-gpg-context.c:1799
-#: ../camel/camel-gpg-context.c:1807 ../camel/camel-gpg-context.c:1827
-#: ../camel/camel-smime-context.c:973 ../camel/camel-smime-context.c:987
-#: ../camel/camel-smime-context.c:996
+#: ../camel/camel-gpg-context.c:1794 ../camel/camel-gpg-context.c:1802
+#: ../camel/camel-gpg-context.c:1810 ../camel/camel-gpg-context.c:1830
+#: ../camel/camel-smime-context.c:972 ../camel/camel-smime-context.c:986
+#: ../camel/camel-smime-context.c:995
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Не удалось проверить подпись сообщения: Неверный формат сообщения"
 
-#: ../camel/camel-gpg-context.c:1873
+#: ../camel/camel-gpg-context.c:1876
 msgid "Cannot verify message signature: "
 msgstr "Не удалось проверить подпись сообщения: "
 
-#: ../camel/camel-gpg-context.c:1996
+#: ../camel/camel-gpg-context.c:1999
 msgid "Could not generate encrypting data: "
 msgstr "Не удалось создать данные шифрования: "
 
-#: ../camel/camel-gpg-context.c:2049
+#: ../camel/camel-gpg-context.c:2052
 msgid "This is a digitally encrypted message part"
 msgstr "Это зашифрованная часть сообщения"
 
-#: ../camel/camel-gpg-context.c:2105 ../camel/camel-gpg-context.c:2114
-#: ../camel/camel-gpg-context.c:2137
+#: ../camel/camel-gpg-context.c:2108 ../camel/camel-gpg-context.c:2117
+#: ../camel/camel-gpg-context.c:2140
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Не удалось декодировать сообщение: Неверный формат сообщения"
 
-#: ../camel/camel-gpg-context.c:2125
+#: ../camel/camel-gpg-context.c:2128
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Сбой при декодировании части MIME: ошибка протокола"
 
-#: ../camel/camel-gpg-context.c:2220 ../camel/camel-smime-context.c:1289
+#: ../camel/camel-gpg-context.c:2223 ../camel/camel-smime-context.c:1288
 msgid "Encrypted content"
 msgstr "Зашифрованное содержимое"
 
@@ -2350,56 +2362,56 @@ msgstr "Не удалось заблокировать «%s»: ошибка пр
 msgid "Could not lock '%s'"
 msgstr "Не удалось заблокировать «%s»"
 
-#: ../camel/camel-movemail.c:109
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "Не удалось проверить почтовый файл %s: %s"
-
-#: ../camel/camel-movemail.c:123
+#: ../camel/camel-movemail.c:101
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Не удалось открыть почтовый файл %s: %s"
 
-#: ../camel/camel-movemail.c:133
+#: ../camel/camel-movemail.c:121
+#, c-format
+msgid "Could not check mail file %s: %s"
+msgstr "Не удалось проверить почтовый файл %s: %s"
+
+#: ../camel/camel-movemail.c:136
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Не удалось открыть временный почтовый файл %s: %s"
 
-#: ../camel/camel-movemail.c:163
+#: ../camel/camel-movemail.c:166
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Сбой при сохранении почты во временном файле %s: %s"
 
-#: ../camel/camel-movemail.c:197
+#: ../camel/camel-movemail.c:200
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Не удалось создать канал: %s"
 
-#: ../camel/camel-movemail.c:211
+#: ../camel/camel-movemail.c:214
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Не удалось запустить: %s"
 
-#: ../camel/camel-movemail.c:249
+#: ../camel/camel-movemail.c:252
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Сбой программы разбора почты: %s"
 
-#: ../camel/camel-movemail.c:250
+#: ../camel/camel-movemail.c:253
 msgid "(Unknown error)"
 msgstr "(Неизвестная ошибка)"
 
-#: ../camel/camel-movemail.c:277
+#: ../camel/camel-movemail.c:280
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Ошибка при чтении почтового файла: %s"
 
-#: ../camel/camel-movemail.c:290
+#: ../camel/camel-movemail.c:293
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Ошибка сохранения временного почтового файла: %s"
 
-#: ../camel/camel-movemail.c:497 ../camel/camel-movemail.c:566
+#: ../camel/camel-movemail.c:500 ../camel/camel-movemail.c:569
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Ошибка копирования временного почтового файла: %s"
@@ -2438,64 +2450,74 @@ msgstr "Узел «%s» не найден. Проверьте правильно
 msgid "Host lookup '%s' failed: %s"
 msgstr "Узел «%s» не найден: %s"
 
-#: ../camel/camel-offline-folder.c:90
-msgid "Downloading new messages for offline mode"
-msgstr "Новые сообщения загружаются для автономной работы"
+#: ../camel/camel-offline-folder.c:89
+#, c-format
+#| msgid "Downloading new messages for offline mode"
+msgid "Downloading new messages for offline mode in '%s'"
+msgstr "Загрузка новых сообщений в «%s» для автономной работы"
+
+#: ../camel/camel-offline-folder.c:155
+#, c-format
+#| msgid "Downloading new messages for offline mode"
+msgid "Checking download of new messages for offline in '%s'"
+msgstr ""
+"Проверка на необходимость загрузки новых сообщений в «%s» для автономной "
+"работы"
 
-#: ../camel/camel-offline-folder.c:209
+#: ../camel/camel-offline-folder.c:214
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "Синхронизация сообщений в папке «%s» на диск"
 
-#: ../camel/camel-offline-folder.c:266
+#: ../camel/camel-offline-folder.c:271
 msgid "Copy folder content locally for _offline operation"
 msgstr ""
 "Скопировать содержимое папки на локальную машину для _автономной работы"
 
-#: ../camel/camel-provider.c:56
+#: ../camel/camel-provider.c:55
 msgid "Virtual folder email provider"
 msgstr "Провайдер виртуальных папок эл. почты"
 
-#: ../camel/camel-provider.c:58
+#: ../camel/camel-provider.c:57
 msgid "For reading mail as a query of another set of folders"
 msgstr "Для чтения почты по запросу к другому набору папок"
 
-#: ../camel/camel-provider.c:261
+#: ../camel/camel-provider.c:260
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Не удалось загрузить %s: Загрузка модулей не поддерживается в этой системе."
 
-#: ../camel/camel-provider.c:270
+#: ../camel/camel-provider.c:269
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Не удалось загрузить %s: %s"
 
-#: ../camel/camel-provider.c:279
+#: ../camel/camel-provider.c:278
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Не удалось загрузить %s: в модуле нет инициализирующего кода."
 
-#: ../camel/camel-provider.c:427 ../camel/camel-session.c:424
+#: ../camel/camel-provider.c:426 ../camel/camel-session.c:424
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "Провайдер для протокола «%s» не доступен"
 
-#: ../camel/camel-sasl-anonymous.c:33
-#: ../camel/providers/nntp/camel-nntp-provider.c:83
+#: ../camel/camel-sasl-anonymous.c:32
+#: ../camel/providers/nntp/camel-nntp-provider.c:82
 msgid "Anonymous"
 msgstr "Анонимный"
 
-#: ../camel/camel-sasl-anonymous.c:35
+#: ../camel/camel-sasl-anonymous.c:34
 msgid "This option will connect to the server using an anonymous login."
 msgstr "Будет производиться анонимное (anonymous) подключение к серверу."
 
-#: ../camel/camel-sasl-anonymous.c:68
+#: ../camel/camel-sasl-anonymous.c:67
 #, c-format
 msgid "Authentication failed."
 msgstr "Сбой проверки подлинности."
 
-#: ../camel/camel-sasl-anonymous.c:79
+#: ../camel/camel-sasl-anonymous.c:78
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -2504,7 +2526,7 @@ msgstr ""
 "Неверная трассировочная информация эл.адреса:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:93
+#: ../camel/camel-sasl-anonymous.c:92
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -2513,7 +2535,7 @@ msgstr ""
 "Неверная скрытая трассировочная информация:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:107
+#: ../camel/camel-sasl-anonymous.c:106
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -2522,11 +2544,11 @@ msgstr ""
 "Неверная трассировочная информация:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:44
+#: ../camel/camel-sasl-cram-md5.c:43
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:46
+#: ../camel/camel-sasl-cram-md5.c:45
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -2534,11 +2556,11 @@ msgstr ""
 "Подключение к серверу будет производиться с использованием для идентификации "
 "протокола CRAM-MD5, если сервер его поддерживает."
 
-#: ../camel/camel-sasl-digest-md5.c:57
+#: ../camel/camel-sasl-digest-md5.c:56
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:59
+#: ../camel/camel-sasl-digest-md5.c:58
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -2546,50 +2568,50 @@ msgstr ""
 "Подключение к серверу будет производиться с использованием зашифрованного "
 "пароля DIGEST-MD5, если сервер его поддерживает."
 
-#: ../camel/camel-sasl-digest-md5.c:855
+#: ../camel/camel-sasl-digest-md5.c:854
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Слишком длинный ответ от сервера (>2048 байт)"
 
-#: ../camel/camel-sasl-digest-md5.c:866
+#: ../camel/camel-sasl-digest-md5.c:865
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "Недопустимый ответ сервера\n"
 
-#: ../camel/camel-sasl-digest-md5.c:874
+#: ../camel/camel-sasl-digest-md5.c:873
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "Ответ сервера содержит недопустимый жетон «Качество защиты»"
 
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:906
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "Ответ сервера не содержит информации об авторизации"
 
-#: ../camel/camel-sasl-digest-md5.c:928
+#: ../camel/camel-sasl-digest-md5.c:927
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "Ответ сервера содержит неполную информацию об авторизации"
 
-#: ../camel/camel-sasl-digest-md5.c:941
+#: ../camel/camel-sasl-digest-md5.c:940
 #, c-format
 msgid "Server response does not match"
 msgstr "Ответ сервера не совпадает"
 
-#: ../camel/camel-sasl-gssapi.c:95
+#: ../camel/camel-sasl-gssapi.c:94
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:97
+#: ../camel/camel-sasl-gssapi.c:96
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "Подключение к серверу будет производиться с использованием Kerberos 5."
 
-#: ../camel/camel-sasl-gssapi.c:149
+#: ../camel/camel-sasl-gssapi.c:148
 #, c-format
 msgid "(Unknown GSSAPI mechanism code: %x)"
 msgstr "(неизвестный код механизма GSSAPI: %x)"
 
-#: ../camel/camel-sasl-gssapi.c:182
+#: ../camel/camel-sasl-gssapi.c:181
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -2597,11 +2619,11 @@ msgstr ""
 "Указанный механизм не поддерживается предоставленными средствами, либо не "
 "распознаётся в этой реализации."
 
-#: ../camel/camel-sasl-gssapi.c:187
+#: ../camel/camel-sasl-gssapi.c:186
 msgid "The provided target_name parameter was ill-formed."
 msgstr "Предоставленный параметр target_name сформирован неверно."
 
-#: ../camel/camel-sasl-gssapi.c:190
+#: ../camel/camel-sasl-gssapi.c:189
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
@@ -2609,7 +2631,7 @@ msgstr ""
 "Предоставленный параметр target_name содержит неверный или неподдерживаемый "
 "тип имени."
 
-#: ../camel/camel-sasl-gssapi.c:194
+#: ../camel/camel-sasl-gssapi.c:193
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -2617,7 +2639,7 @@ msgstr ""
 "input_token содержит не такую привязку к каналам, как указано в параметре "
 "input_chan_bindings."
 
-#: ../camel/camel-sasl-gssapi.c:199
+#: ../camel/camel-sasl-gssapi.c:198
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
@@ -2625,7 +2647,7 @@ msgstr ""
 "input_token содержит неверную подпись, или подпись, которая не может быть "
 "проверена."
 
-#: ../camel/camel-sasl-gssapi.c:203
+#: ../camel/camel-sasl-gssapi.c:202
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -2633,46 +2655,46 @@ msgstr ""
 "Предоставленные удостоверения были не действительны для инициализации "
 "контекста, либо обработчик удостоверения не ссылается на удостоверения."
 
-#: ../camel/camel-sasl-gssapi.c:208
+#: ../camel/camel-sasl-gssapi.c:207
 msgid "The supplied context handle did not refer to a valid context."
 msgstr ""
 "Указанный обработчик контекста не ссылается на действительный контекст."
 
-#: ../camel/camel-sasl-gssapi.c:211
+#: ../camel/camel-sasl-gssapi.c:210
 msgid "The consistency checks performed on the input_token failed."
 msgstr "Сбой проверки целостности элемента input_token."
 
-#: ../camel/camel-sasl-gssapi.c:214
+#: ../camel/camel-sasl-gssapi.c:213
 msgid "The consistency checks performed on the credential failed."
 msgstr "Сбой проверки целостности удостоверений."
 
-#: ../camel/camel-sasl-gssapi.c:217
+#: ../camel/camel-sasl-gssapi.c:216
 msgid "The referenced credentials have expired."
 msgstr "Срок действия упомянутых удостоверений истёк."
 
-#: ../camel/camel-sasl-gssapi.c:223 ../camel/camel-sasl-gssapi.c:405
-#: ../camel/camel-sasl-gssapi.c:454 ../camel/camel-sasl-gssapi.c:471
-#: ../camel/providers/smtp/camel-smtp-transport.c:622
+#: ../camel/camel-sasl-gssapi.c:222 ../camel/camel-sasl-gssapi.c:404
+#: ../camel/camel-sasl-gssapi.c:453 ../camel/camel-sasl-gssapi.c:470
+#: ../camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "Неверный ответ от сервера при идентификации."
 
-#: ../camel/camel-sasl-gssapi.c:483
+#: ../camel/camel-sasl-gssapi.c:482
 #, c-format
 msgid "Unsupported security layer."
 msgstr "Неподдерживаемый уровень безопасности."
 
-#: ../camel/camel-sasl-login.c:38
+#: ../camel/camel-sasl-login.c:37
 msgid "Login"
 msgstr "Регистрация"
 
-#: ../camel/camel-sasl-login.c:40 ../camel/camel-sasl-plain.c:44
+#: ../camel/camel-sasl-login.c:39 ../camel/camel-sasl-plain.c:43
 msgid "This option will connect to the server using a simple password."
 msgstr ""
 "Подключение к серверу будет производиться с использованием незашифрованного "
 "пароля."
 
-#: ../camel/camel-sasl-login.c:108
+#: ../camel/camel-sasl-login.c:107
 #, c-format
 msgid "Unknown authentication state."
 msgstr "Неизвестное состояние идентификации."
@@ -2689,33 +2711,33 @@ msgstr ""
 "Эта опция подключает к серверу, основанному на Windows, используя для "
 "аутентификации NTLM / Secure Password Authentication."
 
-#: ../camel/camel-sasl-plain.c:42
+#: ../camel/camel-sasl-plain.c:41
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:44
+#: ../camel/camel-sasl-popb4smtp.c:43
 msgid "POP before SMTP"
 msgstr "POP до SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:46
+#: ../camel/camel-sasl-popb4smtp.c:45
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "Будет производиться авторизация POP до попытки передачи почты по SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:82
+#: ../camel/camel-sasl-popb4smtp.c:81
 msgid "POP Source UID"
 msgstr "Идентификатор источника POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:96
+#: ../camel/camel-sasl-popb4smtp.c:95
 #, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "Аутентификация POP до SMTP, используя неизвестный транспорт"
 
-#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:117
+#: ../camel/camel-sasl-popb4smtp.c:107 ../camel/camel-sasl-popb4smtp.c:116
 #, c-format
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "Аутентификация POP до SMTP посредством службы %s"
 
-#: ../camel/camel-search-private.c:114
+#: ../camel/camel-search-private.c:113
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Сбой компиляции регулярного выражения: %s: %s"
@@ -2726,10 +2748,10 @@ msgid "Invalid GType registered for protocol '%s'"
 msgstr "Некорректный зарегистрированный GType для протокола «%s»"
 
 #: ../camel/camel-session.c:502
-#: ../camel/providers/imapx/camel-imapx-server.c:4734
-#: ../camel/providers/pop3/camel-pop3-store.c:311
-#: ../camel/providers/pop3/camel-pop3-store.c:757
-#: ../camel/providers/smtp/camel-smtp-transport.c:515
+#: ../camel/providers/imapx/camel-imapx-server.c:4781
+#: ../camel/providers/pop3/camel-pop3-store.c:309
+#: ../camel/providers/pop3/camel-pop3-store.c:764
+#: ../camel/providers/smtp/camel-smtp-transport.c:544
 #, c-format
 msgid "No support for %s authentication"
 msgstr "Аутентификация %s не поддерживается"
@@ -2743,240 +2765,245 @@ msgstr "Сбой при проверке подлинности %s"
 msgid "Forwarding messages is not supported"
 msgstr "Перенаправление сообщений не поддерживается"
 
-#: ../camel/camel-smime-context.c:349 ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1075
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Не удалось найти сертификат для «%s»"
 
-#: ../camel/camel-smime-context.c:377
+#: ../camel/camel-smime-context.c:376
 msgid "Cannot create CMS message"
 msgstr "Не удалось создать сообщение CMS"
 
-#: ../camel/camel-smime-context.c:382
+#: ../camel/camel-smime-context.c:381
 msgid "Cannot create CMS signed data"
 msgstr "Не удалось создать CMS signedData"
 
-#: ../camel/camel-smime-context.c:388
+#: ../camel/camel-smime-context.c:387
 msgid "Cannot attach CMS signed data"
 msgstr "Не удалось вложить CMS signedData"
 
-#: ../camel/camel-smime-context.c:395
+#: ../camel/camel-smime-context.c:394
 msgid "Cannot attach CMS data"
 msgstr "Не удалось вложить CMS data"
 
-#: ../camel/camel-smime-context.c:401
+#: ../camel/camel-smime-context.c:400
 msgid "Cannot create CMS Signer information"
 msgstr "Не удалось создать CMS SignerInfo"
 
-#: ../camel/camel-smime-context.c:407
+#: ../camel/camel-smime-context.c:406
 msgid "Cannot find certificate chain"
 msgstr "Не удалось найти цепочку сертификатов"
 
-#: ../camel/camel-smime-context.c:413
+#: ../camel/camel-smime-context.c:412
 msgid "Cannot add CMS Signing time"
 msgstr "Не удалось добавить CMS SigningTime"
 
-#: ../camel/camel-smime-context.c:437 ../camel/camel-smime-context.c:452
+#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "Сертификат шифрования для «%s» не существует"
 
-#: ../camel/camel-smime-context.c:459
+#: ../camel/camel-smime-context.c:458
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "Не удалось добавить атрибут SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:464
+#: ../camel/camel-smime-context.c:463
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "Не удалось добавить атрибут MS SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:469
+#: ../camel/camel-smime-context.c:468
 msgid "Cannot add encryption certificate"
 msgstr "Не удалось добавить сертификат шифрования"
 
-#: ../camel/camel-smime-context.c:475
+#: ../camel/camel-smime-context.c:474
 msgid "Cannot add CMS Signer information"
 msgstr "Не удалось добавить CMS SignerInfo"
 
 #. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../camel/camel-smime-context.c:508
+#: ../camel/camel-smime-context.c:507
 msgid "Unverified"
 msgstr "Непроверено"
 
-#: ../camel/camel-smime-context.c:510
+#: ../camel/camel-smime-context.c:509
 msgid "Good signature"
 msgstr "Подпись верна"
 
-#: ../camel/camel-smime-context.c:512
+#: ../camel/camel-smime-context.c:511
 msgid "Bad signature"
 msgstr "Подпись неверна"
 
-#: ../camel/camel-smime-context.c:514
+#: ../camel/camel-smime-context.c:513
 msgid "Content tampered with or altered in transit"
 msgstr "Сообщение было подделано или изменено на пути"
 
-#: ../camel/camel-smime-context.c:516
+#: ../camel/camel-smime-context.c:515
 msgid "Signing certificate not found"
 msgstr "Сертификат подписи не найден"
 
-#: ../camel/camel-smime-context.c:518
+#: ../camel/camel-smime-context.c:517
 msgid "Signing certificate not trusted"
 msgstr "Сертификат подписи недостоверен"
 
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:519
 msgid "Signature algorithm unknown"
 msgstr "Неизвестный алгоритм подписи"
 
-#: ../camel/camel-smime-context.c:522
+#: ../camel/camel-smime-context.c:521
 msgid "Signature algorithm unsupported"
 msgstr "Неподдерживаемый алгоритм подписи"
 
-#: ../camel/camel-smime-context.c:524
+#: ../camel/camel-smime-context.c:523
 msgid "Malformed signature"
 msgstr "Неверно сформированная подпись"
 
-#: ../camel/camel-smime-context.c:526
+#: ../camel/camel-smime-context.c:525
 msgid "Processing error"
 msgstr "Ошибка обработки"
 
-#: ../camel/camel-smime-context.c:571
+#: ../camel/camel-smime-context.c:570
 msgid "No signed data in signature"
 msgstr "В подписи отсутствуют данные подписи"
 
-#: ../camel/camel-smime-context.c:576
+#: ../camel/camel-smime-context.c:575
 msgid "Digests missing from enveloped data"
 msgstr "В данных конверта отсутствует сводка"
 
-#: ../camel/camel-smime-context.c:589 ../camel/camel-smime-context.c:600
+#: ../camel/camel-smime-context.c:588 ../camel/camel-smime-context.c:599
 msgid "Cannot calculate digests"
 msgstr "Не удалось вычислить дайджесты"
 
-#: ../camel/camel-smime-context.c:607 ../camel/camel-smime-context.c:611
+#: ../camel/camel-smime-context.c:606 ../camel/camel-smime-context.c:610
 msgid "Cannot set message digests"
 msgstr "Не удалось установить дайджесты сообщения"
 
-#: ../camel/camel-smime-context.c:621 ../camel/camel-smime-context.c:626
+#: ../camel/camel-smime-context.c:620 ../camel/camel-smime-context.c:625
 msgid "Certificate import failed"
 msgstr "Сбой импорта сертификата"
 
-#: ../camel/camel-smime-context.c:636
+#: ../camel/camel-smime-context.c:635
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr ""
 "Сообщение состоит только из сертификатов, Не удалось проверить сертификаты"
 
-#: ../camel/camel-smime-context.c:639
+#: ../camel/camel-smime-context.c:638
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "В сообщении только сертификаты, сертификаты импортированы и проверены"
 
-#: ../camel/camel-smime-context.c:643
+#: ../camel/camel-smime-context.c:642
 msgid "Cannot find signature digests"
 msgstr "Не удалось найти дайджесты подписи"
 
-#: ../camel/camel-smime-context.c:660
+#: ../camel/camel-smime-context.c:659
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Подписано: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:856 ../camel/camel-smime-context.c:1150
+#: ../camel/camel-smime-context.c:855 ../camel/camel-smime-context.c:1149
 msgid "Cannot create encoder context"
 msgstr "Не удалось создать контекст кодировщика"
 
-#: ../camel/camel-smime-context.c:862
+#: ../camel/camel-smime-context.c:861
 msgid "Failed to add data to CMS encoder"
 msgstr "Не удалось добавить данные к кодировщику CMS"
 
-#: ../camel/camel-smime-context.c:867 ../camel/camel-smime-context.c:1167
+#: ../camel/camel-smime-context.c:866 ../camel/camel-smime-context.c:1166
 msgid "Failed to encode data"
 msgstr "Ошибка кодирования данных"
 
-#: ../camel/camel-smime-context.c:1015 ../camel/camel-smime-context.c:1264
+#: ../camel/camel-smime-context.c:1014 ../camel/camel-smime-context.c:1263
 msgid "Decoder failed"
 msgstr "Сбой декодера"
 
-#: ../camel/camel-smime-context.c:1084
+#: ../camel/camel-smime-context.c:1083
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Не удалось найти общий алгоритм шифрования"
 
-#: ../camel/camel-smime-context.c:1092
+#: ../camel/camel-smime-context.c:1091
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Не удалось распределить слот для ключа общего шифрования"
 
-#: ../camel/camel-smime-context.c:1103
+#: ../camel/camel-smime-context.c:1102
 msgid "Cannot create CMS Message"
 msgstr "Не удалось создать сообщение CMS"
 
-#: ../camel/camel-smime-context.c:1109
+#: ../camel/camel-smime-context.c:1108
 msgid "Cannot create CMS Enveloped data"
 msgstr "Не удалось создать CMS EnvelopedData"
 
-#: ../camel/camel-smime-context.c:1115
+#: ../camel/camel-smime-context.c:1114
 msgid "Cannot attach CMS Enveloped data"
 msgstr "Не удалось вложить CMS EnvelopedData"
 
-#: ../camel/camel-smime-context.c:1121
+#: ../camel/camel-smime-context.c:1120
 msgid "Cannot attach CMS data object"
 msgstr "Не удалось вложить объект CMS data"
 
-#: ../camel/camel-smime-context.c:1130
+#: ../camel/camel-smime-context.c:1129
 msgid "Cannot create CMS Recipient information"
 msgstr "Не удалось создать сведения CMS RecipientInfo"
 
-#: ../camel/camel-smime-context.c:1135
+#: ../camel/camel-smime-context.c:1134
 msgid "Cannot add CMS Recipient information"
 msgstr "Не удалось добавить сведения CMS RecipientInfo"
 
-#: ../camel/camel-smime-context.c:1161
+#: ../camel/camel-smime-context.c:1160
 msgid "Failed to add data to encoder"
 msgstr "Не удалось добавить данные к кодировщику"
 
-#: ../camel/camel-smime-context.c:1271
+#: ../camel/camel-smime-context.c:1270
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME Decrypt: Не найдено зашифрованного содержимого"
 
-#: ../camel/camel-store.c:1232
+#: ../camel/camel-store.c:1248
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Открытие папки «%s»"
 
-#: ../camel/camel-store.c:1523
+#: ../camel/camel-store.c:1539
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Сканирование папок на «%s»"
 
-#: ../camel/camel-store.c:1551 ../camel/camel-store.c:1596
-#: ../camel/camel-vtrash-folder.c:46
+#: ../camel/camel-store.c:1567 ../camel/camel-store.c:1612
+#: ../camel/camel-vtrash-folder.c:45
 msgid "Trash"
 msgstr "Корзина"
 
-#: ../camel/camel-store.c:1565 ../camel/camel-store.c:1613
-#: ../camel/camel-vtrash-folder.c:48
+#: ../camel/camel-store.c:1581 ../camel/camel-store.c:1629
+#: ../camel/camel-vtrash-folder.c:47
 msgid "Junk"
 msgstr "Спам"
 
-#: ../camel/camel-store.c:2214
+#: ../camel/camel-store.c:2230
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Не удалось создать папку: %s: папка существует"
 
-#: ../camel/camel-store.c:2221
+#: ../camel/camel-store.c:2237
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "Создание папки «%s»"
 
-#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:410
-#: ../camel/providers/local/camel-maildir-store.c:321
+#: ../camel/camel-store.c:2414 ../camel/camel-vee-store.c:410
+#: ../camel/providers/local/camel-maildir-store.c:330
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Не удалось удалить папку: %s: недопустимая операция"
 
-#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:461
-#: ../camel/providers/local/camel-maildir-store.c:872
+#: ../camel/camel-store.c:2604 ../camel/camel-vee-store.c:461
+#: ../camel/providers/local/camel-maildir-store.c:898
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Не удалось переименовать папку: %s: недопустимая операция"
 
-#: ../camel/camel-stream.c:285 ../camel/camel-stream.c:336
+#: ../camel/camel-stream.c:168
+#| msgid "Cannot authenticate without a username"
+msgid "Cannot write with no base stream"
+msgstr "Запись невозможна, поскольку нет основного потока"
+
+#: ../camel/camel-stream.c:288 ../camel/camel-stream.c:339
 #, c-format
 msgid "Stream type '%s' is not seekable"
 msgstr "Потоковый тип «%s» не позволяет перемещаться по потоку"
@@ -2985,16 +3012,16 @@ msgstr "Потоковый тип «%s» не позволяет перемещ
 msgid "Only reset to beginning is supported with CamelStreamFilter"
 msgstr "Для CamelStreamFilter поддерживается только переход к началу"
 
-#: ../camel/camel-stream-null.c:76
+#: ../camel/camel-stream-null.c:74
 msgid "Only reset to beginning is supported with CamelHttpStream"
 msgstr "Для CamelHttpStream поддерживается только переход к началу"
 
-#: ../camel/camel-stream-process.c:280
+#: ../camel/camel-stream-process.c:278
 #, c-format
 msgid "Connection cancelled"
 msgstr "Соединение отменено"
 
-#: ../camel/camel-stream-process.c:285
+#: ../camel/camel-stream-process.c:283
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Не удалось подключиться командой «%s»: %s"
@@ -3009,7 +3036,7 @@ msgstr "Подписка на папку «%s»"
 msgid "Unsubscribing from folder '%s'"
 msgstr "Отмена подписки на папку «%s»"
 
-#: ../camel/camel-url.c:329
+#: ../camel/camel-url.c:327
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "Не удалось разобрать URL «%s»"
@@ -3034,7 +3061,7 @@ msgstr "Нет сообщения %s в %s"
 msgid "Error storing '%s': "
 msgstr "Ошибка при хранении «%s»: "
 
-#: ../camel/camel-vee-folder.c:1167
+#: ../camel/camel-vee-folder.c:1173
 msgid "Automatically _update on change in source folders"
 msgstr "Автоматически _обновлять при изменении папок-источников"
 
@@ -3058,49 +3085,59 @@ msgstr "Не удалось переименовать папку: %s: нет т
 msgid "Enable _Unmatched folder"
 msgstr "Включить папку «_Прочее»"
 
-#: ../camel/camel-vtrash-folder.c:47
+#: ../camel/camel-vee-store.c:1025
+#| msgid "Enable _Unmatched folder"
+msgid "Updating Unmatched search folder"
+msgstr "Обновление папки поиска «Прочее»"
+
+#: ../camel/camel-vtrash-folder.c:46
 msgid "Cannot copy messages to the Trash folder"
 msgstr "Не удалось переместить сообщения в корзину"
 
-#: ../camel/camel-vtrash-folder.c:49
+#: ../camel/camel-vtrash-folder.c:48
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Не удалось переместить сообщения в папку «Спам»"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:796
+#: ../camel/providers/imapx/camel-imapx-folder.c:812
 #, c-format
 msgid "No quota information available for folder '%s'"
 msgstr "Для папки «%s» нет информации о квоте"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:936
-#: ../camel/providers/imapx/camel-imapx-folder.c:1029
+#: ../camel/providers/imapx/camel-imapx-folder.c:952
+#: ../camel/providers/imapx/camel-imapx-folder.c:1045
 #, c-format
 msgid "No destination folder specified"
 msgstr "Не указана целевая папка"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:964
+#: ../camel/providers/imapx/camel-imapx-folder.c:980
 msgid "Unable to move junk messages"
 msgstr "Не удалось переместить сообщения, содержащие спам"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1057
+#: ../camel/providers/imapx/camel-imapx-folder.c:1073
 msgid "Unable to move deleted messages"
 msgstr "Не удалось переместить удалённые сообщения"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1374
+#: ../camel/providers/imapx/camel-imapx-folder.c:1393
 #: ../camel/providers/nntp/camel-nntp-folder.c:760
 msgid "Apply message _filters to this folder"
 msgstr "Применять _фильтры сообщений к этой папке"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1485
+#: ../camel/providers/imapx/camel-imapx-folder.c:1404
+#| msgid "Only check for Junk messages in the IN_BOX folder"
+msgid "Always check for _new mail in this folder"
+msgstr "Всегда проверять эту папку на наличие новых сообщений"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:1515
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr "Не удалось создать краткую информацию по папке %s"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1494
+#: ../camel/providers/imapx/camel-imapx-folder.c:1524
 #, c-format
 msgid "Could not create cache for %s: "
 msgstr "Не удалось создать кэш для %s:"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1709
+#: ../camel/providers/imapx/camel-imapx-folder.c:1739
 #, c-format
 msgid "No IMAP mailbox available for folder '%s'"
 msgstr "Для папки «%s» нет доступного ящика IMAP"
@@ -3141,7 +3178,7 @@ msgid "Numbe_r of concurrent connections to use"
 msgstr "Коли_чество одновременно используемых соединений"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:54
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
+#: ../camel/providers/nntp/camel-nntp-provider.c:43
 msgid "Folders"
 msgstr "Папки"
 
@@ -3159,14 +3196,14 @@ msgstr "Пространство имён:"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:64
 #: ../camel/providers/local/camel-local-provider.c:39
-#: ../camel/providers/local/camel-local-provider.c:79
+#: ../camel/providers/local/camel-local-provider.c:77
 #: ../camel/providers/local/camel-local-provider.c:99
-#: ../camel/providers/nntp/camel-nntp-provider.c:39
+#: ../camel/providers/nntp/camel-nntp-provider.c:38
 msgid "Options"
 msgstr "Параметры"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:66
-#: ../camel/providers/nntp/camel-nntp-provider.c:41
+#: ../camel/providers/nntp/camel-nntp-provider.c:40
 msgid "Apply _filters to new messages in all folders"
 msgstr "_Применить фильтры к новым сообщениям во всех папках"
 
@@ -3180,13 +3217,16 @@ msgid "Check new messages for _Junk contents"
 msgstr "Проверять новые _сообщения на наличие спама"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:72
-msgid "Only check for Junk messages in the IN_BOX folder"
+#| msgid "Only check for Junk messages in the IN_BOX folder"
+msgid "Only check for Junk messages in the In_box folder"
 msgstr ""
-"Проверять, являются ли новые сообщения _спамом, только в папке «Входящие»"
+"Проверять, являются ли новые сообщения спамом, только в папке «_Входящие»"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:74
-msgid "Automatically synchroni_ze remote mail locally"
-msgstr "Автоматически синхрони_зировать удалённую почту локально"
+#| msgid "Automatically synchroni_ze remote mail locally"
+msgid "Synchroni_ze remote mail locally in all folders"
+msgstr ""
+"Автоматически _синхронизировать удалённую почту локально во всех папках"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Default IMAP port"
@@ -3204,179 +3244,179 @@ msgstr "IMAP+"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Для чтения и хранения почты на серверах IMAP."
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1009
-#: ../camel/providers/imapx/camel-imapx-server.c:1016
+#: ../camel/providers/imapx/camel-imapx-server.c:1006
+#: ../camel/providers/imapx/camel-imapx-server.c:1013
 #, c-format
 msgid "Not authenticated"
 msgstr "Не удалось выполнить аутентификацию"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1713
+#: ../camel/providers/imapx/camel-imapx-server.c:1734
 msgid "Server disconnected"
 msgstr "Сервер отключился"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2205
+#: ../camel/providers/imapx/camel-imapx-server.c:2228
 msgid "Error writing to cache stream"
 msgstr "Ошибка записи в поток кэша"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3565
+#: ../camel/providers/imapx/camel-imapx-server.c:3616
 msgid "Error performing IDLE"
 msgstr "Ошибка выполнения команды IDLE"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4573
+#: ../camel/providers/imapx/camel-imapx-server.c:4622
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Не удалось подключиться к IMAP-серверу %s в защищённом режиме:%s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4574
+#: ../camel/providers/imapx/camel-imapx-server.c:4623
 #: ../camel/providers/smtp/camel-smtp-transport.c:215
 msgid "STARTTLS not supported"
 msgstr "STARTTLS не поддерживается"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4634
+#: ../camel/providers/imapx/camel-imapx-server.c:4683
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: "
 msgstr "Не удалось подключиться к IMAP-серверу %s в защищённом режиме: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4723
+#: ../camel/providers/imapx/camel-imapx-server.c:4770
 #, c-format
 msgid "IMAP server %s does not support %s authentication"
 msgstr "Сервер IMAP %s не поддерживает аутентификацию %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4753
-#: ../camel/providers/nntp/camel-nntp-store.c:394
-#: ../camel/providers/nntp/camel-nntp-store.c:531
+#: ../camel/providers/imapx/camel-imapx-server.c:4800
+#: ../camel/providers/nntp/camel-nntp-store.c:393
+#: ../camel/providers/nntp/camel-nntp-store.c:530
 msgid "Cannot authenticate without a username"
 msgstr "Невозможно выполнить проверку подлинности без имени пользователя"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4762
-#: ../camel/providers/nntp/camel-nntp-store.c:540
-#: ../camel/providers/pop3/camel-pop3-store.c:678
-#: ../camel/providers/pop3/camel-pop3-store.c:699
+#: ../camel/providers/imapx/camel-imapx-server.c:4809
+#: ../camel/providers/nntp/camel-nntp-store.c:539
+#: ../camel/providers/pop3/camel-pop3-store.c:676
+#: ../camel/providers/pop3/camel-pop3-store.c:706
 msgid "Authentication password not available"
 msgstr "Пароль аутентификации недоступен"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4998
-#: ../camel/providers/imapx/camel-imapx-server.c:5057
+#: ../camel/providers/imapx/camel-imapx-server.c:5045
+#: ../camel/providers/imapx/camel-imapx-server.c:5104
 msgid "Error fetching message"
 msgstr "Ошибка при получении сообщения"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5050
+#: ../camel/providers/imapx/camel-imapx-server.c:5097
 msgid "Failed to close the tmp stream"
 msgstr "Сбой при закрытии временного потока"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5086
+#: ../camel/providers/imapx/camel-imapx-server.c:5133
 msgid "Failed to copy the tmp file"
 msgstr "Сбой при копировании временного файла"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5227
+#: ../camel/providers/imapx/camel-imapx-server.c:5274
 msgid "Error moving messages"
 msgstr "Ошибка при перемещении сообщений"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5231
+#: ../camel/providers/imapx/camel-imapx-server.c:5278
 msgid "Error copying messages"
 msgstr "Ошибка при копировании сообщений"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5453
+#: ../camel/providers/imapx/camel-imapx-server.c:5500
 msgid "Error appending message"
 msgstr "Ошибка при присоединении сообщения"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5689
+#: ../camel/providers/imapx/camel-imapx-server.c:5736
 msgid "Error fetching message headers"
 msgstr "Ошибка при получении заголовков сообщений"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5856
+#: ../camel/providers/imapx/camel-imapx-server.c:5903
 msgid "Error retrieving message"
 msgstr "Ошибка при получении сообщения"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5990
-#: ../camel/providers/imapx/camel-imapx-server.c:6219
+#: ../camel/providers/imapx/camel-imapx-server.c:6037
+#: ../camel/providers/imapx/camel-imapx-server.c:6266
 #, c-format
 msgid "Fetching summary information for new messages in '%s'"
 msgstr "Получение краткой информации о новых сообщениях «%s»"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6042
+#: ../camel/providers/imapx/camel-imapx-server.c:6089
 #, c-format
 msgid "Scanning for changed messages in '%s'"
 msgstr "Поиск изменённых сообщений в «%s»"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6094
+#: ../camel/providers/imapx/camel-imapx-server.c:6141
 msgid "Error fetching new messages"
 msgstr "Ошибка при получении новых сообщений"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6367
+#: ../camel/providers/imapx/camel-imapx-server.c:6414
 msgid "Error refreshing folder"
 msgstr "Ошибка при обновлении папки"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6517
+#: ../camel/providers/imapx/camel-imapx-server.c:6564
 msgid "Error expunging message"
 msgstr "Ошибка уничтожения сообщений"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6632
-#: ../camel/providers/imapx/camel-imapx-server.c:6657
+#: ../camel/providers/imapx/camel-imapx-server.c:6679
+#: ../camel/providers/imapx/camel-imapx-server.c:6704
 msgid "Error fetching folders"
 msgstr "Ошибка при получении папок"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6737
+#: ../camel/providers/imapx/camel-imapx-server.c:6784
 msgid "Error creating folder"
 msgstr "Ошибка при создании папки"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6789
+#: ../camel/providers/imapx/camel-imapx-server.c:6836
 msgid "Error deleting folder"
 msgstr "Ошибка при удалении папки"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6865
+#: ../camel/providers/imapx/camel-imapx-server.c:6912
 msgid "Error renaming folder"
 msgstr "Ошибка при переименовании папки"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6939
+#: ../camel/providers/imapx/camel-imapx-server.c:6986
 msgid "Error subscribing to folder"
 msgstr "Ошибка подписывания на папку"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:7005
+#: ../camel/providers/imapx/camel-imapx-server.c:7052
 msgid "Error unsubscribing from folder"
 msgstr "Ошибка отписывания от папки"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:7067
+#: ../camel/providers/imapx/camel-imapx-server.c:7114
 msgid "Error retrieving quota information"
 msgstr "Ошибка получения информации о квоте"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:7119
+#: ../camel/providers/imapx/camel-imapx-server.c:7166
 msgid "Search failed"
 msgstr "Ошибка поиска"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:7181
+#: ../camel/providers/imapx/camel-imapx-server.c:7228
 msgid "Error performing NOOP"
 msgstr "Ошибка выполнения команды NOOP"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:7288
+#: ../camel/providers/imapx/camel-imapx-server.c:7335
 msgid "Error syncing changes"
 msgstr "Ошибка при синхронизации изменений"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:8275
+#: ../camel/providers/imapx/camel-imapx-server.c:8332
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "Не удалось получить сообщение с идентификатором %s: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:8276
+#: ../camel/providers/imapx/camel-imapx-server.c:8333
 msgid "No such message available."
 msgstr "Нет такого сообщения."
 
-#: ../camel/providers/imapx/camel-imapx-server.c:8483
-#: ../camel/providers/imapx/camel-imapx-server.c:8504
+#: ../camel/providers/imapx/camel-imapx-server.c:8554
+#: ../camel/providers/imapx/camel-imapx-server.c:8575
 msgid "Cannot create spool file: "
 msgstr "Не удалось создать файл спула: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:9256
+#: ../camel/providers/imapx/camel-imapx-server.c:9383
 msgid "IMAP server does not support quotas"
 msgstr "Сервер IMAP не поддерживает квоты"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
 #: ../camel/providers/imapx/camel-imapx-store.c:223
 #: ../camel/providers/local/camel-maildir-folder.c:482
-#: ../camel/providers/local/camel-maildir-store.c:322
-#: ../camel/providers/local/camel-maildir-store.c:784
-#: ../camel/providers/local/camel-maildir-store.c:790
-#: ../camel/providers/local/camel-maildir-store.c:873
+#: ../camel/providers/local/camel-maildir-store.c:331
+#: ../camel/providers/local/camel-maildir-store.c:810
+#: ../camel/providers/local/camel-maildir-store.c:816
+#: ../camel/providers/local/camel-maildir-store.c:899
 #: ../camel/providers/local/camel-spool-store.c:393
 msgid "Inbox"
 msgstr "Входящие"
@@ -3392,8 +3432,8 @@ msgid "IMAP service for %s on %s"
 msgstr "Сервис IMAP для %s на %s"
 
 #: ../camel/providers/imapx/camel-imapx-store.c:836
-#: ../camel/providers/nntp/camel-nntp-provider.c:93
-#: ../camel/providers/pop3/camel-pop3-provider.c:81
+#: ../camel/providers/nntp/camel-nntp-provider.c:92
+#: ../camel/providers/pop3/camel-pop3-provider.c:80
 msgid "Password"
 msgstr "Пароль"
 
@@ -3403,63 +3443,71 @@ msgstr ""
 "Подключение к серверу IMAP будет производиться с использованием "
 "незашифрованного пароля."
 
-#: ../camel/providers/imapx/camel-imapx-store.c:913
+#: ../camel/providers/imapx/camel-imapx-store.c:917
 #, c-format
 msgid "No such folder %s"
 msgstr "Нет папки с именем %s"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1324
+#: ../camel/providers/imapx/camel-imapx-store.c:1331
 #, c-format
 msgid "No IMAP namespace for folder path '%s'"
 msgstr "Нет пространства имён IMAP для папки с путём «%s»"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1472
+#: ../camel/providers/imapx/camel-imapx-store.c:1512
+#: ../camel/providers/imapx/camel-imapx-store.c:1757
 #, c-format
-msgid "Retrieving folder list for %s"
-msgstr "Получение списка папок для %s"
+#| msgid "Retrieving folder list for %s"
+msgid "Retrieving folder list for '%s'"
+msgstr "Получение списка папок для «%s»"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1924
+#: ../camel/providers/imapx/camel-imapx-store.c:1977
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "Недопустимое имя папки «%s»: имя содержит символ «%c»"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2689
-#: ../camel/providers/nntp/camel-nntp-store.c:1250
-#: ../camel/providers/pop3/camel-pop3-folder.c:450
-#: ../camel/providers/pop3/camel-pop3-folder.c:593
-#: ../camel/providers/pop3/camel-pop3-folder.c:789
-#: ../camel/providers/pop3/camel-pop3-folder.c:987
-#: ../camel/providers/pop3/camel-pop3-store.c:299
-#: ../camel/providers/pop3/camel-pop3-store.c:528
-#: ../camel/providers/pop3/camel-pop3-store.c:576
-#: ../camel/providers/pop3/camel-pop3-store.c:668
-#: ../camel/providers/pop3/camel-pop3-store.c:1072
+#: ../camel/providers/imapx/camel-imapx-store.c:2749
+#: ../camel/providers/nntp/camel-nntp-store.c:1249
+#: ../camel/providers/pop3/camel-pop3-folder.c:448
+#: ../camel/providers/pop3/camel-pop3-folder.c:591
+#: ../camel/providers/pop3/camel-pop3-folder.c:787
+#: ../camel/providers/pop3/camel-pop3-folder.c:985
+#: ../camel/providers/pop3/camel-pop3-store.c:297
+#: ../camel/providers/pop3/camel-pop3-store.c:526
+#: ../camel/providers/pop3/camel-pop3-store.c:574
+#: ../camel/providers/pop3/camel-pop3-store.c:666
+#: ../camel/providers/pop3/camel-pop3-store.c:1079
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "Для завершения данной операции необходимо подключение к сети"
 
-#: ../camel/providers/local/camel-local-folder.c:195
+#: ../camel/providers/imapx/camel-imapx-store.c:2754
+#, c-format
+#| msgid "You must be working online to complete this operation"
+msgid "You must be working online to complete this operation (%s)"
+msgstr "Для завершения данной операции необходимо подключение к сети (%s)"
+
+#: ../camel/providers/local/camel-local-folder.c:194
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:205
-#: ../camel/providers/local/camel-local-folder.c:214
+#: ../camel/providers/local/camel-local-folder.c:204
+#: ../camel/providers/local/camel-local-folder.c:213
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "почтовый ящик: %s: (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:223
+#: ../camel/providers/local/camel-local-folder.c:222
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:500
+#: ../camel/providers/local/camel-local-folder.c:499
 msgid "_Index message body data"
 msgstr "_Индексировать данные тела сообщения"
 
-#: ../camel/providers/local/camel-local-folder.c:730
+#: ../camel/providers/local/camel-local-folder.c:727
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3492,16 +3540,16 @@ msgstr ""
 "Для получения (перемещения) локальной почты из очередей в стандартном "
 "формате mbox в папки, управляемые Evolution."
 
-#: ../camel/providers/local/camel-local-provider.c:81
+#: ../camel/providers/local/camel-local-provider.c:79
 #: ../camel/providers/local/camel-local-provider.c:101
 msgid "_Apply filters to new messages in Inbox"
 msgstr "_Применить фильтры к новым сообщениям в папке «Входящие»"
 
-#: ../camel/providers/local/camel-local-provider.c:88
+#: ../camel/providers/local/camel-local-provider.c:86
 msgid "Maildir-format mail directories"
 msgstr "Почтовые каталоги в формате Maildir"
 
-#: ../camel/providers/local/camel-local-provider.c:89
+#: ../camel/providers/local/camel-local-provider.c:87
 msgid "For storing local mail in maildir directories."
 msgstr "Для хранения локальной почты в почтовых каталогах maildir."
 
@@ -3527,56 +3575,56 @@ msgstr ""
 msgid "Standard Unix mbox spool directory"
 msgstr "Стандартный для Unix каталог очередей типа mbox"
 
-#: ../camel/providers/local/camel-local-store.c:96
+#: ../camel/providers/local/camel-local-store.c:88
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Не удалось переименовать папку %s в %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:178
+#: ../camel/providers/local/camel-local-store.c:170
 #, c-format
 msgid "Local mail file %s"
 msgstr "Локальный почтовый файл %s"
 
-#: ../camel/providers/local/camel-local-store.c:221
-#: ../camel/providers/local/camel-local-store.c:381
-#: ../camel/providers/local/camel-maildir-store.c:122
+#: ../camel/providers/local/camel-local-store.c:213
+#: ../camel/providers/local/camel-local-store.c:373
+#: ../camel/providers/local/camel-maildir-store.c:123
 #: ../camel/providers/local/camel-mbox-store.c:572
 #: ../camel/providers/local/camel-spool-store.c:87
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Относительный путь к хранилищу %s"
 
-#: ../camel/providers/local/camel-local-store.c:230
+#: ../camel/providers/local/camel-local-store.c:222
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Хранилище %s не является каталогом"
 
-#: ../camel/providers/local/camel-local-store.c:242
-#: ../camel/providers/local/camel-local-store.c:252
-#: ../camel/providers/local/camel-local-store.c:394
-#: ../camel/providers/local/camel-maildir-store.c:156
+#: ../camel/providers/local/camel-local-store.c:234
+#: ../camel/providers/local/camel-local-store.c:244
+#: ../camel/providers/local/camel-local-store.c:386
+#: ../camel/providers/local/camel-maildir-store.c:165
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Не удалось получить папку: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:289
+#: ../camel/providers/local/camel-local-store.c:281
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "Локальное хранилище не имеет папки Входящие"
 
-#: ../camel/providers/local/camel-local-store.c:454
+#: ../camel/providers/local/camel-local-store.c:446
 #: ../camel/providers/local/camel-mbox-store.c:739
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "Не удалось удалить индексный файл папки «%s»: %s"
 
-#: ../camel/providers/local/camel-local-store.c:482
+#: ../camel/providers/local/camel-local-store.c:474
 #: ../camel/providers/local/camel-mbox-store.c:769
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "Не удалось удалить мета-файл папки «%s»: %s"
 
-#: ../camel/providers/local/camel-local-store.c:594
+#: ../camel/providers/local/camel-local-store.c:587
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Не удалось переименовать «%s»: %s"
@@ -3608,53 +3656,60 @@ msgstr "Не удалось получить сообщение %s из папк
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "Не удалось переместить сообщение в папку: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:130
-#: ../camel/providers/local/camel-maildir-store.c:149
-#: ../camel/providers/local/camel-maildir-store.c:881
+#: ../camel/providers/local/camel-maildir-store.c:131
+#: ../camel/providers/local/camel-maildir-store.c:915
+#, c-format
+#| msgid "Cannot create folder '%s': %s"
+msgid "Cannot create folder containing '%s'"
+msgstr "Не удалось создать папку, содержащую «%s»"
+
+#: ../camel/providers/local/camel-maildir-store.c:139
+#: ../camel/providers/local/camel-maildir-store.c:158
+#: ../camel/providers/local/camel-maildir-store.c:907
 #, c-format
 msgid "Folder %s already exists"
 msgstr "Папка %s уже существует"
 
-#: ../camel/providers/local/camel-maildir-store.c:241
-#: ../camel/providers/local/camel-maildir-store.c:272
+#: ../camel/providers/local/camel-maildir-store.c:250
+#: ../camel/providers/local/camel-maildir-store.c:281
 #: ../camel/providers/local/camel-mbox-store.c:401
 #: ../camel/providers/local/camel-mbox-store.c:422
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "Не удалось создать папку: «%s»: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:256
+#: ../camel/providers/local/camel-maildir-store.c:265
 #: ../camel/providers/local/camel-mbox-store.c:367
 #: ../camel/providers/local/camel-mh-store.c:523
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "Не удалось получить папку: «%s»: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:262
+#: ../camel/providers/local/camel-maildir-store.c:271
 #: ../camel/providers/local/camel-mbox-store.c:377
 #: ../camel/providers/local/camel-mh-store.c:532
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "Не удалось получить папку «%s»: папка не существует."
 
-#: ../camel/providers/local/camel-maildir-store.c:289
+#: ../camel/providers/local/camel-maildir-store.c:298
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "Не удалось получить папку «%s»: не является почтовым каталогом."
 
-#: ../camel/providers/local/camel-maildir-store.c:353
-#: ../camel/providers/local/camel-maildir-store.c:393
+#: ../camel/providers/local/camel-maildir-store.c:362
+#: ../camel/providers/local/camel-maildir-store.c:402
 #: ../camel/providers/local/camel-mh-store.c:676
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "Не удалось удалить папку «%s»: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:355
+#: ../camel/providers/local/camel-maildir-store.c:364
 msgid "not a maildir directory"
 msgstr "не является почтовым каталогом"
 
-#: ../camel/providers/local/camel-maildir-store.c:637
-#: ../camel/providers/local/camel-maildir-store.c:1095
+#: ../camel/providers/local/camel-maildir-store.c:650
+#: ../camel/providers/local/camel-maildir-store.c:1130
 #: ../camel/providers/local/camel-spool-store.c:212
 #: ../camel/providers/local/camel-spool-store.c:231
 #, c-format
@@ -3780,7 +3835,7 @@ msgstr "Не удалось открыть папку: %s: %s"
 msgid "Cannot check folder: %s: %s"
 msgstr "Не удалось проверить папку: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:700
+#: ../camel/providers/local/camel-mbox-summary.c:696
 #: ../camel/providers/local/camel-mbox-summary.c:845
 #: ../camel/providers/local/camel-spool-summary.c:146
 #, c-format
@@ -3971,17 +4026,17 @@ msgstr "Внутренняя ошибка: UID в неверном формат
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:292
 #: ../camel/providers/nntp/camel-nntp-folder.c:297
-#: ../camel/providers/pop3/camel-pop3-folder.c:546
-#: ../camel/providers/pop3/camel-pop3-folder.c:945
+#: ../camel/providers/pop3/camel-pop3-folder.c:544
+#: ../camel/providers/pop3/camel-pop3-folder.c:943
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Не удалось получить сообщение %s: %s"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:304
 #: ../camel/providers/nntp/camel-nntp-folder.c:624
-#: ../camel/providers/pop3/camel-pop3-folder.c:476
-#: ../camel/providers/pop3/camel-pop3-folder.c:536
-#: ../camel/providers/pop3/camel-pop3-folder.c:555
+#: ../camel/providers/pop3/camel-pop3-folder.c:474
+#: ../camel/providers/pop3/camel-pop3-folder.c:534
+#: ../camel/providers/pop3/camel-pop3-folder.c:553
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "Не удалось получить сообщение %s: "
@@ -4006,41 +4061,41 @@ msgstr "Это сообщение в настоящий момент недос
 msgid "You cannot copy messages from a NNTP folder"
 msgstr "Вы не можете копировать сообщения из папки NNTP"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:45
 msgid ""
 "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr ""
 "_Показывать папки в сокращённой форме (то есть c.o.linux вместо comp.os."
 "linux)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:49
+#: ../camel/providers/nntp/camel-nntp-provider.c:48
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "По_казывать относительные имена папок в диалоге подписки"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:54
 msgid "Default NNTP port"
 msgstr "Порт по умолчанию для NNTP"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:56
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
 msgid "NNTP over SSL"
 msgstr "NNTP поверх SSL"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:62
+#: ../camel/providers/nntp/camel-nntp-provider.c:61
 msgid "USENET news"
 msgstr "Новости USENET"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:64
+#: ../camel/providers/nntp/camel-nntp-provider.c:63
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr ""
 "Это проводник для чтения и отправки сообщений в группы новостей USENET."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:85
+#: ../camel/providers/nntp/camel-nntp-provider.c:84
 msgid ""
 "This option will connect to the NNTP server anonymously, without "
 "authentication."
 msgstr "Этот параметр используется для анонимного подключения к серверу NNTP."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:95
+#: ../camel/providers/nntp/camel-nntp-provider.c:94
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4048,22 +4103,22 @@ msgstr ""
 "Подключение к серверу NNTP будет производиться с использованием "
 "незашифрованного пароля."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:371
+#: ../camel/providers/nntp/camel-nntp-store.c:370
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "Не удалось прочитать приветствие из %s: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:379
+#: ../camel/providers/nntp/camel-nntp-store.c:378
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "Сервер NNTP %s вернул код ошибки %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:449
+#: ../camel/providers/nntp/camel-nntp-store.c:448
 #, c-format
 msgid "USENET News via %s"
 msgstr "Новости USENET через %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1151
+#: ../camel/providers/nntp/camel-nntp-store.c:1150
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4074,26 +4129,26 @@ msgstr ""
 "\n"
 " %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1267
+#: ../camel/providers/nntp/camel-nntp-store.c:1266
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "Вы не можете создать папку в группах новостей: вместо этого следует "
 "подписаться."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1283
+#: ../camel/providers/nntp/camel-nntp-store.c:1282
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "Вы не можете переименовать папку в группах новостей."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1306
+#: ../camel/providers/nntp/camel-nntp-store.c:1305
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Вы не можете удалить папку в группах новостей: вместо этого следует "
 "отписаться."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1516
+#: ../camel/providers/nntp/camel-nntp-store.c:1515
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4105,7 +4160,7 @@ msgstr ""
 "Нет такой группы новостей. Выбранный элемент скорее всего является "
 "родительской папкой."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1583
+#: ../camel/providers/nntp/camel-nntp-store.c:1582
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4116,16 +4171,16 @@ msgstr ""
 "\n"
 "Группа новостей не существует!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2009
+#: ../camel/providers/nntp/camel-nntp-store.c:2008
 msgid "NNTP Command failed: "
 msgstr "Сбой команды NNTP: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2106
+#: ../camel/providers/nntp/camel-nntp-store.c:2105
 #, c-format
 msgid "Not connected."
 msgstr "Не подключён."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2200
+#: ../camel/providers/nntp/camel-nntp-store.c:2199
 #, c-format
 msgid "No such folder: %s"
 msgstr "Нет такой папки: %s"
@@ -4151,81 +4206,81 @@ msgstr "Неожиданный ответ сервера от head: %s"
 msgid "Operation failed: %s"
 msgstr "Сбой операции: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:359
-#: ../camel/providers/pop3/camel-pop3-folder.c:442
+#: ../camel/providers/pop3/camel-pop3-folder.c:357
+#: ../camel/providers/pop3/camel-pop3-folder.c:440
 #, c-format
 msgid "No message with UID %s"
 msgstr "Нет сообщения с UID %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:458
+#: ../camel/providers/pop3/camel-pop3-folder.c:456
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Получение сообщения %d по POP"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:547
+#: ../camel/providers/pop3/camel-pop3-folder.c:545
 msgid "Unknown reason"
 msgstr "Неизвестная причина"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:598
+#: ../camel/providers/pop3/camel-pop3-folder.c:596
 msgid "Retrieving POP summary"
 msgstr "Получение краткой информации от сервера POP"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:659
-#: ../camel/providers/pop3/camel-pop3-folder.c:662
-#: ../camel/providers/pop3/camel-pop3-folder.c:675
-#: ../camel/providers/pop3/camel-pop3-folder.c:688
-#: ../camel/providers/pop3/camel-pop3-folder.c:702
+#: ../camel/providers/pop3/camel-pop3-folder.c:657
+#: ../camel/providers/pop3/camel-pop3-folder.c:660
+#: ../camel/providers/pop3/camel-pop3-folder.c:673
+#: ../camel/providers/pop3/camel-pop3-folder.c:686
+#: ../camel/providers/pop3/camel-pop3-folder.c:700
 msgid "Cannot get POP summary: "
 msgstr "Невозможно получить общие данные POP: "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:766
+#: ../camel/providers/pop3/camel-pop3-folder.c:764
 msgid "Expunging old messages"
 msgstr "Уничтожение старых сообщений"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:794
+#: ../camel/providers/pop3/camel-pop3-folder.c:792
 msgid "Expunging deleted messages"
 msgstr "Уничтожение сообщений, помеченных как удалённые"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:37
+#: ../camel/providers/pop3/camel-pop3-provider.c:36
 msgid "Message Storage"
 msgstr "Хранилище сообщений"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:39
+#: ../camel/providers/pop3/camel-pop3-provider.c:38
 msgid "_Leave messages on server"
 msgstr "_Оставлять сообщения на сервере"
 
 #. Translators: '%s' is replaced with a widget, where user can
 #. * select how many days can be message left on the server.
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#: ../camel/providers/pop3/camel-pop3-provider.c:42
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "_Удалять через %s дней"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:44
 msgid "Delete _expunged from local Inbox"
 msgstr "_Удалить сообщения, удалённые из локальной папки «Входящие»"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:46
 msgid "Disable _support for all POP3 extensions"
 msgstr "Запретить _поддержку всех расширений POP3"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:53
+#: ../camel/providers/pop3/camel-pop3-provider.c:52
 msgid "Default POP3 port"
 msgstr "Порт по умолчанию для POP3"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:54
+#: ../camel/providers/pop3/camel-pop3-provider.c:53
 msgid "POP3 over SSL"
 msgstr "POP3 поверх SSL"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:61
+#: ../camel/providers/pop3/camel-pop3-provider.c:60
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:63
+#: ../camel/providers/pop3/camel-pop3-provider.c:62
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Для подключения и принятия почты с серверов POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:83
+#: ../camel/providers/pop3/camel-pop3-provider.c:82
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4234,7 +4289,7 @@ msgstr ""
 "незашифрованного пароля. Большинством серверов POP поддерживается только "
 "этот вариант."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:93
+#: ../camel/providers/pop3/camel-pop3-provider.c:92
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -4245,57 +4300,67 @@ msgstr ""
 "на серверах, якобы поддерживающих его."
 
 #. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:97
+#: ../camel/providers/pop3/camel-pop3-store.c:95
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:164
+#: ../camel/providers/pop3/camel-pop3-store.c:162
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "Не удалось получить приглашение от POP-сервера %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:179
+#: ../camel/providers/pop3/camel-pop3-store.c:177
 #, 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:180
+#: ../camel/providers/pop3/camel-pop3-store.c:178
 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:201
+#: ../camel/providers/pop3/camel-pop3-store.c:199
 #, 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:219
+#: ../camel/providers/pop3/camel-pop3-store.c:217
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "Не удалось подключиться к POP-серверу %s в защищённом режиме: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:360
+#: ../camel/providers/pop3/camel-pop3-store.c:358
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Не удалось зарегистрироваться на сервере POP %s: Ошибка протокола SASL"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:382
+#: ../camel/providers/pop3/camel-pop3-store.c:380
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "Сбой аутентификации на сервере POP %s: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:490
+#: ../camel/providers/pop3/camel-pop3-store.c:488
 #, c-format
 msgid "POP3 server %s"
 msgstr "Сервер POP3 %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:493
+#: ../camel/providers/pop3/camel-pop3-store.c:491
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "Сервер POP3 для %s на %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:713
+#: ../camel/providers/pop3/camel-pop3-store.c:688
+#: ../camel/providers/pop3/camel-pop3-store.c:775
+#, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending password: "
+msgstr ""
+"Не удалось подключиться к POP-серверу %s.\n"
+"Ошибка отправки пароля: "
+
+#: ../camel/providers/pop3/camel-pop3-store.c:720
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4305,18 +4370,9 @@ msgstr ""
 "некорректный идентификатор APOP. Возникает подозрение о проведение атаки на "
 "персонификацию. Пожалуйста, свяжитесь с администратором."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:768
-#, c-format
-msgid ""
-"Unable to connect to POP server %s.\n"
-"Error sending password: "
-msgstr ""
-"Не удалось подключиться к POP-серверу %s.\n"
-"Ошибка отправки пароля: "
-
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:783
+#: ../camel/providers/pop3/camel-pop3-store.c:790
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4325,101 +4381,101 @@ msgstr ""
 "Не удалось подключиться к POP-серверу %s.\n"
 "Ошибка отправки имени пользователя%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:865
+#: ../camel/providers/pop3/camel-pop3-store.c:872
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Нет такой папки «%s»."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:882
+#: ../camel/providers/pop3/camel-pop3-store.c:889
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "В хранилищах POP3 отсутствует иерархия папок"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:34
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:33
 #: ../services/evolution-source-registry/builtin/sendmail.source.in.h:1
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:35
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr "Доставка почты с помощью программы «sendmail» на локальной системе."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:48
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:46
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:50
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:48
 msgid "Mail delivery via the sendmail program"
 msgstr "Доставка почты через программу sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:138
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:136
 #, c-format
 msgid "Failed to read From address"
 msgstr "Не удалось прочитать адрес отправителя"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:155
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:153
 #, c-format
 msgid "Message send in offline mode is disabled"
 msgstr "Отправка сообщений в автономном режиме отключена"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:183
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:181
 #, c-format
 msgid "Could not parse recipient list"
 msgstr "Не удалось разобрать список получателей"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:200
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "Could not parse arguments"
 msgstr "Не удалось разобрать аргументы"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:231
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
 #, c-format
 msgid "Could not create pipe to '%s': %s: mail not sent"
 msgstr "Не удалось создать канал к «%s»: %s. Почта не отправлена"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:256
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:254
 #, c-format
 msgid "Could not fork '%s': %s: mail not sent"
 msgstr "Не удалось выполнить ветвление (fork) «%s»: %s. Почта не отправлена"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:305
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:303
 msgid "Could not send message: "
 msgstr "Не удалось отправить сообщение:"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:335
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:333
 #, c-format
 msgid "'%s' exited with signal %s: mail not sent."
 msgstr "«%s» завершил работу %s. Почта не отправлена."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:345
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:343
 #, c-format
 msgid "Could not execute '%s': mail not sent."
 msgstr "Не удалось выполнить «%s». Почта не отправлена."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:350
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:348
 #, c-format
 msgid "'%s' exited with status %d: mail not sent."
 msgstr "«%s» завершил работу с кодом %d. Почта не отправлена."
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:40
+#: ../camel/providers/smtp/camel-smtp-provider.c:39
 msgid "Default SMTP port"
 msgstr "Порт по умолчанию для SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:40
 msgid "SMTP over SSL"
 msgstr "SMTP поверх SSL"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:42
+#: ../camel/providers/smtp/camel-smtp-provider.c:41
 msgid "Message submission port"
 msgstr "Порт отсылки сообщений"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:48
+#: ../camel/providers/smtp/camel-smtp-provider.c:47
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:50
+#: ../camel/providers/smtp/camel-smtp-provider.c:49
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 "Для доставки почты путём подключения к удалённому почтовому концентратору по "
@@ -4436,211 +4492,211 @@ msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Не удалось подключиться к SMTP-серверу %s в защищённом режиме: %s"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:224
-#: ../camel/providers/smtp/camel-smtp-transport.c:238
-#: ../camel/providers/smtp/camel-smtp-transport.c:246
+#: ../camel/providers/smtp/camel-smtp-transport.c:239
+#: ../camel/providers/smtp/camel-smtp-transport.c:247
 msgid "STARTTLS command failed: "
 msgstr "Сбой команды STARTTLS: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:265
+#: ../camel/providers/smtp/camel-smtp-transport.c:266
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "Не удалось подключиться к SMTP-серверу %s в защищённом режиме: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:357
+#: ../camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-сервер %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:360
+#: ../camel/providers/smtp/camel-smtp-transport.c:361
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-доставка почты через %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:434
+#: ../camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "SMTP server %s does not support %s authentication"
 msgstr "Сервер SMTP %s не поддерживает аутентификацию %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:506
+#: ../camel/providers/smtp/camel-smtp-transport.c:535
 #, c-format
 msgid "No SASL mechanism was specified"
 msgstr "Не указан механизм SASL"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:536
-#: ../camel/providers/smtp/camel-smtp-transport.c:547
-#: ../camel/providers/smtp/camel-smtp-transport.c:560
+#: ../camel/providers/smtp/camel-smtp-transport.c:570
+#: ../camel/providers/smtp/camel-smtp-transport.c:582
+#: ../camel/providers/smtp/camel-smtp-transport.c:595
 msgid "AUTH command failed: "
 msgstr "Сбой команды AUTH: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:701
+#: ../camel/providers/smtp/camel-smtp-transport.c:739
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "Не удалось отправить сообщение: сервис не подключён."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:708
+#: ../camel/providers/smtp/camel-smtp-transport.c:746
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "Не удалось отправить сообщение: неверный адрес отправителя."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:712
+#: ../camel/providers/smtp/camel-smtp-transport.c:750
 msgid "Sending message"
 msgstr "Отправка сообщения"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:737
+#: ../camel/providers/smtp/camel-smtp-transport.c:775
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "Не удалось отправить сообщение: не определены получатели."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:750
+#: ../camel/providers/smtp/camel-smtp-transport.c:788
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "Не удалось отправить сообщение: указан один или  несколько некорректных "
 "получателей"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:871
+#: ../camel/providers/smtp/camel-smtp-transport.c:909
 msgid "Syntax error, command unrecognized"
 msgstr "Синтаксическая ошибка, команда не распознана"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:873
+#: ../camel/providers/smtp/camel-smtp-transport.c:911
 msgid "Syntax error in parameters or arguments"
 msgstr "Синтаксическая ошибка в параметрах или аргументах"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:875
+#: ../camel/providers/smtp/camel-smtp-transport.c:913
 msgid "Command not implemented"
 msgstr "Команда не реализована"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:877
+#: ../camel/providers/smtp/camel-smtp-transport.c:915
 msgid "Command parameter not implemented"
 msgstr "Параметр команды не реализован"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:879
+#: ../camel/providers/smtp/camel-smtp-transport.c:917
 msgid "System status, or system help reply"
 msgstr "Состояние системы или ответ системной справки"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:881
+#: ../camel/providers/smtp/camel-smtp-transport.c:919
 msgid "Help message"
 msgstr "Справочное сообщение"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:883
+#: ../camel/providers/smtp/camel-smtp-transport.c:921
 msgid "Service ready"
 msgstr "Сервис готов"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:885
+#: ../camel/providers/smtp/camel-smtp-transport.c:923
 msgid "Service closing transmission channel"
 msgstr "Сервис закрывает канал передачи"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:887
+#: ../camel/providers/smtp/camel-smtp-transport.c:925
 msgid "Service not available, closing transmission channel"
 msgstr "Сервис не доступен, закрытие канала передачи"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:889
+#: ../camel/providers/smtp/camel-smtp-transport.c:927
 msgid "Requested mail action okay, completed"
 msgstr "Запрошенное почтовое действие выполнено"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:891
+#: ../camel/providers/smtp/camel-smtp-transport.c:929
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 "Не локальный пользователь; будет отправлено в соответствии с <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:893
+#: ../camel/providers/smtp/camel-smtp-transport.c:931
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Запрошенное действие с почтой не выполнено: почтовый ящик недоступен"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:895
+#: ../camel/providers/smtp/camel-smtp-transport.c:933
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Запрошенное действие не выполнено: почтовый ящик недоступен"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:897
+#: ../camel/providers/smtp/camel-smtp-transport.c:935
 msgid "Requested action aborted: error in processing"
 msgstr "Запрошенное действие прервано: ошибка при обработке"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:899
+#: ../camel/providers/smtp/camel-smtp-transport.c:937
 msgid "User not local; please try <forward-path>"
 msgstr "Пользователь не локальный; установите <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:901
+#: ../camel/providers/smtp/camel-smtp-transport.c:939
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 "Запрошенное действие не выполнено: недостаточно места в системном хранилище"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:903
+#: ../camel/providers/smtp/camel-smtp-transport.c:941
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Запрошенное действие прервано: исчерпано место в хранилище"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:905
+#: ../camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Запрошенное действие прервано: имя почтового ящика недопустимо"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:907
+#: ../camel/providers/smtp/camel-smtp-transport.c:945
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Начало ввода почты; окончание после <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:909
+#: ../camel/providers/smtp/camel-smtp-transport.c:947
 msgid "Transaction failed"
 msgstr "Сбой транзакции"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:913
+#: ../camel/providers/smtp/camel-smtp-transport.c:951
 msgid "A password transition is needed"
 msgstr "Необходима передача пароля"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:915
+#: ../camel/providers/smtp/camel-smtp-transport.c:953
 msgid "Authentication mechanism is too weak"
 msgstr "Слишком слабый механизм аутентификации"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:917
+#: ../camel/providers/smtp/camel-smtp-transport.c:955
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Для запрошенного механизма аутентификации требуется шифрование"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:919
+#: ../camel/providers/smtp/camel-smtp-transport.c:957
 msgid "Temporary authentication failure"
 msgstr "Временный сбой аутентификации"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1207
+#: ../camel/providers/smtp/camel-smtp-transport.c:1246
 msgid "SMTP Greeting"
 msgstr "Приветствие SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1217
-#: ../camel/providers/smtp/camel-smtp-transport.c:1231
-#: ../camel/providers/smtp/camel-smtp-transport.c:1239
+#: ../camel/providers/smtp/camel-smtp-transport.c:1256
+#: ../camel/providers/smtp/camel-smtp-transport.c:1271
+#: ../camel/providers/smtp/camel-smtp-transport.c:1279
 msgid "HELO command failed: "
 msgstr "Сбой команды HELO: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1314
-#: ../camel/providers/smtp/camel-smtp-transport.c:1329
-#: ../camel/providers/smtp/camel-smtp-transport.c:1339
+#: ../camel/providers/smtp/camel-smtp-transport.c:1354
+#: ../camel/providers/smtp/camel-smtp-transport.c:1370
+#: ../camel/providers/smtp/camel-smtp-transport.c:1380
 msgid "MAIL FROM command failed: "
 msgstr "Сбой команды MAIL FROM: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1366
+#: ../camel/providers/smtp/camel-smtp-transport.c:1407
 msgid "RCPT TO command failed: "
 msgstr "Сбой команды RCPT TO: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1383
-#: ../camel/providers/smtp/camel-smtp-transport.c:1393
+#: ../camel/providers/smtp/camel-smtp-transport.c:1425
+#: ../camel/providers/smtp/camel-smtp-transport.c:1435
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "Сбой команды RCPT TO <%s>: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1436
-#: ../camel/providers/smtp/camel-smtp-transport.c:1447
-#: ../camel/providers/smtp/camel-smtp-transport.c:1458
-#: ../camel/providers/smtp/camel-smtp-transport.c:1517
-#: ../camel/providers/smtp/camel-smtp-transport.c:1537
-#: ../camel/providers/smtp/camel-smtp-transport.c:1551
+#: ../camel/providers/smtp/camel-smtp-transport.c:1478
+#: ../camel/providers/smtp/camel-smtp-transport.c:1490
+#: ../camel/providers/smtp/camel-smtp-transport.c:1501
 #: ../camel/providers/smtp/camel-smtp-transport.c:1560
+#: ../camel/providers/smtp/camel-smtp-transport.c:1580
+#: ../camel/providers/smtp/camel-smtp-transport.c:1595
+#: ../camel/providers/smtp/camel-smtp-transport.c:1604
 msgid "DATA command failed: "
 msgstr "Сбой команды DATA: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1585
-#: ../camel/providers/smtp/camel-smtp-transport.c:1600
-#: ../camel/providers/smtp/camel-smtp-transport.c:1609
+#: ../camel/providers/smtp/camel-smtp-transport.c:1629
+#: ../camel/providers/smtp/camel-smtp-transport.c:1645
+#: ../camel/providers/smtp/camel-smtp-transport.c:1654
 msgid "RSET command failed: "
 msgstr "Сбой команды RSET: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1634
-#: ../camel/providers/smtp/camel-smtp-transport.c:1648
-#: ../camel/providers/smtp/camel-smtp-transport.c:1655
+#: ../camel/providers/smtp/camel-smtp-transport.c:1679
+#: ../camel/providers/smtp/camel-smtp-transport.c:1693
+#: ../camel/providers/smtp/camel-smtp-transport.c:1700
 msgid "QUIT command failed: "
 msgstr "Сбой команды QUIT: "
 
@@ -4739,314 +4795,255 @@ msgstr "(Устарело) Номер порта для запросов SOCKS"
 msgid "(Deprecated) Automatic proxy configuration URL"
 msgstr "(Устарело) URL автоматической настройки прокси"
 
-#: ../libebackend/e-authentication-mediator.c:204
-#: ../libebackend/e-authentication-mediator.c:215
-#: ../libebackend/e-authentication-mediator.c:860
-#: ../libebackend/e-authentication-mediator.c:1197
-msgid "Bus name vanished (client terminated?)"
-msgstr "Имя шины пропало (клиент отключился?)"
-
-#: ../libebackend/e-authentication-mediator.c:263
-msgid "No response from client"
-msgstr "Нет ответа от клиента"
-
-#: ../libebackend/e-authentication-mediator.c:333
-#: ../libebackend/e-authentication-mediator.c:344
-#: ../libebackend/e-authentication-mediator.c:854
-#: ../libebackend/e-authentication-mediator.c:1191
-msgid "Client cancelled the operation"
-msgstr "Клиент отменил операцию"
-
-#: ../libebackend/e-authentication-mediator.c:415
-msgid "Client reports password was rejected"
-msgstr "Пароль клиента отклонён"
-
-#: ../libebackend/e-authentication-session.c:539
-msgid "Add this password to your keyring"
-msgstr "Добавить этот пароль в связку ключей"
-
-#: ../libebackend/e-authentication-session.c:649
-msgid "Password was incorrect"
-msgstr "Некорректный пароль"
-
-#: ../libebackend/e-backend.c:408
-#, c-format
-msgid "%s does not support authentication"
-msgstr "%s не поддерживает аутентификацию"
-
-#: ../libebackend/e-collection-backend.c:901
+#: ../libebackend/e-collection-backend.c:900
 #, c-format
 msgid "%s does not support creating remote resources"
 msgstr "%s не поддерживает создание удалённых ресурсов"
 
-#: ../libebackend/e-collection-backend.c:960
+#: ../libebackend/e-collection-backend.c:959
 #, c-format
 msgid "%s does not support deleting remote resources"
 msgstr "%s не поддерживает удаление удалённых ресурсов"
 
-#: ../libebackend/e-data-factory.c:303
+#: ../libebackend/e-data-factory.c:1233
 #, c-format
-msgid "No backend factory for hash key '%s'"
-msgstr "Отсутствует фабрика движка для ключа хэша «%s»"
+msgid "Backend factory for source '%s' and extension '%s' cannot be found."
+msgstr ""
+"Не удалось найти драйвер для создания для источника «%s» и расширения «%s»"
 
-#: ../libebackend/e-server-side-source.c:133
+#: ../libebackend/e-server-side-source.c:141
 #, c-format
 msgid "Data source is missing a [%s] group"
 msgstr "В источнике данных нет группы [%s]"
 
-#: ../libebackend/e-server-side-source.c:1022
-#: ../libedataserver/e-source.c:1394
+#: ../libebackend/e-server-side-source.c:1324
+#: ../libedataserver/e-source.c:1837
 #, c-format
 msgid "Data source '%s' does not support creating remote resources"
 msgstr "Источник данных «%s» не поддерживает создание удалённых ресурсов"
 
-#: ../libebackend/e-server-side-source.c:1036
+#: ../libebackend/e-server-side-source.c:1338
 #, c-format
 msgid ""
 "Data source '%s' has no collection backend to create the remote resource"
 msgstr "У источника данных «%s» нет бэкэнда для создания удалённого ресурса"
 
-#: ../libebackend/e-server-side-source.c:1064
-#: ../libedataserver/e-source.c:1507
+#: ../libebackend/e-server-side-source.c:1366
+#: ../libedataserver/e-source.c:1950
 #, c-format
 msgid "Data source '%s' does not support deleting remote resources"
 msgstr "Источник данных «%s» не поддерживает удаление удалённых ресурсов"
 
-#: ../libebackend/e-server-side-source.c:1078
+#: ../libebackend/e-server-side-source.c:1380
 #, c-format
 msgid ""
 "Data source '%s' has no collection backend to delete the remote resource"
 msgstr "У источника данных «%s» нет бэкэнда для удаления удалённого ресурса"
 
-#: ../libebackend/e-server-side-source.c:1109
-#: ../libedataserver/e-source.c:1603
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1026
+#: ../libebackend/e-server-side-source.c:1411
+#: ../libedataserver/e-source.c:2046
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1021
 #, c-format
 msgid "Data source '%s' does not support OAuth 2.0 authentication"
 msgstr "Источник данных «%s» не поддерживает аутентификацию OAuth 2.0"
 
-#: ../libebackend/e-server-side-source.c:1456
+#: ../libebackend/e-server-side-source.c:1773
 #, c-format
 msgid "File must have a '.source' extension"
 msgstr "Файл должен иметь расширение «.source»"
 
-#: ../libebackend/e-source-registry-server.c:531
-#: ../libedataserver/e-source-registry.c:1957
-msgid "The user declined to authenticate"
-msgstr "Пользователю отказано в аутентификации"
-
-#: ../libebackend/e-source-registry-server.c:800
+#: ../libebackend/e-source-registry-server.c:315
 #, c-format
 msgid "UID '%s' is already in use"
 msgstr "UID «%s» уже используется"
 
+#: ../libebackend/e-subprocess-factory.c:285
+#, c-format
+msgid "No such source for UID '%s'"
+msgstr "Нет такого источника для UID «%s»"
+
 #: ../libebackend/e-user-prompter-server.c:305
 #, c-format
 msgid "Extension dialog '%s' not found."
 msgstr "Диалоговое окно расширений «%s» не найдено."
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:49
 msgctxt "CategoryName"
 msgid "Anniversary"
 msgstr "Годовщина"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:50
 msgctxt "CategoryName"
 msgid "Birthday"
 msgstr "День рождения"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:51
 msgctxt "CategoryName"
 msgid "Business"
 msgstr "Бизнес"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:52
 msgctxt "CategoryName"
 msgid "Competition"
 msgstr "Конкуренция"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:53
 msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "Избранные"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:54
 msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "Подарки"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:55
 msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "Цели и задачи"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:56
 msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "Праздник (выходной)"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:57
 msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "Поздравительные открытки"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:59
 msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "Важные контакты"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:60
 msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "Идеи"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:61
 msgctxt "CategoryName"
 msgid "International"
 msgstr "Международные"
 
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:62
 msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "Ключевой потребитель"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:63
 msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "Разное"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:64
 msgctxt "CategoryName"
 msgid "Personal"
 msgstr "Личное"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:65
 msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "Телефонные звонки"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:67
 msgctxt "CategoryName"
 msgid "Status"
 msgstr "Состояние"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:68
 msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "Стратегии"
 
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:69
 msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "Поставщики"
 
-#: ../libedataserver/e-categories.c:69
+#: ../libedataserver/e-categories.c:70
 msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "Время и расходы"
 
-#: ../libedataserver/e-categories.c:70
+#: ../libedataserver/e-categories.c:71
 msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:71
+#: ../libedataserver/e-categories.c:72
 msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "Ожидание"
 
-#: ../libedataserver/e-client.c:141
+#: ../libedataserver/e-client.c:143
 msgid "Source not loaded"
 msgstr "Источник не загружен"
 
-#: ../libedataserver/e-client.c:143
+#: ../libedataserver/e-client.c:145
 msgid "Source already loaded"
 msgstr "Источник уже загружен"
 
 #. Translators: This means that the EClient does not
 #. * support offline mode, or it's not set to by a user,
 #. * thus it is unavailable while user is not connected.
-#: ../libedataserver/e-client.c:154
+#: ../libedataserver/e-client.c:156
 msgid "Offline unavailable"
 msgstr "Режим «вне сети» недоступен"
 
-#: ../libedataserver/e-client.c:176
+#: ../libedataserver/e-client.c:178
 msgid "D-Bus error"
 msgstr "Ошибка D-Bus"
 
-#: ../libedataserver/e-source-authenticator.c:162
-msgid "Address book authentication request"
-msgstr "Запрос аутентификации от адресной книги"
-
-#: ../libedataserver/e-source-authenticator.c:167
-msgid "Calendar authentication request"
-msgstr "Запрос аутентификации от календаря"
-
-#: ../libedataserver/e-source-authenticator.c:171
-msgid "Mail authentication request"
-msgstr "Запрос аутентификации от почты"
-
-#. generic account prompt
-#: ../libedataserver/e-source-authenticator.c:174
-msgid "Authentication request"
-msgstr "Запрос аутентификации"
-
-#: ../libedataserver/e-source-authenticator.c:184
-#, c-format
-msgid "Please enter the password for address book \"%s\"."
-msgstr "Введите пароль для адресной книги «%s»."
-
-#: ../libedataserver/e-source-authenticator.c:190
-#, c-format
-msgid "Please enter the password for calendar \"%s\"."
-msgstr "Введите пароль для календаря «%s»."
-
-#: ../libedataserver/e-source-authenticator.c:196
-#, c-format
-msgid "Please enter the password for mail account \"%s\"."
-msgstr "Введите пароль для учётной записи почты «%s»."
-
-#: ../libedataserver/e-source-authenticator.c:202
-#, c-format
-msgid "Please enter the password for mail transport \"%s\"."
-msgstr "Введите пароль для транспорта почты «%s»."
-
-#: ../libedataserver/e-source-authenticator.c:208
-#, c-format
-msgid "Please enter the password for memo list \"%s\"."
-msgstr "Введите пароль для списка заметок «%s»."
-
-#: ../libedataserver/e-source-authenticator.c:214
-#, c-format
-msgid "Please enter the password for task list \"%s\"."
-msgstr "Введите пароль для списка задач «%s»."
-
-#: ../libedataserver/e-source-authenticator.c:220
-#, c-format
-msgid "Please enter the password for account \"%s\"."
-msgstr "Введите пароль для учётной записи «%s»."
+#: ../libedataserver/e-client.c:2020
+msgid "Timeout was reached"
+msgstr "Время ожидания превышено"
 
-#: ../libedataserver/e-source.c:768
+#: ../libedataserver/e-source.c:967
 #, c-format
 msgid "Source file is missing a [%s] group"
 msgstr "В исходном файле отсутствует группа [%s]"
 
-#: ../libedataserver/e-source.c:1174
+#: ../libedataserver/e-source.c:1617
 #, c-format
 msgid "Data source '%s' is not removable"
 msgstr "Источник данных «%s» нельзя удалить"
 
-#: ../libedataserver/e-source.c:1297
+#: ../libedataserver/e-source.c:1740
 #, c-format
 msgid "Data source '%s' is not writable"
 msgstr "Источник данных «%s» нельзя изменить"
 
-#: ../libedataserver/e-source.c:1910
+#: ../libedataserver/e-source.c:2401
 msgid "Unnamed"
 msgstr "Безымянный"
 
+#: ../libedataserver/e-source-credentials-provider-impl.c:41
+#, fuzzy
+#| msgid "Protocol not supported"
+msgid "Credentials lookup is not supported"
+msgstr "Протокол не поддерживается"
+
+#: ../libedataserver/e-source-credentials-provider-impl.c:54
+#, fuzzy
+#| msgid "Forwarding messages is not supported"
+msgid "Credentials store is not supported"
+msgstr "Перенаправление сообщений не поддерживается"
+
+#: ../libedataserver/e-source-credentials-provider-impl.c:65
+#, fuzzy
+#| msgid "Forwarding messages is not supported"
+msgid "Credentials delete is not supported"
+msgstr "Перенаправление сообщений не поддерживается"
+
+#: ../libedataserver/e-source-credentials-provider-impl-password.c:81
+#| msgid "Contact not found"
+msgid "Password not found"
+msgstr "Пароль не найден"
+
 #: ../libedataserver/e-source-mail-signature.c:485
 #, c-format
 msgid "Signature script must be a local file"
@@ -5057,47 +5054,11 @@ msgstr "Сценарий подписи должен быть локальным
 msgid "Source '%s' does not support proxy lookups"
 msgstr "Источник «%s» не поддерживает поиск прокси"
 
-#: ../libedataserver/e-source-webdav.c:1557
-#, c-format
-msgid ""
-"SSL certificate for host '%s', used by address book '%s', is not trusted. Do "
-"you wish to accept it?"
-msgstr ""
-"Сертификат SSL для «%s», используемый адресной книгой «%s», не является "
-"доверенным. Принять сертификат?"
-
-#: ../libedataserver/e-source-webdav.c:1566
-#, c-format
-msgid ""
-"SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you "
-"wish to accept it?"
-msgstr ""
-"Сертификат SSL для «%s», используемый календарём «%s», не является "
-"доверенным. Принять сертификат?"
-
-#: ../libedataserver/e-source-webdav.c:1575
-#, c-format
-msgid ""
-"SSL certificate for host '%s', used by memo list '%s', is not trusted. Do "
-"you wish to accept it?"
-msgstr ""
-"Сертификат SSL для «%s», используемый списком заметок «%s», не является "
-"доверенным. Принять сертификат?"
-
-#: ../libedataserver/e-source-webdav.c:1584
-#, c-format
-msgid ""
-"SSL certificate for host '%s', used by task list '%s', is not trusted. Do "
-"you wish to accept it?"
-msgstr ""
-"Сертификат SSL для «%s», используемый списком задач «%s», не является "
-"доверенным. Принять сертификат?"
-
 #. 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:1662 ../libedataserver/e-time-utils.c:1961
+#: ../libedataserver/e-time-utils.c:1673 ../libedataserver/e-time-utils.c:1972
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
@@ -5105,7 +5066,7 @@ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 #. * in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1667 ../libedataserver/e-time-utils.c:1952
+#: ../libedataserver/e-time-utils.c:1678 ../libedataserver/e-time-utils.c:1963
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
@@ -5113,7 +5074,7 @@ msgstr "%a %d/%m/%Y %H:%M:%S"
 #. * in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1672 ../libedataserver/e-time-utils.c:1957
+#: ../libedataserver/e-time-utils.c:1683 ../libedataserver/e-time-utils.c:1968
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
@@ -5121,78 +5082,78 @@ msgstr "%a %d/%m/%Y %I:%M %p"
 #. * in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1677 ../libedataserver/e-time-utils.c:1948
+#: ../libedataserver/e-time-utils.c:1688 ../libedataserver/e-time-utils.c:1959
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1682
+#: ../libedataserver/e-time-utils.c:1693
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1687
+#: ../libedataserver/e-time-utils.c:1698
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d/%m/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1690 ../libedataserver/e-time-utils.c:1810
-#: ../libedataserver/e-time-utils.c:1943
+#: ../libedataserver/e-time-utils.c:1701 ../libedataserver/e-time-utils.c:1821
+#: ../libedataserver/e-time-utils.c:1954
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1697
+#: ../libedataserver/e-time-utils.c:1708
 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:1701
+#: ../libedataserver/e-time-utils.c:1712
 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:1706
+#: ../libedataserver/e-time-utils.c:1717
 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:1711
+#: ../libedataserver/e-time-utils.c:1722
 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:1716
+#: ../libedataserver/e-time-utils.c:1727
 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:1721
+#: ../libedataserver/e-time-utils.c:1732
 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:1724 ../libedataserver/e-time-utils.c:1813
+#: ../libedataserver/e-time-utils.c:1735 ../libedataserver/e-time-utils.c:1824
 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:1884 ../libedataserver/e-time-utils.c:2005
+#: ../libedataserver/e-time-utils.c:1895 ../libedataserver/e-time-utils.c:2016
 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:1888 ../libedataserver/e-time-utils.c:1997
+#: ../libedataserver/e-time-utils.c:1899 ../libedataserver/e-time-utils.c:2008
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -5200,35 +5161,190 @@ msgstr "%H:%M:%S"
 #. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1893 ../libedataserver/e-time-utils.c:2002
+#: ../libedataserver/e-time-utils.c:1904 ../libedataserver/e-time-utils.c:2013
 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:1897 ../libedataserver/e-time-utils.c:1994
+#: ../libedataserver/e-time-utils.c:1908 ../libedataserver/e-time-utils.c:2005
 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:1901
+#: ../libedataserver/e-time-utils.c:1912
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1905
+#: ../libedataserver/e-time-utils.c:1916
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:130
-#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:364
+#: ../libedataserverui/e-credentials-prompter.c:259
+#: ../libedataserverui/e-credentials-prompter.c:1561
+#: ../libedataserverui/e-credentials-prompter.c:1605
+msgid "Credentials prompt was cancelled"
+msgstr ""
+
+#: ../libedataserverui/e-credentials-prompter.c:663
+#, fuzzy, c-format
+#| msgid "Source '%s' does not support proxy lookups"
+msgid "Source '%s' doesn't support prompt for credentials"
+msgstr "Источник «%s» не поддерживает поиск прокси"
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:133
+msgid "Address book authentication request"
+msgstr "Запрос аутентификации от адресной книги"
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:138
+msgid "Calendar authentication request"
+msgstr "Запрос аутентификации от календаря"
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:142
+msgid "Mail authentication request"
+msgstr "Запрос аутентификации от почты"
+
+#. generic account prompt
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:145
+msgid "Authentication request"
+msgstr "Запрос аутентификации"
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:156
+#, c-format
+msgid "Please enter the password for address book \"%s\"."
+msgstr "Введите пароль для адресной книги «%s»."
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:160
+#, c-format
+msgid "Please enter the password for calendar \"%s\"."
+msgstr "Введите пароль для календаря «%s»."
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:164
+#, c-format
+msgid "Please enter the password for mail account \"%s\"."
+msgstr "Введите пароль для учётной записи почты «%s»."
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:168
 #, c-format
-msgid "No such data source for UID '%s'"
-msgstr "Нет такого источника данных для UID «%s»"
+msgid "Please enter the password for mail transport \"%s\"."
+msgstr "Введите пароль для транспорта почты «%s»."
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:172
+#, c-format
+msgid "Please enter the password for memo list \"%s\"."
+msgstr "Введите пароль для списка заметок «%s»."
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:176
+#, c-format
+msgid "Please enter the password for task list \"%s\"."
+msgstr "Введите пароль для списка задач «%s»."
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:180
+#, c-format
+msgid "Please enter the password for account \"%s\"."
+msgstr "Введите пароль для учётной записи «%s»."
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:229
+#: ../libedataserverui/e-trust-prompt.c:114
+#| msgid "Canceled"
+msgid "_Cancel"
+msgstr "_Отменить"
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:230
+msgid "_OK"
+msgstr "_OK"
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:343
+msgid "_User Name:"
+msgstr "_Имя пользователя:"
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:355
+#| msgid "Password"
+msgid "_Password:"
+msgstr "_Пароль:"
+
+#. Remember password check
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:371
+#| msgid "Add this password to your keyring"
+msgid "_Add this password to your keyring"
+msgstr "_Добавить этот пароль к связке ключей"
+
+#: ../libedataserverui/e-trust-prompt.c:113
+#: ../modules/trust-prompt/trust-prompt-gtk.c:119
+msgid "Certificate trust..."
+msgstr "Доверять сертификату…"
+
+#: ../libedataserverui/e-trust-prompt.c:115
+#: ../modules/trust-prompt/trust-prompt-gtk.c:120
+msgid "_Reject"
+msgstr "_Отклонить"
+
+#: ../libedataserverui/e-trust-prompt.c:116
+#: ../modules/trust-prompt/trust-prompt-gtk.c:121
+msgid "Accept _Temporarily"
+msgstr "_Временно принять"
+
+#: ../libedataserverui/e-trust-prompt.c:117
+#: ../modules/trust-prompt/trust-prompt-gtk.c:122
+msgid "_Accept Permanently"
+msgstr "_Принять"
 
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:142
+#: ../libedataserverui/e-trust-prompt.c:188
+#: ../modules/trust-prompt/trust-prompt-gtk.c:159
+#, c-format
+msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?"
+msgstr "Сертификат SSL для «%s» не является доверенным. Принять сертификат?"
+
+#: ../libedataserverui/e-trust-prompt.c:210
+#: ../modules/trust-prompt/trust-prompt-gtk.c:174
+msgid "Reason:"
+msgstr "Причина:"
+
+#: ../libedataserverui/e-trust-prompt.c:213
+#| msgid "Other error"
+msgid "Detailed error:"
+msgstr "Сообщение об ошибке:"
+
+#: ../libedataserverui/e-trust-prompt.c:275
+#: ../modules/trust-prompt/module-trust-prompt.c:82
+msgid "The signing certificate authority is not known."
+msgstr "Удостоверяющий центр сертификата неизвестен."
+
+#: ../libedataserverui/e-trust-prompt.c:277
+#: ../modules/trust-prompt/module-trust-prompt.c:84
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr "Сертификат, полученный от сайта, не соответствует ожидаемому."
+
+#: ../libedataserverui/e-trust-prompt.c:279
+#: ../modules/trust-prompt/module-trust-prompt.c:86
+msgid "The certificate's activation time is still in the future."
+msgstr "Время активации сертификата ещё не наступило."
+
+#: ../libedataserverui/e-trust-prompt.c:281
+#: ../modules/trust-prompt/module-trust-prompt.c:88
+msgid "The certificate has expired."
+msgstr "Срок действия сертификата истёк."
+
+#: ../libedataserverui/e-trust-prompt.c:283
+#: ../modules/trust-prompt/module-trust-prompt.c:90
+msgid ""
+"The certificate has been revoked according to the connection's certificate "
+"revocation list."
+msgstr ""
+"Сертификат был аннулирован в соответствии со списком отозванных сертификатов "
+"соединения."
+
+#: ../libedataserverui/e-trust-prompt.c:285
+#: ../modules/trust-prompt/module-trust-prompt.c:92
+msgid "The certificate's algorithm is considered insecure."
+msgstr "Алгоритм сертификата считается небезопасным."
+
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:174
 #, c-format
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
@@ -5237,11 +5353,6 @@ msgstr ""
 "Не удалось найти соответствующую учётную запись в службе org.gnome."
 "OnlineAccounts, с помощью которой можно получить пароль для «%s»"
 
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:218
-#, c-format
-msgid "Invalid password for '%s'"
-msgstr "Неверный пароль для «%s»"
-
 #. TODO: more specific
 #: ../modules/gnome-online-accounts/goaewsclient.c:219
 #, c-format
@@ -5278,7 +5389,7 @@ msgstr "Не удалось найти элемент Account"
 msgid "Failed to find ASUrl and OABUrl in autodiscover response"
 msgstr "Не удалось найти ASUrl и OABUrl в ответе автообнаружения"
 
-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1260
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1252
 #, c-format
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
@@ -5287,7 +5398,7 @@ msgstr ""
 "Не удалось найти соответствующую запись в службе org.gnome.OnlineAccounts, с "
 "помощью которой можно получить маркер доступа для «%s»"
 
-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1290
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1282
 #, c-format
 msgid "Failed to obtain an access token for '%s': "
 msgstr "Не удалось получить маркер доступа для «%s»: "
@@ -5309,61 +5420,6 @@ msgstr "Задачи"
 msgid "Contacts"
 msgstr "Контакты"
 
-#: ../modules/trust-prompt/module-trust-prompt.c:82
-msgid "The signing certificate authority is not known."
-msgstr "Удостоверяющий центр сертификата неизвестен."
-
-#: ../modules/trust-prompt/module-trust-prompt.c:84
-msgid ""
-"The certificate does not match the expected identity of the site that it was "
-"retrieved from."
-msgstr "Сертификат, полученный от сайта, не соответствует ожидаемому."
-
-#: ../modules/trust-prompt/module-trust-prompt.c:86
-msgid "The certificate's activation time is still in the future."
-msgstr "Время активации сертификата ещё не наступило."
-
-#: ../modules/trust-prompt/module-trust-prompt.c:88
-msgid "The certificate has expired."
-msgstr "Срок действия сертификата истёк."
-
-#: ../modules/trust-prompt/module-trust-prompt.c:90
-msgid ""
-"The certificate has been revoked according to the connection's certificate "
-"revocation list."
-msgstr ""
-"Сертификат был аннулирован в соответствии со списком отозванных сертификатов "
-"соединения."
-
-#: ../modules/trust-prompt/module-trust-prompt.c:92
-msgid "The certificate's algorithm is considered insecure."
-msgstr "Алгоритм сертификата считается небезопасным."
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:119
-msgid "Certificate trust..."
-msgstr "Доверять сертификату…"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:120
-msgid "_Reject"
-msgstr "_Отклонить"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:121
-msgid "Accept _Temporarily"
-msgstr "_Временно принять"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:122
-msgid "_Accept Permanently"
-msgstr "_Принять"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:160
-#, c-format
-msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?"
-msgstr "Сертификат SSL для «%s» не является доверенным. Принять сертификат?"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:175
-msgid "Reason:"
-msgstr "Причина:"
-
 #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:2
 msgid "Integrate your calendars"
 msgstr "Интеграция ваших календарей"
@@ -5372,7 +5428,7 @@ msgstr "Интеграция ваших календарей"
 msgid "Integrate your contacts"
 msgstr "Интеграция ваших контаков"
 
-#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:256
+#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:237
 msgid "Signon service did not return a secret"
 msgstr "Служба регистрации не вернула секрет"
 
@@ -5404,7 +5460,7 @@ msgstr "Почта"
 msgid "Integrate your mailboxes"
 msgstr "Интегрировать ваши почтовые ящики"
 
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1007
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1002
 #, c-format
 msgid ""
 "Cannot find a corresponding account service in the accounts database from "
@@ -5451,14 +5507,14 @@ msgstr "Календарь Yahoo!"
 msgid "Yahoo! Mail"
 msgstr "Почта Yahoo!"
 
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:46
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:50
-#: ../services/evolution-user-prompter/evolution-user-prompter.c:30
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:36
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:40
+#: ../services/evolution-user-prompter/evolution-user-prompter.c:32
 msgid "Keep running after the last client is closed"
 msgstr "Сохранять запущенным после закрытия последнего клиента"
 
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:48
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:52
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:38
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:42
 msgid "Wait running until at least one client is connected"
 msgstr "Работает до тех пор, пока подключён хотя бы один клиент"
 
@@ -5501,7 +5557,7 @@ msgstr "В Интернете"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../services/evolution-source-registry/evolution-source-registry.c:38
+#: ../services/evolution-source-registry/evolution-source-registry.c:39
 msgid "Don't migrate user data from previous versions of Evolution"
 msgstr "Не переносить пользовательские данные из предыдущих версий Evolution"
 
@@ -5509,6 +5565,70 @@ msgstr "Не переносить пользовательские данные
 msgid "_Dismiss"
 msgstr "_Отклонить"
 
+#~ msgid "No backend name in source '%s'"
+#~ msgstr "В источнике «%s» не указано имя драйвера"
+
+#~ msgid "Missing source UID"
+#~ msgstr "Отсутствует UID источника"
+
+#~ msgid "Bus name vanished (client terminated?)"
+#~ msgstr "Имя шины пропало (клиент отключился?)"
+
+#~ msgid "No response from client"
+#~ msgstr "Нет ответа от клиента"
+
+#~ msgid "Client cancelled the operation"
+#~ msgstr "Клиент отменил операцию"
+
+#~ msgid "Client reports password was rejected"
+#~ msgstr "Пароль клиента отклонён"
+
+#~ msgid "Password was incorrect"
+#~ msgstr "Некорректный пароль"
+
+#~ msgid "%s does not support authentication"
+#~ msgstr "%s не поддерживает аутентификацию"
+
+#~ msgid "No backend factory for hash key '%s'"
+#~ msgstr "Отсутствует фабрика движка для ключа хэша «%s»"
+
+#~ msgid "The user declined to authenticate"
+#~ msgstr "Пользователю отказано в аутентификации"
+
+#~ msgid ""
+#~ "SSL certificate for host '%s', used by address book '%s', is not trusted. "
+#~ "Do you wish to accept it?"
+#~ msgstr ""
+#~ "Сертификат SSL для «%s», используемый адресной книгой «%s», не является "
+#~ "доверенным. Принять сертификат?"
+
+#~ msgid ""
+#~ "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do "
+#~ "you wish to accept it?"
+#~ msgstr ""
+#~ "Сертификат SSL для «%s», используемый календарём «%s», не является "
+#~ "доверенным. Принять сертификат?"
+
+#~ msgid ""
+#~ "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do "
+#~ "you wish to accept it?"
+#~ msgstr ""
+#~ "Сертификат SSL для «%s», используемый списком заметок «%s», не является "
+#~ "доверенным. Принять сертификат?"
+
+#~ msgid ""
+#~ "SSL certificate for host '%s', used by task list '%s', is not trusted. Do "
+#~ "you wish to accept it?"
+#~ msgstr ""
+#~ "Сертификат SSL для «%s», используемый списком задач «%s», не является "
+#~ "доверенным. Принять сертификат?"
+
+#~ msgid "No such data source for UID '%s'"
+#~ msgstr "Нет такого источника данных для UID «%s»"
+
+#~ msgid "Invalid password for '%s'"
+#~ msgstr "Неверный пароль для «%s»"
+
 #~| msgid "No quota information available for folder '%s'"
 #~ msgid "No host information available"
 #~ msgstr "Нет доступной информации об узле"
@@ -5552,9 +5672,6 @@ msgstr "_Отклонить"
 #~ msgid "Preparing folder '%s' for offline"
 #~ msgstr "Подготовка папки «%s» для автономной работы"
 
-#~ msgid "Canceled"
-#~ msgstr "Отменено"
-
 #~ msgid ""
 #~ "Alert from IMAP server %s:\n"
 #~ "%s"



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