[evolution-data-server] Fixed Russian translation



commit 287dc056f420c6d7a244e548499e063f1f9c8d34
Author: Yuri Myasoedov <ymyasoedov yandex ru>
Date:   Sun Feb 16 08:55:12 2014 +0400

    Fixed Russian translation

 po/ru.po | 4633 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 2402 insertions(+), 2231 deletions(-)
---
diff --git a/po/ru.po b/po/ru.po
index 090fb9f..3a8df27 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,132 +12,168 @@
 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: 2013-09-22 23:31+0000\n"
-"PO-Revision-Date: 2013-09-24 13:12+0300\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
+"POT-Creation-Date: 2014-02-15 05:44+0000\n"
+"PO-Revision-Date: 2014-02-16 08:54+0300\n"
 "Last-Translator: Yuri Myasoedov <omerta13 yandex ru>\n"
 "Language-Team: русский <gnome-cyr gnome org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) 
? 1 : 2);\n"
-"X-Generator: Poedit 1.5.7\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.5.4\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:115
+#: ../addressbook/backends/file/e-book-backend-file.c:117
 #, c-format
 msgid "Failed to remove file '%s': %s"
 msgstr "Не удалось удалить файл «%s»: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:143
+#: ../addressbook/backends/file/e-book-backend-file.c:145
 #, c-format
 msgid "Failed to make directory %s: %s"
 msgstr "Не удалось создать каталог %s: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:394
+#: ../addressbook/backends/file/e-book-backend-file.c:396
 #, c-format
 msgid "Failed to create hardlink for resource '%s': %s"
 msgstr "Не удалось создать жёсткую ссылку для ресурса «%s»: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:499
-#: ../addressbook/backends/file/e-book-backend-file.c:1135
+#: ../addressbook/backends/file/e-book-backend-file.c:501
+#: ../addressbook/backends/file/e-book-backend-file.c:1230
 msgid "No UID in the contact"
 msgstr "В контакте нет UID"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:773
+#: ../addressbook/backends/file/e-book-backend-file.c:828
 #, c-format
 msgid "Conflicting UIDs found in added contacts"
 msgstr "В добавленных контактах обнаружен конфликт UID"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:881
+#: ../addressbook/backends/file/e-book-backend-file.c:967
 msgid "Loading..."
 msgstr "Загрузка…"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:883
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4419
+#: ../addressbook/backends/file/e-book-backend-file.c:969
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4425
 msgid "Searching..."
 msgstr "Поиск…"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1164
+#: ../addressbook/backends/file/e-book-backend-file.c:1258
 #, c-format
 msgid "Tried to modify contact '%s' with out of sync revision"
 msgstr "Попытка изменить контакт «%s» с рассинхронизированной ревизией"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1300
-#: ../addressbook/backends/file/e-book-backend-file.c:1369
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2707
+#: ../addressbook/backends/file/e-book-backend-file.c:1449
+#: ../addressbook/backends/file/e-book-backend-file.c:1532
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3077
+#: ../addressbook/libedata-book/e-book-sqlite.c:6706
 #, c-format
 msgid "Contact '%s' not found"
 msgstr "Контакт «%s» не найден"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1411
-#: ../addressbook/backends/file/e-book-backend-file.c:1478
+#: ../addressbook/backends/file/e-book-backend-file.c:1592
+#: ../addressbook/backends/file/e-book-backend-file.c:1673
 #, c-format
 msgid "Query '%s' not supported"
 msgstr "Запрос «%s» не поддерживается"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1420
-#: ../addressbook/backends/file/e-book-backend-file.c:1487
+#: ../addressbook/backends/file/e-book-backend-file.c:1601
+#: ../addressbook/backends/file/e-book-backend-file.c:1682
 #, c-format
 msgid "Invalid Query '%s'"
 msgstr "Недопустимый запрос «%s»"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1671
+#: ../addressbook/backends/file/e-book-backend-file.c:1947
+msgid "Requested to delete an unrelated cursor"
+msgstr ""
+
+#: ../addressbook/backends/file/e-book-backend-file.c:2014
 #, 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:149
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1240
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4314
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:383
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:826
+#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:147
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1244
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4320
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:378
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:820
 #: ../addressbook/libebook-contacts/e-book-contacts-types.c:35
-#: ../addressbook/libebook-contacts/e-phone-number.c:58
-#: ../addressbook/libedata-book/e-book-backend-sexp.c:874
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:568
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:599
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:611
-#: ../calendar/libecal/e-cal.c:2335
-#: ../calendar/libecal/e-cal-client.c:268
-#: ../camel/camel-imapx-command.c:650
-#: ../libedataserver/e-client.c:177
+#: ../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:575
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:606
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:618
+#: ../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:3237
+#: ../calendar/libecal/e-cal-client.c:3410
+#: ../calendar/libecal/e-cal-client.c:3674
+#: ../calendar/libecal/e-cal-client.c:3915
+#: ../calendar/libecal/e-cal-client.c:4103
+#: ../calendar/libecal/e-cal-client.c:4295
+#: ../calendar/libecal/e-cal-client.c:4465
+#: ../calendar/libecal/e-cal-client.c:4634
+#: ../calendar/libecal/e-cal-client.c:4837
+#: ../calendar/libecal/e-cal-client.c:4987
+#: ../calendar/libecal/e-cal-client.c:5181
+#: ../calendar/libecal/e-cal-client.c:5334
+#: ../calendar/libecal/e-cal-client.c:5551
+#: ../calendar/libecal/e-cal-client.c:5705
+#: ../calendar/libecal/e-cal-client.c:5931
+#: ../calendar/libecal/e-cal-client.c:6127
+#: ../calendar/libecal/e-cal-client.c:6490
+#: ../calendar/libecal/e-cal-client.c:6704
+#: ../camel/providers/imapx/camel-imapx-command.c:640
+#: ../libedataserver/e-client.c:185
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:833
+#: ../addressbook/backends/google/e-book-backend-google.c:836
 msgid "Querying for updated contacts…"
 msgstr "Запрос обновлённых контактов…"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:985
+#: ../addressbook/backends/google/e-book-backend-google.c:988
 msgid "Querying for updated groups…"
 msgstr "Запрос обновлённых групп…"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1673
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5050
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1293
+#: ../addressbook/backends/google/e-book-backend-google.c:1705
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5056
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1273
 msgid "The backend does not support bulk additions"
 msgstr "Драйвер не поддерживает общие добавления"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1822
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5186
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1395
+#: ../addressbook/backends/google/e-book-backend-google.c:1854
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5192
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1375
 msgid "The backend does not support bulk modifications"
 msgstr "Драйвер не поддерживает общие изменения"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2022
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1487
+#: ../addressbook/backends/google/e-book-backend-google.c:2054
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1467
 msgid "The backend does not support bulk removals"
 msgstr "Драйвер не поддерживает общие удаления"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2148
+#: ../addressbook/backends/google/e-book-backend-google.c:2180
 msgid "Loading…"
 msgstr "Загрузка…"
 
 #. System Group: My Contacts
-#: ../addressbook/backends/google/e-book-google-utils.c:1620
+#: ../addressbook/backends/google/e-book-google-utils.c:1618
 #: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1
 #: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1
 #: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1
@@ -146,129 +182,131 @@ msgid "Personal"
 msgstr "Личное"
 
 #. System Group: Friends
-#: ../addressbook/backends/google/e-book-google-utils.c:1622
+#: ../addressbook/backends/google/e-book-google-utils.c:1620
 msgid "Friends"
 msgstr "Друзья"
 
 #. System Group: Family
-#: ../addressbook/backends/google/e-book-google-utils.c:1624
+#: ../addressbook/backends/google/e-book-google-utils.c:1622
 msgid "Family"
 msgstr "Семья"
 
 #. System Group: Coworkers
-#: ../addressbook/backends/google/e-book-google-utils.c:1626
+#: ../addressbook/backends/google/e-book-google-utils.c:1624
 msgid "Coworkers"
 msgstr "Сотрудники"
 
 #. Translators: An error message shown to a user when trying to do an
 #. * operation on the LDAP address book which is not connected to the server
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:174
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172
 msgid "Not connected"
 msgstr "Не подключён"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:968
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:971
 msgid "Failed to bind using either v3 or v2 binds"
 msgstr "Сбой связывания при использовании модуля 2 или 3 версии"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1091
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1094
 msgid "Reconnecting to LDAP server..."
 msgstr "Повторное подключение к серверу LDAP…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1221
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1225
 msgid "Invalid DN syntax"
 msgstr "Недопустимый синтаксис в отличительном имени (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1237
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4313
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1241
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4319
 #, c-format
 msgid "LDAP error 0x%x (%s)"
 msgstr "Ошибка в LDAP 0x%x (%s)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1849
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2172
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1853
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2176
 #, c-format
 msgid "%s: NULL returned from ldap_first_entry"
 msgstr "%s: из ldap_first_entry возвращено значение NULL"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2102
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2230
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2106
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2234
 #, c-format
 msgid "%s: Unhandled result type %d returned"
 msgstr "%s: возвращён необработанный тип результата %d"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2363
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2490
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2367
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2494
 #, c-format
 msgid "%s: Unhandled search result type %d returned"
 msgstr "%s: возвращён необработанный тип результата поиска %d"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4262
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4268
 msgid "Receiving LDAP search results..."
 msgstr "Получение результатов поиска с сервера LDAP…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4441
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4447
 msgid "Error performing search"
 msgstr "Ошибка выполнения поиска"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4569
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4575
 #, c-format
 msgid "Downloading contacts (%d)..."
 msgstr "Загрузка контактов (%d)…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5133
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5139
 msgid "Adding contact to LDAP server..."
 msgstr "Создание контакта на сервере LDAP…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5208
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5214
 msgid "Modifying contact from LDAP server..."
 msgstr "Изменение контакта на сервере LDAP…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5274
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5280
 msgid "Removing contact from LDAP server..."
 msgstr "Удаление контакта с сервера LDAP…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5663
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5669
 #, c-format
 msgid "Failed to get the DN for user '%s'"
 msgstr "Не удалось получить DN для пользователя «%s»"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:805
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:799
 msgid "Loading Addressbook summary..."
 msgstr "Загрузка сводки об адресной книге…"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:823
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:817
 #, 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:842
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:836
 msgid "No response body in webdav PROPFIND result"
 msgstr "Тело ответа отсутствует в результатах работы метода webdav PROPFIND"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:884
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:878
 #, c-format
 msgid "Loading Contacts (%d%%)"
 msgstr "Загрузка контактов (%d%%)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1215
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1196
 msgid "Cannot transform SoupURI to string"
 msgstr "Не удалось преобразовать SoupURI в строку"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1326
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1306
 #, c-format
 msgid "Create resource '%s' failed with HTTP status %d (%s)"
-msgstr "При создании ресурса «%s» произошёл сбой с кодом состояния HTTP: %d (%s)"
+msgstr ""
+"При создании ресурса «%s» произошёл сбой с кодом состояния HTTP: %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1424
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1404
 msgid "Contact on server changed -> not modifying"
 msgstr "Контакт на сервере изменён -> нет изменения"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1432
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1412
 #, c-format
 msgid "Modify contact failed with HTTP status %d (%s)"
-msgstr "При изменении контакта произошла ошибка с кодом состояния HTTP: %d (%s)"
+msgstr ""
+"При изменении контакта произошла ошибка с кодом состояния HTTP: %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1508
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1488
 #, c-format
 msgid "DELETE failed with HTTP status %d"
 msgstr "Ошибка метода DELETE с кодом HTTP %d"
@@ -278,12 +316,12 @@ msgid "No such book"
 msgstr "Нет такой книги"
 
 #: ../addressbook/libebook-contacts/e-book-contacts-types.c:26
-#: ../addressbook/libedata-book/e-data-book.c:346
+#: ../addressbook/libedata-book/e-data-book.c:371
 msgid "Contact not found"
 msgstr "Контакт не найден"
 
 #: ../addressbook/libebook-contacts/e-book-contacts-types.c:28
-#: ../addressbook/libedata-book/e-data-book.c:347
+#: ../addressbook/libedata-book/e-data-book.c:372
 msgid "Contact ID already exists"
 msgstr "Идентификатор контакта уже существует"
 
@@ -292,12 +330,12 @@ msgid "No such source"
 msgstr "Нет такого источника"
 
 #: ../addressbook/libebook-contacts/e-book-contacts-types.c:32
-#: ../addressbook/libedata-book/e-data-book.c:363
+#: ../addressbook/libedata-book/e-data-book.c:388
 msgid "No space"
 msgstr "Недостаточно места"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook-contacts/e-contact.c:123
+#: ../addressbook/libebook-contacts/e-contact.c:131
 msgid "Unique ID"
 msgstr "Уникальный ID"
 
@@ -305,12 +343,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:128
+#: ../addressbook/libebook-contacts/e-contact.c:136
 msgid "File Under"
 msgstr "Сохранить под"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook-contacts/e-contact.c:130
+#: ../addressbook/libebook-contacts/e-contact.c:138
 msgid "Book UID"
 msgstr "UID книги"
 
@@ -318,434 +356,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:136
+#: ../addressbook/libebook-contacts/e-contact.c:144
 msgid "Full Name"
 msgstr "Полное имя"
 
-#: ../addressbook/libebook-contacts/e-contact.c:137
+#: ../addressbook/libebook-contacts/e-contact.c:145
 msgid "Given Name"
 msgstr "Имя"
 
-#: ../addressbook/libebook-contacts/e-contact.c:138
+#: ../addressbook/libebook-contacts/e-contact.c:146
 msgid "Family Name"
 msgstr "Фамилия"
 
-#: ../addressbook/libebook-contacts/e-contact.c:139
+#: ../addressbook/libebook-contacts/e-contact.c:147
 msgid "Nickname"
 msgstr "Псевдоним"
 
 #. Email fields
-#: ../addressbook/libebook-contacts/e-contact.c:142
+#: ../addressbook/libebook-contacts/e-contact.c:150
 msgid "Email 1"
 msgstr "Эл. почта 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:143
+#: ../addressbook/libebook-contacts/e-contact.c:151
 msgid "Email 2"
 msgstr "Эл. почта 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:144
+#: ../addressbook/libebook-contacts/e-contact.c:152
 msgid "Email 3"
 msgstr "Эл. почта 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:145
+#: ../addressbook/libebook-contacts/e-contact.c:153
 msgid "Email 4"
 msgstr "Эл. почта 4"
 
-#: ../addressbook/libebook-contacts/e-contact.c:147
+#: ../addressbook/libebook-contacts/e-contact.c:155
 msgid "Mailer"
 msgstr "Почтовый клиент"
 
 #. Address Labels
-#: ../addressbook/libebook-contacts/e-contact.c:150
+#: ../addressbook/libebook-contacts/e-contact.c:158
 msgid "Home Address Label"
 msgstr "Ярлык домашнего адреса"
 
-#: ../addressbook/libebook-contacts/e-contact.c:151
+#: ../addressbook/libebook-contacts/e-contact.c:159
 msgid "Work Address Label"
 msgstr "Ярлык рабочего адреса"
 
-#: ../addressbook/libebook-contacts/e-contact.c:152
+#: ../addressbook/libebook-contacts/e-contact.c:160
 msgid "Other Address Label"
 msgstr "Ярлык другого адреса"
 
 #. Phone fields
-#: ../addressbook/libebook-contacts/e-contact.c:155
+#: ../addressbook/libebook-contacts/e-contact.c:163
 msgid "Assistant Phone"
 msgstr "Телефон помощника"
 
-#: ../addressbook/libebook-contacts/e-contact.c:156
+#: ../addressbook/libebook-contacts/e-contact.c:164
 msgid "Business Phone"
 msgstr "Служебный телефон"
 
-#: ../addressbook/libebook-contacts/e-contact.c:157
+#: ../addressbook/libebook-contacts/e-contact.c:165
 msgid "Business Phone 2"
 msgstr "Служебный телефон 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:158
+#: ../addressbook/libebook-contacts/e-contact.c:166
 msgid "Business Fax"
 msgstr "Рабочий факс"
 
-#: ../addressbook/libebook-contacts/e-contact.c:159
+#: ../addressbook/libebook-contacts/e-contact.c:167
 msgid "Callback Phone"
 msgstr "Телефон для обратного звонка"
 
-#: ../addressbook/libebook-contacts/e-contact.c:160
+#: ../addressbook/libebook-contacts/e-contact.c:168
 msgid "Car Phone"
 msgstr "Телефон в машине"
 
-#: ../addressbook/libebook-contacts/e-contact.c:161
+#: ../addressbook/libebook-contacts/e-contact.c:169
 msgid "Company Phone"
 msgstr "Телефон компании"
 
-#: ../addressbook/libebook-contacts/e-contact.c:162
+#: ../addressbook/libebook-contacts/e-contact.c:170
 msgid "Home Phone"
 msgstr "Домашний телефон"
 
-#: ../addressbook/libebook-contacts/e-contact.c:163
+#: ../addressbook/libebook-contacts/e-contact.c:171
 msgid "Home Phone 2"
 msgstr "Домашний телефон 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:164
+#: ../addressbook/libebook-contacts/e-contact.c:172
 msgid "Home Fax"
 msgstr "Домашний Факс"
 
-#: ../addressbook/libebook-contacts/e-contact.c:165
+#: ../addressbook/libebook-contacts/e-contact.c:173
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook-contacts/e-contact.c:166
+#: ../addressbook/libebook-contacts/e-contact.c:174
 msgid "Mobile Phone"
 msgstr "Мобильный телефон"
 
-#: ../addressbook/libebook-contacts/e-contact.c:167
+#: ../addressbook/libebook-contacts/e-contact.c:175
 msgid "Other Phone"
 msgstr "Другие телефоны"
 
-#: ../addressbook/libebook-contacts/e-contact.c:168
+#: ../addressbook/libebook-contacts/e-contact.c:176
 msgid "Other Fax"
 msgstr "Другой факс"
 
-#: ../addressbook/libebook-contacts/e-contact.c:169
+#: ../addressbook/libebook-contacts/e-contact.c:177
 msgid "Pager"
 msgstr "Пейджер"
 
-#: ../addressbook/libebook-contacts/e-contact.c:170
+#: ../addressbook/libebook-contacts/e-contact.c:178
 msgid "Primary Phone"
 msgstr "Основной телефон"
 
-#: ../addressbook/libebook-contacts/e-contact.c:171
+#: ../addressbook/libebook-contacts/e-contact.c:179
 msgid "Radio"
 msgstr "Радио"
 
-#: ../addressbook/libebook-contacts/e-contact.c:172
+#: ../addressbook/libebook-contacts/e-contact.c:180
 msgid "Telex"
 msgstr "Телекс"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook-contacts/e-contact.c:174
+#: ../addressbook/libebook-contacts/e-contact.c:182
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook-contacts/e-contact.c:177
+#: ../addressbook/libebook-contacts/e-contact.c:185
 msgid "Organization"
 msgstr "Организация"
 
-#: ../addressbook/libebook-contacts/e-contact.c:178
+#: ../addressbook/libebook-contacts/e-contact.c:186
 msgid "Organizational Unit"
 msgstr "Подразделение организации"
 
-#: ../addressbook/libebook-contacts/e-contact.c:179
+#: ../addressbook/libebook-contacts/e-contact.c:187
 msgid "Office"
 msgstr "Офис"
 
-#: ../addressbook/libebook-contacts/e-contact.c:180
+#: ../addressbook/libebook-contacts/e-contact.c:188
 msgid "Title"
 msgstr "Заголовок"
 
-#: ../addressbook/libebook-contacts/e-contact.c:181
+#: ../addressbook/libebook-contacts/e-contact.c:189
 msgid "Role"
 msgstr "Должность"
 
-#: ../addressbook/libebook-contacts/e-contact.c:182
+#: ../addressbook/libebook-contacts/e-contact.c:190
 msgid "Manager"
 msgstr "Мeнеджер"
 
-#: ../addressbook/libebook-contacts/e-contact.c:183
+#: ../addressbook/libebook-contacts/e-contact.c:191
 msgid "Assistant"
 msgstr "Помощник"
 
 #. Web fields
-#: ../addressbook/libebook-contacts/e-contact.c:186
+#: ../addressbook/libebook-contacts/e-contact.c:194
 msgid "Homepage URL"
 msgstr "URL домашней страницы"
 
-#: ../addressbook/libebook-contacts/e-contact.c:187
+#: ../addressbook/libebook-contacts/e-contact.c:195
 msgid "Weblog URL"
 msgstr "URL веблога"
 
 #. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:190
+#: ../addressbook/libebook-contacts/e-contact.c:198
 msgid "Categories"
 msgstr "Категории"
 
 #. Collaboration fields
-#: ../addressbook/libebook-contacts/e-contact.c:193
+#: ../addressbook/libebook-contacts/e-contact.c:201
 msgid "Calendar URI"
 msgstr "URI календаря"
 
-#: ../addressbook/libebook-contacts/e-contact.c:194
+#: ../addressbook/libebook-contacts/e-contact.c:202
 msgid "Free/Busy URL"
 msgstr "Ссылка (URL) «свободен/занят»"
 
-#: ../addressbook/libebook-contacts/e-contact.c:195
+#: ../addressbook/libebook-contacts/e-contact.c:203
 msgid "ICS Calendar"
 msgstr "Календарь формата ICS"
 
-#: ../addressbook/libebook-contacts/e-contact.c:196
+#: ../addressbook/libebook-contacts/e-contact.c:204
 msgid "Video Conferencing URL"
 msgstr "URL видеоконференций"
 
 #. Misc fields
-#: ../addressbook/libebook-contacts/e-contact.c:199
+#: ../addressbook/libebook-contacts/e-contact.c:207
 msgid "Spouse's Name"
 msgstr "Имя супруга(и)"
 
-#: ../addressbook/libebook-contacts/e-contact.c:200
+#: ../addressbook/libebook-contacts/e-contact.c:208
 msgid "Note"
 msgstr "Примечание"
 
 #. Instant messaging fields
-#: ../addressbook/libebook-contacts/e-contact.c:203
+#: ../addressbook/libebook-contacts/e-contact.c:211
 msgid "AIM Home Screen Name 1"
 msgstr "AIM — домашнее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:204
+#: ../addressbook/libebook-contacts/e-contact.c:212
 msgid "AIM Home Screen Name 2"
 msgstr "AIM — домашнее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:205
+#: ../addressbook/libebook-contacts/e-contact.c:213
 msgid "AIM Home Screen Name 3"
 msgstr "AIM — домашнее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:206
+#: ../addressbook/libebook-contacts/e-contact.c:214
 msgid "AIM Work Screen Name 1"
 msgstr "AIM — рабочее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:207
+#: ../addressbook/libebook-contacts/e-contact.c:215
 msgid "AIM Work Screen Name 2"
 msgstr "AIM — рабочее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:208
+#: ../addressbook/libebook-contacts/e-contact.c:216
 msgid "AIM Work Screen Name 3"
 msgstr "AIM — рабочее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:209
+#: ../addressbook/libebook-contacts/e-contact.c:217
 msgid "GroupWise Home Screen Name 1"
 msgstr "Groupwise — домашнее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:210
+#: ../addressbook/libebook-contacts/e-contact.c:218
 msgid "GroupWise Home Screen Name 2"
 msgstr "Groupwise — домашнее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:211
+#: ../addressbook/libebook-contacts/e-contact.c:219
 msgid "GroupWise Home Screen Name 3"
 msgstr "Groupwise — домашнее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:212
+#: ../addressbook/libebook-contacts/e-contact.c:220
 msgid "GroupWise Work Screen Name 1"
 msgstr "Groupwise — рабочее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:213
+#: ../addressbook/libebook-contacts/e-contact.c:221
 msgid "GroupWise Work Screen Name 2"
 msgstr "Groupwise — рабочее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:214
+#: ../addressbook/libebook-contacts/e-contact.c:222
 msgid "GroupWise Work Screen Name 3"
 msgstr "Groupwise — рабочее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:215
+#: ../addressbook/libebook-contacts/e-contact.c:223
 msgid "Jabber Home ID 1"
 msgstr "Jabber — домашний идентификатор 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:216
+#: ../addressbook/libebook-contacts/e-contact.c:224
 msgid "Jabber Home ID 2"
 msgstr "Jabber — домашний идентификатор 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:217
+#: ../addressbook/libebook-contacts/e-contact.c:225
 msgid "Jabber Home ID 3"
 msgstr "Jabber — домашний идентификатор 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:218
+#: ../addressbook/libebook-contacts/e-contact.c:226
 msgid "Jabber Work ID 1"
 msgstr "Jabber — рабочий идентификатор 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:219
+#: ../addressbook/libebook-contacts/e-contact.c:227
 msgid "Jabber Work ID 2"
 msgstr "Jabber — рабочий идентификатор 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:220
+#: ../addressbook/libebook-contacts/e-contact.c:228
 msgid "Jabber Work ID 3"
 msgstr "Jabber — рабочий идентификатор 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:221
+#: ../addressbook/libebook-contacts/e-contact.c:229
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo! — домашнее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:222
+#: ../addressbook/libebook-contacts/e-contact.c:230
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo! — домашнее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:223
+#: ../addressbook/libebook-contacts/e-contact.c:231
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo! — домашнее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:224
+#: ../addressbook/libebook-contacts/e-contact.c:232
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo! — рабочее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:225
+#: ../addressbook/libebook-contacts/e-contact.c:233
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo! — рабочее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:226
+#: ../addressbook/libebook-contacts/e-contact.c:234
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo! — рабочее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:227
+#: ../addressbook/libebook-contacts/e-contact.c:235
 msgid "MSN Home Screen Name 1"
 msgstr "MSN — домашнее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:228
+#: ../addressbook/libebook-contacts/e-contact.c:236
 msgid "MSN Home Screen Name 2"
 msgstr "MSN — домашнее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:229
+#: ../addressbook/libebook-contacts/e-contact.c:237
 msgid "MSN Home Screen Name 3"
 msgstr "MSN — домашнее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:230
+#: ../addressbook/libebook-contacts/e-contact.c:238
 msgid "MSN Work Screen Name 1"
 msgstr "MSN — рабочее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:231
+#: ../addressbook/libebook-contacts/e-contact.c:239
 msgid "MSN Work Screen Name 2"
 msgstr "MSN — рабочее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:232
+#: ../addressbook/libebook-contacts/e-contact.c:240
 msgid "MSN Work Screen Name 3"
 msgstr "MSN — рабочее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:233
+#: ../addressbook/libebook-contacts/e-contact.c:241
 msgid "ICQ Home ID 1"
 msgstr "ICQ — домашний идентификатор 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:234
+#: ../addressbook/libebook-contacts/e-contact.c:242
 msgid "ICQ Home ID 2"
 msgstr "ICQ — домашний идентификатор 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:235
+#: ../addressbook/libebook-contacts/e-contact.c:243
 msgid "ICQ Home ID 3"
 msgstr "ICQ — домашний идентификатор 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:236
+#: ../addressbook/libebook-contacts/e-contact.c:244
 msgid "ICQ Work ID 1"
 msgstr "ICQ — рабочий идентификатор 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:237
+#: ../addressbook/libebook-contacts/e-contact.c:245
 msgid "ICQ Work ID 2"
 msgstr "ICQ — рабочий идентификатор 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:238
+#: ../addressbook/libebook-contacts/e-contact.c:246
 msgid "ICQ Work ID 3"
 msgstr "ICQ — рабочий идентификатор 3"
 
 #. Last modified time
-#: ../addressbook/libebook-contacts/e-contact.c:241
+#: ../addressbook/libebook-contacts/e-contact.c:249
 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:245
+#: ../addressbook/libebook-contacts/e-contact.c:253
 msgid "Name or Org"
 msgstr "Имя или Орг"
 
 #. Address fields
-#: ../addressbook/libebook-contacts/e-contact.c:248
+#: ../addressbook/libebook-contacts/e-contact.c:256
 msgid "Address List"
 msgstr "Список адресов"
 
-#: ../addressbook/libebook-contacts/e-contact.c:249
+#: ../addressbook/libebook-contacts/e-contact.c:257
 msgid "Home Address"
 msgstr "Домашний адрес"
 
-#: ../addressbook/libebook-contacts/e-contact.c:250
+#: ../addressbook/libebook-contacts/e-contact.c:258
 msgid "Work Address"
 msgstr "Рабочий адрес"
 
-#: ../addressbook/libebook-contacts/e-contact.c:251
+#: ../addressbook/libebook-contacts/e-contact.c:259
 msgid "Other Address"
 msgstr "Другой адрес"
 
 #. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:254
+#: ../addressbook/libebook-contacts/e-contact.c:262
 msgid "Category List"
 msgstr "Список категорий"
 
 #. Photo/Logo
-#: ../addressbook/libebook-contacts/e-contact.c:257
+#: ../addressbook/libebook-contacts/e-contact.c:265
 msgid "Photo"
 msgstr "Фото"
 
-#: ../addressbook/libebook-contacts/e-contact.c:258
+#: ../addressbook/libebook-contacts/e-contact.c:266
 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:262
+#: ../addressbook/libebook-contacts/e-contact.c:270
 msgid "Name"
 msgstr "Имя"
 
-#: ../addressbook/libebook-contacts/e-contact.c:263
+#: ../addressbook/libebook-contacts/e-contact.c:271
 msgid "Email List"
 msgstr "Список адресов эл. почты"
 
 #. Instant messaging fields
-#: ../addressbook/libebook-contacts/e-contact.c:266
+#: ../addressbook/libebook-contacts/e-contact.c:274
 msgid "AIM Screen Name List"
-msgstr "Список экранных имен AIM"
+msgstr "Список экранных имён AIM"
 
-#: ../addressbook/libebook-contacts/e-contact.c:267
+#: ../addressbook/libebook-contacts/e-contact.c:275
 msgid "GroupWise ID List"
 msgstr "Список идентификаторов Groupwise"
 
-#: ../addressbook/libebook-contacts/e-contact.c:268
+#: ../addressbook/libebook-contacts/e-contact.c:276
 msgid "Jabber ID List"
 msgstr "Список идентификаторов Jabber"
 
-#: ../addressbook/libebook-contacts/e-contact.c:269
+#: ../addressbook/libebook-contacts/e-contact.c:277
 msgid "Yahoo! Screen Name List"
-msgstr "Список экранных имен Yahoo!"
+msgstr "Список экранных имён Yahoo!"
 
-#: ../addressbook/libebook-contacts/e-contact.c:270
+#: ../addressbook/libebook-contacts/e-contact.c:278
 msgid "MSN Screen Name List"
-msgstr "Список экранных имен MSN"
+msgstr "Список экранных имён MSN"
 
-#: ../addressbook/libebook-contacts/e-contact.c:271
+#: ../addressbook/libebook-contacts/e-contact.c:279
 msgid "ICQ ID List"
 msgstr "Список идентификаторов ICQ"
 
-#: ../addressbook/libebook-contacts/e-contact.c:273
+#: ../addressbook/libebook-contacts/e-contact.c:281
 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:278
+#: ../addressbook/libebook-contacts/e-contact.c:286
 msgid "List"
 msgstr "Список"
 
@@ -753,463 +791,566 @@ 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:283
+#: ../addressbook/libebook-contacts/e-contact.c:291
 msgid "List Shows Addresses"
 msgstr "Список показывает адреса"
 
-#: ../addressbook/libebook-contacts/e-contact.c:285
+#: ../addressbook/libebook-contacts/e-contact.c:293
 msgid "Birth Date"
 msgstr "Дата рождения"
 
-#: ../addressbook/libebook-contacts/e-contact.c:286
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:887
+#: ../addressbook/libebook-contacts/e-contact.c:294
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:893
 msgid "Anniversary"
 msgstr "Годовщина"
 
 #. Security fields
-#: ../addressbook/libebook-contacts/e-contact.c:289
+#: ../addressbook/libebook-contacts/e-contact.c:297
 msgid "X.509 Certificate"
 msgstr "Сертификат X.509"
 
-#: ../addressbook/libebook-contacts/e-contact.c:291
+#: ../addressbook/libebook-contacts/e-contact.c:299
 msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu — домашний идентификатор 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:292
+#: ../addressbook/libebook-contacts/e-contact.c:300
 msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu — домашний идентификатор 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:293
+#: ../addressbook/libebook-contacts/e-contact.c:301
 msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu — домашний идентификатор 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:294
+#: ../addressbook/libebook-contacts/e-contact.c:302
 msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu — рабочий идентификатор 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:295
+#: ../addressbook/libebook-contacts/e-contact.c:303
 msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu — рабочий идентификатор 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:296
+#: ../addressbook/libebook-contacts/e-contact.c:304
 msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu — рабочий идентификатор 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:297
+#: ../addressbook/libebook-contacts/e-contact.c:305
 msgid "Gadu-Gadu ID List"
 msgstr "Список идентификаторов Gadu-Gadu"
 
 #. Geo information
-#: ../addressbook/libebook-contacts/e-contact.c:300
+#: ../addressbook/libebook-contacts/e-contact.c:308
 msgid "Geographic Information"
 msgstr "Географическая информация"
 
-#: ../addressbook/libebook-contacts/e-contact.c:302
+#: ../addressbook/libebook-contacts/e-contact.c:310
 msgid "Telephone"
 msgstr "Телефон"
 
-#: ../addressbook/libebook-contacts/e-contact.c:304
+#: ../addressbook/libebook-contacts/e-contact.c:312
 msgid "Skype Home Name 1"
 msgstr "Skype - домашнее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:305
+#: ../addressbook/libebook-contacts/e-contact.c:313
 msgid "Skype Home Name 2"
 msgstr "Skype - домашнее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:306
+#: ../addressbook/libebook-contacts/e-contact.c:314
 msgid "Skype Home Name 3"
 msgstr "Skype - домашнее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:307
+#: ../addressbook/libebook-contacts/e-contact.c:315
 msgid "Skype Work Name 1"
 msgstr "Skype - рабочее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:308
+#: ../addressbook/libebook-contacts/e-contact.c:316
 msgid "Skype Work Name 2"
 msgstr "Skype - рабочее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:309
+#: ../addressbook/libebook-contacts/e-contact.c:317
 msgid "Skype Work Name 3"
 msgstr "Skype - рабочее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:310
+#: ../addressbook/libebook-contacts/e-contact.c:318
 msgid "Skype Name List"
-msgstr "Список экранных имен Skype"
+msgstr "Список экранных имён Skype"
 
-#: ../addressbook/libebook-contacts/e-contact.c:312
+#: ../addressbook/libebook-contacts/e-contact.c:320
 msgid "SIP address"
 msgstr "Адрес SIP"
 
-#: ../addressbook/libebook-contacts/e-contact.c:314
+#: ../addressbook/libebook-contacts/e-contact.c:322
 msgid "Google Talk Home Name 1"
 msgstr "Google Talk — домашнее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:315
+#: ../addressbook/libebook-contacts/e-contact.c:323
 msgid "Google Talk Home Name 2"
 msgstr "Google Talk — домашнее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:316
+#: ../addressbook/libebook-contacts/e-contact.c:324
 msgid "Google Talk Home Name 3"
 msgstr "Google Talk — домашнее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:317
+#: ../addressbook/libebook-contacts/e-contact.c:325
 msgid "Google Talk Work Name 1"
 msgstr "Google Talk — рабочее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:318
+#: ../addressbook/libebook-contacts/e-contact.c:326
 msgid "Google Talk Work Name 2"
 msgstr "Google Talk — рабочее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:319
+#: ../addressbook/libebook-contacts/e-contact.c:327
 msgid "Google Talk Work Name 3"
 msgstr "Google Talk — рабочее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:320
+#: ../addressbook/libebook-contacts/e-contact.c:328
 msgid "Google Talk Name List"
 msgstr "Список экранных имён Google Talk"
 
-#: ../addressbook/libebook-contacts/e-contact.c:322
+#: ../addressbook/libebook-contacts/e-contact.c:330
 msgid "Twitter Name List"
 msgstr "Список имён Twitter"
 
-#: ../addressbook/libebook-contacts/e-contact.c:1627
-#: ../addressbook/libebook/e-destination.c:883
+#: ../addressbook/libebook-contacts/e-contact.c:1635
+#: ../addressbook/libebook/e-destination.c:881
 msgid "Unnamed List"
 msgstr "Безымянный список"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:43
+#: ../addressbook/libebook-contacts/e-phone-number.c:41
 msgid "The library was built without phone number support."
 msgstr "Библиотека собрана без поддержки телефонных номеров."
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:45
+#: ../addressbook/libebook-contacts/e-phone-number.c:43
 msgid "The phone number parser reported an yet unkown error code."
 msgstr "Анализатор телефонных номеров выдал неизвестный код ошибки."
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:47
+#: ../addressbook/libebook-contacts/e-phone-number.c:45
 msgid "Not a phone number"
 msgstr "Некорректный номер"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:49
+#: ../addressbook/libebook-contacts/e-phone-number.c:47
 msgid "Invalid country calling code"
 msgstr "Неверный телефонный код страны"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:51
-msgid "Remaining text after the country calling code is too short for a phone number"
+#: ../addressbook/libebook-contacts/e-phone-number.c:49
+msgid ""
+"Remaining text after the country calling code is too short for a phone number"
 msgstr "Текст после кода страны слишком короткий для телефонного номера"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:53
+#: ../addressbook/libebook-contacts/e-phone-number.c:51
 msgid "Text is too short for a phone number"
 msgstr "Текст слишком короткий для телефонного номера"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:55
+#: ../addressbook/libebook-contacts/e-phone-number.c:53
 msgid "Text is too long for a phone number"
 msgstr "Текст слишком длинный для телефонного номера"
 
-#: ../addressbook/libebook/e-book-client.c:749
+#: ../addressbook/libebook/e-book-client.c:807
 #, c-format
 msgid "Unknown book property '%s'"
 msgstr "Неизвестное свойство книги «%s»"
 
-#: ../addressbook/libebook/e-book-client.c:764
+#: ../addressbook/libebook/e-book-client.c:822
 #, c-format
 msgid "Cannot change value of book property '%s'"
 msgstr "Невозможно изменить значение свойства книги «%s»"
 
-#: ../addressbook/libebook/e-book-client.c:1099
-#: ../addressbook/libebook/e-book-client.c:1274
-#: ../calendar/libecal/e-cal-client.c:1522
-#: ../calendar/libecal/e-cal-client.c:1704
+#: ../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
 #, c-format
 msgid "Unable to connect to '%s': "
 msgstr "Не удалось подключиться к «%s»: "
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:796
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:899
+#: ../addressbook/libedata-book/e-book-sqlite.c:2163
 #, c-format
 msgid "Error introspecting unknown summary field '%s'"
 msgstr "Ошибка при интроспекции неизвестного поля сводки «%s»"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1295
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1509
+#: ../addressbook/libedata-book/e-book-sqlite.c:1319
 msgid "Error parsing regular expression"
 msgstr "Ошибка разбора регулярного выражения"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1340
-#: ../camel/camel-db.c:544
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1554
+#: ../addressbook/libedata-book/e-book-sqlite.c:1803 ../camel/camel-db.c:545
 #, c-format
 msgid "Insufficient memory"
 msgstr "Недостаточно памяти"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1473
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1691
 #, c-format
 msgid "Invalid contact field '%d' specified in summary"
 msgstr "В сводке указано неверное поле контакта «%d»"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1507
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1725
+#: ../addressbook/libedata-book/e-book-sqlite.c:557
 #, c-format
-msgid "Contact field '%s' of type '%s' specified in summary, but only boolean, string and string list field 
types are supported"
-msgstr "В сводке указано поле контакта «%s», имеющее тип данных «%s», но поддерживается только логический 
тип, строковый тип или список строк."
+msgid ""
+"Contact field '%s' of type '%s' specified in summary, but only boolean, "
+"string and string list field types are supported"
+msgstr ""
+"В сводке указано поле контакта «%s», имеющее тип данных «%s», но "
+"поддерживается только логический тип, строковый тип или список строк."
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2695
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3772
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3065
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4161
 #, c-format
-msgid "Full search_contacts are not stored in cache. vcards cannot be returned."
-msgstr "Полные данные search_contact не хранятся в кэше. Невозможно возвратить данные vcards."
+msgid ""
+"Full search_contacts are not stored in cache. vcards cannot be returned."
+msgstr ""
+"Полные данные search_contact не хранятся в кэше. Невозможно возвратить "
+"данные vcards."
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3898
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3979
+#: ../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:5364
 #, c-format
 msgid "Query contained unsupported elements"
 msgstr "Запрос содержит неподдерживаемые элементы"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3902
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4296
 #, c-format
 msgid "Invalid Query"
 msgstr "Некорректный запрос"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3926
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4320
 #, c-format
-msgid "Full search_contacts are not stored in cache. Hence only summary query is supported."
-msgstr "Полные данные search_contact не хранятся в кэше. Поэтому поддерживается только запрос для сводки."
+msgid ""
+"Full search_contacts are not stored in cache. Hence only summary query is "
+"supported."
+msgstr ""
+"Полные данные search_contact не хранятся в кэше. Поэтому поддерживается "
+"только запрос для сводки."
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3983
-#: ../addressbook/libedata-book/e-data-book.c:358
-#: ../addressbook/libedata-book/e-data-book.c:992
-#: ../calendar/libedata-cal/e-data-cal.c:412
-#: ../calendar/libedata-cal/e-data-cal.c:1299
-#: ../libedataserver/e-client.c:164
+#: ../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
 #, c-format
 msgid "Invalid query"
 msgstr "Некорректный запрос"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4026
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4432
 #, c-format
-msgid "Full vcards are not stored in cache. Hence only summary query is supported."
-msgstr "Полные данные vcard не хранятся в кэше. Поэтому поддерживается только запрос для сводки."
+msgid ""
+"Full vcards are not stored in cache. Hence only summary query is supported."
+msgstr ""
+"Полные данные vcard не хранятся в кэше. Поэтому поддерживается только запрос "
+"для сводки."
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4729
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5255
 #, c-format
 msgid "Unable to remove the db file: errno %d"
 msgstr "Не удалось удалить файл базы данных: код ошибки %d"
 
-#: ../addressbook/libedata-book/e-data-book.c:342
-#: ../calendar/libedata-cal/e-data-cal.c:393
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6042
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6442
+#, c-format
+msgid "Only summary queries are supported by EbSdbCursor"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6049
+#, c-format
+msgid "At least one sort field must be specified to use an EbSdbCursor"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6063
+#, c-format
+msgid "Cannot sort by a field that is not in the summary"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6070
+#, 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:7376
+#, c-format
+msgid ""
+"Tried to step a cursor in reverse, but cursor is already at the beginning of "
+"the contact list"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211
+#: ../addressbook/libedata-book/e-book-sqlite.c:7384
+#, c-format
+msgid ""
+"Tried to step a cursor forwards, but cursor is already at the end of the "
+"contact list"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:524
+#, fuzzy, c-format
+#| msgid "Invalid contact field '%d' specified in summary"
+msgid "Unsupported contact field '%d' specified in summary"
+msgstr "В сводке указано неверное поле контакта «%d»"
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:1876
+msgid ""
+"Cannot upgrade contacts database from a legacy database with more than one "
+"addressbook. Delete one of the entries in the 'folders' table first."
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:5357
+#, c-format
+#| msgid "Invalid query: "
+msgid "Invalid query: %s"
+msgstr "Недопустимый запрос: %s"
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:5532
+#, fuzzy
+#| msgid "Invalid query: "
+msgid "Invalid query for EbSqlCursor"
+msgstr "Недопустимый запрос: "
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:7198
+msgid "At least one sort field must be specified to use an EbSqlCursor"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:7216
+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
 msgid "Success"
 msgstr "Успешно"
 
-#: ../addressbook/libedata-book/e-data-book.c:343
-#: ../calendar/libecal/e-cal.c:2303
-#: ../calendar/libedata-cal/e-data-cal.c:394
-#: ../libedataserver/e-client.c:131
+#: ../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
 msgid "Backend is busy"
 msgstr "Драйвер занят"
 
-#: ../addressbook/libedata-book/e-data-book.c:344
-#: ../calendar/libedata-cal/e-data-cal.c:395
-#: ../libedataserver/e-client.c:141
+#: ../addressbook/libedata-book/e-data-book.c:369
+#: ../calendar/libedata-cal/e-data-cal.c:403 ../libedataserver/e-client.c:149
 msgid "Repository offline"
 msgstr "Репозиторий отключён от сети"
 
-#: ../addressbook/libedata-book/e-data-book.c:345
-#: ../calendar/libecal/e-cal.c:2317
-#: ../calendar/libedata-cal/e-data-cal.c:396
-#: ../libedataserver/e-client.c:148
+#: ../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
 msgid "Permission denied"
-msgstr "Доступ запрещен"
+msgstr "Доступ запрещён"
 
-#: ../addressbook/libedata-book/e-data-book.c:348
-#: ../calendar/libedata-cal/e-data-cal.c:401
+#: ../addressbook/libedata-book/e-data-book.c:373
+#: ../calendar/libedata-cal/e-data-cal.c:409
 msgid "Authentication Failed"
 msgstr "Сбой аутентификации"
 
-#: ../addressbook/libedata-book/e-data-book.c:349
-#: ../calendar/libedata-cal/e-data-cal.c:402
+#: ../addressbook/libedata-book/e-data-book.c:374
+#: ../calendar/libedata-cal/e-data-cal.c:410
 msgid "Authentication Required"
 msgstr "Требуется аутентификация"
 
-#: ../addressbook/libedata-book/e-data-book.c:350
-#: ../calendar/libedata-cal/e-data-cal.c:403
+#: ../addressbook/libedata-book/e-data-book.c:375
+#: ../calendar/libedata-cal/e-data-cal.c:411
 msgid "Unsupported field"
 msgstr "Неподдерживаемое поле"
 
-#: ../addressbook/libedata-book/e-data-book.c:351
-#: ../calendar/libedata-cal/e-data-cal.c:405
-#: ../libedataserver/e-client.c:156
+#: ../addressbook/libedata-book/e-data-book.c:376
+#: ../calendar/libedata-cal/e-data-cal.c:413 ../libedataserver/e-client.c:164
 msgid "Unsupported authentication method"
 msgstr "Неподдерживаемый метод аутентификации"
 
-#: ../addressbook/libedata-book/e-data-book.c:352
-#: ../calendar/libedata-cal/e-data-cal.c:406
-#: ../libedataserver/e-client.c:158
+#: ../addressbook/libedata-book/e-data-book.c:377
+#: ../calendar/libedata-cal/e-data-cal.c:414 ../libedataserver/e-client.c:166
 msgid "TLS not available"
 msgstr "TLS недоступен"
 
-#: ../addressbook/libedata-book/e-data-book.c:353
+#: ../addressbook/libedata-book/e-data-book.c:378
 msgid "Address book does not exist"
 msgstr "Адресная книга не существует"
 
-#: ../addressbook/libedata-book/e-data-book.c:354
+#: ../addressbook/libedata-book/e-data-book.c:379
 msgid "Book removed"
 msgstr "Книга удалена"
 
-#: ../addressbook/libedata-book/e-data-book.c:355
-#: ../calendar/libedata-cal/e-data-cal.c:409
+#: ../addressbook/libedata-book/e-data-book.c:380
+#: ../calendar/libedata-cal/e-data-cal.c:417
 msgid "Not available in offline mode"
 msgstr "Недоступно в автономном режиме"
 
-#: ../addressbook/libedata-book/e-data-book.c:356
-#: ../calendar/libedata-cal/e-data-cal.c:410
-#: ../libedataserver/e-client.c:160
+#: ../addressbook/libedata-book/e-data-book.c:381
+#: ../calendar/libedata-cal/e-data-cal.c:418 ../libedataserver/e-client.c:168
 msgid "Search size limit exceeded"
 msgstr "Превышено ограничение на размер результатов поиска"
 
-#: ../addressbook/libedata-book/e-data-book.c:357
-#: ../calendar/libedata-cal/e-data-cal.c:411
-#: ../libedataserver/e-client.c:162
+#: ../addressbook/libedata-book/e-data-book.c:382
+#: ../calendar/libedata-cal/e-data-cal.c:419 ../libedataserver/e-client.c:170
 msgid "Search time limit exceeded"
 msgstr "Превышено ограничение на время поиска"
 
-#: ../addressbook/libedata-book/e-data-book.c:359
-#: ../calendar/libedata-cal/e-data-cal.c:413
-#: ../libedataserver/e-client.c:166
+#: ../addressbook/libedata-book/e-data-book.c:384
+#: ../calendar/libedata-cal/e-data-cal.c:421 ../libedataserver/e-client.c:174
 msgid "Query refused"
 msgstr "Запрос отклонён"
 
-#: ../addressbook/libedata-book/e-data-book.c:360
-#: ../calendar/libedata-cal/e-data-cal.c:414
-#: ../libedataserver/e-client.c:152
+#: ../addressbook/libedata-book/e-data-book.c:385
+#: ../calendar/libedata-cal/e-data-cal.c:422 ../libedataserver/e-client.c:160
 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:362
-#: ../calendar/libedata-cal/e-data-cal.c:416
+#: ../addressbook/libedata-book/e-data-book.c:387
+#: ../calendar/libedata-cal/e-data-cal.c:424
 msgid "Invalid server version"
 msgstr "Недопустимая версия сервера"
 
-#: ../addressbook/libedata-book/e-data-book.c:364
-#: ../calendar/libecal/e-cal.c:2301
-#: ../calendar/libedata-cal/e-data-cal.c:417
-#: ../libedataserver/e-client.c:129
+#: ../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
 msgid "Invalid argument"
 msgstr "Недопустимый аргумент"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:366
-#: ../calendar/libecal/e-cal.c:1060
-#: ../calendar/libecal/e-cal.c:1428
-#: ../calendar/libecal/e-cal.c:1908
-#: ../calendar/libecal/e-cal.c:2340
-#: ../calendar/libedata-cal/e-data-cal.c:419
-#: ../libedataserver/e-client.c:154
+#: ../addressbook/libedata-book/e-data-book.c:391
+#: ../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
 #, c-format
 msgid "Not supported"
 msgstr "Не поддерживается"
 
-#: ../addressbook/libedata-book/e-data-book.c:367
-#: ../calendar/libedata-cal/e-data-cal.c:420
-#: ../libedataserver/e-client.c:172
+#: ../addressbook/libedata-book/e-data-book.c:392
+#: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:180
 msgid "Backend is not opened yet"
 msgstr "Драйвер ещё не открыт"
 
-#: ../addressbook/libedata-book/e-data-book.c:368
-#: ../libedataserver/e-client.c:174
+#: ../addressbook/libedata-book/e-data-book.c:393
+#: ../libedataserver/e-client.c:182
 msgid "Object is out of sync"
 msgstr "Объект рассинхронизирован"
 
-#: ../addressbook/libedata-book/e-data-book.c:376
-#: ../calendar/libedata-cal/e-data-cal.c:428
-#: ../libedataserver/e-client.c:170
+#: ../addressbook/libedata-book/e-data-book.c:401
+#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:178
 msgid "Other error"
 msgstr "Другая ошибка"
 
-#: ../addressbook/libedata-book/e-data-book.c:1017
-#: ../calendar/libedata-cal/e-data-cal.c:1324
+#: ../addressbook/libedata-book/e-data-book.c:1053
+#: ../calendar/libedata-cal/e-data-cal.c:1332
 msgid "Invalid query: "
 msgstr "Недопустимый запрос: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1069
+#: ../addressbook/libedata-book/e-data-book.c:1272
 msgid "Cannot open book: "
 msgstr "Невозможно открыть книгу: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1106
+#: ../addressbook/libedata-book/e-data-book.c:1309
 msgid "Cannot refresh address book: "
 msgstr "Невозможно обновить адресную книгу: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1137
+#: ../addressbook/libedata-book/e-data-book.c:1340
 msgid "Cannot get contact: "
 msgstr "Невозможно получить контакт: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1175
+#: ../addressbook/libedata-book/e-data-book.c:1378
 msgid "Cannot get contact list: "
 msgstr "Невозможно получить список контактов: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1227
+#: ../addressbook/libedata-book/e-data-book.c:1430
 msgid "Cannot get contact list uids: "
 msgstr "Невозможно получить идентификаторы списка контактов: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1274
+#: ../addressbook/libedata-book/e-data-book.c:1477
 msgid "Cannot add contact: "
 msgstr "Невозможно добавить контакт: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1323
+#: ../addressbook/libedata-book/e-data-book.c:1526
 msgid "Cannot modify contacts: "
 msgstr "Невозможно изменить контакты:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1365
+#: ../addressbook/libedata-book/e-data-book.c:1568
 msgid "Cannot remove contacts: "
 msgstr "Невозможно удалить контакты: "
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:273
-#: ../calendar/libedata-cal/e-data-cal-factory.c:276
+#: ../addressbook/libedata-book/e-data-book-cursor.c:772
+#, fuzzy
+#| msgid "%s does not support creating remote resources"
+msgid "Cursor does not support setting the search expression"
+msgstr "%s не поддерживает создание удалённых ресурсов"
+
+#: ../addressbook/libedata-book/e-data-book-cursor.c:855
+#, fuzzy
+#| msgid "Store does not support an INBOX"
+msgid "Cursor does not support step"
+msgstr "Хранилище не поддерживает INBOX"
+
+#: ../addressbook/libedata-book/e-data-book-cursor.c:938
+#, fuzzy
+#| msgid "%s does not support authentication"
+msgid "Cursor does not support alphabetic indexes"
+msgstr "%s не поддерживает аутентификацию"
+
+#: ../addressbook/libedata-book/e-data-book-cursor-sqlite.c:268
+msgid "Unrecognized cursor origin"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-data-book-cursor-sqlite.c:336
+msgid "Out of sync revision while moving cursor"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-data-book-cursor-sqlite.c:430
+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:324
-#: ../calendar/libedata-cal/e-data-cal-factory.c:330
+#: ../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:335
-#: ../calendar/libedata-cal/e-data-cal-factory.c:340
+#: ../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:566
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:573
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "Сервер недоступен (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:597
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:604
 #, c-format
 msgid "Failed to connect to a server using SSL: %s"
 msgstr "Сбой при подключении к серверу с использованием SSL: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:608
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:615
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "Получен неожиданный код (%d) состояния HTTP (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:627
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:634
 msgid "CalDAV backend is not loaded yet"
 msgstr "Драйвер CalDAV ещё не загружен"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1048
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1073
 msgid "Invalid Redirect URL"
 msgstr "Неверный перенаправляющий URL"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2525
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2917
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2565
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2930
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1218,768 +1359,715 @@ msgstr ""
 "Сервер недоступен, календарь открыт в режиме «только чтение».\n"
 "Сообщение об ошибке: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2869
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2885
 #, c-format
 msgid "Cannot create local cache folder '%s'"
 msgstr "Не удалось создать локальную кэш-папку «%s»"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3957
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3970
 msgid "CalDAV does not support bulk additions"
 msgstr "CalDAV не поддерживает пакетные добавления"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4060
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4073
 msgid "CalDAV does not support bulk modifications"
 msgstr "CalDAV не поддерживает пакетные изменения"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4236
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4249
 msgid "CalDAV does not support bulk removals"
 msgstr "CalDAV не поддерживает пакетные удаления"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4903
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4916
 msgid "Calendar doesn't support Free/Busy"
 msgstr "Календарь не поддерживает информацию о занятости"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4912
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4925
 msgid "Schedule outbox url not found"
 msgstr "Не найден url исходящего расписания"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5009
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5022
 msgid "Unexpected result in schedule-response"
 msgstr "Неожиданный результат в ответе-расписании"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:889
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:895
 msgid "Birthday"
 msgstr "День рождения"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:925
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:931
 #, c-format
 msgid "Birthday: %s"
 msgstr "День рождения: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:956
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:962
 #, c-format
 msgid "Anniversary: %s"
 msgstr "Годовщина: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:245
+#: ../calendar/backends/file/e-cal-backend-file.c:244
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "Не удалось сохранить данные календаря: Неверный URI."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:252
-#: ../calendar/backends/file/e-cal-backend-file.c:258
+#: ../calendar/backends/file/e-cal-backend-file.c:251
+#: ../calendar/backends/file/e-cal-backend-file.c:257
 msgid "Cannot save calendar data"
 msgstr "Не удалось сохранить данные календаря"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:479
+#: ../calendar/backends/http/e-cal-backend-http.c:483
 #, c-format
 msgid "Malformed URI: %s"
 msgstr "Некорректный URI: %s"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:570
+#: ../calendar/backends/http/e-cal-backend-http.c:574
 #, c-format
 msgid "Redirected to Invalid URI"
 msgstr "Переадресован на недопустимый URI"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:613
+#: ../calendar/backends/http/e-cal-backend-http.c:617
 #, c-format
 msgid "Bad file format."
 msgstr "Неверный формат файла."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:623
+#: ../calendar/backends/http/e-cal-backend-http.c:627
 #, c-format
 msgid "Not a calendar."
 msgstr "Не является календарём."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:927
-#: ../calendar/backends/weather/e-cal-backend-weather.c:514
+#: ../calendar/backends/http/e-cal-backend-http.c:914
+#: ../calendar/backends/weather/e-cal-backend-weather.c:536
 msgid "Could not create cache file"
 msgstr "Не удалось создать файл кэша"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:173
+#: ../calendar/backends/weather/e-cal-backend-weather.c:174
 msgid "Could not retrieve weather data"
 msgstr "Не удалось получить информацию о погоде"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:284
+#: ../calendar/backends/weather/e-cal-backend-weather.c:295
 msgid "Weather: Fog"
 msgstr "Погода: Туман"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:285
+#: ../calendar/backends/weather/e-cal-backend-weather.c:296
 msgid "Weather: Cloudy Night"
 msgstr "Погода: Облачная ночь"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:286
+#: ../calendar/backends/weather/e-cal-backend-weather.c:297
 msgid "Weather: Cloudy"
 msgstr "Погода: Облачно"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:287
+#: ../calendar/backends/weather/e-cal-backend-weather.c:298
 msgid "Weather: Overcast"
 msgstr "Погода: Пасмурно"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+#: ../calendar/backends/weather/e-cal-backend-weather.c:299
 msgid "Weather: Showers"
 msgstr "Погода: Дожди"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:289
+#: ../calendar/backends/weather/e-cal-backend-weather.c:300
 msgid "Weather: Snow"
 msgstr "Погода: Снег"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:290
+#: ../calendar/backends/weather/e-cal-backend-weather.c:301
 msgid "Weather: Clear Night"
 msgstr "Погода: Ясная ночь"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:291
+#: ../calendar/backends/weather/e-cal-backend-weather.c:302
 msgid "Weather: Sunny"
 msgstr "Погода: Солнечно"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:292
+#: ../calendar/backends/weather/e-cal-backend-weather.c:303
 msgid "Weather: Thunderstorms"
 msgstr "Погода: Грозы"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:416
+#. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN)
+#: ../calendar/backends/weather/e-cal-backend-weather.c:329
+#, c-format
+msgid "%.1f °F"
+msgstr ""
+
+#. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN)
+#: ../calendar/backends/weather/e-cal-backend-weather.c:332
+#, c-format
+msgid "%.1f °C"
+msgstr ""
+
+#. TRANSLATOR: This is the temperature in kelvin
+#: ../calendar/backends/weather/e-cal-backend-weather.c:335
+#, c-format
+msgid "%.1f K"
+msgstr ""
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:341
+#, c-format
+msgid "%.1f"
+msgstr ""
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:452
 msgid "Forecast"
 msgstr "Прогноз"
 
-#: ../calendar/libecal/e-cal.c:2305
+#: ../calendar/libecal/e-cal.c:2304
 msgid "Repository is offline"
 msgstr "Репозиторий находится в автономном режиме"
 
-#: ../calendar/libecal/e-cal.c:2307
-#: ../calendar/libecal/e-cal-client.c:255
+#: ../calendar/libecal/e-cal.c:2306 ../calendar/libecal/e-cal-client.c:263
 msgid "No such calendar"
 msgstr "Нет такого календаря"
 
-#: ../calendar/libecal/e-cal.c:2309
-#: ../calendar/libecal/e-cal-client.c:257
-#: ../calendar/libedata-cal/e-data-cal.c:398
+#: ../calendar/libecal/e-cal.c:2308 ../calendar/libecal/e-cal-client.c:265
+#: ../calendar/libedata-cal/e-data-cal.c:406
 msgid "Object not found"
 msgstr "Объект не найден"
 
-#: ../calendar/libecal/e-cal.c:2311
-#: ../calendar/libecal/e-cal-client.c:259
-#: ../calendar/libedata-cal/e-data-cal.c:399
+#: ../calendar/libecal/e-cal.c:2310 ../calendar/libecal/e-cal-client.c:267
+#: ../calendar/libedata-cal/e-data-cal.c:407
 msgid "Invalid object"
 msgstr "Неверный объект"
 
-#: ../calendar/libecal/e-cal.c:2313
+#: ../calendar/libecal/e-cal.c:2312
 msgid "URI not loaded"
 msgstr "URI не загружен"
 
-#: ../calendar/libecal/e-cal.c:2315
+#: ../calendar/libecal/e-cal.c:2314
 msgid "URI already loaded"
 msgstr "URI уже загружен"
 
-#: ../calendar/libecal/e-cal.c:2319
+#: ../calendar/libecal/e-cal.c:2318
 msgid "Unknown User"
 msgstr "Неизвестный пользователь"
 
-#: ../calendar/libecal/e-cal.c:2321
-#: ../calendar/libecal/e-cal-client.c:263
-#: ../calendar/libedata-cal/e-data-cal.c:400
+#: ../calendar/libecal/e-cal.c:2320 ../calendar/libecal/e-cal-client.c:271
+#: ../calendar/libedata-cal/e-data-cal.c:408
 msgid "Object ID already exists"
 msgstr "Идентификатор объекта уже существует"
 
-#: ../calendar/libecal/e-cal.c:2323
+#: ../calendar/libecal/e-cal.c:2322
 msgid "Protocol not supported"
 msgstr "Протокол не поддерживается"
 
-#: ../calendar/libecal/e-cal.c:2325
+#: ../calendar/libecal/e-cal.c:2324
 msgid "Operation has been canceled"
 msgstr "Операция отменена"
 
-#: ../calendar/libecal/e-cal.c:2327
+#: ../calendar/libecal/e-cal.c:2326
 msgid "Could not cancel operation"
 msgstr "Не удалось отменить операцию"
 
-#: ../calendar/libecal/e-cal.c:2329
-#: ../libedataserver/e-client.c:137
+#: ../calendar/libecal/e-cal.c:2328 ../libedataserver/e-client.c:145
 msgid "Authentication failed"
 msgstr "Сбой проверки подлинности"
 
-#: ../calendar/libecal/e-cal.c:2331
-#: ../camel/providers/smtp/camel-smtp-transport.c:911
-#: ../libedataserver/e-client.c:139
+#: ../calendar/libecal/e-cal.c:2330
+#: ../camel/providers/smtp/camel-smtp-transport.c:921
+#: ../libedataserver/e-client.c:147
 msgid "Authentication required"
 msgstr "Требуется аутентификация"
 
-#: ../calendar/libecal/e-cal.c:2333
+#: ../calendar/libecal/e-cal.c:2332
 msgid "A D-Bus exception has occurred"
 msgstr "Произошло исключение D-Bus"
 
-#: ../calendar/libecal/e-cal.c:2337
+#: ../calendar/libecal/e-cal.c:2336
 msgid "No error"
 msgstr "Нет ошибки"
 
-#: ../calendar/libecal/e-cal-client.c:261
-#: ../calendar/libedata-cal/e-data-cal.c:408
+#: ../calendar/libecal/e-cal-client.c:269
+#: ../calendar/libedata-cal/e-data-cal.c:416
 msgid "Unknown user"
 msgstr "Неизвестный пользователь"
 
-#: ../calendar/libecal/e-cal-client.c:265
-#: ../calendar/libedata-cal/e-data-cal.c:397
+#: ../calendar/libecal/e-cal-client.c:273
+#: ../calendar/libedata-cal/e-data-cal.c:405
 msgid "Invalid range"
 msgstr "Недопустимый диапазон"
 
-#: ../calendar/libecal/e-cal-client.c:928
+#: ../calendar/libecal/e-cal-client.c:936
 #, c-format
 msgid "Unknown calendar property '%s'"
 msgstr "Неизвестное свойство календаря «%s»"
 
-#: ../calendar/libecal/e-cal-client.c:943
+#: ../calendar/libecal/e-cal-client.c:951
 #, c-format
 msgid "Cannot change value of calendar property '%s'"
 msgstr "Невозможно изменить значение свойства календаря «%s»"
 
-#: ../calendar/libecal/e-cal-component.c:1340
+#: ../calendar/libecal/e-cal-component.c:1348
 msgid "Untitled appointment"
 msgstr "Неозаглавленная встреча"
 
-#: ../calendar/libecal/e-cal-recur.c:4036
+#: ../calendar/libecal/e-cal-recur.c:4037
 msgid "1st"
 msgstr "1-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4037
+#: ../calendar/libecal/e-cal-recur.c:4038
 msgid "2nd"
 msgstr "2-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4038
+#: ../calendar/libecal/e-cal-recur.c:4039
 msgid "3rd"
 msgstr "3-е"
 
-#: ../calendar/libecal/e-cal-recur.c:4039
+#: ../calendar/libecal/e-cal-recur.c:4040
 msgid "4th"
 msgstr "4-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4040
+#: ../calendar/libecal/e-cal-recur.c:4041
 msgid "5th"
 msgstr "5-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4041
+#: ../calendar/libecal/e-cal-recur.c:4042
 msgid "6th"
 msgstr "6-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4042
+#: ../calendar/libecal/e-cal-recur.c:4043
 msgid "7th"
 msgstr "7-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4043
+#: ../calendar/libecal/e-cal-recur.c:4044
 msgid "8th"
 msgstr "8-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4044
+#: ../calendar/libecal/e-cal-recur.c:4045
 msgid "9th"
 msgstr "9-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4045
+#: ../calendar/libecal/e-cal-recur.c:4046
 msgid "10th"
 msgstr "10-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:4047
 msgid "11th"
 msgstr "11-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:4048
 msgid "12th"
 msgstr "12-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:4049
 msgid "13th"
 msgstr "13-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:4050
 msgid "14th"
 msgstr "14-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:4051
 msgid "15th"
 msgstr "15-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:4052
 msgid "16th"
 msgstr "16-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:4053
 msgid "17th"
 msgstr "17-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:4054
 msgid "18th"
 msgstr "18-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:4055
 msgid "19th"
 msgstr "19-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:4056
 msgid "20th"
 msgstr "20-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:4057
 msgid "21st"
 msgstr "21-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:4058
 msgid "22nd"
 msgstr "22-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:4059
 msgid "23rd"
 msgstr "23-е"
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:4060
 msgid "24th"
 msgstr "24-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:4061
 msgid "25th"
 msgstr "25-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:4062
 msgid "26th"
 msgstr "26-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:4063
 msgid "27th"
 msgstr "27-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:4064
 msgid "28th"
 msgstr "28-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:4065
 msgid "29th"
 msgstr "29-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:4066
 msgid "30th"
 msgstr "30-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:4067
 msgid "31st"
 msgstr "31-ое"
 
-#: ../calendar/libecal/e-cal-util.c:707
-#: ../calendar/libecal/e-cal-util.c:734
+#: ../calendar/libecal/e-cal-util.c:706 ../calendar/libecal/e-cal-util.c:733
 msgctxt "Priority"
 msgid "High"
 msgstr "Высокий"
 
-#: ../calendar/libecal/e-cal-util.c:709
-#: ../calendar/libecal/e-cal-util.c:736
+#: ../calendar/libecal/e-cal-util.c:708 ../calendar/libecal/e-cal-util.c:735
 msgctxt "Priority"
 msgid "Normal"
 msgstr "Нормальный"
 
-#: ../calendar/libecal/e-cal-util.c:711
-#: ../calendar/libecal/e-cal-util.c:738
+#: ../calendar/libecal/e-cal-util.c:710 ../calendar/libecal/e-cal-util.c:737
 msgctxt "Priority"
 msgid "Low"
 msgstr "Низкий"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:732
+#: ../calendar/libecal/e-cal-util.c:731
 msgctxt "Priority"
 msgid "Undefined"
 msgstr "Неопределённый"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:78
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1056
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1365
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1492
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1541
+#: ../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
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "«%s» предполагает один аргумент"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:85
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:667
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1372
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1380
+#: ../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:1386
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "«%s» предполагает строку в качестве аргумента 1"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
 #, c-format
 msgid "\"%s\" expects two or three arguments"
 msgstr "«%s» предполагает два или три аргумента"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:167
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:256
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:318
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1063
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1441
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1499
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1548
+#: ../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
 #, 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:176
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:264
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:328
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:826
+#: ../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
 #, 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:186
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:192
 #, c-format
 msgid "\"%s\" expects the third argument to be a string"
 msgstr "«%s» предполагает строку в качестве третьего аргумента"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:248
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
 #, c-format
 msgid "\"%s\" expects none or two arguments"
 msgstr "«%s» предполагает два аргумента или ни одного"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:311
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:660
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:810
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1434
+#: ../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
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "«%s» предполагает два аргумента"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:596
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:619
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:742
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:774
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:981
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1014
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1326
+#: ../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
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "«%s» не предполагает аргументов"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:682
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "«%s» предполагает строку в качестве аргумента 2"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:707
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:713
 #, c-format
-msgid "\"%s\" expects the first argument to be either \"any\", \"summary\", or \"description\", or 
\"location\", or \"attendee\", or \"organizer\", or \"classification\""
-msgstr "«%s» предполагает одно из «any», «summary», «description», «location», «attendee», «organizer» или 
«classification» в качестве аргумента 1"
+msgid ""
+"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
+"\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
+"\"classification\""
+msgstr ""
+"«%s» предполагает одно из «any», «summary», «description», «location», "
+"«attendee», «organizer» или «classification» в качестве аргумента 1"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:884
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "«%s» предполагает по крайней мере 1 аргумент"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:893
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:899
 #, c-format
-msgid "\"%s\" expects all arguments to be strings or one and only one argument to be a boolean false (#f)"
-msgstr "«%s» предполагает, что все аргументы - строки или единственный аргумент - логическая ложь (#f)"
+msgid ""
+"\"%s\" expects all arguments to be strings or one and only one argument to "
+"be a boolean false (#f)"
+msgstr ""
+"«%s» предполагает, что все аргументы - строки или единственный аргумент - "
+"логическая ложь (#f)"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1389
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1395
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
-msgstr "«%s» предусматривает, что аргумент 1 должен быть строкой даты в формате ISO 8601"
+msgstr ""
+"«%s» предусматривает, что аргумент 1 должен быть строкой даты в формате ISO "
+"8601"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1450
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1456
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "«%s» предполагает целое число в качестве аргумента 2"
 
-#: ../calendar/libedata-cal/e-data-cal.c:404
+#: ../calendar/libedata-cal/e-data-cal.c:412
 msgid "Unsupported method"
 msgstr "Неподдерживаемый метод"
 
-#: ../calendar/libedata-cal/e-data-cal.c:407
+#: ../calendar/libedata-cal/e-data-cal.c:415
 msgid "Calendar does not exist"
 msgstr "Календарь не существует"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1495
+#: ../calendar/libedata-cal/e-data-cal.c:1503
 msgid "Cannot open calendar: "
 msgstr "Невозможно открыть календарь: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1532
+#: ../calendar/libedata-cal/e-data-cal.c:1540
 msgid "Cannot refresh calendar: "
 msgstr "Невозможно обновить календарь: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1573
+#: ../calendar/libedata-cal/e-data-cal.c:1581
 msgid "Cannot retrieve calendar object path: "
 msgstr "Невозможно получить путь объекта календаря: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1625
+#: ../calendar/libedata-cal/e-data-cal.c:1633
 msgid "Cannot retrieve calendar object list: "
 msgstr "Невозможно получить список объектов календаря: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1676
+#: ../calendar/libedata-cal/e-data-cal.c:1684
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "Невозможно получить список свободных/занятых дней календаря: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1719
+#: ../calendar/libedata-cal/e-data-cal.c:1727
 msgid "Cannot create calendar object: "
 msgstr "Невозможно создать объект календаря: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1787
+#: ../calendar/libedata-cal/e-data-cal.c:1795
 msgid "Cannot modify calendar object: "
 msgstr "Невозможно изменить объект календаря: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1865
+#: ../calendar/libedata-cal/e-data-cal.c:1873
 msgid "Cannot remove calendar object: "
 msgstr "Невозможно удалить объект календаря: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1951
+#: ../calendar/libedata-cal/e-data-cal.c:1959
 msgid "Cannot receive calendar objects: "
 msgstr "Невозможно получить объекты календаря: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1994
+#: ../calendar/libedata-cal/e-data-cal.c:2002
 msgid "Cannot send calendar objects: "
 msgstr "Невозможно отправить объекты календаря: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2046
+#: ../calendar/libedata-cal/e-data-cal.c:2054
 msgid "Could not retrieve attachment uris: "
 msgstr "Невозможно получить uri вложений: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2091
+#: ../calendar/libedata-cal/e-data-cal.c:2099
 msgid "Could not discard reminder: "
 msgstr "Не удалось снять уведомление: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2132
+#: ../calendar/libedata-cal/e-data-cal.c:2140
 msgid "Could not retrieve calendar time zone: "
 msgstr "Невозможно получить часовой пояс календаря: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2172
+#: ../calendar/libedata-cal/e-data-cal.c:2180
 msgid "Could not add calendar time zone: "
 msgstr "Невозможно добавить часовой пояс календаря: "
 
-#: ../camel/camel-cipher-context.c:208
+#: ../camel/camel-cipher-context.c:200
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "Подпись не поддерживается этим шифром"
 
-#: ../camel/camel-cipher-context.c:221
+#: ../camel/camel-cipher-context.c:213
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "Проверка не поддерживается этим шифром"
 
-#: ../camel/camel-cipher-context.c:237
+#: ../camel/camel-cipher-context.c:229
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "Шифрование не поддерживается этим шифром"
 
-#: ../camel/camel-cipher-context.c:251
+#: ../camel/camel-cipher-context.c:243
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "Расшифровка не поддерживается этим шифром"
 
-#: ../camel/camel-cipher-context.c:264
-#, c-format
-msgid "You may not import keys with this cipher"
-msgstr "Импорт ключей не поддерживается этим шифром"
-
-#: ../camel/camel-cipher-context.c:278
-#, c-format
-msgid "You may not export keys with this cipher"
-msgstr "Экспорт ключей не поддерживается этим шифром"
-
-#: ../camel/camel-cipher-context.c:819
+#: ../camel/camel-cipher-context.c:359
 msgid "Signing message"
 msgstr "Сообщение подписывается"
 
-#: ../camel/camel-cipher-context.c:1060
+#: ../camel/camel-cipher-context.c:649
 msgid "Encrypting message"
 msgstr "Сообщение шифруется"
 
-#: ../camel/camel-cipher-context.c:1187
+#: ../camel/camel-cipher-context.c:821
 msgid "Decrypting message"
 msgstr "Сообщение расшифровывается"
 
-#: ../camel/camel-data-cache.c:181
+#: ../camel/camel-data-cache.c:179
 #, c-format
 msgid "Unable to create cache path"
 msgstr "Не удалось создать путь для кэша"
 
-#: ../camel/camel-data-cache.c:440
+#: ../camel/camel-data-cache.c:449
 msgid "Empty cache file"
 msgstr "Кэш-файл пуст"
 
-#: ../camel/camel-data-cache.c:509
+#: ../camel/camel-data-cache.c:522
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Не удалось удалить кэшированный элемент: %s: %s"
 
-#: ../camel/camel-disco-diary.c:207
-#, c-format
-msgid ""
-"Could not write log entry: %s\n"
-"Further operations on this server will not be replayed when you\n"
-"reconnect to the network."
-msgstr ""
-"Не удалось произвести запись в журнал: %s\n"
-"Дальнейшие операции не будут записаны и, соответственно, не будут\n"
-"воспроизведены после подключения к серверу."
-
-#: ../camel/camel-disco-diary.c:279
-#, c-format
-msgid ""
-"Could not open '%s':\n"
-"%s\n"
-"Changes made to this folder will not be resynchronized."
-msgstr ""
-"Не удалось открыть «%s»:\n"
-"%s\n"
-"Изменения, сделанные в этой папке, не будут синхронизированы."
-
-#: ../camel/camel-disco-diary.c:326
-msgid "Resynchronizing with server"
-msgstr "Синхронизация с сервером"
-
-#: ../camel/camel-disco-folder.c:76
-#: ../camel/camel-offline-folder.c:93
-msgid "Downloading new messages for offline mode"
-msgstr "Новые сообщения загружаются для автономной работы"
-
-#: ../camel/camel-disco-folder.c:422
-#, c-format
-msgid "Preparing folder '%s' for offline"
-msgstr "Подготовка папки «%s» для автономной работы"
-
-#: ../camel/camel-disco-folder.c:489
-#: ../camel/camel-offline-folder.c:336
-msgid "Copy folder content locally for _offline operation"
-msgstr "Скопировать содержимое папки на локальную машину для _автономной работы"
-
-#: ../camel/camel-disco-store.c:518
-#: ../camel/camel-imapx-store.c:618
-#: ../camel/camel-imapx-store.c:2242
-#: ../camel/providers/pop3/camel-pop3-folder.c:596
-#: ../camel/providers/pop3/camel-pop3-folder.c:746
-#: ../camel/providers/pop3/camel-pop3-folder.c:987
-#: ../camel/providers/pop3/camel-pop3-folder.c:1216
-#: ../camel/providers/pop3/camel-pop3-store.c:291
-#: ../camel/providers/pop3/camel-pop3-store.c:519
-#: ../camel/providers/pop3/camel-pop3-store.c:567
-#: ../camel/providers/pop3/camel-pop3-store.c:659
-#: ../camel/providers/pop3/camel-pop3-store.c:1059
-#, c-format
-msgid "You must be working online to complete this operation"
-msgstr "Для завершения данной операции необходимо подключение к сети"
-
-#: ../camel/camel-file-utils.c:732
-#, c-format
-msgid "Canceled"
-msgstr "Отменено"
-
-#: ../camel/camel-filter-driver.c:916
-#: ../camel/camel-filter-search.c:797
+#: ../camel/camel-filter-driver.c:914 ../camel/camel-filter-search.c:795
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Сбой при создании дочернего процесса «%s»: %s"
 
-#: ../camel/camel-filter-driver.c:964
+#: ../camel/camel-filter-driver.c:962
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Неверный поток сообщений получен из %s: %s"
 
-#: ../camel/camel-filter-driver.c:1171
-#: ../camel/camel-filter-driver.c:1180
+#: ../camel/camel-filter-driver.c:1169 ../camel/camel-filter-driver.c:1178
 msgid "Syncing folders"
 msgstr "Синхронизация папок"
 
-#: ../camel/camel-filter-driver.c:1278
+#: ../camel/camel-filter-driver.c:1276
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Не удалось разобрать фильтр: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1289
+#: ../camel/camel-filter-driver.c:1287
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Ошибка выполнения фильтра: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1385
+#: ../camel/camel-filter-driver.c:1383
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "Не удалось открыть папку спула"
 
-#: ../camel/camel-filter-driver.c:1397
+#: ../camel/camel-filter-driver.c:1395
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "Не удалось обработать папку спула"
 
-#: ../camel/camel-filter-driver.c:1420
+#: ../camel/camel-filter-driver.c:1418
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Получение сообщения %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1429
-#: ../camel/camel-filter-driver.c:1451
+#: ../camel/camel-filter-driver.c:1427 ../camel/camel-filter-driver.c:1449
 #, c-format
 msgid "Failed on message %d"
 msgstr "Сбой на сообщении %d"
 
-#: ../camel/camel-filter-driver.c:1470
-#: ../camel/camel-filter-driver.c:1584
+#: ../camel/camel-filter-driver.c:1468 ../camel/camel-filter-driver.c:1582
 msgid "Syncing folder"
 msgstr "Синхронизация папки"
 
-#: ../camel/camel-filter-driver.c:1475
-#: ../camel/camel-filter-driver.c:1592
+#: ../camel/camel-filter-driver.c:1473 ../camel/camel-filter-driver.c:1590
 msgid "Complete"
 msgstr "Завершена"
 
-#: ../camel/camel-filter-driver.c:1538
+#: ../camel/camel-filter-driver.c:1536
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Получение сообщения %d из %d"
 
-#: ../camel/camel-filter-driver.c:1556
+#: ../camel/camel-filter-driver.c:1554
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Сбой на сообщении %d из %d"
 
-#: ../camel/camel-filter-driver.c:1752
-#: ../camel/camel-filter-driver.c:1779
+#: ../camel/camel-filter-driver.c:1750 ../camel/camel-filter-driver.c:1777
 #, c-format
 msgid "Execution of filter '%s' failed: "
 msgstr "Ошибка выполнения фильтра «%s»: "
 
-#: ../camel/camel-filter-driver.c:1769
+#: ../camel/camel-filter-driver.c:1767
 #, c-format
 msgid "Error parsing filter '%s': %s: %s"
 msgstr "Ошибка разбора фильтра «%s»: %s; %s"
 
-#: ../camel/camel-filter-driver.c:1788
+#: ../camel/camel-filter-driver.c:1786
 #, c-format
 msgid "Error executing filter '%s': %s: %s"
 msgstr "Ошибка выполнения фильтра «%s»: %s; %s"
 
-#: ../camel/camel-filter-search.c:138
+#: ../camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Сбой при получении сообщения"
 
-#: ../camel/camel-filter-search.c:537
+#: ../camel/camel-filter-search.c:535
 msgid "Invalid arguments to (system-flag)"
 msgstr "Недопустимые аргументы для system-flag"
 
-#: ../camel/camel-filter-search.c:555
+#: ../camel/camel-filter-search.c:553
 msgid "Invalid arguments to (user-tag)"
 msgstr "Недопустимые аргументы для user-tag"
 
-#: ../camel/camel-filter-search.c:1046
-#: ../camel/camel-filter-search.c:1055
+#: ../camel/camel-filter-search.c:1044 ../camel/camel-filter-search.c:1053
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Ошибка выполнения поиска фильтра: %s: %s"
 
-#: ../camel/camel-folder.c:311
+#: ../camel/camel-folder.c:300
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
@@ -1987,7 +2075,7 @@ msgstr[0] "Изучение нового спам-сообщения в «%s»"
 msgstr[1] "Изучение новых спам-сообщений в «%s»"
 msgstr[2] "Изучение новых спам-сообщений в «%s»"
 
-#: ../camel/camel-folder.c:351
+#: ../camel/camel-folder.c:340
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
@@ -1995,7 +2083,7 @@ msgstr[0] "Изучение нового сообщения в «%s»"
 msgstr[1] "Изучение новых сообщений в «%s»"
 msgstr[2] "Изучение новых сообщений в «%s»"
 
-#: ../camel/camel-folder.c:399
+#: ../camel/camel-folder.c:388
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
@@ -2003,43 +2091,42 @@ msgstr[0] "Фильтрация нового сообщения в «%s»"
 msgstr[1] "Фильтрация новых сообщений в «%s»"
 msgstr[2] "Фильтрация новых сообщений в «%s»"
 
-#: ../camel/camel-folder.c:1009
-#: ../camel/providers/local/camel-maildir-folder.c:321
+#: ../camel/camel-folder.c:988
+#: ../camel/providers/local/camel-maildir-folder.c:319
 msgid "Moving messages"
 msgstr "Перемещение сообщений"
 
-#: ../camel/camel-folder.c:1012
+#: ../camel/camel-folder.c:991
 msgid "Copying messages"
 msgstr "Копирование сообщений"
 
-#: ../camel/camel-folder.c:1332
+#: ../camel/camel-folder.c:1033
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr "Информация о квоте не поддерживается для папки «%s»"
 
-#: ../camel/camel-folder.c:3578
+#: ../camel/camel-folder.c:2847
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Уничтожение папки «%s»"
 
-#: ../camel/camel-folder.c:3810
+#: ../camel/camel-folder.c:2975
 #, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "Получение сообщения «%s» в %s"
 
-#: ../camel/camel-folder.c:3965
+#: ../camel/camel-folder.c:3166
 #, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "Получение информации о квоте для «%s»"
 
-#: ../camel/camel-folder.c:4205
+#: ../camel/camel-folder.c:3466
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Обновление папки «%s»"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:886
-#: ../camel/camel-folder-search.c:929
+#: ../camel/camel-folder-search.c:886 ../camel/camel-folder-search.c:929
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) требует единственного логического результата"
@@ -2051,8 +2138,7 @@ msgid "(%s) not allowed inside %s"
 msgstr "(%s) запрещено в %s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:971
-#: ../camel/camel-folder-search.c:979
+#: ../camel/camel-folder-search.c:971 ../camel/camel-folder-search.c:979
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) требует строку соответствия"
@@ -2069,8 +2155,7 @@ msgstr "(%s) ожидает результат в виде массива"
 msgid "(%s) requires the folder set"
 msgstr "(%s) требует набор папок"
 
-#: ../camel/camel-folder-search.c:1930
-#: ../camel/camel-folder-search.c:2096
+#: ../camel/camel-folder-search.c:1931 ../camel/camel-folder-search.c:2097
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2079,8 +2164,7 @@ msgstr ""
 "Ошибка в регулярном выражении «%s»:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:1942
-#: ../camel/camel-folder-search.c:2108
+#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2089,19 +2173,18 @@ msgstr ""
 "Ошибка при выполнении выражения поиска «%s»:\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:730
-#: ../camel/camel-gpg-context.c:735
-#: ../camel/camel-gpg-context.c:1398
+#: ../camel/camel-gpg-context.c:721 ../camel/camel-gpg-context.c:726
+#: ../camel/camel-gpg-context.c:1383
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Сбой при исполнении gpg: %s"
 
-#: ../camel/camel-gpg-context.c:735
-#: ../camel/providers/smtp/camel-smtp-transport.c:914
+#: ../camel/camel-gpg-context.c:726
+#: ../camel/providers/smtp/camel-smtp-transport.c:924
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: ../camel/camel-gpg-context.c:800
+#: ../camel/camel-gpg-context.c:791
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -2112,25 +2195,24 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:836
+#: ../camel/camel-gpg-context.c:827
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "Ошибка при обработке подсказки gpg userid."
 
-#: ../camel/camel-gpg-context.c:861
-#: ../camel/camel-gpg-context.c:876
+#: ../camel/camel-gpg-context.c:852 ../camel/camel-gpg-context.c:867
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "Ошибка при обработке запроса парольной фразы gpg."
 
-#: ../camel/camel-gpg-context.c:897
+#: ../camel/camel-gpg-context.c:888
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
 "SmartCard: \"%s\""
 msgstr "Для разблокирования смарткарты необходимо ввести PIN: «%s»"
 
-#: ../camel/camel-gpg-context.c:901
+#: ../camel/camel-gpg-context.c:892
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2139,78 +2221,74 @@ msgstr ""
 "Введите ключевую фразу, чтобы разблокировать\n"
 "ключ пользователя: «%s»"
 
-#: ../camel/camel-gpg-context.c:907
+#: ../camel/camel-gpg-context.c:898
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "Неожиданный запрос от GnuPG для «%s»"
 
-#: ../camel/camel-gpg-context.c:919
-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."
-msgstr "Зашифрованные данные не содержат сведений о получателе. Для каждого закрытого ключа будет предложено 
ввести пароль."
+#: ../camel/camel-gpg-context.c:910
+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."
+msgstr ""
+"Зашифрованные данные не содержат сведений о получателе. Для каждого "
+"закрытого ключа будет предложено ввести пароль."
 
-#: ../camel/camel-gpg-context.c:950
-#: ../camel/camel-net-utils.c:524
-#: ../camel/camel-tcp-stream-raw.c:268
-#: ../camel/providers/nntp/camel-nntp-summary.c:402
-#: ../libedataserver/e-client.c:150
+#: ../camel/camel-gpg-context.c:941 ../camel/camel-net-utils.c:522
+#: ../camel/providers/nntp/camel-nntp-summary.c:401
+#: ../libedataserver/e-client.c:158
 #, c-format
 msgid "Cancelled"
 msgstr "Отменено"
 
-#: ../camel/camel-gpg-context.c:971
+#: ../camel/camel-gpg-context.c:962
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr "Сбой при разблокировании секретного ключа: указано 3 некорректных парольных фразы."
+msgstr ""
+"Сбой при разблокировании секретного ключа: указано 3 некорректных парольных "
+"фразы."
 
-#: ../camel/camel-gpg-context.c:984
+#: ../camel/camel-gpg-context.c:975
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Неожиданный ответ от GnuPG: %s"
 
-#: ../camel/camel-gpg-context.c:1115
+#: ../camel/camel-gpg-context.c:1106
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
-msgstr "Не удалось зашифровать это сообщение: Не определены корректные получатели"
+msgstr ""
+"Не удалось зашифровать это сообщение: Не определены корректные получатели"
 
-#: ../camel/camel-gpg-context.c:1665
-#: ../camel/camel-smime-context.c:846
+#: ../camel/camel-gpg-context.c:1658 ../camel/camel-smime-context.c:844
 msgid "Could not generate signing data: "
 msgstr "Не удалось создать данные подписи: "
 
-#: ../camel/camel-gpg-context.c:1714
-#: ../camel/camel-gpg-context.c:1918
-#: ../camel/camel-gpg-context.c:2028
-#: ../camel/camel-gpg-context.c:2179
-#: ../camel/camel-gpg-context.c:2279
-#: ../camel/camel-gpg-context.c:2327
+#: ../camel/camel-gpg-context.c:1708 ../camel/camel-gpg-context.c:1920
+#: ../camel/camel-gpg-context.c:2030 ../camel/camel-gpg-context.c:2179
 msgid "Failed to execute gpg."
 msgstr "Сбой при исполнении gpg."
 
-#: ../camel/camel-gpg-context.c:1793
-#: ../camel/camel-gpg-context.c:1801
-#: ../camel/camel-gpg-context.c:1809
-#: ../camel/camel-gpg-context.c:1829
-#: ../camel/camel-smime-context.c:973
-#: ../camel/camel-smime-context.c:987
+#: ../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
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Не удалось проверить подпись сообщения: Неверный формат сообщения"
 
-#: ../camel/camel-gpg-context.c:1871
+#: ../camel/camel-gpg-context.c:1873
 msgid "Cannot verify message signature: "
 msgstr "Не удалось проверить подпись сообщения: "
 
-#: ../camel/camel-gpg-context.c:1994
+#: ../camel/camel-gpg-context.c:1996
 msgid "Could not generate encrypting data: "
 msgstr "Не удалось создать данные шифрования: "
 
-#: ../camel/camel-gpg-context.c:2047
+#: ../camel/camel-gpg-context.c:2049
 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:2105 ../camel/camel-gpg-context.c:2114
 #: ../camel/camel-gpg-context.c:2137
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
@@ -2221,513 +2299,206 @@ msgstr "Не удалось декодировать сообщение: Нев
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Сбой при декодировании части MIME: ошибка протокола"
 
-#: ../camel/camel-gpg-context.c:2220
-#: ../camel/camel-smime-context.c:1287
+#: ../camel/camel-gpg-context.c:2220 ../camel/camel-smime-context.c:1289
 msgid "Encrypted content"
 msgstr "Зашифрованное содержимое"
 
-#: ../camel/camel-imapx-folder.c:643
-#, c-format
-msgid "No quota information available for folder '%s'"
-msgstr "Для папки «%s» нет информации о квоте"
-
-#: ../camel/camel-imapx-folder.c:727
-#: ../camel/camel-imapx-folder.c:801
-#, c-format
-msgid "No destination folder specified"
-msgstr "Не указана целевая папка"
-
-#: ../camel/camel-imapx-folder.c:747
-msgid "Unable to move junk messages"
-msgstr "Не удалось переместить сообщения, содержащие спам"
-
-#: ../camel/camel-imapx-folder.c:821
-msgid "Unable to move deleted messages"
-msgstr "Не удалось переместить удалённые сообщения"
-
-#: ../camel/camel-imapx-folder.c:1008
-#: ../camel/providers/nntp/camel-nntp-folder.c:794
-msgid "Apply message _filters to this folder"
-msgstr "Применять _фильтры сообщений к этой папке"
-
-#: ../camel/camel-imapx-folder.c:1114
-#, c-format
-msgid "Could not create folder summary for %s"
-msgstr "Не удалось создать краткую информацию по папке %s"
-
-#: ../camel/camel-imapx-folder.c:1123
-#, c-format
-msgid "Could not create cache for %s: "
-msgstr "Не удалось создать кэш для %s:"
-
-#: ../camel/camel-imapx-server.c:1333
-msgid "Server disconnected"
-msgstr "Сервер отключился"
-
-#: ../camel/camel-imapx-server.c:1756
-msgid "Error writing to cache stream"
-msgstr "Ошибка записи в поток кэша"
-
-#: ../camel/camel-imapx-server.c:2439
-#, c-format
-msgid ""
-"Alert from IMAP server %s:\n"
-"%s"
-msgstr ""
-"Предупреждение от сервера IMAP %s:\n"
-"%s"
-
-#: ../camel/camel-imapx-server.c:3035
-#, c-format
-msgid "Not authenticated"
-msgstr "Не удалось выполнить аутентификацию"
-
-#: ../camel/camel-imapx-server.c:3113
-msgid "Error performing IDLE"
-msgstr "Ошибка выполнения команды IDLE"
-
-#: ../camel/camel-imapx-server.c:4005
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Не удалось подключиться к IMAP-серверу %s в защищенном режиме:%s"
-
-#: ../camel/camel-imapx-server.c:4006
-#: ../camel/providers/smtp/camel-smtp-transport.c:203
-msgid "STARTTLS not supported"
-msgstr "STARTTLS не поддерживается"
-
-#: ../camel/camel-imapx-server.c:4047
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: "
-msgstr "Не удалось подключиться к IMAP-серверу %s в защищённом режиме: "
-
-#: ../camel/camel-imapx-server.c:4125
-#, c-format
-msgid "IMAP server %s does not support %s authentication"
-msgstr "Сервер IMAP %s не поддерживает аутентификацию %s"
-
-#: ../camel/camel-imapx-server.c:4136
-#: ../camel/camel-session.c:494
-#: ../camel/providers/pop3/camel-pop3-store.c:303
-#: ../camel/providers/pop3/camel-pop3-store.c:744
-#: ../camel/providers/smtp/camel-smtp-transport.c:505
-#, c-format
-msgid "No support for %s authentication"
-msgstr "Аутентификация %s не поддерживается"
-
-#: ../camel/camel-imapx-server.c:4155
-#: ../camel/providers/nntp/camel-nntp-store.c:409
-#: ../camel/providers/nntp/camel-nntp-store.c:595
-msgid "Cannot authenticate without a username"
-msgstr "Невозможно выполнить проверку подлинности без имени пользователя"
-
-#: ../camel/camel-imapx-server.c:4164
-#: ../camel/providers/nntp/camel-nntp-store.c:604
-#: ../camel/providers/pop3/camel-pop3-store.c:669
-#: ../camel/providers/pop3/camel-pop3-store.c:689
-msgid "Authentication password not available"
-msgstr "Пароль аутентификации недоступен"
-
-#: ../camel/camel-imapx-server.c:4377
-msgid "Error fetching message"
-msgstr "Ошибка при получении сообщения"
-
-#: ../camel/camel-imapx-server.c:4427
-#: ../camel/camel-imapx-server.c:4434
-msgid "Failed to close the tmp stream"
-msgstr "Сбой при закрытии временного потока"
-
-#: ../camel/camel-imapx-server.c:4463
-msgid "Failed to copy the tmp file"
-msgstr "Сбой при копировании временного файла"
-
-#: ../camel/camel-imapx-server.c:4588
-msgid "Error moving messages"
-msgstr "Ошибка при перемещении сообщений"
-
-#: ../camel/camel-imapx-server.c:4592
-msgid "Error copying messages"
-msgstr "Ошибка при копировании сообщений"
-
-#: ../camel/camel-imapx-server.c:4759
-msgid "Error appending message"
-msgstr "Ошибка при присоединении сообщения"
-
-#: ../camel/camel-imapx-server.c:4956
-msgid "Error fetching message headers"
-msgstr "Ошибка при получении заголовков сообщений"
-
-#: ../camel/camel-imapx-server.c:5119
-msgid "Error retrieving message"
-msgstr "Ошибка при получении сообщения"
-
-#: ../camel/camel-imapx-server.c:5250
-#: ../camel/camel-imapx-server.c:5471
-#, c-format
-msgid "Fetching summary information for new messages in '%s'"
-msgstr "Получение краткой информации о новых сообщениях «%s»"
-
-#: ../camel/camel-imapx-server.c:5310
-#, c-format
-msgid "Scanning for changed messages in '%s'"
-msgstr "Поиск изменённых сообщений в «%s»"
-
-#: ../camel/camel-imapx-server.c:5365
-msgid "Error fetching new messages"
-msgstr "Ошибка при получении новых сообщений"
-
-#: ../camel/camel-imapx-server.c:5577
-msgid "Error while fetching messages"
-msgstr "Ошибка при получении сообщений"
-
-#: ../camel/camel-imapx-server.c:5585
-#: ../camel/camel-imapx-server.c:5618
-#, c-format
-msgid "Fetching summary information for %d message in '%s'"
-msgid_plural "Fetching summary information for %d messages in '%s'"
-msgstr[0] "Получение краткой информации об %d новом сообщении в «%s»"
-msgstr[1] "Получение краткой информации о %d новых сообщениях в «%s»"
-msgstr[2] "Получение краткой информации о %d новых сообщениях в «%s»"
-
-#: ../camel/camel-imapx-server.c:5752
-#: ../camel/camel-imapx-server.c:5782
-msgid "Error refreshing folder"
-msgstr "Ошибка при обновлении папки"
-
-#: ../camel/camel-imapx-server.c:5904
-msgid "Error expunging message"
-msgstr "Ошибка уничтожения сообщений"
-
-#: ../camel/camel-imapx-server.c:6012
-msgid "Error fetching folders"
-msgstr "Ошибка при получении папок"
-
-#: ../camel/camel-imapx-server.c:6095
-msgid "Error subscribing to folder"
-msgstr "Ошибка подписывания на папку"
-
-#: ../camel/camel-imapx-server.c:6157
-msgid "Error creating folder"
-msgstr "Ошибка при создании папки"
-
-#: ../camel/camel-imapx-server.c:6210
-msgid "Error deleting folder"
-msgstr "Ошибка при удалении папки"
-
-#: ../camel/camel-imapx-server.c:6281
-msgid "Error renaming folder"
-msgstr "Ошибка при переименовании папки"
-
-#: ../camel/camel-imapx-server.c:6355
-msgid "Error retrieving quota information"
-msgstr "Ошибка получения информации о квоте"
-
-#: ../camel/camel-imapx-server.c:6413
-msgid "Search failed"
-msgstr "Ошибка поиска"
-
-#: ../camel/camel-imapx-server.c:6475
-msgid "Error performing NOOP"
-msgstr "Ошибка выполнения команды NOOP"
-
-#: ../camel/camel-imapx-server.c:6583
-msgid "Error syncing changes"
-msgstr "Ошибка при синхронизации изменений"
-
-#: ../camel/camel-imapx-server.c:6883
-msgid "Lost connection to IMAP server"
-msgstr "Соединение с сервером IMAP разорвано"
-
-#: ../camel/camel-imapx-server.c:7330
-#, c-format
-msgid "Cannot get message with message ID %s: %s"
-msgstr "Не удалось получить сообщение с идентификатором %s: %s"
-
-#: ../camel/camel-imapx-server.c:7331
-msgid "No such message available."
-msgstr "Нет такого сообщения."
-
-#: ../camel/camel-imapx-server.c:7492
-#: ../camel/camel-imapx-server.c:7507
-msgid "Cannot create spool file: "
-msgstr "Не удалось создать файл спула: "
-
-#: ../camel/camel-imapx-server.c:8212
-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/camel-imapx-store.c:203
-#: ../camel/camel-imapx-store.c:1143
-#: ../camel/providers/local/camel-maildir-folder.c:473
-#: ../camel/providers/local/camel-maildir-store.c:316
-#: ../camel/providers/local/camel-maildir-store.c:752
-#: ../camel/providers/local/camel-maildir-store.c:758
-#: ../camel/providers/local/camel-maildir-store.c:842
-#: ../camel/providers/local/camel-spool-store.c:393
-msgid "Inbox"
-msgstr "Входящие"
-
-#: ../camel/camel-imapx-store.c:487
-#, c-format
-msgid "IMAP server %s"
-msgstr "Сервер IMAP %s"
-
-#: ../camel/camel-imapx-store.c:490
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "Сервис IMAP для %s на %s"
-
-#: ../camel/camel-imapx-store.c:591
-#: ../camel/providers/nntp/camel-nntp-provider.c:95
-#: ../camel/providers/pop3/camel-pop3-provider.c:83
-msgid "Password"
-msgstr "Пароль"
-
-#: ../camel/camel-imapx-store.c:593
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "Подключение к серверу IMAP будет производиться с использованием незашифрованного пароля."
-
-#: ../camel/camel-imapx-store.c:687
-#, c-format
-msgid "No such folder %s"
-msgstr "Нет такой папки %s"
-
-#: ../camel/camel-imapx-store.c:1413
-#, c-format
-msgid "Retrieving folder list for %s"
-msgstr "Получение списка папок для %s"
-
-#: ../camel/camel-imapx-store.c:1783
-#, c-format
-msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Недопустимое имя папки «%s»: имя содержит символ «%c»"
-
-#: ../camel/camel-imapx-store.c:1794
-#, c-format
-msgid "Unknown parent folder: %s"
-msgstr "Неизвестная родительская папка: %s"
-
-#: ../camel/camel-imapx-store.c:1804
-#, c-format
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "Эта папка не может содержать подпапки"
-
-#: ../camel/camel-imapx-stream.c:98
-#, c-format
-msgid "Source stream returned no data"
-msgstr "Поток не вернул данные"
-
-#: ../camel/camel-imapx-stream.c:107
-#, c-format
-msgid "Source stream unavailable"
-msgstr "Поток недоступен"
-
-#: ../camel/camel-junk-filter.c:168
+#: ../camel/camel-junk-filter.c:167
 msgid "Synchronizing junk database"
 msgstr "Синхронизация базы данных спама"
 
-#: ../camel/camel-lock.c:102
+#: ../camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Не удалось создать файл блокировки для %s: %s"
 
-#: ../camel/camel-lock.c:145
+#: ../camel/camel-lock.c:153
 #, c-format
 msgid "Timed out trying to get lock file on %s.  Try again later."
 msgstr "Превышено время ожидания  блокировки файла %s. Попробуйте позже."
 
-#: ../camel/camel-lock.c:205
+#: ../camel/camel-lock.c:215
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Не удалось получить блокировку используя fcntl(2): %s"
 
-#: ../camel/camel-lock.c:272
+#: ../camel/camel-lock.c:282
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Не удалось получить блокировку используя flock(2): %s"
 
-#: ../camel/camel-lock-client.c:106
+#: ../camel/camel-lock-client.c:107
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Не удалось создать канал к блокиратору: %s"
 
-#: ../camel/camel-lock-client.c:130
+#: ../camel/camel-lock-client.c:131
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Не удалось запустить блокиратор: %s"
 
-#: ../camel/camel-lock-client.c:211
-#: ../camel/camel-lock-client.c:239
+#: ../camel/camel-lock-client.c:218 ../camel/camel-lock-client.c:246
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "Не удалось заблокировать «%s»: ошибка протокола с блокиратором"
 
-#: ../camel/camel-lock-client.c:227
+#: ../camel/camel-lock-client.c:234
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Не удалось заблокировать «%s»"
 
-#: ../camel/camel-movemail.c:105
+#: ../camel/camel-movemail.c:109
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Не удалось проверить почтовый файл %s: %s"
 
-#: ../camel/camel-movemail.c:119
+#: ../camel/camel-movemail.c:123
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Не удалось открыть почтовый файл %s: %s"
 
-#: ../camel/camel-movemail.c:129
+#: ../camel/camel-movemail.c:133
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Не удалось открыть временный почтовый файл %s: %s"
 
-#: ../camel/camel-movemail.c:159
+#: ../camel/camel-movemail.c:163
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Сбой при сохранении почты во временном файле %s: %s"
 
-#: ../camel/camel-movemail.c:193
+#: ../camel/camel-movemail.c:197
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Не удалось создать канал: %s"
 
-#: ../camel/camel-movemail.c:207
+#: ../camel/camel-movemail.c:211
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Не удалось запустить: %s"
 
-#: ../camel/camel-movemail.c:245
+#: ../camel/camel-movemail.c:249
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Сбой программы разбора почты: %s"
 
-#: ../camel/camel-movemail.c:246
+#: ../camel/camel-movemail.c:250
 msgid "(Unknown error)"
 msgstr "(Неизвестная ошибка)"
 
-#: ../camel/camel-movemail.c:273
+#: ../camel/camel-movemail.c:277
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Ошибка при чтении почтового файла: %s"
 
-#: ../camel/camel-movemail.c:286
+#: ../camel/camel-movemail.c:290
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Ошибка сохранения временного почтового файла: %s"
 
-#: ../camel/camel-movemail.c:493
-#: ../camel/camel-movemail.c:562
+#: ../camel/camel-movemail.c:497 ../camel/camel-movemail.c:566
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Ошибка копирования временного почтового файла: %s"
 
-#: ../camel/camel-multipart-signed.c:297
+#: ../camel/camel-multipart-signed.c:279
 #, c-format
 msgid "No content available"
 msgstr "Содержимое недоступно"
 
-#: ../camel/camel-multipart-signed.c:305
+#: ../camel/camel-multipart-signed.c:287
 #, c-format
 msgid "No signature available"
 msgstr "Подпись недоступна"
 
-#: ../camel/camel-multipart-signed.c:689
+#: ../camel/camel-multipart-signed.c:636
 #, c-format
 msgid "parse error"
 msgstr "Ошибка обработки"
 
-#: ../camel/camel-net-utils.c:704
+#: ../camel/camel-net-utils.c:702
 #, c-format
 msgid "Resolving: %s"
 msgstr "Поиск узла: %s"
 
-#: ../camel/camel-net-utils.c:727
+#: ../camel/camel-net-utils.c:725
 msgid "Host lookup failed"
 msgstr "Узел не найден"
 
-#: ../camel/camel-net-utils.c:733
+#: ../camel/camel-net-utils.c:731
 #, c-format
 msgid "Host lookup '%s' failed. Check your host name for spelling errors."
 msgstr "Узел «%s» не найден. Проверьте правильность имени узла."
 
-#: ../camel/camel-net-utils.c:737
+#: ../camel/camel-net-utils.c:735
 #, c-format
 msgid "Host lookup '%s' failed: %s"
 msgstr "Узел «%s» не найден: %s"
 
-#: ../camel/camel-net-utils.c:858
-msgid "Resolving address"
-msgstr "Поиск адреса"
-
-#: ../camel/camel-net-utils.c:879
-msgid "Name lookup failed"
-msgstr "Имя узла не найдено"
-
-#: ../camel/camel-net-utils.c:886
-msgid "Name lookup failed. Check your host name for spelling errors."
-msgstr "Имя узла не найдено. Проверьте правильность имени узла."
-
-#: ../camel/camel-net-utils.c:890
-#, c-format
-msgid "Name lookup failed: %s"
-msgstr "Имя узла не найдено: %s"
+#: ../camel/camel-network-service.c:1009
+#, fuzzy
+#| msgid "No quota information available for folder '%s'"
+msgid "No host information available"
+msgstr "Для папки «%s» нет информации о квоте"
 
-#: ../camel/camel-network-service.c:350
-#, c-format
-msgid "Could not connect to '%s:%s': "
-msgstr "Не удалось подключиться к «%s:%s»: "
+#: ../camel/camel-offline-folder.c:90
+msgid "Downloading new messages for offline mode"
+msgstr "Новые сообщения загружаются для автономной работы"
 
-#: ../camel/camel-offline-folder.c:212
+#: ../camel/camel-offline-folder.c:209
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "Синхронизация сообщений в папке «%s» на диск"
 
-#: ../camel/camel-provider.c:58
+#: ../camel/camel-offline-folder.c:266
+msgid "Copy folder content locally for _offline operation"
+msgstr ""
+"Скопировать содержимое папки на локальную машину для _автономной работы"
+
+#: ../camel/camel-provider.c:56
 msgid "Virtual folder email provider"
 msgstr "Провайдер виртуальных папок эл. почты"
 
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:58
 msgid "For reading mail as a query of another set of folders"
 msgstr "Для чтения почты по запросу к другому набору папок"
 
-#: ../camel/camel-provider.c:263
+#: ../camel/camel-provider.c:261
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
-msgstr "Не удалось загрузить %s: Загрузка модулей не поддерживается в этой системе."
+msgstr ""
+"Не удалось загрузить %s: Загрузка модулей не поддерживается в этой системе."
 
-#: ../camel/camel-provider.c:272
+#: ../camel/camel-provider.c:270
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Не удалось загрузить %s: %s"
 
-#: ../camel/camel-provider.c:281
+#: ../camel/camel-provider.c:279
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Не удалось загрузить %s: в модуле нет инициализирующего кода."
 
-#: ../camel/camel-provider.c:429
-#: ../camel/camel-session.c:406
+#: ../camel/camel-provider.c:427 ../camel/camel-session.c:424
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "Провайдер для протокола «%s» не доступен"
 
-#: ../camel/camel-sasl-anonymous.c:35
-#: ../camel/providers/nntp/camel-nntp-provider.c:85
+#: ../camel/camel-sasl-anonymous.c:33
+#: ../camel/providers/nntp/camel-nntp-provider.c:83
 msgid "Anonymous"
 msgstr "Анонимный"
 
-#: ../camel/camel-sasl-anonymous.c:37
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "This option will connect to the server using an anonymous login."
 msgstr "Будет производиться анонимное (anonymous) подключение к серверу."
 
-#: ../camel/camel-sasl-anonymous.c:70
+#: ../camel/camel-sasl-anonymous.c:68
 #, c-format
 msgid "Authentication failed."
 msgstr "Сбой проверки подлинности."
 
-#: ../camel/camel-sasl-anonymous.c:81
+#: ../camel/camel-sasl-anonymous.c:79
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -2736,7 +2507,7 @@ msgstr ""
 "Неверная трассировочная информация эл.адреса:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:95
+#: ../camel/camel-sasl-anonymous.c:93
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -2745,7 +2516,7 @@ msgstr ""
 "Неверная скрытая трассировочная информация:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:109
+#: ../camel/camel-sasl-anonymous.c:107
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -2754,87 +2525,116 @@ msgstr ""
 "Неверная трассировочная информация:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:46
+#: ../camel/camel-sasl-cram-md5.c:44
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:48
-msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
-msgstr "Подключение к серверу будет производиться с использованием для идентификации протокола CRAM-MD5, 
если сервер его поддерживает."
+#: ../camel/camel-sasl-cram-md5.c:46
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+"Подключение к серверу будет производиться с использованием для идентификации "
+"протокола CRAM-MD5, если сервер его поддерживает."
 
-#: ../camel/camel-sasl-digest-md5.c:59
+#: ../camel/camel-sasl-digest-md5.c:57
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:61
-msgid "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it."
-msgstr "Подключение к серверу будет производиться с использованием зашифрованного пароля DIGEST-MD5, если 
сервер его поддерживает."
+#: ../camel/camel-sasl-digest-md5.c:59
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"Подключение к серверу будет производиться с использованием зашифрованного "
+"пароля DIGEST-MD5, если сервер его поддерживает."
 
-#: ../camel/camel-sasl-digest-md5.c:855
+#: ../camel/camel-sasl-digest-md5.c:853
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Слишком длинный ответ от сервера (>2048 байт)"
 
-#: ../camel/camel-sasl-digest-md5.c:866
+#: ../camel/camel-sasl-digest-md5.c:864
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "Недопустимый ответ сервера\n"
 
-#: ../camel/camel-sasl-digest-md5.c:874
+#: ../camel/camel-sasl-digest-md5.c:872
 #, 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:905
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "Ответ сервера не содержит информации об авторизации"
 
-#: ../camel/camel-sasl-digest-md5.c:928
+#: ../camel/camel-sasl-digest-md5.c:926
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "Ответ сервера содержит неполную информацию об авторизации"
 
-#: ../camel/camel-sasl-digest-md5.c:941
+#: ../camel/camel-sasl-digest-md5.c:939
 #, c-format
 msgid "Server response does not match"
 msgstr "Ответ сервера не совпадает"
 
-#: ../camel/camel-sasl-gssapi.c:91
+#: ../camel/camel-sasl-gssapi.c:89
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:93
+#: ../camel/camel-sasl-gssapi.c:91
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "Подключение к серверу будет производиться с использованием Kerberos 5."
 
 #: ../camel/camel-sasl-gssapi.c:134
-msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the 
implementation."
-msgstr "Указанный механизм не поддерживается предоставленными средствами, либо не распознается в этой 
реализации."
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
+msgstr ""
+"Указанный механизм не поддерживается предоставленными средствами, либо не "
+"распознаётся в этой реализации."
 
 #: ../camel/camel-sasl-gssapi.c:139
 msgid "The provided target_name parameter was ill-formed."
 msgstr "Предоставленный параметр target_name сформирован неверно."
 
 #: ../camel/camel-sasl-gssapi.c:142
-msgid "The provided target_name parameter contained an invalid or unsupported type of name."
-msgstr "Предоставленный параметр target_name содержит неверный или неподдерживаемый тип имени."
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
+msgstr ""
+"Предоставленный параметр target_name содержит неверный или неподдерживаемый "
+"тип имени."
 
 #: ../camel/camel-sasl-gssapi.c:146
-msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings 
parameter."
-msgstr "input_token содержит не такую привязку к каналам, как указано в параметре input_chan_bindings."
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
+msgstr ""
+"input_token содержит не такую привязку к каналам, как указано в параметре "
+"input_chan_bindings."
 
 #: ../camel/camel-sasl-gssapi.c:151
-msgid "The input_token contains an invalid signature, or a signature that could not be verified."
-msgstr "input_token содержит неверную подпись, или подпись, которая не может быть проверена."
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
+msgstr ""
+"input_token содержит неверную подпись, или подпись, которая не может быть "
+"проверена."
 
 #: ../camel/camel-sasl-gssapi.c:155
-msgid "The supplied credentials were not valid for context initiation, or the credential handle did not 
reference any credentials."
-msgstr "Предоставленные удостоверения были не действительны для инициализации контекста, либо обработчик 
удостоверения не ссылается на удостоверения."
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
+msgstr ""
+"Предоставленные удостоверения были не действительны для инициализации "
+"контекста, либо обработчик удостоверения не ссылается на удостоверения."
 
 #: ../camel/camel-sasl-gssapi.c:160
 msgid "The supplied context handle did not refer to a valid context."
-msgstr "Указанный обработчик контекста не ссылается на действительный контекст."
+msgstr ""
+"Указанный обработчик контекста не ссылается на действительный контекст."
 
 #: ../camel/camel-sasl-gssapi.c:163
 msgid "The consistency checks performed on the input_token failed."
@@ -2848,492 +2648,403 @@ msgstr "Сбой проверки целостности удостоверен
 msgid "The referenced credentials have expired."
 msgstr "Срок действия упомянутых удостоверений истёк."
 
-#: ../camel/camel-sasl-gssapi.c:175
-#: ../camel/camel-sasl-gssapi.c:340
-#: ../camel/camel-sasl-gssapi.c:388
-#: ../camel/camel-sasl-gssapi.c:405
-#: ../camel/providers/smtp/camel-smtp-transport.c:612
+#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:352
+#: ../camel/camel-sasl-gssapi.c:400 ../camel/camel-sasl-gssapi.c:417
+#: ../camel/providers/smtp/camel-smtp-transport.c:622
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "Неверный ответ от сервера при идентификации."
 
-#: ../camel/camel-sasl-gssapi.c:417
+#: ../camel/camel-sasl-gssapi.c:429
 #, c-format
 msgid "Unsupported security layer."
 msgstr "Неподдерживаемый уровень безопасности."
 
-#: ../camel/camel-sasl-login.c:40
+#: ../camel/camel-sasl-login.c:38
 msgid "Login"
 msgstr "Регистрация"
 
-#: ../camel/camel-sasl-login.c:42
-#: ../camel/camel-sasl-plain.c:46
+#: ../camel/camel-sasl-login.c:40 ../camel/camel-sasl-plain.c:44
 msgid "This option will connect to the server using a simple password."
-msgstr "Подключение к серверу будет производиться с использованием незашифрованного пароля."
+msgstr ""
+"Подключение к серверу будет производиться с использованием незашифрованного "
+"пароля."
 
-#: ../camel/camel-sasl-login.c:110
+#: ../camel/camel-sasl-login.c:108
 #, c-format
 msgid "Unknown authentication state."
 msgstr "Неизвестное состояние идентификации."
 
-#: ../camel/camel-sasl-ntlm.c:48
+#: ../camel/camel-sasl-ntlm.c:46
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:50
-msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
-msgstr "Эта опция подключает к серверу, основанному на Windows, используя для аутентификации NTLM / Secure 
Password Authentication."
+#: ../camel/camel-sasl-ntlm.c:48
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr ""
+"Эта опция подключает к серверу, основанному на Windows, используя для "
+"аутентификации NTLM / Secure Password Authentication."
 
-#: ../camel/camel-sasl-plain.c:44
+#: ../camel/camel-sasl-plain.c:42
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:46
+#: ../camel/camel-sasl-popb4smtp.c:44
 msgid "POP before SMTP"
 msgstr "POP до SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:48
+#: ../camel/camel-sasl-popb4smtp.c:46
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "Будет производиться авторизация POP до попытки передачи почты по SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:84
+#: ../camel/camel-sasl-popb4smtp.c:82
 msgid "POP Source UID"
 msgstr "Идентификатор источника POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:98
+#: ../camel/camel-sasl-popb4smtp.c:96
 #, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "Аутентификация POP до SMTP, используя неизвестный транспорт"
 
-#: ../camel/camel-sasl-popb4smtp.c:110
-#: ../camel/camel-sasl-popb4smtp.c:119
+#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:117
 #, c-format
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "Аутентификация POP до SMTP посредством службы %s"
 
-#: ../camel/camel-search-private.c:116
+#: ../camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Сбой компиляции регулярного выражения: %s: %s"
 
-#: ../camel/camel-session.c:415
+#: ../camel/camel-session.c:433
 #, c-format
 msgid "Invalid GType registered for protocol '%s'"
 msgstr "Некорректный зарегистрированный GType для протокола «%s»"
 
-#: ../camel/camel-session.c:509
+#: ../camel/camel-session.c:502
+#: ../camel/providers/imapx/camel-imapx-server.c:4631
+#: ../camel/providers/pop3/camel-pop3-store.c:311
+#: ../camel/providers/pop3/camel-pop3-store.c:757
+#: ../camel/providers/smtp/camel-smtp-transport.c:515
+#, c-format
+msgid "No support for %s authentication"
+msgstr "Аутентификация %s не поддерживается"
+
+#: ../camel/camel-session.c:517
 #, c-format
 msgid "%s authentication failed"
 msgstr "Сбой при проверке подлинности %s"
 
-#: ../camel/camel-session.c:645
+#: ../camel/camel-session.c:586
 msgid "Forwarding messages is not supported"
 msgstr "Перенаправление сообщений не поддерживается"
 
-#. Translators: The first argument is the account type
-#. * (e.g. "IMAP"), the second is the user name, and the
-#. * third is the host name.
-#: ../camel/camel-session.c:1420
-#, c-format
-msgid "Please enter the %s password for %s on host %s."
-msgstr "Введите пароль %s для %s на узле %s."
-
-#: ../camel/camel-smime-context.c:351
-#: ../camel/camel-smime-context.c:1074
+#: ../camel/camel-smime-context.c:349 ../camel/camel-smime-context.c:1076
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Не удалось найти сертификат для «%s»"
 
-#: ../camel/camel-smime-context.c:379
+#: ../camel/camel-smime-context.c:377
 msgid "Cannot create CMS message"
 msgstr "Не удалось создать сообщение CMS"
 
-#: ../camel/camel-smime-context.c:384
+#: ../camel/camel-smime-context.c:382
 msgid "Cannot create CMS signed data"
 msgstr "Не удалось создать CMS signedData"
 
-#: ../camel/camel-smime-context.c:390
+#: ../camel/camel-smime-context.c:388
 msgid "Cannot attach CMS signed data"
 msgstr "Не удалось вложить CMS signedData"
 
-#: ../camel/camel-smime-context.c:397
+#: ../camel/camel-smime-context.c:395
 msgid "Cannot attach CMS data"
 msgstr "Не удалось вложить CMS data"
 
-#: ../camel/camel-smime-context.c:403
+#: ../camel/camel-smime-context.c:401
 msgid "Cannot create CMS Signer information"
 msgstr "Не удалось создать CMS SignerInfo"
 
-#: ../camel/camel-smime-context.c:409
+#: ../camel/camel-smime-context.c:407
 msgid "Cannot find certificate chain"
 msgstr "Не удалось найти цепочку сертификатов"
 
-#: ../camel/camel-smime-context.c:415
+#: ../camel/camel-smime-context.c:413
 msgid "Cannot add CMS Signing time"
 msgstr "Не удалось добавить CMS SigningTime"
 
-#: ../camel/camel-smime-context.c:439
-#: ../camel/camel-smime-context.c:454
+#: ../camel/camel-smime-context.c:437 ../camel/camel-smime-context.c:452
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "Сертификат шифрования для «%s» не существует"
 
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:459
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "Не удалось добавить атрибут SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:466
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "Не удалось добавить атрибут MS SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:471
+#: ../camel/camel-smime-context.c:469
 msgid "Cannot add encryption certificate"
 msgstr "Не удалось добавить сертификат шифрования"
 
-#: ../camel/camel-smime-context.c:477
+#: ../camel/camel-smime-context.c:475
 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:510
+#: ../camel/camel-smime-context.c:508
 msgid "Unverified"
 msgstr "Непроверено"
 
-#: ../camel/camel-smime-context.c:512
+#: ../camel/camel-smime-context.c:510
 msgid "Good signature"
 msgstr "Подпись верна"
 
-#: ../camel/camel-smime-context.c:514
+#: ../camel/camel-smime-context.c:512
 msgid "Bad signature"
 msgstr "Подпись неверна"
 
-#: ../camel/camel-smime-context.c:516
+#: ../camel/camel-smime-context.c:514
 msgid "Content tampered with or altered in transit"
 msgstr "Сообщение было подделано или изменено на пути"
 
-#: ../camel/camel-smime-context.c:518
+#: ../camel/camel-smime-context.c:516
 msgid "Signing certificate not found"
 msgstr "Сертификат подписи не найден"
 
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:518
 msgid "Signing certificate not trusted"
 msgstr "Сертификат подписи недостоверен"
 
-#: ../camel/camel-smime-context.c:522
+#: ../camel/camel-smime-context.c:520
 msgid "Signature algorithm unknown"
 msgstr "Неизвестный алгоритм подписи"
 
-#: ../camel/camel-smime-context.c:524
+#: ../camel/camel-smime-context.c:522
 msgid "Signature algorithm unsupported"
 msgstr "Неподдерживаемый алгоритм подписи"
 
-#: ../camel/camel-smime-context.c:526
+#: ../camel/camel-smime-context.c:524
 msgid "Malformed signature"
 msgstr "Неверно сформированная подпись"
 
-#: ../camel/camel-smime-context.c:528
+#: ../camel/camel-smime-context.c:526
 msgid "Processing error"
 msgstr "Ошибка обработки"
 
-#: ../camel/camel-smime-context.c:573
+#: ../camel/camel-smime-context.c:571
 msgid "No signed data in signature"
 msgstr "В подписи отсутствуют данные подписи"
 
-#: ../camel/camel-smime-context.c:578
+#: ../camel/camel-smime-context.c:576
 msgid "Digests missing from enveloped data"
 msgstr "В данных конверта отсутствует сводка"
 
-#: ../camel/camel-smime-context.c:591
-#: ../camel/camel-smime-context.c:602
+#: ../camel/camel-smime-context.c:589 ../camel/camel-smime-context.c:600
 msgid "Cannot calculate digests"
 msgstr "Не удалось вычислить дайджесты"
 
-#: ../camel/camel-smime-context.c:609
-#: ../camel/camel-smime-context.c:613
+#: ../camel/camel-smime-context.c:607 ../camel/camel-smime-context.c:611
 msgid "Cannot set message digests"
 msgstr "Не удалось установить дайджесты сообщения"
 
-#: ../camel/camel-smime-context.c:623
-#: ../camel/camel-smime-context.c:628
+#: ../camel/camel-smime-context.c:621 ../camel/camel-smime-context.c:626
 msgid "Certificate import failed"
 msgstr "Сбой импорта сертификата"
 
-#: ../camel/camel-smime-context.c:638
+#: ../camel/camel-smime-context.c:636
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
-msgstr "Сообщение состоит только из сертификатов, Не удалось проверить сертификаты"
+msgstr ""
+"Сообщение состоит только из сертификатов, Не удалось проверить сертификаты"
 
-#: ../camel/camel-smime-context.c:641
+#: ../camel/camel-smime-context.c:639
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "В сообщении только сертификаты, сертификаты импортированы и проверены"
 
-#: ../camel/camel-smime-context.c:645
+#: ../camel/camel-smime-context.c:643
 msgid "Cannot find signature digests"
 msgstr "Не удалось найти дайджесты подписи"
 
-#: ../camel/camel-smime-context.c:662
+#: ../camel/camel-smime-context.c:660
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Подписано: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:858
-#: ../camel/camel-smime-context.c:1148
+#: ../camel/camel-smime-context.c:856 ../camel/camel-smime-context.c:1150
 msgid "Cannot create encoder context"
 msgstr "Не удалось создать контекст кодировщика"
 
-#: ../camel/camel-smime-context.c:864
+#: ../camel/camel-smime-context.c:862
 msgid "Failed to add data to CMS encoder"
 msgstr "Не удалось добавить данные к кодировщику CMS"
 
-#: ../camel/camel-smime-context.c:869
-#: ../camel/camel-smime-context.c:1165
+#: ../camel/camel-smime-context.c:867 ../camel/camel-smime-context.c:1167
 msgid "Failed to encode data"
 msgstr "Ошибка кодирования данных"
 
-#: ../camel/camel-smime-context.c:1013
-#: ../camel/camel-smime-context.c:1262
+#: ../camel/camel-smime-context.c:1015 ../camel/camel-smime-context.c:1264
 msgid "Decoder failed"
 msgstr "Сбой декодера"
 
-#: ../camel/camel-smime-context.c:1082
+#: ../camel/camel-smime-context.c:1084
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Не удалось найти общий алгоритм шифрования"
 
-#: ../camel/camel-smime-context.c:1090
+#: ../camel/camel-smime-context.c:1092
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Не удалось распределить слот для ключа общего шифрования"
 
-#: ../camel/camel-smime-context.c:1101
+#: ../camel/camel-smime-context.c:1103
 msgid "Cannot create CMS Message"
 msgstr "Не удалось создать сообщение CMS"
 
-#: ../camel/camel-smime-context.c:1107
+#: ../camel/camel-smime-context.c:1109
 msgid "Cannot create CMS Enveloped data"
 msgstr "Не удалось создать CMS EnvelopedData"
 
-#: ../camel/camel-smime-context.c:1113
+#: ../camel/camel-smime-context.c:1115
 msgid "Cannot attach CMS Enveloped data"
 msgstr "Не удалось вложить CMS EnvelopedData"
 
-#: ../camel/camel-smime-context.c:1119
+#: ../camel/camel-smime-context.c:1121
 msgid "Cannot attach CMS data object"
 msgstr "Не удалось вложить объект CMS data"
 
-#: ../camel/camel-smime-context.c:1128
+#: ../camel/camel-smime-context.c:1130
 msgid "Cannot create CMS Recipient information"
 msgstr "Не удалось создать сведения CMS RecipientInfo"
 
-#: ../camel/camel-smime-context.c:1133
+#: ../camel/camel-smime-context.c:1135
 msgid "Cannot add CMS Recipient information"
 msgstr "Не удалось добавить сведения CMS RecipientInfo"
 
-#: ../camel/camel-smime-context.c:1159
+#: ../camel/camel-smime-context.c:1161
 msgid "Failed to add data to encoder"
 msgstr "Не удалось добавить данные к кодировщику"
 
-#: ../camel/camel-smime-context.c:1269
+#: ../camel/camel-smime-context.c:1271
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME Decrypt: Не найдено зашифрованного содержимого"
 
-#: ../camel/camel-store.c:1999
+#: ../camel/camel-store.c:1201
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "Не удалось создать папку «%s»: папка уже существует"
 
-#: ../camel/camel-store.c:2042
+#: ../camel/camel-store.c:1244
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Открытие папки «%s»"
 
-#: ../camel/camel-store.c:2231
+#: ../camel/camel-store.c:1471
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Сканирование папок на «%s»"
 
-#: ../camel/camel-store.c:2259
-#: ../camel/camel-store.c:2304
-#: ../camel/camel-vtrash-folder.c:48
+#: ../camel/camel-store.c:1499 ../camel/camel-store.c:1544
+#: ../camel/camel-vtrash-folder.c:46
 msgid "Trash"
 msgstr "Корзина"
 
-#: ../camel/camel-store.c:2273
-#: ../camel/camel-store.c:2321
-#: ../camel/camel-vtrash-folder.c:50
+#: ../camel/camel-store.c:1513 ../camel/camel-store.c:1561
+#: ../camel/camel-vtrash-folder.c:48
 msgid "Junk"
 msgstr "Спам"
 
-#: ../camel/camel-store.c:2774
+#: ../camel/camel-store.c:2162
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Не удалось создать папку: %s: папка существует"
 
-#: ../camel/camel-store.c:2788
+#: ../camel/camel-store.c:2169
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "Создание папки «%s»"
 
-#: ../camel/camel-store.c:2906
-#: ../camel/camel-vee-store.c:416
-#: ../camel/providers/local/camel-maildir-store.c:315
+#: ../camel/camel-store.c:2346 ../camel/camel-vee-store.c:416
+#: ../camel/providers/local/camel-maildir-store.c:320
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Не удалось удалить папку: %s: недопустимая операция"
 
-#: ../camel/camel-store.c:3049
-#: ../camel/camel-vee-store.c:466
-#: ../camel/providers/local/camel-maildir-store.c:841
+#: ../camel/camel-store.c:2536 ../camel/camel-vee-store.c:467
+#: ../camel/providers/local/camel-maildir-store.c:851
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Не удалось переименовать папку: %s: недопустимая операция"
 
-#: ../camel/camel-stream-filter.c:334
+#: ../camel/camel-stream.c:285 ../camel/camel-stream.c:336
+#, fuzzy, c-format
+#| msgid "Data source '%s' is not removable"
+msgid "Stream type '%s' is not seekable"
+msgstr "Источник данных «%s» нельзя удалить"
+
+#: ../camel/camel-stream-filter.c:344
 msgid "Only reset to beginning is supported with CamelStreamFilter"
 msgstr "Для CamelStreamFilter поддерживается только переход к началу"
 
-#: ../camel/camel-stream-null.c:78
+#: ../camel/camel-stream-null.c:76
 msgid "Only reset to beginning is supported with CamelHttpStream"
 msgstr "Для CamelHttpStream поддерживается только переход к началу"
 
-#: ../camel/camel-stream-process.c:275
+#: ../camel/camel-stream-process.c:280
 #, c-format
 msgid "Connection cancelled"
 msgstr "Соединение отменено"
 
-#: ../camel/camel-stream-process.c:280
+#: ../camel/camel-stream-process.c:285
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Не удалось подключиться командой «%s»: %s"
 
-#: ../camel/camel-subscribable.c:395
+#: ../camel/camel-subscribable.c:273
 #, c-format
 msgid "Subscribing to folder '%s'"
 msgstr "Подписка на папку «%s»"
 
-#: ../camel/camel-subscribable.c:527
+#: ../camel/camel-subscribable.c:442
 #, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "Отмена подписки на папку «%s»"
 
-#: ../camel/camel-tcp-stream-raw.c:310
-#, c-format
-msgid "NSPR error code %d"
-msgstr "Код ошибки NSPR %d"
-
-#: ../camel/camel-tcp-stream-raw.c:649
-#: ../camel/camel-tcp-stream-raw.c:662
-#, c-format
-msgid "The proxy host does not support SOCKS4"
-msgstr "Узел прокси не поддерживает SOCKS4"
-
-#: ../camel/camel-tcp-stream-raw.c:675
-#, c-format
-msgid "The proxy host denied our request: code %d"
-msgstr "Узел прокси отклонил запрос: код %d"
-
-#: ../camel/camel-tcp-stream-raw.c:773
-#: ../camel/camel-tcp-stream-raw.c:781
-#, c-format
-msgid "The proxy host does not support SOCKS5"
-msgstr "Узел прокси не поддерживает SOCKS5"
-
-#: ../camel/camel-tcp-stream-raw.c:789
-#, c-format
-msgid "Could not find a suitable authentication type: code 0x%x"
-msgstr "Не удалось найти подходящий тип аутентификации: код 0x%x"
-
-#: ../camel/camel-tcp-stream-raw.c:801
-msgid "General SOCKS server failure"
-msgstr "Сбой сервера SOCKS"
-
-#: ../camel/camel-tcp-stream-raw.c:802
-msgid "SOCKS server's rules do not allow connection"
-msgstr "Правила сервера SOCKS запрещают подключение"
-
-#: ../camel/camel-tcp-stream-raw.c:803
-msgid "Network is unreachable from SOCKS server"
-msgstr "Сеть недоступна через сервер SOCKS"
-
-#: ../camel/camel-tcp-stream-raw.c:804
-msgid "Host is unreachable from SOCKS server"
-msgstr "Узел недоступен через сервер SOCKS"
-
-#: ../camel/camel-tcp-stream-raw.c:805
-msgid "Connection refused"
-msgstr "Соединение отклонено"
-
-#: ../camel/camel-tcp-stream-raw.c:806
-msgid "Time-to-live expired"
-msgstr "Превышено максимальное время ожидания"
-
-#: ../camel/camel-tcp-stream-raw.c:807
-msgid "Command not supported by SOCKS server"
-msgstr "Команда не поддерживается сервером SOCKS"
-
-#: ../camel/camel-tcp-stream-raw.c:808
-msgid "Address type not supported by SOCKS server"
-msgstr "Тип адреса не поддерживается сервером SOCKS"
-
-#: ../camel/camel-tcp-stream-raw.c:809
-msgid "Unknown error from SOCKS server"
-msgstr "Получена неизвестная ошибка от сервера SOCKS"
-
-#: ../camel/camel-tcp-stream-raw.c:842
-#, c-format
-msgid "Got unknown address type from SOCKS server"
-msgstr "От сервера SOCKS получен адрес неизвестного типа"
-
-#: ../camel/camel-tcp-stream-raw.c:860
-#, c-format
-msgid "Incomplete reply from SOCKS server"
-msgstr "Получен неполный ответ от сервера SOCKS"
-
-#: ../camel/camel-tcp-stream-raw.c:880
-#, c-format
-msgid "Hostname is too long (maximum is 255 characters)"
-msgstr "Слишком длинное имя узла (максимальное кол-во символов — 255)"
-
-#. SOCKS5
-#. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:912
-#: ../camel/camel-tcp-stream-raw.c:922
-#, c-format
-msgid "Invalid reply from proxy server"
-msgstr "Недопустимый ответ от прокси-сервера"
-
-#: ../camel/camel-url.c:331
+#: ../camel/camel-url.c:329
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "Не удалось разобрать URL «%s»"
 
-#: ../camel/camel-vee-folder.c:494
+#: ../camel/camel-vee-folder.c:491
 #, c-format
 msgid "Updating folder '%s'"
 msgstr "Обновление папки «%s»"
 
-#: ../camel/camel-vee-folder.c:855
-#: ../camel/camel-vee-folder.c:965
+#: ../camel/camel-vee-folder.c:851 ../camel/camel-vee-folder.c:961
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Не удалось скопировать или переместить сообщения в виртуальную папку"
 
-#: ../camel/camel-vee-folder.c:888
+#: ../camel/camel-vee-folder.c:884
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Нет сообщения %s в %s"
 
-#: ../camel/camel-vee-folder.c:941
+#: ../camel/camel-vee-folder.c:937
 #, c-format
 msgid "Error storing '%s': "
 msgstr "Ошибка при хранении «%s»: "
 
-#: ../camel/camel-vee-folder.c:1171
+#: ../camel/camel-vee-folder.c:1167
 msgid "Automatically _update on change in source folders"
 msgstr "Автоматически _обновлять при изменении папок-источников"
 
 #. Translators: 'Unmatched' is a folder name under Search folders where are shown
 #. * all messages not belonging into any other configured search folder
-#: ../camel/camel-vee-store.c:42
+#: ../camel/camel-vee-store.c:40
 msgid "Unmatched"
 msgstr "Прочее"
 
@@ -3342,23 +3053,63 @@ msgstr "Прочее"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Не удалось удалить папку: %s: нет такой папки"
 
-#: ../camel/camel-vee-store.c:476
+#: ../camel/camel-vee-store.c:477
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Не удалось переименовать папку: %s: нет такой папки"
 
-#: ../camel/camel-vee-store.c:538
+#: ../camel/camel-vee-store.c:539
 msgid "Enable _Unmatched folder"
 msgstr "Включить папку «_Прочее»"
 
-#: ../camel/camel-vtrash-folder.c:49
+#: ../camel/camel-vtrash-folder.c:47
 msgid "Cannot copy messages to the Trash folder"
 msgstr "Не удалось переместить сообщения в корзину"
 
-#: ../camel/camel-vtrash-folder.c:51
+#: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Не удалось переместить сообщения в папку «Спам»"
 
+#: ../camel/providers/imapx/camel-imapx-folder.c:687
+#, c-format
+msgid "No quota information available for folder '%s'"
+msgstr "Для папки «%s» нет информации о квоте"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:801
+#: ../camel/providers/imapx/camel-imapx-folder.c:894
+#, c-format
+msgid "No destination folder specified"
+msgstr "Не указана целевая папка"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:829
+msgid "Unable to move junk messages"
+msgstr "Не удалось переместить сообщения, содержащие спам"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:922
+msgid "Unable to move deleted messages"
+msgstr "Не удалось переместить удалённые сообщения"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:1148
+#: ../camel/providers/nntp/camel-nntp-folder.c:758
+msgid "Apply message _filters to this folder"
+msgstr "Применять _фильтры сообщений к этой папке"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:1254
+#, c-format
+msgid "Could not create folder summary for %s"
+msgstr "Не удалось создать краткую информацию по папке %s"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:1263
+#, c-format
+msgid "Could not create cache for %s: "
+msgstr "Не удалось создать кэш для %s:"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:1448
+#, fuzzy, c-format
+#| msgid "No quota information available for folder '%s'"
+msgid "No IMAP mailbox available for folder '%s'"
+msgstr "Для папки «%s» нет информации о квоте"
+
 #: ../camel/providers/imapx/camel-imapx-provider.c:38
 msgid "Checking for New Mail"
 msgstr "Проверка новой почты"
@@ -3373,14 +3124,16 @@ msgstr "П_роверять новую почту в подписанных па
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:44
 msgid "Use _Quick Resync if the server supports it"
-msgstr "Использовать _быструю синхронизацию, если сервер поддерживает такую возможность"
+msgstr ""
+"Использовать _быструю синхронизацию, если сервер поддерживает такую "
+"возможность"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:46
 msgid "_Listen for server change notifications"
 msgstr "_Следить за уведомлениями сервера об изменениях"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:49
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid "Folders"
 msgstr "Папки"
 
@@ -3397,21 +3150,22 @@ msgid "Namespace:"
 msgstr "Пространство имён:"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:59
-#: ../camel/providers/local/camel-local-provider.c:41
-#: ../camel/providers/local/camel-local-provider.c:81
-#: ../camel/providers/local/camel-local-provider.c:101
-#: ../camel/providers/nntp/camel-nntp-provider.c:41
+#: ../camel/providers/local/camel-local-provider.c:39
+#: ../camel/providers/local/camel-local-provider.c:79
+#: ../camel/providers/local/camel-local-provider.c:99
+#: ../camel/providers/nntp/camel-nntp-provider.c:39
 msgid "Options"
 msgstr "Параметры"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:61
-#: ../camel/providers/nntp/camel-nntp-provider.c:43
+#: ../camel/providers/nntp/camel-nntp-provider.c:41
 msgid "Apply _filters to new messages in all folders"
 msgstr "_Применить фильтры к новым сообщениям во всех папках"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:63
 msgid "_Apply filters to new messages in Inbox on this server"
-msgstr "_Применить фильтры к новым сообщениям в папке «Входящие» на этом сервере"
+msgstr ""
+"_Применить фильтры к новым сообщениям в папке «Входящие» на этом сервере"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:65
 msgid "Check new messages for _Junk contents"
@@ -3419,11 +3173,12 @@ msgstr "Проверять новые _сообщения на наличие с
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:67
 msgid "Only check for Junk messages in the IN_BOX folder"
-msgstr "Проверять, являются ли новые сообщения _спамом, только в папке «Входящие»"
+msgstr ""
+"Проверять, являются ли новые сообщения _спамом, только в папке «Входящие»"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "Automatically synchroni_ze remote mail locally"
-msgstr "Автоматически синхрони_зировать удаленную почту локально"
+msgstr "Автоматически синхрони_зировать удалённую почту локально"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:75
 msgid "Default IMAP port"
@@ -3441,27 +3196,277 @@ msgstr "IMAP+"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Для чтения и хранения почты на серверах IMAP."
 
-#: ../camel/providers/local/camel-local-folder.c:194
+#: ../camel/providers/imapx/camel-imapx-server.c:829
+#, c-format
+msgid "Not authenticated"
+msgstr "Не удалось выполнить аутентификацию"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:1773
+msgid "Server disconnected"
+msgstr "Сервер отключился"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:2236
+msgid "Error writing to cache stream"
+msgstr "Ошибка записи в поток кэша"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3597
+msgid "Error performing IDLE"
+msgstr "Ошибка выполнения команды IDLE"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4492
+#, 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:4493
+#: ../camel/providers/smtp/camel-smtp-transport.c:215
+msgid "STARTTLS not supported"
+msgstr "STARTTLS не поддерживается"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4540
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: "
+msgstr "Не удалось подключиться к IMAP-серверу %s в защищённом режиме: "
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4620
+#, c-format
+msgid "IMAP server %s does not support %s authentication"
+msgstr "Сервер IMAP %s не поддерживает аутентификацию %s"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4650
+#: ../camel/providers/nntp/camel-nntp-store.c:394
+#: ../camel/providers/nntp/camel-nntp-store.c:531
+msgid "Cannot authenticate without a username"
+msgstr "Невозможно выполнить проверку подлинности без имени пользователя"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4659
+#: ../camel/providers/nntp/camel-nntp-store.c:540
+#: ../camel/providers/pop3/camel-pop3-store.c:678
+#: ../camel/providers/pop3/camel-pop3-store.c:699
+msgid "Authentication password not available"
+msgstr "Пароль аутентификации недоступен"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4910
+msgid "Error fetching message"
+msgstr "Ошибка при получении сообщения"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4956
+#: ../camel/providers/imapx/camel-imapx-server.c:4963
+msgid "Failed to close the tmp stream"
+msgstr "Сбой при закрытии временного потока"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4998
+msgid "Failed to copy the tmp file"
+msgstr "Сбой при копировании временного файла"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5124
+msgid "Error moving messages"
+msgstr "Ошибка при перемещении сообщений"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5128
+msgid "Error copying messages"
+msgstr "Ошибка при копировании сообщений"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5287
+msgid "Error appending message"
+msgstr "Ошибка при присоединении сообщения"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5522
+msgid "Error fetching message headers"
+msgstr "Ошибка при получении заголовков сообщений"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5687
+msgid "Error retrieving message"
+msgstr "Ошибка при получении сообщения"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5817
+#: ../camel/providers/imapx/camel-imapx-server.c:6040
+#, c-format
+msgid "Fetching summary information for new messages in '%s'"
+msgstr "Получение краткой информации о новых сообщениях «%s»"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5869
+#, c-format
+msgid "Scanning for changed messages in '%s'"
+msgstr "Поиск изменённых сообщений в «%s»"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5921
+msgid "Error fetching new messages"
+msgstr "Ошибка при получении новых сообщений"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6189
+msgid "Error refreshing folder"
+msgstr "Ошибка при обновлении папки"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6339
+msgid "Error expunging message"
+msgstr "Ошибка уничтожения сообщений"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6448
+#: ../camel/providers/imapx/camel-imapx-server.c:6473
+msgid "Error fetching folders"
+msgstr "Ошибка при получении папок"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6553
+msgid "Error creating folder"
+msgstr "Ошибка при создании папки"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6605
+msgid "Error deleting folder"
+msgstr "Ошибка при удалении папки"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6672
+msgid "Error renaming folder"
+msgstr "Ошибка при переименовании папки"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6759
+msgid "Error subscribing to folder"
+msgstr "Ошибка подписывания на папку"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6819
+#, fuzzy
+#| msgid "Error subscribing to folder"
+msgid "Error unsubscribing from folder"
+msgstr "Ошибка подписывания на папку"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6875
+msgid "Error retrieving quota information"
+msgstr "Ошибка получения информации о квоте"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6927
+msgid "Search failed"
+msgstr "Ошибка поиска"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6989
+msgid "Error performing NOOP"
+msgstr "Ошибка выполнения команды NOOP"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:7096
+msgid "Error syncing changes"
+msgstr "Ошибка при синхронизации изменений"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:7383
+msgid "Lost connection to IMAP server"
+msgstr "Соединение с сервером IMAP разорвано"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:8240
+#, c-format
+msgid "Cannot get message with message ID %s: %s"
+msgstr "Не удалось получить сообщение с идентификатором %s: %s"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:8241
+msgid "No such message available."
+msgstr "Нет такого сообщения."
+
+#: ../camel/providers/imapx/camel-imapx-server.c:8441
+#: ../camel/providers/imapx/camel-imapx-server.c:8456
+msgid "Cannot create spool file: "
+msgstr "Не удалось создать файл спула: "
+
+#: ../camel/providers/imapx/camel-imapx-server.c:9201
+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:207
+#: ../camel/providers/local/camel-maildir-folder.c:471
+#: ../camel/providers/local/camel-maildir-store.c:321
+#: ../camel/providers/local/camel-maildir-store.c:763
+#: ../camel/providers/local/camel-maildir-store.c:769
+#: ../camel/providers/local/camel-maildir-store.c:852
+#: ../camel/providers/local/camel-spool-store.c:393
+msgid "Inbox"
+msgstr "Входящие"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:823
+#, c-format
+msgid "IMAP server %s"
+msgstr "Сервер IMAP %s"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:826
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "Сервис IMAP для %s на %s"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1035
+#: ../camel/providers/nntp/camel-nntp-provider.c:93
+#: ../camel/providers/pop3/camel-pop3-provider.c:81
+msgid "Password"
+msgstr "Пароль"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1037
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr ""
+"Подключение к серверу IMAP будет производиться с использованием "
+"незашифрованного пароля."
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1112
+#, c-format
+msgid "No such folder %s"
+msgstr "Нет такой папки %s"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1507
+#, c-format
+msgid "No IMAP namespace for folder path '%s'"
+msgstr ""
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1656
+#, c-format
+msgid "Retrieving folder list for %s"
+msgstr "Получение списка папок для %s"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2094
+#, 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:2615
+#: ../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
+#, c-format
+msgid "You must be working online to complete this operation"
+msgstr "Для завершения данной операции необходимо подключение к сети"
+
+#: ../camel/providers/imapx/camel-imapx-stream.c:96
+#, c-format
+msgid "Source stream returned no data"
+msgstr "Поток не вернул данные"
+
+#: ../camel/providers/imapx/camel-imapx-stream.c:105
+#, c-format
+msgid "Source stream unavailable"
+msgstr "Поток недоступен"
+
+#: ../camel/providers/local/camel-local-folder.c:192
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:204
-#: ../camel/providers/local/camel-local-folder.c:213
+#: ../camel/providers/local/camel-local-folder.c:202
+#: ../camel/providers/local/camel-local-folder.c:211
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "почтовый ящик: %s: (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:222
+#: ../camel/providers/local/camel-local-folder.c:220
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:499
+#: ../camel/providers/local/camel-local-folder.c:497
 msgid "_Index message body data"
 msgstr "_Индексировать данные тела сообщения"
 
-#: ../camel/providers/local/camel-local-folder.c:727
+#: ../camel/providers/local/camel-local-folder.c:725
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3470,49 +3475,53 @@ msgstr ""
 "Не удалось получить сообщение %s из папки %s\n"
 "%s"
 
-#: ../camel/providers/local/camel-local-provider.c:43
+#: ../camel/providers/local/camel-local-provider.c:41
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr "_Использовать общий файл индекса «.folders» (exmh)"
 
-#: ../camel/providers/local/camel-local-provider.c:50
+#: ../camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr "Почтовые каталоги в формате UNIX MH"
 
-#: ../camel/providers/local/camel-local-provider.c:51
+#: ../camel/providers/local/camel-local-provider.c:49
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Для хранения локальной почты в почтовых каталогах типа MH."
 
-#: ../camel/providers/local/camel-local-provider.c:68
+#: ../camel/providers/local/camel-local-provider.c:66
 msgid "Local delivery"
 msgstr "Локальная доставка"
 
-#: ../camel/providers/local/camel-local-provider.c:69
-msgid "For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by 
Evolution."
-msgstr "Для получения (перемещения) локальной почты из очередей в стандартном формате mbox в папки, 
управляемые Evolution."
+#: ../camel/providers/local/camel-local-provider.c:67
+msgid ""
+"For retrieving (moving) local mail from standard mbox-formatted spools into "
+"folders managed by Evolution."
+msgstr ""
+"Для получения (перемещения) локальной почты из очередей в стандартном "
+"формате mbox в папки, управляемые Evolution."
 
-#: ../camel/providers/local/camel-local-provider.c:83
-#: ../camel/providers/local/camel-local-provider.c:103
+#: ../camel/providers/local/camel-local-provider.c:81
+#: ../camel/providers/local/camel-local-provider.c:101
 msgid "_Apply filters to new messages in Inbox"
 msgstr "_Применить фильтры к новым сообщениям в папке «Входящие»"
 
-#: ../camel/providers/local/camel-local-provider.c:90
+#: ../camel/providers/local/camel-local-provider.c:88
 msgid "Maildir-format mail directories"
 msgstr "Почтовые каталоги в формате Maildir"
 
-#: ../camel/providers/local/camel-local-provider.c:91
+#: ../camel/providers/local/camel-local-provider.c:89
 msgid "For storing local mail in maildir directories."
 msgstr "Для хранения локальной почты в почтовых каталогах maildir."
 
-#: ../camel/providers/local/camel-local-provider.c:104
+#: ../camel/providers/local/camel-local-provider.c:102
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "_Сохранять заголовки статуса в формате Elm/Pine/Mutt"
 
-#: ../camel/providers/local/camel-local-provider.c:111
+#: ../camel/providers/local/camel-local-provider.c:109
 msgid "Standard Unix mbox spool file"
 msgstr "Стандартная для Unix очередь типа mbox"
 
-#: ../camel/providers/local/camel-local-provider.c:112
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:110
+#: ../camel/providers/local/camel-local-provider.c:124
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -3521,225 +3530,220 @@ msgstr ""
 "спула в формате mbox. Также может использоваться для чтения дерева\n"
 "папок в стиле Elm, Pine или Mutt."
 
-#: ../camel/providers/local/camel-local-provider.c:125
+#: ../camel/providers/local/camel-local-provider.c:123
 msgid "Standard Unix mbox spool directory"
 msgstr "Стандартный для Unix каталог очередей типа mbox"
 
-#: ../camel/providers/local/camel-local-store.c:98
+#: ../camel/providers/local/camel-local-store.c:96
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Не удалось переименовать папку %s в %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:180
+#: ../camel/providers/local/camel-local-store.c:178
 #, c-format
 msgid "Local mail file %s"
 msgstr "Локальный почтовый файл %s"
 
-#: ../camel/providers/local/camel-local-store.c:223
-#: ../camel/providers/local/camel-local-store.c:383
-#: ../camel/providers/local/camel-maildir-store.c:117
-#: ../camel/providers/local/camel-mbox-store.c:581
-#: ../camel/providers/local/camel-spool-store.c:89
+#: ../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-mbox-store.c:579
+#: ../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:232
+#: ../camel/providers/local/camel-local-store.c:230
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Хранилище %s не является каталогом"
 
-#: ../camel/providers/local/camel-local-store.c:244
-#: ../camel/providers/local/camel-local-store.c:254
-#: ../camel/providers/local/camel-local-store.c:396
-#: ../camel/providers/local/camel-maildir-store.c:145
+#: ../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:150
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Не удалось получить папку: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:291
+#: ../camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "Локальное хранилище не имеет папки Входящие"
 
-#: ../camel/providers/local/camel-local-store.c:456
-#: ../camel/providers/local/camel-mbox-store.c:748
+#: ../camel/providers/local/camel-local-store.c:454
+#: ../camel/providers/local/camel-mbox-store.c:746
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "Не удалось удалить индексный файл папки «%s»: %s"
 
-#: ../camel/providers/local/camel-local-store.c:484
-#: ../camel/providers/local/camel-mbox-store.c:778
+#: ../camel/providers/local/camel-local-store.c:482
+#: ../camel/providers/local/camel-mbox-store.c:776
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "Не удалось удалить мета-файл папки «%s»: %s"
 
-#: ../camel/providers/local/camel-local-store.c:596
+#: ../camel/providers/local/camel-local-store.c:594
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Не удалось переименовать «%s»: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:567
-#, c-format
-msgid "Unable to add message to summary: unknown reason"
-msgstr "Не удалось добавить сообщение к краткой информации: причина неизвестна"
-
-#: ../camel/providers/local/camel-maildir-folder.c:100
-#: ../camel/providers/local/camel-maildir-folder.c:335
-#: ../camel/providers/local/camel-mbox-folder.c:117
-#: ../camel/providers/local/camel-mbox-folder.c:329
-#: ../camel/providers/local/camel-mh-folder.c:159
+#: ../camel/providers/local/camel-maildir-folder.c:98
+#: ../camel/providers/local/camel-maildir-folder.c:333
+#: ../camel/providers/local/camel-mbox-folder.c:115
+#: ../camel/providers/local/camel-mbox-folder.c:328
+#: ../camel/providers/local/camel-mh-folder.c:157
 msgid "No such message"
 msgstr "Нет такого сообщения"
 
-#: ../camel/providers/local/camel-maildir-folder.c:225
+#: ../camel/providers/local/camel-maildir-folder.c:223
 #, c-format
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "Не удалось добавить сообщение в папку почтового каталога: %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:273
-#: ../camel/providers/local/camel-maildir-folder.c:283
-#: ../camel/providers/local/camel-mbox-folder.c:390
-#: ../camel/providers/local/camel-mh-folder.c:171
-#: ../camel/providers/local/camel-mh-folder.c:181
+#: ../camel/providers/local/camel-maildir-folder.c:271
+#: ../camel/providers/local/camel-maildir-folder.c:281
+#: ../camel/providers/local/camel-mbox-folder.c:389
+#: ../camel/providers/local/camel-mh-folder.c:169
+#: ../camel/providers/local/camel-mh-folder.c:179
 #, c-format
 msgid "Cannot get message %s from folder %s: "
 msgstr "Не удалось получить сообщение %s из папки %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:353
+#: ../camel/providers/local/camel-maildir-folder.c:351
 #, c-format
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "Не удалось переместить сообщение в папку: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:125
-#: ../camel/providers/local/camel-maildir-store.c:850
+#: ../camel/providers/local/camel-maildir-store.c:130
+#: ../camel/providers/local/camel-maildir-store.c:860
 #, c-format
 msgid "Folder %s already exists"
 msgstr "Папка %s уже существует"
 
-#: ../camel/providers/local/camel-maildir-store.c:230
-#: ../camel/providers/local/camel-maildir-store.c:261
-#: ../camel/providers/local/camel-mbox-store.c:403
-#: ../camel/providers/local/camel-mbox-store.c:424
+#: ../camel/providers/local/camel-maildir-store.c:235
+#: ../camel/providers/local/camel-maildir-store.c:266
+#: ../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:245
-#: ../camel/providers/local/camel-mbox-store.c:369
-#: ../camel/providers/local/camel-mh-store.c:514
+#: ../camel/providers/local/camel-maildir-store.c:250
+#: ../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:251
-#: ../camel/providers/local/camel-mbox-store.c:379
-#: ../camel/providers/local/camel-mh-store.c:523
+#: ../camel/providers/local/camel-maildir-store.c:256
+#: ../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:278
+#: ../camel/providers/local/camel-maildir-store.c:283
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "Не удалось получить папку «%s»: не является почтовым каталогом."
 
-#: ../camel/providers/local/camel-maildir-store.c:283
-#: ../camel/providers/local/camel-mbox-store.c:442
-#: ../camel/providers/local/camel-mh-store.c:556
+#: ../camel/providers/local/camel-maildir-store.c:288
+#: ../camel/providers/local/camel-mbox-store.c:440
+#: ../camel/providers/local/camel-mh-store.c:565
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "Не удалось создать папку «%s»: папка существует."
 
-#: ../camel/providers/local/camel-maildir-store.c:347
-#: ../camel/providers/local/camel-maildir-store.c:387
-#: ../camel/providers/local/camel-mh-store.c:674
+#: ../camel/providers/local/camel-maildir-store.c:352
+#: ../camel/providers/local/camel-maildir-store.c:392
+#: ../camel/providers/local/camel-mh-store.c:683
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "Не удалось удалить папку «%s»: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:349
+#: ../camel/providers/local/camel-maildir-store.c:354
 msgid "not a maildir directory"
 msgstr "не является почтовым каталогом"
 
-#: ../camel/providers/local/camel-maildir-store.c:630
-#: ../camel/providers/local/camel-maildir-store.c:1065
+#: ../camel/providers/local/camel-maildir-store.c:635
+#: ../camel/providers/local/camel-maildir-store.c:1074
 #: ../camel/providers/local/camel-spool-store.c:212
 #: ../camel/providers/local/camel-spool-store.c:231
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "Не удалось просканировать папку «%s»: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:458
-#: ../camel/providers/local/camel-maildir-summary.c:591
+#: ../camel/providers/local/camel-maildir-summary.c:465
+#: ../camel/providers/local/camel-maildir-summary.c:605
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Не удалось открыть путь к папке почтового каталога: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:582
+#: ../camel/providers/local/camel-maildir-summary.c:596
 msgid "Checking folder consistency"
 msgstr "Проверка содержания каталогов"
 
-#: ../camel/providers/local/camel-maildir-summary.c:675
+#: ../camel/providers/local/camel-maildir-summary.c:689
 msgid "Checking for new messages"
 msgstr "Проверка новых сообщений"
 
-#: ../camel/providers/local/camel-maildir-summary.c:770
-#: ../camel/providers/local/camel-mbox-summary.c:450
+#: ../camel/providers/local/camel-maildir-summary.c:784
+#: ../camel/providers/local/camel-mbox-summary.c:466
 #: ../camel/providers/local/camel-mbox-summary.c:682
-#: ../camel/providers/local/camel-mbox-summary.c:830
-#: ../camel/providers/local/camel-spool-summary.c:141
+#: ../camel/providers/local/camel-mbox-summary.c:831
+#: ../camel/providers/local/camel-spool-summary.c:139
 msgid "Storing folder"
 msgstr "Сохранение папки"
 
-#: ../camel/providers/local/camel-mbox-folder.c:187
+#: ../camel/providers/local/camel-mbox-folder.c:185
 #, c-format
 msgid "Cannot open mailbox: %s: "
 msgstr "Не удалось открыть почтовый ящик: %s:"
 
-#: ../camel/providers/local/camel-mbox-folder.c:253
+#: ../camel/providers/local/camel-mbox-folder.c:251
 #, c-format
 msgid "Cannot append message to mbox file: %s: "
 msgstr "Не удалось добавить сообщение в файл почтового ящика: %s:"
 
-#: ../camel/providers/local/camel-mbox-folder.c:382
+#: ../camel/providers/local/camel-mbox-folder.c:381
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Видимо, папка невостановимо испорчена."
 
-#: ../camel/providers/local/camel-mbox-folder.c:439
-#: ../camel/providers/local/camel-spool-folder.c:69
+#: ../camel/providers/local/camel-mbox-folder.c:438
+#: ../camel/providers/local/camel-spool-folder.c:67
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Не удалось заблокировать папку %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:391
-#: ../camel/providers/local/camel-mbox-store.c:589
+#: ../camel/providers/local/camel-mbox-store.c:389
+#: ../camel/providers/local/camel-mbox-store.c:587
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "Не удалось создать папку с таким именем."
 
-#: ../camel/providers/local/camel-mbox-store.c:435
+#: ../camel/providers/local/camel-mbox-store.c:433
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "Не удалось получить папку «%s»: не является обычным файлом."
 
-#: ../camel/providers/local/camel-mbox-store.c:605
+#: ../camel/providers/local/camel-mbox-store.c:603
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "Не удалось создать каталог «%s»: %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:617
+#: ../camel/providers/local/camel-mbox-store.c:615
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Не удалось создать папку: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:619
+#: ../camel/providers/local/camel-mbox-store.c:617
 msgid "Folder already exists"
 msgstr "Папка уже существует"
 
-#: ../camel/providers/local/camel-mbox-store.c:659
-#: ../camel/providers/local/camel-mbox-store.c:672
-#: ../camel/providers/local/camel-mbox-store.c:701
+#: ../camel/providers/local/camel-mbox-store.c:657
+#: ../camel/providers/local/camel-mbox-store.c:670
+#: ../camel/providers/local/camel-mbox-store.c:699
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3748,142 +3752,141 @@ msgstr ""
 "Не удалось удалить папку «%s»:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:682
+#: ../camel/providers/local/camel-mbox-store.c:680
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "«%s» не является обычным файлом."
 
-#: ../camel/providers/local/camel-mbox-store.c:691
+#: ../camel/providers/local/camel-mbox-store.c:689
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "Папка «%s» не пуста. Не удалена."
 
-#: ../camel/providers/local/camel-mbox-store.c:718
-#: ../camel/providers/local/camel-mbox-store.c:733
+#: ../camel/providers/local/camel-mbox-store.c:716
+#: ../camel/providers/local/camel-mbox-store.c:731
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "Не удалось удалить файл краткой информации «%s»: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:815
+#: ../camel/providers/local/camel-mbox-store.c:813
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "Имя новой папки недопустимо."
 
-#: ../camel/providers/local/camel-mbox-store.c:831
+#: ../camel/providers/local/camel-mbox-store.c:829
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "Не удалось переименовать «%s»: «%s»: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:915
+#: ../camel/providers/local/camel-mbox-store.c:913
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Не удалось переименовать «%s» в %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:460
+#: ../camel/providers/local/camel-mbox-summary.c:476
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Не удалось открыть папку: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:522
-#, c-format
-msgid "Fatal mail parser error near position %s in folder %s"
-msgstr "Фатальная ошибка почтового анализатора возле позиции %s в папке %s"
-
-#: ../camel/providers/local/camel-mbox-summary.c:607
+#: ../camel/providers/local/camel-mbox-summary.c:606
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Не удалось проверить папку: %s: %s"
 
 #: ../camel/providers/local/camel-mbox-summary.c:695
-#: ../camel/providers/local/camel-mbox-summary.c:839
-#: ../camel/providers/local/camel-spool-summary.c:148
+#: ../camel/providers/local/camel-mbox-summary.c:840
+#: ../camel/providers/local/camel-spool-summary.c:146
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Не удалось открыть файл: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:709
-#: ../camel/providers/local/camel-spool-summary.c:163
+#: ../camel/providers/local/camel-mbox-summary.c:710
+#: ../camel/providers/local/camel-spool-summary.c:161
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Не удалось открыть временный почтовый ящик: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:726
-#: ../camel/providers/local/camel-mbox-summary.c:956
+#: ../camel/providers/local/camel-mbox-summary.c:727
+#: ../camel/providers/local/camel-mbox-summary.c:962
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Не удалось закрыть исходную папку %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:739
+#: ../camel/providers/local/camel-mbox-summary.c:740
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "Не удалось закрыть временную папку: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:758
+#: ../camel/providers/local/camel-mbox-summary.c:759
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Не удалось переименовать папку: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:853
-#: ../camel/providers/local/camel-mbox-summary.c:1122
+#: ../camel/providers/local/camel-mbox-summary.c:854
+#: ../camel/providers/local/camel-mbox-summary.c:1127
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Не удалось сохранить папку: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:892
-#: ../camel/providers/local/camel-mbox-summary.c:1162
+#: ../camel/providers/local/camel-mbox-summary.c:893
+#: ../camel/providers/local/camel-mbox-summary.c:1167
 #, c-format
-msgid "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get it.)"
-msgstr "Файл почтового ящика повреждён, исправьте его. (Ожидалась строка «От», но она не была получена.)"
+msgid ""
+"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
+"it.)"
+msgstr ""
+"Файл почтового ящика повреждён, исправьте его. (Ожидалась строка «От», но "
+"она не была получена.)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:902
-#: ../camel/providers/local/camel-mbox-summary.c:1174
+#: ../camel/providers/local/camel-mbox-summary.c:903
+#: ../camel/providers/local/camel-mbox-summary.c:1179
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Сводка и папка расходятся даже после синхронизации"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1067
+#: ../camel/providers/local/camel-mbox-summary.c:1072
 #: ../camel/providers/local/camel-spool-summary.c:356
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Неизвестная ошибка: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1232
-#: ../camel/providers/local/camel-mbox-summary.c:1262
+#: ../camel/providers/local/camel-mbox-summary.c:1237
+#: ../camel/providers/local/camel-mbox-summary.c:1267
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "Сбой записи во временный почтовый ящик: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1251
+#: ../camel/providers/local/camel-mbox-summary.c:1256
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "Сбой записи во временный почтовый ящик: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:118
+#: ../camel/providers/local/camel-mh-folder.c:116
 #, c-format
 msgid "Cannot append message to mh folder: %s: "
 msgstr "Не удалось добавить сообщение в папку mh: %s:"
 
-#: ../camel/providers/local/camel-mh-store.c:533
+#: ../camel/providers/local/camel-mh-store.c:542
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "Не удалось создать папку «%s»: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:549
+#: ../camel/providers/local/camel-mh-store.c:558
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "Не удалось получить папку «%s»: не является каталогом."
 
-#: ../camel/providers/local/camel-mh-summary.c:227
+#: ../camel/providers/local/camel-mh-summary.c:236
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Не удалось открыть MH каталог: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:97
+#: ../camel/providers/local/camel-spool-store.c:95
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "Не удалось открыть файл накопления «%s»: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:111
+#: ../camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "Накопитель «%s» не является обычным файлом или каталогом"
@@ -3902,12 +3905,12 @@ msgstr "Дерево папки спула %s"
 msgid "Invalid spool"
 msgstr "Неверный спул"
 
-#: ../camel/providers/local/camel-spool-store.c:492
+#: ../camel/providers/local/camel-spool-store.c:481
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "Папка «%s/%s» не существует."
 
-#: ../camel/providers/local/camel-spool-store.c:505
+#: ../camel/providers/local/camel-spool-store.c:494
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3916,12 +3919,12 @@ msgstr ""
 "Не удалось открыть папку «%s»:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:511
+#: ../camel/providers/local/camel-spool-store.c:500
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "Папка «%s» не существует."
 
-#: ../camel/providers/local/camel-spool-store.c:519
+#: ../camel/providers/local/camel-spool-store.c:508
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -3930,34 +3933,34 @@ msgstr ""
 "Не удалось создать папку «%s»:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:532
+#: ../camel/providers/local/camel-spool-store.c:521
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "«%s» не является файлом почтового ящика."
 
-#: ../camel/providers/local/camel-spool-store.c:596
+#: ../camel/providers/local/camel-spool-store.c:585
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "Хранилище не поддерживает INBOX"
 
-#: ../camel/providers/local/camel-spool-store.c:615
+#: ../camel/providers/local/camel-spool-store.c:604
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "Папки спула не могут быть удалены"
 
-#: ../camel/providers/local/camel-spool-store.c:630
+#: ../camel/providers/local/camel-spool-store.c:619
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "Папки спула не могут быть переименованы"
 
-#: ../camel/providers/local/camel-spool-summary.c:179
-#: ../camel/providers/local/camel-spool-summary.c:191
-#: ../camel/providers/local/camel-spool-summary.c:203
+#: ../camel/providers/local/camel-spool-summary.c:177
+#: ../camel/providers/local/camel-spool-summary.c:189
+#: ../camel/providers/local/camel-spool-summary.c:201
 #, c-format
 msgid "Could not synchronize temporary folder %s: %s"
 msgstr "Не удалось синхронизировать временную папку %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:221
+#: ../camel/providers/local/camel-spool-summary.c:219
 #, c-format
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "Не удалось синхронизировать папку спула %s: %s"
@@ -3973,103 +3976,108 @@ msgstr ""
 "Не удалось синхронизировать папку спула %s: %s\n"
 "Папка может быть повреждена, копия сохранена в «%s»"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:285
-#: ../camel/providers/nntp/camel-nntp-folder.c:388
-#: ../camel/providers/nntp/camel-nntp-folder.c:510
+#: ../camel/providers/nntp/camel-nntp-folder.c:222
+#: ../camel/providers/nntp/camel-nntp-folder.c:588
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "Внутренняя ошибка: UID в неверном формате: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:349
-#: ../camel/providers/nntp/camel-nntp-folder.c:354
-#: ../camel/providers/pop3/camel-pop3-folder.c:698
-#: ../camel/providers/pop3/camel-pop3-folder.c:1173
+#: ../camel/providers/nntp/camel-nntp-folder.c:291
+#: ../camel/providers/nntp/camel-nntp-folder.c:296
+#: ../camel/providers/pop3/camel-pop3-folder.c:546
+#: ../camel/providers/pop3/camel-pop3-folder.c:945
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Не удалось получить сообщение %s: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:361
-#: ../camel/providers/nntp/camel-nntp-folder.c:536
-#: ../camel/providers/pop3/camel-pop3-folder.c:623
-#: ../camel/providers/pop3/camel-pop3-folder.c:688
-#: ../camel/providers/pop3/camel-pop3-folder.c:707
+#: ../camel/providers/nntp/camel-nntp-folder.c:303
+#: ../camel/providers/nntp/camel-nntp-folder.c:622
+#: ../camel/providers/pop3/camel-pop3-folder.c:476
+#: ../camel/providers/pop3/camel-pop3-folder.c:536
+#: ../camel/providers/pop3/camel-pop3-folder.c:555
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "Не удалось получить сообщение %s: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:525
-#, c-format
-msgid "This message is not currently available"
-msgstr "Это сообщение в настоящий момент недоступно"
-
-#: ../camel/providers/nntp/camel-nntp-folder.c:593
-#: ../camel/providers/nntp/camel-nntp-folder.c:599
+#: ../camel/providers/nntp/camel-nntp-folder.c:430
+#: ../camel/providers/nntp/camel-nntp-folder.c:436
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Ошибка отправки сообщения: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:664
+#: ../camel/providers/nntp/camel-nntp-folder.c:501
 msgid "Posting failed: "
 msgstr "Ошибка отправки сообщения: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:689
+#: ../camel/providers/nntp/camel-nntp-folder.c:611
 #, c-format
-msgid "You cannot post NNTP messages while working offline!"
-msgstr "Вы не можете отправлять сообщения NNTP во время автономной работы!"
+msgid "This message is not currently available"
+msgstr "Это сообщение в настоящий момент недоступно"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:709
-#, c-format
-msgid "You cannot copy messages from a NNTP folder!"
+#: ../camel/providers/nntp/camel-nntp-folder.c:720
+#, fuzzy, c-format
+#| msgid "You cannot copy messages from a NNTP folder!"
+msgid "You cannot copy messages from a NNTP folder"
 msgstr "Вы не можете копировать сообщения из папки NNTP!"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:48
-msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr "_Показывать папки в сокращённой форме (то есть c.o.linux вместо comp.os.linux)"
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
+msgid ""
+"_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:51
+#: ../camel/providers/nntp/camel-nntp-provider.c:49
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "По_казывать относительные имена папок в диалоге подписки"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
 msgid "Default NNTP port"
 msgstr "Порт по умолчанию для NNTP"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:58
+#: ../camel/providers/nntp/camel-nntp-provider.c:56
 msgid "NNTP over SSL"
 msgstr "NNTP поверх SSL"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:64
+#: ../camel/providers/nntp/camel-nntp-provider.c:62
 msgid "USENET news"
 msgstr "Новости USENET"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:66
+#: ../camel/providers/nntp/camel-nntp-provider.c:64
 msgid "This is a provider for reading from and posting to USENET newsgroups."
-msgstr "Это проводник для чтения и отправки сообщений в группы новостей USENET."
+msgstr ""
+"Это проводник для чтения и отправки сообщений в группы новостей USENET."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:87
-msgid "This option will connect to the NNTP server anonymously, without authentication."
+#: ../camel/providers/nntp/camel-nntp-provider.c:85
+msgid ""
+"This option will connect to the NNTP server anonymously, without "
+"authentication."
 msgstr "Этот параметр используется для анонимного подключения к серверу NNTP."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:97
-msgid "This option will authenticate with the NNTP server using a plaintext password."
-msgstr "Подключение к серверу NNTP будет производиться с использованием незашифрованного пароля."
+#: ../camel/providers/nntp/camel-nntp-provider.c:95
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr ""
+"Подключение к серверу NNTP будет производиться с использованием "
+"незашифрованного пароля."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:386
+#: ../camel/providers/nntp/camel-nntp-store.c:371
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "Не удалось прочитать приветствие из %s: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:394
+#: ../camel/providers/nntp/camel-nntp-store.c:379
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "Сервер NNTP %s вернул код ошибки %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:555
+#: ../camel/providers/nntp/camel-nntp-store.c:449
 #, c-format
 msgid "USENET News via %s"
 msgstr "Новости USENET через %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1225
+#: ../camel/providers/nntp/camel-nntp-store.c:1151
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4080,22 +4088,26 @@ msgstr ""
 "\n"
 " %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1337
+#: ../camel/providers/nntp/camel-nntp-store.c:1267
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr "Вы не можете создать папку в группах новостей: вместо этого следует подписаться."
+msgstr ""
+"Вы не можете создать папку в группах новостей: вместо этого следует "
+"подписаться."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1353
+#: ../camel/providers/nntp/camel-nntp-store.c:1283
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "Вы не можете переименовать папку в группах новостей."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1376
+#: ../camel/providers/nntp/camel-nntp-store.c:1306
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr "Вы не можете удалить папку в группах новостей: вместо этого следует отписаться."
+msgstr ""
+"Вы не можете удалить папку в группах новостей: вместо этого следует "
+"отписаться."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1595
+#: ../camel/providers/nntp/camel-nntp-store.c:1516
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4104,9 +4116,10 @@ msgid ""
 msgstr ""
 "Вы не можете подписаться на эту группу новостей:\n"
 "\n"
-"Нет такой группы новостей. Выбранный элемент скорее всего является родительской папкой."
+"Нет такой группы новостей. Выбранный элемент скорее всего является "
+"родительской папкой."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1662
+#: ../camel/providers/nntp/camel-nntp-store.c:1583
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4117,180 +4130,196 @@ msgstr ""
 "\n"
 "Группа новостей не существует!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2099
+#: ../camel/providers/nntp/camel-nntp-store.c:2009
 msgid "NNTP Command failed: "
 msgstr "Сбой команды NNTP: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2196
+#: ../camel/providers/nntp/camel-nntp-store.c:2106
 #, c-format
 msgid "Not connected."
 msgstr "Не подключен."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2290
+#: ../camel/providers/nntp/camel-nntp-store.c:2200
 #, c-format
 msgid "No such folder: %s"
 msgstr "Нет такой папки: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:200
-#: ../camel/providers/nntp/camel-nntp-summary.c:339
+#: ../camel/providers/nntp/camel-nntp-summary.c:197
+#: ../camel/providers/nntp/camel-nntp-summary.c:337
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Поиск новых сообщений"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:222
+#: ../camel/providers/nntp/camel-nntp-summary.c:219
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "Неожиданный ответ сервера от xover: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:360
+#: ../camel/providers/nntp/camel-nntp-summary.c:358
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "Неожиданный ответ сервера от head: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:407
+#: ../camel/providers/nntp/camel-nntp-summary.c:406
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Сбой операции: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:509
-#: ../camel/providers/pop3/camel-pop3-folder.c:588
+#: ../camel/providers/pop3/camel-pop3-folder.c:359
+#: ../camel/providers/pop3/camel-pop3-folder.c:442
 #, c-format
 msgid "No message with UID %s"
 msgstr "Нет сообщения с UID %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:604
+#: ../camel/providers/pop3/camel-pop3-folder.c:458
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Получение сообщения %d по POP"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:699
+#: ../camel/providers/pop3/camel-pop3-folder.c:547
 msgid "Unknown reason"
 msgstr "Неизвестная причина"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:751
+#: ../camel/providers/pop3/camel-pop3-folder.c:598
 msgid "Retrieving POP summary"
 msgstr "Получение краткой информации от сервера POP"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:812
-#: ../camel/providers/pop3/camel-pop3-folder.c:815
-#: ../camel/providers/pop3/camel-pop3-folder.c:828
-#: ../camel/providers/pop3/camel-pop3-folder.c:841
-#: ../camel/providers/pop3/camel-pop3-folder.c:855
+#: ../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
 msgid "Cannot get POP summary: "
 msgstr "Невозможно получить общие данные POP: "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:966
+#: ../camel/providers/pop3/camel-pop3-folder.c:766
 msgid "Expunging old messages"
 msgstr "Уничтожение старых сообщений"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:992
+#: ../camel/providers/pop3/camel-pop3-folder.c:794
 msgid "Expunging deleted messages"
 msgstr "Уничтожение сообщений, помеченных как удалённые"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:39
+#: ../camel/providers/pop3/camel-pop3-provider.c:37
 msgid "Message Storage"
 msgstr "Хранилище сообщений"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:41
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
 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:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "_Удалять через %s дней"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
 msgid "Delete _expunged from local Inbox"
 msgstr "_Удалить сообщения, удалённые из локальной папки «Входящие»"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:49
+#: ../camel/providers/pop3/camel-pop3-provider.c:47
 msgid "Disable _support for all POP3 extensions"
 msgstr "Запретить _поддержку всех расширений POP3"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:53
 msgid "Default POP3 port"
 msgstr "Порт по умолчанию для POP3"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:56
+#: ../camel/providers/pop3/camel-pop3-provider.c:54
 msgid "POP3 over SSL"
 msgstr "POP3 поверх SSL"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:63
+#: ../camel/providers/pop3/camel-pop3-provider.c:61
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:65
+#: ../camel/providers/pop3/camel-pop3-provider.c:63
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Для подключения и принятия почты с серверов POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:85
-msgid "This option will connect to the POP server using a plaintext password. This is the only option 
supported by many POP servers."
-msgstr "Подключение к серверу POP будет производиться с использованием незашифрованного пароля. Большинством 
серверов POP поддерживается только этот вариант."
+#: ../camel/providers/pop3/camel-pop3-provider.c:83
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
+msgstr ""
+"Подключение к серверу POP будет производиться с использованием "
+"незашифрованного пароля. Большинством серверов POP поддерживается только "
+"этот вариант."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:95
-msgid "This option will connect to the POP server using an encrypted password via the APOP protocol. This 
may not work for all users even on servers that claim to support it."
-msgstr "Подключение к серверу POP будет производиться с использованием шифрованного пароля по протоколу 
APOP. Это может работать не для всех пользователей даже на серверах, якобы поддерживающих его."
+#: ../camel/providers/pop3/camel-pop3-provider.c:93
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
+msgstr ""
+"Подключение к серверу POP будет производиться с использованием шифрованного "
+"пароля по протоколу APOP. Это может работать не для всех пользователей даже "
+"на серверах, якобы поддерживающих его."
 
 #. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:99
+#: ../camel/providers/pop3/camel-pop3-store.c:97
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:161
+#: ../camel/providers/pop3/camel-pop3-store.c:164
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "Не удалось получить приглашение от POP-сервера %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:176
+#: ../camel/providers/pop3/camel-pop3-store.c:179
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr "Сбой при подключении к серверу POP %s в защищенном режиме: %s"
+msgstr "Сбой при подключении к серверу POP %s в защищённом режиме: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:177
+#: ../camel/providers/pop3/camel-pop3-store.c:180
 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:198
+#: ../camel/providers/pop3/camel-pop3-store.c:201
 #, 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:211
+#: ../camel/providers/pop3/camel-pop3-store.c:219
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "Не удалось подключиться к POP-серверу %s в защищённом режиме: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:351
+#: ../camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Не удалось зарегистрироваться на сервере POP %s: Ошибка протокола SASL"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:373
+#: ../camel/providers/pop3/camel-pop3-store.c:382
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "Сбой аутентификации на сервере POP %s: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:481
+#: ../camel/providers/pop3/camel-pop3-store.c:490
 #, c-format
 msgid "POP3 server %s"
 msgstr "Сервер POP3 %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:484
+#: ../camel/providers/pop3/camel-pop3-store.c:493
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "Сервер POP3 для %s на %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:703
+#: ../camel/providers/pop3/camel-pop3-store.c:713
 #, c-format
-msgid "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation attack suspected. Please 
contact your admin."
-msgstr "Не удалось соединиться с сервером %s по протоколу POP:\t  Получен некорректный идентификатор APOP. 
Возникает подозрение о проведение атаки на персонификацию. Пожалуйста, свяжитесь с администратором."
+msgid ""
+"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
+"attack suspected. Please contact your admin."
+msgstr ""
+"Не удалось соединиться с сервером %s по протоколу POP:\t  Получен "
+"некорректный идентификатор APOP. Возникает подозрение о проведение атаки на "
+"персонификацию. Пожалуйста, свяжитесь с администратором."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:755
+#: ../camel/providers/pop3/camel-pop3-store.c:768
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4301,7 +4330,7 @@ msgstr ""
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:770
+#: ../camel/providers/pop3/camel-pop3-store.c:783
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4310,314 +4339,322 @@ msgstr ""
 "Не удалось подключиться к POP-серверу %s.\n"
 "Ошибка отправки имени пользователя%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:852
+#: ../camel/providers/pop3/camel-pop3-store.c:865
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Нет такой папки «%s»."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:869
+#: ../camel/providers/pop3/camel-pop3-store.c:882
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "В хранилищах POP3 отсутствует иерархия папок"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:34
 #: ../services/evolution-source-registry/builtin/sendmail.source.in.h:1
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
-msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
 msgstr "Доставка почты с помощью программы «sendmail» на локальной системе."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:50
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:48
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:52
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:50
 msgid "Mail delivery via the sendmail program"
 msgstr "Доставка почты через программу sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:140
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:138
 #, c-format
 msgid "Failed to read From address"
 msgstr "Не удалось прочитать адрес отправителя"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:157
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:155
 #, c-format
 msgid "Message send in offline mode is disabled"
 msgstr "Отправка сообщений в автономном режиме отключена"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:185
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:183
 #, c-format
 msgid "Could not parse recipient list"
 msgstr "Не удалось разобрать список получателей"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:202
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:200
 #, c-format
 msgid "Could not parse arguments"
 msgstr "Не удалось разобрать аргументы"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:233
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:231
 #, c-format
 msgid "Could not create pipe to '%s': %s: mail not sent"
 msgstr "Не удалось создать канал к «%s»: %s. Почта не отправлена"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:258
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:256
 #, c-format
 msgid "Could not fork '%s': %s: mail not sent"
 msgstr "Не удалось выполнить ветвление (fork) «%s»: %s. Почта не отправлена"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:307
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:305
 msgid "Could not send message: "
 msgstr "Не удалось отправить сообщение:"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:337
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:335
 #, c-format
 msgid "'%s' exited with signal %s: mail not sent."
 msgstr "«%s» завершил работу %s. Почта не отправлена."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:347
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:345
 #, c-format
 msgid "Could not execute '%s': mail not sent."
 msgstr "Не удалось выполнить «%s». Почта не отправлена."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:352
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:350
 #, c-format
 msgid "'%s' exited with status %d: mail not sent."
 msgstr "«%s» завершил работу с кодом %d. Почта не отправлена."
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:42
+#: ../camel/providers/smtp/camel-smtp-provider.c:40
 msgid "Default SMTP port"
 msgstr "Порт по умолчанию для SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:43
+#: ../camel/providers/smtp/camel-smtp-provider.c:41
 msgid "SMTP over SSL"
 msgstr "SMTP поверх SSL"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:44
+#: ../camel/providers/smtp/camel-smtp-provider.c:42
 msgid "Message submission port"
 msgstr "Порт отсылки сообщений"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:50
+#: ../camel/providers/smtp/camel-smtp-provider.c:48
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:52
+#: ../camel/providers/smtp/camel-smtp-provider.c:50
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr "Для доставки почты путем подключения к удалённому почтовому концентратору по протоколу SMTP."
+msgstr ""
+"Для доставки почты путём подключения к удалённому почтовому концентратору по "
+"протоколу SMTP."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:158
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
+#: ../camel/providers/smtp/camel-smtp-transport.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Welcome response error: "
 msgstr "Ошибка ответа на приветствие: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
+#: ../camel/providers/smtp/camel-smtp-transport.c:214
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "Не удалось подключиться к SMTP-серверу %s в защищенном режиме: %s"
+msgstr "Не удалось подключиться к SMTP-серверу %s в защищённом режиме: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:212
-#: ../camel/providers/smtp/camel-smtp-transport.c:226
-#: ../camel/providers/smtp/camel-smtp-transport.c:234
+#: ../camel/providers/smtp/camel-smtp-transport.c:224
+#: ../camel/providers/smtp/camel-smtp-transport.c:238
+#: ../camel/providers/smtp/camel-smtp-transport.c:246
 msgid "STARTTLS command failed: "
 msgstr "Сбой команды STARTTLS: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:246
+#: ../camel/providers/smtp/camel-smtp-transport.c:265
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "Не удалось подключиться к SMTP-серверу %s в защищённом режиме: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:338
+#: ../camel/providers/smtp/camel-smtp-transport.c:357
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-сервер %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:341
+#: ../camel/providers/smtp/camel-smtp-transport.c:360
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-доставка почты через %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:415
+#: ../camel/providers/smtp/camel-smtp-transport.c:434
 #, c-format
 msgid "SMTP server %s does not support %s authentication"
 msgstr "Сервер SMTP %s не поддерживает аутентификацию %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:496
+#: ../camel/providers/smtp/camel-smtp-transport.c:506
 #, c-format
 msgid "No SASL mechanism was specified"
 msgstr "Не указан механизм SASL"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:526
-#: ../camel/providers/smtp/camel-smtp-transport.c:537
-#: ../camel/providers/smtp/camel-smtp-transport.c:550
+#: ../camel/providers/smtp/camel-smtp-transport.c:536
+#: ../camel/providers/smtp/camel-smtp-transport.c:547
+#: ../camel/providers/smtp/camel-smtp-transport.c:560
 msgid "AUTH command failed: "
 msgstr "Сбой команды AUTH: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:691
+#: ../camel/providers/smtp/camel-smtp-transport.c:701
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "Не удалось отправить сообщение: сервис не подключён."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:698
+#: ../camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "Не удалось отправить сообщение: неверный адрес отправителя."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:702
+#: ../camel/providers/smtp/camel-smtp-transport.c:712
 msgid "Sending message"
 msgstr "Отправка сообщения"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:737
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "Не удалось отправить сообщение: не определены получатели."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:740
+#: ../camel/providers/smtp/camel-smtp-transport.c:750
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
-msgstr "Не удалось отправить сообщение: указан один или  несколько некорректных получателей"
+msgstr ""
+"Не удалось отправить сообщение: указан один или  несколько некорректных "
+"получателей"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:861
+#: ../camel/providers/smtp/camel-smtp-transport.c:871
 msgid "Syntax error, command unrecognized"
 msgstr "Синтаксическая ошибка, команда не распознана"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:863
+#: ../camel/providers/smtp/camel-smtp-transport.c:873
 msgid "Syntax error in parameters or arguments"
 msgstr "Синтаксическая ошибка в параметрах или аргументах"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:865
+#: ../camel/providers/smtp/camel-smtp-transport.c:875
 msgid "Command not implemented"
 msgstr "Команда не реализована"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:867
+#: ../camel/providers/smtp/camel-smtp-transport.c:877
 msgid "Command parameter not implemented"
 msgstr "Параметр команды не реализован"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:869
+#: ../camel/providers/smtp/camel-smtp-transport.c:879
 msgid "System status, or system help reply"
 msgstr "Состояние системы или ответ системной справки"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:871
+#: ../camel/providers/smtp/camel-smtp-transport.c:881
 msgid "Help message"
 msgstr "Справочное сообщение"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:873
+#: ../camel/providers/smtp/camel-smtp-transport.c:883
 msgid "Service ready"
 msgstr "Сервис готов"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:875
+#: ../camel/providers/smtp/camel-smtp-transport.c:885
 msgid "Service closing transmission channel"
 msgstr "Сервис закрывает канал передачи"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:877
+#: ../camel/providers/smtp/camel-smtp-transport.c:887
 msgid "Service not available, closing transmission channel"
 msgstr "Сервис не доступен, закрытие канала передачи"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:879
+#: ../camel/providers/smtp/camel-smtp-transport.c:889
 msgid "Requested mail action okay, completed"
 msgstr "Запрошенное почтовое действие выполнено"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:881
+#: ../camel/providers/smtp/camel-smtp-transport.c:891
 msgid "User not local; will forward to <forward-path>"
-msgstr "Не локальный пользователь; будет отправлено в соответствии с <forward-path>"
+msgstr ""
+"Не локальный пользователь; будет отправлено в соответствии с <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:883
+#: ../camel/providers/smtp/camel-smtp-transport.c:893
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Запрошенное действие с почтой не выполнено: почтовый ящик недоступен"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:885
+#: ../camel/providers/smtp/camel-smtp-transport.c:895
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Запрошенное действие не выполнено: почтовый ящик недоступен"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:887
+#: ../camel/providers/smtp/camel-smtp-transport.c:897
 msgid "Requested action aborted: error in processing"
 msgstr "Запрошенное действие прервано: ошибка при обработке"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:889
+#: ../camel/providers/smtp/camel-smtp-transport.c:899
 msgid "User not local; please try <forward-path>"
 msgstr "Пользователь не локальный; установите <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:891
+#: ../camel/providers/smtp/camel-smtp-transport.c:901
 msgid "Requested action not taken: insufficient system storage"
-msgstr "Запрошенное действие не выполнено: недостаточно места в системном хранилище"
+msgstr ""
+"Запрошенное действие не выполнено: недостаточно места в системном хранилище"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:893
+#: ../camel/providers/smtp/camel-smtp-transport.c:903
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Запрошенное действие прервано: исчерпано место в хранилище"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:895
+#: ../camel/providers/smtp/camel-smtp-transport.c:905
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Запрошенное действие прервано: имя почтового ящика недопустимо"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:897
+#: ../camel/providers/smtp/camel-smtp-transport.c:907
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Начало ввода почты; окончание после <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:899
+#: ../camel/providers/smtp/camel-smtp-transport.c:909
 msgid "Transaction failed"
 msgstr "Сбой транзакции"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:903
+#: ../camel/providers/smtp/camel-smtp-transport.c:913
 msgid "A password transition is needed"
 msgstr "Необходима передача пароля"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:905
+#: ../camel/providers/smtp/camel-smtp-transport.c:915
 msgid "Authentication mechanism is too weak"
 msgstr "Слишком слабый механизм аутентификации"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:907
+#: ../camel/providers/smtp/camel-smtp-transport.c:917
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Для запрошенного механизма аутентификации требуется шифрование"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:909
+#: ../camel/providers/smtp/camel-smtp-transport.c:919
 msgid "Temporary authentication failure"
 msgstr "Временный сбой аутентификации"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1166
+#: ../camel/providers/smtp/camel-smtp-transport.c:1207
 msgid "SMTP Greeting"
 msgstr "Приветствие SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1193
-#: ../camel/providers/smtp/camel-smtp-transport.c:1207
-#: ../camel/providers/smtp/camel-smtp-transport.c:1215
+#: ../camel/providers/smtp/camel-smtp-transport.c:1217
+#: ../camel/providers/smtp/camel-smtp-transport.c:1231
+#: ../camel/providers/smtp/camel-smtp-transport.c:1239
 msgid "HELO command failed: "
 msgstr "Сбой команды HELO: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1290
-#: ../camel/providers/smtp/camel-smtp-transport.c:1305
-#: ../camel/providers/smtp/camel-smtp-transport.c:1315
+#: ../camel/providers/smtp/camel-smtp-transport.c:1314
+#: ../camel/providers/smtp/camel-smtp-transport.c:1329
+#: ../camel/providers/smtp/camel-smtp-transport.c:1339
 msgid "MAIL FROM command failed: "
 msgstr "Сбой команды MAIL FROM: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1342
+#: ../camel/providers/smtp/camel-smtp-transport.c:1366
 msgid "RCPT TO command failed: "
 msgstr "Сбой команды RCPT TO: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1359
-#: ../camel/providers/smtp/camel-smtp-transport.c:1369
+#: ../camel/providers/smtp/camel-smtp-transport.c:1383
+#: ../camel/providers/smtp/camel-smtp-transport.c:1393
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "Сбой команды RCPT TO <%s>: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1412
-#: ../camel/providers/smtp/camel-smtp-transport.c:1423
-#: ../camel/providers/smtp/camel-smtp-transport.c:1434
-#: ../camel/providers/smtp/camel-smtp-transport.c:1493
-#: ../camel/providers/smtp/camel-smtp-transport.c:1513
-#: ../camel/providers/smtp/camel-smtp-transport.c:1527
-#: ../camel/providers/smtp/camel-smtp-transport.c:1536
+#: ../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:1560
 msgid "DATA command failed: "
 msgstr "Сбой команды DATA: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1561
-#: ../camel/providers/smtp/camel-smtp-transport.c:1576
 #: ../camel/providers/smtp/camel-smtp-transport.c:1585
+#: ../camel/providers/smtp/camel-smtp-transport.c:1600
+#: ../camel/providers/smtp/camel-smtp-transport.c:1609
 msgid "RSET command failed: "
 msgstr "Сбой команды RSET: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1610
-#: ../camel/providers/smtp/camel-smtp-transport.c:1624
-#: ../camel/providers/smtp/camel-smtp-transport.c:1631
+#: ../camel/providers/smtp/camel-smtp-transport.c:1634
+#: ../camel/providers/smtp/camel-smtp-transport.c:1648
+#: ../camel/providers/smtp/camel-smtp-transport.c:1655
 msgid "QUIT command failed: "
 msgstr "Сбой команды QUIT: "
 
@@ -4639,353 +4676,466 @@ msgstr "Значение напоминания о днях рождения и
 
 #: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:4
 msgid "Number of units for determining a birthday or anniversary reminder"
-msgstr "Количество единиц для определения напоминания о днях рождения и годовщинах"
+msgstr ""
+"Количество единиц для определения напоминания о днях рождения и годовщинах"
 
 #: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:5
 msgid "Birthday and anniversary reminder units"
 msgstr "Единицы для напоминания о днях рождения и годовщинах"
 
 #: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:6
-msgid "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or \"days\""
-msgstr "Единицы для напоминания о днях рождения и годовщинах: «minutes», «hours» или «days»"
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\""
+msgstr ""
+"Единицы для напоминания о днях рождения и годовщинах: «minutes», «hours» или "
+"«days»"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
+#, fuzzy
+#| msgid "Proxy type to use"
+msgid "(Deprecated) Proxy type to use"
+msgstr "Тип прокси"
 
-#: ../libebackend/e-authentication-mediator.c:205
-#: ../libebackend/e-authentication-mediator.c:216
-#: ../libebackend/e-authentication-mediator.c:862
-#: ../libebackend/e-authentication-mediator.c:1193
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2
+msgid ""
+"This key was deprecated in version 3.12 and should no longer be used. Proxy "
+"settings are now integrated into Evolution-Data-Server's account system. See "
+"the ESourceProxy API documentation for details."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
+#, fuzzy
+#| msgid "Whether to use http-proxy"
+msgid "(Deprecated) Whether to use http-proxy"
+msgstr "Использовать ли http-proxy"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4
+#, fuzzy
+#| msgid "Whether proxy server requires authentication"
+msgid "(Deprecated) Whether proxy server requires authentication"
+msgstr "Требуется ли аутентификация дли прокси-сервера"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5
+#, fuzzy
+#| msgid "Host name for HTTP requests"
+msgid "(Deprecated) Host name for HTTP requests"
+msgstr "Имя узла для запросов HTTP"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
+#, fuzzy
+#| msgid "Port number for HTTP requests"
+msgid "(Deprecated) Port number for HTTP requests"
+msgstr "Номер порта для запросов HTTP"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7
+#, fuzzy
+#| msgid "Proxy authentication user name"
+msgid "(Deprecated) Proxy authentication user name"
+msgstr "Имя пользователя аутентификации для прокси"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8
+#, fuzzy
+#| msgid "Proxy authentication password"
+msgid "(Deprecated) Proxy authentication password"
+msgstr "Пароль аутентификации для прокси"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9
+#, fuzzy
+#| msgid "List of hosts to connect to without proxy"
+msgid "(Deprecated) List of hosts to connect to without proxy"
+msgstr "Список узлов для подключения без прокси"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10
+#, fuzzy
+#| msgid "Host name for HTTPS requests"
+msgid "(Deprecated) Host name for HTTPS requests"
+msgstr "Имя узла для запросов HTTPS"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
+#, fuzzy
+#| msgid "Port number for HTTPS requests"
+msgid "(Deprecated) Port number for HTTPS requests"
+msgstr "Номер порта для запросов HTTPS"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
+#, fuzzy
+#| msgid "Host name for SOCKS requests"
+msgid "(Deprecated) Host name for SOCKS requests"
+msgstr "Имя узла для запросов SOCKS"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
+#, fuzzy
+#| msgid "Port number for SOCKS requests"
+msgid "(Deprecated) Port number for SOCKS requests"
+msgstr "Номер порта для запросов SOCKS"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
+#, fuzzy
+#| msgid "Automatic proxy configuration URL"
+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:861
+#: ../libebackend/e-authentication-mediator.c:1198
 msgid "Bus name vanished (client terminated?)"
 msgstr "Имя шины пропало (клиент отключился?)"
 
-#: ../libebackend/e-authentication-mediator.c:264
+#: ../libebackend/e-authentication-mediator.c:263
 msgid "No response from client"
 msgstr "Нет ответа от клиента"
 
-#: ../libebackend/e-authentication-mediator.c:334
-#: ../libebackend/e-authentication-mediator.c:345
-#: ../libebackend/e-authentication-mediator.c:856
-#: ../libebackend/e-authentication-mediator.c:1187
+#: ../libebackend/e-authentication-mediator.c:333
+#: ../libebackend/e-authentication-mediator.c:344
+#: ../libebackend/e-authentication-mediator.c:855
+#: ../libebackend/e-authentication-mediator.c:1192
 msgid "Client cancelled the operation"
 msgstr "Клиент отменил операцию"
 
-#: ../libebackend/e-authentication-mediator.c:416
+#: ../libebackend/e-authentication-mediator.c:415
 msgid "Client reports password was rejected"
 msgstr "Пароль клиента отклонён"
 
-#: ../libebackend/e-authentication-session.c:569
+#: ../libebackend/e-authentication-session.c:554
 msgid "Add this password to your keyring"
 msgstr "Добавить этот пароль в связку ключей"
 
-#: ../libebackend/e-authentication-session.c:674
+#: ../libebackend/e-authentication-session.c:664
 msgid "Password was incorrect"
 msgstr "Некорректный пароль"
 
-#: ../libebackend/e-backend.c:428
+#: ../libebackend/e-backend.c:408
 #, c-format
 msgid "%s does not support authentication"
 msgstr "%s не поддерживает аутентификацию"
 
-#: ../libebackend/e-collection-backend.c:800
+#: ../libebackend/e-collection-backend.c:900
 #, c-format
 msgid "%s does not support creating remote resources"
 msgstr "%s не поддерживает создание удалённых ресурсов"
 
-#: ../libebackend/e-collection-backend.c:859
+#: ../libebackend/e-collection-backend.c:959
 #, c-format
 msgid "%s does not support deleting remote resources"
 msgstr "%s не поддерживает удаление удалённых ресурсов"
 
-#: ../libebackend/e-data-factory.c:304
+#: ../libebackend/e-data-factory.c:303
 #, c-format
 msgid "No backend factory for hash key '%s'"
 msgstr "Отсутствует фабрика движка для ключа хэша «%s»"
 
-#: ../libebackend/e-server-side-source.c:134
+#: ../libebackend/e-server-side-source.c:133
 #, c-format
 msgid "Data source is missing a [%s] group"
 msgstr "В источнике данных нет группы [%s]"
 
-#: ../libebackend/e-server-side-source.c:1008
-#: ../libedataserver/e-source.c:1138
+#: ../libebackend/e-server-side-source.c:1020
+#: ../libedataserver/e-source.c:1348
 #, c-format
 msgid "Data source '%s' does not support creating remote resources"
 msgstr "Источник данных «%s» не поддерживает создание удалённых ресурсов"
 
-#: ../libebackend/e-server-side-source.c:1022
+#: ../libebackend/e-server-side-source.c:1034
 #, c-format
-msgid "Data source '%s' has no collection backend to create the remote resource"
+msgid ""
+"Data source '%s' has no collection backend to create the remote resource"
 msgstr "У источника данных «%s» нет бэкэнда для создания удалённого ресурса"
 
-#: ../libebackend/e-server-side-source.c:1050
-#: ../libedataserver/e-source.c:1251
+#: ../libebackend/e-server-side-source.c:1062
+#: ../libedataserver/e-source.c:1461
 #, c-format
 msgid "Data source '%s' does not support deleting remote resources"
 msgstr "Источник данных «%s» не поддерживает удаление удалённых ресурсов"
 
-#: ../libebackend/e-server-side-source.c:1064
+#: ../libebackend/e-server-side-source.c:1076
 #, c-format
-msgid "Data source '%s' has no collection backend to delete the remote resource"
+msgid ""
+"Data source '%s' has no collection backend to delete the remote resource"
 msgstr "У источника данных «%s» нет бэкэнда для удаления удалённого ресурса"
 
-#: ../libebackend/e-server-side-source.c:1095
-#: ../libedataserver/e-source.c:1347
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:990
+#: ../libebackend/e-server-side-source.c:1107
+#: ../libedataserver/e-source.c:1557
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1027
 #, c-format
 msgid "Data source '%s' does not support OAuth 2.0 authentication"
 msgstr "Источник данных «%s» не поддерживает аутентификацию OAuth 2.0"
 
-#: ../libebackend/e-server-side-source.c:1438
+#: ../libebackend/e-server-side-source.c:1452
 #, c-format
 msgid "File must have a '.source' extension"
 msgstr "Файл должен иметь расширение «.source»"
 
-#: ../libebackend/e-source-registry-server.c:521
-#: ../libedataserver/e-source-registry.c:1876
+#: ../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:790
+#: ../libebackend/e-source-registry-server.c:800
 #, c-format
 msgid "UID '%s' is already in use"
 msgstr "UID «%s» уже используется"
 
-#: ../libebackend/e-user-prompter-server.c:301
+#: ../libebackend/e-user-prompter-server.c:305
 #, c-format
 msgid "Extension dialog '%s' not found."
 msgstr "Диалоговое окно расширений «%s» не найдено."
 
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:48
 msgctxt "CategoryName"
 msgid "Anniversary"
 msgstr "Годовщина"
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:49
 msgctxt "CategoryName"
 msgid "Birthday"
 msgstr "День рождения"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:50
 msgctxt "CategoryName"
 msgid "Business"
 msgstr "Бизнес"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:51
 msgctxt "CategoryName"
 msgid "Competition"
 msgstr "Конкуренция"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:52
 msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "Избранные"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:53
 msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "Подарки"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:54
 msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "Цели и задачи"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:55
 msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "Праздник (выходной)"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:56
 msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "Поздравительные открытки"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:58
 msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "Важные контакты"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:59
 msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "Идеи"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:60
 msgctxt "CategoryName"
 msgid "International"
 msgstr "Международные"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:61
 msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "Ключевой потребитель"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:62
 msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "Разное"
 
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:63
 msgctxt "CategoryName"
 msgid "Personal"
 msgstr "Личное"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:64
 msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "Телефонные звонки"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:66
 msgctxt "CategoryName"
 msgid "Status"
 msgstr "Состояние"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:67
 msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "Стратегии"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:68
 msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "Поставщики"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:69
 msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "Время и расходы"
 
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:70
 msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:69
+#: ../libedataserver/e-categories.c:71
 msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "Ожидание"
 
-#: ../libedataserver/e-client.c:133
+#: ../libedataserver/e-client.c:141
 msgid "Source not loaded"
 msgstr "Источник не загружен"
 
-#: ../libedataserver/e-client.c:135
+#: ../libedataserver/e-client.c:143
 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:146
+#: ../libedataserver/e-client.c:154
 msgid "Offline unavailable"
 msgstr "Режим «вне сети» недоступен"
 
-#: ../libedataserver/e-client.c:168
+#: ../libedataserver/e-client.c:176
 msgid "D-Bus error"
 msgstr "Ошибка D-Bus"
 
-#: ../libedataserver/e-source-authenticator.c:166
+#: ../libedataserver/e-source-authenticator.c:162
 msgid "Address book authentication request"
 msgstr "Запрос аутентификации от адресной книги"
 
-#: ../libedataserver/e-source-authenticator.c:171
+#: ../libedataserver/e-source-authenticator.c:167
 msgid "Calendar authentication request"
 msgstr "Запрос аутентификации от календаря"
 
-#: ../libedataserver/e-source-authenticator.c:175
+#: ../libedataserver/e-source-authenticator.c:171
 msgid "Mail authentication request"
 msgstr "Запрос аутентификации от почты"
 
 #. generic account prompt
-#: ../libedataserver/e-source-authenticator.c:178
+#: ../libedataserver/e-source-authenticator.c:174
 msgid "Authentication request"
 msgstr "Запрос аутентификации"
 
-#: ../libedataserver/e-source-authenticator.c:188
+#: ../libedataserver/e-source-authenticator.c:184
 #, c-format
 msgid "Please enter the password for address book \"%s\"."
 msgstr "Введите пароль для адресной книги «%s»."
 
-#: ../libedataserver/e-source-authenticator.c:194
+#: ../libedataserver/e-source-authenticator.c:190
 #, c-format
 msgid "Please enter the password for calendar \"%s\"."
 msgstr "Введите пароль для календаря «%s»."
 
-#: ../libedataserver/e-source-authenticator.c:200
+#: ../libedataserver/e-source-authenticator.c:196
 #, c-format
 msgid "Please enter the password for mail account \"%s\"."
 msgstr "Введите пароль для учётной записи почты «%s»."
 
-#: ../libedataserver/e-source-authenticator.c:206
+#: ../libedataserver/e-source-authenticator.c:202
 #, c-format
 msgid "Please enter the password for mail transport \"%s\"."
 msgstr "Введите пароль для транспорта почты «%s»."
 
-#: ../libedataserver/e-source-authenticator.c:212
+#: ../libedataserver/e-source-authenticator.c:208
 #, c-format
 msgid "Please enter the password for memo list \"%s\"."
 msgstr "Введите пароль для списка заметок «%s»."
 
-#: ../libedataserver/e-source-authenticator.c:218
+#: ../libedataserver/e-source-authenticator.c:214
 #, c-format
 msgid "Please enter the password for task list \"%s\"."
 msgstr "Введите пароль для списка задач «%s»."
 
-#: ../libedataserver/e-source-authenticator.c:224
+#: ../libedataserver/e-source-authenticator.c:220
 #, c-format
 msgid "Please enter the password for account \"%s\"."
 msgstr "Введите пароль для учётной записи «%s»."
 
-#: ../libedataserver/e-source.c:627
+#: ../libedataserver/e-source.c:765
 #, c-format
 msgid "Source file is missing a [%s] group"
 msgstr "В исходном файле отсутствует группа [%s]"
 
-#: ../libedataserver/e-source.c:949
+#: ../libedataserver/e-source.c:1128
 #, c-format
 msgid "Data source '%s' is not removable"
 msgstr "Источник данных «%s» нельзя удалить"
 
-#: ../libedataserver/e-source.c:1041
+#: ../libedataserver/e-source.c:1251
 #, c-format
 msgid "Data source '%s' is not writable"
 msgstr "Источник данных «%s» нельзя изменить"
 
-#: ../libedataserver/e-source.c:1559
+#: ../libedataserver/e-source.c:1864
 msgid "Unnamed"
 msgstr "Безымянный"
 
-#: ../libedataserver/e-source-mail-signature.c:487
+#: ../libedataserver/e-source-mail-signature.c:486
 #, c-format
 msgid "Signature script must be a local file"
 msgstr "Сценарий подписи должен быть локальным файлом"
 
-#: ../libedataserver/e-source-webdav.c:1553
+#: ../libedataserver/e-source-proxy.c:1646
+#, fuzzy, c-format
+#| msgid "Data source '%s' does not support creating remote resources"
+msgid "Source '%s' does not support proxy lookups"
+msgstr "Источник данных «%s» не поддерживает создание удалённых ресурсов"
+
+#: ../libedataserver/e-source-webdav.c:1551
 #, 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», не является доверенным. Принять 
сертификат?"
+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:1562
+#: ../libedataserver/e-source-webdav.c:1560
 #, 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», не является доверенным. Принять сертификат?"
+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:1571
+#: ../libedataserver/e-source-webdav.c:1569
 #, 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», не является доверенным. Принять 
сертификат?"
+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:1580
+#: ../libedataserver/e-source-webdav.c:1578
 #, 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», не является доверенным. Принять 
сертификат?"
+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:1663
-#: ../libedataserver/e-time-utils.c:1962
+#: ../libedataserver/e-time-utils.c:1662 ../libedataserver/e-time-utils.c:1961
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
@@ -4993,8 +5143,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:1668
-#: ../libedataserver/e-time-utils.c:1953
+#: ../libedataserver/e-time-utils.c:1667 ../libedataserver/e-time-utils.c:1952
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
@@ -5002,8 +5151,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:1673
-#: ../libedataserver/e-time-utils.c:1958
+#: ../libedataserver/e-time-utils.c:1672 ../libedataserver/e-time-utils.c:1957
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
@@ -5011,83 +5159,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:1678
-#: ../libedataserver/e-time-utils.c:1949
+#: ../libedataserver/e-time-utils.c:1677 ../libedataserver/e-time-utils.c:1948
 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:1683
+#: ../libedataserver/e-time-utils.c:1682
 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:1688
+#: ../libedataserver/e-time-utils.c:1687
 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:1691
-#: ../libedataserver/e-time-utils.c:1811
-#: ../libedataserver/e-time-utils.c:1944
+#: ../libedataserver/e-time-utils.c:1690 ../libedataserver/e-time-utils.c:1810
+#: ../libedataserver/e-time-utils.c:1943
 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:1698
+#: ../libedataserver/e-time-utils.c:1697
 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:1702
+#: ../libedataserver/e-time-utils.c:1701
 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:1707
+#: ../libedataserver/e-time-utils.c:1706
 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:1712
+#: ../libedataserver/e-time-utils.c:1711
 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:1717
+#: ../libedataserver/e-time-utils.c:1716
 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:1722
+#: ../libedataserver/e-time-utils.c:1721
 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:1725
-#: ../libedataserver/e-time-utils.c:1814
+#: ../libedataserver/e-time-utils.c:1724 ../libedataserver/e-time-utils.c:1813
 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:1885
-#: ../libedataserver/e-time-utils.c:2006
+#: ../libedataserver/e-time-utils.c:1884 ../libedataserver/e-time-utils.c:2005
 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:1889
-#: ../libedataserver/e-time-utils.c:1998
+#: ../libedataserver/e-time-utils.c:1888 ../libedataserver/e-time-utils.c:1997
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -5095,562 +5238,162 @@ msgstr "%H:%M:%S"
 #. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1894
-#: ../libedataserver/e-time-utils.c:2003
+#: ../libedataserver/e-time-utils.c:1893 ../libedataserver/e-time-utils.c:2002
 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:1898
-#: ../libedataserver/e-time-utils.c:1995
+#: ../libedataserver/e-time-utils.c:1897 ../libedataserver/e-time-utils.c:1994
 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:1902
+#: ../libedataserver/e-time-utils.c:1901
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1906
+#: ../libedataserver/e-time-utils.c:1905
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
-msgid "Proxy type to use"
-msgstr "Тип прокси"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2
-msgid "What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" means manual proxy."
-msgstr "Тип используемого прокси. «0» — системный; «1» — без прокси; «2» — прокси, настроенный вручную."
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
-msgid "Whether to use http-proxy"
-msgstr "Использовать ли http-proxy"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4
-msgid "Whether to use proxy for HTTP requests."
-msgstr "Использовать ли прокси для запросов HTTP."
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5
-msgid "Whether proxy server requires authentication"
-msgstr "Требуется ли аутентификация дли прокси-сервера"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
-msgid "Whether authentication is required to access proxy server."
-msgstr "Требуется ли для доступа к серверу прокси аутентификация."
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7
-msgid "Host name for HTTP requests"
-msgstr "Имя узла для запросов HTTP"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8
-msgid "Host name to use for HTTP requests."
-msgstr "Имя узла для запросов HTTP."
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9
-msgid "Port number for HTTP requests"
-msgstr "Номер порта для запросов HTTP"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10
-msgid "Port number to use for HTTP requests."
-msgstr "Номер порта для запросов HTTP."
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
-msgid "Proxy authentication user name"
-msgstr "Имя пользователя аутентификации для прокси"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
-msgid "User name to use to authenticate against proxy server."
-msgstr "Имя пользователя для аутентификации через сервер прокси."
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
-msgid "Proxy authentication password"
-msgstr "Пароль аутентификации для прокси"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
-msgid "Password to use to authenticate against proxy server."
-msgstr "Пароль для аутентификации через сервер прокси."
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:15
-msgid "List of hosts to connect to without proxy"
-msgstr "Список узлов для подключения без прокси"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:16
-msgid "List of hosts for which do not use proxy."
-msgstr "Список узлов для подключения без прокси."
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:17
-msgid "Host name for HTTPS requests"
-msgstr "Имя узла для запросов HTTPS"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:18
-msgid "Host name to use for HTTPS requests."
-msgstr "Имя узла для запросов HTTPS."
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:19
-msgid "Port number for HTTPS requests"
-msgstr "Номер порта для запросов HTTPS"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:20
-msgid "Port number to use for HTTPS requests."
-msgstr "Номер порта для запросов HTTPS."
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:21
-msgid "Host name for SOCKS requests"
-msgstr "Имя узла для запросов SOCKS"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:22
-msgid "Host name to use for SOCKS requests."
-msgstr "Имя узла для запросов SOCKS."
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:23
-msgid "Port number for SOCKS requests"
-msgstr "Номер порта для запросов SOCKS"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:24
-msgid "Port number to use for SOCKS requests."
-msgstr "Номер порта для запросов SOCKS."
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:25
-msgid "Automatic proxy configuration URL"
-msgstr "URL автоматической настройки прокси"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:26
-msgid "Where to read automatic proxy configuration from."
-msgstr "Откуда читается автоматическая настройка прокси."
-
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:129
-#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:365
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:130
+#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:364
 #, c-format
 msgid "No such data source for UID '%s'"
 msgstr "Нет такого источника данных для UID «%s»"
 
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:141
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:142
 #, c-format
-msgid "Cannot find a corresponding account in the org.gnome.OnlineAccounts service from which to obtain a 
password for '%s'"
-msgstr "Не удалось найти соответствующую учётную запись в службе org.gnome.OnlineAccounts, с помощью которой 
можно получить пароль для «%s»"
+msgid ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain a password for '%s'"
+msgstr ""
+"Не удалось найти соответствующую учётную запись в службе org.gnome."
+"OnlineAccounts, с помощью которой можно получить пароль для «%s»"
 
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:213
+#: ../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:222
+#: ../modules/gnome-online-accounts/goaewsclient.c:219
 #, c-format
 msgid "Code: %u - Unexpected response from server"
 msgstr "Код: %u — неожиданный ответ от сервера"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:243
+#: ../modules/gnome-online-accounts/goaewsclient.c:240
 #, c-format
 msgid "Failed to parse autodiscover response XML"
 msgstr "Не удалось разобрать XML ответа автообнаружения"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:252
+#: ../modules/gnome-online-accounts/goaewsclient.c:249
 #, c-format
 msgid "Failed to find Autodiscover element"
 msgstr "Не удалось найти элемент Autodiscover"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:264
+#: ../modules/gnome-online-accounts/goaewsclient.c:261
 #, c-format
 msgid "Failed to find Response element"
 msgstr "Не удалось найти элемент Response"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:276
+#: ../modules/gnome-online-accounts/goaewsclient.c:273
 #, c-format
 msgid "Failed to find Account element"
 msgstr "Не удалось найти элемент Account"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:290
+#: ../modules/gnome-online-accounts/goaewsclient.c:287
 #, c-format
 msgid "Failed to find ASUrl and OABUrl in autodiscover response"
 msgstr "Не удалось найти ASUrl и OABUrl в ответе автообнаружения"
 
-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1238
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1261
 #, c-format
-msgid "Cannot find a corresponding account in the org.gnome.OnlineAccounts service from which to obtain an 
access token for '%s'"
-msgstr "Не удалось найти соответствующую запись в службе org.gnome.OnlineAccounts, с помощью которой можно 
получить маркер доступа для «%s»"
+msgid ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain an access token for '%s'"
+msgstr ""
+"Не удалось найти соответствующую запись в службе org.gnome.OnlineAccounts, с "
+"помощью которой можно получить маркер доступа для «%s»"
 
-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1265
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1288
 #, c-format
 msgid "Failed to obtain an access token for '%s': "
 msgstr "Не удалось получить маркер доступа для «%s»: "
 
-#: ../modules/google-backend/module-google-backend.c:192
+#: ../modules/google-backend/module-google-backend.c:191
 #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1
-#: ../modules/yahoo-backend/module-yahoo-backend.c:200
+#: ../modules/yahoo-backend/module-yahoo-backend.c:199
 msgid "Calendar"
 msgstr "Календарь"
 
-#: ../modules/google-backend/module-google-backend.c:261
+#: ../modules/google-backend/module-google-backend.c:260
 #: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
 #: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
 msgid "Contacts"
 msgstr "Контакты"
 
-#: ../modules/trust-prompt/certificate-viewer.c:292
-msgid "Not part of certificate"
-msgstr "Не входит в сертификат"
-
-#: ../modules/trust-prompt/certificate-viewer.c:575
-msgid "_Close"
-msgstr "_Закрыть"
-
-#: ../modules/trust-prompt/certificate-viewer.c:600
-msgid "This certificate has been verified for the following uses:"
-msgstr "Этот сертификат проверен для следующих применений:"
-
-#: ../modules/trust-prompt/certificate-viewer.c:604
-#: ../modules/trust-prompt/e-asn1-object.c:387
-msgid "SSL Client Certificate"
-msgstr "Клиентский сертификат SSL"
-
-#: ../modules/trust-prompt/certificate-viewer.c:609
-#: ../modules/trust-prompt/e-asn1-object.c:391
-msgid "SSL Server Certificate"
-msgstr "Серверный сертификат SSL"
-
-#: ../modules/trust-prompt/certificate-viewer.c:614
-msgid "Email Signer Certificate"
-msgstr "Сертификат подписчика почты"
-
-#: ../modules/trust-prompt/certificate-viewer.c:619
-msgid "Email Recipient Certificate"
-msgstr "Сертификат получателя почты"
-
-#: ../modules/trust-prompt/certificate-viewer.c:634
-msgid "Issued To"
-msgstr "Кому выдано"
-
-#: ../modules/trust-prompt/certificate-viewer.c:635
-#: ../modules/trust-prompt/certificate-viewer.c:641
-msgid "Common Name (CN)"
-msgstr "Общее имя (CN)"
-
-#: ../modules/trust-prompt/certificate-viewer.c:636
-#: ../modules/trust-prompt/certificate-viewer.c:642
-msgid "Organization (O)"
-msgstr "Организация (O)"
-
-#: ../modules/trust-prompt/certificate-viewer.c:637
-#: ../modules/trust-prompt/certificate-viewer.c:643
-msgid "Organizational Unit (OU)"
-msgstr "Подразделение организации (OU)"
-
-#: ../modules/trust-prompt/certificate-viewer.c:638
-#: ../modules/trust-prompt/e-asn1-object.c:134
-msgid "Serial Number"
-msgstr "Серийный номер"
-
-#: ../modules/trust-prompt/certificate-viewer.c:640
-msgid "Issued By"
-msgstr "Кем выдано"
-
-#: ../modules/trust-prompt/certificate-viewer.c:645
-msgid "Validity"
-msgstr "Срок действия"
-
-#: ../modules/trust-prompt/certificate-viewer.c:646
-msgid "Issued On"
-msgstr "Выдано"
-
-#: ../modules/trust-prompt/certificate-viewer.c:647
-msgid "Expires On"
-msgstr "Истекает"
-
-#: ../modules/trust-prompt/certificate-viewer.c:649
-msgid "Fingerprints"
-msgstr "Отпечатки"
-
-#: ../modules/trust-prompt/certificate-viewer.c:650
-msgid "SHA1 Fingerprint"
-msgstr "Отпечаток SHA1"
-
-#: ../modules/trust-prompt/certificate-viewer.c:651
-msgid "MD5 Fingerprint"
-msgstr "Отпечаток MD5"
-
-#: ../modules/trust-prompt/certificate-viewer.c:653
-msgid "General"
-msgstr "Общие"
-
-#: ../modules/trust-prompt/certificate-viewer.c:672
-msgid "Certificate Hierarchy"
-msgstr "Иерархия сертификата"
-
-#: ../modules/trust-prompt/certificate-viewer.c:676
-msgid "Certificate Fields"
-msgstr "Поля сертификата"
-
-#: ../modules/trust-prompt/certificate-viewer.c:680
-msgid "Field Value"
-msgstr "Значение поля"
-
-#: ../modules/trust-prompt/certificate-viewer.c:682
-msgid "Details"
-msgstr "Подробности"
-
-#: ../modules/trust-prompt/e-asn1-object.c:95
-msgid "Version"
-msgstr "Версия"
-
-#: ../modules/trust-prompt/e-asn1-object.c:110
-msgid "Version 1"
-msgstr "Версия 1"
-
-#: ../modules/trust-prompt/e-asn1-object.c:113
-msgid "Version 2"
-msgstr "Версия 3"
-
-#: ../modules/trust-prompt/e-asn1-object.c:116
-msgid "Version 3"
-msgstr "Версия 3"
-
-#: ../modules/trust-prompt/e-asn1-object.c:192
-msgid "PKCS #1 MD2 With RSA Encryption"
-msgstr "PKCS #1 MD2 с шифрованием RSA"
-
-#: ../modules/trust-prompt/e-asn1-object.c:195
-msgid "PKCS #1 MD5 With RSA Encryption"
-msgstr "PKCS #1 MD5 с шифрованием RSA"
-
-#: ../modules/trust-prompt/e-asn1-object.c:198
-msgid "PKCS #1 SHA-1 With RSA Encryption"
-msgstr "PKCS #1 SHA-1 с шифрованием RSA"
-
-#: ../modules/trust-prompt/e-asn1-object.c:201
-msgid "PKCS #1 SHA-256 With RSA Encryption"
-msgstr "PKCS #1 SHA-256 с шифрованием RSA"
-
-#: ../modules/trust-prompt/e-asn1-object.c:204
-msgid "PKCS #1 SHA-384 With RSA Encryption"
-msgstr "PKCS #1 SHA-384 с шифрованием RSA"
-
-#: ../modules/trust-prompt/e-asn1-object.c:207
-msgid "PKCS #1 SHA-512 With RSA Encryption"
-msgstr "PKCS #1 SHA-512 с шифрованием RSA"
-
-#: ../modules/trust-prompt/e-asn1-object.c:234
-msgid "PKCS #1 RSA Encryption"
-msgstr "PKCS #1 шифрование RSA"
-
-#: ../modules/trust-prompt/e-asn1-object.c:237
-msgid "Certificate Key Usage"
-msgstr "Использование ключа сертификата"
-
-#: ../modules/trust-prompt/e-asn1-object.c:240
-msgid "Netscape Certificate Type"
-msgstr "Тип сертификата Netscape"
-
-#: ../modules/trust-prompt/e-asn1-object.c:243
-msgid "Certificate Authority Key Identifier"
-msgstr "Идентификатор ключа удостоверяющего центра сертификата"
-
-#: ../modules/trust-prompt/e-asn1-object.c:255
-#, c-format
-msgid "Object Identifier (%s)"
-msgstr "Идентификатор объекта (%s)"
-
-#: ../modules/trust-prompt/e-asn1-object.c:306
-msgid "Algorithm Identifier"
-msgstr "Идентификатор алгоритма"
-
-#: ../modules/trust-prompt/e-asn1-object.c:314
-msgid "Algorithm Parameters"
-msgstr "Параметры алгоритма"
-
-#: ../modules/trust-prompt/e-asn1-object.c:336
-msgid "Subject Public Key Info"
-msgstr "Информация о публичном ключе субъекта"
-
-#: ../modules/trust-prompt/e-asn1-object.c:341
-msgid "Subject Public Key Algorithm"
-msgstr "Алгоритм публичного ключа субъекта"
-
-#: ../modules/trust-prompt/e-asn1-object.c:356
-msgid "Subject's Public Key"
-msgstr "Публичный ключ субъекта"
-
-#: ../modules/trust-prompt/e-asn1-object.c:378
-#: ../modules/trust-prompt/e-asn1-object.c:428
-msgid "Error: Unable to process extension"
-msgstr "Ошибка: невозможно обработать расширение"
-
-#: ../modules/trust-prompt/e-asn1-object.c:395
-msgid "Email"
-msgstr "Эл. почта"
-
-#: ../modules/trust-prompt/e-asn1-object.c:399
-#: ../modules/trust-prompt/e-asn1-object.c:411
-msgid "Object Signer"
-msgstr "Подписчик объекта"
-
-#: ../modules/trust-prompt/e-asn1-object.c:403
-msgid "SSL Certificate Authority"
-msgstr "Удостоверяющий центр SSL-сертификата"
-
-#: ../modules/trust-prompt/e-asn1-object.c:407
-msgid "Email Certificate Authority"
-msgstr "Эл. почта центра сертификации"
-
-#: ../modules/trust-prompt/e-asn1-object.c:436
-msgid "Signing"
-msgstr "Подпись"
-
-#: ../modules/trust-prompt/e-asn1-object.c:440
-msgid "Non-repudiation"
-msgstr "Безотказность"
-
-#: ../modules/trust-prompt/e-asn1-object.c:444
-msgid "Key Encipherment"
-msgstr "Шифрование ключа"
-
-#: ../modules/trust-prompt/e-asn1-object.c:448
-msgid "Data Encipherment"
-msgstr "Шифрование данных"
-
-#: ../modules/trust-prompt/e-asn1-object.c:452
-msgid "Key Agreement"
-msgstr "Соглашение о ключе"
-
-#: ../modules/trust-prompt/e-asn1-object.c:456
-msgid "Certificate Signer"
-msgstr "Подписчик сертификата"
-
-#: ../modules/trust-prompt/e-asn1-object.c:460
-msgid "CRL Signer"
-msgstr "Подписчик CRL"
-
-#: ../modules/trust-prompt/e-asn1-object.c:509
-msgid "Critical"
-msgstr "Критично"
-
-#: ../modules/trust-prompt/e-asn1-object.c:511
-#: ../modules/trust-prompt/e-asn1-object.c:514
-msgid "Not Critical"
-msgstr "Не критично"
-
-#: ../modules/trust-prompt/e-asn1-object.c:535
-msgid "Extensions"
-msgstr "Расширения"
-
-#. Translators: This string is used in Certificate
-#. * details for fields like Issuer or Subject, which
-#. * shows the field name on the left and its respective
-#. * value on the right, both as stored in the
-#. * certificate itself.  You probably do not need to
-#. * change this string, unless changing the order of
-#. * name and value.  As a result example:
-#. * "OU = VeriSign Trust Network"
-#: ../modules/trust-prompt/e-asn1-object.c:615
-#, c-format
-msgid "%s = %s"
-msgstr "%s = %s"
-
-#: ../modules/trust-prompt/e-asn1-object.c:658
-msgid "Certificate"
-msgstr "Сертификат"
-
-#: ../modules/trust-prompt/e-asn1-object.c:674
-#: ../modules/trust-prompt/e-asn1-object.c:812
-msgid "Certificate Signature Algorithm"
-msgstr "Алгоритм подписи сертификата"
-
-#: ../modules/trust-prompt/e-asn1-object.c:683
-msgid "Issuer"
-msgstr "Издатель"
-
-#: ../modules/trust-prompt/e-asn1-object.c:714
-msgid "Subject"
-msgstr "Субъект"
-
-#: ../modules/trust-prompt/e-asn1-object.c:738
-msgid "Issuer Unique ID"
-msgstr "Уникальный идентификатор издателя"
-
-#: ../modules/trust-prompt/e-asn1-object.c:757
-msgid "Subject Unique ID"
-msgstr "Уникальный идентификатор субъекта"
-
-#: ../modules/trust-prompt/e-asn1-object.c:818
-msgid "Certificate Signature Value"
-msgstr "Значение подписи сертификата"
-
-#: ../modules/trust-prompt/module-trust-prompt.c:201
+#: ../modules/trust-prompt/module-trust-prompt.c:82
 msgid "The signing certificate authority is not known."
 msgstr "Удостоверяющий центр сертификата неизвестен."
 
-#: ../modules/trust-prompt/module-trust-prompt.c:203
-msgid "The certificate does not match the expected identity of the site that it was retrieved from."
+#: ../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:205
+#: ../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:207
+#: ../modules/trust-prompt/module-trust-prompt.c:88
 msgid "The certificate has expired."
 msgstr "Срок действия сертификата истёк."
 
-#: ../modules/trust-prompt/module-trust-prompt.c:209
-msgid "The certificate has been revoked according to the connection's certificate revocation list."
-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:211
+#: ../modules/trust-prompt/module-trust-prompt.c:92
 msgid "The certificate's algorithm is considered insecure."
 msgstr "Алгоритм сертификата считается небезопасным."
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:162
+#: ../modules/trust-prompt/trust-prompt-gtk.c:119
 msgid "Certificate trust..."
 msgstr "Доверять сертификату…"
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:163
-msgid "_View Certificate"
-msgstr "_Показать сертификат"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:164
+#: ../modules/trust-prompt/trust-prompt-gtk.c:120
 msgid "_Reject"
 msgstr "_Отклонить"
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:165
+#: ../modules/trust-prompt/trust-prompt-gtk.c:121
 msgid "Accept _Temporarily"
 msgstr "_Временно принять"
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:166
+#: ../modules/trust-prompt/trust-prompt-gtk.c:122
 msgid "_Accept Permanently"
 msgstr "_Принять"
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:203
+#: ../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:209
-msgid "Detailed information about the certificate:"
-msgstr "Подробная информация о сертификате:"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:223
-msgid "Issuer:"
-msgstr "Издатель:"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:224
-msgid "Subject:"
-msgstr "Субъект:"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:225
-msgid "Fingerprint:"
-msgstr "Отпечаток:"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:226
+#: ../modules/trust-prompt/trust-prompt-gtk.c:175
 msgid "Reason:"
 msgstr "Причина:"
 
@@ -5662,7 +5405,7 @@ msgstr "Интеграция ваших календарей"
 msgid "Integrate your contacts"
 msgstr "Интеграция ваших контаков"
 
-#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:257
+#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:256
 msgid "Signon service did not return a secret"
 msgstr "Служба регистрации не вернула секрет"
 
@@ -5694,24 +5437,52 @@ msgstr "Почта"
 msgid "Integrate your mailboxes"
 msgstr "Интегрировать ваши почтовые ящики"
 
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:971
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1008
 #, c-format
-msgid "Cannot find a corresponding account service in the accounts database from which to obtain an access 
token for '%s'"
-msgstr "Не удалось найти соответствующую учётную запись службы в базе данных учётных записей, с помощью 
которой можно получить маркер доступа для «%s»"
+msgid ""
+"Cannot find a corresponding account service in the accounts database from "
+"which to obtain an access token for '%s'"
+msgstr ""
+"Не удалось найти соответствующую учётную запись службы в базе данных учётных "
+"записей, с помощью которой можно получить маркер доступа для «%s»"
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:79
-#, c-format
-msgid "Expected status 200 when requesting guid, instead got status %d (%s)"
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:84
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:281
+#, fuzzy, c-format
+#| msgid "Expected status 200 when requesting guid, instead got status %d (%s)"
+msgid ""
+"Expected status 200 when requesting your identity, instead got status %d (%s)"
 msgstr "Вместо ожидаемого статуса 200 при запросе guid получен статус %d (%s)"
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:96
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:101
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:298
 msgid "Error parsing response as JSON: "
 msgstr "Не удалось разобрать как JSON:"
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:112
-msgid "Didn't find email member in JSON data"
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:119
+#, fuzzy
+#| msgid "Didn't find email member in JSON data"
+msgid "Didn't find 'email' in JSON data"
+msgstr "Не удалось найти член «email» в данных JSON"
+
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:316
+#, fuzzy
+#| msgid "Didn't find email member in JSON data"
+msgid "Didn't find 'id' in JSON data"
+msgstr "Не удалось найти член «email» в данных JSON"
+
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:321
+#, fuzzy
+#| msgid "Didn't find email member in JSON data"
+msgid "Didn't find 'emails.account' in JSON data"
 msgstr "Не удалось найти член «email» в данных JSON"
 
+#: ../modules/ubuntu-online-accounts/windows-live-mail.service.in.in.h:1
+#, fuzzy
+#| msgid "Wants HTML Mail"
+msgid "Windows Live Mail"
+msgstr "Предпочитает почту в HTML"
+
 #: ../modules/ubuntu-online-accounts/yahoo-calendar.service.in.in.h:1
 msgid "Yahoo! Calendar"
 msgstr "Календарь Yahoo!"
@@ -5720,18 +5491,18 @@ msgstr "Календарь Yahoo!"
 msgid "Yahoo! Mail"
 msgstr "Почта Yahoo!"
 
-#: ../modules/yahoo-backend/module-yahoo-backend.c:227
+#: ../modules/yahoo-backend/module-yahoo-backend.c:226
 msgid "Tasks"
 msgstr "Задачи"
 
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:47
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:51
-#: ../services/evolution-user-prompter/evolution-user-prompter.c:31
+#: ../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
 msgid "Keep running after the last client is closed"
 msgstr "Сохранять запущенным после закрытия последнего клиента"
 
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:49
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:53
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:48
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:52
 msgid "Wait running until at least one client is connected"
 msgstr "Работает до тех пор, пока подключён хотя бы один клиент"
 
@@ -5774,6 +5545,406 @@ msgstr "В Интернете"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../services/evolution-user-prompter/prompt-user-gtk.c:122
+#: ../services/evolution-source-registry/evolution-source-registry.c:38
+msgid "Don't migrate user data from previous versions of Evolution"
+msgstr ""
+
+#: ../services/evolution-user-prompter/prompt-user-gtk.c:121
 msgid "_Dismiss"
 msgstr "_Отклонить"
+
+#~ msgid "You may not import keys with this cipher"
+#~ msgstr "Импорт ключей не поддерживается этим шифром"
+
+#~ msgid "You may not export keys with this cipher"
+#~ msgstr "Экспорт ключей не поддерживается этим шифром"
+
+#~ msgid ""
+#~ "Could not write log entry: %s\n"
+#~ "Further operations on this server will not be replayed when you\n"
+#~ "reconnect to the network."
+#~ msgstr ""
+#~ "Не удалось произвести запись в журнал: %s\n"
+#~ "Дальнейшие операции не будут записаны и, соответственно, не будут\n"
+#~ "воспроизведены после подключения к серверу."
+
+#~ msgid ""
+#~ "Could not open '%s':\n"
+#~ "%s\n"
+#~ "Changes made to this folder will not be resynchronized."
+#~ msgstr ""
+#~ "Не удалось открыть «%s»:\n"
+#~ "%s\n"
+#~ "Изменения, сделанные в этой папке, не будут синхронизированы."
+
+#~ msgid "Resynchronizing with server"
+#~ msgstr "Синхронизация с сервером"
+
+#~ msgid "Preparing folder '%s' for offline"
+#~ msgstr "Подготовка папки «%s» для автономной работы"
+
+#~ msgid "Canceled"
+#~ msgstr "Отменено"
+
+#~ msgid ""
+#~ "Alert from IMAP server %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Предупреждение от сервера IMAP %s:\n"
+#~ "%s"
+
+#~ msgid "Error while fetching messages"
+#~ msgstr "Ошибка при получении сообщений"
+
+#~ msgid "Fetching summary information for %d message in '%s'"
+#~ msgid_plural "Fetching summary information for %d messages in '%s'"
+#~ msgstr[0] "Получение краткой информации об %d новом сообщении в «%s»"
+#~ msgstr[1] "Получение краткой информации о %d новых сообщениях в «%s»"
+#~ msgstr[2] "Получение краткой информации о %d новых сообщениях в «%s»"
+
+#~ msgid "Unknown parent folder: %s"
+#~ msgstr "Неизвестная родительская папка: %s"
+
+#~ msgid "The parent folder is not allowed to contain subfolders"
+#~ msgstr "Эта папка не может содержать подпапки"
+
+#~ msgid "Resolving address"
+#~ msgstr "Поиск адреса"
+
+#~ msgid "Name lookup failed"
+#~ msgstr "Имя узла не найдено"
+
+#~ msgid "Name lookup failed. Check your host name for spelling errors."
+#~ msgstr "Имя узла не найдено. Проверьте правильность имени узла."
+
+#~ msgid "Name lookup failed: %s"
+#~ msgstr "Имя узла не найдено: %s"
+
+#~ msgid "Could not connect to '%s:%s': "
+#~ msgstr "Не удалось подключиться к «%s:%s»: "
+
+#~ msgid "Please enter the %s password for %s on host %s."
+#~ msgstr "Введите пароль %s для %s на узле %s."
+
+#~ msgid "NSPR error code %d"
+#~ msgstr "Код ошибки NSPR %d"
+
+#~ msgid "The proxy host does not support SOCKS4"
+#~ msgstr "Узел прокси не поддерживает SOCKS4"
+
+#~ msgid "The proxy host denied our request: code %d"
+#~ msgstr "Узел прокси отклонил запрос: код %d"
+
+#~ msgid "The proxy host does not support SOCKS5"
+#~ msgstr "Узел прокси не поддерживает SOCKS5"
+
+#~ msgid "Could not find a suitable authentication type: code 0x%x"
+#~ msgstr "Не удалось найти подходящий тип аутентификации: код 0x%x"
+
+#~ msgid "General SOCKS server failure"
+#~ msgstr "Сбой сервера SOCKS"
+
+#~ msgid "SOCKS server's rules do not allow connection"
+#~ msgstr "Правила сервера SOCKS запрещают подключение"
+
+#~ msgid "Network is unreachable from SOCKS server"
+#~ msgstr "Сеть недоступна через сервер SOCKS"
+
+#~ msgid "Host is unreachable from SOCKS server"
+#~ msgstr "Узел недоступен через сервер SOCKS"
+
+#~ msgid "Connection refused"
+#~ msgstr "Соединение отклонено"
+
+#~ msgid "Time-to-live expired"
+#~ msgstr "Превышено максимальное время ожидания"
+
+#~ msgid "Command not supported by SOCKS server"
+#~ msgstr "Команда не поддерживается сервером SOCKS"
+
+#~ msgid "Address type not supported by SOCKS server"
+#~ msgstr "Тип адреса не поддерживается сервером SOCKS"
+
+#~ msgid "Unknown error from SOCKS server"
+#~ msgstr "Получена неизвестная ошибка от сервера SOCKS"
+
+#~ msgid "Got unknown address type from SOCKS server"
+#~ msgstr "От сервера SOCKS получен адрес неизвестного типа"
+
+#~ msgid "Incomplete reply from SOCKS server"
+#~ msgstr "Получен неполный ответ от сервера SOCKS"
+
+#~ msgid "Hostname is too long (maximum is 255 characters)"
+#~ msgstr "Слишком длинное имя узла (максимальное кол-во символов — 255)"
+
+#~ msgid "Invalid reply from proxy server"
+#~ msgstr "Недопустимый ответ от прокси-сервера"
+
+#~ msgid "Unable to add message to summary: unknown reason"
+#~ msgstr ""
+#~ "Не удалось добавить сообщение к краткой информации: причина неизвестна"
+
+#~ msgid "Fatal mail parser error near position %s in folder %s"
+#~ msgstr "Фатальная ошибка почтового анализатора возле позиции %s в папке %s"
+
+#~ msgid "You cannot post NNTP messages while working offline!"
+#~ msgstr "Вы не можете отправлять сообщения NNTP во время автономной работы!"
+
+#~ msgid ""
+#~ "What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" "
+#~ "means manual proxy."
+#~ msgstr ""
+#~ "Тип используемого прокси. «0» — системный; «1» — без прокси; «2» — "
+#~ "прокси, настроенный вручную."
+
+#~ msgid "Whether to use proxy for HTTP requests."
+#~ msgstr "Использовать ли прокси для запросов HTTP."
+
+#~ msgid "Whether authentication is required to access proxy server."
+#~ msgstr "Требуется ли для доступа к серверу прокси аутентификация."
+
+#~ msgid "Host name to use for HTTP requests."
+#~ msgstr "Имя узла для запросов HTTP."
+
+#~ msgid "Port number to use for HTTP requests."
+#~ msgstr "Номер порта для запросов HTTP."
+
+#~ msgid "User name to use to authenticate against proxy server."
+#~ msgstr "Имя пользователя для аутентификации через сервер прокси."
+
+#~ msgid "Password to use to authenticate against proxy server."
+#~ msgstr "Пароль для аутентификации через сервер прокси."
+
+#~ msgid "List of hosts for which do not use proxy."
+#~ msgstr "Список узлов для подключения без прокси."
+
+#~ msgid "Host name to use for HTTPS requests."
+#~ msgstr "Имя узла для запросов HTTPS."
+
+#~ msgid "Port number to use for HTTPS requests."
+#~ msgstr "Номер порта для запросов HTTPS."
+
+#~ msgid "Host name to use for SOCKS requests."
+#~ msgstr "Имя узла для запросов SOCKS."
+
+#~ msgid "Port number to use for SOCKS requests."
+#~ msgstr "Номер порта для запросов SOCKS."
+
+#~ msgid "Where to read automatic proxy configuration from."
+#~ msgstr "Откуда читается автоматическая настройка прокси."
+
+#~ msgid "Not part of certificate"
+#~ msgstr "Не входит в сертификат"
+
+#~ msgid "_Close"
+#~ msgstr "_Закрыть"
+
+#~ msgid "This certificate has been verified for the following uses:"
+#~ msgstr "Этот сертификат проверен для следующих применений:"
+
+#~ msgid "SSL Client Certificate"
+#~ msgstr "Клиентский сертификат SSL"
+
+#~ msgid "SSL Server Certificate"
+#~ msgstr "Серверный сертификат SSL"
+
+#~ msgid "Email Signer Certificate"
+#~ msgstr "Сертификат подписчика почты"
+
+#~ msgid "Email Recipient Certificate"
+#~ msgstr "Сертификат получателя почты"
+
+#~ msgid "Issued To"
+#~ msgstr "Кому выдано"
+
+#~ msgid "Common Name (CN)"
+#~ msgstr "Общее имя (CN)"
+
+#~ msgid "Organization (O)"
+#~ msgstr "Организация (O)"
+
+#~ msgid "Organizational Unit (OU)"
+#~ msgstr "Подразделение организации (OU)"
+
+#~ msgid "Serial Number"
+#~ msgstr "Серийный номер"
+
+#~ msgid "Issued By"
+#~ msgstr "Кем выдано"
+
+#~ msgid "Validity"
+#~ msgstr "Срок действия"
+
+#~ msgid "Issued On"
+#~ msgstr "Выдано"
+
+#~ msgid "Expires On"
+#~ msgstr "Истекает"
+
+#~ msgid "Fingerprints"
+#~ msgstr "Отпечатки"
+
+#~ msgid "SHA1 Fingerprint"
+#~ msgstr "Отпечаток SHA1"
+
+#~ msgid "MD5 Fingerprint"
+#~ msgstr "Отпечаток MD5"
+
+#~ msgid "General"
+#~ msgstr "Общие"
+
+#~ msgid "Certificate Hierarchy"
+#~ msgstr "Иерархия сертификата"
+
+#~ msgid "Certificate Fields"
+#~ msgstr "Поля сертификата"
+
+#~ msgid "Field Value"
+#~ msgstr "Значение поля"
+
+#~ msgid "Details"
+#~ msgstr "Подробности"
+
+#~ msgid "Version"
+#~ msgstr "Версия"
+
+#~ msgid "Version 1"
+#~ msgstr "Версия 1"
+
+#~ msgid "Version 2"
+#~ msgstr "Версия 3"
+
+#~ msgid "Version 3"
+#~ msgstr "Версия 3"
+
+#~ msgid "PKCS #1 MD2 With RSA Encryption"
+#~ msgstr "PKCS #1 MD2 с шифрованием RSA"
+
+#~ msgid "PKCS #1 MD5 With RSA Encryption"
+#~ msgstr "PKCS #1 MD5 с шифрованием RSA"
+
+#~ msgid "PKCS #1 SHA-1 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-1 с шифрованием RSA"
+
+#~ msgid "PKCS #1 SHA-256 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-256 с шифрованием RSA"
+
+#~ msgid "PKCS #1 SHA-384 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-384 с шифрованием RSA"
+
+#~ msgid "PKCS #1 SHA-512 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-512 с шифрованием RSA"
+
+#~ msgid "PKCS #1 RSA Encryption"
+#~ msgstr "PKCS #1 шифрование RSA"
+
+#~ msgid "Certificate Key Usage"
+#~ msgstr "Использование ключа сертификата"
+
+#~ msgid "Netscape Certificate Type"
+#~ msgstr "Тип сертификата Netscape"
+
+#~ msgid "Certificate Authority Key Identifier"
+#~ msgstr "Идентификатор ключа удостоверяющего центра сертификата"
+
+#~ msgid "Object Identifier (%s)"
+#~ msgstr "Идентификатор объекта (%s)"
+
+#~ msgid "Algorithm Identifier"
+#~ msgstr "Идентификатор алгоритма"
+
+#~ msgid "Algorithm Parameters"
+#~ msgstr "Параметры алгоритма"
+
+#~ msgid "Subject Public Key Info"
+#~ msgstr "Информация о публичном ключе субъекта"
+
+#~ msgid "Subject Public Key Algorithm"
+#~ msgstr "Алгоритм публичного ключа субъекта"
+
+#~ msgid "Subject's Public Key"
+#~ msgstr "Публичный ключ субъекта"
+
+#~ msgid "Error: Unable to process extension"
+#~ msgstr "Ошибка: невозможно обработать расширение"
+
+#~ msgid "Email"
+#~ msgstr "Эл. почта"
+
+#~ msgid "Object Signer"
+#~ msgstr "Подписчик объекта"
+
+#~ msgid "SSL Certificate Authority"
+#~ msgstr "Удостоверяющий центр SSL-сертификата"
+
+#~ msgid "Email Certificate Authority"
+#~ msgstr "Эл. почта центра сертификации"
+
+#~ msgid "Signing"
+#~ msgstr "Подпись"
+
+#~ msgid "Non-repudiation"
+#~ msgstr "Безотказность"
+
+#~ msgid "Key Encipherment"
+#~ msgstr "Шифрование ключа"
+
+#~ msgid "Data Encipherment"
+#~ msgstr "Шифрование данных"
+
+#~ msgid "Key Agreement"
+#~ msgstr "Соглашение о ключе"
+
+#~ msgid "Certificate Signer"
+#~ msgstr "Подписчик сертификата"
+
+#~ msgid "CRL Signer"
+#~ msgstr "Подписчик CRL"
+
+#~ msgid "Critical"
+#~ msgstr "Критично"
+
+#~ msgid "Not Critical"
+#~ msgstr "Не критично"
+
+#~ msgid "Extensions"
+#~ msgstr "Расширения"
+
+#~ msgid "%s = %s"
+#~ msgstr "%s = %s"
+
+#~ msgid "Certificate"
+#~ msgstr "Сертификат"
+
+#~ msgid "Certificate Signature Algorithm"
+#~ msgstr "Алгоритм подписи сертификата"
+
+#~ msgid "Issuer"
+#~ msgstr "Издатель"
+
+#~ msgid "Subject"
+#~ msgstr "Субъект"
+
+#~ msgid "Issuer Unique ID"
+#~ msgstr "Уникальный идентификатор издателя"
+
+#~ msgid "Subject Unique ID"
+#~ msgstr "Уникальный идентификатор субъекта"
+
+#~ msgid "Certificate Signature Value"
+#~ msgstr "Значение подписи сертификата"
+
+#~ msgid "_View Certificate"
+#~ msgstr "_Показать сертификат"
+
+#~ msgid "Detailed information about the certificate:"
+#~ msgstr "Подробная информация о сертификате:"
+
+#~ msgid "Issuer:"
+#~ msgstr "Издатель:"
+
+#~ msgid "Subject:"
+#~ msgstr "Субъект:"
+
+#~ msgid "Fingerprint:"
+#~ msgstr "Отпечаток:"


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