[evolution-data-server] Update Russian translation



commit e181b4903b633d21a1ebe407a312ceb37d7d505a
Author: Alexey Rubtsov <rushills gmail com>
Date:   Wed Jun 30 11:18:39 2021 +0000

    Update Russian translation

 po/ru.po | 6555 ++++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 4438 insertions(+), 2117 deletions(-)
---
diff --git a/po/ru.po b/po/ru.po
index 4535c7018..76413ad29 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,11 +13,11 @@
 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: 2016-03-19 06:14+0000\n"
-"PO-Revision-Date: 2016-03-19 16:11+0300\n"
-"Last-Translator: Yuri Myasoedov <ymyasoedov yandex ru>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/evolution-data-server/";
+"issues\n"
+"POT-Creation-Date: 2021-06-14 20:06+0000\n"
+"PO-Revision-Date: 2021-06-29 18:08+0300\n"
+"Last-Translator: Alexey Rubtsov <rushills gmail com>\n"
 "Language-Team: Русский <gnome-cyr gnome org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
@@ -25,328 +25,300 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 1.6.9\n"
+"X-Generator: Poedit 3.0\n"
+
+#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:234
+#, c-format
+msgid "Given URL “%s” doesn’t reference CardDAV address book"
+msgstr "Указанный URL «%s» не ссылается на адресную книгу CardDAV"
+
+#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:293
+#: ../src/addressbook/backends/file/e-book-backend-file-migrate-bdb.c:149
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1136
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4379
+#: ../src/addressbook/libebook-contacts/e-book-contacts-utils.c:51
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:54
+#: ../src/addressbook/libebook/e-book.c:1067
+#: ../src/addressbook/libebook/e-book-client.c:2122
+#: ../src/addressbook/libebook/e-book-client.c:2300
+#: ../src/addressbook/libebook/e-book-client.c:2519
+#: ../src/addressbook/libebook/e-book-client.c:2656
+#: ../src/addressbook/libebook/e-book-client.c:2821
+#: ../src/addressbook/libebook/e-book-client.c:2961
+#: ../src/addressbook/libebook/e-book-client.c:3098
+#: ../src/addressbook/libebook/e-book-client.c:3261
+#: ../src/addressbook/libebook/e-book-client.c:3456
+#: ../src/addressbook/libebook/e-book-client.c:3674
+#: ../src/addressbook/libedata-book/e-book-backend-sexp.c:873
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:275
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:288
+#: ../src/calendar/backends/http/e-cal-backend-http.c:313
+#: ../src/calendar/backends/webdav-notes/e-cal-backend-webdav-notes.c:197
+#: ../src/calendar/libecal/e-cal-client.c:257
+#: ../src/calendar/libecal/e-cal-client.c:3242
+#: ../src/calendar/libecal/e-cal-client.c:3415
+#: ../src/calendar/libecal/e-cal-client.c:3688
+#: ../src/calendar/libecal/e-cal-client.c:3926
+#: ../src/calendar/libecal/e-cal-client.c:4118
+#: ../src/calendar/libecal/e-cal-client.c:4301
+#: ../src/calendar/libecal/e-cal-client.c:4509
+#: ../src/calendar/libecal/e-cal-client.c:4686
+#: ../src/calendar/libecal/e-cal-client.c:4897
+#: ../src/calendar/libecal/e-cal-client.c:5053
+#: ../src/calendar/libecal/e-cal-client.c:5253
+#: ../src/calendar/libecal/e-cal-client.c:5419
+#: ../src/calendar/libecal/e-cal-client.c:5646
+#: ../src/calendar/libecal/e-cal-client.c:5806
+#: ../src/calendar/libecal/e-cal-client.c:6037
+#: ../src/calendar/libecal/e-cal-client.c:6236
+#: ../src/calendar/libecal/e-cal-client.c:6604
+#: ../src/calendar/libecal/e-cal-client.c:6828
+#: ../src/calendar/libedata-cal/e-cal-cache.c:1847
+#: ../src/camel/camel-filter-driver.c:1717
+#: ../src/camel/camel-filter-driver.c:1846
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3327
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3333
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3343
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3355
+#: ../src/camel/providers/nntp/camel-nntp-store.c:419
+#: ../src/libebackend/e-server-side-source.c:498
+#: ../src/libedataserver/e-client.c:183
+#: ../src/libedataserver/e-soup-session.c:1234
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:204
+#: ../src/libedataserverui/e-reminders-widget.c:1994
+#: ../src/tools/list-sources/list-sources.c:429
+msgid "Unknown error"
+msgstr "Неизвестная ошибка"
+
+#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:1155
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1376
+#: ../src/calendar/backends/webdav-notes/e-cal-backend-webdav-notes.c:930
+msgid "Server didn’t return object’s href"
+msgstr "Сервер не вернул href объекта"
+
+#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:1157
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1378
+#: ../src/calendar/backends/webdav-notes/e-cal-backend-webdav-notes.c:932
+msgid "Server didn’t return object’s ETag"
+msgstr "Сервер не вернул ETag объекта"
+
+#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:1159
+msgid "Received object is not a valid vCard"
+msgstr "Полученный объект не является действительной vCard"
+
+#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:1276
+msgid ""
+"Missing information about vCard URL, local cache is possibly incomplete or "
+"broken. Remove it, please."
+msgstr ""
+"Отсутствует информация об URL vCard, возможно, локальный кэш неполный или "
+"поврежден. Удалите его, пожалуйста."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:120
+#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:1279
+msgid "Object to save is not a valid vCard"
+msgstr "Объект для сохранения не является действительным vCard"
+
+#: ../src/addressbook/backends/file/e-book-backend-file.c:117
 #, c-format
-msgid "Failed to remove file '%s': %s"
+msgid "Failed to remove file “%s”: %s"
 msgstr "Не удалось удалить файл «%s»: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:148
+#: ../src/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:419
+#: ../src/addressbook/backends/file/e-book-backend-file.c:429
 #, c-format
-msgid "Failed to create hardlink for resource '%s': %s"
-msgstr "Не удалось создать жёсткую ссылку для ресурса «%s»: %s"
+msgid "Failed to create hardlink for resource “%s”: %s"
+msgstr "Не удалось создать жесткую ссылку для ресурса «%s»: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:524
-#: ../addressbook/backends/file/e-book-backend-file.c:1256
+#: ../src/addressbook/backends/file/e-book-backend-file.c:534
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1275
 msgid "No UID in the contact"
 msgstr "В контакте нет UID"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:851
+#: ../src/addressbook/backends/file/e-book-backend-file.c:871
 #, c-format
 msgid "Conflicting UIDs found in added contacts"
 msgstr "В добавленных контактах обнаружен конфликт UID"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:990
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1001
 msgid "Loading..."
 msgstr "Загрузка…"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:992
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4357
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1003
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4494
 msgid "Searching..."
 msgstr "Поиск…"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1284
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1303
 #, c-format
-msgid "Tried to modify contact '%s' with out of sync revision"
+msgid "Tried to modify contact “%s” with out of sync revision"
 msgstr "Попытка изменить контакт «%s» с рассинхронизированной ревизией"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1475
-#: ../addressbook/backends/file/e-book-backend-file.c:1560
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3085
-#: ../addressbook/libedata-book/e-book-sqlite.c:7332
-#: ../addressbook/libedata-book/e-book-sqlite.c:7401
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1484
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1570
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:3076
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7371
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7440
 #, c-format
-msgid "Contact '%s' not found"
+msgid "Contact “%s” not found"
 msgstr "Контакт «%s» не найден"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1620
-#: ../addressbook/backends/file/e-book-backend-file.c:1701
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1634
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1717
 #, c-format
-msgid "Query '%s' not supported"
+msgid "Query “%s” not supported"
 msgstr "Запрос «%s» не поддерживается"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1629
-#: ../addressbook/backends/file/e-book-backend-file.c:1710
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1643
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1726
 #, c-format
-msgid "Invalid Query '%s'"
+msgid "Invalid Query “%s”"
 msgstr "Недопустимый запрос «%s»"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1975
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1975
+#: ../src/addressbook/libedata-book/e-book-meta-backend.c:2050
 msgid "Requested to delete an unrelated cursor"
 msgstr "Запрошено удаление несвязанного курсора"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:2046
+#: ../src/addressbook/backends/file/e-book-backend-file.c:2046
 #, c-format
-msgid "Failed to rename old database from '%s' to '%s': %s"
+msgid "Failed to rename old database from “%s” to “%s”: %s"
 msgstr "Не удалось переименовать базу данных из «%s» в «%s»: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1166
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4247
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:384
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:867
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:51
-#: ../addressbook/libebook-contacts/e-phone-number.c:56
-#: ../addressbook/libebook/e-book.c:1078
-#: ../addressbook/libebook/e-book-client.c:2131
-#: ../addressbook/libebook/e-book-client.c:2303
-#: ../addressbook/libebook/e-book-client.c:2516
-#: ../addressbook/libebook/e-book-client.c:2647
-#: ../addressbook/libebook/e-book-client.c:2806
-#: ../addressbook/libebook/e-book-client.c:2940
-#: ../addressbook/libebook/e-book-client.c:3071
-#: ../addressbook/libebook/e-book-client.c:3229
-#: ../addressbook/libebook/e-book-client.c:3424
-#: ../addressbook/libebook/e-book-client.c:3642
-#: ../addressbook/libedata-book/e-book-backend-sexp.c:877
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:673
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:704
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:721
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:274
-#: ../calendar/libecal/e-cal.c:2336 ../calendar/libecal/e-cal-client.c:279
-#: ../calendar/libecal/e-cal-client.c:3520
-#: ../calendar/libecal/e-cal-client.c:3693
-#: ../calendar/libecal/e-cal-client.c:3957
-#: ../calendar/libecal/e-cal-client.c:4198
-#: ../calendar/libecal/e-cal-client.c:4388
-#: ../calendar/libecal/e-cal-client.c:4581
-#: ../calendar/libecal/e-cal-client.c:4790
-#: ../calendar/libecal/e-cal-client.c:4959
-#: ../calendar/libecal/e-cal-client.c:5162
-#: ../calendar/libecal/e-cal-client.c:5312
-#: ../calendar/libecal/e-cal-client.c:5506
-#: ../calendar/libecal/e-cal-client.c:5659
-#: ../calendar/libecal/e-cal-client.c:5876
-#: ../calendar/libecal/e-cal-client.c:6030
-#: ../calendar/libecal/e-cal-client.c:6256
-#: ../calendar/libecal/e-cal-client.c:6452
-#: ../calendar/libecal/e-cal-client.c:6815
-#: ../calendar/libecal/e-cal-client.c:7037
-#: ../camel/providers/imapx/camel-imapx-server.c:2979
-#: ../camel/providers/imapx/camel-imapx-server.c:2989
-#: ../camel/providers/imapx/camel-imapx-server.c:3001
-#: ../libebackend/e-server-side-source.c:497 ../libedataserver/e-client.c:190
-msgid "Unknown error"
-msgstr "Неизвестная ошибка"
-
-#. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:781
-msgid "Querying for updated contacts…"
-msgstr "Запрос обновлённых контактов…"
-
-#. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:965
-msgid "Querying for updated groups…"
-msgstr "Запрос обновлённых групп…"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:1748
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4999
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1503
-msgid "The backend does not support bulk additions"
-msgstr "Драйвер не поддерживает общие добавления"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:1905
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5135
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1625
-msgid "The backend does not support bulk modifications"
-msgstr "Драйвер не поддерживает общие изменения"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:2114
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1725
-msgid "The backend does not support bulk removals"
-msgstr "Драйвер не поддерживает общие удаления"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:2236
-msgid "Loading…"
-msgstr "Загрузка…"
-
-#. System Group: My Contacts
-#: ../addressbook/backends/google/e-book-google-utils.c:1653
-#: ../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
-#: ../services/evolution-source-registry/builtin/system-task-list.source.in.h:1
-msgid "Personal"
-msgstr "Личное"
-
-#. System Group: Friends
-#: ../addressbook/backends/google/e-book-google-utils.c:1655
-msgid "Friends"
-msgstr "Друзья"
-
-#. System Group: Family
-#: ../addressbook/backends/google/e-book-google-utils.c:1657
-msgid "Family"
-msgstr "Семья"
-
-#. System Group: Coworkers
-#: ../addressbook/backends/google/e-book-google-utils.c:1659
-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:114
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:109
 msgid "Not connected"
 msgstr "Не подключён"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:892
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:873
 msgid "Failed to bind using either v3 or v2 binds"
 msgstr "Сбой связывания при использовании модуля 2 или 3 версии"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1016
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:982
 msgid "Reconnecting to LDAP server..."
 msgstr "Повторное подключение к серверу LDAP…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1147
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1117
 msgid "Invalid DN syntax"
 msgstr "Недопустимый синтаксис в отличительном имени (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1163
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4246
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1133
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4378
 #, c-format
 msgid "LDAP error 0x%x (%s)"
 msgstr "Ошибка в LDAP 0x%x (%s)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1775
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2098
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1776
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2125
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2138
 #, c-format
 msgid "%s: NULL returned from ldap_first_entry"
 msgstr "%s: из ldap_first_entry возвращено значение NULL"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2028
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2156
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2053
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2197
 #, c-format
 msgid "%s: Unhandled result type %d returned"
 msgstr "%s: возвращён необработанный тип результата %d"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2289
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2416
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2340
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2478
 #, c-format
 msgid "%s: Unhandled search result type %d returned"
 msgstr "%s: возвращён необработанный тип результата поиска %d"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4195
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2628
+msgid "LDAP contact lists cannot be empty."
+msgstr "Списки контактов LDAP не могут быть пустыми."
+
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2666
+#, c-format
+msgid ""
+"Contact lists in LDAP address books require each member to be from the same "
+"LDAP address book, but one member could not be recognized."
+msgid_plural ""
+"Contact lists in LDAP address books require each member to be from the same "
+"LDAP address book, but %d members could not be recognized."
+msgstr[0] ""
+"Списки контактов в адресных книгах LDAP требуют, чтобы каждый участник был "
+"из одной адресной книги LDAP, но %d участник не мог быть распознан."
+msgstr[1] ""
+"Списки контактов в адресных книгах LDAP требуют, чтобы каждый участник был "
+"из одной адресной книги LDAP, но %d участника не могут быть распознаны."
+msgstr[2] ""
+"Списки контактов в адресных книгах LDAP требуют, чтобы каждый участник был "
+"из одной адресной книги LDAP, но %d участников не могут быть распознаны."
+
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4317
 msgid "Receiving LDAP search results..."
 msgstr "Получение результатов поиска с сервера LDAP…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4379
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4520
 msgid "Error performing search"
 msgstr "Ошибка выполнения поиска"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4512
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4660
 #, c-format
 msgid "Downloading contacts (%d)..."
 msgstr "Загрузка контактов (%d)…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5082
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4761
+#: ../src/addressbook/libedata-book/e-book-meta-backend.c:790
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:691
+msgid "Refreshing…"
+msgstr "Обновляю…"
+
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5148
+msgid "The backend does not support bulk additions"
+msgstr "Драйвер не поддерживает общие добавления"
+
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5239
 msgid "Adding contact to LDAP server..."
 msgstr "Создание контакта на сервере LDAP…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5157
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5301
+msgid "The backend does not support bulk modifications"
+msgstr "Драйвер не поддерживает общие изменения"
+
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5323
 msgid "Modifying contact from LDAP server..."
 msgstr "Изменение контакта на сервере LDAP…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5223
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5395
 msgid "Removing contact from LDAP server..."
 msgstr "Удаление контакта с сервера LDAP…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5618
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5805
 #, c-format
-msgid "Failed to get the DN for user '%s'"
+msgid "Failed to get the DN for user “%s”"
 msgstr "Не удалось получить DN для пользователя «%s»"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:588
-#: ../calendar/backends/http/e-cal-backend-http.c:512
-#, c-format
-msgid "Malformed URI: %s"
-msgstr "Некорректный URI: %s"
-
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:836
-msgid "Loading Addressbook summary..."
-msgstr "Загрузка сводки об адресной книге…"
-
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:864
-#, 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:883
-msgid "No response body in webdav PROPFIND result"
-msgstr "Тело ответа отсутствует в результатах работы метода webdav PROPFIND"
-
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:944
-#, c-format
-msgid "Loading Contacts (%d%%)"
-msgstr "Загрузка контактов (%d%%)"
-
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1358
-msgid "Cannot transform SoupURI to string"
-msgstr "Не удалось преобразовать SoupURI в строку"
-
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1554
-#, c-format
-msgid "Create resource '%s' failed with HTTP status %d (%s)"
-msgstr ""
-"При создании ресурса «%s» произошёл сбой с кодом состояния HTTP: %d (%s)"
-
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1656
-msgid "Contact on server changed -> not modifying"
-msgstr "Контакт на сервере изменён -> нет изменения"
-
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1664
-#, c-format
-msgid "Modify contact failed with HTTP status %d (%s)"
-msgstr ""
-"При изменении контакта произошла ошибка с кодом состояния HTTP: %d (%s)"
-
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1757
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1773
-#, c-format
-msgid "DELETE failed with HTTP status %d"
-msgstr "Ошибка метода DELETE с кодом HTTP %d"
-
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:40
+#: ../src/addressbook/libebook-contacts/e-book-contacts-utils.c:40
 msgid "No such book"
 msgstr "Нет такой книги"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:42
-#: ../addressbook/libedata-book/e-data-book.c:384
+#: ../src/addressbook/libebook-contacts/e-book-contacts-utils.c:42
 msgid "Contact not found"
 msgstr "Контакт не найден"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:44
-#: ../addressbook/libedata-book/e-data-book.c:385
+#: ../src/addressbook/libebook-contacts/e-book-contacts-utils.c:44
 msgid "Contact ID already exists"
 msgstr "Идентификатор контакта уже существует"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:46
+#: ../src/addressbook/libebook-contacts/e-book-contacts-utils.c:46
 msgid "No such source"
 msgstr "Нет такого источника"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:48
-#: ../addressbook/libedata-book/e-data-book.c:401
+#: ../src/addressbook/libebook-contacts/e-book-contacts-utils.c:48
 msgid "No space"
 msgstr "Недостаточно места"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook-contacts/e-contact.c:130
+#: ../src/addressbook/libebook-contacts/e-contact.c:149
 msgid "Unique ID"
 msgstr "Уникальный ID"
 
@@ -354,12 +326,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:135
+#: ../src/addressbook/libebook-contacts/e-contact.c:154
 msgid "File Under"
 msgstr "Сохранить под"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook-contacts/e-contact.c:137
+#: ../src/addressbook/libebook-contacts/e-contact.c:156
 msgid "Book UID"
 msgstr "UID книги"
 
@@ -367,435 +339,435 @@ 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:143
+#: ../src/addressbook/libebook-contacts/e-contact.c:162
 msgid "Full Name"
 msgstr "Полное имя"
 
-#: ../addressbook/libebook-contacts/e-contact.c:144
+#: ../src/addressbook/libebook-contacts/e-contact.c:163
 msgid "Given Name"
 msgstr "Имя"
 
-#: ../addressbook/libebook-contacts/e-contact.c:145
+#: ../src/addressbook/libebook-contacts/e-contact.c:164
 msgid "Family Name"
 msgstr "Фамилия"
 
-#: ../addressbook/libebook-contacts/e-contact.c:146
+#: ../src/addressbook/libebook-contacts/e-contact.c:165
 msgid "Nickname"
 msgstr "Псевдоним"
 
 #. Email fields
-#: ../addressbook/libebook-contacts/e-contact.c:149
+#: ../src/addressbook/libebook-contacts/e-contact.c:168
 msgid "Email 1"
 msgstr "Эл. почта 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:150
+#: ../src/addressbook/libebook-contacts/e-contact.c:169
 msgid "Email 2"
 msgstr "Эл. почта 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:151
+#: ../src/addressbook/libebook-contacts/e-contact.c:170
 msgid "Email 3"
 msgstr "Эл. почта 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:152
+#: ../src/addressbook/libebook-contacts/e-contact.c:171
 msgid "Email 4"
 msgstr "Эл. почта 4"
 
-#: ../addressbook/libebook-contacts/e-contact.c:154
+#: ../src/addressbook/libebook-contacts/e-contact.c:173
 msgid "Mailer"
 msgstr "Почтовый клиент"
 
 #. Address Labels
-#: ../addressbook/libebook-contacts/e-contact.c:157
+#: ../src/addressbook/libebook-contacts/e-contact.c:176
 msgid "Home Address Label"
 msgstr "Ярлык домашнего адреса"
 
-#: ../addressbook/libebook-contacts/e-contact.c:158
+#: ../src/addressbook/libebook-contacts/e-contact.c:177
 msgid "Work Address Label"
 msgstr "Ярлык рабочего адреса"
 
-#: ../addressbook/libebook-contacts/e-contact.c:159
+#: ../src/addressbook/libebook-contacts/e-contact.c:178
 msgid "Other Address Label"
 msgstr "Ярлык другого адреса"
 
 #. Phone fields
-#: ../addressbook/libebook-contacts/e-contact.c:162
+#: ../src/addressbook/libebook-contacts/e-contact.c:181
 msgid "Assistant Phone"
 msgstr "Телефон помощника"
 
-#: ../addressbook/libebook-contacts/e-contact.c:163
+#: ../src/addressbook/libebook-contacts/e-contact.c:182
 msgid "Business Phone"
 msgstr "Служебный телефон"
 
-#: ../addressbook/libebook-contacts/e-contact.c:164
+#: ../src/addressbook/libebook-contacts/e-contact.c:183
 msgid "Business Phone 2"
 msgstr "Служебный телефон 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:165
+#: ../src/addressbook/libebook-contacts/e-contact.c:184
 msgid "Business Fax"
 msgstr "Рабочий факс"
 
-#: ../addressbook/libebook-contacts/e-contact.c:166
+#: ../src/addressbook/libebook-contacts/e-contact.c:185
 msgid "Callback Phone"
 msgstr "Телефон для обратного звонка"
 
-#: ../addressbook/libebook-contacts/e-contact.c:167
+#: ../src/addressbook/libebook-contacts/e-contact.c:186
 msgid "Car Phone"
 msgstr "Телефон в машине"
 
-#: ../addressbook/libebook-contacts/e-contact.c:168
+#: ../src/addressbook/libebook-contacts/e-contact.c:187
 msgid "Company Phone"
 msgstr "Телефон компании"
 
-#: ../addressbook/libebook-contacts/e-contact.c:169
+#: ../src/addressbook/libebook-contacts/e-contact.c:188
 msgid "Home Phone"
 msgstr "Домашний телефон"
 
-#: ../addressbook/libebook-contacts/e-contact.c:170
+#: ../src/addressbook/libebook-contacts/e-contact.c:189
 msgid "Home Phone 2"
 msgstr "Домашний телефон 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:171
+#: ../src/addressbook/libebook-contacts/e-contact.c:190
 msgid "Home Fax"
 msgstr "Домашний Факс"
 
-#: ../addressbook/libebook-contacts/e-contact.c:172
+#: ../src/addressbook/libebook-contacts/e-contact.c:191
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook-contacts/e-contact.c:173
+#: ../src/addressbook/libebook-contacts/e-contact.c:192
 msgid "Mobile Phone"
 msgstr "Мобильный телефон"
 
-#: ../addressbook/libebook-contacts/e-contact.c:174
+#: ../src/addressbook/libebook-contacts/e-contact.c:193
 msgid "Other Phone"
 msgstr "Другие телефоны"
 
-#: ../addressbook/libebook-contacts/e-contact.c:175
+#: ../src/addressbook/libebook-contacts/e-contact.c:194
 msgid "Other Fax"
 msgstr "Другой факс"
 
-#: ../addressbook/libebook-contacts/e-contact.c:176
+#: ../src/addressbook/libebook-contacts/e-contact.c:195
 msgid "Pager"
 msgstr "Пейджер"
 
-#: ../addressbook/libebook-contacts/e-contact.c:177
+#: ../src/addressbook/libebook-contacts/e-contact.c:196
 msgid "Primary Phone"
 msgstr "Основной телефон"
 
-#: ../addressbook/libebook-contacts/e-contact.c:178
+#: ../src/addressbook/libebook-contacts/e-contact.c:197
 msgid "Radio"
 msgstr "Радио"
 
-#: ../addressbook/libebook-contacts/e-contact.c:179
+#: ../src/addressbook/libebook-contacts/e-contact.c:198
 msgid "Telex"
 msgstr "Телекс"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook-contacts/e-contact.c:181
+#: ../src/addressbook/libebook-contacts/e-contact.c:200
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook-contacts/e-contact.c:184
+#: ../src/addressbook/libebook-contacts/e-contact.c:203
 msgid "Organization"
 msgstr "Организация"
 
-#: ../addressbook/libebook-contacts/e-contact.c:185
+#: ../src/addressbook/libebook-contacts/e-contact.c:204
 msgid "Organizational Unit"
 msgstr "Подразделение организации"
 
-#: ../addressbook/libebook-contacts/e-contact.c:186
+#: ../src/addressbook/libebook-contacts/e-contact.c:205
 msgid "Office"
 msgstr "Офис"
 
-#: ../addressbook/libebook-contacts/e-contact.c:187
+#: ../src/addressbook/libebook-contacts/e-contact.c:206
 msgid "Title"
 msgstr "Заголовок"
 
-#: ../addressbook/libebook-contacts/e-contact.c:188
+#: ../src/addressbook/libebook-contacts/e-contact.c:207
 msgid "Role"
 msgstr "Должность"
 
-#: ../addressbook/libebook-contacts/e-contact.c:189
+#: ../src/addressbook/libebook-contacts/e-contact.c:208
 msgid "Manager"
 msgstr "Мeнеджер"
 
-#: ../addressbook/libebook-contacts/e-contact.c:190
+#: ../src/addressbook/libebook-contacts/e-contact.c:209
 msgid "Assistant"
 msgstr "Помощник"
 
 #. Web fields
-#: ../addressbook/libebook-contacts/e-contact.c:193
+#: ../src/addressbook/libebook-contacts/e-contact.c:212
 msgid "Homepage URL"
 msgstr "URL домашней страницы"
 
-#: ../addressbook/libebook-contacts/e-contact.c:194
+#: ../src/addressbook/libebook-contacts/e-contact.c:213
 msgid "Weblog URL"
 msgstr "URL веблога"
 
 #. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:197
+#: ../src/addressbook/libebook-contacts/e-contact.c:216
 msgid "Categories"
 msgstr "Категории"
 
 #. Collaboration fields
-#: ../addressbook/libebook-contacts/e-contact.c:200
+#: ../src/addressbook/libebook-contacts/e-contact.c:219
 msgid "Calendar URI"
 msgstr "URI календаря"
 
-#: ../addressbook/libebook-contacts/e-contact.c:201
+#: ../src/addressbook/libebook-contacts/e-contact.c:220
 msgid "Free/Busy URL"
 msgstr "Ссылка (URL) «свободен/занят»"
 
-#: ../addressbook/libebook-contacts/e-contact.c:202
+#: ../src/addressbook/libebook-contacts/e-contact.c:221
 msgid "ICS Calendar"
 msgstr "Календарь формата ICS"
 
-#: ../addressbook/libebook-contacts/e-contact.c:203
+#: ../src/addressbook/libebook-contacts/e-contact.c:222
 msgid "Video Conferencing URL"
 msgstr "URL видеоконференций"
 
 #. Misc fields
-#: ../addressbook/libebook-contacts/e-contact.c:206
-msgid "Spouse's Name"
-msgstr "Имя супруга(и)"
+#: ../src/addressbook/libebook-contacts/e-contact.c:225
+msgid "Spouse’s Name"
+msgstr "Имя супруги/супруга"
 
-#: ../addressbook/libebook-contacts/e-contact.c:207
+#: ../src/addressbook/libebook-contacts/e-contact.c:226
 msgid "Note"
 msgstr "Примечание"
 
 #. Instant messaging fields
-#: ../addressbook/libebook-contacts/e-contact.c:210
+#: ../src/addressbook/libebook-contacts/e-contact.c:229
 msgid "AIM Home Screen Name 1"
 msgstr "AIM — домашнее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:211
+#: ../src/addressbook/libebook-contacts/e-contact.c:230
 msgid "AIM Home Screen Name 2"
 msgstr "AIM — домашнее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:212
+#: ../src/addressbook/libebook-contacts/e-contact.c:231
 msgid "AIM Home Screen Name 3"
 msgstr "AIM — домашнее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:213
+#: ../src/addressbook/libebook-contacts/e-contact.c:232
 msgid "AIM Work Screen Name 1"
 msgstr "AIM — рабочее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:214
+#: ../src/addressbook/libebook-contacts/e-contact.c:233
 msgid "AIM Work Screen Name 2"
 msgstr "AIM — рабочее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:215
+#: ../src/addressbook/libebook-contacts/e-contact.c:234
 msgid "AIM Work Screen Name 3"
 msgstr "AIM — рабочее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:216
+#: ../src/addressbook/libebook-contacts/e-contact.c:235
 msgid "GroupWise Home Screen Name 1"
 msgstr "Groupwise — домашнее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:217
+#: ../src/addressbook/libebook-contacts/e-contact.c:236
 msgid "GroupWise Home Screen Name 2"
 msgstr "Groupwise — домашнее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:218
+#: ../src/addressbook/libebook-contacts/e-contact.c:237
 msgid "GroupWise Home Screen Name 3"
 msgstr "Groupwise — домашнее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:219
+#: ../src/addressbook/libebook-contacts/e-contact.c:238
 msgid "GroupWise Work Screen Name 1"
 msgstr "Groupwise — рабочее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:220
+#: ../src/addressbook/libebook-contacts/e-contact.c:239
 msgid "GroupWise Work Screen Name 2"
 msgstr "Groupwise — рабочее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:221
+#: ../src/addressbook/libebook-contacts/e-contact.c:240
 msgid "GroupWise Work Screen Name 3"
 msgstr "Groupwise — рабочее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:222
+#: ../src/addressbook/libebook-contacts/e-contact.c:241
 msgid "Jabber Home ID 1"
 msgstr "Jabber — домашний идентификатор 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:223
+#: ../src/addressbook/libebook-contacts/e-contact.c:242
 msgid "Jabber Home ID 2"
 msgstr "Jabber — домашний идентификатор 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:224
+#: ../src/addressbook/libebook-contacts/e-contact.c:243
 msgid "Jabber Home ID 3"
 msgstr "Jabber — домашний идентификатор 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:225
+#: ../src/addressbook/libebook-contacts/e-contact.c:244
 msgid "Jabber Work ID 1"
 msgstr "Jabber — рабочий идентификатор 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:226
+#: ../src/addressbook/libebook-contacts/e-contact.c:245
 msgid "Jabber Work ID 2"
 msgstr "Jabber — рабочий идентификатор 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:227
+#: ../src/addressbook/libebook-contacts/e-contact.c:246
 msgid "Jabber Work ID 3"
 msgstr "Jabber — рабочий идентификатор 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:228
+#: ../src/addressbook/libebook-contacts/e-contact.c:247
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo! — домашнее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:229
+#: ../src/addressbook/libebook-contacts/e-contact.c:248
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo! — домашнее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:230
+#: ../src/addressbook/libebook-contacts/e-contact.c:249
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo! — домашнее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:231
+#: ../src/addressbook/libebook-contacts/e-contact.c:250
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo! — рабочее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:232
+#: ../src/addressbook/libebook-contacts/e-contact.c:251
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo! — рабочее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:233
+#: ../src/addressbook/libebook-contacts/e-contact.c:252
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo! — рабочее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:234
+#: ../src/addressbook/libebook-contacts/e-contact.c:253
 msgid "MSN Home Screen Name 1"
 msgstr "MSN — домашнее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:235
+#: ../src/addressbook/libebook-contacts/e-contact.c:254
 msgid "MSN Home Screen Name 2"
 msgstr "MSN — домашнее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:236
+#: ../src/addressbook/libebook-contacts/e-contact.c:255
 msgid "MSN Home Screen Name 3"
 msgstr "MSN — домашнее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:237
+#: ../src/addressbook/libebook-contacts/e-contact.c:256
 msgid "MSN Work Screen Name 1"
 msgstr "MSN — рабочее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:238
+#: ../src/addressbook/libebook-contacts/e-contact.c:257
 msgid "MSN Work Screen Name 2"
 msgstr "MSN — рабочее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:239
+#: ../src/addressbook/libebook-contacts/e-contact.c:258
 msgid "MSN Work Screen Name 3"
 msgstr "MSN — рабочее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:240
+#: ../src/addressbook/libebook-contacts/e-contact.c:259
 msgid "ICQ Home ID 1"
 msgstr "ICQ — домашний идентификатор 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:241
+#: ../src/addressbook/libebook-contacts/e-contact.c:260
 msgid "ICQ Home ID 2"
 msgstr "ICQ — домашний идентификатор 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:242
+#: ../src/addressbook/libebook-contacts/e-contact.c:261
 msgid "ICQ Home ID 3"
 msgstr "ICQ — домашний идентификатор 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:243
+#: ../src/addressbook/libebook-contacts/e-contact.c:262
 msgid "ICQ Work ID 1"
 msgstr "ICQ — рабочий идентификатор 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:244
+#: ../src/addressbook/libebook-contacts/e-contact.c:263
 msgid "ICQ Work ID 2"
 msgstr "ICQ — рабочий идентификатор 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:245
+#: ../src/addressbook/libebook-contacts/e-contact.c:264
 msgid "ICQ Work ID 3"
 msgstr "ICQ — рабочий идентификатор 3"
 
 #. Last modified time
-#: ../addressbook/libebook-contacts/e-contact.c:248
+#: ../src/addressbook/libebook-contacts/e-contact.c:267
 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:252
+#: ../src/addressbook/libebook-contacts/e-contact.c:271
 msgid "Name or Org"
 msgstr "Имя или Орг"
 
 #. Address fields
-#: ../addressbook/libebook-contacts/e-contact.c:255
+#: ../src/addressbook/libebook-contacts/e-contact.c:274
 msgid "Address List"
 msgstr "Список адресов"
 
-#: ../addressbook/libebook-contacts/e-contact.c:256
+#: ../src/addressbook/libebook-contacts/e-contact.c:275
 msgid "Home Address"
 msgstr "Домашний адрес"
 
-#: ../addressbook/libebook-contacts/e-contact.c:257
+#: ../src/addressbook/libebook-contacts/e-contact.c:276
 msgid "Work Address"
 msgstr "Рабочий адрес"
 
-#: ../addressbook/libebook-contacts/e-contact.c:258
+#: ../src/addressbook/libebook-contacts/e-contact.c:277
 msgid "Other Address"
 msgstr "Другой адрес"
 
 #. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:261
+#: ../src/addressbook/libebook-contacts/e-contact.c:280
 msgid "Category List"
 msgstr "Список категорий"
 
 #. Photo/Logo
-#: ../addressbook/libebook-contacts/e-contact.c:264
+#: ../src/addressbook/libebook-contacts/e-contact.c:283
 msgid "Photo"
 msgstr "Фото"
 
-#: ../addressbook/libebook-contacts/e-contact.c:265
+#: ../src/addressbook/libebook-contacts/e-contact.c:284
 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:269
-#: ../libedataserverui/e-webdav-discover-widget.c:153
+#: ../src/addressbook/libebook-contacts/e-contact.c:288
+#: ../src/libedataserverui/e-webdav-discover-widget.c:180
 msgid "Name"
 msgstr "Имя"
 
-#: ../addressbook/libebook-contacts/e-contact.c:270
+#: ../src/addressbook/libebook-contacts/e-contact.c:289
 msgid "Email List"
 msgstr "Список адресов эл. почты"
 
 #. Instant messaging fields
-#: ../addressbook/libebook-contacts/e-contact.c:273
+#: ../src/addressbook/libebook-contacts/e-contact.c:292
 msgid "AIM Screen Name List"
 msgstr "Список экранных имён AIM"
 
-#: ../addressbook/libebook-contacts/e-contact.c:274
+#: ../src/addressbook/libebook-contacts/e-contact.c:293
 msgid "GroupWise ID List"
 msgstr "Список идентификаторов Groupwise"
 
-#: ../addressbook/libebook-contacts/e-contact.c:275
+#: ../src/addressbook/libebook-contacts/e-contact.c:294
 msgid "Jabber ID List"
 msgstr "Список идентификаторов Jabber"
 
-#: ../addressbook/libebook-contacts/e-contact.c:276
+#: ../src/addressbook/libebook-contacts/e-contact.c:295
 msgid "Yahoo! Screen Name List"
 msgstr "Список экранных имён Yahoo!"
 
-#: ../addressbook/libebook-contacts/e-contact.c:277
+#: ../src/addressbook/libebook-contacts/e-contact.c:296
 msgid "MSN Screen Name List"
 msgstr "Список экранных имён MSN"
 
-#: ../addressbook/libebook-contacts/e-contact.c:278
+#: ../src/addressbook/libebook-contacts/e-contact.c:297
 msgid "ICQ ID List"
 msgstr "Список идентификаторов ICQ"
 
-#: ../addressbook/libebook-contacts/e-contact.c:280
+#: ../src/addressbook/libebook-contacts/e-contact.c:299
 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:285
+#: ../src/addressbook/libebook-contacts/e-contact.c:304
 msgid "List"
 msgstr "Список"
 
@@ -803,222 +775,265 @@ 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:290
+#: ../src/addressbook/libebook-contacts/e-contact.c:309
 msgid "List Shows Addresses"
 msgstr "Список показывает адреса"
 
-#: ../addressbook/libebook-contacts/e-contact.c:292
+#: ../src/addressbook/libebook-contacts/e-contact.c:311
 msgid "Birth Date"
 msgstr "Дата рождения"
 
-#: ../addressbook/libebook-contacts/e-contact.c:293
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:948
+#: ../src/addressbook/libebook-contacts/e-contact.c:312
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:957
 msgid "Anniversary"
 msgstr "Годовщина"
 
 #. Security fields
-#: ../addressbook/libebook-contacts/e-contact.c:296
+#: ../src/addressbook/libebook-contacts/e-contact.c:315
 msgid "X.509 Certificate"
 msgstr "Сертификат X.509"
 
-#: ../addressbook/libebook-contacts/e-contact.c:297
+#: ../src/addressbook/libebook-contacts/e-contact.c:316
 msgid "PGP Certificate"
 msgstr "Сертификат PGP"
 
-#: ../addressbook/libebook-contacts/e-contact.c:299
+#: ../src/addressbook/libebook-contacts/e-contact.c:318
 msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu — домашний идентификатор 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:300
+#: ../src/addressbook/libebook-contacts/e-contact.c:319
 msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu — домашний идентификатор 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:301
+#: ../src/addressbook/libebook-contacts/e-contact.c:320
 msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu — домашний идентификатор 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:302
+#: ../src/addressbook/libebook-contacts/e-contact.c:321
 msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu — рабочий идентификатор 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:303
+#: ../src/addressbook/libebook-contacts/e-contact.c:322
 msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu — рабочий идентификатор 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:304
+#: ../src/addressbook/libebook-contacts/e-contact.c:323
 msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu — рабочий идентификатор 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:305
+#: ../src/addressbook/libebook-contacts/e-contact.c:324
 msgid "Gadu-Gadu ID List"
 msgstr "Список идентификаторов Gadu-Gadu"
 
 #. Geo information
-#: ../addressbook/libebook-contacts/e-contact.c:308
+#: ../src/addressbook/libebook-contacts/e-contact.c:327
 msgid "Geographic Information"
 msgstr "Географическая информация"
 
-#: ../addressbook/libebook-contacts/e-contact.c:310
+#: ../src/addressbook/libebook-contacts/e-contact.c:329
 msgid "Telephone"
 msgstr "Телефон"
 
-#: ../addressbook/libebook-contacts/e-contact.c:312
+#: ../src/addressbook/libebook-contacts/e-contact.c:331
 msgid "Skype Home Name 1"
 msgstr "Skype - домашнее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:313
+#: ../src/addressbook/libebook-contacts/e-contact.c:332
 msgid "Skype Home Name 2"
 msgstr "Skype - домашнее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:314
+#: ../src/addressbook/libebook-contacts/e-contact.c:333
 msgid "Skype Home Name 3"
 msgstr "Skype - домашнее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:315
+#: ../src/addressbook/libebook-contacts/e-contact.c:334
 msgid "Skype Work Name 1"
 msgstr "Skype - рабочее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:316
+#: ../src/addressbook/libebook-contacts/e-contact.c:335
 msgid "Skype Work Name 2"
 msgstr "Skype - рабочее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:317
+#: ../src/addressbook/libebook-contacts/e-contact.c:336
 msgid "Skype Work Name 3"
 msgstr "Skype - рабочее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:318
+#: ../src/addressbook/libebook-contacts/e-contact.c:337
 msgid "Skype Name List"
 msgstr "Список экранных имён Skype"
 
-#: ../addressbook/libebook-contacts/e-contact.c:320
+#: ../src/addressbook/libebook-contacts/e-contact.c:339
 msgid "SIP address"
 msgstr "Адрес SIP"
 
-#: ../addressbook/libebook-contacts/e-contact.c:322
+#: ../src/addressbook/libebook-contacts/e-contact.c:341
 msgid "Google Talk Home Name 1"
 msgstr "Google Talk — домашнее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:323
+#: ../src/addressbook/libebook-contacts/e-contact.c:342
 msgid "Google Talk Home Name 2"
 msgstr "Google Talk — домашнее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:324
+#: ../src/addressbook/libebook-contacts/e-contact.c:343
 msgid "Google Talk Home Name 3"
 msgstr "Google Talk — домашнее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:325
+#: ../src/addressbook/libebook-contacts/e-contact.c:344
 msgid "Google Talk Work Name 1"
 msgstr "Google Talk — рабочее экранное имя 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:326
+#: ../src/addressbook/libebook-contacts/e-contact.c:345
 msgid "Google Talk Work Name 2"
 msgstr "Google Talk — рабочее экранное имя 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:327
+#: ../src/addressbook/libebook-contacts/e-contact.c:346
 msgid "Google Talk Work Name 3"
 msgstr "Google Talk — рабочее экранное имя 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:328
+#: ../src/addressbook/libebook-contacts/e-contact.c:347
 msgid "Google Talk Name List"
 msgstr "Список экранных имён Google Talk"
 
-#: ../addressbook/libebook-contacts/e-contact.c:330
+#: ../src/addressbook/libebook-contacts/e-contact.c:349
 msgid "Twitter Name List"
 msgstr "Список имён Twitter"
 
-#: ../addressbook/libebook-contacts/e-contact.c:1660
-#: ../addressbook/libebook/e-destination.c:918
+#: ../src/addressbook/libebook-contacts/e-contact.c:351
+msgid "Matrix Home ID 1"
+msgstr "Matrix Home ID 1"
+
+#: ../src/addressbook/libebook-contacts/e-contact.c:352
+#| msgid "Jabber Home ID 2"
+msgid "Matrix Home ID 2"
+msgstr "Matrix Home ID 2"
+
+#: ../src/addressbook/libebook-contacts/e-contact.c:353
+#| msgid "Jabber Home ID 3"
+msgid "Matrix Home ID 3"
+msgstr "Matrix Home ID 3"
+
+#: ../src/addressbook/libebook-contacts/e-contact.c:354
+#| msgid "Jabber Work ID 1"
+msgid "Matrix Work ID 1"
+msgstr "Matrix Work ID 1"
+
+#: ../src/addressbook/libebook-contacts/e-contact.c:355
+#| msgid "Jabber Work ID 2"
+msgid "Matrix Work ID 2"
+msgstr "Matrix Work ID 2"
+
+#: ../src/addressbook/libebook-contacts/e-contact.c:356
+#| msgid "Jabber Work ID 3"
+msgid "Matrix Work ID 3"
+msgstr "Matrix Work ID 3"
+
+#: ../src/addressbook/libebook-contacts/e-contact.c:357
+#| msgid "Jabber ID List"
+msgid "Matrix ID List"
+msgstr "Matrix ID List"
+
+#: ../src/addressbook/libebook-contacts/e-contact.c:1924
+#: ../src/addressbook/libebook/e-destination.c:911
 msgid "Unnamed List"
 msgstr "Безымянный список"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:41
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:39
 msgid "The library was built without phone number support."
 msgstr "Библиотека собрана без поддержки телефонных номеров."
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:43
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:41
 msgid "The phone number parser reported a yet unknown error code."
 msgstr "Анализатор телефонных номеров выдал неизвестный код ошибки."
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:45
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:43
 msgid "Not a phone number"
 msgstr "Некорректный номер"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:47
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:45
 msgid "Invalid country calling code"
 msgstr "Неверный телефонный код страны"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:49
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:47
 msgid ""
 "Remaining text after the country calling code is too short for a phone number"
 msgstr "Текст после кода страны слишком короткий для телефонного номера"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:51
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:49
 msgid "Text is too short for a phone number"
 msgstr "Текст слишком короткий для телефонного номера"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:53
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:51
 msgid "Text is too long for a phone number"
 msgstr "Текст слишком длинный для телефонного номера"
 
-#: ../addressbook/libebook/e-book-client.c:931
+#: ../src/addressbook/libebook/e-book-client.c:924
 #, c-format
-msgid "Unknown book property '%s'"
+msgid "Unknown book property “%s”"
 msgstr "Неизвестное свойство книги «%s»"
 
-#: ../addressbook/libebook/e-book-client.c:946
+#: ../src/addressbook/libebook/e-book-client.c:939
 #, c-format
-msgid "Cannot change value of book property '%s'"
+msgid "Cannot change value of book property “%s”"
 msgstr "Невозможно изменить значение свойства книги «%s»"
 
-#: ../addressbook/libebook/e-book-client.c:1390
-#: ../addressbook/libebook/e-book-client.c:1621
-#: ../addressbook/libebook/e-book-client.c:1898
-#: ../calendar/libecal/e-cal-client.c:1717
-#: ../calendar/libecal/e-cal-client.c:1955
+#: ../src/addressbook/libebook/e-book-client.c:1381
+#: ../src/addressbook/libebook/e-book-client.c:1611
+#: ../src/addressbook/libebook/e-book-client.c:1887
+#: ../src/calendar/libecal/e-cal-client.c:1714
+#: ../src/calendar/libecal/e-cal-client.c:1952
 #, c-format
-msgid "Unable to connect to '%s': "
+msgid "Unable to connect to “%s”: "
 msgstr "Не удалось подключиться к «%s»: "
 
-#: ../addressbook/libebook/e-book-client-view.c:870
-#: ../calendar/libecal/e-cal-client-view.c:681
+#: ../src/addressbook/libebook/e-book-client-view.c:857
+#: ../src/calendar/libecal/e-cal-client-view.c:667
 #, c-format
 msgid "Client disappeared"
 msgstr "Клиент исчез"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:905
-#: ../addressbook/libedata-book/e-book-sqlite.c:2229
+#: ../src/addressbook/libedata-book/e-book-backend.c:3253
+#, c-format
+msgid "Addressbook backend does not support cursors"
+msgstr "Сервер адресной книги не поддерживает курсоры"
+
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:895
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:2254
 #, c-format
-msgid "Error introspecting unknown summary field '%s'"
+msgid "Error introspecting unknown summary field “%s”"
 msgstr "Ошибка при интроспекции неизвестного поля сводки «%s»"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1515
-#: ../addressbook/libedata-book/e-book-sqlite.c:1368
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1504
+#: ../src/addressbook/libedata-book/e-book-cache.c:549
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:1393
 msgid "Error parsing regular expression"
 msgstr "Ошибка разбора регулярного выражения"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1560
-#: ../addressbook/libedata-book/e-book-sqlite.c:1852 ../camel/camel-db.c:751
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1549
+#: ../src/addressbook/libedata-book/e-book-cache.c:4586
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:1877
+#: ../src/camel/camel-db.c:814
 #, c-format
 msgid "Insufficient memory"
 msgstr "Недостаточно памяти"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1697
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1686
 #, c-format
-msgid "Invalid contact field '%d' specified in summary"
+msgid "Invalid contact field “%d” specified in summary"
 msgstr "В сводке указано неверное поле контакта «%d»"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1731
-#: ../addressbook/libedata-book/e-book-sqlite.c:579
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1720
+#: ../src/addressbook/libedata-book/e-book-cache.c:372
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:603
 #, c-format
 msgid ""
-"Contact field '%s' of type '%s' specified in summary, but only boolean, "
+"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:3073
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4169
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:3064
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4165
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. vcards cannot be returned."
@@ -1026,19 +1041,20 @@ msgstr ""
 "Полные данные search_contact не хранятся в кэше. Невозможно возвратить "
 "данные vcards."
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4300
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4393
-#: ../addressbook/libedata-book/e-book-sqlite.c:5807
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4296
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4389
+#: ../src/addressbook/libedata-book/e-book-cache.c:3468
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:5848
 #, c-format
 msgid "Query contained unsupported elements"
 msgstr "Запрос содержит неподдерживаемые элементы"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4304
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4300
 #, c-format
 msgid "Invalid Query"
 msgstr "Некорректный запрос"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4328
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4324
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. Hence only summary query is "
@@ -1047,16 +1063,15 @@ msgstr ""
 "Полные данные search_contact не хранятся в кэше. Поэтому поддерживается "
 "только запрос для сводки."
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4397
-#: ../addressbook/libedata-book/e-data-book.c:396
-#: ../addressbook/libedata-book/e-data-book.c:1146
-#: ../calendar/libedata-cal/e-data-cal.c:428
-#: ../calendar/libedata-cal/e-data-cal.c:1427 ../libedataserver/e-client.c:177
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4393
+#: ../src/addressbook/libedata-book/e-data-book.c:868
+#: ../src/calendar/libedata-cal/e-data-cal.c:1143
+#: ../src/libedataserver/e-client.c:170
 #, c-format
 msgid "Invalid query"
 msgstr "Некорректный запрос"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4440
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4436
 #, c-format
 msgid ""
 "Full vcards are not stored in cache. Hence only summary query is supported."
@@ -1064,36 +1079,37 @@ msgstr ""
 "Полные данные vcard не хранятся в кэше. Поэтому поддерживается только запрос "
 "для сводки."
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5263
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:5259
 #, c-format
 msgid "Unable to remove the db file: errno %d"
 msgstr "Не удалось удалить файл базы данных: код ошибки %d"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6050
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6450
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6046
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6446
 #, c-format
 msgid "Only summary queries are supported by EbSdbCursor"
 msgstr "EbSdbCursor поддерживает только запросы по сводкам"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6057
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6053
 #, c-format
 msgid "At least one sort field must be specified to use an EbSdbCursor"
 msgstr ""
 "Для использования EbSdbCursor должно быть указано по крайней мере одно поле "
 "сортировки"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6071
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6067
 #, c-format
 msgid "Cannot sort by a field that is not in the summary"
 msgstr "Невозможно отсортировать по полю, которое не является сводкой"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6078
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6074
 #, c-format
 msgid "Cannot sort by a field which may have multiple values"
 msgstr "Невозможно отсортировать по полю, которое имеет несколько значений"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211
-#: ../addressbook/libedata-book/e-book-sqlite.c:8106
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6207
+#: ../src/addressbook/libedata-book/e-book-cache.c:5797
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:8145
 #, c-format
 msgid ""
 "Tried to step a cursor in reverse, but cursor is already at the beginning of "
@@ -1102,8 +1118,9 @@ msgstr ""
 "Попытка перевести курсор на шаг назад, но курсор уже находится в начале "
 "списка контактов"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6219
-#: ../addressbook/libedata-book/e-book-sqlite.c:8114
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6215
+#: ../src/addressbook/libedata-book/e-book-cache.c:5804
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:8153
 #, c-format
 msgid ""
 "Tried to step a cursor forwards, but cursor is already at the end of the "
@@ -1112,1065 +1129,1839 @@ msgstr ""
 "Попытка перевести курсор на шаг вперёд, но курсор уже находится в конце "
 "списка контактов"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:545
+#: ../src/addressbook/libedata-book/e-book-cache.c:337
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:569
 #, c-format
-msgid "Unsupported contact field '%d' specified in summary"
+msgid "Unsupported contact field “%d” specified in summary"
 msgstr "В сводке указано неподдерживаемое поле контакта «%d»"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:1925
-msgid ""
-"Cannot upgrade contacts database from a legacy database with more than one "
-"addressbook. Delete one of the entries in the 'folders' table first."
-msgstr ""
-"Невозможно обновить базу данных контактов из существующей базы, в которой "
-"больше одной адресной книги. Сначала удалите одну из записей в таблице "
-"«папки»."
-
-#: ../addressbook/libedata-book/e-book-sqlite.c:5800
+#: ../src/addressbook/libedata-book/e-book-cache.c:3463
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:5841
+#: ../src/calendar/libedata-cal/e-cal-cache.c:1702
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3560
 #, c-format
 msgid "Invalid query: %s"
 msgstr "Недопустимый запрос: %s"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:5975
-msgid "Invalid query for EbSqlCursor"
-msgstr "Недопустимый запрос для EbSqlCursor"
-
-#: ../addressbook/libedata-book/e-book-sqlite.c:7928
-msgid "At least one sort field must be specified to use an EbSqlCursor"
-msgstr ""
-"Для использования EbSqlCursor должно быть указано по крайней мере одно поле "
-"сортировки"
-
-#: ../addressbook/libedata-book/e-book-sqlite.c:7946
-msgid "Cannot sort by a field that is not a string type"
-msgstr "Невозможно отсортировать по полю, которое имеет нестроковый тип"
-
-#: ../addressbook/libedata-book/e-data-book.c:380
-#: ../calendar/libedata-cal/e-data-cal.c:409
-msgid "Success"
-msgstr "Успешно"
-
-#: ../addressbook/libedata-book/e-data-book.c:381
-#: ../calendar/libecal/e-cal.c:2304 ../calendar/libedata-cal/e-data-cal.c:410
-#: ../libedataserver/e-client.c:144
-msgid "Backend is busy"
-msgstr "Драйвер занят"
-
-#: ../addressbook/libedata-book/e-data-book.c:382
-#: ../calendar/libedata-cal/e-data-cal.c:411 ../libedataserver/e-client.c:154
-msgid "Repository offline"
-msgstr "Репозиторий отключён от сети"
-
-#: ../addressbook/libedata-book/e-data-book.c:383
-#: ../calendar/libecal/e-cal.c:2318 ../calendar/libedata-cal/e-data-cal.c:412
-#: ../libedataserver/e-client.c:161
-msgid "Permission denied"
-msgstr "Доступ запрещён"
-
-#: ../addressbook/libedata-book/e-data-book.c:386
-#: ../calendar/libedata-cal/e-data-cal.c:417
-msgid "Authentication Failed"
-msgstr "Сбой аутентификации"
-
-#: ../addressbook/libedata-book/e-data-book.c:387
-#: ../calendar/libedata-cal/e-data-cal.c:418
-msgid "Authentication Required"
-msgstr "Требуется аутентификация"
-
-#: ../addressbook/libedata-book/e-data-book.c:388
-#: ../calendar/libedata-cal/e-data-cal.c:419
-msgid "Unsupported field"
-msgstr "Неподдерживаемое поле"
-
-#: ../addressbook/libedata-book/e-data-book.c:389
-#: ../calendar/libedata-cal/e-data-cal.c:421 ../libedataserver/e-client.c:169
-msgid "Unsupported authentication method"
-msgstr "Неподдерживаемый метод аутентификации"
-
-#: ../addressbook/libedata-book/e-data-book.c:390
-#: ../calendar/libedata-cal/e-data-cal.c:422 ../libedataserver/e-client.c:171
-msgid "TLS not available"
-msgstr "TLS недоступен"
-
-#: ../addressbook/libedata-book/e-data-book.c:391
-msgid "Address book does not exist"
-msgstr "Адресная книга не существует"
+#: ../src/addressbook/libedata-book/e-book-cache.c:3648
+msgid "Invalid query for a book cursor"
+msgstr "Неверный запрос для книжного курсора"
 
-#: ../addressbook/libedata-book/e-data-book.c:392
-msgid "Book removed"
-msgstr "Книга удалена"
-
-#: ../addressbook/libedata-book/e-data-book.c:393
-#: ../calendar/libedata-cal/e-data-cal.c:425
-msgid "Not available in offline mode"
-msgstr "Недоступно в автономном режиме"
+#: ../src/addressbook/libedata-book/e-book-cache.c:4590
+#: ../src/libebackend/e-cache.c:756
+#, c-format
+msgid "Can’t open database %s: %s"
+msgstr "Не удается открыть базу данных %s: %s"
 
-#: ../addressbook/libedata-book/e-data-book.c:394
-#: ../calendar/libedata-cal/e-data-cal.c:426 ../libedataserver/e-client.c:173
-msgid "Search size limit exceeded"
-msgstr "Превышено ограничение на размер результатов поиска"
+#: ../src/addressbook/libedata-book/e-book-cache.c:5224
+#: ../src/addressbook/libedata-book/e-book-cache.c:5271
+#: ../src/addressbook/libedata-book/e-book-cache.c:5318
+#: ../src/addressbook/libedata-book/e-book-cache.c:5370
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2842
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2900
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2959
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3022
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3193
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1375
+#: ../src/libebackend/e-cache.c:1371 ../src/libebackend/e-cache.c:2349
+#: ../src/libebackend/e-cache.c:2389
+#, c-format
+msgid "Object “%s” not found"
+msgstr "Объект «%s» не найден"
 
-#: ../addressbook/libedata-book/e-data-book.c:395
-#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:175
-msgid "Search time limit exceeded"
-msgstr "Превышено ограничение на время поиска"
+#: ../src/addressbook/libedata-book/e-book-cache.c:5430
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3084
+#, c-format
+msgid "Object with extra “%s” not found"
+msgstr "Объект с дополнительным «%s» не найден"
 
-#: ../addressbook/libedata-book/e-data-book.c:397
-#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:179
-msgid "Query refused"
-msgstr "Запрос отклонён"
+#: ../src/addressbook/libedata-book/e-book-cache.c:5584
+msgid "At least one sort field must be specified to use a cursor"
+msgstr ""
+"Для использования курсора должно быть указано хотя бы одно поле сортировки"
 
-#: ../addressbook/libedata-book/e-data-book.c:398
-#: ../calendar/libedata-cal/e-data-cal.c:430 ../libedataserver/e-client.c:165
-msgid "Could not cancel"
-msgstr "Не удалось отменить"
+#: ../src/addressbook/libedata-book/e-book-cache.c:5593
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7985
+msgid "Cannot sort by a field that is not a string type"
+msgstr "Невозможно отсортировать по полю, которое имеет нестроковый тип"
 
-#. { E_DATA_BOOK_STATUS_OTHER_ERROR,                   N_("Other error") },
-#. { OtherError,                       N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:400
-#: ../calendar/libedata-cal/e-data-cal.c:432
-msgid "Invalid server version"
-msgstr "Недопустимая версия сервера"
+#: ../src/addressbook/libedata-book/e-book-meta-backend.c:1088
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1098
+#, c-format
+msgid "Preloaded object for UID “%s” is invalid"
+msgstr "Предварительно загруженный объект для UID «%s» недействителен"
 
-#: ../addressbook/libedata-book/e-data-book.c:402
-#: ../calendar/libecal/e-cal.c:2302 ../calendar/libedata-cal/e-data-cal.c:433
-#: ../libedataserver/e-client.c:142
-msgid "Invalid argument"
-msgstr "Недопустимый аргумент"
+#: ../src/addressbook/libedata-book/e-book-meta-backend.c:1096
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1106
+#, c-format
+msgid "Received object for UID “%s” is invalid"
+msgstr "Полученный объект для UID «%s» недействителен"
 
-#. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:404
-#: ../calendar/libecal/e-cal.c:1059 ../calendar/libecal/e-cal.c:1427
-#: ../calendar/libecal/e-cal.c:1909 ../calendar/libecal/e-cal.c:2341
-#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:167
+#: ../src/addressbook/libedata-book/e-book-meta-backend.c:1920
+#: ../src/addressbook/libedata-book/e-book-meta-backend.c:2376
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:3332
 #, c-format
-msgid "Not supported"
-msgstr "Не поддерживается"
+msgid "Failed to create cache “%s”:"
+msgstr "Не удалось создать кэш «%s»:"
 
-#: ../addressbook/libedata-book/e-data-book.c:405
-#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:185
-msgid "Backend is not opened yet"
-msgstr "Драйвер ещё не открыт"
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:1950
+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-data-book.c:406
-#: ../libedataserver/e-client.c:187
-msgid "Object is out of sync"
-msgstr "Объект рассинхронизирован"
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:6016
+msgid "Invalid query for EbSqlCursor"
+msgstr "Недопустимый запрос для EbSqlCursor"
 
-#: ../addressbook/libedata-book/e-data-book.c:414
-#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:183
-msgid "Other error"
-msgstr "Другая ошибка"
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7967
+msgid "At least one sort field must be specified to use an EbSqlCursor"
+msgstr ""
+"Для использования EbSqlCursor должно быть указано по крайней мере одно поле "
+"сортировки"
 
-#: ../addressbook/libedata-book/e-data-book.c:1171
-#: ../calendar/libedata-cal/e-data-cal.c:1452
+#: ../src/addressbook/libedata-book/e-data-book.c:893
+#: ../src/calendar/libedata-cal/e-data-cal.c:1168
 msgid "Invalid query: "
 msgstr "Недопустимый запрос: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1420
+#: ../src/addressbook/libedata-book/e-data-book.c:1142
 msgid "Cannot open book: "
 msgstr "Невозможно открыть книгу: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1458
+#: ../src/addressbook/libedata-book/e-data-book.c:1180
 msgid "Cannot refresh address book: "
 msgstr "Невозможно обновить адресную книгу: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1497
+#: ../src/addressbook/libedata-book/e-data-book.c:1221
 msgid "Cannot get contact: "
 msgstr "Невозможно получить контакт: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1546
+#: ../src/addressbook/libedata-book/e-data-book.c:1266
 msgid "Cannot get contact list: "
 msgstr "Невозможно получить список контактов: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1602
+#: ../src/addressbook/libedata-book/e-data-book.c:1318
 msgid "Cannot get contact list uids: "
 msgstr "Невозможно получить идентификаторы списка контактов: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1653
+#: ../src/addressbook/libedata-book/e-data-book.c:1369
 msgid "Cannot add contact: "
 msgstr "Невозможно добавить контакт: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1706
+#: ../src/addressbook/libedata-book/e-data-book.c:1420
 msgid "Cannot modify contacts: "
-msgstr "Невозможно изменить контакты:"
+msgstr "Невозможно изменить контакты: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1759
+#: ../src/addressbook/libedata-book/e-data-book.c:1472
 msgid "Cannot remove contacts: "
 msgstr "Невозможно удалить контакты: "
 
-#: ../addressbook/libedata-book/e-data-book-cursor.c:776
+#: ../src/addressbook/libedata-book/e-data-book-cursor.c:771
 msgid "Cursor does not support setting the search expression"
 msgstr "Курсор не поддерживает установку поискового выражения"
 
-#: ../addressbook/libedata-book/e-data-book-cursor.c:859
+#: ../src/addressbook/libedata-book/e-data-book-cursor.c:858
 msgid "Cursor does not support step"
 msgstr "Курсор не поддерживает шаг"
 
-#: ../addressbook/libedata-book/e-data-book-cursor.c:942
+#: ../src/addressbook/libedata-book/e-data-book-cursor.c:934
 msgid "Cursor does not support alphabetic indexes"
 msgstr "Курсор не поддерживает алфавитные индексы"
 
-#: ../addressbook/libedata-book/e-data-book-cursor-sqlite.c:268
+#: ../src/addressbook/libedata-book/e-data-book-cursor-cache.c:92
+#: ../src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:260
 msgid "Unrecognized cursor origin"
 msgstr "Нераспознанный оригинал курсора"
 
-#: ../addressbook/libedata-book/e-data-book-cursor-sqlite.c:336
+#: ../src/addressbook/libedata-book/e-data-book-cursor-cache.c:151
+#: ../src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:328
 msgid "Out of sync revision while moving cursor"
 msgstr "Ревизия рассинхронизировалась во время перемещения курсора"
 
-#: ../addressbook/libedata-book/e-data-book-cursor-sqlite.c:430
+#: ../src/addressbook/libedata-book/e-data-book-cursor-cache.c:222
+#: ../src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:422
 msgid "Alphabetic index was set for incorrect locale"
 msgstr "Алфавитный индекс был установлен для неверной локали"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:671
-#, c-format
-msgid "Server is unreachable (%s)"
-msgstr "Сервер недоступен (%s)"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:702
-#, c-format
-msgid "Failed to connect to a server using SSL/TLS: %s"
-msgstr "Сбой при подключении к серверу с использованием SSL/TLS: %s"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:718
-#, c-format
-msgid "Unexpected HTTP status code %d returned (%s) for URI: %s"
-msgstr "Получен неожиданный код (%d) состояния HTTP (%s) для URI: %s"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:739
-msgid "CalDAV backend is not loaded yet"
-msgstr "Драйвер CalDAV ещё не загружен"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1176
-#: ../libedataserver/e-webdav-discover.c:147
-msgid "Invalid Redirect URL"
-msgstr "Неверный перенаправляющий URL"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3033
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:218
 #, c-format
-msgid "Cannot create local cache folder '%s'"
-msgstr "Не удалось создать локальную кэш-папку «%s»"
+msgid "Given URL “%s” doesn’t reference CalDAV calendar"
+msgstr "Указанный URL «%s» не ссылается на календарь CalDAV"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3116
-#, c-format
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1513
+#: ../src/calendar/backends/webdav-notes/e-cal-backend-webdav-notes.c:1164
 msgid ""
-"Server is unreachable, calendar is opened in read-only mode.\n"
-"Error message: %s"
+"Missing information about component URL, local cache is possibly incomplete "
+"or broken. Remove it, please."
 msgstr ""
-"Сервер недоступен, календарь открыт в режиме «только чтение».\n"
-"Сообщение об ошибке: %s"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4211
-msgid "CalDAV does not support bulk additions"
-msgstr "CalDAV не поддерживает пакетные добавления"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4314
-msgid "CalDAV does not support bulk modifications"
-msgstr "CalDAV не поддерживает пакетные изменения"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4595
-msgid "CalDAV does not support bulk removals"
-msgstr "CalDAV не поддерживает пакетные удаления"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5277
-msgid "Calendar doesn't support Free/Busy"
-msgstr "Календарь не поддерживает информацию о занятости"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5286
-msgid "Schedule outbox url not found"
-msgstr "Не найден url исходящего расписания"
+"Отсутствует информация об URL компонента, возможно, локальный кэш неполный "
+"или поврежден. Удалите его, пожалуйста."
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5383
-msgid "Unexpected result in schedule-response"
-msgstr "Неожиданный результат в ответе-расписании"
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:2025
+msgid "Failed to parse response data"
+msgstr "Не удалось разобрать данные ответа"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:950
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:959
 msgid "Birthday"
 msgstr "День рождения"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:986
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:995
 #, c-format
 msgid "Birthday: %s"
 msgstr "День рождения: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1017
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:1026
 #, c-format
 msgid "Anniversary: %s"
 msgstr "Годовщина: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:245
+#: ../src/calendar/backends/file/e-cal-backend-file.c:43
+msgid "Cannot get URI"
+msgstr "Невозможно получить URI"
+
+#: ../src/calendar/backends/file/e-cal-backend-file.c:243
 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
+#: ../src/calendar/backends/file/e-cal-backend-file.c:250
+#: ../src/calendar/backends/file/e-cal-backend-file.c:256
 msgid "Cannot save calendar data"
 msgstr "Не удалось сохранить данные календаря"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:581
+#: ../src/calendar/backends/file/e-cal-backend-file.c:1184
+#: ../src/calendar/backends/file/e-cal-backend-file.c:1313
+#, c-format
+msgid "Cannot parse ISC file “%s”"
+msgstr "Невозможно разобрать файл ISC «%s»"
+
+#: ../src/calendar/backends/file/e-cal-backend-file.c:1195
+#: ../src/calendar/backends/file/e-cal-backend-file.c:1324
+#, c-format
+msgid "File “%s” is not a VCALENDAR component"
+msgstr "Файл «%s» не является компонентом VCALENDAR"
+
+#. FIXME This should be doable once all the recurid stuff is done
+#: ../src/calendar/backends/file/e-cal-backend-file.c:3739
+#: ../src/calendar/backends/file/e-cal-backend-file.c:3745
+#: ../src/calendar/backends/file/e-cal-backend-file.c:3751
+#: ../src/calendar/backends/file/e-cal-backend-file.c:3778
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:2559
+msgid "Unsupported method"
+msgstr "Неподдерживаемый метод"
+
+#: ../src/calendar/backends/http/e-cal-backend-http.c:227
+msgid "URI not set"
+msgstr "URI не установлен"
+
+#: ../src/calendar/backends/http/e-cal-backend-http.c:312
 #, c-format
-msgid "Redirected to Invalid URI"
-msgstr "Переадресован на недопустимый URI"
+msgid "Malformed URI “%s”: %s"
+msgstr "Некорректный URI «%s»: %s"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:640
+#: ../src/calendar/backends/http/e-cal-backend-http.c:460
 #, c-format
 msgid "Bad file format."
 msgstr "Неверный формат файла."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:650
+#: ../src/calendar/backends/http/e-cal-backend-http.c:469
 #, c-format
 msgid "Not a calendar."
 msgstr "Не является календарём."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:954
-#: ../calendar/backends/weather/e-cal-backend-weather.c:709
-msgid "Could not create cache file"
-msgstr "Не удалось создать файл кэша"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:195
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:214
 msgid "Could not retrieve weather data"
 msgstr "Не удалось получить информацию о погоде"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:378
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:358
 msgid "Weather: Fog"
 msgstr "Погода: Туман"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:379
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:359
 msgid "Weather: Cloudy Night"
 msgstr "Погода: Облачная ночь"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:380
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:360
 msgid "Weather: Cloudy"
 msgstr "Погода: Облачно"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:381
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:361
 msgid "Weather: Overcast"
 msgstr "Погода: Пасмурно"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:382
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:362
 msgid "Weather: Showers"
 msgstr "Погода: Дожди"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:383
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:363
 msgid "Weather: Snow"
 msgstr "Погода: Снег"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:384
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:364
 msgid "Weather: Clear Night"
 msgstr "Погода: Ясная ночь"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:385
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:365
 msgid "Weather: Sunny"
 msgstr "Погода: Солнечно"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:386
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:366
 msgid "Weather: Thunderstorms"
 msgstr "Погода: Грозы"
 
 #. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN)
-#: ../calendar/backends/weather/e-cal-backend-weather.c:412
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:392
 #, c-format
 msgid "%.1f °F"
 msgstr "%.1f °F"
 
 #. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN)
-#: ../calendar/backends/weather/e-cal-backend-weather.c:415
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:395
 #, c-format
 msgid "%.1f °C"
 msgstr "%.1f °C"
 
 #. TRANSLATOR: This is the temperature in kelvin
-#: ../calendar/backends/weather/e-cal-backend-weather.c:418
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:398
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:424
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:404
 #, c-format
 msgid "%.1f"
 msgstr "%.1f"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:589
-#: ../calendar/backends/weather/e-cal-backend-weather.c:617
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:567
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:595
 msgid "Forecast"
 msgstr "Прогноз"
 
-#: ../calendar/libecal/e-cal.c:2306
-msgid "Repository is offline"
-msgstr "Репозиторий находится в автономном режиме"
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:691
+msgid "Could not create cache file"
+msgstr "Не удалось создать файл кэша"
+
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:693
+msgid "Could not create cache file: "
+msgstr "Не удалось создать файл кэша: "
+
+#: ../src/calendar/backends/webdav-notes/e-cal-backend-webdav-notes.c:973
+#: ../src/calendar/backends/webdav-notes/e-cal-backend-webdav-notes.c:1002
+msgid "New note"
+msgstr "Новая заметка"
 
-#: ../calendar/libecal/e-cal.c:2308 ../calendar/libecal/e-cal-client.c:266
+#: ../src/calendar/libecal/e-cal-client.c:244
 msgid "No such calendar"
 msgstr "Нет такого календаря"
 
-#: ../calendar/libecal/e-cal.c:2310 ../calendar/libecal/e-cal-client.c:268
-#: ../calendar/libedata-cal/e-data-cal.c:414
+#: ../src/calendar/libecal/e-cal-client.c:246
 msgid "Object not found"
 msgstr "Объект не найден"
 
-#: ../calendar/libecal/e-cal.c:2312 ../calendar/libecal/e-cal-client.c:270
-#: ../calendar/libedata-cal/e-data-cal.c:415
+#: ../src/calendar/libecal/e-cal-client.c:248
 msgid "Invalid object"
 msgstr "Неверный объект"
 
-#: ../calendar/libecal/e-cal.c:2314
-msgid "URI not loaded"
-msgstr "URI не загружен"
-
-#: ../calendar/libecal/e-cal.c:2316
-msgid "URI already loaded"
-msgstr "URI уже загружен"
-
-#: ../calendar/libecal/e-cal.c:2320
-msgid "Unknown User"
+#: ../src/calendar/libecal/e-cal-client.c:250
+msgid "Unknown user"
 msgstr "Неизвестный пользователь"
 
-#: ../calendar/libecal/e-cal.c:2322 ../calendar/libecal/e-cal-client.c:274
-#: ../calendar/libedata-cal/e-data-cal.c:416
+#: ../src/calendar/libecal/e-cal-client.c:252
 msgid "Object ID already exists"
 msgstr "Идентификатор объекта уже существует"
 
-#: ../calendar/libecal/e-cal.c:2324
-msgid "Protocol not supported"
-msgstr "Протокол не поддерживается"
-
-#: ../calendar/libecal/e-cal.c:2326
-msgid "Operation has been canceled"
-msgstr "Операция отменена"
-
-#: ../calendar/libecal/e-cal.c:2328
-msgid "Could not cancel operation"
-msgstr "Не удалось отменить операцию"
-
-#: ../calendar/libecal/e-cal.c:2330 ../libedataserver/e-client.c:150
-msgid "Authentication failed"
-msgstr "Сбой проверки подлинности"
-
-#: ../calendar/libecal/e-cal.c:2332
-#: ../camel/providers/smtp/camel-smtp-transport.c:1127
-#: ../libedataserver/e-client.c:152
-msgid "Authentication required"
-msgstr "Требуется аутентификация"
-
-#: ../calendar/libecal/e-cal.c:2334
-msgid "A D-Bus exception has occurred"
-msgstr "Произошло исключение D-Bus"
-
-#: ../calendar/libecal/e-cal.c:2338
-msgid "No error"
-msgstr "Нет ошибки"
-
-#: ../calendar/libecal/e-cal-client.c:272
-#: ../calendar/libedata-cal/e-data-cal.c:424
-msgid "Unknown user"
-msgstr "Неизвестный пользователь"
-
-#: ../calendar/libecal/e-cal-client.c:276
-#: ../calendar/libedata-cal/e-data-cal.c:413
+#: ../src/calendar/libecal/e-cal-client.c:254
 msgid "Invalid range"
 msgstr "Недопустимый диапазон"
 
-#: ../calendar/libecal/e-cal-client.c:1065
+#: ../src/calendar/libecal/e-cal-client.c:1073
 #, c-format
-msgid "Unknown calendar property '%s'"
+msgid "Unknown calendar property “%s”"
 msgstr "Неизвестное свойство календаря «%s»"
 
-#: ../calendar/libecal/e-cal-client.c:1080
+#: ../src/calendar/libecal/e-cal-client.c:1088
 #, c-format
-msgid "Cannot change value of calendar property '%s'"
+msgid "Cannot change value of calendar property “%s”"
 msgstr "Невозможно изменить значение свойства календаря «%s»"
 
-#: ../calendar/libecal/e-cal-component.c:1357
+#: ../src/calendar/libecal/e-cal-component.c:716
 msgid "Untitled appointment"
 msgstr "Неозаглавленная встреча"
 
-#: ../calendar/libecal/e-cal-recur.c:4744
+#: ../src/calendar/libecal/e-cal-recur.c:4889
 msgid "1st"
 msgstr "1-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4745
+#: ../src/calendar/libecal/e-cal-recur.c:4890
 msgid "2nd"
 msgstr "2-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4746
+#: ../src/calendar/libecal/e-cal-recur.c:4891
 msgid "3rd"
 msgstr "3-е"
 
-#: ../calendar/libecal/e-cal-recur.c:4747
+#: ../src/calendar/libecal/e-cal-recur.c:4892
 msgid "4th"
 msgstr "4-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4748
+#: ../src/calendar/libecal/e-cal-recur.c:4893
 msgid "5th"
 msgstr "5-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4749
+#: ../src/calendar/libecal/e-cal-recur.c:4894
 msgid "6th"
 msgstr "6-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4750
+#: ../src/calendar/libecal/e-cal-recur.c:4895
 msgid "7th"
 msgstr "7-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4751
+#: ../src/calendar/libecal/e-cal-recur.c:4896
 msgid "8th"
 msgstr "8-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4752
+#: ../src/calendar/libecal/e-cal-recur.c:4897
 msgid "9th"
 msgstr "9-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4753
+#: ../src/calendar/libecal/e-cal-recur.c:4898
 msgid "10th"
 msgstr "10-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4754
+#: ../src/calendar/libecal/e-cal-recur.c:4899
 msgid "11th"
 msgstr "11-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4755
+#: ../src/calendar/libecal/e-cal-recur.c:4900
 msgid "12th"
 msgstr "12-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4756
+#: ../src/calendar/libecal/e-cal-recur.c:4901
 msgid "13th"
 msgstr "13-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4757
+#: ../src/calendar/libecal/e-cal-recur.c:4902
 msgid "14th"
 msgstr "14-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4758
+#: ../src/calendar/libecal/e-cal-recur.c:4903
 msgid "15th"
 msgstr "15-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4759
+#: ../src/calendar/libecal/e-cal-recur.c:4904
 msgid "16th"
 msgstr "16-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4760
+#: ../src/calendar/libecal/e-cal-recur.c:4905
 msgid "17th"
 msgstr "17-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4761
+#: ../src/calendar/libecal/e-cal-recur.c:4906
 msgid "18th"
 msgstr "18-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4762
+#: ../src/calendar/libecal/e-cal-recur.c:4907
 msgid "19th"
 msgstr "19-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4763
+#: ../src/calendar/libecal/e-cal-recur.c:4908
 msgid "20th"
 msgstr "20-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4764
+#: ../src/calendar/libecal/e-cal-recur.c:4909
 msgid "21st"
 msgstr "21-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4765
+#: ../src/calendar/libecal/e-cal-recur.c:4910
 msgid "22nd"
 msgstr "22-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4766
+#: ../src/calendar/libecal/e-cal-recur.c:4911
 msgid "23rd"
 msgstr "23-е"
 
-#: ../calendar/libecal/e-cal-recur.c:4767
+#: ../src/calendar/libecal/e-cal-recur.c:4912
 msgid "24th"
 msgstr "24-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4768
+#: ../src/calendar/libecal/e-cal-recur.c:4913
 msgid "25th"
 msgstr "25-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4769
+#: ../src/calendar/libecal/e-cal-recur.c:4914
 msgid "26th"
 msgstr "26-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4770
+#: ../src/calendar/libecal/e-cal-recur.c:4915
 msgid "27th"
 msgstr "27-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4771
+#: ../src/calendar/libecal/e-cal-recur.c:4916
 msgid "28th"
 msgstr "28-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4772
+#: ../src/calendar/libecal/e-cal-recur.c:4917
 msgid "29th"
 msgstr "29-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4773
+#: ../src/calendar/libecal/e-cal-recur.c:4918
 msgid "30th"
 msgstr "30-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4774
+#: ../src/calendar/libecal/e-cal-recur.c:4919
 msgid "31st"
 msgstr "31-ое"
 
-#: ../calendar/libecal/e-cal-util.c:706 ../calendar/libecal/e-cal-util.c:733
+#: ../src/calendar/libecal/e-cal-recur.c:5069
+#, c-format
+msgid "every day forever"
+msgid_plural "every %d days forever"
+msgstr[0] "каждый %d-й день без конца"
+msgstr[1] "каждый %d-й день без конца"
+msgstr[2] "каждый %d-й день без конца"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5075
+#, c-format
+msgid "Every day forever"
+msgid_plural "Every %d days forever"
+msgstr[0] "Каждый %d день без конца"
+msgstr[1] "Каждый %d день без конца"
+msgstr[2] "Каждый %d день без конца"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5083
+#, c-format
+msgid "every day"
+msgid_plural "every %d days"
+msgstr[0] "каждый %d-й день"
+msgstr[1] "каждый %d-й день"
+msgstr[2] "каждый %d-й день"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5089
+#, c-format
+msgid "Every day"
+msgid_plural "Every %d days"
+msgstr[0] "Каждый %d-й день"
+msgstr[1] "Каждый %d-й день"
+msgstr[2] "Каждый %d-й день"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5175
+#, c-format
+msgid "every week"
+msgid_plural "every %d weeks"
+msgstr[0] "каждую %d-ю неделю"
+msgstr[1] "каждую %d-ю неделю"
+msgstr[2] "каждую %d-ю неделю"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5181
+#, c-format
+msgid "Every week"
+msgid_plural "Every %d weeks"
+msgstr[0] "Каждую %d-ю неделю"
+msgstr[1] "Каждую %d-ю неделю"
+msgstr[2] "Каждую %d-ю неделю"
+
+#. Translators: This is used to merge set of week day names in a recurrence, which can contain any
+#. of the week day names. The string always starts with "on DAYNAME", then it can continue either
+#. with ", DAYNAME" or " and DAYNAME", thus it can be something like "on Monday and Tuesday"
+#. or "on Monday, Wednesday and Friday" or simply "on Saturday". The '%1$s' is replaced with
+#. the previously gathered text, while the '%2$s' is replaced with the text to append.
+#: ../src/calendar/libecal/e-cal-recur.c:5195
+#, c-format
+msgctxt "recur-description-dayname"
+msgid "%1$s%2$s"
+msgstr "%1$s%2$s"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5212
+msgctxt "recur-description"
+msgid "on Sunday"
+msgstr "в воскресенье"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5213
+msgctxt "recur-description"
+msgid ", Sunday"
+msgstr ", воскресенье"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5214
+msgctxt "recur-description"
+msgid " and Sunday"
+msgstr " и воскресенье"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5217
+msgctxt "recur-description"
+msgid "on Monday"
+msgstr "в понедельник"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5218
+msgctxt "recur-description"
+msgid ", Monday"
+msgstr ", понедельник"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5219
+msgctxt "recur-description"
+msgid " and Monday"
+msgstr " и понедельник"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5222
+msgctxt "recur-description"
+msgid "on Tuesday"
+msgstr "во вторник"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5223
+msgctxt "recur-description"
+msgid ", Tuesday"
+msgstr ", вторник"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5224
+msgctxt "recur-description"
+msgid " and Tuesday"
+msgstr " и вторник"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5227
+msgctxt "recur-description"
+msgid "on Wednesday"
+msgstr "в среду"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5228
+msgctxt "recur-description"
+msgid ", Wednesday"
+msgstr ", среда"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5229
+msgctxt "recur-description"
+msgid " and Wednesday"
+msgstr " и среда"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5232
+msgctxt "recur-description"
+msgid "on Thursday"
+msgstr "в четверг"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5233
+msgctxt "recur-description"
+msgid ", Thursday"
+msgstr ", четверг"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5234
+msgctxt "recur-description"
+msgid " and Thursday"
+msgstr " и четверг"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5237
+msgctxt "recur-description"
+msgid "on Friday"
+msgstr "в пятницу"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5238
+msgctxt "recur-description"
+msgid ", Friday"
+msgstr ", пятница"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5239
+msgctxt "recur-description"
+msgid " and Friday"
+msgstr " и пятница"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5242
+msgctxt "recur-description"
+msgid "on Saturday"
+msgstr "в субботу"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5243
+msgctxt "recur-description"
+msgid ", Saturday"
+msgstr ", суббота"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5244
+msgctxt "recur-description"
+msgid " and Saturday"
+msgstr " и суббота"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5373
+#, c-format
+msgid "every month"
+msgid_plural "every %d months"
+msgstr[0] "каждый %d-й месяц"
+msgstr[1] "каждый %d-й месяц"
+msgstr[2] "каждый %d-й месяц"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5379
+#, c-format
+msgid "Every month"
+msgid_plural "Every %d months"
+msgstr[0] "Каждый %d-й месяц"
+msgstr[1] "Каждый %d-й месяц"
+msgstr[2] "Каждый %d-й месяц"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5389
+#: ../src/calendar/libecal/e-cal-recur.c:5710
+msgctxt "recur-description"
+msgid "on the last Sunday"
+msgstr "в последнее воскресенье"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5392
+#: ../src/calendar/libecal/e-cal-recur.c:5560
+msgctxt "recur-description"
+msgid "on the last Monday"
+msgstr "в последний понедельник"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5395
+#: ../src/calendar/libecal/e-cal-recur.c:5585
+msgctxt "recur-description"
+msgid "on the last Tuesday"
+msgstr "в последний вторник"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5398
+#: ../src/calendar/libecal/e-cal-recur.c:5610
+msgctxt "recur-description"
+msgid "on the last Wednesday"
+msgstr "в последнюю среду"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5401
+#: ../src/calendar/libecal/e-cal-recur.c:5635
+msgctxt "recur-description"
+msgid "on the last Thursday"
+msgstr "в последний четверг"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5404
+#: ../src/calendar/libecal/e-cal-recur.c:5660
+msgctxt "recur-description"
+msgid "on the last Friday"
+msgstr "в последнюю пятницу"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5407
+#: ../src/calendar/libecal/e-cal-recur.c:5685
+msgctxt "recur-description"
+msgid "on the last Saturday"
+msgstr "в последнюю субботу"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5417
+msgctxt "recur-description"
+msgid "on the 1st day"
+msgstr "в 1-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5421
+msgctxt "recur-description"
+msgid "on the 2nd day"
+msgstr "на 2-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5425
+msgctxt "recur-description"
+msgid "on the 3rd day"
+msgstr "на 3-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5429
+msgctxt "recur-description"
+msgid "on the 4th day"
+msgstr "на 4-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5433
+msgctxt "recur-description"
+msgid "on the 5th day"
+msgstr "на 5-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5437
+msgctxt "recur-description"
+msgid "on the 6th day"
+msgstr "на 6-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5441
+msgctxt "recur-description"
+msgid "on the 7th day"
+msgstr "на 7-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5445
+msgctxt "recur-description"
+msgid "on the 8th day"
+msgstr "на 8-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5449
+msgctxt "recur-description"
+msgid "on the 9th day"
+msgstr "на 9-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5453
+msgctxt "recur-description"
+msgid "on the 10th day"
+msgstr "на 10-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5457
+msgctxt "recur-description"
+msgid "on the 11th day"
+msgstr "на 11-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5461
+msgctxt "recur-description"
+msgid "on the 12th day"
+msgstr "на 12-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5465
+msgctxt "recur-description"
+msgid "on the 13th day"
+msgstr "на 13-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5469
+msgctxt "recur-description"
+msgid "on the 14th day"
+msgstr "на 14-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5473
+msgctxt "recur-description"
+msgid "on the 15th day"
+msgstr "на 15-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5477
+msgctxt "recur-description"
+msgid "on the 16th day"
+msgstr "на 16-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5481
+msgctxt "recur-description"
+msgid "on the 17th day"
+msgstr "на 17-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5485
+msgctxt "recur-description"
+msgid "on the 18th day"
+msgstr "на 18-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5489
+msgctxt "recur-description"
+msgid "on the 19th day"
+msgstr "на 19-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5493
+msgctxt "recur-description"
+msgid "on the 20th day"
+msgstr "на 20-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5497
+msgctxt "recur-description"
+msgid "on the 21st day"
+msgstr "на 21-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5501
+msgctxt "recur-description"
+msgid "on the 22nd day"
+msgstr "на 22-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5505
+msgctxt "recur-description"
+msgid "on the 23rd day"
+msgstr "на 23-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5509
+msgctxt "recur-description"
+msgid "on the 24th day"
+msgstr "на 24-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5513
+msgctxt "recur-description"
+msgid "on the 25th day"
+msgstr "на 25-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5517
+msgctxt "recur-description"
+msgid "on the 26th day"
+msgstr "на 26-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5521
+msgctxt "recur-description"
+msgid "on the 27th day"
+msgstr "на 27-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5525
+msgctxt "recur-description"
+msgid "on the 28th day"
+msgstr "на 28-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5529
+msgctxt "recur-description"
+msgid "on the 29th day"
+msgstr "на 29-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5533
+msgctxt "recur-description"
+msgid "on the 30th day"
+msgstr "на 30-й день"
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5537
+msgctxt "recur-description"
+msgid "on the 31st day"
+msgstr "в 31-й день"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5545
+msgctxt "recur-description"
+msgid "on the first Monday"
+msgstr "в первый понедельник"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5548
+msgctxt "recur-description"
+msgid "on the second Monday"
+msgstr "во второй понедельник"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5551
+msgctxt "recur-description"
+msgid "on the third Monday"
+msgstr "в третий понедельник"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5554
+msgctxt "recur-description"
+msgid "on the fourth Monday"
+msgstr "в четвертый понедельник"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5557
+msgctxt "recur-description"
+msgid "on the fifth Monday"
+msgstr "в пятый понедельник"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5570
+msgctxt "recur-description"
+msgid "on the first Tuesday"
+msgstr "в первый вторник"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5573
+msgctxt "recur-description"
+msgid "on the second Tuesday"
+msgstr "во второй вторник"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5576
+msgctxt "recur-description"
+msgid "on the third Tuesday"
+msgstr "в третий вторник"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5579
+msgctxt "recur-description"
+msgid "on the fourth Tuesday"
+msgstr "в четвертый вторник"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5582
+msgctxt "recur-description"
+msgid "on the fifth Tuesday"
+msgstr "в пятый вторник"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5595
+msgctxt "recur-description"
+msgid "on the first Wednesday"
+msgstr "в первую среду"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5598
+msgctxt "recur-description"
+msgid "on the second Wednesday"
+msgstr "во вторую среду"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5601
+msgctxt "recur-description"
+msgid "on the third Wednesday"
+msgstr "в третью среду"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5604
+msgctxt "recur-description"
+msgid "on the fourth Wednesday"
+msgstr "в четвёртую среду"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5607
+msgctxt "recur-description"
+msgid "on the fifth Wednesday"
+msgstr "в пятую среду"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5620
+msgctxt "recur-description"
+msgid "on the first Thursday"
+msgstr "в первый четверг"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5623
+msgctxt "recur-description"
+msgid "on the second Thursday"
+msgstr "во второй четверг"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5626
+msgctxt "recur-description"
+msgid "on the third Thursday"
+msgstr "в третий четверг"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5629
+msgctxt "recur-description"
+msgid "on the fourth Thursday"
+msgstr "в четвертый четверг"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5632
+msgctxt "recur-description"
+msgid "on the fifth Thursday"
+msgstr "в пятый четверг"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5645
+msgctxt "recur-description"
+msgid "on the first Friday"
+msgstr "в первую пятницу"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5648
+msgctxt "recur-description"
+msgid "on the second Friday"
+msgstr "во вторую пятницу"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5651
+msgctxt "recur-description"
+msgid "on the third Friday"
+msgstr "в третью пятницу"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5654
+msgctxt "recur-description"
+msgid "on the fourth Friday"
+msgstr "в четвертую пятницу"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5657
+msgctxt "recur-description"
+msgid "on the fifth Friday"
+msgstr "в пятую пятницу"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5670
+msgctxt "recur-description"
+msgid "on the first Saturday"
+msgstr "в первую субботу"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5673
+msgctxt "recur-description"
+msgid "on the second Saturday"
+msgstr "во вторую субботу"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5676
+msgctxt "recur-description"
+msgid "on the third Saturday"
+msgstr "в третью субботу"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5679
+msgctxt "recur-description"
+msgid "on the fourth Saturday"
+msgstr "в четвертую субботу"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5682
+msgctxt "recur-description"
+msgid "on the fifth Saturday"
+msgstr "в пятую субботу"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5695
+msgctxt "recur-description"
+msgid "on the first Sunday"
+msgstr "в первое воскресенье"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5698
+msgctxt "recur-description"
+msgid "on the second Sunday"
+msgstr "во второе воскресенье"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5701
+msgctxt "recur-description"
+msgid "on the third Sunday"
+msgstr "в третье воскресенье"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5704
+msgctxt "recur-description"
+msgid "on the fourth Sunday"
+msgstr "в четвертое воскресенье"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5707
+msgctxt "recur-description"
+msgid "on the fifth Sunday"
+msgstr "в пятое воскресенье"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5736
+#, c-format
+msgid "every year forever"
+msgid_plural "every %d years forever"
+msgstr[0] "каждый %d-й год без конца"
+msgstr[1] "каждый %d-й год без конца"
+msgstr[2] "каждый %d-й год без конца"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5742
+#, c-format
+msgid "Every year forever"
+msgid_plural "Every %d years forever"
+msgstr[0] "Каждый %d-й год без конца"
+msgstr[1] "Каждый %d-й год без конца"
+msgstr[2] "Каждый %d-й год без конца"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5750
+#, c-format
+msgid "every year"
+msgid_plural "every %d years"
+msgstr[0] "каждый %d-й год"
+msgstr[1] "каждый %d-й год"
+msgstr[2] "каждый %d-й год"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5756
+#, c-format
+msgid "Every year"
+msgid_plural "Every %d years"
+msgstr[0] "Каждый %d-й год"
+msgstr[1] "Каждый %d-й год"
+msgstr[2] "Каждый %d-й год"
+
+#. Translators: This is one of the last possible parts of a recurrence description.
+#. The text is appended at the end of the complete recurrence description, making it
+#. for example: "Every 3 days for 10 occurrences"
+#: ../src/calendar/libecal/e-cal-recur.c:5775
+#, c-format
+msgid "for one occurrence"
+msgid_plural "for %d occurrences"
+msgstr[0] "%d раз"
+msgstr[1] "%d раза"
+msgstr[2] "%d раз"
+
+#. Translators: This is one of the last possible parts of a recurrence description.
+#. The '%s' is replaced with actual date, thus it can create something like
+#. "until Mon 15.1.2018". The text is appended at the end of the complete
+#. recurrence description, making it for example: "Every 3 days until Mon 15.1.2018"
+#: ../src/calendar/libecal/e-cal-recur.c:5811
+#, c-format
+msgctxt "recur-description"
+msgid "until %s"
+msgstr "до %s"
+
+#. Translators: This is one of the last possible parts of a recurrence description.
+#. The text is appended at the end of the complete recurrence description, making it
+#. for example: "Every 2 months on Tuesday, Thursday and Friday forever"
+#: ../src/calendar/libecal/e-cal-recur.c:5817
+msgctxt "recur-description"
+msgid "forever"
+msgstr "без конца"
+
+#. Translators: This constructs a complete recurrence description; the '%1$s' is like "Every 2 weeks",
+#. the '%2$s' is like "on Tuesday and Friday" and the '%3$s' is like "for 10 occurrences", constructing
+#. together one sentence: "Every 2 weeks on Tuesday and Friday for 10 occurrences".
+#: ../src/calendar/libecal/e-cal-recur.c:5827
+#, c-format
+msgctxt "recur-description"
+msgid "%1$s %2$s %3$s"
+msgstr "%1$s %2$s %3$s"
+
+#. Translators: This constructs a complete recurrence description; the '%1$s' is like "Every 2 days",
+#. the '%2$s' is like "for 10 occurrences", constructing together one sentence:
+#. "Every 2 days for 10 occurrences".
+#: ../src/calendar/libecal/e-cal-recur.c:5832
+#, c-format
+msgctxt "recur-description"
+msgid "%1$s %2$s"
+msgstr "%1$s %2$s"
+
+#. Translators: This text is appended at the end of complete recur description using "%s%s" in
+#. context "recur-description"
+#: ../src/calendar/libecal/e-cal-recur.c:5848
+#, c-format
+msgid ", with one exception"
+msgid_plural ", with %d exceptions"
+msgstr[0] "за %d исключением"
+msgstr[1] "за %d исключениями"
+msgstr[2] "за %d исключениями"
+
+#. Translators: This appends text like ", with 3 exceptions" at the end of complete recurrence description.
+#. The "%1$s" is replaced with the recurrence description, the "%2$s" with the text about exceptions.
+#. It will form something like: "Every 2 weeks on Tuesday and Friday for 10 occurrences, with 3 exceptions"
+#: ../src/calendar/libecal/e-cal-recur.c:5855
+#, c-format
+msgctxt "recur-description"
+msgid "%1$s%2$s"
+msgstr "%1$s%2$s"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5868
+#: ../src/calendar/libecal/e-cal-recur.c:5891
+msgctxt "recur-description"
+msgid "The meeting recurs"
+msgstr "Встреча повторяется"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5870
+#: ../src/calendar/libecal/e-cal-recur.c:5893
+msgctxt "recur-description"
+msgid "The appointment recurs"
+msgstr "Мероприятие повторяется"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5873
+#: ../src/calendar/libecal/e-cal-recur.c:5896
+msgctxt "recur-description"
+msgid "The task recurs"
+msgstr "Задача повторяется"
+
+#. if (i_cal_component_isa (comp) == I_CAL_VJOURNAL_COMPONENT)
+#: ../src/calendar/libecal/e-cal-recur.c:5875
+#: ../src/calendar/libecal/e-cal-recur.c:5898
+msgctxt "recur-description"
+msgid "The memo recurs"
+msgstr "Памятка повторяется"
+
+#. Translators: This adds a prefix in front of the complete recurrence description.
+#. The '%1$s' is replaced with something like "The meeting recurs" and
+#. the '%2$s' with something like "every 2 days forever", thus forming
+#. sentence like "This meeting recurs every 2 days forever"
+#: ../src/calendar/libecal/e-cal-recur.c:5882
+#, c-format
+msgctxt "recur-description-prefix"
+msgid "%1$s %2$s"
+msgstr "%1$s %2$s"
+
+#: ../src/calendar/libecal/e-cal-util.c:837
+#: ../src/calendar/libecal/e-cal-util.c:864
 msgctxt "Priority"
 msgid "High"
 msgstr "Высокий"
 
-#: ../calendar/libecal/e-cal-util.c:708 ../calendar/libecal/e-cal-util.c:735
+#: ../src/calendar/libecal/e-cal-util.c:839
+#: ../src/calendar/libecal/e-cal-util.c:866
 msgctxt "Priority"
 msgid "Normal"
 msgstr "Нормальный"
 
-#: ../calendar/libecal/e-cal-util.c:710 ../calendar/libecal/e-cal-util.c:737
+#: ../src/calendar/libecal/e-cal-util.c:841
+#: ../src/calendar/libecal/e-cal-util.c:868
 msgctxt "Priority"
 msgid "Low"
 msgstr "Низкий"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:731
+#: ../src/calendar/libecal/e-cal-util.c:862
 msgctxt "Priority"
 msgid "Undefined"
 msgstr "Неопределённый"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:85
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1063
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1379
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1506
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1555
+#: ../src/calendar/libecal/e-cal-util.c:904
+#: ../src/libedataserverui/e-reminders-widget.c:299
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d неделя"
+msgstr[1] "%d недели"
+msgstr[2] "%d недель"
+
+#: ../src/calendar/libecal/e-cal-util.c:913
+#: ../src/libedataserverui/e-reminders-widget.c:295
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d день"
+msgstr[1] "%d дня"
+msgstr[2] "%d дней"
+
+#: ../src/calendar/libecal/e-cal-util.c:922
+#: ../src/libedataserverui/e-reminders-widget.c:291
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d час"
+msgstr[1] "%d часа"
+msgstr[2] "%d часов"
+
+#: ../src/calendar/libecal/e-cal-util.c:931
+#: ../src/libedataserverui/e-reminders-widget.c:287
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d минута"
+msgstr[1] "%d минуты"
+msgstr[2] "%d минут"
+
+#. Translators: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../src/calendar/libecal/e-cal-util.c:936
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d секунда"
+msgstr[1] "%d секунды"
+msgstr[2] "%d секунд"
+
+#: ../src/calendar/libecal/e-reminder-watcher.c:2824
+msgid "No Summary"
+msgstr "Нет сводки"
+
+#. Translators: The first %s is replaced with the time string,
+#. the second %s with a duration, and the third %s with an event location,
+#. making it something like: "24.1.2018 10:30 (30 minutes) Meeting room A1"
+#: ../src/calendar/libecal/e-reminder-watcher.c:2840
+#, c-format
+msgctxt "overdue"
+msgid "%s (%s) %s"
+msgstr "%s (%s) %s"
+
+#. Translators: The first %s is replaced with the time string,
+#. the second %s with a duration, making is something like:
+#. "24.1.2018 10:30 (30 minutes)"
+#: ../src/calendar/libecal/e-reminder-watcher.c:2845
+#, c-format
+msgctxt "overdue"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#. Translators: The first %s is replaced with the time string,
+#. the second %s with an event location, making it something like:
+#. "24.1.2018 10:30 Meeting room A1"
+#: ../src/calendar/libecal/e-reminder-watcher.c:2850
+#, c-format
+msgctxt "overdue"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:77
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1173
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1234
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1579
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1706
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1755
 #, c-format
-msgid "\"%s\" expects one argument"
+msgid "“%s” expects one argument"
 msgstr "«%s» предполагает один аргумент"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:92
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1386
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1394
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:84
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:707
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1586
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1594
 #, c-format
-msgid "\"%s\" expects the first argument to be a string"
-msgstr "«%s» предполагает строку в качестве аргумента 1"
+msgid "“%s” expects the first argument to be a string"
+msgstr "«%s» предполагает строку в качестве первого аргумента"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:167
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:164
 #, c-format
-msgid "\"%s\" expects two or three arguments"
+msgid "“%s” expects two or three arguments"
 msgstr "«%s» предполагает два или три аргумента"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:263
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:325
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:824
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1070
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1455
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1513
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1562
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:171
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:272
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:340
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:926
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1180
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1241
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1655
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1713
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1762
 #, c-format
-msgid "\"%s\" expects the first argument to be a time_t"
-msgstr "«%s» предполагает тип time_t в качестве аргумента 1"
+msgid "“%s” expects the first argument to be a time_t"
+msgstr "«%s» предполагает тип time_t в качестве первого аргумента"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:183
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:271
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:335
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:833
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:180
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:280
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:350
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:935
 #, c-format
-msgid "\"%s\" expects the second argument to be a time_t"
-msgstr "«%s» предполагает тип time_t в качестве аргумента 1"
+msgid "“%s” expects the second argument to be a time_t"
+msgstr "«%s» предполагает тип time_t в качестве первого аргумента"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:193
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:190
 #, c-format
-msgid "\"%s\" expects the third argument to be a string"
+msgid "“%s” expects the third argument to be a string"
 msgstr "«%s» предполагает строку в качестве третьего аргумента"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:255
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:264
 #, c-format
-msgid "\"%s\" expects none or two arguments"
+msgid "“%s” expects none or two arguments"
 msgstr "«%s» предполагает два аргумента или ни одного"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:318
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:667
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1448
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:333
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:700
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:919
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1648
 #, c-format
-msgid "\"%s\" expects two arguments"
+msgid "“%s” expects two arguments"
 msgstr "«%s» предполагает два аргумента"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:603
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:626
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:749
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:781
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:988
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1021
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1340
-#, c-format
-msgid "\"%s\" expects no arguments"
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:639
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:662
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:790
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:812
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:834
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:857
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:883
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1092
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1125
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1540
+#, c-format
+msgid "“%s” expects no arguments"
 msgstr "«%s» не предполагает аргументов"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:683
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:716
 #, c-format
-msgid "\"%s\" expects the second argument to be a string"
-msgstr "«%s» предполагает строку в качестве аргумента 2"
+msgid "“%s” expects the second argument to be a string"
+msgstr "«%s» предполагает строку в качестве второго аргумента"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:714
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:747
 #, c-format
 msgid ""
-"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
-"\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
-"\"classification\""
+"“%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"
+"«attendee», «organizer» или «classification» в качестве первого аргумента"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:885
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:987
 #, c-format
-msgid "\"%s\" expects at least one argument"
-msgstr "«%s» предполагает по крайней мере 1 аргумент"
+msgid "“%s” expects at least one argument"
+msgstr "«%s» предполагает по крайней мере один аргумент"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:900
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1002
 #, c-format
 msgid ""
-"\"%s\" expects all arguments to be strings or one and only one argument to "
-"be a boolean false (#f)"
+"“%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:1403
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1603
 #, c-format
-msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
+msgid "“%s” expects the first argument to be an ISO 8601 date/time string"
 msgstr ""
-"«%s» предусматривает, что аргумент 1 должен быть строкой даты в формате ISO "
-"8601"
+"«%s» предусматривает, что первый аргумент должен быть строкой даты в формате "
+"ISO 8601"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1464
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1664
 #, c-format
-msgid "\"%s\" expects the second argument to be an integer"
-msgstr "«%s» предполагает целое число в качестве аргумента 2"
+msgid "“%s” expects the second argument to be an integer"
+msgstr "«%s» предполагает целое число в качестве второго аргумента"
 
-#: ../calendar/libedata-cal/e-data-cal.c:420
-msgid "Unsupported method"
-msgstr "Неподдерживаемый метод"
+#: ../src/calendar/libedata-cal/e-cal-cache.c:1846
+#, c-format
+msgid "Failed to create SQLite function, error code “%d”: %s"
+msgstr "Не удалось создать функцию SQLite, код ошибки «%d»: %s"
+
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2840
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2898
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2957
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3020
+#, c-format
+msgid "Object “%s”, “%s” not found"
+msgstr "Объект «%s», «%s» не найден"
+
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3799
+msgid "Cannot add timezone without tzid"
+msgstr "Невозможно добавить часовой пояс без tzid"
+
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3808
+msgid "Cannot add timezone without component"
+msgstr "Невозможно добавить часовой пояс без компонента"
+
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3816
+msgid "Cannot add timezone with invalid component"
+msgstr "Невозможно добавить часовой пояс с недопустимым компонентом"
 
-#: ../calendar/libedata-cal/e-data-cal.c:423
-msgid "Calendar does not exist"
-msgstr "Календарь не существует"
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1153
+#, c-format
+msgid "Received object for UID “%s” doesn’t contain any expected component"
+msgstr "Полученный объект для UID «%s» не содержит ожидаемого компонента"
+
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:4206
+msgid "attachment.dat"
+msgstr "attachment.dat"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1645
+#: ../src/calendar/libedata-cal/e-data-cal.c:1362
 msgid "Cannot open calendar: "
 msgstr "Невозможно открыть календарь: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1682
+#: ../src/calendar/libedata-cal/e-data-cal.c:1400
 msgid "Cannot refresh calendar: "
 msgstr "Невозможно обновить календарь: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1723
+#: ../src/calendar/libedata-cal/e-data-cal.c:1442
 msgid "Cannot retrieve calendar object path: "
 msgstr "Невозможно получить путь объекта календаря: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1775
+#: ../src/calendar/libedata-cal/e-data-cal.c:1495
 msgid "Cannot retrieve calendar object list: "
 msgstr "Невозможно получить список объектов календаря: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1832
+#: ../src/calendar/libedata-cal/e-data-cal.c:1553
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "Невозможно получить список свободных/занятых дней календаря: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1882
+#: ../src/calendar/libedata-cal/e-data-cal.c:1604
 msgid "Cannot create calendar object: "
 msgstr "Невозможно создать объект календаря: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1950
+#: ../src/calendar/libedata-cal/e-data-cal.c:1673
 msgid "Cannot modify calendar object: "
 msgstr "Невозможно изменить объект календаря: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2028
+#: ../src/calendar/libedata-cal/e-data-cal.c:1752
 msgid "Cannot remove calendar object: "
 msgstr "Невозможно удалить объект календаря: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2114
+#: ../src/calendar/libedata-cal/e-data-cal.c:1839
 msgid "Cannot receive calendar objects: "
 msgstr "Невозможно получить объекты календаря: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2157
+#: ../src/calendar/libedata-cal/e-data-cal.c:1883
 msgid "Cannot send calendar objects: "
 msgstr "Невозможно отправить объекты календаря: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2209
+#: ../src/calendar/libedata-cal/e-data-cal.c:1936
 msgid "Could not retrieve attachment uris: "
 msgstr "Невозможно получить uri вложений: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2254
+#: ../src/calendar/libedata-cal/e-data-cal.c:1982
 msgid "Could not discard reminder: "
 msgstr "Не удалось снять уведомление: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2295
+#: ../src/calendar/libedata-cal/e-data-cal.c:2024
 msgid "Could not retrieve calendar time zone: "
 msgstr "Невозможно получить часовой пояс календаря: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2335
+#: ../src/calendar/libedata-cal/e-data-cal.c:2065
 msgid "Could not add calendar time zone: "
 msgstr "Невозможно добавить часовой пояс календаря: "
 
-#: ../camel/camel-cipher-context.c:204
+#: ../src/camel/camel-cipher-context.c:194
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "Подпись не поддерживается этим шифром"
 
-#: ../camel/camel-cipher-context.c:217
+#: ../src/camel/camel-cipher-context.c:207
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "Проверка не поддерживается этим шифром"
 
-#: ../camel/camel-cipher-context.c:233
+#: ../src/camel/camel-cipher-context.c:223
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "Шифрование не поддерживается этим шифром"
 
-#: ../camel/camel-cipher-context.c:247
+#: ../src/camel/camel-cipher-context.c:237
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "Расшифровка не поддерживается этим шифром"
 
-#: ../camel/camel-cipher-context.c:363
+#: ../src/camel/camel-cipher-context.c:352
 msgid "Signing message"
 msgstr "Сообщение подписывается"
 
-#: ../camel/camel-cipher-context.c:653
+#: ../src/camel/camel-cipher-context.c:644
 msgid "Encrypting message"
 msgstr "Сообщение шифруется"
 
-#: ../camel/camel-cipher-context.c:825
+#: ../src/camel/camel-cipher-context.c:817
 msgid "Decrypting message"
 msgstr "Сообщение расшифровывается"
 
-#: ../camel/camel-data-cache.c:179
+#: ../src/camel/camel-data-cache.c:199
 #, c-format
 msgid "Unable to create cache path"
 msgstr "Не удалось создать путь для кэша"
 
-#: ../camel/camel-data-cache.c:457
+#: ../src/camel/camel-data-cache.c:528
 msgid "Empty cache file"
 msgstr "Кэш-файл пуст"
 
-#: ../camel/camel-data-cache.c:534
+#: ../src/camel/camel-data-cache.c:605
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Не удалось удалить кэшированный элемент: %s: %s"
 
-#: ../camel/camel-db.c:810 ../camel/providers/local/camel-mbox-store.c:906
+#: ../src/camel/camel-db.c:868
+#: ../src/camel/providers/local/camel-mbox-store.c:913
 #, c-format
-msgid "Could not rename '%s' to %s: %s"
+msgid "Could not rename “%s” to %s: %s"
 msgstr "Не удалось переименовать «%s» в %s: %s"
 
-#: ../camel/camel-filter-driver.c:934 ../camel/camel-filter-search.c:798
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-filter-driver.c:264
+#, c-format
+msgid "Transferring filtered messages in “%s : %s”"
+msgstr "Передача отфильтрованных сообщений в формате «%s : %s»"
+
+#: ../src/camel/camel-filter-driver.c:1125
+#: ../src/camel/camel-filter-search.c:934
 #, c-format
-msgid "Failed to create child process '%s': %s"
+msgid "Failed to create child process “%s”: %s"
 msgstr "Сбой при создании дочернего процесса «%s»: %s"
 
-#: ../camel/camel-filter-driver.c:982
+#: ../src/camel/camel-filter-driver.c:1173
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Неверный поток сообщений получен из %s: %s"
 
-#: ../camel/camel-filter-driver.c:1189 ../camel/camel-filter-driver.c:1198
+#: ../src/camel/camel-filter-driver.c:1397
+#: ../src/camel/camel-filter-driver.c:1410
 msgid "Syncing folders"
 msgstr "Синхронизация папок"
 
-#: ../camel/camel-filter-driver.c:1296
+#: ../src/camel/camel-filter-driver.c:1518
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Не удалось разобрать фильтр: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1307
+#: ../src/camel/camel-filter-driver.c:1529
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Ошибка выполнения фильтра: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1403
+#: ../src/camel/camel-filter-driver.c:1627
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "Не удалось открыть папку спула"
 
-#: ../camel/camel-filter-driver.c:1415
+#: ../src/camel/camel-filter-driver.c:1639
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "Не удалось обработать папку спула"
 
-#: ../camel/camel-filter-driver.c:1438
+#: ../src/camel/camel-filter-driver.c:1667
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Получение сообщения %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1447 ../camel/camel-filter-driver.c:1469
+#: ../src/camel/camel-filter-driver.c:1676
+#: ../src/camel/camel-filter-driver.c:1699
 #, c-format
 msgid "Failed on message %d"
 msgstr "Сбой на сообщении %d"
 
-#: ../camel/camel-filter-driver.c:1488 ../camel/camel-filter-driver.c:1602
+#: ../src/camel/camel-filter-driver.c:1717
+#: ../src/camel/camel-filter-driver.c:1846
+#, c-format
+msgid "Failed to transfer messages: %s"
+msgstr "Не удалось передать сообщения: %s"
+
+#: ../src/camel/camel-filter-driver.c:1727
+#: ../src/camel/camel-filter-driver.c:1860
 msgid "Syncing folder"
 msgstr "Синхронизация папки"
 
-#: ../camel/camel-filter-driver.c:1493 ../camel/camel-filter-driver.c:1610
+#: ../src/camel/camel-filter-driver.c:1732
+#: ../src/camel/camel-filter-driver.c:1868
 msgid "Complete"
 msgstr "Завершена"
 
-#: ../camel/camel-filter-driver.c:1556
+#: ../src/camel/camel-filter-driver.c:1800
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Получение сообщения %d из %d"
 
-#: ../camel/camel-filter-driver.c:1574
+#: ../src/camel/camel-filter-driver.c:1818
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Сбой на сообщении %d из %d"
 
-#: ../camel/camel-filter-driver.c:1769 ../camel/camel-filter-driver.c:1796
+#: ../src/camel/camel-filter-driver.c:2025
+#: ../src/camel/camel-filter-driver.c:2049
 #, c-format
-msgid "Execution of filter '%s' failed: "
+msgid "Execution of filter “%s” failed: "
 msgstr "Ошибка выполнения фильтра «%s»: "
 
-#: ../camel/camel-filter-driver.c:1786
+#: ../src/camel/camel-filter-driver.c:2039
 #, c-format
-msgid "Error parsing filter '%s': %s: %s"
+msgid "Error parsing filter “%s”: %s: %s"
 msgstr "Ошибка разбора фильтра «%s»: %s; %s"
 
-#: ../camel/camel-filter-driver.c:1805
+#: ../src/camel/camel-filter-driver.c:2058
 #, c-format
-msgid "Error executing filter '%s': %s: %s"
+msgid "Error executing filter “%s”: %s: %s"
 msgstr "Ошибка выполнения фильтра «%s»: %s; %s"
 
-#: ../camel/camel-filter-search.c:139
+#: ../src/camel/camel-filter-search.c:171
 msgid "Failed to retrieve message"
 msgstr "Сбой при получении сообщения"
 
-#: ../camel/camel-filter-search.c:538
+#: ../src/camel/camel-filter-search.c:635
 msgid "Invalid arguments to (system-flag)"
 msgstr "Недопустимые аргументы для (system-flag)"
 
-#: ../camel/camel-filter-search.c:556
+#: ../src/camel/camel-filter-search.c:654
 msgid "Invalid arguments to (user-tag)"
 msgstr "Недопустимые аргументы для (user-tag)"
 
-#: ../camel/camel-filter-search.c:1068
+#: ../src/camel/camel-filter-search.c:1236
 msgid "Invalid arguments to (message-location)"
 msgstr "Недопустимые аргументы для (message-location)"
 
-#: ../camel/camel-filter-search.c:1149 ../camel/camel-filter-search.c:1160
+#: ../src/camel/camel-filter-search.c:1391
+#: ../src/camel/camel-filter-search.c:1402
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Ошибка выполнения поиска фильтра: %s: %s"
 
-#: ../camel/camel-folder.c:326
-#, c-format
-msgid "Learning new spam message in '%s'"
-msgid_plural "Learning new spam messages in '%s'"
-msgstr[0] "Изучение нового спам-сообщения в «%s»"
-msgstr[1] "Изучение новых спам-сообщений в «%s»"
-msgstr[2] "Изучение новых спам-сообщений в «%s»"
-
-#: ../camel/camel-folder.c:366
-#, c-format
-msgid "Learning new ham message in '%s'"
-msgid_plural "Learning new ham messages in '%s'"
-msgstr[0] "Изучение нового сообщения в «%s»"
-msgstr[1] "Изучение новых сообщений в «%s»"
-msgstr[2] "Изучение новых сообщений в «%s»"
-
-#: ../camel/camel-folder.c:414
-#, c-format
-msgid "Filtering new message in '%s'"
-msgid_plural "Filtering new messages in '%s'"
-msgstr[0] "Фильтрация нового сообщения в «%s»"
-msgstr[1] "Фильтрация новых сообщений в «%s»"
-msgstr[2] "Фильтрация новых сообщений в «%s»"
-
-#: ../camel/camel-folder.c:1020
-#: ../camel/providers/local/camel-maildir-folder.c:330
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-folder.c:171
+#, c-format
+msgid "Storing changes in folder “%s : %s”"
+msgstr "Сохранение изменений в папке «%s : %s»"
+
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-folder.c:456
+#, c-format
+msgid "Learning new spam message in “%s : %s”"
+msgid_plural "Learning new spam messages in “%s : %s”"
+msgstr[0] "Изучение нового спам-сообщения в «%s : %s»"
+msgstr[1] "Изучение нового спам-сообщений в «%s : %s»"
+msgstr[2] "Изучение нового спам-сообщений в «%s : %s»"
+
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-folder.c:499
+#, c-format
+msgid "Learning new ham message in “%s : %s”"
+msgid_plural "Learning new ham messages in “%s : %s”"
+msgstr[0] "Изучение нового спам-сообщения в «%s : %s»"
+msgstr[1] "Изучение новых спам-сообщений в «%s : %s»"
+msgstr[2] "Изучение новых сообщений в «%s : %s»"
+
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-folder.c:547
+#, c-format
+msgid "Filtering new message in “%s : %s”"
+msgid_plural "Filtering new messages in “%s : %s”"
+msgstr[0] "Фильтрация нового сообщения в «%s : %s»"
+msgstr[1] "Фильтрация новых сообщений в «%s : %s»"
+msgstr[2] "Фильтрация новых сообщений в «%s : %s»"
+
+#: ../src/camel/camel-folder.c:1210
+#: ../src/camel/providers/local/camel-maildir-folder.c:332
 msgid "Moving messages"
 msgstr "Перемещение сообщений"
 
-#: ../camel/camel-folder.c:1023
+#: ../src/camel/camel-folder.c:1213
 msgid "Copying messages"
 msgstr "Копирование сообщений"
 
-#: ../camel/camel-folder.c:1065
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-folder.c:1258
 #, c-format
-msgid "Quota information not supported for folder '%s'"
-msgstr "Информация о квоте не поддерживается для папки «%s»"
+msgid "Quota information not supported for folder “%s : %s”"
+msgstr "Информация о квоте не поддерживается для папки «%s : %s»"
 
-#: ../camel/camel-folder.c:1160
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-folder.c:1360
 #, c-format
-msgid "Filtering folder '%s'"
-msgstr "Фильтрация папки «%s»"
+msgid "Filtering folder “%s : %s”"
+msgstr "Фильтрация папки «%s : %s»"
 
-#: ../camel/camel-folder.c:2896
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-folder.c:3326
 #, c-format
-msgid "Expunging folder '%s'"
-msgstr "Уничтожение папки «%s»"
+msgid "Expunging folder “%s : %s”"
+msgstr "Уничтожение папки «%s : %s»"
 
-#: ../camel/camel-folder.c:3027
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-folder.c:3461
 #, c-format
-msgid "Retrieving message '%s' in %s"
-msgstr "Получение сообщения «%s» в %s"
+msgid "Retrieving message “%s” in “%s : %s”"
+msgstr "Получение сообщения «%s» в «%s : %s»"
 
-#: ../camel/camel-folder.c:3218
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-folder.c:3686
 #, c-format
-msgid "Retrieving quota information for '%s'"
-msgstr "Получение информации о квоте для «%s»"
+msgid "Retrieving quota information for “%s : %s”"
+msgstr "Получение информации о квоте для «%s : %s»"
 
-#: ../camel/camel-folder.c:3515
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-folder.c:3986
 #, c-format
-msgid "Refreshing folder '%s'"
-msgstr "Обновление папки «%s»"
+msgid "Refreshing folder “%s : %s”"
+msgstr "Обновление папки «%s : %s»"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:915 ../camel/camel-folder-search.c:957
+#: ../src/camel/camel-folder-search.c:926
+#: ../src/camel/camel-folder-search.c:969
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) требует единственного логического результата"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:992
+#: ../src/camel/camel-folder-search.c:1007
 #, c-format
 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:999 ../camel/camel-folder-search.c:1007
+#: ../src/camel/camel-folder-search.c:1014
+#: ../src/camel/camel-folder-search.c:1022
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) требует строку соответствия"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1035
+#: ../src/camel/camel-folder-search.c:1050
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) ожидает результат в виде массива"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1045
+#: ../src/camel/camel-folder-search.c:1060
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) требует набор папок"
 
-#: ../camel/camel-folder-search.c:1963 ../camel/camel-folder-search.c:2132
+#: ../src/camel/camel-folder-search.c:2218
+#: ../src/camel/camel-folder-search.c:2392
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2179,7 +2970,8 @@ msgstr ""
 "Ошибка в регулярном выражении «%s»:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:1975 ../camel/camel-folder-search.c:2144
+#: ../src/camel/camel-folder-search.c:2230
+#: ../src/camel/camel-folder-search.c:2404
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2188,28 +2980,32 @@ msgstr ""
 "Ошибка при выполнении выражения поиска «%s»:\n"
 "%s"
 
-#: ../camel/camel-folder-summary.c:2156
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-folder-summary.c:1661
 #, c-format
-msgid "Release unused memory for folder '%s'"
-msgstr "Освобождение неиспользуемой памяти для папки «%s»"
+msgid "Release unused memory for folder “%s : %s”"
+msgstr "Освободите неиспользуемую память для папки «%s : %s»"
 
-#: ../camel/camel-folder-summary.c:2368
+#. Translators: The '%s' is replaced with the actual path and filename of the used gpg, like '/usr/bin/gpg2'
+#: ../src/camel/camel-gpg-context.c:447
 #, c-format
-msgid "Update preview data for folder '%s'"
-msgstr "Обновление данных для предварительного просмотра папки «%s»"
+msgid "Output from %s:"
+msgstr "Вывод из %s:"
 
-#: ../camel/camel-gpg-context.c:770 ../camel/camel-gpg-context.c:775
-#: ../camel/camel-gpg-context.c:1442
+#: ../src/camel/camel-gpg-context.c:928 ../src/camel/camel-gpg-context.c:933
+#: ../src/camel/camel-gpg-context.c:1674
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Сбой при исполнении gpg: %s"
 
-#: ../camel/camel-gpg-context.c:775
-#: ../camel/providers/smtp/camel-smtp-transport.c:1130
+#: ../src/camel/camel-gpg-context.c:933
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1205
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: ../camel/camel-gpg-context.c:840
+#: ../src/camel/camel-gpg-context.c:1045
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -2220,322 +3016,371 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:876
+#: ../src/camel/camel-gpg-context.c:1081
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "Ошибка при обработке подсказки gpg userid."
 
-#: ../camel/camel-gpg-context.c:901 ../camel/camel-gpg-context.c:916
+#: ../src/camel/camel-gpg-context.c:1106 ../src/camel/camel-gpg-context.c:1121
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "Ошибка при обработке запроса парольной фразы gpg."
 
-#: ../camel/camel-gpg-context.c:937
+#: ../src/camel/camel-gpg-context.c:1142
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
-"SmartCard: \"%s\""
-msgstr "Для разблокирования смарткарты необходимо ввести PIN: «%s»"
+"SmartCard: “%s”"
+msgstr ""
+"Вам нужен PIN-код, чтобы разблокировать ключ для вашей\n"
+"смарт-карты: «%s»"
 
-#: ../camel/camel-gpg-context.c:941
+#: ../src/camel/camel-gpg-context.c:1146
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
-"user: \"%s\""
+"user: “%s”"
 msgstr ""
-"Введите ключевую фразу, чтобы разблокировать\n"
-"ключ пользователя: «%s»"
+"Для разблокировки ключа необходима парольная фраза для\n"
+"пользователя: «%s»"
 
-#: ../camel/camel-gpg-context.c:947
+#: ../src/camel/camel-gpg-context.c:1152
 #, c-format
-msgid "Unexpected request from GnuPG for '%s'"
+msgid "Unexpected request from GnuPG for “%s”"
 msgstr "Неожиданный запрос от GnuPG для «%s»"
 
-#: ../camel/camel-gpg-context.c:959
+#: ../src/camel/camel-gpg-context.c:1164
 msgid ""
-"Note the encrypted content doesn't contain information about a recipient, "
+"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:990 ../camel/camel-net-utils.c:524
-#: ../camel/providers/nntp/camel-nntp-summary.c:401
-#: ../libedataserver/e-client.c:163
+#: ../src/camel/camel-gpg-context.c:1195 ../src/camel/camel-net-utils.c:522
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:393
+#: ../src/libedataserver/e-client.c:156
 #, c-format
 msgid "Cancelled"
 msgstr "Отменено"
 
-#: ../camel/camel-gpg-context.c:1011
+#: ../src/camel/camel-gpg-context.c:1216
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Сбой при разблокировании секретного ключа: указано 3 некорректных парольных "
 "фразы."
 
-#: ../camel/camel-gpg-context.c:1024
+#: ../src/camel/camel-gpg-context.c:1229
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Неожиданный ответ от GnuPG: %s"
 
-#: ../camel/camel-gpg-context.c:1162
+#: ../src/camel/camel-gpg-context.c:1346
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
-"Не удалось зашифровать это сообщение: Не определены корректные получатели"
+"Не удалось зашифровать это сообщение: Не определены корректные получатели."
+
+#. Translators: The first '%s' is replaced with the e-mail address, like '<user example com>';
+#. the second '%s' is replaced with the actual path and filename of the used gpg, like '/usr/bin/gpg2'
+#: ../src/camel/camel-gpg-context.c:1359
+#, c-format
+msgid ""
+"Failed to encrypt: Invalid recipient %s specified. A common issue is that "
+"the %s doesn’t have imported public key for this recipient."
+msgstr ""
+"Не удалось зашифровать: Указан недопустимый получатель %s. Частая проблема "
+"заключается в том, что у %s нет импортированного открытого ключа для этого "
+"получателя."
 
-#: ../camel/camel-gpg-context.c:1761 ../camel/camel-smime-context.c:843
+#: ../src/camel/camel-gpg-context.c:2185 ../src/camel/camel-smime-context.c:869
 msgid "Could not generate signing data: "
 msgstr "Не удалось создать данные подписи: "
 
-#: ../camel/camel-gpg-context.c:1812 ../camel/camel-gpg-context.c:2047
-#: ../camel/camel-gpg-context.c:2163 ../camel/camel-gpg-context.c:2338
+#: ../src/camel/camel-gpg-context.c:2236 ../src/camel/camel-gpg-context.c:2475
+#: ../src/camel/camel-gpg-context.c:2614 ../src/camel/camel-gpg-context.c:2791
 msgid "Failed to execute gpg."
 msgstr "Сбой при исполнении gpg."
 
-#: ../camel/camel-gpg-context.c:1918 ../camel/camel-gpg-context.c:1926
-#: ../camel/camel-gpg-context.c:1934 ../camel/camel-gpg-context.c:1954
-#: ../camel/camel-smime-context.c:972 ../camel/camel-smime-context.c:986
-#: ../camel/camel-smime-context.c:995
+#: ../src/camel/camel-gpg-context.c:2343 ../src/camel/camel-gpg-context.c:2351
+#: ../src/camel/camel-gpg-context.c:2359 ../src/camel/camel-gpg-context.c:2379
+#: ../src/camel/camel-smime-context.c:1000
+#: ../src/camel/camel-smime-context.c:1014
+#: ../src/camel/camel-smime-context.c:1026
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Не удалось проверить подпись сообщения: Неверный формат сообщения"
 
-#: ../camel/camel-gpg-context.c:2000
+#: ../src/camel/camel-gpg-context.c:2425
 msgid "Cannot verify message signature: "
 msgstr "Не удалось проверить подпись сообщения: "
 
-#: ../camel/camel-gpg-context.c:2128
+#: ../src/camel/camel-gpg-context.c:2573
 msgid "Could not generate encrypting data: "
 msgstr "Не удалось создать данные шифрования: "
 
-#: ../camel/camel-gpg-context.c:2203
+#: ../src/camel/camel-gpg-context.c:2654
 msgid "This is a digitally encrypted message part"
 msgstr "Это зашифрованная часть сообщения"
 
-#: ../camel/camel-gpg-context.c:2262 ../camel/camel-gpg-context.c:2271
-#: ../camel/camel-gpg-context.c:2294
+#: ../src/camel/camel-gpg-context.c:2714 ../src/camel/camel-gpg-context.c:2723
+#: ../src/camel/camel-gpg-context.c:2746
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Не удалось декодировать сообщение: Неверный формат сообщения"
 
-#: ../camel/camel-gpg-context.c:2282
+#: ../src/camel/camel-gpg-context.c:2734
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Сбой при декодировании части MIME: ошибка протокола"
 
-#: ../camel/camel-gpg-context.c:2348
+#: ../src/camel/camel-gpg-context.c:2806
 #, c-format
 msgid "Failed to decrypt MIME part: Secret key not found"
 msgstr "Сбой при декодировании части MIME: секретный ключ не найден"
 
-#: ../camel/camel-gpg-context.c:2384 ../camel/camel-smime-context.c:1288
+#: ../src/camel/camel-gpg-context.c:2843
+#, c-format
+msgid "GPG blob contains unencrypted text: %s"
+msgstr "Блок GPG содержит незашифрованный текст: %s"
+
+#: ../src/camel/camel-gpg-context.c:2845
+#: ../src/camel/camel-smime-context.c:1546
 msgid "Encrypted content"
 msgstr "Зашифрованное содержимое"
 
-#: ../camel/camel-junk-filter.c:167
+#: ../src/camel/camel-junk-filter.c:167
 msgid "Synchronizing junk database"
 msgstr "Синхронизация базы данных спама"
 
-#: ../camel/camel-lock.c:110
+#: ../src/camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Не удалось создать файл блокировки для %s: %s"
 
-#: ../camel/camel-lock.c:153
+#: ../src/camel/camel-lock.c:154
 #, c-format
 msgid "Timed out trying to get lock file on %s.  Try again later."
 msgstr "Превышено время ожидания  блокировки файла %s. Попробуйте позже."
 
-#: ../camel/camel-lock.c:215
+#: ../src/camel/camel-lock.c:221
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Не удалось получить блокировку используя fcntl(2): %s"
 
-#: ../camel/camel-lock.c:282
+#: ../src/camel/camel-lock.c:293
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Не удалось получить блокировку используя flock(2): %s"
 
-#: ../camel/camel-lock-client.c:107
+#: ../src/camel/camel-lock-client.c:105
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Не удалось создать канал к блокиратору: %s"
 
-#: ../camel/camel-lock-client.c:131
+#: ../src/camel/camel-lock-client.c:129
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Не удалось запустить блокиратор: %s"
 
-#: ../camel/camel-lock-client.c:218 ../camel/camel-lock-client.c:246
+#: ../src/camel/camel-lock-client.c:216 ../src/camel/camel-lock-client.c:244
 #, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Не удалось заблокировать «%s»: ошибка протокола с блокиратором"
+msgid "Could not lock “%s”: protocol error with lock-helper"
+msgstr "Не удалось заблокировать «%s»: ошибка протокола с lock-helper"
 
-#: ../camel/camel-lock-client.c:234
+#: ../src/camel/camel-lock-client.c:232
 #, c-format
-msgid "Could not lock '%s'"
+msgid "Could not lock “%s”"
 msgstr "Не удалось заблокировать «%s»"
 
-#: ../camel/camel-movemail.c:101
+#: ../src/camel/camel-movemail.c:99
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Не удалось открыть почтовый файл %s: %s"
 
-#: ../camel/camel-movemail.c:121
+#: ../src/camel/camel-movemail.c:119
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Не удалось проверить почтовый файл %s: %s"
 
-#: ../camel/camel-movemail.c:136
+#: ../src/camel/camel-movemail.c:134
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Не удалось открыть временный почтовый файл %s: %s"
 
-#: ../camel/camel-movemail.c:166
+#: ../src/camel/camel-movemail.c:164
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Сбой при сохранении почты во временном файле %s: %s"
 
-#: ../camel/camel-movemail.c:200
+#: ../src/camel/camel-movemail.c:198
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Не удалось создать канал: %s"
 
-#: ../camel/camel-movemail.c:214
+#: ../src/camel/camel-movemail.c:212
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Не удалось запустить: %s"
 
-#: ../camel/camel-movemail.c:252
+#: ../src/camel/camel-movemail.c:250
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Сбой программы разбора почты: %s"
 
-#: ../camel/camel-movemail.c:253
+#: ../src/camel/camel-movemail.c:251
 msgid "(Unknown error)"
 msgstr "(Неизвестная ошибка)"
 
-#: ../camel/camel-movemail.c:280
+#: ../src/camel/camel-movemail.c:278
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Ошибка при чтении почтового файла: %s"
 
-#: ../camel/camel-movemail.c:293
+#: ../src/camel/camel-movemail.c:291
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Ошибка сохранения временного почтового файла: %s"
 
-#: ../camel/camel-movemail.c:500 ../camel/camel-movemail.c:569
+#: ../src/camel/camel-movemail.c:499 ../src/camel/camel-movemail.c:573
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Ошибка копирования временного почтового файла: %s"
 
-#: ../camel/camel-multipart-signed.c:279 ../camel/camel-multipart-signed.c:432
+#: ../src/camel/camel-multipart-signed.c:273
+#: ../src/camel/camel-multipart-signed.c:426
 #, c-format
 msgid "No content available"
 msgstr "Содержимое недоступно"
 
-#: ../camel/camel-multipart-signed.c:287 ../camel/camel-multipart-signed.c:440
+#: ../src/camel/camel-multipart-signed.c:281
+#: ../src/camel/camel-multipart-signed.c:434
 #, c-format
 msgid "No signature available"
 msgstr "Подпись недоступна"
 
-#: ../camel/camel-multipart-signed.c:806
+#: ../src/camel/camel-multipart-signed.c:798
 #, c-format
 msgid "parse error"
-msgstr "Ошибка обработки"
+msgstr "ошибка обработки"
 
-#: ../camel/camel-net-utils.c:708
+#: ../src/camel/camel-net-utils.c:714
 #, c-format
 msgid "Resolving: %s"
 msgstr "Поиск узла: %s"
 
-#: ../camel/camel-net-utils.c:733
+#: ../src/camel/camel-net-utils.c:739
 msgid "Host lookup failed"
 msgstr "Узел не найден"
 
-#: ../camel/camel-net-utils.c:739
+#: ../src/camel/camel-net-utils.c:745
 #, c-format
-msgid "Host lookup '%s' failed. Check your host name for spelling errors."
+msgid "Host lookup “%s” failed. Check your host name for spelling errors."
 msgstr "Узел «%s» не найден. Проверьте правильность имени узла."
 
-#: ../camel/camel-net-utils.c:743
+#: ../src/camel/camel-net-utils.c:749
 #, c-format
-msgid "Host lookup '%s' failed: %s"
+msgid "Host lookup “%s” failed: %s"
 msgstr "Узел «%s» не найден: %s"
 
-#: ../camel/camel-offline-folder.c:93
+#: ../src/camel/camel-network-service.c:1128
 #, c-format
-msgid "Downloading new messages for offline mode in '%s'"
-msgstr "Загрузка новых сообщений в «%s» для автономной работы"
+msgid "Checking reachability of account “%s”"
+msgstr "Проверка достижимости учётной записи «%s»"
 
-#: ../camel/camel-offline-folder.c:160
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-offline-folder.c:175
 #, c-format
-msgid "Storing changes in folder '%s'"
-msgstr "Сохранение изменений в папке «%s»"
+msgid "Downloading new messages for offline mode in “%s : %s”"
+msgstr "Загрузка новых сообщений для автономного режима в «%s : %s»"
 
-#: ../camel/camel-offline-folder.c:262
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-offline-folder.c:260
 #, c-format
-msgid "Checking download of new messages for offline in '%s'"
-msgstr ""
-"Проверка на необходимость загрузки новых сообщений в «%s» для автономной "
-"работы"
+msgid "Checking download of new messages for offline in “%s : %s”"
+msgstr "Проверка загрузки новых сообщений для автономного режима в «%s : %s»"
+
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-offline-folder.c:336
+#, c-format
+msgid "Syncing messages in folder “%s : %s” to disk"
+msgstr "Синхронизация сообщений в папке «%s : %s» на диск"
 
-#: ../camel/camel-offline-folder.c:375
+#. Translators: The first “%d” is the sequence number of the message, the second “%d”
+#. is the total number of messages to synchronize.
+#. The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-offline-folder.c:430
 #, c-format
-msgid "Syncing messages in folder '%s' to disk"
-msgstr "Синхронизация сообщений в папке «%s» на диск"
+msgid "Syncing message %d of %d in folder “%s : %s” to disk"
+msgstr "Синхронизация сообщения %d от %d в папке «%s : %s» на диск"
 
-#: ../camel/camel-offline-folder.c:438
+#: ../src/camel/camel-offline-folder.c:484
 msgid "Copy folder content locally for _offline operation"
 msgstr ""
 "Скопировать содержимое папки на локальную машину для _автономной работы"
 
-#: ../camel/camel-provider.c:55
+#: ../src/camel/camel-offline-store.c:326
+#, c-format
+msgid "Syncing messages in account “%s” to disk"
+msgstr "Синхронизация сообщений в учетной записи «%s» на диск"
+
+#: ../src/camel/camel-provider.c:90
 msgid "Virtual folder email provider"
 msgstr "Провайдер виртуальных папок эл. почты"
 
-#: ../camel/camel-provider.c:57
+#: ../src/camel/camel-provider.c:92
 msgid "For reading mail as a query of another set of folders"
 msgstr "Для чтения почты по запросу к другому набору папок"
 
-#: ../camel/camel-provider.c:260
+#: ../src/camel/camel-provider.c:335
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Не удалось загрузить %s: Загрузка модулей не поддерживается в этой системе."
 
-#: ../camel/camel-provider.c:269
+#: ../src/camel/camel-provider.c:344
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Не удалось загрузить %s: %s"
 
-#: ../camel/camel-provider.c:278
+#: ../src/camel/camel-provider.c:353
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Не удалось загрузить %s: в модуле нет инициализирующего кода."
 
-#: ../camel/camel-provider.c:424 ../camel/camel-session.c:421
+#: ../src/camel/camel-provider.c:499 ../src/camel/camel-session.c:430
 #, c-format
-msgid "No provider available for protocol '%s'"
+msgid "No provider available for protocol “%s”"
 msgstr "Провайдер для протокола «%s» не доступен"
 
-#: ../camel/camel-sasl-anonymous.c:32
-#: ../camel/providers/nntp/camel-nntp-provider.c:82
+#: ../src/camel/camel-sasl-anonymous.c:35
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:85
 msgid "Anonymous"
 msgstr "Анонимный"
 
-#: ../camel/camel-sasl-anonymous.c:34
+#: ../src/camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
 msgstr "Будет производиться анонимное (anonymous) подключение к серверу."
 
-#: ../camel/camel-sasl-anonymous.c:67
+#: ../src/camel/camel-sasl-anonymous.c:70
 #, c-format
 msgid "Authentication failed."
 msgstr "Сбой проверки подлинности."
 
-#: ../camel/camel-sasl-anonymous.c:78
+#. Translators: the 'trace information' term comes from https://tools.ietf.org/html/rfc4505
+#. In this case the user set to use an email address as the trace information,
+#. but the provided value is not a valid email address.
+#: ../src/camel/camel-sasl-anonymous.c:84
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -2544,7 +3389,10 @@ msgstr ""
 "Неверная трассировочная информация эл.адреса:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:92
+#. Translators: the 'trace information' term comes from https://tools.ietf.org/html/rfc4505
+#. In this case the user set to use an opaque trace information,
+#. but the provided value looks like an email address.
+#: ../src/camel/camel-sasl-anonymous.c:101
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -2553,20 +3401,15 @@ msgstr ""
 "Неверная скрытая трассировочная информация:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:106
-#, c-format
-msgid ""
-"Invalid trace information:\n"
-"%s"
-msgstr ""
-"Неверная трассировочная информация:\n"
-"%s"
+#: ../src/camel/camel-sasl-anonymous.c:115 ../src/libedataserver/e-client.c:135
+msgid "Invalid argument"
+msgstr "Недопустимый аргумент"
 
-#: ../camel/camel-sasl-cram-md5.c:43
+#: ../src/camel/camel-sasl-cram-md5.c:37
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:45
+#: ../src/camel/camel-sasl-cram-md5.c:39
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -2574,11 +3417,11 @@ msgstr ""
 "Подключение к серверу будет производиться с использованием для идентификации "
 "протокола CRAM-MD5, если сервер его поддерживает."
 
-#: ../camel/camel-sasl-digest-md5.c:56
+#: ../src/camel/camel-sasl-digest-md5.c:50
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:58
+#: ../src/camel/camel-sasl-digest-md5.c:52
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -2586,50 +3429,58 @@ msgstr ""
 "Подключение к серверу будет производиться с использованием зашифрованного "
 "пароля DIGEST-MD5, если сервер его поддерживает."
 
-#: ../camel/camel-sasl-digest-md5.c:854
+#: ../src/camel/camel-sasl-digest-md5.c:848
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Слишком длинный ответ от сервера (>2048 байт)"
 
-#: ../camel/camel-sasl-digest-md5.c:865
+#: ../src/camel/camel-sasl-digest-md5.c:859
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "Недопустимый ответ сервера\n"
 
-#: ../camel/camel-sasl-digest-md5.c:873
+#: ../src/camel/camel-sasl-digest-md5.c:867
 #, c-format
-msgid "Server challenge contained invalid \"Quality of Protection\" token"
-msgstr "Ответ сервера содержит недопустимый жетон «Качество защиты»"
+msgid "Server challenge contained invalid “Quality of Protection” token"
+msgstr "Ответ сервера содержит недопустимый токен «Качество защиты»"
 
-#: ../camel/camel-sasl-digest-md5.c:906
+#: ../src/camel/camel-sasl-digest-md5.c:900
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "Ответ сервера не содержит информации об авторизации"
 
-#: ../camel/camel-sasl-digest-md5.c:927
+#: ../src/camel/camel-sasl-digest-md5.c:921
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "Ответ сервера содержит неполную информацию об авторизации"
 
-#: ../camel/camel-sasl-digest-md5.c:940
+#: ../src/camel/camel-sasl-digest-md5.c:934
 #, c-format
 msgid "Server response does not match"
 msgstr "Ответ сервера не совпадает"
 
-#: ../camel/camel-sasl-gssapi.c:94
+#: ../src/camel/camel-sasl-gssapi.c:88
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:96
+#: ../src/camel/camel-sasl-gssapi.c:90
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "Подключение к серверу будет производиться с использованием Kerberos 5."
 
-#: ../camel/camel-sasl-gssapi.c:148
+#: ../src/camel/camel-sasl-gssapi.c:151
 #, c-format
 msgid "(Unknown GSSAPI mechanism code: %x)"
 msgstr "(неизвестный код механизма GSSAPI: %x)"
 
-#: ../camel/camel-sasl-gssapi.c:181
+#. Translators: the first '%s' is replaced with a generic error message,
+#. the second '%s' is replaced with additional error information.
+#: ../src/camel/camel-sasl-gssapi.c:174 ../src/camel/camel-sasl-gssapi.c:246
+#, c-format
+msgctxt "gssapi_error"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../src/camel/camel-sasl-gssapi.c:196
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -2637,11 +3488,11 @@ msgstr ""
 "Указанный механизм не поддерживается предоставленными средствами, либо не "
 "распознаётся в этой реализации."
 
-#: ../camel/camel-sasl-gssapi.c:186
+#: ../src/camel/camel-sasl-gssapi.c:201
 msgid "The provided target_name parameter was ill-formed."
 msgstr "Предоставленный параметр target_name сформирован неверно."
 
-#: ../camel/camel-sasl-gssapi.c:189
+#: ../src/camel/camel-sasl-gssapi.c:204
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
@@ -2649,7 +3500,7 @@ msgstr ""
 "Предоставленный параметр target_name содержит неверный или неподдерживаемый "
 "тип имени."
 
-#: ../camel/camel-sasl-gssapi.c:193
+#: ../src/camel/camel-sasl-gssapi.c:208
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -2657,7 +3508,7 @@ msgstr ""
 "input_token содержит не такую привязку к каналам, как указано в параметре "
 "input_chan_bindings."
 
-#: ../camel/camel-sasl-gssapi.c:198
+#: ../src/camel/camel-sasl-gssapi.c:213
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
@@ -2665,7 +3516,7 @@ msgstr ""
 "input_token содержит неверную подпись, или подпись, которая не может быть "
 "проверена."
 
-#: ../camel/camel-sasl-gssapi.c:202
+#: ../src/camel/camel-sasl-gssapi.c:217
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -2673,55 +3524,70 @@ msgstr ""
 "Предоставленные удостоверения были не действительны для инициализации "
 "контекста, либо обработчик удостоверения не ссылается на удостоверения."
 
-#: ../camel/camel-sasl-gssapi.c:207
+#: ../src/camel/camel-sasl-gssapi.c:222
 msgid "The supplied context handle did not refer to a valid context."
 msgstr ""
 "Указанный обработчик контекста не ссылается на действительный контекст."
 
-#: ../camel/camel-sasl-gssapi.c:210
+#: ../src/camel/camel-sasl-gssapi.c:225
 msgid "The consistency checks performed on the input_token failed."
 msgstr "Сбой проверки целостности элемента input_token."
 
-#: ../camel/camel-sasl-gssapi.c:213
+#: ../src/camel/camel-sasl-gssapi.c:228
 msgid "The consistency checks performed on the credential failed."
 msgstr "Сбой проверки целостности удостоверений."
 
-#: ../camel/camel-sasl-gssapi.c:216
+#: ../src/camel/camel-sasl-gssapi.c:231
 msgid "The referenced credentials have expired."
 msgstr "Срок действия упомянутых удостоверений истёк."
 
-#: ../camel/camel-sasl-gssapi.c:222 ../camel/camel-sasl-gssapi.c:404
-#: ../camel/camel-sasl-gssapi.c:453 ../camel/camel-sasl-gssapi.c:470
-#: ../camel/providers/smtp/camel-smtp-transport.c:798
+#: ../src/camel/camel-sasl-gssapi.c:237 ../src/camel/camel-sasl-gssapi.c:441
+#: ../src/camel/camel-sasl-gssapi.c:491 ../src/camel/camel-sasl-gssapi.c:508
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:856
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "Неверный ответ от сервера при идентификации."
 
-#: ../camel/camel-sasl-gssapi.c:482
+#: ../src/camel/camel-sasl-gssapi.c:288
+msgid "Could not get session bus:"
+msgstr "Не удалось получить шину сессии:"
+
+#: ../src/camel/camel-sasl-gssapi.c:322
+#, c-format
+msgid ""
+"Cannot ask for Kerberos ticket. Obtain the ticket manually, like on command "
+"line with “kinit” or open “Online Accounts” in “Settings” and add the "
+"Kerberos account there. Reported error was: %s"
+msgstr ""
+"Не удается запросить билет Kerberos. Получите билет вручную, например, в "
+"командной строке с помощью \"kinit\" или откройте \"Online Accounts\" в "
+"«Параметры» и добавьте учетную запись Kerberos там. Сообщается об ошибке: %s"
+
+#: ../src/camel/camel-sasl-gssapi.c:520
 #, c-format
 msgid "Unsupported security layer."
 msgstr "Неподдерживаемый уровень безопасности."
 
-#: ../camel/camel-sasl-login.c:37
+#: ../src/camel/camel-sasl-login.c:31
 msgid "Login"
 msgstr "Регистрация"
 
-#: ../camel/camel-sasl-login.c:39 ../camel/camel-sasl-plain.c:43
+#: ../src/camel/camel-sasl-login.c:33 ../src/camel/camel-sasl-plain.c:37
 msgid "This option will connect to the server using a simple password."
 msgstr ""
 "Подключение к серверу будет производиться с использованием незашифрованного "
 "пароля."
 
-#: ../camel/camel-sasl-login.c:107
+#: ../src/camel/camel-sasl-login.c:101
 #, c-format
 msgid "Unknown authentication state."
 msgstr "Неизвестное состояние идентификации."
 
-#: ../camel/camel-sasl-ntlm.c:46
+#: ../src/camel/camel-sasl-ntlm.c:40
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:48
+#: ../src/camel/camel-sasl-ntlm.c:42
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -2729,916 +3595,1073 @@ msgstr ""
 "Эта опция подключает к серверу, основанному на Windows, используя для "
 "аутентификации NTLM / Secure Password Authentication."
 
-#: ../camel/camel-sasl-plain.c:41
+#: ../src/camel/camel-sasl-plain.c:35
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:43
+#: ../src/camel/camel-sasl-popb4smtp.c:37
 msgid "POP before SMTP"
 msgstr "POP до SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:45
+#: ../src/camel/camel-sasl-popb4smtp.c:39
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "Будет производиться авторизация POP до попытки передачи почты по SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:83
+#: ../src/camel/camel-sasl-popb4smtp.c:77
 msgid "POP Source UID"
 msgstr "Идентификатор источника POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:97
+#: ../src/camel/camel-sasl-popb4smtp.c:91
 #, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "Аутентификация POP до SMTP, используя неизвестный транспорт"
 
-#: ../camel/camel-sasl-popb4smtp.c:109 ../camel/camel-sasl-popb4smtp.c:118
+#: ../src/camel/camel-sasl-popb4smtp.c:103
+#: ../src/camel/camel-sasl-popb4smtp.c:112
 #, c-format
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "Аутентификация POP до SMTP посредством службы %s"
 
-#: ../camel/camel-search-private.c:113
+#: ../src/camel/camel-sasl-xoauth2.c:26
+msgid "OAuth2"
+msgstr "OAuth2"
+
+#: ../src/camel/camel-sasl-xoauth2.c:27
+msgid "This option will use an OAuth 2.0 access token to connect to the server"
+msgstr ""
+"Эта опция будет использовать маркер доступа OAuth 2.0 для подключения к "
+"серверу"
+
+#: ../src/camel/camel-sasl-xoauth2-google.c:23
+msgid "OAuth2 (Google)"
+msgstr "OAuth2 (Google)"
+
+#: ../src/camel/camel-sasl-xoauth2-google.c:24
+msgid ""
+"This option will use an OAuth 2.0 access token to connect to the Google "
+"server"
+msgstr ""
+"Этот параметр будет использовать маркер доступа OAuth 2.0 для подключения к "
+"серверу Google"
+
+#: ../src/camel/camel-sasl-xoauth2-outlook.c:23
+msgid "OAuth2 (Outlook)"
+msgstr "OAuth2 (Outlook)"
+
+#: ../src/camel/camel-sasl-xoauth2-outlook.c:24
+msgid ""
+"This option will use an OAuth 2.0 access token to connect to the Outlook.com "
+"server"
+msgstr ""
+"Этот параметр будет использовать маркер доступа OAuth 2.0 для подключения к "
+"серверу Outlook.com"
+
+#: ../src/camel/camel-sasl-xoauth2-yahoo.c:23
+msgid "OAuth2 (Yahoo!)"
+msgstr "OAuth2 (Yahoo!)"
+
+#: ../src/camel/camel-sasl-xoauth2-yahoo.c:24
+msgid ""
+"This option will use an OAuth 2.0 access token to connect to the Yahoo! "
+"server"
+msgstr ""
+"Эта опция будет использовать маркер доступа OAuth 2.0 для подключения к "
+"серверу Yahoo!"
+
+#: ../src/camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Сбой компиляции регулярного выражения: %s: %s"
 
-#: ../camel/camel-session.c:430
+#: ../src/camel/camel-session.c:439
 #, c-format
-msgid "Invalid GType registered for protocol '%s'"
+msgid "Invalid GType registered for protocol “%s”"
 msgstr "Некорректный зарегистрированный GType для протокола «%s»"
 
-#: ../camel/camel-session.c:499
-#: ../camel/providers/imapx/camel-imapx-server.c:2928
-#: ../camel/providers/pop3/camel-pop3-store.c:308
-#: ../camel/providers/pop3/camel-pop3-store.c:786
-#: ../camel/providers/smtp/camel-smtp-transport.c:672
+#: ../src/camel/camel-session.c:508
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3246
+#: ../src/camel/providers/pop3/camel-pop3-store.c:305
+#: ../src/camel/providers/pop3/camel-pop3-store.c:809
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:696
 #, c-format
 msgid "No support for %s authentication"
 msgstr "Аутентификация %s не поддерживается"
 
-#: ../camel/camel-session.c:514
+#: ../src/camel/camel-session.c:523
 #, c-format
 msgid "%s authentication failed"
 msgstr "Сбой при проверке подлинности %s"
 
-#: ../camel/camel-session.c:583
+#: ../src/camel/camel-session.c:592
 msgid "Forwarding messages is not supported"
 msgstr "Перенаправление сообщений не поддерживается"
 
-#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1075
+#: ../src/camel/camel-smime-context.c:343
 #, c-format
-msgid "Cannot find certificate for '%s'"
+msgid "Cannot find certificate for “%s”"
 msgstr "Не удалось найти сертификат для «%s»"
 
-#: ../camel/camel-smime-context.c:376
+#: ../src/camel/camel-smime-context.c:371
 msgid "Cannot create CMS message"
 msgstr "Не удалось создать сообщение CMS"
 
-#: ../camel/camel-smime-context.c:381
+#: ../src/camel/camel-smime-context.c:376
 msgid "Cannot create CMS signed data"
 msgstr "Не удалось создать CMS signedData"
 
-#: ../camel/camel-smime-context.c:387
+#: ../src/camel/camel-smime-context.c:382
 msgid "Cannot attach CMS signed data"
 msgstr "Не удалось вложить CMS signedData"
 
-#: ../camel/camel-smime-context.c:394
+#: ../src/camel/camel-smime-context.c:389
 msgid "Cannot attach CMS data"
 msgstr "Не удалось вложить CMS data"
 
-#: ../camel/camel-smime-context.c:400
+#: ../src/camel/camel-smime-context.c:395
 msgid "Cannot create CMS Signer information"
 msgstr "Не удалось создать CMS SignerInfo"
 
-#: ../camel/camel-smime-context.c:406
+#: ../src/camel/camel-smime-context.c:401
 msgid "Cannot find certificate chain"
 msgstr "Не удалось найти цепочку сертификатов"
 
-#: ../camel/camel-smime-context.c:412
+#: ../src/camel/camel-smime-context.c:407
 msgid "Cannot add CMS Signing time"
 msgstr "Не удалось добавить CMS SigningTime"
 
-#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
+#: ../src/camel/camel-smime-context.c:431
+#: ../src/camel/camel-smime-context.c:446
 #, c-format
-msgid "Encryption certificate for '%s' does not exist"
+msgid "Encryption certificate for “%s” does not exist"
 msgstr "Сертификат шифрования для «%s» не существует"
 
-#: ../camel/camel-smime-context.c:458
+#: ../src/camel/camel-smime-context.c:453
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "Не удалось добавить атрибут SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:463
+#: ../src/camel/camel-smime-context.c:458
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "Не удалось добавить атрибут MS SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:468
+#: ../src/camel/camel-smime-context.c:463
 msgid "Cannot add encryption certificate"
 msgstr "Не удалось добавить сертификат шифрования"
 
-#: ../camel/camel-smime-context.c:474
+#: ../src/camel/camel-smime-context.c:469
 msgid "Cannot add CMS Signer information"
 msgstr "Не удалось добавить CMS SignerInfo"
 
 #. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../camel/camel-smime-context.c:507
+#: ../src/camel/camel-smime-context.c:502
 msgid "Unverified"
 msgstr "Непроверено"
 
-#: ../camel/camel-smime-context.c:509
+#: ../src/camel/camel-smime-context.c:504
 msgid "Good signature"
 msgstr "Подпись верна"
 
-#: ../camel/camel-smime-context.c:511
+#: ../src/camel/camel-smime-context.c:506
 msgid "Bad signature"
 msgstr "Подпись неверна"
 
-#: ../camel/camel-smime-context.c:513
+#: ../src/camel/camel-smime-context.c:508
 msgid "Content tampered with or altered in transit"
 msgstr "Сообщение было подделано или изменено на пути"
 
-#: ../camel/camel-smime-context.c:515
+#: ../src/camel/camel-smime-context.c:510
 msgid "Signing certificate not found"
 msgstr "Сертификат подписи не найден"
 
-#: ../camel/camel-smime-context.c:517
+#: ../src/camel/camel-smime-context.c:512
 msgid "Signing certificate not trusted"
 msgstr "Сертификат подписи недостоверен"
 
-#: ../camel/camel-smime-context.c:519
+#: ../src/camel/camel-smime-context.c:514
 msgid "Signature algorithm unknown"
 msgstr "Неизвестный алгоритм подписи"
 
-#: ../camel/camel-smime-context.c:521
+#: ../src/camel/camel-smime-context.c:516
 msgid "Signature algorithm unsupported"
 msgstr "Неподдерживаемый алгоритм подписи"
 
-#: ../camel/camel-smime-context.c:523
+#: ../src/camel/camel-smime-context.c:518
 msgid "Malformed signature"
 msgstr "Неверно сформированная подпись"
 
-#: ../camel/camel-smime-context.c:525
+#: ../src/camel/camel-smime-context.c:520
 msgid "Processing error"
 msgstr "Ошибка обработки"
 
-#: ../camel/camel-smime-context.c:570
+#: ../src/camel/camel-smime-context.c:565
 msgid "No signed data in signature"
 msgstr "В подписи отсутствуют данные подписи"
 
-#: ../camel/camel-smime-context.c:575
+#: ../src/camel/camel-smime-context.c:570
 msgid "Digests missing from enveloped data"
 msgstr "В данных конверта отсутствует сводка"
 
-#: ../camel/camel-smime-context.c:588 ../camel/camel-smime-context.c:599
+#: ../src/camel/camel-smime-context.c:583
+#: ../src/camel/camel-smime-context.c:594
 msgid "Cannot calculate digests"
 msgstr "Не удалось вычислить дайджесты"
 
-#: ../camel/camel-smime-context.c:606 ../camel/camel-smime-context.c:610
+#: ../src/camel/camel-smime-context.c:601
+#: ../src/camel/camel-smime-context.c:605
 msgid "Cannot set message digests"
 msgstr "Не удалось установить дайджесты сообщения"
 
-#: ../camel/camel-smime-context.c:620 ../camel/camel-smime-context.c:625
+#: ../src/camel/camel-smime-context.c:615
+#: ../src/camel/camel-smime-context.c:620
 msgid "Certificate import failed"
 msgstr "Сбой импорта сертификата"
 
-#: ../camel/camel-smime-context.c:635
+#: ../src/camel/camel-smime-context.c:630
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr ""
 "Сообщение состоит только из сертификатов, Не удалось проверить сертификаты"
 
-#: ../camel/camel-smime-context.c:638
+#: ../src/camel/camel-smime-context.c:633
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "В сообщении только сертификаты, сертификаты импортированы и проверены"
 
-#: ../camel/camel-smime-context.c:642
+#: ../src/camel/camel-smime-context.c:637
 msgid "Cannot find signature digests"
 msgstr "Не удалось найти дайджесты подписи"
 
-#: ../camel/camel-smime-context.c:659
+#: ../src/camel/camel-smime-context.c:656
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Подписано: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:855 ../camel/camel-smime-context.c:1149
+#: ../src/camel/camel-smime-context.c:881
+#: ../src/camel/camel-smime-context.c:1403
 msgid "Cannot create encoder context"
 msgstr "Не удалось создать контекст кодировщика"
 
-#: ../camel/camel-smime-context.c:861
+#: ../src/camel/camel-smime-context.c:887
 msgid "Failed to add data to CMS encoder"
 msgstr "Не удалось добавить данные к кодировщику CMS"
 
-#: ../camel/camel-smime-context.c:866 ../camel/camel-smime-context.c:1166
+#: ../src/camel/camel-smime-context.c:892
+#: ../src/camel/camel-smime-context.c:1420
 msgid "Failed to encode data"
 msgstr "Ошибка кодирования данных"
 
-#: ../camel/camel-smime-context.c:1014 ../camel/camel-smime-context.c:1263
+#: ../src/camel/camel-smime-context.c:1045
+#: ../src/camel/camel-smime-context.c:1521
 msgid "Decoder failed"
 msgstr "Сбой декодера"
 
-#: ../camel/camel-smime-context.c:1083
+#: ../src/camel/camel-smime-context.c:1297
+#, c-format
+msgid "No valid or appropriate certificate for “%s” was found"
+msgstr "Не найден действительный или подходящий сертификат для «%s»"
+
+#: ../src/camel/camel-smime-context.c:1337
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Не удалось найти общий алгоритм шифрования"
 
-#: ../camel/camel-smime-context.c:1091
+#: ../src/camel/camel-smime-context.c:1345
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Не удалось распределить слот для ключа общего шифрования"
 
-#: ../camel/camel-smime-context.c:1102
+#: ../src/camel/camel-smime-context.c:1356
 msgid "Cannot create CMS Message"
 msgstr "Не удалось создать сообщение CMS"
 
-#: ../camel/camel-smime-context.c:1108
+#: ../src/camel/camel-smime-context.c:1362
 msgid "Cannot create CMS Enveloped data"
 msgstr "Не удалось создать CMS EnvelopedData"
 
-#: ../camel/camel-smime-context.c:1114
+#: ../src/camel/camel-smime-context.c:1368
 msgid "Cannot attach CMS Enveloped data"
 msgstr "Не удалось вложить CMS EnvelopedData"
 
-#: ../camel/camel-smime-context.c:1120
+#: ../src/camel/camel-smime-context.c:1374
 msgid "Cannot attach CMS data object"
 msgstr "Не удалось вложить объект CMS data"
 
-#: ../camel/camel-smime-context.c:1129
+#: ../src/camel/camel-smime-context.c:1383
 msgid "Cannot create CMS Recipient information"
 msgstr "Не удалось создать сведения CMS RecipientInfo"
 
-#: ../camel/camel-smime-context.c:1134
+#: ../src/camel/camel-smime-context.c:1388
 msgid "Cannot add CMS Recipient information"
 msgstr "Не удалось добавить сведения CMS RecipientInfo"
 
-#: ../camel/camel-smime-context.c:1160
+#: ../src/camel/camel-smime-context.c:1414
 msgid "Failed to add data to encoder"
 msgstr "Не удалось добавить данные к кодировщику"
 
-#: ../camel/camel-smime-context.c:1270
+#: ../src/camel/camel-smime-context.c:1528
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME Decrypt: Не найдено зашифрованного содержимого"
 
-#: ../camel/camel-store.c:1280
+#: ../src/camel/camel-store.c:1413
 #, c-format
-msgid "Opening folder '%s'"
+msgid "Opening folder “%s”"
 msgstr "Открытие папки «%s»"
 
-#: ../camel/camel-store.c:1571
+#: ../src/camel/camel-store.c:1710
 #, c-format
-msgid "Scanning folders in '%s'"
+msgid "Scanning folders in “%s”"
 msgstr "Сканирование папок на «%s»"
 
-#: ../camel/camel-store.c:1599 ../camel/camel-store.c:1644
-#: ../camel/camel-vtrash-folder.c:45
+#: ../src/camel/camel-store.c:1738 ../src/camel/camel-store.c:1783
+#: ../src/camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "Корзина"
 
-#: ../camel/camel-store.c:1613 ../camel/camel-store.c:1661
-#: ../camel/camel-vtrash-folder.c:47
+#: ../src/camel/camel-store.c:1752 ../src/camel/camel-store.c:1800
+#: ../src/camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "Спам"
 
-#: ../camel/camel-store.c:2262
+#: ../src/camel/camel-store.c:2405
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Не удалось создать папку: %s: папка существует"
 
-#: ../camel/camel-store.c:2269
+#: ../src/camel/camel-store.c:2412
 #, c-format
-msgid "Creating folder '%s'"
+msgid "Creating folder “%s”"
 msgstr "Создание папки «%s»"
 
-#: ../camel/camel-store.c:2446 ../camel/camel-vee-store.c:410
-#: ../camel/providers/local/camel-maildir-store.c:346
+#: ../src/camel/camel-store.c:2590 ../src/camel/camel-vee-store.c:426
+#: ../src/camel/providers/local/camel-maildir-store.c:341
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Не удалось удалить папку: %s: недопустимая операция"
 
-#: ../camel/camel-store.c:2636 ../camel/camel-vee-store.c:461
-#: ../camel/providers/local/camel-maildir-store.c:914
+#: ../src/camel/camel-store.c:2781 ../src/camel/camel-vee-store.c:477
+#: ../src/camel/providers/local/camel-maildir-store.c:912
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Не удалось переименовать папку: %s: недопустимая операция"
 
-#: ../camel/camel-stream.c:168
+#: ../src/camel/camel-stream.c:167
 msgid "Cannot write with no base stream"
 msgstr "Запись невозможна, поскольку нет основного потока"
 
-#: ../camel/camel-stream.c:288 ../camel/camel-stream.c:339
+#: ../src/camel/camel-stream.c:287 ../src/camel/camel-stream.c:338
 #, c-format
-msgid "Stream type '%s' is not seekable"
+msgid "Stream type “%s” is not seekable"
 msgstr "Потоковый тип «%s» не позволяет перемещаться по потоку"
 
-#: ../camel/camel-stream-filter.c:344
+#: ../src/camel/camel-stream-filter.c:339
 msgid "Only reset to beginning is supported with CamelStreamFilter"
 msgstr "Для CamelStreamFilter поддерживается только переход к началу"
 
-#: ../camel/camel-stream-null.c:74
+#: ../src/camel/camel-stream-null.c:89
 msgid "Only reset to beginning is supported with CamelHttpStream"
 msgstr "Для CamelHttpStream поддерживается только переход к началу"
 
-#: ../camel/camel-stream-process.c:278
-#: ../camel/providers/smtp/camel-smtp-transport.c:719
+#: ../src/camel/camel-stream-process.c:282
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:743
 #, c-format
 msgid "Connection cancelled"
 msgstr "Соединение отменено"
 
-#: ../camel/camel-stream-process.c:283
+#: ../src/camel/camel-stream-process.c:287
 #, c-format
-msgid "Could not connect with command \"%s\": %s"
+msgid "Could not connect with command “%s”: %s"
 msgstr "Не удалось подключиться командой «%s»: %s"
 
-#: ../camel/camel-subscribable.c:273
+#: ../src/camel/camel-subscribable.c:234
 #, c-format
-msgid "Subscribing to folder '%s'"
+msgid "Subscribing to folder “%s”"
 msgstr "Подписка на папку «%s»"
 
-#: ../camel/camel-subscribable.c:442
+#: ../src/camel/camel-subscribable.c:403
 #, c-format
-msgid "Unsubscribing from folder '%s'"
+msgid "Unsubscribing from folder “%s”"
 msgstr "Отмена подписки на папку «%s»"
 
-#: ../camel/camel-url.c:327
+#: ../src/camel/camel-url.c:325
 #, c-format
-msgid "Could not parse URL '%s'"
+msgid "Could not parse URL “%s”"
 msgstr "Не удалось разобрать URL «%s»"
 
-#: ../camel/camel-vee-folder.c:491
+#: ../src/camel/camel-vee-folder.c:558
 #, c-format
-msgid "Updating folder '%s'"
+msgid "Updating folder “%s”"
 msgstr "Обновление папки «%s»"
 
-#: ../camel/camel-vee-folder.c:869 ../camel/camel-vee-folder.c:979
+#: ../src/camel/camel-vee-folder.c:1283 ../src/camel/camel-vee-folder.c:1419
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Не удалось скопировать или переместить сообщения в виртуальную папку"
 
-#: ../camel/camel-vee-folder.c:902
+#. Translators: The first “%s” is replaced with a message UID, the second “%s”
+#. is replaced with an account name and the third “%s” is replaced with a full
+#. path name. The spaces around “:” are intentional, as the whole “%s : %s” is
+#. meant as an absolute identification of the folder.
+#: ../src/camel/camel-vee-folder.c:1320
 #, c-format
-msgid "No such message %s in %s"
-msgstr "Нет сообщения %s в %s"
+msgid "No such message %s in “%s : %s”"
+msgstr "Нет такого сообщения %s в «%s : %s»"
 
-#: ../camel/camel-vee-folder.c:955
+#: ../src/camel/camel-vee-folder.c:1395
 #, c-format
-msgid "Error storing '%s': "
+msgid "Error storing “%s”: "
 msgstr "Ошибка при хранении «%s»: "
 
-#: ../camel/camel-vee-folder.c:1193
+#: ../src/camel/camel-vee-folder.c:1585
+#, c-format
+msgid "Updating search folder “%s”"
+msgstr "Обновление папки поиска «%s»"
+
+#: ../src/camel/camel-vee-folder.c:1643
 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:40
+#: ../src/camel/camel-vee-store.c:34
 msgid "Unmatched"
 msgstr "Прочее"
 
-#: ../camel/camel-vee-store.c:436
+#: ../src/camel/camel-vee-store.c:452
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Не удалось удалить папку: %s: нет такой папки"
 
-#: ../camel/camel-vee-store.c:471
+#: ../src/camel/camel-vee-store.c:487
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Не удалось переименовать папку: %s: нет такой папки"
 
-#: ../camel/camel-vee-store.c:533
+#: ../src/camel/camel-vee-store.c:556
 msgid "Enable _Unmatched folder"
 msgstr "Включить папку «_Прочее»"
 
-#: ../camel/camel-vee-store.c:1030
+#: ../src/camel/camel-vee-store.c:1112
 msgid "Updating Unmatched search folder"
 msgstr "Обновление папки поиска «Прочее»"
 
-#: ../camel/camel-vtrash-folder.c:46
+#: ../src/camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "Не удалось переместить сообщения в корзину"
 
-#: ../camel/camel-vtrash-folder.c:48
+#: ../src/camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Не удалось переместить сообщения в папку «Спам»"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:953
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:979
 #, c-format
 msgid "You must be working online to complete this operation (%s)"
 msgstr "Для завершения данной операции необходимо подключение к сети (%s)"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:961
-#: ../camel/providers/imapx/camel-imapx-server.c:3060
-#: ../camel/providers/nntp/camel-nntp-store.c:349
-#: ../camel/providers/nntp/camel-nntp-store.c:1291
-#: ../camel/providers/nntp/camel-nntp-store.c:2099
-#: ../camel/providers/nntp/camel-nntp-store.c:2243
-#: ../camel/providers/pop3/camel-pop3-folder.c:449
-#: ../camel/providers/pop3/camel-pop3-folder.c:632
-#: ../camel/providers/pop3/camel-pop3-folder.c:834
-#: ../camel/providers/pop3/camel-pop3-folder.c:1044
-#: ../camel/providers/pop3/camel-pop3-store.c:296
-#: ../camel/providers/pop3/camel-pop3-store.c:529
-#: ../camel/providers/pop3/camel-pop3-store.c:577
-#: ../camel/providers/pop3/camel-pop3-store.c:672
-#: ../camel/providers/pop3/camel-pop3-store.c:1103
-#: ../camel/providers/smtp/camel-smtp-transport.c:543
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:987
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3412
+#: ../src/camel/providers/nntp/camel-nntp-store.c:348
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1343
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2153
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2308
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:447
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:630
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:916
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:1130
+#: ../src/camel/providers/pop3/camel-pop3-store.c:293
+#: ../src/camel/providers/pop3/camel-pop3-store.c:528
+#: ../src/camel/providers/pop3/camel-pop3-store.c:576
+#: ../src/camel/providers/pop3/camel-pop3-store.c:673
+#: ../src/camel/providers/pop3/camel-pop3-store.c:1124
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:547
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "Для завершения данной операции необходимо подключение к сети"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1533
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1621
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1611
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1707
 #, c-format
 msgid "No destination folder specified"
 msgstr "Не указана целевая папка"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1560
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1638
 msgid "Unable to move junk messages"
 msgstr "Не удалось переместить сообщения, содержащие спам"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1655
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1741
 msgid "Unable to move deleted messages"
 msgstr "Не удалось переместить удалённые сообщения"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:702
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1809
+msgid "Unable to move messages to Inbox"
+msgstr "Невозможно переместить сообщения в папку Входящие"
+
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:765
+#, c-format
+msgid "No quota information available for folder “%s : %s”"
+msgstr "Нет информации о квоте для папки «%s : %s»"
+
+#. transfer ownership to 'rcf'
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1032
 #, c-format
-msgid "No quota information available for folder '%s'"
-msgstr "Для папки «%s» нет информации о квоте"
+msgid "Removing stale cache files in folder “%s : %s”"
+msgstr "Удаление устаревших файлов кэша в папке «%s : %s»"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:964
-#: ../camel/providers/nntp/camel-nntp-folder.c:765
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1124
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:832
 msgid "Apply message _filters to this folder"
 msgstr "Применять _фильтры сообщений к этой папке"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:975
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1136
 msgid "Always check for _new mail in this folder"
 msgstr "Всегда проверять эту папку на наличие новых сообщений"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1088
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1251
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr "Не удалось создать краткую информацию по папке %s"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1097
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1263
 #, c-format
 msgid "Could not create cache for %s: "
-msgstr "Не удалось создать кэш для %s:"
+msgstr "Не удалось создать кэш для %s: "
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1295
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1463
 #, c-format
-msgid "No IMAP mailbox available for folder '%s'"
-msgstr "Для папки «%s» нет доступного ящика IMAP"
+msgid "No IMAP mailbox available for folder “%s : %s”"
+msgstr "Нет доступного почтового ящика IMAP для папки «%s : %s»"
 
-#: ../camel/providers/imapx/camel-imapx-input-stream.c:101
+#: ../src/camel/providers/imapx/camel-imapx-input-stream.c:101
 #, c-format
 msgid "Source stream returned no data"
 msgstr "Поток не вернул данные"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:38
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:36
 msgid "Checking for New Mail"
 msgstr "Проверка новой почты"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:40
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:38
 msgid "C_heck for new messages in all folders"
 msgstr "П_роверять новую почту во всех папках"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:42
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:40
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "П_роверять новую почту в подписанных папках"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:42
 msgid "Use _Quick Resync if the server supports it"
 msgstr ""
 "Использовать _быструю синхронизацию, если сервер поддерживает такую "
 "возможность"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:44
 msgid "_Listen for server change notifications"
 msgstr "_Следить за уведомлениями сервера об изменениях"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:49
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:47
 msgid "Connection to Server"
 msgstr "Соединение с сервером"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:51
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:49
 msgid "Numbe_r of concurrent connections to use"
 msgstr "Коли_чество одновременно используемых соединений"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:54
-#: ../camel/providers/nntp/camel-nntp-provider.c:43
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:51
+msgid "Enable full folder update on _metered network"
+msgstr "Включить полное обновление папок в тарифицируемой сети"
+
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:54
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:43
 msgid "Folders"
 msgstr "Папки"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:56
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:56
 msgid "_Show only subscribed folders"
 msgstr "_Показывать только подписанные папки"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:59
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:59
 msgid "O_verride server-supplied folder namespace"
 msgstr "Пе_реопределять предлагаемое сервером пространство имён папок"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:61
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:61
 msgid "Namespace:"
 msgstr "Пространство имён:"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:64
-#: ../camel/providers/local/camel-local-provider.c:39
-#: ../camel/providers/local/camel-local-provider.c:77
-#: ../camel/providers/local/camel-local-provider.c:99
-#: ../camel/providers/nntp/camel-nntp-provider.c:38
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:64
+#: ../src/camel/providers/local/camel-local-provider.c:37
+#: ../src/camel/providers/local/camel-local-provider.c:63
+#: ../src/camel/providers/local/camel-local-provider.c:84
+#: ../src/camel/providers/local/camel-local-provider.c:108
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:36
 msgid "Options"
 msgstr "Параметры"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:66
-#: ../camel/providers/nntp/camel-nntp-provider.c:40
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:66
+#: ../src/camel/providers/local/camel-local-provider.c:39
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:38
 msgid "Apply _filters to new messages in all folders"
 msgstr "_Применить фильтры к новым сообщениям во всех папках"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:68
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:68
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr ""
 "_Применить фильтры к новым сообщениям в папке «Входящие» на этом сервере"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:70
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:70
+#: ../src/camel/providers/local/camel-local-provider.c:41
+#: ../src/camel/providers/local/camel-local-provider.c:67
+#: ../src/camel/providers/local/camel-local-provider.c:88
+#: ../src/camel/providers/local/camel-local-provider.c:114
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:40
 msgid "Check new messages for _Junk contents"
 msgstr "Проверять новые _сообщения на наличие спама"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:72
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:72
 msgid "Only check for Junk messages in the In_box folder"
 msgstr ""
 "Проверять, являются ли новые сообщения спамом, только в папке «_Входящие»"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:74
 msgid "Synchroni_ze remote mail locally in all folders"
 msgstr ""
 "Автоматически _синхронизировать удалённую почту локально во всех папках"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:80
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:81
 msgid "Default IMAP port"
 msgstr "Порт по умолчанию для IMAP"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:81
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:82
 msgid "IMAP over TLS"
 msgstr "IMAP поверх TLS"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
-msgid "IMAP+"
-msgstr "IMAP+"
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:89
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:90
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:91
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Для чтения и хранения почты на серверах IMAP."
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1134
+#: ../src/camel/providers/imapx/camel-imapx-server.c:1152
 msgid "Error writing to cache stream"
 msgstr "Ошибка записи в поток кэша"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2745
-#: ../camel/providers/imapx/camel-imapx-server.c:2832
-#: ../camel/providers/imapx/camel-imapx-server.c:3093
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3044
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3131
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3445
 msgid "Failed to get capabilities"
 msgstr "Не удалось получить возможности"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2764
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3063
 #, 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:2765
-#: ../camel/providers/smtp/camel-smtp-transport.c:281
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3064
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:283
 msgid "STARTTLS not supported"
 msgstr "STARTTLS не поддерживается"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2773
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3073
 msgid "Failed to issue STARTTLS"
 msgstr "Не удалось оформить STARTTLS"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2821
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3120
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: "
 msgstr "Не удалось подключиться к IMAP-серверу %s в защищённом режиме: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2915
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3233
 #, c-format
 msgid "IMAP server %s does not support %s authentication"
 msgstr "Сервер IMAP %s не поддерживает аутентификацию %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2946
-#: ../camel/providers/nntp/camel-nntp-store.c:400
-#: ../camel/providers/nntp/camel-nntp-store.c:542
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3259
+#, c-format
+msgid ""
+"Plaintext authentication disallowed on insecure connections. Change "
+"encryption to STARTTLS or TLS for account “%s”."
+msgstr ""
+"Аутентификация обычным текстом запрещена на небезопасных соединениях. "
+"Измените шифрование на STARTTLS или TLS для учетной записи «%s»."
+
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3272
+#: ../src/camel/providers/nntp/camel-nntp-store.c:454
+#: ../src/camel/providers/nntp/camel-nntp-store.c:596
 msgid "Cannot authenticate without a username"
 msgstr "Невозможно выполнить проверку подлинности без имени пользователя"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2955
-#: ../camel/providers/nntp/camel-nntp-store.c:551
-#: ../camel/providers/pop3/camel-pop3-store.c:690
-#: ../camel/providers/pop3/camel-pop3-store.c:728
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3281
+#: ../src/camel/providers/nntp/camel-nntp-store.c:605
+#: ../src/camel/providers/pop3/camel-pop3-store.c:709
+#: ../src/camel/providers/pop3/camel-pop3-store.c:747
 msgid "Authentication password not available"
 msgstr "Пароль аутентификации недоступен"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2963
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3291
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3306
 msgid "Failed to authenticate"
 msgstr "Не удалось выполнить аутентификацию"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3115
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3472
+msgid "Failed to issue ENABLE UTF8=ACCEPT"
+msgstr "Не удалось выдать ENABLE UTF8=ACCEPT"
+
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3494
 msgid "Failed to issue NAMESPACE"
 msgstr "Не удалось оформить NAMESPACE"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3133
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3512
 msgid "Failed to enable QResync"
 msgstr "Не удалось включить QResync"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3165
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3549
 msgid "Failed to issue NOTIFY"
 msgstr "Не удалось оформить NOTIFY"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3624
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4028
 msgid "Failed to select mailbox"
 msgstr "Не удалось выбрать почтовый ящик"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3722
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4128
 msgid "Cannot issue command, no stream available"
 msgstr "Невозможно оформить команду, нет доступного потока"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3985
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4394
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "Не удалось получить сообщение с идентификатором %s: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3986
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4395
 msgid "No such message available."
 msgstr "Нет такого сообщения."
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4022
-#: ../camel/providers/imapx/camel-imapx-server.c:4047
-#: ../camel/providers/imapx/camel-imapx-server.c:4066
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4444
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4469
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4508
 msgid "Error fetching message"
 msgstr "Ошибка при получении сообщения"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4059
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4486
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5259
+msgid "Error performing NOOP"
+msgstr "Ошибка выполнения команды NOOP"
+
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4501
 msgid "Failed to close the tmp stream"
 msgstr "Сбой при закрытии временного потока"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4090
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4532
 msgid "Failed to copy the tmp file"
 msgstr "Сбой при копировании временного файла"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4253
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4770
 msgid "Error moving messages"
 msgstr "Ошибка при перемещении сообщений"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4253
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4770
 msgid "Error copying messages"
 msgstr "Ошибка при копировании сообщений"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4437
-#: ../camel/providers/imapx/camel-imapx-server.c:4458
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5049
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5070
 msgid "Cannot create spool file: "
 msgstr "Не удалось создать файл спула: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4549
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5156
 msgid "Error appending message"
 msgstr "Ошибка при присоединении сообщения"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4639
-msgid "Error performing NOOP"
-msgstr "Ошибка выполнения команды NOOP"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4787
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5412
 #, c-format
-msgid "Scanning for changed messages in '%s'"
-msgstr "Поиск изменённых сообщений в «%s»"
+msgid "Scanning for changed messages in “%s : %s”"
+msgstr "Поиск изменённых сообщений в «%s : %s»"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4790
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5416
 msgid "Error scanning changes"
 msgstr "Ошибка при сканировании изменений"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4808
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5437
 #, c-format
-msgid "Fetching summary information for new messages in '%s'"
-msgstr "Получение краткой информации о новых сообщениях «%s»"
+msgid "Fetching summary information for new messages in “%s : %s”"
+msgstr "Получение сводной информации для новых сообщений в «%s : %s»"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4825
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5465
 msgid "Error fetching message info"
 msgstr "Ошибка при получении информацию сообщения"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4887
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5598
 msgid "Error running STATUS"
 msgstr "Ошибка выполнения STATUS"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5370
-#: ../camel/providers/imapx/camel-imapx-server.c:5422
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6178
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6233
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6297
 msgid "Error syncing changes"
 msgstr "Ошибка при синхронизации изменений"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5533
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6191
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6243
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6316
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6457
 msgid "Error expunging message"
 msgstr "Ошибка уничтожения сообщений"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5603
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6539
 msgid "Error fetching folders"
 msgstr "Ошибка при получении папок"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5614
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6547
 msgid "Error fetching subscribed folders"
 msgstr "Ошибка при получении подписных папок"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5636
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6604
 msgid "Error creating folder"
 msgstr "Ошибка при создании папки"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5692
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6654
 msgid "Error deleting folder"
 msgstr "Ошибка при удалении папки"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5738
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6700
 msgid "Error renaming folder"
 msgstr "Ошибка при переименовании папки"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5770
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6732
 msgid "Error subscribing to folder"
 msgstr "Ошибка подписывания на папку"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5806
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6768
 msgid "Error unsubscribing from folder"
 msgstr "Ошибка отписывания от папки"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5846
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6808
 msgid "IMAP server does not support quotas"
 msgstr "Сервер IMAP не поддерживает квоты"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5858
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6820
 msgid "Error retrieving quota information"
 msgstr "Ошибка получения информации о квоте"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5905
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6885
 msgid "Search failed"
 msgstr "Ошибка поиска"
 
 #. Blocks, until the DONE is issued or on inactivity timeout, error, ...
-#: ../camel/providers/imapx/camel-imapx-server.c:6023
+#: ../src/camel/providers/imapx/camel-imapx-server.c:7013
 msgid "Error running IDLE"
 msgstr "Ошибка выполнения IDLE"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imapx/camel-imapx-store.c:224
-#: ../camel/providers/local/camel-maildir-folder.c:482
-#: ../camel/providers/local/camel-maildir-store.c:347
-#: ../camel/providers/local/camel-maildir-store.c:826
-#: ../camel/providers/local/camel-maildir-store.c:832
-#: ../camel/providers/local/camel-maildir-store.c:915
-#: ../camel/providers/local/camel-spool-store.c:393
+#: ../src/camel/providers/imapx/camel-imapx-store.c:353
+#: ../src/camel/providers/local/camel-maildir-folder.c:477
+#: ../src/camel/providers/local/camel-maildir-store.c:342
+#: ../src/camel/providers/local/camel-maildir-store.c:824
+#: ../src/camel/providers/local/camel-maildir-store.c:830
+#: ../src/camel/providers/local/camel-maildir-store.c:913
+#: ../src/camel/providers/local/camel-spool-store.c:397
 msgid "Inbox"
 msgstr "Входящие"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:765
+#: ../src/camel/providers/imapx/camel-imapx-store.c:956
 #, c-format
 msgid "IMAP server %s"
 msgstr "Сервер IMAP %s"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:768
+#: ../src/camel/providers/imapx/camel-imapx-store.c:959
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Сервис IMAP для %s на %s"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:836
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1050
 msgid "No IMAPx connection object provided"
 msgstr "Нет предоставленных объектов соединения IMAPx"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:853
-#: ../camel/providers/nntp/camel-nntp-provider.c:92
-#: ../camel/providers/pop3/camel-pop3-provider.c:80
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1067
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:95
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:82
 msgid "Password"
 msgstr "Пароль"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:855
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1069
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Подключение к серверу IMAP будет производиться с использованием "
 "незашифрованного пароля."
 
-#: ../camel/providers/imapx/camel-imapx-store.c:938
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1156
 #, c-format
 msgid "No such folder %s"
 msgstr "Нет папки с именем %s"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1381
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1620
 #, c-format
-msgid "No IMAP namespace for folder path '%s'"
+msgid "No IMAP namespace for folder path “%s”"
 msgstr "Нет пространства имён IMAP для папки с путём «%s»"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1642
-#: ../camel/providers/imapx/camel-imapx-store.c:1876
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1887
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2081
 #, c-format
-msgid "Retrieving folder list for '%s'"
+msgid "Retrieving folder list for “%s”"
 msgstr "Получение списка папок для «%s»"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2093
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2349
 #, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgid "The folder name “%s” is invalid because it contains the character “%c”"
 msgstr "Недопустимое имя папки «%s»: имя содержит символ «%c»"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2444
+#. Translators: The strings in "IMAPDefaults" context are folder names as can be presented
+#. by the server; There's checked for the localized version of it and for the non-localized
+#. version as well. It's always the folder name (eventually path) as provided by the server,
+#. when returned in given localization. it can be checked semi-easily in the case of
+#. the GMail variants, by changing the GMail interface language in the GMail Preferences.
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2744
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Drafts"
 msgstr "[Gmail]/Черновики"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2445
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2745
 msgctxt "IMAPDefaults"
 msgid "Drafts"
 msgstr "Черновики"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2446
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2746
 msgctxt "IMAPDefaults"
 msgid "Draft"
 msgstr "Черновик"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2449
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2749
 msgctxt "IMAPDefaults"
 msgid "Templates"
 msgstr "Шаблоны"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2452
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2752
 msgctxt "IMAPDefaults"
 msgid "Archive"
 msgstr "Архив"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2455
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2755
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Sent Mail"
 msgstr "[Gmail]/Отправленные"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2456
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2756
 msgctxt "IMAPDefaults"
 msgid "Sent"
 msgstr "Отправленные"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2457
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2757
 msgctxt "IMAPDefaults"
 msgid "Sent Items"
 msgstr "Отправленные объекты"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2460
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2758
+msgctxt "IMAPDefaults"
+msgid "Sent Messages"
+msgstr "Отправленные сообщения"
+
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2761
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Spam"
 msgstr "[Gmail]/Спам"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2461
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2762
 msgctxt "IMAPDefaults"
 msgid "Junk"
 msgstr "Спам"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2462
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2763
 msgctxt "IMAPDefaults"
 msgid "Junk E-mail"
 msgstr "Нежелательная почта"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2463
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2764
 msgctxt "IMAPDefaults"
 msgid "Junk Email"
 msgstr "Нежелательная почта"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2464
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2765
 msgctxt "IMAPDefaults"
 msgid "Spam"
 msgstr "Спам"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2465
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2766
 msgctxt "IMAPDefaults"
 msgid "Bulk Mail"
 msgstr "Массовые рассылки"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2468
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2769
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Trash"
 msgstr "[Gmail]/Корзина"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2469
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2770
 msgctxt "IMAPDefaults"
 msgid "Trash"
 msgstr "Корзина"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2470
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2771
 msgctxt "IMAPDefaults"
 msgid "Deleted Items"
 msgstr "Удаленные объекты"
 
-#: ../camel/providers/local/camel-local-folder.c:194
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2772
+msgctxt "IMAPDefaults"
+msgid "Deleted Messages"
+msgstr "Удаленные сообщения"
+
+#. Translators: This is used for a folder description,
+#. * for folders being under $HOME.  The first %s is replaced
+#. * with a relative path under $HOME, the second %s is
+#. * replaced with a protocol name, like mbox/maldir/...
+#: ../src/camel/providers/local/camel-local-folder.c:186
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:204
-#: ../camel/providers/local/camel-local-folder.c:213
+#. Translators: This is used for a folder description, for
+#. * folders being under /var/spool/mail.  The first %s is
+#. * replaced with a relative path under /var/spool/mail,
+#. * the second %s is replaced with a protocol name, like
+#. * mbox/maldir/...
+#. Translators: This is used for a folder description, for
+#. * folders being under /var/mail.  The first %s is replaced
+#. * with a relative path under /var/mail, the second %s is
+#. * replaced with a protocol name, like mbox/maldir/...
+#: ../src/camel/providers/local/camel-local-folder.c:196
+#: ../src/camel/providers/local/camel-local-folder.c:205
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "почтовый ящик: %s: (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:222
+#. Translators: This is used for a folder description.
+#. * The first %s is replaced with a folder's full path,
+#. * the second %s is replaced with a protocol name, like
+#. * mbox/maldir/...
+#: ../src/camel/providers/local/camel-local-folder.c:214
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:499
+#: ../src/camel/providers/local/camel-local-folder.c:505
 msgid "_Index message body data"
 msgstr "_Индексировать данные тела сообщения"
 
-#: ../camel/providers/local/camel-local-folder.c:727
+#. Translators: The first %s is replaced with a message ID,
+#. * the second %s is replaced with the folder path,
+#. * the third %s is replaced with a detailed error string
+#: ../src/camel/providers/local/camel-local-folder.c:744
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3647,23 +4670,27 @@ msgstr ""
 "Не удалось получить сообщение %s из папки %s\n"
 "%s"
 
-#: ../camel/providers/local/camel-local-provider.c:41
-msgid "_Use the '.folders' folder summary file (exmh)"
+#: ../src/camel/providers/local/camel-local-provider.c:43
+msgid "_Use the “.folders” folder summary file (exmh)"
 msgstr "_Использовать общий файл индекса «.folders» (exmh)"
 
-#: ../camel/providers/local/camel-local-provider.c:48
+#: ../src/camel/providers/local/camel-local-provider.c:50
 msgid "MH-format mail directories"
 msgstr "Почтовые каталоги в формате UNIX MH"
 
-#: ../camel/providers/local/camel-local-provider.c:49
+#: ../src/camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Для хранения локальной почты в почтовых каталогах типа MH."
 
-#: ../camel/providers/local/camel-local-provider.c:66
+#: ../src/camel/providers/local/camel-local-provider.c:65
+msgid "Apply _filters to new messages"
+msgstr "_Применить фильтры к новым сообщениям"
+
+#: ../src/camel/providers/local/camel-local-provider.c:73
 msgid "Local delivery"
 msgstr "Локальная доставка"
 
-#: ../camel/providers/local/camel-local-provider.c:67
+#: ../src/camel/providers/local/camel-local-provider.c:74
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
@@ -3671,29 +4698,33 @@ msgstr ""
 "Для получения (перемещения) локальной почты из очередей в стандартном "
 "формате mbox в папки, управляемые Evolution."
 
-#: ../camel/providers/local/camel-local-provider.c:79
-#: ../camel/providers/local/camel-local-provider.c:101
+#: ../src/camel/providers/local/camel-local-provider.c:86
+#: ../src/camel/providers/local/camel-local-provider.c:112
 msgid "_Apply filters to new messages in Inbox"
 msgstr "_Применить фильтры к новым сообщениям в папке «Входящие»"
 
-#: ../camel/providers/local/camel-local-provider.c:86
+#: ../src/camel/providers/local/camel-local-provider.c:95
 msgid "Maildir-format mail directories"
 msgstr "Почтовые каталоги в формате Maildir"
 
-#: ../camel/providers/local/camel-local-provider.c:87
+#: ../src/camel/providers/local/camel-local-provider.c:96
 msgid "For storing local mail in maildir directories."
 msgstr "Для хранения локальной почты в почтовых каталогах maildir."
 
-#: ../camel/providers/local/camel-local-provider.c:102
+#: ../src/camel/providers/local/camel-local-provider.c:110
+msgid "_Listen for change notifications"
+msgstr "Слушать _уведомления об изменениях"
+
+#: ../src/camel/providers/local/camel-local-provider.c:115
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "_Сохранять заголовки статуса в формате Elm/Pine/Mutt"
 
-#: ../camel/providers/local/camel-local-provider.c:109
+#: ../src/camel/providers/local/camel-local-provider.c:122
 msgid "Standard Unix mbox spool file"
 msgstr "Стандартная для Unix очередь типа mbox"
 
-#: ../camel/providers/local/camel-local-provider.c:110
-#: ../camel/providers/local/camel-local-provider.c:124
+#: ../src/camel/providers/local/camel-local-provider.c:123
+#: ../src/camel/providers/local/camel-local-provider.c:137
 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."
@@ -3702,527 +4733,537 @@ msgstr ""
 "спула в формате mbox. Также может использоваться для чтения дерева\n"
 "папок в стиле Elm, Pine или Mutt."
 
-#: ../camel/providers/local/camel-local-provider.c:123
+#: ../src/camel/providers/local/camel-local-provider.c:136
 msgid "Standard Unix mbox spool directory"
 msgstr "Стандартный для Unix каталог очередей типа mbox"
 
-#: ../camel/providers/local/camel-local-store.c:88
+#: ../src/camel/providers/local/camel-local-store.c:82
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Не удалось переименовать папку %s в %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:170
+#: ../src/camel/providers/local/camel-local-store.c:164
 #, c-format
 msgid "Local mail file %s"
 msgstr "Локальный почтовый файл %s"
 
-#: ../camel/providers/local/camel-local-store.c:213
-#: ../camel/providers/local/camel-local-store.c:373
-#: ../camel/providers/local/camel-maildir-store.c:123
-#: ../camel/providers/local/camel-mbox-store.c:572
-#: ../camel/providers/local/camel-spool-store.c:87
+#: ../src/camel/providers/local/camel-local-store.c:207
+#: ../src/camel/providers/local/camel-local-store.c:367
+#: ../src/camel/providers/local/camel-maildir-store.c:118
+#: ../src/camel/providers/local/camel-mbox-store.c:579
+#: ../src/camel/providers/local/camel-spool-store.c:90
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Относительный путь к хранилищу %s"
 
-#: ../camel/providers/local/camel-local-store.c:222
+#: ../src/camel/providers/local/camel-local-store.c:216
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Хранилище %s не является каталогом"
 
-#: ../camel/providers/local/camel-local-store.c:234
-#: ../camel/providers/local/camel-local-store.c:244
-#: ../camel/providers/local/camel-local-store.c:386
-#: ../camel/providers/local/camel-maildir-store.c:165
+#: ../src/camel/providers/local/camel-local-store.c:228
+#: ../src/camel/providers/local/camel-local-store.c:238
+#: ../src/camel/providers/local/camel-local-store.c:380
+#: ../src/camel/providers/local/camel-maildir-store.c:160
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Не удалось получить папку: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:281
+#: ../src/camel/providers/local/camel-local-store.c:275
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "Локальное хранилище не имеет папки Входящие"
 
-#: ../camel/providers/local/camel-local-store.c:446
-#: ../camel/providers/local/camel-mbox-store.c:739
+#: ../src/camel/providers/local/camel-local-store.c:440
+#: ../src/camel/providers/local/camel-mbox-store.c:746
 #, c-format
-msgid "Could not delete folder index file '%s': %s"
+msgid "Could not delete folder index file “%s”: %s"
 msgstr "Не удалось удалить индексный файл папки «%s»: %s"
 
-#: ../camel/providers/local/camel-local-store.c:474
-#: ../camel/providers/local/camel-mbox-store.c:769
+#: ../src/camel/providers/local/camel-local-store.c:468
+#: ../src/camel/providers/local/camel-mbox-store.c:776
 #, c-format
-msgid "Could not delete folder meta file '%s': %s"
+msgid "Could not delete folder meta file “%s”: %s"
 msgstr "Не удалось удалить мета-файл папки «%s»: %s"
 
-#: ../camel/providers/local/camel-local-store.c:587
+#: ../src/camel/providers/local/camel-local-store.c:581
 #, c-format
-msgid "Could not rename '%s': %s"
+msgid "Could not rename “%s”: %s"
 msgstr "Не удалось переименовать «%s»: %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:109
-#: ../camel/providers/local/camel-maildir-folder.c:344
-#: ../camel/providers/local/camel-mbox-folder.c:126
-#: ../camel/providers/local/camel-mbox-folder.c:339
-#: ../camel/providers/local/camel-mh-folder.c:157
+#: ../src/camel/providers/local/camel-maildir-folder.c:107
+#: ../src/camel/providers/local/camel-maildir-folder.c:346
+#: ../src/camel/providers/local/camel-mbox-folder.c:133
+#: ../src/camel/providers/local/camel-mbox-folder.c:348
+#: ../src/camel/providers/local/camel-mh-folder.c:159
 msgid "No such message"
 msgstr "Нет такого сообщения"
 
-#: ../camel/providers/local/camel-maildir-folder.c:234
+#: ../src/camel/providers/local/camel-maildir-folder.c:240
 #, c-format
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "Не удалось добавить сообщение в папку почтового каталога: %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:282
-#: ../camel/providers/local/camel-maildir-folder.c:292
-#: ../camel/providers/local/camel-mbox-folder.c:400
-#: ../camel/providers/local/camel-mh-folder.c:169
-#: ../camel/providers/local/camel-mh-folder.c:179
+#: ../src/camel/providers/local/camel-maildir-folder.c:287
+#: ../src/camel/providers/local/camel-maildir-folder.c:297
+#: ../src/camel/providers/local/camel-mbox-folder.c:407
+#: ../src/camel/providers/local/camel-mh-folder.c:171
+#: ../src/camel/providers/local/camel-mh-folder.c:181
 #, c-format
 msgid "Cannot get message %s from folder %s: "
 msgstr "Не удалось получить сообщение %s из папки %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:362
+#: ../src/camel/providers/local/camel-maildir-folder.c:364
 #, c-format
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "Не удалось переместить сообщение в папку: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:131
-#: ../camel/providers/local/camel-maildir-store.c:931
+#: ../src/camel/providers/local/camel-maildir-store.c:126
+#: ../src/camel/providers/local/camel-maildir-store.c:929
 #, c-format
-msgid "Cannot create folder containing '%s'"
+msgid "Cannot create folder containing “%s”"
 msgstr "Не удалось создать папку, содержащую «%s»"
 
-#: ../camel/providers/local/camel-maildir-store.c:139
-#: ../camel/providers/local/camel-maildir-store.c:158
-#: ../camel/providers/local/camel-maildir-store.c:923
+#: ../src/camel/providers/local/camel-maildir-store.c:134
+#: ../src/camel/providers/local/camel-maildir-store.c:153
+#: ../src/camel/providers/local/camel-maildir-store.c:921
 #, c-format
 msgid "Folder %s already exists"
 msgstr "Папка %s уже существует"
 
-#: ../camel/providers/local/camel-maildir-store.c:266
-#: ../camel/providers/local/camel-maildir-store.c:297
-#: ../camel/providers/local/camel-mbox-store.c:401
-#: ../camel/providers/local/camel-mbox-store.c:422
+#: ../src/camel/providers/local/camel-maildir-store.c:261
+#: ../src/camel/providers/local/camel-maildir-store.c:292
+#: ../src/camel/providers/local/camel-mbox-store.c:410
+#: ../src/camel/providers/local/camel-mbox-store.c:431
 #, c-format
-msgid "Cannot create folder '%s': %s"
+msgid "Cannot create folder “%s”: %s"
 msgstr "Не удалось создать папку: «%s»: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:281
-#: ../camel/providers/local/camel-mbox-store.c:367
-#: ../camel/providers/local/camel-mh-store.c:523
+#: ../src/camel/providers/local/camel-maildir-store.c:276
+#: ../src/camel/providers/local/camel-mbox-store.c:376
+#: ../src/camel/providers/local/camel-mh-store.c:519
 #, c-format
-msgid "Cannot get folder '%s': %s"
-msgstr "Не удалось получить папку: «%s»: %s"
+msgid "Cannot get folder “%s”: %s"
+msgstr "Не удается получить папку «%s»: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:287
-#: ../camel/providers/local/camel-mbox-store.c:377
-#: ../camel/providers/local/camel-mh-store.c:532
+#: ../src/camel/providers/local/camel-maildir-store.c:282
+#: ../src/camel/providers/local/camel-mbox-store.c:386
+#: ../src/camel/providers/local/camel-mh-store.c:528
 #, c-format
-msgid "Cannot get folder '%s': folder does not exist."
+msgid "Cannot get folder “%s”: folder does not exist."
 msgstr "Не удалось получить папку «%s»: папка не существует."
 
-#: ../camel/providers/local/camel-maildir-store.c:314
+#: ../src/camel/providers/local/camel-maildir-store.c:309
 #, c-format
-msgid "Cannot get folder '%s': not a maildir directory."
+msgid "Cannot get folder “%s”: not a maildir directory."
 msgstr "Не удалось получить папку «%s»: не является почтовым каталогом."
 
-#: ../camel/providers/local/camel-maildir-store.c:378
-#: ../camel/providers/local/camel-maildir-store.c:418
-#: ../camel/providers/local/camel-mh-store.c:676
+#: ../src/camel/providers/local/camel-maildir-store.c:373
+#: ../src/camel/providers/local/camel-maildir-store.c:413
+#: ../src/camel/providers/local/camel-mh-store.c:672
 #, c-format
-msgid "Could not delete folder '%s': %s"
+msgid "Could not delete folder “%s”: %s"
 msgstr "Не удалось удалить папку «%s»: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:380
+#: ../src/camel/providers/local/camel-maildir-store.c:375
 msgid "not a maildir directory"
 msgstr "не является почтовым каталогом"
 
-#: ../camel/providers/local/camel-maildir-store.c:666
-#: ../camel/providers/local/camel-maildir-store.c:1146
-#: ../camel/providers/local/camel-spool-store.c:212
-#: ../camel/providers/local/camel-spool-store.c:231
+#: ../src/camel/providers/local/camel-maildir-store.c:664
+#: ../src/camel/providers/local/camel-maildir-store.c:1142
+#: ../src/camel/providers/local/camel-spool-store.c:217
+#: ../src/camel/providers/local/camel-spool-store.c:236
 #, c-format
-msgid "Could not scan folder '%s': %s"
+msgid "Could not scan folder “%s”: %s"
 msgstr "Не удалось просканировать папку «%s»: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:476
-#: ../camel/providers/local/camel-maildir-summary.c:616
+#: ../src/camel/providers/local/camel-maildir-summary.c:494
+#: ../src/camel/providers/local/camel-maildir-summary.c:636
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Не удалось открыть путь к папке почтового каталога: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:607
+#: ../src/camel/providers/local/camel-maildir-summary.c:627
 msgid "Checking folder consistency"
 msgstr "Проверка содержания каталогов"
 
-#: ../camel/providers/local/camel-maildir-summary.c:707
+#: ../src/camel/providers/local/camel-maildir-summary.c:749
 msgid "Checking for new messages"
 msgstr "Проверка новых сообщений"
 
-#: ../camel/providers/local/camel-maildir-summary.c:810
-#: ../camel/providers/local/camel-mbox-summary.c:466
-#: ../camel/providers/local/camel-mbox-summary.c:687
-#: ../camel/providers/local/camel-mbox-summary.c:836
-#: ../camel/providers/local/camel-spool-summary.c:139
+#: ../src/camel/providers/local/camel-maildir-summary.c:853
+#: ../src/camel/providers/local/camel-mbox-summary.c:367
+#: ../src/camel/providers/local/camel-mbox-summary.c:585
+#: ../src/camel/providers/local/camel-mbox-summary.c:739
+#: ../src/camel/providers/local/camel-spool-summary.c:141
 msgid "Storing folder"
 msgstr "Сохранение папки"
 
-#: ../camel/providers/local/camel-mbox-folder.c:196
+#: ../src/camel/providers/local/camel-mbox-folder.c:205
 #, c-format
 msgid "Cannot open mailbox: %s: "
-msgstr "Не удалось открыть почтовый ящик: %s:"
+msgstr "Не удалось открыть почтовый ящик: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:262
+#: ../src/camel/providers/local/camel-mbox-folder.c:266
 #, c-format
 msgid "Cannot append message to mbox file: %s: "
-msgstr "Не удалось добавить сообщение в файл почтового ящика: %s:"
+msgstr "Не удалось добавить сообщение в файл почтового ящика: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:392
+#: ../src/camel/providers/local/camel-mbox-folder.c:399
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Видимо, папка невостановимо испорчена."
 
-#: ../camel/providers/local/camel-mbox-folder.c:449
-#: ../camel/providers/local/camel-spool-folder.c:67
+#: ../src/camel/providers/local/camel-mbox-folder.c:454
+#: ../src/camel/providers/local/camel-spool-folder.c:65
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Не удалось заблокировать папку %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:389
-#: ../camel/providers/local/camel-mbox-store.c:580
+#: ../src/camel/providers/local/camel-mbox-store.c:398
+#: ../src/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:433
+#: ../src/camel/providers/local/camel-mbox-store.c:442
 #, c-format
-msgid "Cannot get folder '%s': not a regular file."
+msgid "Cannot get folder “%s”: not a regular file."
 msgstr "Не удалось получить папку «%s»: не является обычным файлом."
 
-#: ../camel/providers/local/camel-mbox-store.c:596
+#: ../src/camel/providers/local/camel-mbox-store.c:603
 #, c-format
-msgid "Cannot create directory '%s': %s."
+msgid "Cannot create directory “%s”: %s."
 msgstr "Не удалось создать каталог «%s»: %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:608
+#: ../src/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:610
+#: ../src/camel/providers/local/camel-mbox-store.c:617
 msgid "Folder already exists"
 msgstr "Папка уже существует"
 
-#: ../camel/providers/local/camel-mbox-store.c:650
-#: ../camel/providers/local/camel-mbox-store.c:663
-#: ../camel/providers/local/camel-mbox-store.c:692
+#: ../src/camel/providers/local/camel-mbox-store.c:657
+#: ../src/camel/providers/local/camel-mbox-store.c:670
+#: ../src/camel/providers/local/camel-mbox-store.c:699
 #, c-format
 msgid ""
-"Could not delete folder '%s':\n"
+"Could not delete folder “%s”:\n"
 "%s"
 msgstr ""
 "Не удалось удалить папку «%s»:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:673
+#: ../src/camel/providers/local/camel-mbox-store.c:680
 #, c-format
-msgid "'%s' is not a regular file."
+msgid "“%s” is not a regular file."
 msgstr "«%s» не является обычным файлом."
 
-#: ../camel/providers/local/camel-mbox-store.c:682
+#: ../src/camel/providers/local/camel-mbox-store.c:689
 #, c-format
-msgid "Folder '%s' is not empty. Not deleted."
+msgid "Folder “%s” is not empty. Not deleted."
 msgstr "Папка «%s» не пуста. Не удалена."
 
-#: ../camel/providers/local/camel-mbox-store.c:709
-#: ../camel/providers/local/camel-mbox-store.c:724
+#: ../src/camel/providers/local/camel-mbox-store.c:716
+#: ../src/camel/providers/local/camel-mbox-store.c:731
 #, c-format
-msgid "Could not delete folder summary file '%s': %s"
+msgid "Could not delete folder summary file “%s”: %s"
 msgstr "Не удалось удалить файл краткой информации «%s»: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:806
+#: ../src/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:822
+#: ../src/camel/providers/local/camel-mbox-store.c:829
 #, c-format
-msgid "Could not rename '%s': '%s': %s"
+msgid "Could not rename “%s”: “%s”: %s"
 msgstr "Не удалось переименовать «%s»: «%s»: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:476
+#: ../src/camel/providers/local/camel-mbox-summary.c:377
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Не удалось открыть папку: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:611
+#: ../src/camel/providers/local/camel-mbox-summary.c:509
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Не удалось проверить папку: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:696
-#: ../camel/providers/local/camel-mbox-summary.c:845
-#: ../camel/providers/local/camel-spool-summary.c:146
+#: ../src/camel/providers/local/camel-mbox-summary.c:594
+#: ../src/camel/providers/local/camel-mbox-summary.c:748
+#: ../src/camel/providers/local/camel-spool-summary.c:148
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Не удалось открыть файл: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:715
-#: ../camel/providers/local/camel-spool-summary.c:161
+#: ../src/camel/providers/local/camel-mbox-summary.c:613
+#: ../src/camel/providers/local/camel-spool-summary.c:163
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Не удалось открыть временный почтовый ящик: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:732
-#: ../camel/providers/local/camel-mbox-summary.c:967
+#: ../src/camel/providers/local/camel-mbox-summary.c:630
+#: ../src/camel/providers/local/camel-mbox-summary.c:870
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Не удалось закрыть исходную папку %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:745
+#: ../src/camel/providers/local/camel-mbox-summary.c:643
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "Не удалось закрыть временную папку: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:764
+#: ../src/camel/providers/local/camel-mbox-summary.c:662
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Не удалось переименовать папку: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:859
-#: ../camel/providers/local/camel-mbox-summary.c:1132
+#: ../src/camel/providers/local/camel-mbox-summary.c:762
+#: ../src/camel/providers/local/camel-mbox-summary.c:1032
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Не удалось сохранить папку: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:898
-#: ../camel/providers/local/camel-mbox-summary.c:1172
+#: ../src/camel/providers/local/camel-mbox-summary.c:803
+#: ../src/camel/providers/local/camel-mbox-summary.c:1075
 #, c-format
 msgid ""
-"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
+"MBOX file is corrupted, please fix it. (Expected a From line, but didn’t get "
 "it.)"
 msgstr ""
-"Файл почтового ящика повреждён, исправьте его. (Ожидалась строка «От», но "
-"она не была получена.)"
+"Файл MBOX поврежден, пожалуйста, исправьте его. (Ожидалась строка From, но "
+"не получена)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:908
-#: ../camel/providers/local/camel-mbox-summary.c:1184
+#: ../src/camel/providers/local/camel-mbox-summary.c:813
+#: ../src/camel/providers/local/camel-mbox-summary.c:1087
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Сводка и папка расходятся даже после синхронизации"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1077
-#: ../camel/providers/local/camel-spool-summary.c:356
+#: ../src/camel/providers/local/camel-mbox-summary.c:979
+#: ../src/camel/providers/local/camel-spool-summary.c:358
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Неизвестная ошибка: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1242
-#: ../camel/providers/local/camel-mbox-summary.c:1272
+#: ../src/camel/providers/local/camel-mbox-summary.c:1148
+#: ../src/camel/providers/local/camel-mbox-summary.c:1178
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "Сбой записи во временный почтовый ящик: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1261
+#: ../src/camel/providers/local/camel-mbox-summary.c:1167
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "Сбой записи во временный почтовый ящик: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:116
+#: ../src/camel/providers/local/camel-mh-folder.c:119
 #, c-format
 msgid "Cannot append message to mh folder: %s: "
-msgstr "Не удалось добавить сообщение в папку mh: %s:"
+msgstr "Не удалось добавить сообщение в папку mh: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:542
+#: ../src/camel/providers/local/camel-mh-store.c:538
 #, c-format
-msgid "Could not create folder '%s': %s"
+msgid "Could not create folder “%s”: %s"
 msgstr "Не удалось создать папку «%s»: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:558
+#: ../src/camel/providers/local/camel-mh-store.c:554
 #, c-format
-msgid "Cannot get folder '%s': not a directory."
+msgid "Cannot get folder “%s”: not a directory."
 msgstr "Не удалось получить папку «%s»: не является каталогом."
 
-#: ../camel/providers/local/camel-mh-summary.c:236
+#: ../src/camel/providers/local/camel-mh-summary.c:232
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Не удалось открыть MH каталог: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:95
+#: ../src/camel/providers/local/camel-spool-store.c:98
 #, c-format
-msgid "Spool '%s' cannot be opened: %s"
+msgid "Spool “%s” cannot be opened: %s"
 msgstr "Не удалось открыть файл накопления «%s»: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:109
+#: ../src/camel/providers/local/camel-spool-store.c:112
 #, c-format
-msgid "Spool '%s' is not a regular file or directory"
+msgid "Spool “%s” is not a regular file or directory"
 msgstr "Накопитель «%s» не является обычным файлом или каталогом"
 
-#: ../camel/providers/local/camel-spool-store.c:425
+#: ../src/camel/providers/local/camel-spool-store.c:429
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Файл почтового спула %s"
 
-#: ../camel/providers/local/camel-spool-store.c:429
+#: ../src/camel/providers/local/camel-spool-store.c:433
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Дерево папки спула %s"
 
-#: ../camel/providers/local/camel-spool-store.c:432
+#: ../src/camel/providers/local/camel-spool-store.c:436
 msgid "Invalid spool"
 msgstr "Неверный спул"
 
-#: ../camel/providers/local/camel-spool-store.c:481
+#: ../src/camel/providers/local/camel-spool-store.c:485
 #, c-format
-msgid "Folder '%s/%s' does not exist."
+msgid "Folder “%s/%s” does not exist."
 msgstr "Папка «%s/%s» не существует."
 
-#: ../camel/providers/local/camel-spool-store.c:494
+#: ../src/camel/providers/local/camel-spool-store.c:498
 #, c-format
 msgid ""
-"Could not open folder '%s':\n"
+"Could not open folder “%s”:\n"
 "%s"
 msgstr ""
 "Не удалось открыть папку «%s»:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:500
+#: ../src/camel/providers/local/camel-spool-store.c:504
 #, c-format
-msgid "Folder '%s' does not exist."
+msgid "Folder “%s” does not exist."
 msgstr "Папка «%s» не существует."
 
-#: ../camel/providers/local/camel-spool-store.c:508
+#: ../src/camel/providers/local/camel-spool-store.c:512
 #, c-format
 msgid ""
-"Could not create folder '%s':\n"
+"Could not create folder “%s”:\n"
 "%s"
 msgstr ""
 "Не удалось создать папку «%s»:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:521
+#: ../src/camel/providers/local/camel-spool-store.c:525
 #, c-format
-msgid "'%s' is not a mailbox file."
+msgid "“%s” is not a mailbox file."
 msgstr "«%s» не является файлом почтового ящика."
 
-#: ../camel/providers/local/camel-spool-store.c:585
+#: ../src/camel/providers/local/camel-spool-store.c:589
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "Хранилище не поддерживает INBOX"
 
-#: ../camel/providers/local/camel-spool-store.c:604
+#: ../src/camel/providers/local/camel-spool-store.c:608
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "Папки спула не могут быть удалены"
 
-#: ../camel/providers/local/camel-spool-store.c:619
+#: ../src/camel/providers/local/camel-spool-store.c:623
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "Папки спула не могут быть переименованы"
 
-#: ../camel/providers/local/camel-spool-summary.c:177
-#: ../camel/providers/local/camel-spool-summary.c:189
-#: ../camel/providers/local/camel-spool-summary.c:201
+#: ../src/camel/providers/local/camel-spool-store.c:779
+msgid "Refreshing spool folder"
+msgstr "Обновление папки спула"
+
+#: ../src/camel/providers/local/camel-spool-summary.c:179
+#: ../src/camel/providers/local/camel-spool-summary.c:191
+#: ../src/camel/providers/local/camel-spool-summary.c:203
 #, c-format
 msgid "Could not synchronize temporary folder %s: %s"
 msgstr "Не удалось синхронизировать временную папку %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:219
+#: ../src/camel/providers/local/camel-spool-summary.c:221
 #, c-format
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "Не удалось синхронизировать папку спула %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:253
-#: ../camel/providers/local/camel-spool-summary.c:272
-#: ../camel/providers/local/camel-spool-summary.c:285
+#: ../src/camel/providers/local/camel-spool-summary.c:255
+#: ../src/camel/providers/local/camel-spool-summary.c:274
+#: ../src/camel/providers/local/camel-spool-summary.c:287
 #, c-format
 msgid ""
 "Could not synchronize spool folder %s: %s\n"
-"Folder may be corrupt, copy saved in '%s'"
+"Folder may be corrupt, copy saved in “%s”"
 msgstr ""
-"Не удалось синхронизировать папку спула %s: %s\n"
+"Не удалось синхронизировать папку накопления %s: %s\n"
 "Папка может быть повреждена, копия сохранена в «%s»"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:227
-#: ../camel/providers/nntp/camel-nntp-folder.c:595
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:212
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:629
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "Внутренняя ошибка: UID в неверном формате: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:297
-#: ../camel/providers/nntp/camel-nntp-folder.c:302
-#: ../camel/providers/pop3/camel-pop3-folder.c:574
-#: ../camel/providers/pop3/camel-pop3-folder.c:1002
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:280
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:285
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:572
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:1086
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Не удалось получить сообщение %s: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:309
-#: ../camel/providers/nntp/camel-nntp-folder.c:629
-#: ../camel/providers/pop3/camel-pop3-folder.c:478
-#: ../camel/providers/pop3/camel-pop3-folder.c:510
-#: ../camel/providers/pop3/camel-pop3-folder.c:542
-#: ../camel/providers/pop3/camel-pop3-folder.c:564
-#: ../camel/providers/pop3/camel-pop3-folder.c:583
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:292
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:663
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:476
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:508
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:540
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:562
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:581
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "Не удалось получить сообщение %s: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:435
-#: ../camel/providers/nntp/camel-nntp-folder.c:441
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:421
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:427
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Ошибка отправки сообщения: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:508
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:479
 msgid "Posting failed: "
 msgstr "Ошибка отправки сообщения: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:618
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:652
 #, c-format
 msgid "This message is not currently available"
 msgstr "Это сообщение в настоящий момент недоступно"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:727
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:761
 #, c-format
 msgid "You cannot copy messages from a NNTP folder"
 msgstr "Вы не можете копировать сообщения из папки NNTP"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:45
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:45
 msgid ""
 "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr ""
 "_Показывать папки в сокращённой форме (то есть c.o.linux вместо comp.os."
 "linux)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:48
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:48
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "По_казывать относительные имена папок в диалоге подписки"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:54
+#. Translators: The '%s' is replaced with a spin button with the actual value to use
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:51
+#, c-format
+msgid "Download only up to %s latest messages"
+msgstr "Загружать только до %s последних сообщений"
+
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:57
 msgid "Default NNTP port"
 msgstr "Порт по умолчанию для NNTP"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:58
 msgid "NNTP over TLS"
 msgstr "NNTP поверх TLS"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:61
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:64
 msgid "USENET news"
 msgstr "Новости USENET"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:63
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:66
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr ""
 "Это проводник для чтения и отправки сообщений в группы новостей USENET."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:84
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:87
 msgid ""
 "This option will connect to the NNTP server anonymously, without "
 "authentication."
 msgstr "Этот параметр используется для анонимного подключения к серверу NNTP."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:94
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:97
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4230,22 +5271,37 @@ msgstr ""
 "Подключение к серверу NNTP будет производиться с использованием "
 "незашифрованного пароля."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:377
+#: ../src/camel/providers/nntp/camel-nntp-store.c:376
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "Не удалось прочитать приветствие из %s: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:385
+#: ../src/camel/providers/nntp/camel-nntp-store.c:388
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "Сервер NNTP %s вернул код ошибки %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:455
+#: ../src/camel/providers/nntp/camel-nntp-store.c:407
+#, c-format
+msgid "Failed to issue STARTTLS for NNTP server %s: "
+msgstr "Не удалось выдать STARTTLS для NNTP-сервера %s: "
+
+#: ../src/camel/providers/nntp/camel-nntp-store.c:418
+#, c-format
+msgid "NNTP server %s doesn’t support STARTTLS: %s"
+msgstr "NNTP-сервер %s не поддерживает STARTTLS: %s"
+
+#: ../src/camel/providers/nntp/camel-nntp-store.c:438
+#, c-format
+msgid "Failed to connect to NNTP server %s in secure mode: "
+msgstr "Не удалось подключиться к NNTP-серверу %s в безопасном режиме: "
+
+#: ../src/camel/providers/nntp/camel-nntp-store.c:509
 #, c-format
 msgid "USENET News via %s"
 msgstr "Новости USENET через %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1192
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1245
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4256,26 +5312,26 @@ msgstr ""
 "\n"
 " %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1308
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1360
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "Вы не можете создать папку в группах новостей: вместо этого следует "
 "подписаться."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1324
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1376
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "Вы не можете переименовать папку в группах новостей."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1347
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1399
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Вы не можете удалить папку в группах новостей: вместо этого следует "
 "отписаться."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1557
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1613
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4287,7 +5343,7 @@ msgstr ""
 "Нет такой группы новостей. Выбранный элемент скорее всего является "
 "родительской папкой."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1624
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1680
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4298,116 +5354,137 @@ msgstr ""
 "\n"
 "Группа новостей не существует!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2050
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2104
 msgid "NNTP Command failed: "
 msgstr "Сбой команды NNTP: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2155
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2210
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2245
 #, c-format
 msgid "Not connected."
 msgstr "Не подключён."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2257
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2322
 #, c-format
 msgid "No such folder: %s"
 msgstr "Нет такой папки: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:197
-#: ../camel/providers/nntp/camel-nntp-summary.c:337
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:189
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:331
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Поиск новых сообщений"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:219
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:211
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "Неожиданный ответ сервера от xover: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:358
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:352
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "Неожиданный ответ сервера от head: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:406
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:398
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Сбой операции: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:357
-#: ../camel/providers/pop3/camel-pop3-folder.c:441
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:442
+#, c-format
+msgid "%s: Scanning existing messages"
+msgstr "%s: Сканирование существующих сообщений"
+
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:455
+#, c-format
+msgid "Unexpected server response from listgroup: %s"
+msgstr "Неожиданный ответ сервера от listgroup: %s"
+
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:355
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:439
 #, c-format
 msgid "No message with UID %s"
 msgstr "Нет сообщения с UID %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:457
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:455
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Получение сообщения %d по POP"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:575
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:573
 msgid "Unknown reason"
 msgstr "Неизвестная причина"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:644
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:642
 msgid "Retrieving POP summary"
 msgstr "Получение краткой информации от сервера POP"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:703
-#: ../camel/providers/pop3/camel-pop3-folder.c:706
-#: ../camel/providers/pop3/camel-pop3-folder.c:719
-#: ../camel/providers/pop3/camel-pop3-folder.c:732
-#: ../camel/providers/pop3/camel-pop3-folder.c:746
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:698
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:701
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:714
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:727
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:741
 msgid "Cannot get POP summary: "
 msgstr "Невозможно получить общие данные POP: "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:811
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:889
 msgid "Expunging old messages"
 msgstr "Уничтожение старых сообщений"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:839
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:921
 msgid "Expunging deleted messages"
 msgstr "Уничтожение сообщений, помеченных как удалённые"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:36
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:34
 msgid "Message Storage"
 msgstr "Хранилище сообщений"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:38
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:36
 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:42
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:40
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "_Удалять через %s дней"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:44
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:42
+msgid "Hint: Use 0 days to keep messages on the server indefinitely."
+msgstr ""
+"Подсказка: Используйте 0 дней, чтобы хранить сообщения на сервере "
+"неограниченное время."
+
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:44
 msgid "Delete _expunged from local Inbox"
 msgstr "_Удалить сообщения, удалённые из локальной папки «Входящие»"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:46
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:46
 msgid "Disable _support for all POP3 extensions"
 msgstr "Запретить _поддержку всех расширений POP3"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:52
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:48
+msgid "Enable _UTF-8 extension, when the server supports it"
+msgstr "Включите расширение _UTF-8, если сервер его поддерживает"
+
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:54
 msgid "Default POP3 port"
 msgstr "Порт по умолчанию для POP3"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:53
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:55
 msgid "POP3 over TLS"
 msgstr "POP3 поверх TLS"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:60
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:62
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:62
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:64
 msgid "For connecting to and downloading mail from POP servers."
-msgstr "Для подключения и принятия почты с серверов POP"
+msgstr "Для подключения и принятия почты с серверов POP."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:82
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:84
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4416,7 +5493,7 @@ msgstr ""
 "незашифрованного пароля. Большинством серверов POP поддерживается только "
 "этот вариант."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:92
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:94
 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 "
@@ -4427,59 +5504,68 @@ msgstr ""
 "на серверах, якобы поддерживающих его."
 
 #. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:95
+#: ../src/camel/providers/pop3/camel-pop3-store.c:90
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:162
+#: ../src/camel/providers/pop3/camel-pop3-store.c:157
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "Не удалось получить приглашение от POP-сервера %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:177
+#: ../src/camel/providers/pop3/camel-pop3-store.c:172
 #, 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:178
+#: ../src/camel/providers/pop3/camel-pop3-store.c:173
 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:199
+#: ../src/camel/providers/pop3/camel-pop3-store.c:194
 #, 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:217
+#: ../src/camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "Не удалось подключиться к POP-серверу %s в защищённом режиме: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:357
+#: ../src/camel/providers/pop3/camel-pop3-store.c:356
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Не удалось зарегистрироваться на сервере POP %s: Ошибка протокола SASL"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:379
+#: ../src/camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "Сбой аутентификации на сервере POP %s: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:487
+#: ../src/camel/providers/pop3/camel-pop3-store.c:486
 #, c-format
 msgid "POP3 server %s"
 msgstr "Сервер POP3 %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:490
+#: ../src/camel/providers/pop3/camel-pop3-store.c:489
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "Сервер POP3 для %s на %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:702
-#: ../camel/providers/pop3/camel-pop3-store.c:715
-#: ../camel/providers/pop3/camel-pop3-store.c:797
+#: ../src/camel/providers/pop3/camel-pop3-store.c:693
+#, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error enabling UTF-8 mode: "
+msgstr ""
+"Невозможно подключиться к POP-серверу %s.\n"
+"Ошибка при включении режима UTF-8: "
+
+#: ../src/camel/providers/pop3/camel-pop3-store.c:721
+#: ../src/camel/providers/pop3/camel-pop3-store.c:734
+#: ../src/camel/providers/pop3/camel-pop3-store.c:820
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4488,7 +5574,8 @@ msgstr ""
 "Не удалось подключиться к POP-серверу %s.\n"
 "Ошибка отправки пароля: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:742
+#. Translators: Do not translate APOP.
+#: ../src/camel/providers/pop3/camel-pop3-store.c:761
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4500,7 +5587,7 @@ msgstr ""
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:812
+#: ../src/camel/providers/pop3/camel-pop3-store.c:835
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4509,326 +5596,333 @@ msgstr ""
 "Не удалось подключиться к POP-серверу %s.\n"
 "Ошибка отправки имени пользователя%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:896
+#: ../src/camel/providers/pop3/camel-pop3-store.c:919
 #, c-format
-msgid "No such folder '%s'."
+msgid "No such folder “%s”."
 msgstr "Нет такой папки «%s»."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:913
+#: ../src/camel/providers/pop3/camel-pop3-store.c:936
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "В хранилищах POP3 отсутствует иерархия папок"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:33
-#: ../services/evolution-source-registry/builtin/sendmail.source.in.h:1
+#: ../src/camel/providers/sendmail/camel-sendmail-provider.c:31
+#: ../src/services/evolution-source-registry/builtin/sendmail.source.in.h:1
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:35
+#: ../src/camel/providers/sendmail/camel-sendmail-provider.c:33
 msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
+"For delivering mail by passing it to the “sendmail” program on the local "
 "system."
-msgstr "Доставка почты с помощью программы «sendmail» на локальной системе."
+msgstr ""
+"Для доставки почты путем передачи ее программе \"sendmail\" в локальной "
+"системе."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:46
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:44
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:48
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:46
 msgid "Mail delivery via the sendmail program"
 msgstr "Доставка почты через программу sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:137
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:137
 #, c-format
 msgid "Failed to read From address"
 msgstr "Не удалось прочитать адрес отправителя"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:154
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:154
 #, c-format
 msgid "Message send in offline mode is disabled"
 msgstr "Отправка сообщений в автономном режиме отключена"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:182
 #, c-format
 msgid "Could not parse recipient list"
 msgstr "Не удалось разобрать список получателей"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:199
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:199
 #, c-format
 msgid "Could not parse arguments"
 msgstr "Не удалось разобрать аргументы"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:230
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:215
 #, c-format
-msgid "Could not create pipe to '%s': %s: mail not sent"
-msgstr "Не удалось создать канал к «%s»: %s. Почта не отправлена"
+msgid "Could not create pipe to “%s”: %s: mail not sent"
+msgstr "Не удалось создать соединение с «%s»: %s: почта не отправлена"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:255
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:246
 #, c-format
-msgid "Could not fork '%s': %s: mail not sent"
-msgstr "Не удалось выполнить ветвление (fork) «%s»: %s. Почта не отправлена"
+msgid "Could not fork “%s”: %s: mail not sent"
+msgstr "Не удалось запустить дочерний процесс «%s»: %s: почта не отправлена"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:304
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:301
 msgid "Could not send message: "
-msgstr "Не удалось отправить сообщение:"
+msgstr "Не удалось отправить сообщение: "
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:334
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:343
 #, c-format
-msgid "'%s' exited with signal %s: mail not sent."
-msgstr "«%s» завершил работу %s. Почта не отправлена."
+msgid "“%s” exited with signal %s: mail not sent."
+msgstr "«%s» завершился с сигналом %s: почта не отправлена."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:344
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:353
 #, c-format
-msgid "Could not execute '%s': mail not sent."
+msgid "Could not execute “%s”: mail not sent."
 msgstr "Не удалось выполнить «%s». Почта не отправлена."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:349
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:358
 #, c-format
-msgid "'%s' exited with status %d: mail not sent."
+msgid "“%s” exited with status %d: mail not sent."
 msgstr "«%s» завершил работу с кодом %d. Почта не отправлена."
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:39
+#: ../src/camel/providers/smtp/camel-smtp-provider.c:37
 msgid "Default SMTP port"
 msgstr "Порт по умолчанию для SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:40
+#: ../src/camel/providers/smtp/camel-smtp-provider.c:38
 msgid "SMTP over TLS"
 msgstr "SMTP поверх TLS"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../src/camel/providers/smtp/camel-smtp-provider.c:39
 msgid "Message submission port"
 msgstr "Порт отсылки сообщений"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:47
+#: ../src/camel/providers/smtp/camel-smtp-provider.c:45
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:49
+#: ../src/camel/providers/smtp/camel-smtp-provider.c:47
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 "Для доставки почты путём подключения к удалённому почтовому концентратору по "
 "протоколу SMTP."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:237
-#: ../camel/providers/smtp/camel-smtp-transport.c:244
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:237
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:244
 msgid "Welcome response error: "
 msgstr "Ошибка ответа на приветствие: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:280
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:282
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Не удалось подключиться к SMTP-серверу %s в защищённом режиме: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:289
-#: ../camel/providers/smtp/camel-smtp-transport.c:302
-#: ../camel/providers/smtp/camel-smtp-transport.c:309
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:291
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:304
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:311
 msgid "STARTTLS command failed: "
 msgstr "Сбой команды STARTTLS: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:328
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:332
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "Не удалось подключиться к SMTP-серверу %s в защищённом режиме: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:439
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:443
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-сервер %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:442
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:446
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-доставка почты через %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:582
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:586
 #, c-format
 msgid "SMTP server %s does not support %s authentication"
 msgstr "Сервер SMTP %s не поддерживает аутентификацию %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:663
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:686
 #, c-format
 msgid "No SASL mechanism was specified"
 msgstr "Не указан механизм SASL"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:699
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:723
 msgid "AUTH command failed: Not connected."
 msgstr "Сбой команды AUTH: не подключён."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:706
-#: ../camel/providers/smtp/camel-smtp-transport.c:720
-#: ../camel/providers/smtp/camel-smtp-transport.c:732
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:730
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:744
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:760
 msgid "AUTH command failed: "
 msgstr "Сбой команды AUTH: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:888
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:963
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "Не удалось отправить сообщение: сервис не подключён."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:897
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "Не удалось отправить сообщение: неверный адрес отправителя."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:901
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:976
 msgid "Sending message"
 msgstr "Отправка сообщения"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:930
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "Не удалось отправить сообщение: не определены получатели."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:945
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1020
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "Не удалось отправить сообщение: указан один или  несколько некорректных "
 "получателей"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1077
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1152
 msgid "Syntax error, command unrecognized"
 msgstr "Синтаксическая ошибка, команда не распознана"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1079
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1154
 msgid "Syntax error in parameters or arguments"
 msgstr "Синтаксическая ошибка в параметрах или аргументах"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1081
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1156
 msgid "Command not implemented"
 msgstr "Команда не реализована"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1083
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1158
 msgid "Command parameter not implemented"
 msgstr "Параметр команды не реализован"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1085
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1160
 msgid "System status, or system help reply"
 msgstr "Состояние системы или ответ системной справки"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1087
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1162
 msgid "Help message"
 msgstr "Справочное сообщение"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1089
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1164
 msgid "Service ready"
 msgstr "Сервис готов"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1091
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1166
 msgid "Service closing transmission channel"
 msgstr "Сервис закрывает канал передачи"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1093
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1168
 msgid "Service not available, closing transmission channel"
 msgstr "Сервис не доступен, закрытие канала передачи"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1095
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1170
 msgid "Requested mail action okay, completed"
 msgstr "Запрошенное почтовое действие выполнено"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1097
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1172
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 "Не локальный пользователь; будет отправлено в соответствии с <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1099
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1174
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Запрошенное действие с почтой не выполнено: почтовый ящик недоступен"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1101
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1176
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Запрошенное действие не выполнено: почтовый ящик недоступен"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1103
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1178
 msgid "Requested action aborted: error in processing"
 msgstr "Запрошенное действие прервано: ошибка при обработке"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1105
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1180
 msgid "User not local; please try <forward-path>"
 msgstr "Пользователь не локальный; установите <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1107
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1182
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 "Запрошенное действие не выполнено: недостаточно места в системном хранилище"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1109
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1184
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Запрошенное действие прервано: исчерпано место в хранилище"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1111
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1186
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Запрошенное действие прервано: имя почтового ящика недопустимо"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1113
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1188
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Начало ввода почты; окончание после <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1115
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1190
 msgid "Transaction failed"
 msgstr "Сбой транзакции"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1119
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1194
 msgid "A password transition is needed"
 msgstr "Необходима передача пароля"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1121
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1196
 msgid "Authentication mechanism is too weak"
 msgstr "Слишком слабый механизм аутентификации"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1123
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1198
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Для запрошенного механизма аутентификации требуется шифрование"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1125
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1200
 msgid "Temporary authentication failure"
 msgstr "Временный сбой аутентификации"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1415
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1202
+#: ../src/libedataserver/e-client.c:145
+msgid "Authentication required"
+msgstr "Требуется аутентификация"
+
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1512
 msgid "SMTP Greeting"
 msgstr "Приветствие SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1424
-#: ../camel/providers/smtp/camel-smtp-transport.c:1437
-#: ../camel/providers/smtp/camel-smtp-transport.c:1444
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1521
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1534
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1541
 msgid "HELO command failed: "
 msgstr "Сбой команды HELO: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1520
-#: ../camel/providers/smtp/camel-smtp-transport.c:1534
-#: ../camel/providers/smtp/camel-smtp-transport.c:1543
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1625
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1639
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1648
 msgid "MAIL FROM command failed: "
 msgstr "Сбой команды MAIL FROM: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1571
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1676
 msgid "RCPT TO command failed: "
 msgstr "Сбой команды RCPT TO: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1587
-#: ../camel/providers/smtp/camel-smtp-transport.c:1596
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1692
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1701
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "Сбой команды RCPT TO <%s>: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1668
-#: ../camel/providers/smtp/camel-smtp-transport.c:1679
-#: ../camel/providers/smtp/camel-smtp-transport.c:1690
-#: ../camel/providers/smtp/camel-smtp-transport.c:1752
-#: ../camel/providers/smtp/camel-smtp-transport.c:1770
-#: ../camel/providers/smtp/camel-smtp-transport.c:1783
-#: ../camel/providers/smtp/camel-smtp-transport.c:1791
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1775
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1786
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1797
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1882
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1900
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1913
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1921
 msgid "DATA command failed: "
 msgstr "Сбой команды DATA: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1817
-#: ../camel/providers/smtp/camel-smtp-transport.c:1831
-#: ../camel/providers/smtp/camel-smtp-transport.c:1839
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1947
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1961
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1969
 msgid "RSET command failed: "
 msgstr "Сбой команды RSET: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1865
-#: ../camel/providers/smtp/camel-smtp-transport.c:1877
-#: ../camel/providers/smtp/camel-smtp-transport.c:1883
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1995
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:2007
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:2013
 msgid "QUIT command failed: "
 msgstr "Сбой команды QUIT: "
 
@@ -4859,11 +5953,88 @@ 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\""
+"Units for a birthday or anniversary reminder, “minutes”, “hours” or “days”"
+msgstr ""
+"Единицы для напоминания о днях рождения и годовщинах: «minutes» (минуты), "
+"«hours» (часы) или «days» (дни)"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:7
+msgid "Past reminders for EReminderWatcher"
+msgstr "Прошлые напоминания для EReminderWatcher"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:8
+msgid "Snoozed reminders for EReminderWatcher"
+msgstr "Отложенные напоминания для EReminderWatcher"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:9
+msgid "Reminder programs"
+msgstr "Программы напоминания"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:10
+msgid "Programs that are allowed to be run by reminders"
+msgstr "Программы, которые разрешено запускать с помощью напоминаний"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:11
+msgid "Show reminders in notification tray only"
+msgstr "Показывать напоминания только в области уведомлений"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:12
+msgid ""
+"When set to true, the reminders are shown only in the notification tray, "
+"otherwise the reminders dialog is shown immediately"
+msgstr ""
+"Если установлено значение true, напоминания отображаются только в области "
+"уведомлений, в противном случае диалог напоминаний отображается немедленно"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:13
+msgid "Show reminder notification dialog always on top"
+msgstr "Показывайте диалог уведомления о напоминании всегда сверху"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:14
+msgid ""
+"Whether or not to show reminder notification dialog always on top. Note this "
+"works only as a hint for the window manager, which may or may not obey it."
+msgstr ""
+"Показывать или нет диалог уведомления о напоминании всегда сверху. Обратите "
+"внимание, что это работает только как подсказка для оконного менеджера, "
+"который может подчиниться ей, а может и не подчиниться."
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:15
+msgid "X position of the reminder notification dialog"
+msgstr "X позиция диалогового окна уведомления о напоминании"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:16
+msgid "Y position of the reminder notification dialog"
+msgstr "Положение по оси Y диалогового окна уведомления о напоминании"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:17
+msgid "Width of the reminder notification dialog"
+msgstr "Ширина диалогового окна уведомления о напоминании"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:18
+msgid "Height of the reminder notification dialog"
+msgstr "Высота диалогового окна уведомления о напоминании"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:19
+msgid "Size in pixels of the event list in the reminder notification dialog"
 msgstr ""
-"Единицы для напоминания о днях рождения и годовщинах: «minutes», «hours» или "
-"«days»"
+"Размер в пикселях списка событий в диалоговом окне уведомления о напоминании"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:20
+msgid "Show reminder notification for completed tasks"
+msgstr "Показывать уведомления о напоминании о выполненных задачах"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:21
+msgid "Show reminder notification for past events"
+msgstr "Показывать уведомления о напоминаниях о прошедших событиях"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:22
+msgid "The last used snooze time, in minutes"
+msgstr "Последнее использованное время дремоты, в минутах"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:23
+msgid "User-defined snooze times, in minutes"
+msgstr "Время ожидания, задаваемое пользователем, в минутах"
 
 #: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:1
 msgid "Whether the migration of old setting was already done"
@@ -4875,11 +6046,222 @@ msgstr "Абсолютный путь, где находится бинарны
 
 #: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:3
 msgid ""
-"An example is '/usr/bin/gpg'; if it is not filled, or doesn't exist, then it "
-"is searched for it. Change requires restart of the application."
+"An example is “/usr/bin/gpg”; when it is left empty, or an incorrect value "
+"is set, then it will be searched for. Change requires restart of the "
+"application."
+msgstr ""
+"Примером может служить \"/usr/bin/gpg\"; если он оставлен пустым или задано "
+"неверное значение, то будет произведен поиск. Изменение требует перезапуска "
+"приложения."
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:4
+msgid "Whether to load photos of signers/encrypters"
+msgstr "Загружать ли фотографии подписантов/шифровальщиков"
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:5
+msgid ""
+"When set to “true”, tries to load also photo of the signers/encrypters, if "
+"available in the key/certificate."
+msgstr ""
+"Если установлено значение \"true\", пытается загрузить также фото "
+"подписавших/шифровальщиков, если таковые имеются в ключе/сертификате."
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:6
+msgid "Override SMTP HELO/EHLO argument"
+msgstr "Отмена аргумента SMTP HELO/EHLO"
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:7
+msgid ""
+"When not empty, it's used as the SMTP HELO/EHLO argument, instead of the "
+"local host name/IP."
+msgstr ""
+"Если он не пуст, то используется в качестве аргумента SMTP HELO/EHLO вместо "
+"имени/IP локального хоста."
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:8
+msgid "GIO name of the GNetworkMonitor to use for an ENetworkMonitor instance"
+msgstr ""
+"GIO-имя GNetworkMonitor для использования для экземпляра ENetworkMonitor"
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:9
+msgid ""
+"When set to an unknown value, then the default GNetworkMonitor is used in "
+"the background. A special value “always-online” is used for no network "
+"monitoring."
+msgstr ""
+"Если установлено неизвестное значение, то в фоновом режиме используется "
+"GNetworkMonitor по умолчанию. Специальное значение \"always-online\" "
+"используется для отсутствия мониторинга сети."
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:10
+msgid ""
+"A full path to a directory where .source files with preconfigured options "
+"can be stored"
+msgstr ""
+"Полный путь к каталогу, где могут храниться файлы .source с предварительно "
+"настроенными опциями"
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:11
+msgid ""
+"This directory, if filled with an existing path, is checked additionally to "
+"XDG configure directories."
+msgstr ""
+"Эта директория, если она заполнена существующим путем, проверяется "
+"дополнительно к директориям конфигурации XDG."
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:12
+msgid "A list of variables which can be part of the autoconfig .source files"
+msgstr "Список переменных, которые могут быть частью файлов autoconfig .source"
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:13
+msgid ""
+"Each item of the array is expected to be of the form: name=value. These "
+"variables are checked before environment variables, but after the predefined "
+"USER, REALNAME and HOST variables."
+msgstr ""
+"Каждый элемент массива должен иметь вид: name=value. Эти переменные "
+"проверяются перед переменными окружения, но после предопределенных "
+"переменных USER, REALNAME и HOST."
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:14
+msgid "A list of hints for OAuth2 services"
+msgstr "Список подсказок для сервисов OAuth2"
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:15
+msgid ""
+"Users can extend the list of supported protocols and hostnames for defined "
+"OAuth2 services, in addition to those hard-coded. Each line can be of the "
+"form: servicename[-protocol]:hostname1,hostname2,... where “servicename” is "
+"the actual service name; the “-protocol” is optional, and if written, then "
+"the service can be used only if both “protocol” and “hostnameX” match; the "
+"“hostnameX” is the actual host name to compare with, case insensitively. "
+"Each line can contain multiple values, separated by comma. There can be "
+"provided multiple lines for one OAuth2 service. Note that the actual URL "
+"where the token is requested and refreshed cannot be changed here, the "
+"hostname is to allow other servers, where the OAuth2 service can be used. "
+"Examples: Company:mail.company.com — enables “Company” OAuth2 authentication "
+"for “mail.company.com” host Company-CalDAV:caldav.company.com — enables "
+"“Company” OAuth2 authentication for any “CalDAV” source, which reads data "
+"from “caldav.company.com” host"
+msgstr ""
+"Пользователи могут расширить список поддерживаемых протоколов и имен хостов "
+"для определенных сервисов OAuth2 в дополнение к жестко заданным. Каждая "
+"строка может иметь вид: servicename[-protocol]:hostname1,hostname2,..., где "
+"\"servicename\" - фактическое имя сервиса; \"-protocol\" необязателен, и "
+"если он вписан, то сервис может быть использован, только если совпадают "
+"\"protocol\" и \"hostnameX\"; \"hostnameX\" - фактическое имя хоста для "
+"сравнения, без учета регистра. Каждая строка может содержать несколько "
+"значений, разделенных запятой. Для одного сервиса OAuth2 может быть "
+"предусмотрено несколько строк. Обратите внимание, что фактический URL, по "
+"которому запрашивается и обновляется токен, не может быть изменен здесь, имя "
+"хоста служит для того, чтобы разрешить другим серверам, где может "
+"использоваться сервис OAuth2. Примеры: Company:mail.company.com - включает "
+"OAuth2 аутентификацию \"Company\" для хоста \"mail.company.com\" Company-"
+"CalDAV:caldav.company.com - включает OAuth2 аутентификацию \"Company\" для "
+"любого источника \"CalDAV\", который читает данные с хоста \"caldav.company."
+"com\""
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:16
+msgid ""
+"An OAuth2 client ID to use to connect to Google servers, instead of the one "
+"provided during build time"
+msgstr ""
+"Идентификатор клиента OAuth2 для подключения к серверам Google, а не тот, "
+"который предоставляется во время сборки"
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:17
+msgid ""
+"User-specified OAuth2 client ID for Google servers. Empty string means to "
+"use the one provided during build time. Change of this requires restart."
+msgstr ""
+"Указанный пользователем идентификатор клиента OAuth2 для серверов Google. "
+"Пустая строка означает использование того, который был предоставлен во время "
+"сборки. Для его изменения требуется перезапуск."
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:18
+msgid ""
+"An OAuth2 client secret to use to connect to Google servers, instead of the "
+"one provided during build time"
+msgstr ""
+"Секрет клиента OAuth2, используемый для подключения к серверам Google, "
+"вместо того, который предоставляется во время сборки"
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:19
+msgid ""
+"User-specified OAuth2 client secret for Google servers. Empty string means "
+"to use the one provided during build time. Change of this requires restart."
+msgstr ""
+"Указанный пользователем секрет клиента OAuth2 для серверов Google. Пустая "
+"строка означает использование той, которая была предоставлена во время "
+"сборки. Изменение этого параметра требует перезапуска."
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:20
+msgid ""
+"An OAuth2 client ID to use to connect to Outlook servers, instead of the one "
+"provided during build time"
+msgstr ""
+"Идентификатор клиента OAuth2 для подключения к серверам Outlook, а не тот, "
+"который предоставляется во время сборки"
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:21
+msgid ""
+"User-specified OAuth2 client ID for Outlook servers. Empty string means to "
+"use the one provided during build time. Change of this requires restart."
+msgstr ""
+"Указанный пользователем идентификатор клиента OAuth2 для серверов Outlook. "
+"Пустая строка означает использование того, который был предоставлен во время "
+"сборки. Для его изменения требуется перезапуск."
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:22
+msgid ""
+"An OAuth2 client secret to use to connect to Outlook servers, instead of the "
+"one provided during build time"
+msgstr ""
+"Секрет клиента OAuth2 для подключения к серверам Outlook, а не тот, который "
+"предоставляется во время сборки"
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:23
+msgid ""
+"User-specified OAuth2 client secret for Outlook servers. Empty string means "
+"to use the one provided during build time. Change of this requires restart."
 msgstr ""
-"Например: «/usr/bin/gpg»; если не заполнено, или не существует, то это "
-"ищется. Изменение требует перезапуск приложения."
+"Указанный пользователем секрет клиента OAuth2 для серверов Outlook. Пустая "
+"строка означает использование той, которая была предоставлена во время "
+"сборки. Изменение этого параметра требует перезапуска."
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:24
+msgid ""
+"An OAuth2 client ID to use to connect to Yahoo! servers, instead of the one "
+"provided during build time"
+msgstr ""
+"Идентификатор клиента OAuth2, который будет использоваться для подключения к "
+"серверам Yahoo! вместо того, который предоставляется во время сборки"
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:25
+msgid ""
+"User-specified OAuth2 client ID for Yahoo! servers. Empty string means to "
+"use the one provided during build time. Change of this requires restart."
+msgstr ""
+"Указанный пользователем идентификатор клиента OAuth2 для серверов Yahoo! "
+"Пустая строка означает использование того, который был предоставлен во время "
+"сборки. Изменение этого параметра требует перезапуска."
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:26
+msgid ""
+"An OAuth2 client secret to use to connect to Yahoo! servers, instead of the "
+"one provided during build time"
+msgstr ""
+"Секрет клиента OAuth2, который будет использоваться для подключения к "
+"серверам Yahoo! вместо того, который предоставляется во время сборки"
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:27
+msgid ""
+"User-specified OAuth2 client secret for Yahoo! servers. Empty string means "
+"to use the one provided during build time. Change of this requires restart."
+msgstr ""
+"Указанный пользователем секрет клиента OAuth2 для серверов Yahoo! Пустая "
+"строка означает использование той, которая была предоставлена во время "
+"сборки. Изменение этого параметра требует перезапуска."
 
 #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
 msgid "(Deprecated) Proxy type to use"
@@ -4888,12 +6270,12 @@ msgstr "(Устарело) Тип прокси"
 #: ../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 "
+"settings are now integrated into Evolution-Data-Server’s account system. See "
 "the ESourceProxy API documentation for details."
 msgstr ""
-"Этот ключ устарел в версии 3.12 и больше не должен использоваться. Параметры "
-"прокси-сервера теперь интегрированы в систему учётных записей Evolution-Data-"
-"Server. Подробнее см. документацию по API ESourceProxy."
+"Этот ключ был устаревшим в версии 3.12 и больше не должен использоваться. "
+"Настройки прокси теперь интегрированы в систему учетных записей Evolution-"
+"Data-Server. Подробности смотрите в документации по API ESourceProxy."
 
 #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
 msgid "(Deprecated) Whether to use http-proxy"
@@ -4943,285 +6325,433 @@ msgstr "(Устарело) Номер порта для запросов SOCKS"
 msgid "(Deprecated) Automatic proxy configuration URL"
 msgstr "(Устарело) URL автоматической настройки прокси"
 
-#: ../libebackend/e-collection-backend.c:976
+#: ../data/org.gnome.Evolution-alarm-notify.desktop.in.in.h:1
+msgid "Evolution Alarm Notify"
+msgstr "Нотификации Evolution"
+
+#: ../data/org.gnome.Evolution-alarm-notify.desktop.in.in.h:2
+msgid "Calendar event notifications"
+msgstr "Уведомления о событиях календаря"
+
+#: ../src/libebackend/e-cache.c:751
+msgid "Out of memory"
+msgstr "Недостаточно памяти"
+
+#: ../src/libebackend/e-cache.c:943
+#, c-format
+msgid "Can not make parent directory: %s"
+msgstr "Не удается создать родительский каталог: %s"
+
+#: ../src/libebackend/e-collection-backend.c:1111
 #, c-format
 msgid "%s does not support creating remote resources"
 msgstr "%s не поддерживает создание удалённых ресурсов"
 
-#: ../libebackend/e-collection-backend.c:1035
+#: ../src/libebackend/e-collection-backend.c:1170
 #, c-format
 msgid "%s does not support deleting remote resources"
 msgstr "%s не поддерживает удаление удалённых ресурсов"
 
-#: ../libebackend/e-data-factory.c:1294
+#: ../src/libebackend/e-data-factory.c:1441
+#: ../src/libebackend/e-subprocess-factory.c:288
 #, c-format
-msgid "Backend factory for source '%s' and extension '%s' cannot be found."
+msgid "No such source for UID “%s”"
+msgstr "Нет такого источника для UID «%s»"
+
+#: ../src/libebackend/e-data-factory.c:1596
+#, c-format
+msgid "Backend factory for source “%s” and extension “%s” cannot be found."
 msgstr ""
-"Не удалось найти драйвер для создания для источника «%s» и расширения «%s»"
+"Фабрика сервиса для источника «%s» и расширения «%s» не может быть найдена."
 
-#: ../libebackend/e-server-side-source.c:141
+#: ../src/libebackend/e-server-side-source.c:139
 #, c-format
 msgid "Data source is missing a [%s] group"
 msgstr "В источнике данных нет группы [%s]"
 
-#: ../libebackend/e-server-side-source.c:466
+#: ../src/libebackend/e-server-side-source.c:467
 msgid "Failed to lookup credentials: "
 msgstr "Не удалось найти учётные данные: "
 
-#: ../libebackend/e-server-side-source.c:1391
-#: ../libedataserver/e-source.c:1595
+#: ../src/libebackend/e-server-side-source.c:1389
+#: ../src/libedataserver/e-source.c:1584
 #, c-format
-msgid "Data source '%s' does not support creating remote resources"
+msgid "Data source “%s” does not support creating remote resources"
 msgstr "Источник данных «%s» не поддерживает создание удалённых ресурсов"
 
-#: ../libebackend/e-server-side-source.c:1405
+#: ../src/libebackend/e-server-side-source.c:1403
 #, c-format
 msgid ""
-"Data source '%s' has no collection backend to create the remote resource"
+"Data source “%s” has no collection backend to create the remote resource"
 msgstr "У источника данных «%s» нет бэкэнда для создания удалённого ресурса"
 
-#: ../libebackend/e-server-side-source.c:1433
-#: ../libedataserver/e-source.c:1708
+#: ../src/libebackend/e-server-side-source.c:1431
+#: ../src/libedataserver/e-source.c:1697
 #, c-format
-msgid "Data source '%s' does not support deleting remote resources"
+msgid "Data source “%s” does not support deleting remote resources"
 msgstr "Источник данных «%s» не поддерживает удаление удалённых ресурсов"
 
-#: ../libebackend/e-server-side-source.c:1447
+#: ../src/libebackend/e-server-side-source.c:1445
 #, c-format
 msgid ""
-"Data source '%s' has no collection backend to delete the remote resource"
+"Data source “%s” has no collection backend to delete the remote resource"
 msgstr "У источника данных «%s» нет бэкэнда для удаления удалённого ресурса"
 
-#: ../libebackend/e-server-side-source.c:1478
-#: ../libedataserver/e-source.c:1804
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1079
+#: ../src/libebackend/e-server-side-source.c:1484
+#: ../src/libebackend/e-source-registry-server.c:1038
+#: ../src/libedataserver/e-source.c:1826
 #, c-format
-msgid "Data source '%s' does not support OAuth 2.0 authentication"
+msgid "Data source “%s” does not support OAuth 2.0 authentication"
 msgstr "Источник данных «%s» не поддерживает аутентификацию OAuth 2.0"
 
-#: ../libebackend/e-server-side-source.c:1856
+#: ../src/libebackend/e-server-side-source.c:1867
 #, c-format
-msgid "File must have a '.source' extension"
+msgid "File must have a “.source” extension"
 msgstr "Файл должен иметь расширение «.source»"
 
-#: ../libebackend/e-source-registry-server.c:319
+#: ../src/libebackend/e-source-registry-server.c:319
 #, c-format
-msgid "UID '%s' is already in use"
+msgid "UID “%s” is already in use"
 msgstr "UID «%s» уже используется"
 
-#: ../libebackend/e-subprocess-factory.c:285
+#: ../src/libebackend/e-source-registry-server.c:444
 #, c-format
-msgid "No such source for UID '%s'"
-msgstr "Нет такого источника для UID «%s»"
+msgid "Cannot find corresponding collection backend for source “%s”"
+msgstr "Невозможно найти соответствующий бэкенд коллекции для источника «%s»"
+
+#: ../src/libebackend/e-source-registry-server.c:448
+#, c-format
+msgid "Source “%s” is not a collection source"
+msgstr "Источник «%s» не является источником коллекции"
+
+#: ../src/libebackend/e-source-registry-server.c:454
+#, c-format
+msgid "Cannot find source “%s”"
+msgstr "Невозможно найти источник «%s»"
+
+#: ../src/libebackend/e-subprocess-factory.c:276
+#, c-format
+msgid "Module “%s” for source UID “%s” cannot be loaded"
+msgstr "Модуль «%s» для UID источника «%s» не может быть загружен"
+
+#: ../src/libebackend/e-subprocess-factory.c:297
+#, c-format
+msgid "Failed to create backend of type “%s” for source UID “%s”"
+msgstr "Не удалось создать бэкэнд типа «%s» для UID источника «%s»"
 
-#: ../libebackend/e-user-prompter-server.c:305
+#: ../src/libebackend/e-user-prompter-server.c:301
 #, c-format
-msgid "Extension dialog '%s' not found."
+msgid "Extension dialog “%s” not found."
 msgstr "Диалоговое окно расширений «%s» не найдено."
 
-#: ../libedataserver/e-categories.c:49
+#: ../src/libedataserver/e-categories.c:47
 msgctxt "CategoryName"
 msgid "Anniversary"
 msgstr "Годовщина"
 
-#: ../libedataserver/e-categories.c:50
+#: ../src/libedataserver/e-categories.c:48
 msgctxt "CategoryName"
 msgid "Birthday"
 msgstr "День рождения"
 
-#: ../libedataserver/e-categories.c:51
+#: ../src/libedataserver/e-categories.c:49
 msgctxt "CategoryName"
 msgid "Business"
 msgstr "Бизнес"
 
-#: ../libedataserver/e-categories.c:52
+#: ../src/libedataserver/e-categories.c:50
 msgctxt "CategoryName"
 msgid "Competition"
 msgstr "Конкуренция"
 
-#: ../libedataserver/e-categories.c:53
+#: ../src/libedataserver/e-categories.c:51
 msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "Избранные"
 
-#: ../libedataserver/e-categories.c:54
+#: ../src/libedataserver/e-categories.c:52
 msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "Подарки"
 
-#: ../libedataserver/e-categories.c:55
+#: ../src/libedataserver/e-categories.c:53
 msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "Цели и задачи"
 
-#: ../libedataserver/e-categories.c:56
+#: ../src/libedataserver/e-categories.c:54
 msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "Праздник (выходной)"
 
-#: ../libedataserver/e-categories.c:57
+#: ../src/libedataserver/e-categories.c:55
 msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "Поздравительные открытки"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:59
+#: ../src/libedataserver/e-categories.c:57
 msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "Важные контакты"
 
-#: ../libedataserver/e-categories.c:60
+#: ../src/libedataserver/e-categories.c:58
 msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "Идеи"
 
-#: ../libedataserver/e-categories.c:61
+#: ../src/libedataserver/e-categories.c:59
 msgctxt "CategoryName"
 msgid "International"
 msgstr "Международные"
 
-#: ../libedataserver/e-categories.c:62
+#: ../src/libedataserver/e-categories.c:60
 msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "Ключевой потребитель"
 
-#: ../libedataserver/e-categories.c:63
+#: ../src/libedataserver/e-categories.c:61
 msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "Разное"
 
-#: ../libedataserver/e-categories.c:64
+#: ../src/libedataserver/e-categories.c:62
 msgctxt "CategoryName"
 msgid "Personal"
 msgstr "Личное"
 
-#: ../libedataserver/e-categories.c:65
+#: ../src/libedataserver/e-categories.c:63
 msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "Телефонные звонки"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:67
+#: ../src/libedataserver/e-categories.c:65
 msgctxt "CategoryName"
 msgid "Status"
 msgstr "Состояние"
 
-#: ../libedataserver/e-categories.c:68
+#: ../src/libedataserver/e-categories.c:66
 msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "Стратегии"
 
-#: ../libedataserver/e-categories.c:69
+#: ../src/libedataserver/e-categories.c:67
 msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "Поставщики"
 
-#: ../libedataserver/e-categories.c:70
+#: ../src/libedataserver/e-categories.c:68
 msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "Время и расходы"
 
-#: ../libedataserver/e-categories.c:71
+#: ../src/libedataserver/e-categories.c:69
 msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:72
+#: ../src/libedataserver/e-categories.c:70
 msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "Ожидание"
 
-#: ../libedataserver/e-client.c:146
+#: ../src/libedataserver/e-client.c:137
+msgid "Backend is busy"
+msgstr "Драйвер занят"
+
+#: ../src/libedataserver/e-client.c:139
 msgid "Source not loaded"
 msgstr "Источник не загружен"
 
-#: ../libedataserver/e-client.c:148
+#: ../src/libedataserver/e-client.c:141
 msgid "Source already loaded"
 msgstr "Источник уже загружен"
 
+#: ../src/libedataserver/e-client.c:143
+msgid "Authentication failed"
+msgstr "Сбой проверки подлинности"
+
+#: ../src/libedataserver/e-client.c:147
+msgid "Repository offline"
+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:159
+#: ../src/libedataserver/e-client.c:152
 msgid "Offline unavailable"
 msgstr "Режим «вне сети» недоступен"
 
-#: ../libedataserver/e-client.c:181
+#: ../src/libedataserver/e-client.c:154
+msgid "Permission denied"
+msgstr "Доступ запрещён"
+
+#: ../src/libedataserver/e-client.c:158
+msgid "Could not cancel"
+msgstr "Не удалось отменить"
+
+#: ../src/libedataserver/e-client.c:160
+msgid "Not supported"
+msgstr "Не поддерживается"
+
+#: ../src/libedataserver/e-client.c:162
+msgid "Unsupported authentication method"
+msgstr "Неподдерживаемый метод аутентификации"
+
+#: ../src/libedataserver/e-client.c:164
+msgid "TLS not available"
+msgstr "TLS недоступен"
+
+#: ../src/libedataserver/e-client.c:166
+msgid "Search size limit exceeded"
+msgstr "Превышено ограничение на размер результатов поиска"
+
+#: ../src/libedataserver/e-client.c:168
+msgid "Search time limit exceeded"
+msgstr "Превышено ограничение на время поиска"
+
+#: ../src/libedataserver/e-client.c:172
+msgid "Query refused"
+msgstr "Запрос отклонён"
+
+#: ../src/libedataserver/e-client.c:174
 msgid "D-Bus error"
 msgstr "Ошибка D-Bus"
 
-#: ../libedataserver/e-client.c:2023
+#: ../src/libedataserver/e-client.c:176
+msgid "Other error"
+msgstr "Другая ошибка"
+
+#: ../src/libedataserver/e-client.c:178
+msgid "Backend is not opened yet"
+msgstr "Драйвер ещё не открыт"
+
+#: ../src/libedataserver/e-client.c:180
+msgid "Object is out of sync"
+msgstr "Объект рассинхронизирован"
+
+#: ../src/libedataserver/e-client.c:2037
 msgid "Timeout was reached"
 msgstr "Время ожидания превышено"
 
-#: ../libedataserver/e-source.c:771
+#: ../src/libedataserver/e-oauth2-service.c:919
+msgid "Malformed, no message body set"
+msgstr "Неправильно сформировано, тело сообщения не установлено"
+
+#. Translators: The first %s is a display name of the source, the second is its UID and
+#. the third is the name of the OAuth service.
+#: ../src/libedataserver/e-oauth2-service.c:1203
+#, c-format
+msgid "Source “%s” (%s) is not valid for “%s” OAuth2 service"
+msgstr "Источник «%s» (%s) не действителен для «%s» сервиса OAuth2"
+
+#: ../src/libedataserver/e-oauth2-service.c:1218
+msgid "OAuth2 secret not found"
+msgstr "Секрет OAuth2 не найден"
+
+#: ../src/libedataserver/e-oauth2-service.c:1413
+#, c-format
+msgid "Received incorrect response from server “%s”."
+msgstr "Получен неверный ответ от сервера «%s»."
+
+#: ../src/libedataserver/e-oauth2-service.c:1422
+msgid "Failed to refresh access token. Sign to the server again, please."
+msgstr ""
+"Не удалось обновить маркер доступа. Повторите вход на сервер, пожалуйста."
+
+#. Translators: The first %s is a display name of the source, the second is its UID.
+#: ../src/libedataserver/e-oauth2-service.c:1464
+#, c-format
+msgid "Source “%s” (%s) is not a valid OAuth2 source"
+msgstr "Источник «%s» (%s) не является действительным источником OAuth2"
+
+#: ../src/libedataserver/e-oauth2-service.c:1538
+msgid ""
+"The access token is expired and it failed to refresh it. Sign to the server "
+"again, please."
+msgstr ""
+"Срок действия маркера доступа истек, и обновить его не удалось. Войдите на "
+"сервер снова, пожалуйста."
+
+#. Translators: This is a user-visible string, display name of an OAuth2 service.
+#: ../src/libedataserver/e-oauth2-service-google.c:56
+msgctxt "OAuth2Service"
+msgid "Google"
+msgstr "Google"
+
+#. Translators: This is a user-visible string, display name of an OAuth2 service.
+#: ../src/libedataserver/e-oauth2-service-outlook.c:57
+msgctxt "OAuth2Service"
+msgid "Outlook"
+msgstr "Outlook"
+
+#. Translators: This is a user-visible string, display name of an OAuth2 service.
+#: ../src/libedataserver/e-oauth2-service-yahoo.c:53
+msgctxt "OAuth2Service"
+msgid "Yahoo!"
+msgstr "Yahoo!"
+
+#: ../src/libedataserver/e-soup-session.c:958
+msgid "Operation was cancelled"
+msgstr "Операция отменена"
+
+#: ../src/libedataserver/e-soup-session.c:964
+#, c-format
+msgid "Failed with HTTP error %d: %s"
+msgstr "Отказ с ошибкой HTTP %d: %s"
+
+#: ../src/libedataserver/e-source.c:771
 #, c-format
 msgid "Source file is missing a [%s] group"
 msgstr "В исходном файле отсутствует группа [%s]"
 
-#: ../libedataserver/e-source.c:1375
+#: ../src/libedataserver/e-source.c:1364
 #, c-format
-msgid "Data source '%s' is not removable"
+msgid "Data source “%s” is not removable"
 msgstr "Источник данных «%s» нельзя удалить"
 
-#: ../libedataserver/e-source.c:1498
+#: ../src/libedataserver/e-source.c:1487
 #, c-format
-msgid "Data source '%s' is not writable"
-msgstr "Источник данных «%s» нельзя изменить"
+msgid "Data source “%s” is not writable"
+msgstr "Источник данных «%s» не доступен для записи"
 
-#: ../libedataserver/e-source.c:2194
+#: ../src/libedataserver/e-source.c:2227
 msgid "Unnamed"
 msgstr "Безымянный"
 
-#: ../libedataserver/e-source-credentials-provider-impl.c:41
+#: ../src/libedataserver/e-source-credentials-provider-impl.c:39
 msgid "Credentials lookup is not supported"
 msgstr "Поиск учётных данных не поддерживается"
 
-#: ../libedataserver/e-source-credentials-provider-impl.c:54
+#: ../src/libedataserver/e-source-credentials-provider-impl.c:52
 msgid "Credentials store is not supported"
 msgstr "Сохранение учётных данных не поддерживается"
 
-#: ../libedataserver/e-source-credentials-provider-impl.c:65
+#: ../src/libedataserver/e-source-credentials-provider-impl.c:63
 msgid "Credentials delete is not supported"
 msgstr "Удаление учётных данных не поддерживается"
 
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:114
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:169
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:208
-msgid "Google authentication is not supported"
-msgstr "Аутентификация Google не поддерживается"
-
-#. Translators: The first %s is a display name of the source, the second is its UID.
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:121
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:176
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:215
-#, c-format
-msgid "Source '%s' (%s) is not a valid Google source"
-msgstr "Источник «%s» (%s) не является действительным источником Google"
-
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:135
-msgid "Google secret not found"
-msgstr "Секретный ключ Google не найден"
-
-#: ../libedataserver/e-source-credentials-provider-impl-password.c:81
+#: ../src/libedataserver/e-source-credentials-provider-impl-password.c:79
 msgid "Password not found"
 msgstr "Пароль не найден"
 
-#: ../libedataserver/e-source-mail-signature.c:481
+#: ../src/libedataserver/e-source-mail-signature.c:473
 #, c-format
 msgid "Signature script must be a local file"
 msgstr "Сценарий подписи должен быть локальным файлом"
 
-#: ../libedataserver/e-source-proxy.c:1641
+#: ../src/libedataserver/e-source-proxy.c:1650
 #, c-format
-msgid "Source '%s' does not support proxy lookups"
+msgid "Source “%s” does not support proxy lookups"
 msgstr "Источник «%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:1692 ../libedataserver/e-time-utils.c:1991
+#: ../src/libedataserver/e-time-utils.c:1691
+#: ../src/libedataserver/e-time-utils.c:1990
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%A, %d.%m.%Y, %I:%M:%S %p"
 
@@ -5229,7 +6759,8 @@ msgstr "%A, %d.%m.%Y, %I:%M:%S %p"
 #. * in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1982
+#: ../src/libedataserver/e-time-utils.c:1696
+#: ../src/libedataserver/e-time-utils.c:1981
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%A, %d.%m.%Y, %H:%M:%S"
 
@@ -5237,7 +6768,8 @@ msgstr "%A, %d.%m.%Y, %H:%M:%S"
 #. * in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1702 ../libedataserver/e-time-utils.c:1987
+#: ../src/libedataserver/e-time-utils.c:1701
+#: ../src/libedataserver/e-time-utils.c:1986
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%A, %d.%m.%Y, %I:%M %p"
 
@@ -5245,78 +6777,83 @@ 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:1707 ../libedataserver/e-time-utils.c:1978
+#: ../src/libedataserver/e-time-utils.c:1706
+#: ../src/libedataserver/e-time-utils.c:1977
 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:1712
+#: ../src/libedataserver/e-time-utils.c:1711
 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:1717
+#: ../src/libedataserver/e-time-utils.c:1716
 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:1720 ../libedataserver/e-time-utils.c:1840
-#: ../libedataserver/e-time-utils.c:1973
+#: ../src/libedataserver/e-time-utils.c:1719
+#: ../src/libedataserver/e-time-utils.c:1839
+#: ../src/libedataserver/e-time-utils.c:1972
 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:1727
+#: ../src/libedataserver/e-time-utils.c:1726
 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:1731
+#: ../src/libedataserver/e-time-utils.c:1730
 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:1736
+#: ../src/libedataserver/e-time-utils.c:1735
 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:1741
+#: ../src/libedataserver/e-time-utils.c:1740
 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:1746
+#: ../src/libedataserver/e-time-utils.c:1745
 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:1751
+#: ../src/libedataserver/e-time-utils.c:1750
 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:1754 ../libedataserver/e-time-utils.c:1843
+#: ../src/libedataserver/e-time-utils.c:1753
+#: ../src/libedataserver/e-time-utils.c:1842
 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:1914 ../libedataserver/e-time-utils.c:2035
+#: ../src/libedataserver/e-time-utils.c:1913
+#: ../src/libedataserver/e-time-utils.c:2034
 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:1918 ../libedataserver/e-time-utils.c:2027
+#: ../src/libedataserver/e-time-utils.c:1917
+#: ../src/libedataserver/e-time-utils.c:2026
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -5324,567 +6861,1351 @@ msgstr "%H:%M:%S"
 #. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1923 ../libedataserver/e-time-utils.c:2032
+#: ../src/libedataserver/e-time-utils.c:1922
+#: ../src/libedataserver/e-time-utils.c:2031
 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:1927 ../libedataserver/e-time-utils.c:2024
+#: ../src/libedataserver/e-time-utils.c:1926
+#: ../src/libedataserver/e-time-utils.c:2023
 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:1931
+#: ../src/libedataserver/e-time-utils.c:1930
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1935
+#: ../src/libedataserver/e-time-utils.c:1934
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserver/e-webdav-discover.c:484
-#: ../libedataserver/e-webdav-discover.c:493
+#: ../src/libedataserver/e-webdav-discover.c:295
+msgid "Notes"
+msgstr "Примечания"
+
+#: ../src/libedataserver/e-webdav-session.c:731
+msgid "Cannot determine destination URL without WebDAV extension"
+msgstr "Невозможно определить URL-адрес назначения без расширения WebDAV"
+
+#: ../src/libedataserver/e-webdav-session.c:1001
 #, c-format
-msgid "HTTP Error: %s"
-msgstr "Ошибка HTTP: %s"
+msgid ""
+"The server responded with an HTML page, which can mean there’s an error on "
+"the server or with the client request. The used URI was: %s"
+msgstr ""
+"Сервер ответил HTML-страницей, что может означать ошибку на сервере или в "
+"запросе клиента. Использованный URI был: %s"
+
+#: ../src/libedataserver/e-webdav-session.c:1003
+#, c-format
+msgid ""
+"The server responded with an HTML page, which can mean there’s an error on "
+"the server or with the client request."
+msgstr ""
+"Сервер ответил HTML-страницей, что может означать ошибку на сервере или в "
+"запросе клиента."
+
+#. Translators: The first '%s' is replaced with error prefix, as provided
+#. by the caller, which can be in a form: "Failed with something".
+#. The '%d' is replaced with actual HTTP status code.
+#. The second '%s' is replaced with a reason phrase of the error (user readable text).
+#. The last '%s' is replaced with detailed error text, as returned by the server.
+#: ../src/libedataserver/e-webdav-session.c:1024
+#, c-format
+msgid "%s: HTTP error code %d (%s): %s"
+msgstr "%s: Код ошибки HTTP %d (%s): %s"
+
+#. Translators: The '%d' is replaced with actual HTTP status code.
+#. The '%s' is replaced with a reason phrase of the error (user readable text).
+#. The last '%s' is replaced with detailed error text, as returned by the server.
+#: ../src/libedataserver/e-webdav-session.c:1032
+#, c-format
+msgid "Failed with HTTP error code %d (%s): %s"
+msgstr "Сбой с кодом ошибки HTTP %d (%s): %s"
+
+#. Translators: The first '%s' is replaced with error prefix, as provided
+#. by the caller, which can be in a form: "Failed with something".
+#. The '%d' is replaced with actual HTTP status code.
+#. The second '%s' is replaced with a reason phrase of the error (user readable text).
+#: ../src/libedataserver/e-webdav-session.c:1047
+#, c-format
+msgid "%s: HTTP error code %d (%s)"
+msgstr "%s: Код ошибки HTTP %d (%s)"
+
+#. Translators: The '%d' is replaced with actual HTTP status code.
+#. The '%s' is replaced with a reason phrase of the error (user readable text).
+#: ../src/libedataserver/e-webdav-session.c:1053
+#, c-format
+msgid "Failed with HTTP error code %d (%s)"
+msgstr "Отказ с кодом ошибки HTTP %d (%s)"
+
+#: ../src/libedataserver/e-webdav-session.c:1348
+msgid "Failed to post data"
+msgstr "Не удалось разместить данные"
+
+#: ../src/libedataserver/e-webdav-session.c:1479
+#: ../src/libedataserver/e-webdav-session.c:1556
+#: ../src/libedataserver/e-webdav-session.c:1658
+#: ../src/libedataserver/e-webdav-session.c:2911
+#: ../src/libedataserver/e-webdav-session.c:4184
+msgid "Failed to get input XML content"
+msgstr "Не удалось получить входное XML-содержимое"
+
+#: ../src/libedataserver/e-webdav-session.c:1490
+msgid "Failed to get properties"
+msgstr "Не удалось получить свойства"
 
-#: ../libedataserver/e-webdav-discover.c:523
-msgid "Could not parse response"
-msgstr "Не удалось разобрать ответ"
+#: ../src/libedataserver/e-webdav-session.c:1566
+msgid "Failed to update properties"
+msgstr "Не удалось обновить свойства"
 
-#: ../libedataserver/e-webdav-discover.c:532
-msgid "Empty response"
-msgstr "Пустой ответ"
+#: ../src/libedataserver/e-webdav-session.c:1668
+msgid "Failed to issue REPORT"
+msgstr "Не удалось выпустить отчет"
 
-#: ../libedataserver/e-webdav-discover.c:540
-msgid "Unexpected reply from server"
-msgstr "Неожиданный ответ от сервера"
+#: ../src/libedataserver/e-webdav-session.c:1729
+msgid "Failed to create collection"
+msgstr "Не удалось создать коллекцию"
 
-#: ../libedataserverui/e-credentials-prompter.c:260
-#: ../libedataserverui/e-credentials-prompter.c:1563
-#: ../libedataserverui/e-credentials-prompter.c:1607
+#: ../src/libedataserver/e-webdav-session.c:1822
+#: ../src/libedataserver/e-webdav-session.c:1983
+msgid "Failed to get XML request content"
+msgstr "Не удалось получить содержимое XML-запроса"
+
+#: ../src/libedataserver/e-webdav-session.c:1834
+msgid "Failed to create address book"
+msgstr "Не удалось создать адресную книгу"
+
+#: ../src/libedataserver/e-webdav-session.c:1996
+msgid "Failed to create calendar"
+msgstr "Не удалось создать календарь"
+
+#: ../src/libedataserver/e-webdav-session.c:2124
+#: ../src/libedataserver/e-webdav-session.c:2135
+msgid "Failed to read resource"
+msgstr "Не удалось прочитать ресурс"
+
+#: ../src/libedataserver/e-webdav-session.c:2275
+msgid "Cannot rewind input stream: Not supported"
+msgstr "Невозможно перемотать входной поток: Не поддерживается"
+
+#: ../src/libedataserver/e-webdav-session.c:2439
+#: ../src/libedataserver/e-webdav-session.c:2580
+msgid "Failed to put data"
+msgstr "Не удалось разместить данные"
+
+#: ../src/libedataserver/e-webdav-session.c:2453
+#: ../src/libedataserver/e-webdav-session.c:2588
+#, c-format
+msgid "Failed to put data to server, error code %d (%s)"
+msgstr "Не удалось передать данные на сервер, код ошибки %d (%s)"
+
+#: ../src/libedataserver/e-webdav-session.c:2682
+msgid "Failed to delete resource"
+msgstr "Не удалось удалить ресурс"
+
+#: ../src/libedataserver/e-webdav-session.c:2751
+msgid "Failed to copy resource"
+msgstr "Не удалось скопировать ресурс"
+
+#: ../src/libedataserver/e-webdav-session.c:2815
+msgid "Failed to move resource"
+msgstr "Не удалось переместить ресурс"
+
+#: ../src/libedataserver/e-webdav-session.c:2922
+msgid "Failed to lock resource"
+msgstr "Не удалось заблокировать ресурс"
+
+#: ../src/libedataserver/e-webdav-session.c:2936
+#: ../src/libedataserver/e-webdav-session.c:3144
+msgid "Expected application/xml response, but none returned"
+msgstr "Ожидался ответ в формате application/xml, но он не был получен"
+
+#: ../src/libedataserver/e-webdav-session.c:2939
+#: ../src/libedataserver/e-webdav-session.c:3147
+#, c-format
+msgid "Expected application/xml response, but %s returned"
+msgstr "Ожидался ответ application/xml, но было получено %s"
+
+#: ../src/libedataserver/e-webdav-session.c:2951
+#: ../src/libedataserver/e-webdav-session.c:3160
+msgid "Failed to parse XML data"
+msgstr "Не удалось разобрать данные XML"
+
+#: ../src/libedataserver/e-webdav-session.c:3032
+msgid "Failed to refresh lock"
+msgstr "Не удалось обновить блокировку"
+
+#: ../src/libedataserver/e-webdav-session.c:3093
+msgid "Failed to unlock"
+msgstr "Не удалось разблокировать"
+
+#: ../src/libedataserver/e-webdav-session.c:3132
+#, c-format
+msgid "Expected multistatus response, but %d returned (%s)"
+msgstr "Ожидался мультистатусный ответ, но %d возвращается (%s)"
+
+#: ../src/libedataserver/e-webdav-session.c:3169
+msgid "XML data does not have root node"
+msgstr "XML-данные не имеют корневого узла"
+
+#: ../src/libedataserver/e-webdav-session.c:3192
+#, c-format
+msgid "XML data doesn't have required structure (%s)"
+msgstr "XML-данные не имеют требуемой структуры (%s)"
+
+#: ../src/libedataserver/e-webdav-session.c:4194
+msgid "Failed to get access control list"
+msgstr "Не удалось получить список управления доступом"
+
+#: ../src/libedataserver/e-webdav-session.c:4878
+msgid "Cannot store protected nor inherited Access Control Entry."
+msgstr ""
+"Невозможно хранить защищенные или унаследованные записи контроля доступа."
+
+#: ../src/libedataserver/e-webdav-session.c:4885
+msgid "Provided invalid principal kind for Access Control Entry."
+msgstr "Предоставляется недействительный основной вид для контроля доступа."
+
+#: ../src/libedataserver/e-webdav-session.c:4892
+msgid "Cannot store property-based Access Control Entry."
+msgstr "Невозможно сохранить запись контроля доступа на основе свойств."
+
+#: ../src/libedataserver/e-webdav-session.c:4899
+msgid "Access Control Entry can be only to Grant or Deny, but not None."
+msgstr ""
+"Ввод контроля доступа может быть только Разрешить или Запретить, но не Нет."
+
+#: ../src/libedataserver/e-webdav-session.c:4907
+msgid "Access Control Entry can be only to Grant or Deny, but not both."
+msgstr ""
+"Ввод контроля доступа может быть только Разрешить или Запретить, но не оба "
+"варианта."
+
+#: ../src/libedataserver/e-webdav-session.c:4966
+msgid "Access Control Entry privilege cannot be NULL."
+msgstr "Привилегия Access Control Entry не может быть NULL."
+
+#: ../src/libedataserverui/e-buffer-tagger.c:71
+msgid "Could not open the link."
+msgstr "Не удалось открыть ссылку."
+
+#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
+#: ../src/libedataserverui/e-buffer-tagger.c:548
+msgid "Ctrl-click to open a link"
+msgstr "Кликните с нажатым Ctrl, чтобы открыть ссылку"
+
+#: ../src/libedataserverui/e-buffer-tagger.c:810
+msgid "Copy _Link Location"
+msgstr "_Копировать ссылку"
+
+#: ../src/libedataserverui/e-buffer-tagger.c:817
+msgid "O_pen Link in Browser"
+msgstr "_Открыть сылку в браузере"
+
+#: ../src/libedataserverui/e-credentials-prompter.c:260
+#: ../src/libedataserverui/e-credentials-prompter.c:1753
+#: ../src/libedataserverui/e-credentials-prompter.c:1797
 msgid "Credentials prompt was cancelled"
 msgstr "Запрос учётных данных был отменён"
 
-#: ../libedataserverui/e-credentials-prompter.c:664
+#: ../src/libedataserverui/e-credentials-prompter.c:776
 #, c-format
-msgid "Source '%s' doesn't support prompt for credentials"
+msgid "Source “%s” doesn’t support prompt for credentials"
 msgstr "Источник «%s» не поддерживает запрос учётных данных"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:440
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:202
 #, c-format
-msgid "Failed to obtain access token from address '%s'. Error code %d (%s)"
-msgstr "Не удалось получить маркер доступа по адресу «%s». Код ошибки %d (%s)"
+msgid "Failed to obtain access token from address “%s”: %s"
+msgstr "Не удалось получить маркер доступа с адреса «%s»: %s"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:486
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:246
 msgid "Requesting access token, please wait..."
 msgstr "Запрашивается маркер доступа, подождите…"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:588
-msgid "Google Address book authentication request"
-msgstr "Запрос аутентификации адресной книги Google"
+#. Translators: The %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Google Address Book authentication request".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:472
+#, c-format
+msgid "%s Address Book authentication request"
+msgstr "%s Запрос на аутентификацию адресной книги"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:591
-msgid "Google Calendar authentication request"
-msgstr "Запрос аутентификации календаря Google"
+#. Translators: The %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Google Calendar authentication request".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:477
+#, c-format
+msgid "%s Calendar authentication request"
+msgstr "%s Запрос на аутентификацию календаря"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:594
-msgid "Google Memo List authentication request"
-msgstr "Запрос аутентификации списка заметок Google"
+#. Translators: The %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Google Memo List authentication request".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:482
+#, c-format
+msgid "%s Memo List authentication request"
+msgstr "%s Запрос на аутентификацию списка памяток"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:597
-msgid "Google Task List authentication request"
-msgstr "Запрос аутентификации списка задач Google"
+#. Translators: The %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Google Task List authentication request".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:487
+#, c-format
+msgid "%s Task List authentication request"
+msgstr "%s Запрос на аутентификацию списка задач"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:601
-msgid "Google Mail authentication request"
-msgstr "Запрос аутентификации почты Google"
+#. Translators: The %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Google Mail authentication request".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:493
+#, c-format
+msgid "%s Mail authentication request"
+msgstr "%s Запрос аутентификации почты"
 
 #. generic account prompt
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:604
-msgid "Google account authentication request"
-msgstr "Запрос аутентификации учётной записи Google"
+#. Translators: The %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Google account authentication request".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:498
+#, c-format
+msgid "%s account authentication request"
+msgstr "%s запрос аутентификации учетной записи"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:615
+#. Translators: The first %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Login to your Google account and...". The second %s is the actual source 
display name,
+#. like "On This Computer : Personal".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:512
 #, c-format
 msgid ""
-"Login to your Google account and accept conditions in order to access your "
-"address book \"%s\"."
+"Login to your %s account and accept conditions in order to access your "
+"address book “%s”."
 msgstr ""
-"Войдите в свою учётную запись Google и примите условия, чтобы получить "
-"доступ к своей адресной книге «%s»."
+"Войдите в свою учетную запись %s и примите условия, чтобы получить доступ к "
+"адресной книге «%s»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:619
+#. Translators: The first %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Login to your Google account and...". The second %s is the actual source 
display name,
+#. like "On This Computer : Personal".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:519
 #, c-format
 msgid ""
-"Login to your Google account and accept conditions in order to access your "
-"calendar \"%s\"."
+"Login to your %s account and accept conditions in order to access your "
+"calendar “%s”."
 msgstr ""
-"Войдите в свою учётную запись Google и примите условия, чтобы получить "
-"доступ к своему календарю «%s»."
+"Войдите в свою учетную запись %s и примите условия, чтобы получить доступ к "
+"календарю «%s»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:623
+#. Translators: The first %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Login to your Google account and...". The second %s is the actual source 
display name,
+#. like "On This Computer : Personal".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:526
 #, c-format
 msgid ""
-"Login to your Google account and accept conditions in order to access your "
-"mail account \"%s\"."
+"Login to your %s account and accept conditions in order to access your mail "
+"account “%s”."
 msgstr ""
-"Войдите в свою учётную запись Google и примите условия, чтобы получить "
-"доступ к своей учётной записи «%s» для электронной почты."
+"Войдите в свою учетную запись %s и примите условия, чтобы получить доступ к "
+"почтовому аккаунту «%s»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:627
+#. Translators: The first %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Login to your Google account and...". The second %s is the actual source 
display name,
+#. like "On This Computer : Personal".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:533
 #, c-format
 msgid ""
-"Login to your Google account and accept conditions in order to access your "
-"mail transport \"%s\"."
+"Login to your %s account and accept conditions in order to access your mail "
+"transport “%s”."
 msgstr ""
-"Войдите в свою учётную запись Google и примите условия, чтобы получить "
-"доступ к своему почтовому транспорту «%s»."
+"Войдите в свою учетную запись %s и примите условия, чтобы получить доступ к "
+"своему почтовому транспорту «%s»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:631
+#. Translators: The first %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Login to your Google account and...". The second %s is the actual source 
display name,
+#. like "On This Computer : Personal".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:540
 #, c-format
 msgid ""
-"Login to your Google account and accept conditions in order to access your "
-"memo list \"%s\"."
+"Login to your %s account and accept conditions in order to access your memo "
+"list “%s”."
 msgstr ""
-"Войдите в свою учётную запись Google и примите условия, чтобы получить "
-"доступ к своему списку заметок «%s»."
+"Войдите в свою учетную запись %s и примите условия, чтобы получить доступ к "
+"списку заметок «%s»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:635
+#. Translators: The first %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Login to your Google account and...". The second %s is the actual source 
display name,
+#. like "On This Computer : Personal".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:547
 #, c-format
 msgid ""
-"Login to your Google account and accept conditions in order to access your "
-"task list \"%s\"."
+"Login to your %s account and accept conditions in order to access your task "
+"list “%s”."
 msgstr ""
-"Войдите в свою учётную запись Google и примите условия, чтобы получить "
-"доступ к своему списку задач «%s»."
+"Войдите в свою учетную запись %s и примите условия, чтобы получить доступ к "
+"списку задач «%s»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:639
+#. Translators: The first %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Login to your Google account and...". The second %s is the actual source 
display name,
+#. like "On This Computer : Personal".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:554
 #, c-format
 msgid ""
-"Login to your Google account and accept conditions in order to access your "
-"account \"%s\"."
+"Login to your %s account and accept conditions in order to access your "
+"account “%s”."
 msgstr ""
-"Войдите в свою учётную запись Google и примите условия, чтобы получить "
-"доступ к своей учётной записи «%s»."
+"Войдите в свою учетную запись «%s» и примите условия, чтобы получить доступ "
+"к своей учетной записи «%s»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:683
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:232
-#: ../libedataserverui/e-trust-prompt.c:114
-#: ../libedataserverui/e-webdav-discover-widget.c:1063
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:606
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:235
+#: ../src/libedataserverui/e-trust-prompt.c:111
+#: ../src/libedataserverui/e-webdav-discover-widget.c:1094
 msgid "_Cancel"
 msgstr "_Отменить"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:134
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:680
+msgid "URL:"
+msgstr "URL:"
+
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:132
 msgid "Address book authentication request"
 msgstr "Запрос аутентификации от адресной книги"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:139
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:137
 msgid "Calendar authentication request"
 msgstr "Запрос аутентификации от календаря"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:143
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:141
 msgid "Mail authentication request"
 msgstr "Запрос аутентификации от почты"
 
 #. generic account prompt
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:146
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:144
 msgid "Authentication request"
 msgstr "Запрос аутентификации"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:157
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:153
 #, c-format
-msgid "Please enter the password for address book \"%s\"."
+msgid "Please enter the password for address book “%s”."
 msgstr "Введите пароль для адресной книги «%s»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:161
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:157
 #, c-format
-msgid "Please enter the password for calendar \"%s\"."
+msgid "Please enter the password for calendar “%s”."
 msgstr "Введите пароль для календаря «%s»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:165
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:161
 #, c-format
-msgid "Please enter the password for mail account \"%s\"."
+msgid "Please enter the password for mail account “%s”."
 msgstr "Введите пароль для учётной записи почты «%s»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:169
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:165
 #, c-format
-msgid "Please enter the password for mail transport \"%s\"."
+msgid "Please enter the password for mail transport “%s”."
 msgstr "Введите пароль для транспорта почты «%s»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:173
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:169
 #, c-format
-msgid "Please enter the password for memo list \"%s\"."
+msgid "Please enter the password for memo list “%s”."
 msgstr "Введите пароль для списка заметок «%s»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:177
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:173
 #, c-format
-msgid "Please enter the password for task list \"%s\"."
+msgid "Please enter the password for task list “%s”."
 msgstr "Введите пароль для списка задач «%s»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:181
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:177
 #, c-format
-msgid "Please enter the password for account \"%s\"."
+msgid "Please enter the password for account “%s”."
 msgstr "Введите пароль для учётной записи «%s»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:233
-#: ../libedataserverui/e-webdav-discover-widget.c:1064
+#. Translators: This is part of a credential prompt, constructing for example: "Please enter the password 
for account “%s”.\n(host: hostname)"
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:183
+#, c-format
+msgid ""
+"\n"
+"(host: %s)"
+msgstr ""
+"\n"
+"(хост: %s)"
+
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:236
+#: ../src/libedataserverui/e-webdav-discover-widget.c:1095
 msgid "_OK"
 msgstr "_ОК"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:343
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:354
 msgid "_User Name:"
 msgstr "_Имя пользователя:"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:355
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:366
 msgid "_Password:"
 msgstr "_Пароль:"
 
 #. Remember password check
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:371
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:382
 msgid "_Add this password to your keyring"
 msgstr "_Добавить этот пароль к связке ключей"
 
-#: ../libedataserverui/e-trust-prompt.c:113
-#: ../modules/trust-prompt/trust-prompt-gtk.c:119
+#. Translators: meaning as "Snooze, until event start time"
+#: ../src/libedataserverui/e-reminders-widget.c:182
+msgid "until start time"
+msgstr "до начала работы"
+
+#: ../src/libedataserverui/e-reminders-widget.c:233
+msgid "Add custom time…"
+msgstr "Добавьте пользовательское время…"
+
+#: ../src/libedataserverui/e-reminders-widget.c:237
+msgid "Clear custom times"
+msgstr "Очистить пользовательские времена"
+
+#: ../src/libedataserverui/e-reminders-widget.c:285
+msgctxt "overdue"
+msgid "now"
+msgstr "сейчас"
+
+#: ../src/libedataserverui/e-reminders-widget.c:303
+#, c-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] "%d год"
+msgstr[1] "%d года"
+msgstr[2] "%d лет"
+
+#: ../src/libedataserverui/e-reminders-widget.c:309
+msgctxt "overdue"
+msgid "overdue"
+msgstr "просрочено"
+
+#: ../src/libedataserverui/e-reminders-widget.c:938
+#, c-format
+msgid "Failed to launch URI “%s”:"
+msgstr "Не удалось запустить URI «%s»:"
+
+#: ../src/libedataserverui/e-reminders-widget.c:989
+msgid "No reminder is selected."
+msgstr "Напоминание не выбрано."
+
+#: ../src/libedataserverui/e-reminders-widget.c:1067
+msgid "No details are available."
+msgstr "Подробности отсутствуют."
+
+#: ../src/libedataserverui/e-reminders-widget.c:1071
+msgid "Multiple reminders are selected."
+msgstr "Выбирается несколько напоминаний."
+
+#: ../src/libedataserverui/e-reminders-widget.c:1105
+msgid "Failed to dismiss reminder:"
+msgstr "Не удалось отклонить напоминание:"
+
+#: ../src/libedataserverui/e-reminders-widget.c:1126
+msgid "Failed to dismiss all:"
+msgstr "Не удалось отменить все:"
+
+#: ../src/libedataserverui/e-reminders-widget.c:1262
+msgid "Set a custom snooze time for"
+msgstr "Установите пользовательское время пробуждения для"
+
+#. Translators: this is part of: "Set a custom snooze time for [nnn] days [nnn] hours [nnn] minutes", where 
the text in "[]" means a separate widget
+#: ../src/libedataserverui/e-reminders-widget.c:1275
+msgctxt "reminders-snooze"
+msgid "da_ys"
+msgstr "_дни"
+
+#. Translators: this is part of: "Set a custom snooze time for [nnn] days [nnn] hours [nnn] minutes", where 
the text in "[]" means a separate widget
+#: ../src/libedataserverui/e-reminders-widget.c:1291
+msgctxt "reminders-snooze"
+msgid "_hours"
+msgstr "_часы"
+
+#. Translators: this is part of: "Set a custom snooze time for [nnn] days [nnn] hours [nnn] minutes", where 
the text in "[]" means a separate widget
+#: ../src/libedataserverui/e-reminders-widget.c:1307
+msgctxt "reminders-snooze"
+msgid "_minutes"
+msgstr "_минуты"
+
+#: ../src/libedataserverui/e-reminders-widget.c:1313
+msgid "_Add Snooze time"
+msgstr "Добавить время побудки"
+
+#: ../src/libedataserverui/e-reminders-widget.c:1631
+#: ../src/services/evolution-user-prompter/prompt-user-gtk.c:119
+msgid "_Dismiss"
+msgstr "_Отклонить"
+
+#: ../src/libedataserverui/e-reminders-widget.c:1632
+msgid "Dismiss _All"
+msgstr "Отклонить _все"
+
+#: ../src/libedataserverui/e-reminders-widget.c:1634
+msgid "_Snooze"
+msgstr "_Отложить"
+
+#: ../src/libedataserverui/e-trust-prompt.c:110
+#: ../src/modules/trust-prompt/trust-prompt-gtk.c:117
 msgid "Certificate trust..."
 msgstr "Доверять сертификату…"
 
-#: ../libedataserverui/e-trust-prompt.c:115
-#: ../modules/trust-prompt/trust-prompt-gtk.c:120
+#: ../src/libedataserverui/e-trust-prompt.c:112
+#: ../src/modules/trust-prompt/trust-prompt-gtk.c:118
 msgid "_Reject"
 msgstr "_Отклонить"
 
-#: ../libedataserverui/e-trust-prompt.c:116
-#: ../modules/trust-prompt/trust-prompt-gtk.c:121
+#: ../src/libedataserverui/e-trust-prompt.c:113
+#: ../src/modules/trust-prompt/trust-prompt-gtk.c:119
 msgid "Accept _Temporarily"
 msgstr "_Временно принять"
 
-#: ../libedataserverui/e-trust-prompt.c:117
-#: ../modules/trust-prompt/trust-prompt-gtk.c:122
+#: ../src/libedataserverui/e-trust-prompt.c:114
+#: ../src/modules/trust-prompt/trust-prompt-gtk.c:120
 msgid "_Accept Permanently"
 msgstr "_Принять"
 
-#: ../libedataserverui/e-trust-prompt.c:188
-#: ../modules/trust-prompt/trust-prompt-gtk.c:159
+#: ../src/libedataserverui/e-trust-prompt.c:185
+#: ../src/modules/trust-prompt/trust-prompt-gtk.c:157
 #, c-format
-msgid "SSL/TLS certificate for '%s' is not trusted. Do you wish to accept it?"
+msgid "SSL/TLS certificate for “%s” is not trusted. Do you wish to accept it?"
 msgstr ""
-"Сертификат SSL/TLS для «%s» не является доверенным. Принять сертификат?"
+"Сертификат SSL/TLS для «%s» не является доверенным. Хотите ли вы принять его?"
 
-#: ../libedataserverui/e-trust-prompt.c:210
-#: ../modules/trust-prompt/trust-prompt-gtk.c:174
+#: ../src/libedataserverui/e-trust-prompt.c:207
+#: ../src/modules/trust-prompt/trust-prompt-gtk.c:172
 msgid "Reason:"
 msgstr "Причина:"
 
-#: ../libedataserverui/e-trust-prompt.c:213
+#: ../src/libedataserverui/e-trust-prompt.c:210
 msgid "Detailed error:"
 msgstr "Сообщение об ошибке:"
 
-#: ../libedataserverui/e-trust-prompt.c:275
-#: ../modules/trust-prompt/module-trust-prompt.c:82
+#: ../src/libedataserverui/e-trust-prompt.c:272
+#: ../src/modules/trust-prompt/module-trust-prompt.c:80
 msgid "The signing certificate authority is not known."
 msgstr "Удостоверяющий центр сертификата неизвестен."
 
-#: ../libedataserverui/e-trust-prompt.c:277
-#: ../modules/trust-prompt/module-trust-prompt.c:84
+#: ../src/libedataserverui/e-trust-prompt.c:274
+#: ../src/modules/trust-prompt/module-trust-prompt.c:82
 msgid ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
 msgstr "Сертификат, полученный от сайта, не соответствует ожидаемому."
 
-#: ../libedataserverui/e-trust-prompt.c:279
-#: ../modules/trust-prompt/module-trust-prompt.c:86
-msgid "The certificate's activation time is still in the future."
-msgstr "Время активации сертификата ещё не наступило."
+#: ../src/libedataserverui/e-trust-prompt.c:276
+#: ../src/modules/trust-prompt/module-trust-prompt.c:84
+msgid "The certificate’s activation time is still in the future."
+msgstr "Время активации сертификата еще в будущем."
 
-#: ../libedataserverui/e-trust-prompt.c:281
-#: ../modules/trust-prompt/module-trust-prompt.c:88
+#: ../src/libedataserverui/e-trust-prompt.c:278
+#: ../src/modules/trust-prompt/module-trust-prompt.c:86
 msgid "The certificate has expired."
 msgstr "Срок действия сертификата истёк."
 
-#: ../libedataserverui/e-trust-prompt.c:283
-#: ../modules/trust-prompt/module-trust-prompt.c:90
+#: ../src/libedataserverui/e-trust-prompt.c:280
+#: ../src/modules/trust-prompt/module-trust-prompt.c:88
 msgid ""
-"The certificate has been revoked according to the connection's certificate "
+"The certificate has been revoked according to the connection’s certificate "
 "revocation list."
 msgstr ""
-"Сертификат был аннулирован в соответствии со списком отозванных сертификатов "
+"Сертификат был отозван в соответствии со списком отзыва сертификатов "
 "соединения."
 
-#: ../libedataserverui/e-trust-prompt.c:285
-#: ../modules/trust-prompt/module-trust-prompt.c:92
-msgid "The certificate's algorithm is considered insecure."
+#: ../src/libedataserverui/e-trust-prompt.c:282
+#: ../src/modules/trust-prompt/module-trust-prompt.c:90
+msgid "The certificate’s algorithm is considered insecure."
 msgstr "Алгоритм сертификата считается небезопасным."
 
-#: ../libedataserverui/e-webdav-discover-widget.c:166
+#: ../src/libedataserverui/e-webdav-discover-widget.c:193
 msgid "Supports"
 msgstr "Поддержка"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:177
+#: ../src/libedataserverui/e-webdav-discover-widget.c:204
 msgid "_User mail:"
 msgstr "_Почта пользователя:"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:523
+#: ../src/libedataserverui/e-webdav-discover-widget.c:542
 msgctxt "WebDAVDiscover"
 msgid "Contacts"
 msgstr "Контакты"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:524
+#: ../src/libedataserverui/e-webdav-discover-widget.c:543
 msgctxt "WebDAVDiscover"
 msgid "Events"
 msgstr "События"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:525
+#: ../src/libedataserverui/e-webdav-discover-widget.c:544
 msgctxt "WebDAVDiscover"
 msgid "Memos"
 msgstr "Записки"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:526
+#: ../src/libedataserverui/e-webdav-discover-widget.c:545
 msgctxt "WebDAVDiscover"
 msgid "Tasks"
 msgstr "Задачи"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:825
+#: ../src/libedataserverui/e-webdav-discover-widget.c:857
 msgid "Invalid URL"
 msgstr "Неверный URL"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:839
-msgid "User name not filled"
-msgstr "Имя пользователя не заполнено"
-
-#: ../libedataserverui/e-webdav-discover-widget.c:880
+#: ../src/libedataserverui/e-webdav-discover-widget.c:902
 msgid "Cancel"
 msgstr "Отменить"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:883
+#: ../src/libedataserverui/e-webdav-discover-widget.c:905
 msgid "Searching server sources..."
 msgstr "Поиск источников сервера…"
 
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:210
+#: ../src/modules/gnome-online-accounts/e-goa-password-based.c:248
 #, c-format
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
-"from which to obtain a password for '%s'"
+"from which to obtain a password for “%s”"
 msgstr ""
-"Не удалось найти соответствующую учётную запись в службе org.gnome."
-"OnlineAccounts, с помощью которой можно получить пароль для «%s»"
+"Невозможно найти соответствующую учетную запись в службе org.gnome."
+"OnlineAccounts, от которой можно получить пароль для «%s»"
 
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:273
+#: ../src/modules/gnome-online-accounts/e-goa-password-based.c:315
 msgid "Failed to get password from GOA: "
 msgstr "Не удалось получить пароль из GOA: "
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:219
+#: ../src/modules/gnome-online-accounts/goaewsclient.c:220
 #, c-format
-msgid "Code: %u - Unexpected response from server"
-msgstr "Код: %u — неожиданный ответ от сервера"
+msgid "Code: %u — Unexpected response from server"
+msgstr "Код: %u - Неожиданный ответ от сервера"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:240
+#: ../src/modules/gnome-online-accounts/goaewsclient.c:241
 #, c-format
 msgid "Failed to parse autodiscover response XML"
 msgstr "Не удалось разобрать XML ответа автообнаружения"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:249
+#: ../src/modules/gnome-online-accounts/goaewsclient.c:250
 #, c-format
 msgid "Failed to find Autodiscover element"
 msgstr "Не удалось найти элемент Autodiscover"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:261
+#: ../src/modules/gnome-online-accounts/goaewsclient.c:262
 #, c-format
 msgid "Failed to find Response element"
 msgstr "Не удалось найти элемент Response"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:273
+#: ../src/modules/gnome-online-accounts/goaewsclient.c:274
 #, c-format
 msgid "Failed to find Account element"
 msgstr "Не удалось найти элемент Account"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:287
+#: ../src/modules/gnome-online-accounts/goaewsclient.c:288
 #, c-format
 msgid "Failed to find ASUrl and OABUrl in autodiscover response"
 msgstr "Не удалось найти ASUrl и OABUrl в ответе автообнаружения"
 
-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1235
+#: ../src/modules/gnome-online-accounts/module-gnome-online-accounts.c:1422
 #, c-format
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
-"from which to obtain an access token for '%s'"
+"from which to obtain an access token for “%s”"
 msgstr ""
 "Не удалось найти соответствующую запись в службе org.gnome.OnlineAccounts, с "
 "помощью которой можно получить маркер доступа для «%s»"
 
-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1265
+#: ../src/modules/gnome-online-accounts/module-gnome-online-accounts.c:1472
 #, c-format
-msgid "Failed to obtain an access token for '%s': "
+msgid "Failed to obtain an access token for “%s”: "
 msgstr "Не удалось получить маркер доступа для «%s»: "
 
-#: ../modules/google-backend/module-google-backend.c:568
-#: ../modules/yahoo-backend/module-yahoo-backend.c:226
-msgid "Tasks"
-msgstr "Задачи"
-
-#: ../modules/google-backend/module-google-backend.c:625
-#: ../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/ubuntu-online-accounts/calendar.service-type.in.in.h:1
-#: ../modules/yahoo-backend/module-yahoo-backend.c:199
-msgid "Calendar"
-msgstr "Календарь"
-
-#: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:2
-msgid "Integrate your calendars"
-msgstr "Интеграция ваших календарей"
-
-#: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:2
-msgid "Integrate your contacts"
-msgstr "Интеграция ваших контаков"
-
-#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:272
-msgid "Signon service did not return a secret"
-msgstr "Служба регистрации не вернула секрет"
-
-#: ../modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in.in.h:1
-msgid "Evolution Data Server"
-msgstr "Сервер данных Evolution"
-
-#: ../modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in.in.h:2
-msgid "Required to have EDS appear in UOA"
-msgstr "Требование наличия ЭЦП появилось в UOA"
+#: ../src/services/evolution-addressbook-factory/evolution-addressbook-factory.c:38
+#: ../src/services/evolution-calendar-factory/evolution-calendar-factory.c:40
+#: ../src/services/evolution-user-prompter/evolution-user-prompter.c:33
+msgid "Keep running after the last client is closed"
+msgstr "Сохранять запущенным после закрытия последнего клиента"
 
-#: ../modules/ubuntu-online-accounts/google-calendar.service.in.in.h:1
-msgid "Google Calendar"
-msgstr "Календарь Google"
+#: ../src/services/evolution-addressbook-factory/evolution-addressbook-factory.c:40
+#: ../src/services/evolution-calendar-factory/evolution-calendar-factory.c:42
+msgid "Wait running until at least one client is connected"
+msgstr "Работает до тех пор, пока подключён хотя бы один клиент"
 
-#: ../modules/ubuntu-online-accounts/google-contacts.service.in.in.h:1
-msgid "Google Contacts"
-msgstr "Контакты Google"
+#: ../src/services/evolution-addressbook-factory/evolution-addressbook-factory.c:42
+#: ../src/services/evolution-calendar-factory/evolution-calendar-factory.c:44
+msgid ""
+"Overrides compile-time backend per process option; use 1 to enable, 0 to "
+"disable, any other value is to use compile-time option"
+msgstr ""
+"Переопределяет опцию compile-time backend per process; используйте 1 для "
+"включения, 0 для отключения, любое другое значение будет использовать опцию "
+"compile-time"
 
-#: ../modules/ubuntu-online-accounts/google-gmail.service.in.in.h:1
-msgid "GMail"
-msgstr "GMail"
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:326
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:354
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:882
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:1130
+msgid "Reminders"
+msgstr "Напоминания"
 
-#: ../modules/ubuntu-online-accounts/mail.service-type.in.in.h:1
-msgid "Mail"
-msgstr "Почта"
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:466
+msgid "Warning"
+msgstr "Предупреждение"
 
-#: ../modules/ubuntu-online-accounts/mail.service-type.in.in.h:2
-msgid "Integrate your mailboxes"
-msgstr "Интегрировать ваши почтовые ящики"
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:467
+msgid "_No"
+msgstr "Нет"
 
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1060
-#, c-format
-msgid ""
-"Cannot find a corresponding account service in the accounts database from "
-"which to obtain an access token for '%s'"
-msgstr ""
-"Не удалось найти соответствующую учётную запись службы в базе данных учётных "
-"записей, с помощью которой можно получить маркер доступа для «%s»"
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:468
+msgid "_Yes"
+msgstr "_Да"
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:84
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:281
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:472
 #, c-format
 msgid ""
-"Expected status 200 when requesting your identity, instead got status %d (%s)"
+"A calendar reminder is about to trigger. This reminder is configured to run "
+"the following program:\n"
+"\n"
+"        %s\n"
+"\n"
+"Are you sure you want to run this program?"
 msgstr ""
-"Вместо ожидаемого статуса 200 при запросе идентификации получен статус %d "
-"(%s)"
-
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:101
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:298
-msgid "Error parsing response as JSON: "
-msgstr "Не удалось разобрать как JSON:"
+"В ближайшее время должно сработать напоминание календаря. Это напоминание "
+"настроено на запуск следующей программы:\n"
+"\n"
+"        %s\n"
+"\n"
+"Вы уверены, что хотите запустить эту программу?"
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:119
-msgid "Didn't find 'email' in JSON data"
-msgstr "Не удалось найти член «email» в данных JSON"
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:487
+msgid "Do not ask me about this program again"
+msgstr "Не спрашивайте меня больше об этой программе"
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:316
-msgid "Didn't find 'id' in JSON data"
-msgstr "Не удалось найти член «id» в данных JSON"
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:787
+msgid "Display Reminders window with _notifications"
+msgstr "Показывать окно напоминаний с _уведомлениями"
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:321
-msgid "Didn't find 'emails.account' in JSON data"
-msgstr "Не удалось найти член «emails.account» в данных JSON"
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:788
+msgid "Keep reminder notification window always on _top"
+msgstr "Закрепить _окно напоминаний всегда сверху"
 
-#: ../modules/ubuntu-online-accounts/windows-live-mail.service.in.in.h:1
-msgid "Windows Live Mail"
-msgstr "Почта Windows Live"
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:789
+msgid "Display reminders for _completed tasks"
+msgstr "Показать напоминания для завершённых _задач"
 
-#: ../modules/ubuntu-online-accounts/yahoo-calendar.service.in.in.h:1
-msgid "Yahoo! Calendar"
-msgstr "Календарь Yahoo!"
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:790
+msgid "Display reminders for _past events"
+msgstr "Показывать напоминания для _прошедших событий"
 
-#: ../modules/ubuntu-online-accounts/yahoo-mail.service.in.in.h:1
-msgid "Yahoo! Mail"
-msgstr "Почта Yahoo!"
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:804
+msgid "Reminders Options:"
+msgstr "Параметры напоминаний:"
 
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:36
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:38
-#: ../services/evolution-user-prompter/evolution-user-prompter.c:32
-msgid "Keep running after the last client is closed"
-msgstr "Сохранять запущенным после закрытия последнего клиента"
-
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:38
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:40
-msgid "Wait running until at least one client is connected"
-msgstr "Работает до тех пор, пока подключён хотя бы один клиент"
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:898
+#, c-format
+msgid "You have %d reminder"
+msgid_plural "You have %d reminders"
+msgstr[0] "У вас есть %d напоминание"
+msgstr[1] "У вас есть %d напоминания"
+msgstr[2] "У вас есть %d напоминаний"
 
-#: ../services/evolution-source-registry/builtin/birthdays.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/birthdays.source.in.h:1
 msgid "Birthdays & Anniversaries"
 msgstr "Дни рождения и годовщины"
 
 # Протокол
-#: ../services/evolution-source-registry/builtin/caldav-stub.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/caldav-stub.source.in.h:1
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../services/evolution-source-registry/builtin/google-stub.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/carddav-stub.source.in.h:1
+msgid "CardDAV"
+msgstr "CardDAV"
+
+#: ../src/services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
+msgid "Contacts"
+msgstr "Контакты"
+
+#: ../src/services/evolution-source-registry/builtin/google-stub.source.in.h:1
 msgid "Google"
 msgstr "Google"
 
-#: ../services/evolution-source-registry/builtin/ldap-stub.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/ldap-stub.source.in.h:1
 msgid "On LDAP Servers"
 msgstr "На серверах LDAP"
 
-#: ../services/evolution-source-registry/builtin/local.source.in.h:1
-#: ../services/evolution-source-registry/builtin/local-stub.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/local.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/local-stub.source.in.h:1
 msgid "On This Computer"
 msgstr "На этом компьютере"
 
-#: ../services/evolution-source-registry/builtin/vfolder.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/system-address-book.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/system-calendar.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/system-memo-list.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/system-task-list.source.in.h:1
+msgid "Personal"
+msgstr "Личное"
+
+#: ../src/services/evolution-source-registry/builtin/system-proxy.source.in.h:1
+msgid "Default Proxy Settings"
+msgstr "Настройки прокси по умолчанию"
+
+#: ../src/services/evolution-source-registry/builtin/vfolder.source.in.h:1
 msgid "Search Folders"
 msgstr "Папки поиска"
 
-#: ../services/evolution-source-registry/builtin/weather-stub.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/weather-stub.source.in.h:1
 msgid "Weather"
 msgstr "Погода"
 
-#: ../services/evolution-source-registry/builtin/webcal-stub.source.in.h:1
+#: ../src/services/evolution-source-registry/builtin/webcal-stub.source.in.h:1
 msgid "On The Web"
 msgstr "В Интернете"
 
 # Протокол
-#: ../services/evolution-source-registry/builtin/webdav-stub.source.in.h:1
-msgid "WebDAV"
-msgstr "WebDAV"
+#: ../src/services/evolution-source-registry/builtin/webdav-notes-stub.source.in.h:1
+msgid "WebDAV Notes"
+msgstr "Заметки WebDAV"
 
-#: ../services/evolution-source-registry/evolution-source-registry.c:39
-msgid "Don't migrate user data from previous versions of Evolution"
-msgstr "Не переносить пользовательские данные из предыдущих версий Evolution"
+#: ../src/services/evolution-source-registry/evolution-source-registry.c:41
+msgid "Don’t migrate user data from previous versions of Evolution"
+msgstr "Не переносите пользовательские данные из предыдущих версий Evolution"
 
-#: ../services/evolution-user-prompter/prompt-user-gtk.c:121
-msgid "_Dismiss"
-msgstr "_Отклонить"
+#: ../src/tools/addressbook-export/addressbook-export.c:69
+#: ../src/tools/addressbook-export/addressbook-export.c:781
+msgid "Can not open file"
+msgstr "Не удается открыть файл"
+
+#: ../src/tools/addressbook-export/addressbook-export.c:99
+#, c-format
+msgid "Failed to open client “%s”: %s"
+msgstr "Не удалось открыть клиент «%s»: %s"
+
+#: ../src/tools/addressbook-export/addressbook-export.c:889
+msgid "Unhandled error"
+msgstr "Необработанная ошибка"
+
+#: ../src/tools/addressbook-export/addressbook-export.c:922
+msgid "Specify the output file instead of standard output"
+msgstr "Укажите выходной файл вместо стандартного вывода"
+
+#: ../src/tools/addressbook-export/addressbook-export.c:923
+msgid "OUTPUTFILE"
+msgstr "OUTPUTFILE"
+
+#: ../src/tools/addressbook-export/addressbook-export.c:926
+msgid "List local address book folders"
+msgstr "Список локальных папок адресной книги"
+
+#: ../src/tools/addressbook-export/addressbook-export.c:929
+msgid "Show cards as vcard or csv file"
+msgstr "Показать карты в виде vcard или csv файла"
+
+#: ../src/tools/addressbook-export/addressbook-export.c:930
+msgid "[vcard|csv]"
+msgstr "[vcard|csv]"
+
+#: ../src/tools/addressbook-export/addressbook-export.c:978
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+"Ошибка аргументов командной строки, пожалуйста, используйте опцию --help для "
+"просмотра использования."
+
+#: ../src/tools/addressbook-export/addressbook-export.c:992
+msgid "Only support csv or vcard format."
+msgstr "Поддерживается только формат csv или vcard."
+
+#: ../src/tools/list-sources/list-sources.c:83
+msgid "Show only enabled sources"
+msgstr "Показывать только включенные источники"
+
+#: ../src/tools/list-sources/list-sources.c:86
+msgid "Show source’s UID"
+msgstr "Показать UID источника"
+
+#: ../src/tools/list-sources/list-sources.c:89
+msgid "Show source’s authentication information"
+msgstr "Показать информацию об аутентификации источника"
+
+#: ../src/tools/list-sources/list-sources.c:92
+msgid ""
+"Write in machine readable format (one source per line, without localized "
+"property names and tab as separator)"
+msgstr ""
+"Запись в машиночитаемом формате (один источник на строку, без локализованных "
+"имен свойств и табуляции в качестве разделителя)"
+
+#: ../src/tools/list-sources/list-sources.c:95
+msgid "Limit only to sources with given extension name"
+msgstr "Ограничить только источники с заданным именем расширения"
+
+#: ../src/tools/list-sources/list-sources.c:106
+msgid "yes"
+msgstr "да"
+
+#: ../src/tools/list-sources/list-sources.c:106
+msgid "no"
+msgstr "нет"
+
+#: ../src/tools/list-sources/list-sources.c:126
+msgid "Collection"
+msgstr "Коллекция"
+
+#: ../src/tools/list-sources/list-sources.c:132
+msgid "Collection/GNOME Online Accounts"
+msgstr "Коллекция/GNOME Online Accounts"
+
+#: ../src/tools/list-sources/list-sources.c:137
+msgid "Collection/Ubuntu Online Accounts"
+msgstr "Коллекция/Учетные записи Ubuntu Online"
+
+#: ../src/tools/list-sources/list-sources.c:147
+msgid "Address Book"
+msgstr "Адресная книга"
+
+#: ../src/tools/list-sources/list-sources.c:148
+msgid "Calendar"
+msgstr "Календарь"
+
+#: ../src/tools/list-sources/list-sources.c:149
+msgid "Memo List"
+msgstr "Список заметок"
+
+#: ../src/tools/list-sources/list-sources.c:150
+msgid "Task List"
+msgstr "Список задач"
+
+#: ../src/tools/list-sources/list-sources.c:151
+msgid "Mail Account"
+msgstr "Учётная запись почты"
+
+#: ../src/tools/list-sources/list-sources.c:152
+msgid "Mail Transport"
+msgstr "Почтовый транспорт"
+
+#: ../src/tools/list-sources/list-sources.c:153
+msgid "Mail Identity"
+msgstr "Почтовая идентификация"
+
+#: ../src/tools/list-sources/list-sources.c:154
+msgid "Mail Submission"
+msgstr "Отправка по почте"
+
+#: ../src/tools/list-sources/list-sources.c:155
+msgid "Mail Signature"
+msgstr "Почтовая Подпись"
+
+#: ../src/tools/list-sources/list-sources.c:156
+msgid "Proxy"
+msgstr "Прокси"
+
+#: ../src/tools/list-sources/list-sources.c:224
+#, c-format
+msgid "UID: %s"
+msgstr "UID: %s"
+
+#: ../src/tools/list-sources/list-sources.c:228
+#, c-format
+msgid "Parent UID: %s"
+msgstr "UID родителя: %s"
+
+#: ../src/tools/list-sources/list-sources.c:231
+#, c-format
+msgid "Enabled: %s"
+msgstr "Включено: %s"
+
+#: ../src/tools/list-sources/list-sources.c:233
+#, c-format
+msgid "Backend: %s"
+msgstr "Бэкэнд: %s"
+
+#: ../src/tools/list-sources/list-sources.c:238
+#, c-format
+msgid "Calendar enabled: %s"
+msgstr "Календарь включен: %s"
+
+#: ../src/tools/list-sources/list-sources.c:239
+#, c-format
+msgid "Contacts enabled: %s"
+msgstr "Контакты включены: %s"
+
+#: ../src/tools/list-sources/list-sources.c:240
+#, c-format
+msgid "Mail enabled: %s"
+msgstr "Почта включена: %s"
+
+#: ../src/tools/list-sources/list-sources.c:247
+#, c-format
+msgid "MIME Type: %s"
+msgstr "MIME Type: %s"
+
+#: ../src/tools/list-sources/list-sources.c:269
+#, c-format
+msgid "Auth Host: %s:%d"
+msgstr "Auth Host: %s:%d"
+
+#: ../src/tools/list-sources/list-sources.c:275
+#, c-format
+msgid "Auth Host: %s"
+msgstr "Auth Host: %s"
+
+#: ../src/tools/list-sources/list-sources.c:283
+#, c-format
+msgid "Auth User: %s"
+msgstr "Auth User: %s"
+
+#: ../src/tools/list-sources/list-sources.c:291
+#, c-format
+msgid "Auth Method: %s"
+msgstr "Метод авторизации: %s"
+
+#: ../src/tools/list-sources/list-sources.c:299
+#, c-format
+msgid "Auth Proxy UID: %s"
+msgstr "Auth Proxy UID: %s"
+
+#: ../src/tools/list-sources/list-sources.c:420
+msgid "Failed to parse arguments: Unknown error"
+msgstr "Не удалось разобрать аргументы: Неизвестная ошибка"
+
+#: ../src/tools/list-sources/list-sources.c:429
+#, c-format
+msgid "Failed to connect to source registry: %s\n"
+msgstr "Не удалось подключиться к исходному реестру: %s\n"
+
+#: ../src/tools/list-sources/list-sources.c:445
+#, c-format
+msgid "No sources had been found\n"
+msgstr "Источники не были найдены\n"
+
+#~ msgid "Querying for updated contacts…"
+#~ msgstr "Запрос обновлённых контактов…"
+
+#~ msgid "Querying for updated groups…"
+#~ msgstr "Запрос обновлённых групп…"
+
+#~ msgid "Loading…"
+#~ msgstr "Загрузка…"
+
+#~ msgid "Friends"
+#~ msgstr "Друзья"
+
+#~ msgid "Family"
+#~ msgstr "Семья"
+
+#~ msgid "Coworkers"
+#~ msgstr "Сотрудники"
+
+#~ msgid "Loading Addressbook summary..."
+#~ msgstr "Загрузка сводки об адресной книге…"
+
+#~ msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
+#~ msgstr "Метод PROPFIND завершился с ошибкой с кодом состояния HTTP: %d (%s)"
+
+#~ msgid "No response body in webdav PROPFIND result"
+#~ msgstr "Тело ответа отсутствует в результатах работы метода webdav PROPFIND"
+
+#~ msgid "Loading Contacts (%d%%)"
+#~ msgstr "Загрузка контактов (%d%%)"
+
+#~ msgid "Cannot transform SoupURI to string"
+#~ msgstr "Не удалось преобразовать SoupURI в строку"
+
+#~ msgid "Create resource '%s' failed with HTTP status %d (%s)"
+#~ msgstr ""
+#~ "При создании ресурса «%s» произошёл сбой с кодом состояния HTTP: %d (%s)"
+
+#~ msgid "Contact on server changed -> not modifying"
+#~ msgstr "Контакт на сервере изменён -> нет изменения"
+
+#~ msgid "Modify contact failed with HTTP status %d (%s)"
+#~ msgstr ""
+#~ "При изменении контакта произошла ошибка с кодом состояния HTTP: %d (%s)"
+
+#~ msgid "DELETE failed with HTTP status %d"
+#~ msgstr "Ошибка метода DELETE с кодом HTTP %d"
+
+#~ msgid "Success"
+#~ msgstr "Успешно"
+
+#~ msgid "Authentication Failed"
+#~ msgstr "Сбой аутентификации"
+
+#~ msgid "Authentication Required"
+#~ msgstr "Требуется аутентификация"
+
+#~ msgid "Unsupported field"
+#~ msgstr "Неподдерживаемое поле"
+
+#~ msgid "Address book does not exist"
+#~ msgstr "Адресная книга не существует"
+
+#~ msgid "Book removed"
+#~ msgstr "Книга удалена"
+
+#~ msgid "Not available in offline mode"
+#~ msgstr "Недоступно в автономном режиме"
+
+#~ msgid "Invalid server version"
+#~ msgstr "Недопустимая версия сервера"
+
+#~ msgid "Server is unreachable (%s)"
+#~ msgstr "Сервер недоступен (%s)"
+
+#~ msgid "CalDAV backend is not loaded yet"
+#~ msgstr "Драйвер CalDAV ещё не загружен"
+
+#~ msgid "Invalid Redirect URL"
+#~ msgstr "Неверный перенаправляющий URL"
+
+#~ msgid "Cannot create local cache folder '%s'"
+#~ msgstr "Не удалось создать локальную кэш-папку «%s»"
+
+#~ msgid ""
+#~ "Server is unreachable, calendar is opened in read-only mode.\n"
+#~ "Error message: %s"
+#~ msgstr ""
+#~ "Сервер недоступен, календарь открыт в режиме «только чтение».\n"
+#~ "Сообщение об ошибке: %s"
+
+#~ msgid "CalDAV does not support bulk additions"
+#~ msgstr "CalDAV не поддерживает пакетные добавления"
+
+#~ msgid "CalDAV does not support bulk modifications"
+#~ msgstr "CalDAV не поддерживает пакетные изменения"
+
+#~ msgid "CalDAV does not support bulk removals"
+#~ msgstr "CalDAV не поддерживает пакетные удаления"
+
+#~ msgid "Calendar doesn't support Free/Busy"
+#~ msgstr "Календарь не поддерживает информацию о занятости"
+
+#~ msgid "Schedule outbox url not found"
+#~ msgstr "Не найден url исходящего расписания"
+
+#~ msgid "Unexpected result in schedule-response"
+#~ msgstr "Неожиданный результат в ответе-расписании"
+
+#~ msgid "Redirected to Invalid URI"
+#~ msgstr "Переадресован на недопустимый URI"
+
+#~ msgid "Repository is offline"
+#~ msgstr "Репозиторий находится в автономном режиме"
+
+#~ msgid "URI already loaded"
+#~ msgstr "URI уже загружен"
+
+#~ msgid "Unknown User"
+#~ msgstr "Неизвестный пользователь"
+
+#~ msgid "Protocol not supported"
+#~ msgstr "Протокол не поддерживается"
+
+#~ msgid "Could not cancel operation"
+#~ msgstr "Не удалось отменить операцию"
+
+#~ msgid "A D-Bus exception has occurred"
+#~ msgstr "Произошло исключение D-Bus"
+
+#~ msgid "No error"
+#~ msgstr "Нет ошибки"
+
+#~ msgid "Update preview data for folder '%s'"
+#~ msgstr "Обновление данных для предварительного просмотра папки «%s»"
+
+#~ msgid ""
+#~ "Invalid trace information:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Неверная трассировочная информация:\n"
+#~ "%s"
+
+#~ msgid "Cannot create folder '%s': %s"
+#~ msgstr "Не удалось создать папку: «%s»: %s"
+
+#~ msgid "Cannot get folder '%s': %s"
+#~ msgstr "Не удалось получить папку: «%s»: %s"
+
+#~ msgid "No such folder '%s'."
+#~ msgstr "Нет такой папки «%s»."
+
+#~ msgid "Google authentication is not supported"
+#~ msgstr "Аутентификация Google не поддерживается"
+
+#~ msgid "HTTP Error: %s"
+#~ msgstr "Ошибка HTTP: %s"
+
+#~ msgid "Empty response"
+#~ msgstr "Пустой ответ"
+
+#~ msgid "Unexpected reply from server"
+#~ msgstr "Неожиданный ответ от сервера"
+
+#~ msgid "Google Address book authentication request"
+#~ msgstr "Запрос аутентификации адресной книги Google"
+
+#~ msgid "Google Calendar authentication request"
+#~ msgstr "Запрос аутентификации календаря Google"
+
+#~ msgid "Google Mail authentication request"
+#~ msgstr "Запрос аутентификации почты Google"
+
+#~ msgid "User name not filled"
+#~ msgstr "Имя пользователя не заполнено"
+
+#~ msgid "Integrate your calendars"
+#~ msgstr "Интеграция ваших календарей"
+
+#~ msgid "Integrate your contacts"
+#~ msgstr "Интеграция ваших контаков"
+
+#~ msgid "Evolution Data Server"
+#~ msgstr "Сервер данных Evolution"
+
+#~ msgid "Required to have EDS appear in UOA"
+#~ msgstr "Требование наличия ЭЦП появилось в UOA"
+
+#~ msgid "Google Calendar"
+#~ msgstr "Календарь Google"
+
+#~ msgid "Google Contacts"
+#~ msgstr "Контакты Google"
+
+#~ msgid "GMail"
+#~ msgstr "GMail"
+
+#~ msgid "Mail"
+#~ msgstr "Почта"
+
+#~ msgid "Integrate your mailboxes"
+#~ msgstr "Интегрировать ваши почтовые ящики"
+
+#~ msgid ""
+#~ "Cannot find a corresponding account service in the accounts database from "
+#~ "which to obtain an access token for '%s'"
+#~ msgstr ""
+#~ "Не удалось найти соответствующую учётную запись службы в базе данных "
+#~ "учётных записей, с помощью которой можно получить маркер доступа для «%s»"
+
+#~ msgid ""
+#~ "Expected status 200 when requesting your identity, instead got status %d "
+#~ "(%s)"
+#~ msgstr ""
+#~ "Вместо ожидаемого статуса 200 при запросе идентификации получен статус %d "
+#~ "(%s)"
+
+#~ msgid "Error parsing response as JSON: "
+#~ msgstr "Не удалось разобрать как JSON:"
+
+#~ msgid "Didn't find 'email' in JSON data"
+#~ msgstr "Не удалось найти член «email» в данных JSON"
+
+#~ msgid "Didn't find 'id' in JSON data"
+#~ msgstr "Не удалось найти член «id» в данных JSON"
+
+#~ msgid "Didn't find 'emails.account' in JSON data"
+#~ msgstr "Не удалось найти член «emails.account» в данных JSON"
+
+#~ msgid "Windows Live Mail"
+#~ msgstr "Почта Windows Live"
+
+#~ msgid "Yahoo! Calendar"
+#~ msgstr "Календарь Yahoo!"


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