Updated Russian translation

diff --git a/po/ru.po b/po/ru.po
index ac8bad3..013f4eb 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,188 +6,259 @@
 # Dmitry Mastrukov  <dmitry@taurussoft.org>, 2001-2003.
 # Leonid Kanter <leon@asplinux.ru.com>, 2004-2006, 2007.
 # Michael Yakhontov <mvy@asplinux.ru>, 2003.
-# Yuri Kozlov <yuray@komyakino.ru>, 2010.
+# Yuri Kozlov <yuray@komyakino.ru>, 2010, 2011.
 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&component=Misc.\n"
-"POT-Creation-Date: 2011-02-17 18:29+0000\n"
-"PO-Revision-Date: 2011-03-05 21:18+0400\n"
-"Last-Translator: Yuri Myaseodov <omerta13@yandex.ru>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
+"POT-Creation-Date: 2011-07-29 17:59+0000\n"
+"PO-Revision-Date: 2011-07-31 13:04+0400\n"
+"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnome-cyr@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Lokalize 1.0\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:570
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
+#: ../addressbook/backends/file/e-book-backend-file.c:668
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
 msgid "Loading..."
 msgstr "Загрузка…"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:573
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4506
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
+#: ../addressbook/backends/file/e-book-backend-file.c:671
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4708
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
 msgid "Searching..."
 msgstr "Поиск…"
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:589
+#: ../addressbook/backends/google/e-book-backend-google.c:628
 msgid "Querying for updated contacts…"
 msgstr "Запрос обновлённых контактов…"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:624
+#: ../addressbook/backends/google/e-book-backend-google.c:672
+#: ../addressbook/libebook/e-book.c:3572 ../calendar/libecal/e-cal.c:1331
+#: ../libedataserver/e-client.c:1777
 msgid "Personal"
 msgstr "Личное"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:626
-#| msgid "Favorites"
+#: ../addressbook/backends/google/e-book-backend-google.c:674
 msgid "Friends"
 msgstr "Друзья"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:628
-#| msgid "Family Name"
+#: ../addressbook/backends/google/e-book-backend-google.c:676
 msgid "Family"
 msgstr "Семья"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:630
+#: ../addressbook/backends/google/e-book-backend-google.c:678
 msgid "Coworkers"
 msgstr "Сотрудники"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:707
+#: ../addressbook/backends/google/e-book-backend-google.c:757
 msgid "Querying for updated groups…"
 msgstr "Запрос обновлённых групп…"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:891
-#| msgid "Cannot get contact"
+#: ../addressbook/backends/google/e-book-backend-google.c:1036
 msgid "Creating new contact…"
 msgstr "Создание нового контакта…"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:984
+#: ../addressbook/backends/google/e-book-backend-google.c:1128
 msgid "Deleting contact…"
 msgstr "Удаление контакта…"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1092
-#| msgid "Cannot modify contact"
+#: ../addressbook/backends/google/e-book-backend-google.c:1240
 msgid "Modifying contact…"
 msgstr "Изменение контакта…"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1199
-#| msgid "Loading..."
+#: ../addressbook/backends/google/e-book-backend-google.c:1387
 msgid "Loading…"
 msgstr "Загрузка…"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1346
-#| msgid "Authentication required"
+#: ../addressbook/backends/google/e-book-backend-google.c:1540
 msgid "Authenticating with the server…"
 msgstr "Выполняется аутентификация на сервере…"
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2699
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4665
-#, c-format
-msgid "Downloading contacts (%d)... "
-msgstr "Загрузка контактов (%d)…"
-
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2847
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3028
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3075
-#, c-format
-msgid "Updating contacts cache (%d)... "
-msgstr "Обновление кэша контактов (%d)…"
-
 #. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
-#| msgid "Not connected."
 msgid "Not connected"
 msgstr "Не подключён"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:764
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:776
 msgid "Using Distinguished Name (DN)"
 msgstr "Используя отличительное имя (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:767
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:779
 msgid "Using Email Address"
 msgstr "Используя адрес эл. почты"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1033
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1048
 msgid "Reconnecting to LDAP server..."
 msgstr "Повторное подключение к серверу LDAP…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1158
-#| msgid "Invalid argument"
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1173
 msgid "Invalid DN syntax"
 msgstr "Недопустимый синтаксис в отличительном имени (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1675
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1688
 msgid "Adding contact to LDAP server..."
 msgstr "Создание контакта на сервере LDAP…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1807
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1818
 msgid "Removing contact from LDAP server..."
 msgstr "Удаление контакта с сервера LDAP…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2243
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2250
 msgid "Modifying contact from LDAP server..."
 msgstr "Изменение контакта на сервере LDAP…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4356
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4559
 msgid "Receiving LDAP search results..."
 msgstr "Получение результатов поиска с сервера LDAP…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4528
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4729
 msgid "Error performing search"
 msgstr "Ошибка выполнения поиска"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:273
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:881
-#: ../addressbook/libedata-book/e-data-book.c:441
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:523
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:552
-#: ../calendar/backends/http/e-cal-backend-http.c:435
-#: ../calendar/libecal/e-cal.c:4177
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:160
-#: ../camel/providers/imap/camel-imap-command.c:481
-#: ../camel/providers/imap/camel-imap-store.c:425
-#: ../camel/providers/pop3/camel-pop3-store.c:495
-#: ../camel/providers/smtp/camel-smtp-transport.c:497
-#: ../servers/groupwise/e-gw-connection.c:243
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4849
+#, c-format
+msgid "Downloading contacts (%d)... "
+msgstr "Загрузка контактов (%d)…"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:274
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:880
+#: ../addressbook/libedata-book/e-data-book.c:440
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:519
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:548
+#: ../calendar/backends/http/e-cal-backend-http.c:422
+#: ../calendar/libecal/e-cal.c:4462
+#: ../camel/providers/imap/camel-imap-command.c:484
+#: ../camel/providers/imap/camel-imap-store.c:385
+#: ../camel/providers/smtp/camel-smtp-transport.c:520
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
 #: ../addressbook/backends/webdav/e-book-backend-webdav.c:335
 #, c-format
 msgid "Create resource '%s' failed with HTTP status: %d (%s)"
-msgstr "При создании ресурса «%s» произошёл сбой с кодом состояния HTTP: %d (%s)"
+msgstr ""
+"При создании ресурса «%s» произошёл сбой с кодом состояния HTTP: %d (%s)"
 
-#: ../addressbook/libebook/e-book.c:3064
+#: ../addressbook/libebook/e-book.c:3247
 #, c-format
-#| msgid "%s: there was no source for uid `%s' stored in gconf."
 msgid "%s: there was no source for UID '%s' stored in GConf."
 msgstr "%s: источник для UID «%s» не был сохранён в GConf."
 
-#: ../addressbook/libebook/e-book.c:3420
-#: ../addressbook/libedata-book/e-data-book.c:183
-#| msgid "Folder '%s/%s' does not exist."
+#: ../addressbook/libebook/e-book.c:3555 ../calendar/libecal/e-cal.c:1311
+#: ../libedataserver/e-client.c:1772
+msgid "On This Computer"
+msgstr "На этом компьютере"
+
+#: ../addressbook/libebook/e-book.c:3681
+#: ../addressbook/libebook/e-book-client.c:613
+#: ../addressbook/libedata-book/e-data-book.c:310
 msgid "Address book does not exist"
 msgstr "Адресная книга не существует"
 
+#: ../addressbook/libebook/e-book-client.c:85
+msgctxt "BookClientError"
+msgid "No such book"
+msgstr "Нет такой книги"
+
+#: ../addressbook/libebook/e-book-client.c:87
+msgctxt "BookClientError"
+msgid "Contact not found"
+msgstr "Контакт не найден"
+
+#: ../addressbook/libebook/e-book-client.c:89
+msgctxt "BookClientError"
+msgid "Contact ID already exists"
+msgstr "Идентификатор контакта уже существует"
+
+#: ../addressbook/libebook/e-book-client.c:91
+msgctxt "BookClientError"
+msgid "No such source"
+msgstr "Нет такого источника"
+
+#: ../addressbook/libebook/e-book-client.c:93
+msgctxt "BookClientError"
+msgid "No space"
+msgstr "Недостаточно места"
+
+#: ../addressbook/libebook/e-book-client.c:96
+msgctxt "BookClientError"
+msgid "Unknown error"
+msgstr "Неизвестная ошибка"
+
+#: ../addressbook/libebook/e-book-client.c:167
+msgid "D-Bus book proxy gone"
+msgstr "Исчез прокси D-Bus для книг"
+
+#: ../addressbook/libebook/e-book-client.c:428
+msgid "Failed to run book factory"
+msgstr "Не удалось запустить фабрику книг"
+
+#: ../addressbook/libebook/e-book-client.c:438
+#: ../addressbook/libedata-book/e-data-book-factory.c:371
+#: ../addressbook/libedata-book/e-data-book-factory.c:429
+#: ../calendar/libecal/e-cal-client.c:544
+#: ../calendar/libedata-cal/e-data-cal-factory.c:391
+#, c-format
+msgid "Invalid source"
+msgstr "Неверный источник"
+
+#: ../addressbook/libebook/e-book-client.c:538
+#: ../calendar/libecal/e-cal-client.c:656
+#, c-format
+msgid "Incorrect uri '%s'"
+msgstr "Некорректный uri «%s»"
+
+#: ../addressbook/libebook/e-book-client.c:576
+msgid "Failed to find system book"
+msgstr "Не удалось найти системную книгу"
+
+#: ../addressbook/libebook/e-book-client.c:683
+#: ../calendar/libecal/e-cal-client.c:804
+#, c-format
+msgid "There was no source for UID '%s' stored in a source list."
+msgstr "Здесь нет источника для UID «%s», сохранённого в списке источников."
+
+#: ../addressbook/libebook/e-book-client.c:2006
+#: ../calendar/libecal/e-cal-client.c:3611
+msgid "Cannot get connection to view"
+msgstr "Не удалось подключиться для просмотра"
+
+#: ../addressbook/libebook/e-book-client-view.c:218
+#: ../calendar/libecal/e-cal-client-view.c:456
+msgid "Cannot start view, D-Bus proxy gone"
+msgstr "Невозможно запустить просмотр, исчез прокси D-Bus"
+
+#: ../addressbook/libebook/e-book-client-view.c:247
+#: ../calendar/libecal/e-cal-client-view.c:485
+msgid "Cannot stop view, D-Bus proxy gone"
+msgstr "Невозможно остановить просмотр, исчез прокси D-Bus"
+
+#: ../addressbook/libebook/e-book-client-view.c:288
+#: ../calendar/libecal/e-cal-client-view.c:526
+msgid "Cannot set fields of interest, D-Bus proxy gone"
+msgstr "Невозможно задать нужные поля, исчез прокси D-Bus"
+
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:115
+#: ../addressbook/libebook/e-contact.c:116
 msgid "Unique ID"
 msgstr "Уникальный ID"
 
-#: ../addressbook/libebook/e-contact.c:116
+#. FILE_AS is not really a structured field - we use a getter/setter
+#. so we can generate its value if necessary in the getter
+#: ../addressbook/libebook/e-contact.c:119
 msgid "File Under"
 msgstr "Сохранить под"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:118
+#: ../addressbook/libebook/e-contact.c:121
 msgid "Book URI"
 msgstr "Адрес (URI) книги"
 
@@ -195,804 +266,754 @@ msgstr "Адрес (URI) книги"
 #. FN isn't really a structured field - we use a getter/setter
 #. so we can set the N property (since evo 1.4 works fine with
 #. vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:127
 msgid "Full Name"
 msgstr "Полное имя"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:128
 msgid "Given Name"
 msgstr "Имя"
 
-#: ../addressbook/libebook/e-contact.c:126
+#: ../addressbook/libebook/e-contact.c:129
 msgid "Family Name"
 msgstr "Фамилия"
 
-#: ../addressbook/libebook/e-contact.c:127
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Nickname"
 msgstr "Псевдоним"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 1"
 msgstr "Эл. почта 1"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Email 2"
 msgstr "Эл. почта 2"
 
-#: ../addressbook/libebook/e-contact.c:132
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Email 3"
 msgstr "Эл. почта 3"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:136
 msgid "Email 4"
 msgstr "Эл. почта 4"
 
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Mailer"
 msgstr "Почтовый клиент"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:141
 msgid "Home Address Label"
 msgstr "Ярлык домашнего адреса"
 
-#: ../addressbook/libebook/e-contact.c:139
+#: ../addressbook/libebook/e-contact.c:142
 msgid "Work Address Label"
 msgstr "Ярлык рабочего адреса"
 
-#: ../addressbook/libebook/e-contact.c:140
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Other Address Label"
 msgstr "Ярлык другого адреса"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Assistant Phone"
 msgstr "Телефон помощника"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Business Phone"
 msgstr "Служебный телефон"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Business Phone 2"
 msgstr "Служебный телефон 2"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Business Fax"
 msgstr "Рабочий факс"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Callback Phone"
 msgstr "Телефон для обратного звонка"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Car Phone"
 msgstr "Телефон в машине"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Company Phone"
 msgstr "Телефон компании"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Home Phone"
 msgstr "Домашний телефон"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Home Phone 2"
 msgstr "Домашний телефон 2"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Home Fax"
 msgstr "Домашний Факс"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:156
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Mobile Phone"
 msgstr "Мобильный телефон"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Other Phone"
 msgstr "Другие телефоны"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Other Fax"
 msgstr "Другой факс"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Pager"
 msgstr "Пейджер"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:161
 msgid "Primary Phone"
 msgstr "Основной телефон"
 
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:162
 msgid "Radio"
 msgstr "Радио"
 
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:163
 msgid "Telex"
 msgstr "Телекс"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:162
+#: ../addressbook/libebook/e-contact.c:165
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Organization"
 msgstr "Организация"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Organizational Unit"
 msgstr "Подразделение организации"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Office"
 msgstr "Офис"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Title"
 msgstr "Заголовок"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:172
 msgid "Role"
 msgstr "Должность"
 
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook/e-contact.c:173
 msgid "Manager"
 msgstr "Мeнеджер"
 
-#: ../addressbook/libebook/e-contact.c:171
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Assistant"
 msgstr "Помощник"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:174
+#: ../addressbook/libebook/e-contact.c:177
 msgid "Homepage URL"
 msgstr "URL домашней страницы"
 
-#: ../addressbook/libebook/e-contact.c:175
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Weblog URL"
 msgstr "URL веблога"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:756
+#: ../addressbook/libebook/e-contact.c:181
+#: ../libedataserverui/e-categories-dialog.c:85
 msgid "Categories"
 msgstr "Категории"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Calendar URI"
 msgstr "URI календаря"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Free/Busy URL"
 msgstr "Ссылка (URL) «свободен/занят»"
 
-#: ../addressbook/libebook/e-contact.c:183
+#: ../addressbook/libebook/e-contact.c:186
 msgid "ICS Calendar"
 msgstr "Календарь формата ICS"
 
-#: ../addressbook/libebook/e-contact.c:184
+#: ../addressbook/libebook/e-contact.c:187
 msgid "Video Conferencing URL"
 msgstr "URL видеоконференций"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:187
+#: ../addressbook/libebook/e-contact.c:190
 msgid "Spouse's Name"
 msgstr "Имя супруга(и)"
 
-#: ../addressbook/libebook/e-contact.c:188
+#: ../addressbook/libebook/e-contact.c:191
 msgid "Note"
 msgstr "Примечание"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:194
 msgid "AIM Home Screen Name 1"
 msgstr "AIM - домашнее экранное имя 1"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Home Screen Name 2"
 msgstr "AIM - домашнее экранное имя 2"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Home Screen Name 3"
 msgstr "AIM - домашнее экранное имя 3"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:197
 msgid "AIM Work Screen Name 1"
 msgstr "AIM - рабочее экранное имя 1"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:198
 msgid "AIM Work Screen Name 2"
 msgstr "AIM - рабочее экранное имя 2"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:199
 msgid "AIM Work Screen Name 3"
 msgstr "AIM - рабочее экранное имя 3"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:200
 msgid "GroupWise Home Screen Name 1"
 msgstr "Groupwise - домашнее экранное имя 1"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Home Screen Name 2"
 msgstr "Groupwise - домашнее экранное имя 2"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Home Screen Name 3"
 msgstr "Groupwise - домашнее экранное имя 3"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:203
 msgid "GroupWise Work Screen Name 1"
 msgstr "Groupwise - рабочее экранное имя 1"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:204
 msgid "GroupWise Work Screen Name 2"
 msgstr "Groupwise - рабочее экранное имя 2"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:205
 msgid "GroupWise Work Screen Name 3"
 msgstr "Groupwise - рабочее экранное имя 3"
 
-#: ../addressbook/libebook/e-contact.c:203
-#| msgid "Jabber Home Id 1"
+#: ../addressbook/libebook/e-contact.c:206
 msgid "Jabber Home ID 1"
 msgstr "Jabber — домашний идентификатор 1"
 
-#: ../addressbook/libebook/e-contact.c:204
-#| msgid "Jabber Home Id 2"
+#: ../addressbook/libebook/e-contact.c:207
 msgid "Jabber Home ID 2"
 msgstr "Jabber — домашний идентификатор 2"
 
-#: ../addressbook/libebook/e-contact.c:205
-#| msgid "Jabber Home Id 3"
+#: ../addressbook/libebook/e-contact.c:208
 msgid "Jabber Home ID 3"
 msgstr "Jabber — домашний идентификатор 3"
 
-#: ../addressbook/libebook/e-contact.c:206
-#| msgid "Jabber Work Id 1"
+#: ../addressbook/libebook/e-contact.c:209
 msgid "Jabber Work ID 1"
 msgstr "Jabber — рабочий идентификатор 1"
 
-#: ../addressbook/libebook/e-contact.c:207
-#| msgid "Jabber Work Id 2"
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Jabber Work ID 2"
 msgstr "Jabber — рабочий идентификатор 2"
 
-#: ../addressbook/libebook/e-contact.c:208
-#| msgid "Jabber Work Id 3"
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Jabber Work ID 3"
 msgstr "Jabber — рабочий идентификатор 3"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo! - домашнее экранное имя 1"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo! - домашнее экранное имя 2"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo! - домашнее экранное имя 3"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:215
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo! - рабочее экранное имя 1"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:216
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo! - рабочее экранное имя 2"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo! - рабочее экранное имя 3"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:218
 msgid "MSN Home Screen Name 1"
 msgstr "MSN - домашнее экранное имя 1"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Home Screen Name 2"
 msgstr "MSN - домашнее экранное имя 2"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Home Screen Name 3"
 msgstr "MSN - домашнее экранное имя 3"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:221
 msgid "MSN Work Screen Name 1"
 msgstr "MSN - рабочее экранное имя 1"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:222
 msgid "MSN Work Screen Name 2"
 msgstr "MSN - рабочее экранное имя 2"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:223
 msgid "MSN Work Screen Name 3"
 msgstr "MSN - рабочее экранное имя 3"
 
-#: ../addressbook/libebook/e-contact.c:221
-#| msgid "ICQ Home Id 1"
+#: ../addressbook/libebook/e-contact.c:224
 msgid "ICQ Home ID 1"
 msgstr "ICQ — домашний идентификатор 1"
 
-#: ../addressbook/libebook/e-contact.c:222
-#| msgid "ICQ Home Id 2"
+#: ../addressbook/libebook/e-contact.c:225
 msgid "ICQ Home ID 2"
 msgstr "ICQ — домашний идентификатор 2"
 
-#: ../addressbook/libebook/e-contact.c:223
-#| msgid "ICQ Home Id 3"
+#: ../addressbook/libebook/e-contact.c:226
 msgid "ICQ Home ID 3"
 msgstr "ICQ — домашний идентификатор 3"
 
-#: ../addressbook/libebook/e-contact.c:224
-#| msgid "ICQ Work Id 1"
+#: ../addressbook/libebook/e-contact.c:227
 msgid "ICQ Work ID 1"
 msgstr "ICQ — рабочий идентификатор 1"
 
-#: ../addressbook/libebook/e-contact.c:225
-#| msgid "ICQ Work Id 2"
+#: ../addressbook/libebook/e-contact.c:228
 msgid "ICQ Work ID 2"
 msgstr "ICQ — рабочий идентификатор 2"
 
-#: ../addressbook/libebook/e-contact.c:226
-#| msgid "ICQ Work Id 3"
+#: ../addressbook/libebook/e-contact.c:229
 msgid "ICQ Work ID 3"
 msgstr "ICQ — рабочий идентификатор 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook/e-contact.c:232
 msgid "Last Revision"
 msgstr "Последняя версия"
 
-#: ../addressbook/libebook/e-contact.c:230
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Name or Org"
 msgstr "Имя или Орг"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:236
 msgid "Address List"
 msgstr "Список адресов"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:237
 msgid "Home Address"
 msgstr "Домашний адрес"
 
-#: ../addressbook/libebook/e-contact.c:235
+#: ../addressbook/libebook/e-contact.c:238
 msgid "Work Address"
 msgstr "Рабочий адрес"
 
-#: ../addressbook/libebook/e-contact.c:236
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Other Address"
 msgstr "Другие адреса"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:239
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Category List"
 msgstr "Список категорий"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:242
+#: ../addressbook/libebook/e-contact.c:245
 msgid "Photo"
 msgstr "Фото"
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Logo"
 msgstr "Лого"
 
-#: ../addressbook/libebook/e-contact.c:245
+#: ../addressbook/libebook/e-contact.c:248
 msgid "Name"
 msgstr "Имя"
 
-#: ../addressbook/libebook/e-contact.c:246
+#: ../addressbook/libebook/e-contact.c:249
 msgid "Email List"
 msgstr "Список адресов эл. почты"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:252
 msgid "AIM Screen Name List"
 msgstr "Список экранных имен AIM"
 
-#: ../addressbook/libebook/e-contact.c:250
-#| msgid "GroupWise Id List"
+#: ../addressbook/libebook/e-contact.c:253
 msgid "GroupWise ID List"
 msgstr "Список идентификаторов Groupwise"
 
-#: ../addressbook/libebook/e-contact.c:251
-#| msgid "Jabber Id List"
+#: ../addressbook/libebook/e-contact.c:254
 msgid "Jabber ID List"
 msgstr "Список идентификаторов Jabber"
 
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:255
 msgid "Yahoo! Screen Name List"
 msgstr "Список экранных имен Yahoo!"
 
-#: ../addressbook/libebook/e-contact.c:253
+#: ../addressbook/libebook/e-contact.c:256
 msgid "MSN Screen Name List"
 msgstr "Список экранных имен MSN"
 
-#: ../addressbook/libebook/e-contact.c:254
-#| msgid "ICQ Id List"
+#: ../addressbook/libebook/e-contact.c:257
 msgid "ICQ ID List"
 msgstr "Список идентификаторов ICQ"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:259
 msgid "Wants HTML Mail"
 msgstr "Предпочитает почту в HTML"
 
-#: ../addressbook/libebook/e-contact.c:258
+#: ../addressbook/libebook/e-contact.c:261
 msgid "List"
 msgstr "Список"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:262
 msgid "List Show Addresses"
 msgstr "Список показывает адреса"
 
-#: ../addressbook/libebook/e-contact.c:261
+#: ../addressbook/libebook/e-contact.c:264
 msgid "Birth Date"
 msgstr "Дата рождения"
 
-#: ../addressbook/libebook/e-contact.c:262
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
+#: ../addressbook/libebook/e-contact.c:265
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:721
 msgid "Anniversary"
 msgstr "Годовщина"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:265
+#: ../addressbook/libebook/e-contact.c:268
 msgid "X.509 Certificate"
 msgstr "Сертификат X.509"
 
-#: ../addressbook/libebook/e-contact.c:267
-#| msgid "Gadu-Gadu Home Id 1"
+#: ../addressbook/libebook/e-contact.c:270
 msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu — домашний идентификатор 1"
 
-#: ../addressbook/libebook/e-contact.c:268
-#| msgid "Gadu-Gadu Home Id 2"
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu — домашний идентификатор 2"
 
-#: ../addressbook/libebook/e-contact.c:269
-#| msgid "Gadu-Gadu Home Id 3"
+#: ../addressbook/libebook/e-contact.c:272
 msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu — домашний идентификатор 3"
 
-#: ../addressbook/libebook/e-contact.c:270
-#| msgid "Gadu-Gadu Work Id 1"
+#: ../addressbook/libebook/e-contact.c:273
 msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu — рабочий идентификатор 1"
 
-#: ../addressbook/libebook/e-contact.c:271
-#| msgid "Gadu-Gadu Work Id 2"
+#: ../addressbook/libebook/e-contact.c:274
 msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu — рабочий идентификатор 2"
 
-#: ../addressbook/libebook/e-contact.c:272
-#| msgid "Gadu-Gadu Work Id 3"
+#: ../addressbook/libebook/e-contact.c:275
 msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu — рабочий идентификатор 3"
 
-#: ../addressbook/libebook/e-contact.c:273
-#| msgid "Gadu-Gadu Id List"
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Gadu-Gadu ID List"
 msgstr "Список идентификаторов Gadu-Gadu"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:279
 msgid "Geographic Information"
 msgstr "Географическая информация"
 
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Telephone"
 msgstr "Телефон"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Home Name 1"
 msgstr "Skype - домашнее экранное имя 1"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Home Name 2"
 msgstr "Skype - домашнее экранное имя 2"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Home Name 3"
 msgstr "Skype - домашнее экранное имя 3"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Work Name 1"
 msgstr "Skype - рабочее экранное имя 1"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:287
 msgid "Skype Work Name 2"
 msgstr "Skype - рабочее экранное имя 2"
 
-#: ../addressbook/libebook/e-contact.c:285
+#: ../addressbook/libebook/e-contact.c:288
 msgid "Skype Work Name 3"
 msgstr "Skype - рабочее экранное имя 3"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:289
 msgid "Skype Name List"
 msgstr "Список экранных имен Skype"
 
-#: ../addressbook/libebook/e-contact.c:288
+#: ../addressbook/libebook/e-contact.c:291
 msgid "SIP address"
 msgstr "Адрес SIP"
 
-#: ../addressbook/libebook/e-contact.c:1517
-#: ../addressbook/libebook/e-destination.c:739
+#: ../addressbook/libebook/e-contact.c:1542
+#: ../addressbook/libebook/e-destination.c:870
 msgid "Unnamed List"
 msgstr "Безымянный список"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:304
+#: ../addressbook/libedata-book/e-book-backend.c:19
+msgid "Cannot process, book backend is opening"
+msgstr "Невозможно обработать, открыт драйвер книги"
+
+#: ../addressbook/libedata-book/e-book-backend.c:91
 #, c-format
-msgid "Empty URI"
-msgstr "Ð\9fÑ\83Ñ\81Ñ\82ой URI"
+msgid "Unknown book property '%s'"
+msgstr "Ð\9dеизвеÑ\81Ñ\82ное Ñ\81войÑ\81Ñ\82во книги «%s»"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:323
-#: ../addressbook/libedata-book/e-data-book-factory.c:361
-#: ../calendar/libedata-cal/e-data-cal-factory.c:352
-#: ../calendar/libedata-cal/e-data-cal-factory.c:364
+#: ../addressbook/libedata-book/e-book-backend.c:103
 #, c-format
-msgid "Invalid source"
-msgstr "Неверный источник"
+msgid "Cannot change value of book property '%s'"
+msgstr "Невозможно изменить значение свойства книги «%s»"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:420
+#: ../camel/camel-db.c:470
+#, c-format
+msgid "Insufficient memory"
+msgstr "Недостаточно памяти"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:196
+#: ../addressbook/libedata-book/e-data-book.c:209
+#: ../addressbook/libedata-book/e-data-book.c:692
+msgid "Invalid query: "
+msgstr "Недопустимый запрос: "
 
-#: ../addressbook/libedata-book/e-data-book.c:173
-#: ../calendar/libedata-cal/e-data-cal.c:110
+#: ../addressbook/libedata-book/e-data-book.c:299
+#: ../calendar/libedata-cal/e-data-cal.c:413
 msgid "Success"
 msgstr "Успешно"
 
-#: ../addressbook/libedata-book/e-data-book.c:174
-#: ../calendar/libedata-cal/e-data-cal.c:111
-#| msgid "Repository is offline"
+#: ../addressbook/libedata-book/e-data-book.c:300
+#: ../calendar/libecal/e-cal.c:4430 ../calendar/libedata-cal/e-data-cal.c:414
+msgid "Backend is busy"
+msgstr "Драйвер занят"
+
+#: ../addressbook/libedata-book/e-data-book.c:301
+#: ../calendar/libedata-cal/e-data-cal.c:415
 msgid "Repository offline"
 msgstr "Репозиторий отключён от сети"
 
-#: ../addressbook/libedata-book/e-data-book.c:175
-#: ../calendar/libecal/e-cal.c:4159
-#: ../calendar/libedata-cal/e-data-cal.c:112
+#: ../addressbook/libedata-book/e-data-book.c:302
+#: ../calendar/libecal/e-cal.c:4444 ../calendar/libedata-cal/e-data-cal.c:416
 msgid "Permission denied"
 msgstr "Доступ запрещен"
 
-#: ../addressbook/libedata-book/e-data-book.c:176
-#| msgid "Object not found"
+#: ../addressbook/libedata-book/e-data-book.c:303
 msgid "Contact not found"
 msgstr "Контакт не найден"
 
-#: ../addressbook/libedata-book/e-data-book.c:177
-#| msgid "Object ID already exists"
+#: ../addressbook/libedata-book/e-data-book.c:304
 msgid "Contact ID already exists"
 msgstr "Идентификатор контакта уже существует"
 
-#: ../addressbook/libedata-book/e-data-book.c:178
-#: ../calendar/libedata-cal/e-data-cal.c:117
-#| msgid "Authentication failed"
+#: ../addressbook/libedata-book/e-data-book.c:305
+#: ../calendar/libedata-cal/e-data-cal.c:421
 msgid "Authentication Failed"
 msgstr "Сбой аутентификации"
 
-#: ../addressbook/libedata-book/e-data-book.c:179
-#: ../calendar/libedata-cal/e-data-cal.c:118
-#| msgid "Authentication required"
+#: ../addressbook/libedata-book/e-data-book.c:306
+#: ../calendar/libedata-cal/e-data-cal.c:422
 msgid "Authentication Required"
 msgstr "Требуется аутентификация"
 
-#: ../addressbook/libedata-book/e-data-book.c:180
-#: ../calendar/libedata-cal/e-data-cal.c:119
+#: ../addressbook/libedata-book/e-data-book.c:307
+#: ../calendar/libedata-cal/e-data-cal.c:423
 msgid "Unsupported field"
 msgstr "Неподдерживаемое поле"
 
-#: ../addressbook/libedata-book/e-data-book.c:181
-#: ../calendar/libedata-cal/e-data-cal.c:121
+#: ../addressbook/libedata-book/e-data-book.c:308
+#: ../calendar/libedata-cal/e-data-cal.c:425
 msgid "Unsupported authentication method"
 msgstr "Неподдерживаемый метод аутентификации"
 
-#: ../addressbook/libedata-book/e-data-book.c:182
-#: ../calendar/libedata-cal/e-data-cal.c:122
+#: ../addressbook/libedata-book/e-data-book.c:309
+#: ../calendar/libedata-cal/e-data-cal.c:426
 msgid "TLS not available"
 msgstr "TLS недоступен"
 
-#: ../addressbook/libedata-book/e-data-book.c:184
+#: ../addressbook/libedata-book/e-data-book.c:311
 msgid "Book removed"
 msgstr "Книга удалена"
 
-#: ../addressbook/libedata-book/e-data-book.c:185
-#: ../calendar/libedata-cal/e-data-cal.c:125
-#| msgid "This message is not available in offline mode."
+#: ../addressbook/libedata-book/e-data-book.c:312
+#: ../calendar/libedata-cal/e-data-cal.c:429
 msgid "Not available in offline mode"
 msgstr "Недоступно в автономном режиме"
 
-#: ../addressbook/libedata-book/e-data-book.c:186
-#: ../calendar/libedata-cal/e-data-cal.c:126
+#: ../addressbook/libedata-book/e-data-book.c:313
+#: ../calendar/libedata-cal/e-data-cal.c:430
 msgid "Search size limit exceeded"
 msgstr "Превышено ограничение на размер результатов поиска"
 
-#: ../addressbook/libedata-book/e-data-book.c:187
-#: ../calendar/libedata-cal/e-data-cal.c:127
+#: ../addressbook/libedata-book/e-data-book.c:314
+#: ../calendar/libedata-cal/e-data-cal.c:431
 msgid "Search time limit exceeded"
 msgstr "Превышено ограничение на время поиска"
 
-#: ../addressbook/libedata-book/e-data-book.c:188
-#: ../calendar/libedata-cal/e-data-cal.c:128
+#: ../addressbook/libedata-book/e-data-book.c:315
+#: ../calendar/libedata-cal/e-data-cal.c:432
 msgid "Invalid query"
 msgstr "Некорректный запрос"
 
-#: ../addressbook/libedata-book/e-data-book.c:189
-#: ../calendar/libedata-cal/e-data-cal.c:129
+#: ../addressbook/libedata-book/e-data-book.c:316
+#: ../calendar/libedata-cal/e-data-cal.c:433
 msgid "Query refused"
 msgstr "Запрос отклонён"
 
-#: ../addressbook/libedata-book/e-data-book.c:190
-#: ../calendar/libedata-cal/e-data-cal.c:130
-#| msgid "Could not cancel operation"
+#: ../addressbook/libedata-book/e-data-book.c:317
+#: ../calendar/libedata-cal/e-data-cal.c:434
 msgid "Could not cancel"
 msgstr "Не удалось отменить"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,                   N_("Other error") },
 #. { OtherError,                       N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:192
-#: ../calendar/libedata-cal/e-data-cal.c:132
+#: ../addressbook/libedata-book/e-data-book.c:319
+#: ../calendar/libedata-cal/e-data-cal.c:436
 msgid "Invalid server version"
 msgstr "Недопустимая версия сервера"
 
-#: ../addressbook/libedata-book/e-data-book.c:193
-#| msgid "Namespace"
+#: ../addressbook/libedata-book/e-data-book.c:320
 msgid "No space"
 msgstr "Недостаточно места"
 
-#: ../addressbook/libedata-book/e-data-book.c:194
-#: ../calendar/libecal/e-cal.c:4143
-#: ../calendar/libedata-cal/e-data-cal.c:133
+#: ../addressbook/libedata-book/e-data-book.c:321
+#: ../calendar/libecal/e-cal.c:4428 ../calendar/libedata-cal/e-data-cal.c:437
 msgid "Invalid argument"
 msgstr "Недопустимый аргумент"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:196
-#: ../calendar/libecal/e-cal.c:4182
-#: ../calendar/libedata-cal/e-data-cal.c:135
-#| msgid "Protocol not supported"
+#: ../addressbook/libedata-book/e-data-book.c:323
+#: ../calendar/libecal/e-cal.c:4467 ../calendar/libedata-cal/e-data-cal.c:439
 msgid "Not supported"
 msgstr "Не поддерживается"
 
-#: ../addressbook/libedata-book/e-data-book.c:204
-#: ../calendar/libedata-cal/e-data-cal.c:143
-#| msgid "Other Phone"
+#: ../addressbook/libedata-book/e-data-book.c:331
+#: ../calendar/libecal/e-cal-client.c:552
+#: ../calendar/libedata-cal/e-data-cal.c:447
 msgid "Other error"
 msgstr "Другая ошибка"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:325
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:534
+#: ../addressbook/libedata-book/e-data-book.c:864
+msgid "Cannot get contact: "
+msgstr "Невозможно получить контакт: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:556
+#: ../addressbook/libedata-book/e-data-book.c:578
+msgid "Empty query: "
+msgstr "Пустой запрос: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:600
+#: ../addressbook/libedata-book/e-data-book.c:930
+msgid "Cannot add contact: "
+msgstr "Невозможно добавить контакт: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:622
+#: ../addressbook/libedata-book/e-data-book.c:949
+msgid "Cannot modify contact: "
+msgstr "Невозможно изменить контакт: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:715
+#: ../calendar/libedata-cal/e-data-cal.c:822
+msgid "Cannot authenticate user: "
+msgstr "Невозможно проверить подлинность пользователя: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:777
+msgid "Cannot open book: "
+msgstr "Невозможно открыть книгу: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:791
+msgid "Cannot remove book: "
+msgstr "Невозможно удалить книгу: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:816
+msgid "Cannot refresh address book: "
+msgstr "Невозможно обновить адресную книгу: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:832
+msgid "Cannot get backend property: "
+msgstr "Невозможно получить свойство драйвера: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:848
+#: ../calendar/libedata-cal/e-data-cal.c:999
+msgid "Cannot set backend property: "
+msgstr "Невозможно назначить свойство драйвера: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:879
+msgid "Cannot get contact list: "
+msgstr "Невозможно получить список контактов: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:903
+msgid "Cannot get contact list uids: "
+msgstr "Невозможно получить идентификаторы списка контактов: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:967
+msgid "Cannot remove contacts: "
+msgstr "Невозможно удалить контакты: "
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:355
+#: ../addressbook/libedata-book/e-data-book-factory.c:388
+#: ../calendar/libedata-cal/e-data-cal-factory.c:406
 #, c-format
-#| msgid "Cannot open book"
-msgid "Cannot open book: %s"
-msgstr "Не удалось открыть книгу: %s"
+msgid "Empty URI"
+msgstr "Пустой URI"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:347
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:517
 #, c-format
-#| msgid "Cannot remove book"
-msgid "Cannot remove book: %s"
-msgstr "Не удалось открыть книгу: %s"
+msgid "Server is unreachable (%s)"
+msgstr "Сервер недоступен (%s)"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:364
-#: ../addressbook/libedata-book/e-data-book.c:383
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:545
 #, c-format
-#| msgid "Cannot get contact"
-msgid "Cannot get contact: %s"
-msgstr "Не удалось получить контакт: %s"
+msgid "Unexpected HTTP status code %d returned (%s)"
+msgstr "Получен неожиданный код (%d) состояния HTTP (%s)"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:402
-#, c-format
-#| msgid "Empty query"
-msgid "Empty query: %s"
-msgstr "Пустой запрос: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:418
-#, c-format
-#| msgid "Cannot get contact"
-msgid "Cannot get contact list: %s"
-msgstr "Не удалось получить список контактов: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:457
-#, c-format
-#| msgid "Cannot authenticate user"
-msgid "Cannot authenticate user: %s"
-msgstr "Не удалось аутентифицировать пользователя: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:472
-#: ../addressbook/libedata-book/e-data-book.c:491
-#, c-format
-#| msgid "Cannot add contact"
-msgid "Cannot add contact: %s"
-msgstr "Не удалось добавить контакт: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:513
-#: ../addressbook/libedata-book/e-data-book.c:532
-#, c-format
-#| msgid "Cannot modify contact"
-msgid "Cannot modify contact: %s"
-msgstr "Не удалось изменить контакт: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:571
-#, c-format
-#| msgid "Cannot remove contacts"
-msgid "Cannot remove contacts: %s"
-msgstr "Не удалось удалить контакты: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:610
-#, c-format
-#| msgid "Cannot get message %s: %s"
-msgid "Cannot get supported fields: %s"
-msgstr "Не удалось получить поддерживаемые поля: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:625
-#, c-format
-#| msgid "Cannot get message %s: %s"
-msgid "Cannot get required fields: %s"
-msgstr "Не удалось получить необходимые поля: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:640
-#, c-format
-#| msgid "Unsupported authentication method"
-msgid "Cannot get supported authentication methods: %s"
-msgstr "Не удалось получить поддерживаемые методы аутентификации: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:666
-#: ../addressbook/libedata-book/e-data-book.c:677
-#, c-format
-#| msgid "Invalid query"
-msgid "Invalid query: %s"
-msgstr "Недопустимый запрос: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:713
-#, c-format
-#| msgid "Cannot get changes"
-msgid "Cannot get changes: %s"
-msgstr "Не удалось получить изменения: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:755
-#, c-format
-#| msgid "Operation failed: %s"
-msgid "Cancel operation failed: %s"
-msgstr "Произошёл сбой при отмене операции: %s"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:521
-#, c-format
-msgid "Server is unreachable (%s)"
-msgstr "Сервер недоступен (%s)"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:549
-#, c-format
-#| msgid ""
-#| "Unexpected GnuPG status message encountered:\n"
-#| "\n"
-#| "%s"
-msgid "Unexpected HTTP status code %d returned (%s)"
-msgstr "Получен неожиданный код (%d) состояния HTTP (%s)"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2090
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2490
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2097
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2445
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1001,388 +1022,398 @@ msgstr ""
 "Сервер недоступен, календарь открыт в режиме «только чтение».\n"
 "Сообщение об ошибке: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4241
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4187
 msgid "Calendar doesn't support Free/Busy"
 msgstr "Календарь не поддерживает информацию о занятости"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:725
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
 msgid "Birthday"
 msgstr "День рождения"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:754
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:752
 #, c-format
 msgid "Birthday: %s"
 msgstr "День рождения: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:778
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:776
 #, c-format
 msgid "Anniversary: %s"
 msgstr "Годовщина: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:251
+#: ../calendar/backends/file/e-cal-backend-file.c:241
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "Не удалось сохранить данные календаря: Неверный URI."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:258
-#: ../calendar/backends/file/e-cal-backend-file.c:264
+#: ../calendar/backends/file/e-cal-backend-file.c:248
+#: ../calendar/backends/file/e-cal-backend-file.c:254
 msgid "Cannot save calendar data"
 msgstr "Не удалось сохранить данные календаря"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2105
-msgid "Reply Requested: by "
-msgstr "Запрошен ответ: "
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2110
-msgid "Reply Requested: When convenient"
-msgstr "Запрошен ответ: Когда удобно"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:329
-#| msgid "Loading %s items"
-msgid "Loading Appointment items"
-msgstr "Загрузка элементов «Встреча»"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:331
-#| msgid "Loading %s items"
-msgid "Loading Task items"
-msgstr "Загрузка элементов «Задача»"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:333
-#| msgid "Loading %s items"
-msgid "Loading Note items"
-msgstr "Загрузка элементов «Примечание»"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:335
-#| msgid "Loading %s items"
-msgid "Loading items"
-msgstr "Загрузка элементов"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:951
-msgid "Calendar"
-msgstr "Календарь"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1014
-msgid "Invalid server URI"
-msgstr "Неверный URI сервера"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1115
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1361
-#: ../calendar/backends/http/e-cal-backend-http.c:783
-#: ../calendar/backends/weather/e-cal-backend-weather.c:520
-msgid "Could not create cache file"
-msgstr "Не удалось создать файл кэша"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1127
-msgid "Could not create thread for populating cache"
-msgstr "Не удалось создать поток для заполнения кэша"
-
-#: ../calendar/backends/http/e-cal-backend-http.c:423
+#: ../calendar/backends/http/e-cal-backend-http.c:405
 msgid "Redirected to Invalid URI"
 msgstr "Переадресован на недопустимый URI"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:456
+#: ../calendar/backends/http/e-cal-backend-http.c:443
 msgid "Bad file format."
 msgstr "Неверный формат файла."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:463
+#: ../calendar/backends/http/e-cal-backend-http.c:450
 msgid "Not a calendar."
 msgstr "Не является календарём."
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:186
+#: ../calendar/backends/http/e-cal-backend-http.c:764
+#: ../calendar/backends/http/e-cal-backend-http.c:765
+#: ../calendar/backends/weather/e-cal-backend-weather.c:513
+msgid "Could not create cache file"
+msgstr "Не удалось создать файл кэша"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:183
 msgid "Could not retrieve weather data"
 msgstr "Не удалось получить информацию о погоде"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:286
+#: ../calendar/backends/weather/e-cal-backend-weather.c:285
 msgid "Weather: Fog"
 msgstr "Погода: Туман"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:287
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
 msgid "Weather: Cloudy Night"
 msgstr "Погода: Облачная ночь"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
 msgid "Weather: Cloudy"
 msgstr "Погода: Облачно"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:289
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
 msgid "Weather: Overcast"
 msgstr "Погода: Пасмурно"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:290
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
 msgid "Weather: Showers"
 msgstr "Погода: Дожди"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:291
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
 msgid "Weather: Snow"
 msgstr "Погода: Снег"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:292
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
 msgid "Weather: Clear Night"
 msgstr "Погода: Ясная ночь"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:293
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
 msgid "Weather: Sunny"
 msgstr "Погода: Солнечно"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:294
+#: ../calendar/backends/weather/e-cal-backend-weather.c:293
 msgid "Weather: Thunderstorms"
 msgstr "Погода: Грозы"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:440
+#: ../calendar/backends/weather/e-cal-backend-weather.c:439
 msgid "Forecast"
 msgstr "Прогноз"
 
-#: ../calendar/libecal/e-cal-component.c:1299
+#: ../calendar/libecal/e-cal.c:860 ../libedataserverui/e-book-auth-util.c:204
+#: ../libedataserverui/e-book-auth-util.c:427
+#: ../libedataserverui/e-client-utils.c:758
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "Введите пароль для %s (пользователь %s)"
+
+#.
+#. This password prompt will be prompted rarely. Since the key that is passed to
+#. the auth_func corresponds to the parent user.
+#.
+#: ../calendar/libecal/e-cal.c:874
+#, c-format
+msgid "Enter password for %s to enable proxy for user %s"
+msgstr "Введите пароль к %s для включения прокси для пользователя %s"
+
+#: ../calendar/libecal/e-cal.c:4432
+msgid "Repository is offline"
+msgstr "Репозиторий находится в автономном режиме"
+
+#: ../calendar/libecal/e-cal.c:4434
+msgid "No such calendar"
+msgstr "Нет такого календаря"
+
+#: ../calendar/libecal/e-cal.c:4436 ../calendar/libedata-cal/e-data-cal.c:418
+msgid "Object not found"
+msgstr "Объект не найден"
+
+#: ../calendar/libecal/e-cal.c:4438 ../calendar/libedata-cal/e-data-cal.c:419
+msgid "Invalid object"
+msgstr "Неверный объект"
+
+#: ../calendar/libecal/e-cal.c:4440
+msgid "URI not loaded"
+msgstr "URI не загружен"
+
+#: ../calendar/libecal/e-cal.c:4442
+msgid "URI already loaded"
+msgstr "URI уже загружен"
+
+#: ../calendar/libecal/e-cal.c:4446
+msgid "Unknown User"
+msgstr "Неизвестный пользователь"
+
+#: ../calendar/libecal/e-cal.c:4448 ../calendar/libedata-cal/e-data-cal.c:420
+msgid "Object ID already exists"
+msgstr "Идентификатор объекта уже существует"
+
+#: ../calendar/libecal/e-cal.c:4450
+msgid "Protocol not supported"
+msgstr "Протокол не поддерживается"
+
+#: ../calendar/libecal/e-cal.c:4452
+msgid "Operation has been canceled"
+msgstr "Операция отменена"
+
+#: ../calendar/libecal/e-cal.c:4454
+msgid "Could not cancel operation"
+msgstr "Не удалось отменить операцию"
+
+#: ../calendar/libecal/e-cal.c:4456
+msgid "Authentication failed"
+msgstr "Сбой проверки подлинности"
+
+#: ../calendar/libecal/e-cal.c:4458
+#: ../camel/providers/smtp/camel-smtp-transport.c:864
+msgid "Authentication required"
+msgstr "Требуется аутентификация"
+
+#: ../calendar/libecal/e-cal.c:4460
+msgid "A D-Bus exception has occurred"
+msgstr "Произошло исключение D-Bus"
+
+#: ../calendar/libecal/e-cal.c:4464
+msgid "No error"
+msgstr "Нет ошибки"
+
+#: ../calendar/libecal/e-cal-client.c:127
+msgctxt "CalClientError"
+msgid "No such calendar"
+msgstr "Нет такого календаря"
+
+#: ../calendar/libecal/e-cal-client.c:129
+msgctxt "CalClientError"
+msgid "Object not found"
+msgstr "Объект не найден"
+
+#: ../calendar/libecal/e-cal-client.c:131
+msgctxt "CalClientError"
+msgid "Invalid object"
+msgstr "Неверный объект"
+
+#: ../calendar/libecal/e-cal-client.c:133
+msgctxt "CalClientError"
+msgid "Unknown user"
+msgstr "Неизвестный пользователь"
+
+#: ../calendar/libecal/e-cal-client.c:135
+msgctxt "CalClientError"
+msgid "Object ID already exists"
+msgstr "Идентификатор объекта уже существует"
+
+#: ../calendar/libecal/e-cal-client.c:137
+msgctxt "CalClientError"
+msgid "Invalid range"
+msgstr "Недопустимый диапазон"
+
+#: ../calendar/libecal/e-cal-client.c:140
+msgctxt "CalClientError"
+msgid "Unknown error"
+msgstr "Неизвестная ошибка"
+
+#: ../calendar/libecal/e-cal-client.c:213
+msgid "D-Bus calendar proxy gone"
+msgstr "Исчез прокси D-Bus для календаря"
+
+#: ../calendar/libecal/e-cal-client.c:534
+msgid "Failed to run calendar factory"
+msgstr "Не удалось запустить фабрику календарей"
+
+#: ../calendar/libecal/e-cal-client.c:695
+msgid "Failed to find system calendar"
+msgstr "Не удалось найти системный календарь"
+
+#: ../calendar/libecal/e-cal-client.c:733
+#: ../calendar/libedata-cal/e-data-cal.c:427
+msgid "Calendar does not exist"
+msgstr "Календарь не существует"
+
+#: ../calendar/libecal/e-cal-client.c:843
+msgid "Invalid source type"
+msgstr "Неверный тип источника"
+
+#: ../calendar/libecal/e-cal-component.c:1298
 msgid "Untitled appointment"
 msgstr "Неозаглавленная встреча"
 
-#: ../calendar/libecal/e-cal-recur.c:3979
+#: ../calendar/libecal/e-cal-recur.c:3985
 msgid "1st"
 msgstr "1-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:3980
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "2nd"
 msgstr "2-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "3rd"
 msgstr "3-е"
 
-#: ../calendar/libecal/e-cal-recur.c:3982
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "4th"
 msgstr "4-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:3983
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "5th"
 msgstr "5-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:3984
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "6th"
 msgstr "6-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:3985
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "7th"
 msgstr "7-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:3986
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "8th"
 msgstr "8-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "9th"
 msgstr "9-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "10th"
 msgstr "10-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "11th"
 msgstr "11-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "12th"
 msgstr "12-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "13th"
 msgstr "13-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "14th"
 msgstr "14-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "15th"
 msgstr "15-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "16th"
 msgstr "16-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "17th"
 msgstr "17-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "18th"
 msgstr "18-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "19th"
 msgstr "19-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "20th"
 msgstr "20-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "21st"
 msgstr "21-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "22nd"
 msgstr "22-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "23rd"
 msgstr "23-е"
 
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "24th"
 msgstr "24-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "25th"
 msgstr "25-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "26th"
 msgstr "26-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "27th"
 msgstr "27-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "28th"
 msgstr "28-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "29th"
 msgstr "29-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "30th"
 msgstr "30-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "31st"
 msgstr "31-ое"
 
-#: ../calendar/libecal/e-cal-util.c:678
-#: ../calendar/libecal/e-cal-util.c:705
+#: ../calendar/libecal/e-cal-util.c:677 ../calendar/libecal/e-cal-util.c:704
+msgctxt "Priority"
 msgid "High"
 msgstr "Высокий"
 
-#: ../calendar/libecal/e-cal-util.c:680
-#: ../calendar/libecal/e-cal-util.c:707
+#: ../calendar/libecal/e-cal-util.c:679 ../calendar/libecal/e-cal-util.c:706
+msgctxt "Priority"
 msgid "Normal"
 msgstr "Нормальный"
 
-#: ../calendar/libecal/e-cal-util.c:682
-#: ../calendar/libecal/e-cal-util.c:709
+#: ../calendar/libecal/e-cal-util.c:681 ../calendar/libecal/e-cal-util.c:708
+msgctxt "Priority"
 msgid "Low"
 msgstr "Низкий"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:703
+#: ../calendar/libecal/e-cal-util.c:702
+msgctxt "Priority"
 msgid "Undefined"
 msgstr "Неопределённый"
 
-#: ../calendar/libecal/e-cal.c:1236
-#: ../libedataserverui/e-book-auth-util.c:206
-#: ../libedataserverui/e-book-auth-util.c:440
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "Введите пароль для %s (пользователь %s)"
+#: ../calendar/libedata-cal/e-cal-backend.c:34
+msgid "Cannot process, calendar backend is opening"
+msgstr "Невозможно обработать, открыт драйвер календаря"
 
-#.
-#. This password prompt will be prompted rarely. Since the key that is passed to
-#. the auth_func corresponds to the parent user.
-#.
-#: ../calendar/libecal/e-cal.c:1250
+#: ../calendar/libedata-cal/e-cal-backend.c:206
 #, c-format
-msgid "Enter password for %s to enable proxy for user %s"
-msgstr "Ð\92ведиÑ\82е паÑ\80олÑ\8c к %s длÑ\8f вклÑ\8eÑ\87ениÑ\8f пÑ\80окÑ\81и длÑ\8f полÑ\8cзоваÑ\82елÑ\8f %s"
+msgid "Unknown calendar property '%s'"
+msgstr "Ð\9dеизвеÑ\81Ñ\82ное Ñ\81войÑ\81Ñ\82во календаÑ\80Ñ\8f «%s»"
 
-#: ../calendar/libecal/e-cal.c:4145
-msgid "Backend is busy"
-msgstr "Компонент занят"
-
-#: ../calendar/libecal/e-cal.c:4147
-msgid "Repository is offline"
-msgstr "Репозиторий находится в автономном режиме"
-
-#: ../calendar/libecal/e-cal.c:4149
-msgid "No such calendar"
-msgstr "Нет такого календаря"
-
-#: ../calendar/libecal/e-cal.c:4151
-#: ../calendar/libedata-cal/e-data-cal.c:114
-#: ../servers/groupwise/e-gw-connection.c:235
-msgid "Object not found"
-msgstr "Объект не найден"
-
-#: ../calendar/libecal/e-cal.c:4153
-#: ../calendar/libedata-cal/e-data-cal.c:115
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid object"
-msgstr "Неверный объект"
-
-#: ../calendar/libecal/e-cal.c:4155
-msgid "URI not loaded"
-msgstr "URI не загружен"
-
-#: ../calendar/libecal/e-cal.c:4157
-msgid "URI already loaded"
-msgstr "URI уже загружен"
-
-#: ../calendar/libecal/e-cal.c:4161
-#: ../servers/groupwise/e-gw-connection.c:237
-msgid "Unknown User"
-msgstr "Неизвестный пользователь"
-
-#: ../calendar/libecal/e-cal.c:4163
-#: ../calendar/libedata-cal/e-data-cal.c:116
-msgid "Object ID already exists"
-msgstr "Идентификатор объекта уже существует"
-
-#: ../calendar/libecal/e-cal.c:4165
-msgid "Protocol not supported"
-msgstr "Протокол не поддерживается"
-
-#: ../calendar/libecal/e-cal.c:4167
-msgid "Operation has been canceled"
-msgstr "Операция отменена"
-
-#: ../calendar/libecal/e-cal.c:4169
-msgid "Could not cancel operation"
-msgstr "Не удалось отменить операцию"
-
-#: ../calendar/libecal/e-cal.c:4171
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1310
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1328
-#: ../camel/providers/groupwise/camel-groupwise-store.c:632
-#: ../camel/providers/groupwise/camel-groupwise-store.c:814
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:87
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#: ../calendar/libedata-cal/e-cal-backend.c:218
 #, c-format
-msgid "Authentication failed"
-msgstr "Сбой проверки подлинности"
-
-#: ../calendar/libecal/e-cal.c:4173
-#: ../camel/providers/smtp/camel-smtp-transport.c:775
-msgid "Authentication required"
-msgstr "Требуется аутентификация"
-
-#: ../calendar/libecal/e-cal.c:4175
-#| msgid "A CORBA exception has occurred"
-msgid "A D-Bus exception has occurred"
-msgstr "Произошло исключение D-Bus"
-
-#: ../calendar/libecal/e-cal.c:4179
-msgid "No error"
-msgstr "Нет ошибки"
+msgid "Cannot change value of calendar property '%s'"
+msgstr "Невозможно изменить значение свойства календаря «%s»"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:695
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:804
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1025
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1052
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:693
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:802
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1021
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1048
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "«%s» не предполагает аргументов"
@@ -1391,7 +1422,7 @@ msgstr "«%s» не предполагает аргументов"
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:212
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:290
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1090
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1086
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "«%s» предполагает один аргумент"
@@ -1399,7 +1430,7 @@ msgstr "«%s» предполагает один аргумент"
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:296
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:737
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:735
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "«%s» предполагает строку в качестве аргумента 1"
@@ -1407,13 +1438,15 @@ msgstr "«%s» предполагает строку в качестве арг
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
-msgstr "«%s» предусматривает, что аргумент 1 должен быть строкой даты в формате ISO 8601"
+msgstr ""
+"«%s» предусматривает, что аргумент 1 должен быть строкой даты в формате ISO "
+"8601"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:162
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:363
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:415
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:731
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:864
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "«%s» предполагает два аргумента"
@@ -1422,9 +1455,9 @@ msgstr "«%s» предполагает два аргумента"
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:218
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:260
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:369
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:421
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:870
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1096
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:419
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1092
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "«%s» предполагает тип time_t в качестве аргумента 1"
@@ -1435,289 +1468,210 @@ msgid "\"%s\" expects the second argument to be an integer"
 msgstr "«%s» предполагает целое число в качестве аргумента 2"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:377
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:430
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "«%s» предполагает тип time_t в качестве аргумента 1"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:745
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:743
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "«%s» предполагает строку в качестве аргумента 2"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:773
 #, c-format
-msgid "\"%s\" expects the first argument to be either \"any\", \"summary\", or \"description\", or \"location\", or \"attendee\", or \"organizer\", or \"classification\""
-msgstr "«%s» предполагает одно из «any», «summary», «description», «location», «attendee», «organizer» или «classification» в качестве аргумента 1"
+msgid ""
+"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
+"\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
+"\"classification\""
+msgstr ""
+"«%s» предполагает одно из «any», «summary», «description», «location», «attendee», "
+"«organizer» или «classification» в качестве аргумента 1"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:923
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "«%s» предполагает по крайней мере 1 аргумент"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:941
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:937
 #, c-format
-msgid "\"%s\" expects all arguments to be strings or one and only one argument to be a boolean false (#f)"
-msgstr "«%s» предполагает, что все аргументы - строки или единственный аргумент - логическая ложь (#f)"
+msgid ""
+"\"%s\" expects all arguments to be strings or one and only one argument to "
+"be a boolean false (#f)"
+msgstr ""
+"«%s» предполагает, что все аргументы - строки или единственный аргумент - "
+"логическая ложь (#f)"
 
-#: ../calendar/libedata-cal/e-data-cal.c:113
+#: ../calendar/libedata-cal/e-data-cal.c:417
 msgid "Invalid range"
 msgstr "Недопустимый диапазон"
 
-#: ../calendar/libedata-cal/e-data-cal.c:120
+#: ../calendar/libedata-cal/e-data-cal.c:424
 msgid "Unsupported method"
 msgstr "Неподдерживаемый метод"
 
-#: ../calendar/libedata-cal/e-data-cal.c:123
-#| msgid "Folder '%s' does not exist."
-msgid "Calendar does not exist"
-msgstr "Календарь не существует"
-
-#: ../calendar/libedata-cal/e-data-cal.c:124
-#| msgid "Unknown User"
+#: ../calendar/libedata-cal/e-data-cal.c:428
 msgid "Unknown user"
 msgstr "Неизвестный пользователь"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:610
-#, c-format
-#| msgid "Cannot retrieve calendar address"
-msgid "Cannot retrieve calendar address: %s"
-msgstr "Не удалось получить адрес календаря: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:635
-#, c-format
-#| msgid "Cannot retrieve calendar alarm e-mail address"
-msgid "Cannot retrieve calendar alarm e-mail address: %s"
-msgstr "Не удалось получить адрес эл. почты для отправки уведомлений календаря: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:660
-#, c-format
-#| msgid "Cannot retrieve calendar's ldap attribute"
-msgid "Cannot retrieve calendar's LDAP attribute: %s"
-msgstr "Не удалось получить атрибут LDAP: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:685
-#, c-format
-#| msgid "Cannot retrieve calendar scheduling information"
-msgid "Cannot retrieve calendar scheduling information: %s"
-msgstr "Не удалось получить расписание календаря: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:709
-#, c-format
-#| msgid "Cannot open calendar"
-msgid "Cannot open calendar: %s"
-msgstr "Не удалось открыть календарь: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:730
-#, c-format
-#| msgid "Cannot refresh calendar"
-msgid "Cannot refresh calendar: %s"
-msgstr "Не удалось обновить данные календаря: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:749
-#, c-format
-#| msgid "Cannot remove calendar"
-msgid "Cannot remove calendar: %s"
-msgstr "Не удалось удалить календарь: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:770
-#, c-format
-#| msgid "Cannot create calendar object"
-msgid "Cannot create calendar object: %s"
-msgstr "Не удалось создать объект календаря: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:798
-#, c-format
-#| msgid "Cannot modify calendar object"
-msgid "Cannot modify calendar object: %s"
-msgstr "Не удалось изменить объект календаря: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:824
-#, c-format
-#| msgid "Cannot remove calendar object"
-msgid "Cannot remove calendar object: %s"
-msgstr "Не удалось удалить объект календаря: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:845
-#, c-format
-#| msgid "Cannot receive calendar objects"
-msgid "Cannot receive calendar objects: %s"
-msgstr "Не удалось получить объекты календаря: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:864
-#, c-format
-#| msgid "Cannot discard calendar alarm"
-msgid "Cannot discard calendar alarm: %s"
-msgstr "Не удалось снять уведомление календаря: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:885
-#, c-format
-#| msgid "Cannot send calendar objects"
-msgid "Cannot send calendar objects: %s"
-msgstr "Не удалось отправить объекты календаря: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:912
-#, c-format
-#| msgid "Cannot retrieve default calendar object path"
-msgid "Cannot retrieve default calendar object path: %s"
-msgstr "Не удалось получить путь к объекту календаря по умолчанию: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:937
-#, c-format
-#| msgid "Cannot retrieve calendar object path"
-msgid "Cannot retrieve calendar object path: %s"
-msgstr "Не удалось получить путь к объекту календаря: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:962
-#, c-format
-#| msgid "Cannot retrieve calendar object list"
-msgid "Cannot retrieve calendar object list: %s"
-msgstr "Невозможно получить список объектов календаря: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:990
-#, c-format
-#| msgid "Could not retrieve attachment list"
-msgid "Could not retrieve attachment list: %s"
-msgstr "Не удалось получить список вложений: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1016
-#, c-format
-#| msgid "Could not complete calendar query"
-msgid "Could not complete calendar query: %s"
-msgstr "Не удалось завершить запрос календаря: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1041
-#, c-format
-#| msgid "Could not retrieve calendar time zone"
-msgid "Could not retrieve calendar time zone: %s"
-msgstr "Не удалось получить часовой пояс календаря: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1066
-#, c-format
-#| msgid "Could not add calendar time zone"
-msgid "Could not add calendar time zone: %s"
-msgstr "Не удалось добавить часовой пояс календаря: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1085
-#, c-format
-#| msgid "Could not set default calendar time zone"
-msgid "Could not set default calendar time zone: %s"
-msgstr "Не удалось задать часовой пояс календаря по умолчанию: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1108
-#, c-format
-#| msgid "Cannot retrieve calendar changes"
-msgid "Cannot retrieve calendar changes: %s"
-msgstr "Не удалось получить изменения календаря: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1139
-#, c-format
-#| msgid "Cannot retrieve calendar free/busy list"
-msgid "Cannot retrieve calendar free/busy list: %s"
-msgstr "Не удалось получить список занятости дней: %s"
-
-#: ../calendar/libedata-cal/e-data-cal-factory.c:374
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:907
+msgid "Cannot open calendar: "
+msgstr "Невозможно открыть календарь: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:928
+msgid "Cannot remove calendar: "
+msgstr "Невозможно удалить календарь: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:953
+msgid "Cannot refresh calendar: "
+msgstr "Невозможно обновить календарь: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:977
+msgid "Cannot retrieve backend property: "
+msgstr "Невозможно получить свойство драйвера: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1023
+msgid "Cannot retrieve calendar object path: "
+msgstr "Невозможно получить путь объекта календаря: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1048
+msgid "Cannot retrieve calendar object list: "
+msgstr "Невозможно получить список объектов календаря: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1073
+msgid "Cannot retrieve calendar free/busy list: "
+msgstr "Невозможно получить список свободных/занятых дней календаря: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1099
+msgid "Cannot create calendar object: "
+msgstr "Невозможно создать объект календаря: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1126
+msgid "Cannot modify calendar object: "
+msgstr "Невозможно изменить объект календаря: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1154
+msgid "Cannot remove calendar object: "
+msgstr "Невозможно удалить объект календаря: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1177
+msgid "Cannot receive calendar objects: "
+msgstr "Невозможно получить объекты календаря: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1202
+msgid "Cannot send calendar objects: "
+msgstr "Невозможно отправить объекты календаря: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1229
+msgid "Could not retrieve attachment uris: "
+msgstr "Невозможно получить uri вложений: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1253
+msgid "Could not discard alarm: "
+msgstr "Невозможно снять уведомление: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1277
+msgid "Could not get calendar view path: "
+msgstr "Невозможно получить путь просмотра календаря: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1302
+msgid "Could not retrieve calendar time zone: "
+msgstr "Невозможно получить часовой пояс календаря: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1324
+msgid "Could not add calendar time zone: "
+msgstr "Невозможно добавить часовой пояс календаря: "
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:379
+#, c-format
+msgid "Invalid call"
+msgstr "Некорректный вызов"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:420
 #, c-format
 msgid "Invalid URI"
 msgstr "Неверный URI"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:392
+#: ../calendar/libedata-cal/e-data-cal-factory.c:438
 #, c-format
 msgid "No backend factory for '%s' of '%s'"
 msgstr "Не указан драйвер фабрики для «%s» у «%s»"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:442
+#: ../calendar/libedata-cal/e-data-cal-factory.c:481
 #, c-format
 msgid "Could not instantiate backend"
 msgstr "Не удалось создать объект драйвера"
 
-#: ../camel/camel-cipher-context.c:204
+#: ../camel/camel-cipher-context.c:200
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "Подпись не поддерживается этим шифром"
 
-#: ../camel/camel-cipher-context.c:217
+#: ../camel/camel-cipher-context.c:213
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "Проверка не поддерживается этим шифром"
 
-#: ../camel/camel-cipher-context.c:233
+#: ../camel/camel-cipher-context.c:229
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "Шифрование не поддерживается этим шифром"
 
-#: ../camel/camel-cipher-context.c:247
+#: ../camel/camel-cipher-context.c:243
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "Расшифровка не поддерживается этим шифром"
 
-#: ../camel/camel-cipher-context.c:260
+#: ../camel/camel-cipher-context.c:256
 #, c-format
 msgid "You may not import keys with this cipher"
 msgstr "Импорт ключей не поддерживается этим шифром"
 
-#: ../camel/camel-cipher-context.c:274
+#: ../camel/camel-cipher-context.c:270
 #, c-format
 msgid "You may not export keys with this cipher"
 msgstr "Экспорт ключей не поддерживается этим шифром"
 
-#: ../camel/camel-cipher-context.c:815
+#: ../camel/camel-cipher-context.c:812
 msgid "Signing message"
 msgstr "Сообщение подписывается"
 
-#: ../camel/camel-cipher-context.c:1056
+#: ../camel/camel-cipher-context.c:1053
 msgid "Encrypting message"
 msgstr "Сообщение шифруется"
 
-#: ../camel/camel-cipher-context.c:1183
+#: ../camel/camel-cipher-context.c:1180
 msgid "Decrypting message"
 msgstr "Сообщение расшифровывается"
 
-#: ../camel/camel-data-cache.c:181
+#: ../camel/camel-data-cache.c:178
 #, c-format
 msgid "Unable to create cache path"
 msgstr "Не удалось создать путь для кэша"
 
-#: ../camel/camel-data-cache.c:499
+#: ../camel/camel-data-cache.c:495
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Не удалось удалить кэшированный элемент: %s: %s"
 
-#: ../camel/camel-data-wrapper.c:147
-#, c-format
-#| msgid "No such message available."
-msgid "No stream available"
-msgstr "Поток недоступен"
-
-#: ../camel/camel-db.c:455
-#, c-format
-msgid "Insufficient memory"
-msgstr "Недостаточно памяти"
-
 #: ../camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
@@ -1745,27 +1699,24 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Синхронизация с сервером"
 
-#: ../camel/camel-disco-folder.c:67
-#: ../camel/camel-offline-folder.c:83
+#: ../camel/camel-disco-folder.c:71 ../camel/camel-offline-folder.c:89
 msgid "Downloading new messages for offline mode"
 msgstr "Новые сообщения загружаются для автономной работы"
 
-#: ../camel/camel-disco-folder.c:402
+#: ../camel/camel-disco-folder.c:406
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Подготовка папки «%s» для автономной работы"
 
-#: ../camel/camel-disco-folder.c:468
-#: ../camel/camel-offline-folder.c:316
+#: ../camel/camel-disco-folder.c:472 ../camel/camel-offline-folder.c:321
 msgid "Copy folder content locally for offline operation"
 msgstr "Скопировать содержимое папки на локальную машину для автономной работы"
 
-#: ../camel/camel-disco-store.c:420
-#: ../camel/providers/groupwise/camel-groupwise-store.c:232
-#: ../camel/providers/imap/camel-imap-store.c:1250
-#: ../camel/providers/imap/camel-imap-store.c:1771
-#: ../camel/providers/imap/camel-imap-store.c:2244
-#: ../camel/providers/imap/camel-imap-store.c:3094
+#: ../camel/camel-disco-store.c:436
+#: ../camel/providers/imap/camel-imap-store.c:1179
+#: ../camel/providers/imap/camel-imap-store.c:1901
+#: ../camel/providers/imap/camel-imap-store.c:2384
+#: ../camel/providers/imap/camel-imap-store.c:3205
 #: ../camel/providers/imapx/camel-imapx-folder.c:298
 #: ../camel/providers/imapx/camel-imapx-folder.c:331
 #: ../camel/providers/imapx/camel-imapx-folder.c:385
@@ -1773,108 +1724,147 @@ msgstr "Скопировать содержимое папки на локаль
 #: ../camel/providers/imapx/camel-imapx-folder.c:465
 #: ../camel/providers/imapx/camel-imapx-folder.c:505
 #: ../camel/providers/imapx/camel-imapx-folder.c:541
-#: ../camel/providers/imapx/camel-imapx-store.c:277
-#: ../camel/providers/imapx/camel-imapx-store.c:1299
-#: ../camel/providers/imapx/camel-imapx-store.c:1387
-#: ../camel/providers/imapx/camel-imapx-store.c:1422
+#: ../camel/providers/imapx/camel-imapx-store.c:348
+#: ../camel/providers/imapx/camel-imapx-store.c:1364
+#: ../camel/providers/imapx/camel-imapx-store.c:1452
+#: ../camel/providers/imapx/camel-imapx-store.c:1492
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "Для завершения данной операции необходимо подключение к сети"
 
-#: ../camel/camel-file-utils.c:719
+#: ../camel/camel-file-utils.c:722
 #, c-format
 msgid "Canceled"
 msgstr "Отменено"
 
-#: ../camel/camel-filter-driver.c:839
-#: ../camel/camel-filter-search.c:582
+#: ../camel/camel-filter-driver.c:818 ../camel/camel-filter-search.c:628
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Сбой при создании дочернего процесса «%s»: %s"
 
-#: ../camel/camel-filter-driver.c:886
+#: ../camel/camel-filter-driver.c:866
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Неверный поток сообщений получен из %s: %s"
 
-#: ../camel/camel-filter-driver.c:1073
-#: ../camel/camel-filter-driver.c:1082
+#: ../camel/camel-filter-driver.c:1053 ../camel/camel-filter-driver.c:1062
 msgid "Syncing folders"
 msgstr "Синхронизация папок"
 
-#: ../camel/camel-filter-driver.c:1170
-#: ../camel/camel-filter-driver.c:1620
+#: ../camel/camel-filter-driver.c:1150 ../camel/camel-filter-driver.c:1594
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Не удалось разобрать фильтр: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1181
-#: ../camel/camel-filter-driver.c:1631
+#: ../camel/camel-filter-driver.c:1161 ../camel/camel-filter-driver.c:1605
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Ошибка выполнения фильтра: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1278
+#: ../camel/camel-filter-driver.c:1258
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "Не удалось открыть папку спула"
 
-#: ../camel/camel-filter-driver.c:1289
+#: ../camel/camel-filter-driver.c:1269
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "Не удалось обработать папку спула"
 
-#: ../camel/camel-filter-driver.c:1307
+#: ../camel/camel-filter-driver.c:1287
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Получение сообщения %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1314
-#: ../camel/camel-filter-driver.c:1336
+#: ../camel/camel-filter-driver.c:1294 ../camel/camel-filter-driver.c:1316
 #, c-format
 msgid "Failed on message %d"
 msgstr "Сбой на сообщении %d"
 
-#: ../camel/camel-filter-driver.c:1351
-#: ../camel/camel-filter-driver.c:1456
+#: ../camel/camel-filter-driver.c:1331 ../camel/camel-filter-driver.c:1432
 msgid "Syncing folder"
 msgstr "Синхронизация папки"
 
-#: ../camel/camel-filter-driver.c:1356
-#: ../camel/camel-filter-driver.c:1462
+#: ../camel/camel-filter-driver.c:1336 ../camel/camel-filter-driver.c:1438
 msgid "Complete"
 msgstr "Завершена"
 
-#: ../camel/camel-filter-driver.c:1420
+#: ../camel/camel-filter-driver.c:1396
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Получение сообщения %d из %d"
 
-#: ../camel/camel-filter-driver.c:1438
+#: ../camel/camel-filter-driver.c:1414
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Сбой на сообщении %d из %d"
 
-#: ../camel/camel-filter-search.c:135
+#: ../camel/camel-filter-search.c:137
 msgid "Failed to retrieve message"
 msgstr "Сбой при получении сообщения"
 
-#: ../camel/camel-filter-search.c:401
+#: ../camel/camel-filter-search.c:403
 msgid "Invalid arguments to (system-flag)"
 msgstr "Недопустимые аргументы для system-flag"
 
-#: ../camel/camel-filter-search.c:416
+#: ../camel/camel-filter-search.c:418
 msgid "Invalid arguments to (user-tag)"
 msgstr "Недопустимые аргументы для user-tag"
 
-#: ../camel/camel-filter-search.c:744
-#: ../camel/camel-filter-search.c:753
+#: ../camel/camel-filter-search.c:799 ../camel/camel-filter-search.c:808
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Ошибка выполнения поиска фильтра: %s: %s"
 
-#: ../camel/camel-folder-search.c:345
-#: ../camel/camel-folder-search.c:456
+#: ../camel/camel-folder.c:243
+#, c-format
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "Изучение нового спам-сообщения в «%s»"
+msgstr[1] "Изучение новых спам-сообщений в «%s»"
+msgstr[2] "Изучение новых спам-сообщений в «%s»"
+
+#: ../camel/camel-folder.c:283
+#, c-format
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "Изучение нового сообщения в «%s»"
+msgstr[1] "Изучение новых сообщений в «%s»"
+msgstr[2] "Изучение новых сообщений в «%s»"
+
+#: ../camel/camel-folder.c:331
+#, c-format
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "Фильтрация нового сообщения в «%s»"
+msgstr[1] "Фильтрация новых сообщений в «%s»"
+msgstr[2] "Фильтрация новых сообщений в «%s»"
+
+#: ../camel/camel-folder.c:898
+#: ../camel/providers/local/camel-maildir-folder.c:318
+msgid "Moving messages"
+msgstr "Перемещение сообщений"
+
+#: ../camel/camel-folder.c:901
+msgid "Copying messages"
+msgstr "Копирование сообщений"
+
+#: ../camel/camel-folder.c:1156
+#, c-format
+msgid "Quota information not supported for folder '%s'"
+msgstr "Информация о квоте не поддерживается для папки «%s»"
+
+#: ../camel/camel-folder.c:3265
+#, c-format
+msgid "Retrieving message '%s' in %s"
+msgstr "Получение сообщения «%s» в %s"
+
+#: ../camel/camel-folder.c:3389
+#, c-format
+msgid "Retrieving quota information for '%s'"
+msgstr "Получение информации о квоте для «%s»"
+
+#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
 #: ../camel/camel-folder-search.c:627
 #, c-format
 msgid ""
@@ -1884,8 +1874,7 @@ msgstr ""
 "Ошибка в регулярном выражении «%s»:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:357
-#: ../camel/camel-folder-search.c:468
+#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:468
 #: ../camel/camel-folder-search.c:639
 #, c-format
 msgid ""
@@ -1895,89 +1884,48 @@ msgstr ""
 "Ошибка при выполнении выражения поиска «%s»:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:843
-#: ../camel/camel-folder-search.c:885
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:844 ../camel/camel-folder-search.c:887
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) требует единственного логического результата"
 
-#: ../camel/camel-folder-search.c:938
+#. Translators: Each '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:941
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) запрещено в %s"
 
-#: ../camel/camel-folder-search.c:944
-#: ../camel/camel-folder-search.c:951
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:948 ../camel/camel-folder-search.c:956
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) требует строку соответствия"
 
-#: ../camel/camel-folder-search.c:978
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:984
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) ожидает результат в виде массива"
 
-#: ../camel/camel-folder-search.c:987
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:994
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) требует набор папок"
 
-#: ../camel/camel-folder.c:220
-#, c-format
-#| msgid "Scanning for changed messages in %s"
-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:244
-#, c-format
-#| msgid "Scanning for changed messages in %s"
-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:270
-#, c-format
-#| msgid "Filtering new message(s)"
-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:879
-#: ../camel/providers/local/camel-maildir-folder.c:293
-msgid "Moving messages"
-msgstr "Перемещение сообщений"
-
-#: ../camel/camel-folder.c:882
-msgid "Copying messages"
-msgstr "Копирование сообщений"
-
-#: ../camel/camel-folder.c:3251
-#, c-format
-#| msgid "Retrieving POP message %d"
-msgid "Retrieving message '%s'"
-msgstr "Получение сообщения «%s»"
-
-#: ../camel/camel-gpg-context.c:646
-#: ../camel/camel-gpg-context.c:651
-#: ../camel/camel-gpg-context.c:1276
+#: ../camel/camel-gpg-context.c:642 ../camel/camel-gpg-context.c:647
+#: ../camel/camel-gpg-context.c:1272
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Сбой при исполнении gpg: %s"
 
-#: ../camel/camel-gpg-context.c:651
-#: ../camel/providers/smtp/camel-smtp-transport.c:723
-#: ../camel/providers/smtp/camel-smtp-transport.c:778
+#: ../camel/camel-gpg-context.c:647
+#: ../camel/providers/smtp/camel-smtp-transport.c:867
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: ../camel/camel-gpg-context.c:715
+#: ../camel/camel-gpg-context.c:711
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1988,25 +1936,24 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:732
+#: ../camel/camel-gpg-context.c:728
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "Ошибка при обработке подсказки gpg userid."
 
-#: ../camel/camel-gpg-context.c:757
-#: ../camel/camel-gpg-context.c:772
+#: ../camel/camel-gpg-context.c:753 ../camel/camel-gpg-context.c:768
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "Ошибка при обработке запроса парольной фразы gpg."
 
-#: ../camel/camel-gpg-context.c:793
+#: ../camel/camel-gpg-context.c:789
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
 "SmartCard: \"%s\""
 msgstr "Для разблокирования смарткарты необходимо ввести PIN: «%s»"
 
-#: ../camel/camel-gpg-context.c:797
+#: ../camel/camel-gpg-context.c:793
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2015,120 +1962,88 @@ msgstr ""
 "Введите ключевую фразу, чтобы разблокировать\n"
 "ключ пользователя: «%s»"
 
-#: ../camel/camel-gpg-context.c:803
+#: ../camel/camel-gpg-context.c:799
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "Неожиданный запрос от GnuPG для «%s»"
 
-#: ../camel/camel-gpg-context.c:832
-#: ../camel/camel-net-utils.c:515
+#: ../camel/camel-gpg-context.c:828 ../camel/camel-net-utils.c:515
 #: ../camel/camel-tcp-stream-raw.c:255
-#: ../camel/providers/imapx/camel-imapx-server.c:4894
-#: ../camel/providers/imapx/camel-imapx-server.c:4911
-#: ../camel/providers/imapx/camel-imapx-store.c:199
-#: ../camel/providers/nntp/camel-nntp-summary.c:402
-#: ../camel/providers/pop3/camel-pop3-folder.c:364
-#: ../camel/providers/pop3/camel-pop3-folder.c:429
-#: ../camel/providers/pop3/camel-pop3-folder.c:504
-#: ../camel/providers/pop3/camel-pop3-store.c:487
-#: ../libedataserverui/e-book-auth-util.c:229
+#: ../camel/providers/imapx/camel-imapx-server.c:4981
+#: ../camel/providers/imapx/camel-imapx-server.c:4998
+#: ../camel/providers/imapx/camel-imapx-store.c:269
+#: ../camel/providers/nntp/camel-nntp-summary.c:409
+#: ../libedataserverui/e-book-auth-util.c:227
 #, c-format
-#| msgid "Canceled"
 msgid "Cancelled"
 msgstr "Отменено"
 
-#: ../camel/camel-gpg-context.c:850
+#: ../camel/camel-gpg-context.c:846
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr "Сбой при разблокировании секретного ключа: указано 3 некорректных парольных фразы."
+msgstr ""
+"Сбой при разблокировании секретного ключа: указано 3 некорректных парольных "
+"фразы."
 
-#: ../camel/camel-gpg-context.c:862
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Неожиданный ответ от GnuPG: %s"
 
-#: ../camel/camel-gpg-context.c:993
+#: ../camel/camel-gpg-context.c:989
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
-msgstr "Не удалось зашифровать это сообщение: Не определены корректные получатели"
+msgstr ""
+"Не удалось зашифровать это сообщение: Не определены корректные получатели"
 
-#: ../camel/camel-gpg-context.c:1539
-#: ../camel/camel-smime-context.c:828
-#| msgid "Could not generate signing data: %s"
+#: ../camel/camel-gpg-context.c:1535 ../camel/camel-smime-context.c:824
 msgid "Could not generate signing data: "
 msgstr "Не удалось создать данные подписи: "
 
-#: ../camel/camel-gpg-context.c:1586
-#: ../camel/camel-gpg-context.c:1786
-#: ../camel/camel-gpg-context.c:1896
-#: ../camel/camel-gpg-context.c:2042
-#: ../camel/camel-gpg-context.c:2141
-#: ../camel/camel-gpg-context.c:2189
+#: ../camel/camel-gpg-context.c:1584 ../camel/camel-gpg-context.c:1788
+#: ../camel/camel-gpg-context.c:1898 ../camel/camel-gpg-context.c:2045
+#: ../camel/camel-gpg-context.c:2145 ../camel/camel-gpg-context.c:2193
 msgid "Failed to execute gpg."
 msgstr "Сбой при исполнении gpg."
 
-#: ../camel/camel-gpg-context.c:1666
-#: ../camel/camel-gpg-context.c:1674
-#: ../camel/camel-gpg-context.c:1682
-#: ../camel/camel-gpg-context.c:1701
-#: ../camel/camel-smime-context.c:952
-#: ../camel/camel-smime-context.c:966
-#: ../camel/camel-smime-context.c:975
+#: ../camel/camel-gpg-context.c:1663 ../camel/camel-gpg-context.c:1671
+#: ../camel/camel-gpg-context.c:1679 ../camel/camel-gpg-context.c:1699
+#: ../camel/camel-smime-context.c:950 ../camel/camel-smime-context.c:964
+#: ../camel/camel-smime-context.c:973
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Не удалось проверить подпись сообщения: Неверный формат сообщения"
 
 #: ../camel/camel-gpg-context.c:1741
-#| msgid "Cannot verify message signature: Incorrect message format"
 msgid "Cannot verify message signature: "
 msgstr "Не удалось проверить подпись сообщения: "
 
-#: ../camel/camel-gpg-context.c:1862
-#| msgid "Could not generate encrypting data: %s"
+#: ../camel/camel-gpg-context.c:1864
 msgid "Could not generate encrypting data: "
 msgstr "Не удалось создать данные шифрования: "
 
-#: ../camel/camel-gpg-context.c:1915
+#: ../camel/camel-gpg-context.c:1917
 msgid "This is a digitally encrypted message part"
-msgstr "Это зашифрованная часть сообщения"
-
-#: ../camel/camel-gpg-context.c:1973
-#: ../camel/camel-gpg-context.c:1982
-#: ../camel/camel-gpg-context.c:2005
-#, c-format
-msgid "Cannot decrypt message: Incorrect message format"
-msgstr "Не удалось декодировать сообщение: Неверный формат сообщения"
-
-#: ../camel/camel-gpg-context.c:1993
-#, c-format
-msgid "Failed to decrypt MIME part: protocol error"
-msgstr "Сбой при декодировании части MIME: ошибка протокола"
-
-#: ../camel/camel-gpg-context.c:2082
-#: ../camel/camel-smime-context.c:1259
-msgid "Encrypted content"
-msgstr "Зашифрованное содержимое"
-
-#: ../camel/camel-lock-client.c:106
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Не удалось создать канал к блокиратору: %s"
+msgstr "Это зашифрованная часть сообщения"
 
-#: ../camel/camel-lock-client.c:130
+#: ../camel/camel-gpg-context.c:1975 ../camel/camel-gpg-context.c:1984
+#: ../camel/camel-gpg-context.c:2007
 #, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c запÑ\83Ñ\81Ñ\82иÑ\82Ñ\8c блокиÑ\80аÑ\82оÑ\80: %s"
+msgid "Cannot decrypt message: Incorrect message format"
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c декодиÑ\80оваÑ\82Ñ\8c Ñ\81ообÑ\89ение: Ð\9dевеÑ\80нÑ\8bй Ñ\84оÑ\80маÑ\82 Ñ\81ообÑ\89ениÑ\8f"
 
-#: ../camel/camel-lock-client.c:211
-#: ../camel/camel-lock-client.c:239
+#: ../camel/camel-gpg-context.c:1995
 #, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c заблокиÑ\80оваÑ\82Ñ\8c «%s»: оÑ\88ибка пÑ\80оÑ\82окола Ñ\81 блокиÑ\80аÑ\82оÑ\80ом"
+msgid "Failed to decrypt MIME part: protocol error"
+msgstr "Сбой пÑ\80и декодиÑ\80овании Ñ\87аÑ\81Ñ\82и MIME: оÑ\88ибка пÑ\80оÑ\82окола"
 
-#: ../camel/camel-lock-client.c:227
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Не удалось заблокировать «%s»"
+#: ../camel/camel-gpg-context.c:2086 ../camel/camel-smime-context.c:1261
+msgid "Encrypted content"
+msgstr "Зашифрованное содержимое"
+
+#: ../camel/camel-http-stream.c:546 ../camel/camel-stream-null.c:78
+msgid "Only reset to beginning is supported with CamelHttpStream"
+msgstr "Для CamelHttpStream поддерживается только переход к началу"
 
 #: ../camel/camel-lock.c:102
 #, c-format
@@ -2137,7 +2052,6 @@ msgstr "Не удалось создать файл блокировки для
 
 #: ../camel/camel-lock.c:145
 #, c-format
-#| msgid "Timed out trying to get lock file on %s. Try again later."
 msgid "Timed out trying to get lock file on %s.  Try again later."
 msgstr "Превышено время ожидания  блокировки файла %s. Попробуйте позже."
 
@@ -2151,6 +2065,26 @@ msgstr "Не удалось получить блокировку использ
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Не удалось получить блокировку используя flock(2): %s"
 
+#: ../camel/camel-lock-client.c:106
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Не удалось создать канал к блокиратору: %s"
+
+#: ../camel/camel-lock-client.c:130
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Не удалось запустить блокиратор: %s"
+
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "Не удалось заблокировать «%s»: ошибка протокола с блокиратором"
+
+#: ../camel/camel-lock-client.c:227
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Не удалось заблокировать «%s»"
+
 #: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -2200,29 +2134,40 @@ msgstr "Ошибка при чтении почтового файла: %s"
 msgid "Error writing mail temp file: %s"
 msgstr "Ошибка сохранения временного почтового файла: %s"
 
-#: ../camel/camel-movemail.c:483
-#: ../camel/camel-movemail.c:552
+#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Ошибка копирования временного почтового файла: %s"
 
-#: ../camel/camel-multipart-signed.c:322
+#: ../camel/camel-multipart-signed.c:296
 #, c-format
-#| msgid "No description available"
 msgid "No content available"
 msgstr "Содержимое недоступно"
 
-#: ../camel/camel-multipart-signed.c:330
+#: ../camel/camel-multipart-signed.c:304
 #, c-format
-#| msgid "No description available"
 msgid "No signature available"
 msgstr "Подпись недоступна"
 
-#: ../camel/camel-multipart-signed.c:658
+#: ../camel/camel-multipart-signed.c:688
 #, c-format
 msgid "parse error"
 msgstr "Ошибка обработки"
 
+#: ../camel/camel-network-service.c:91
+#, c-format
+msgid "Could not connect to %s: %s"
+msgstr "Не удалось подключиться к %s: %s"
+
+#: ../camel/camel-network-service.c:92
+msgid "SSL unavailable"
+msgstr "SSL недоступен"
+
+#: ../camel/camel-network-service.c:115
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "Не удалось подключиться к %s: "
+
 #: ../camel/camel-net-utils.c:695
 #, c-format
 msgid "Resolving: %s"
@@ -2250,13 +2195,12 @@ msgstr "Не удалось определить узел"
 msgid "Name lookup failed: %s"
 msgstr "Не удалось определить узел: %s"
 
-#: ../camel/camel-offline-folder.c:193
+#: ../camel/camel-offline-folder.c:198
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "Синхронизация сообщений в папке «%s» на диск"
 
-#: ../camel/camel-offline-journal.c:144
-#: ../camel/camel-offline-journal.c:174
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:174
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "Не удалось записать журнал автономной работы для папки «%s»: %s"
@@ -2269,23 +2213,23 @@ msgstr "Провайдер виртуальных папок эл. почты"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Для чтения почты по запросу к другому набору папок"
 
-#: ../camel/camel-provider.c:188
+#: ../camel/camel-provider.c:192
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
-msgstr "Не удалось загрузить %s: Загрузка модулей не поддерживается в этой системе."
+msgstr ""
+"Не удалось загрузить %s: Загрузка модулей не поддерживается в этой системе."
 
-#: ../camel/camel-provider.c:197
+#: ../camel/camel-provider.c:201
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Не удалось загрузить %s: %s"
 
-#: ../camel/camel-provider.c:206
+#: ../camel/camel-provider.c:210
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Не удалось загрузить %s: в модуле нет инициализирующего кода."
 
-#: ../camel/camel-provider.c:388
-#: ../camel/camel-session.c:206
+#: ../camel/camel-provider.c:391 ../camel/camel-session.c:351
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "Провайдер для протокола «%s» не доступен"
@@ -2330,436 +2274,479 @@ msgstr ""
 "Неверная трассировочная информация:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:45
+#: ../camel/camel-sasl-cram-md5.c:41
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:47
-msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
-msgstr "Подключение к серверу будет производиться с использованием для идентификации протокола CRAM-MD5, если сервер его поддерживает."
+#: ../camel/camel-sasl-cram-md5.c:43
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+"Подключение к серверу будет производиться с использованием для идентификации "
+"протокола CRAM-MD5, если сервер его поддерживает."
 
-#: ../camel/camel-sasl-digest-md5.c:58
+#: ../camel/camel-sasl-digest-md5.c:54
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:60
-msgid "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it."
-msgstr "Подключение к серверу будет производиться с использованием зашифрованного пароля DIGEST-MD5, если сервер его поддерживает."
+#: ../camel/camel-sasl-digest-md5.c:56
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"Подключение к серверу будет производиться с использованием зашифрованного "
+"пароля DIGEST-MD5, если сервер его поддерживает."
 
-#: ../camel/camel-sasl-digest-md5.c:821
+#: ../camel/camel-sasl-digest-md5.c:820
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Слишком длинный ответ от сервера (>2048 байт)"
 
-#: ../camel/camel-sasl-digest-md5.c:832
+#: ../camel/camel-sasl-digest-md5.c:831
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "Недопустимый ответ сервера\n"
 
-#: ../camel/camel-sasl-digest-md5.c:840
+#: ../camel/camel-sasl-digest-md5.c:839
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "Ответ сервера содержит недопустимый жетон «Качество защиты»"
 
-#: ../camel/camel-sasl-digest-md5.c:875
+#: ../camel/camel-sasl-digest-md5.c:873
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "Ответ сервера не содержит информации об авторизации"
 
-#: ../camel/camel-sasl-digest-md5.c:896
+#: ../camel/camel-sasl-digest-md5.c:894
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "Ответ сервера содержит неполную информацию об авторизации"
 
-#: ../camel/camel-sasl-digest-md5.c:909
+#: ../camel/camel-sasl-digest-md5.c:907
 #, c-format
 msgid "Server response does not match"
 msgstr "Ответ сервера не совпадает"
 
-#: ../camel/camel-sasl-gssapi.c:85
+#: ../camel/camel-sasl-gssapi.c:86
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:87
+#: ../camel/camel-sasl-gssapi.c:88
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "Подключение к серверу будет производиться с использованием Kerberos 5."
 
-#: ../camel/camel-sasl-gssapi.c:128
-msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation."
-msgstr "Указанный механизм не поддерживается предоставленными средствами, либо не распознается в этой реализации."
+#: ../camel/camel-sasl-gssapi.c:129
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
+msgstr ""
+"Указанный механизм не поддерживается предоставленными средствами, либо не "
+"распознается в этой реализации."
 
-#: ../camel/camel-sasl-gssapi.c:133
+#: ../camel/camel-sasl-gssapi.c:134
 msgid "The provided target_name parameter was ill-formed."
 msgstr "Предоставленный параметр target_name сформирован неверно."
 
-#: ../camel/camel-sasl-gssapi.c:136
-msgid "The provided target_name parameter contained an invalid or unsupported type of name."
-msgstr "Предоставленный параметр target_name содержит неверный или неподдерживаемый тип имени."
+#: ../camel/camel-sasl-gssapi.c:137
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
+msgstr ""
+"Предоставленный параметр target_name содержит неверный или неподдерживаемый "
+"тип имени."
 
-#: ../camel/camel-sasl-gssapi.c:140
-msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
-msgstr "input_token содержит не такую привязку к каналам, как указано в параметре input_chan_bindings."
+#: ../camel/camel-sasl-gssapi.c:141
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
+msgstr ""
+"input_token содержит не такую привязку к каналам, как указано в параметре "
+"input_chan_bindings."
 
-#: ../camel/camel-sasl-gssapi.c:145
-msgid "The input_token contains an invalid signature, or a signature that could not be verified."
-msgstr "input_token содержит неверную подпись, или подпись, которая не может быть проверена."
+#: ../camel/camel-sasl-gssapi.c:146
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
+msgstr ""
+"input_token содержит неверную подпись, или подпись, которая не может быть "
+"проверена."
 
-#: ../camel/camel-sasl-gssapi.c:149
-msgid "The supplied credentials were not valid for context initiation, or the credential handle did not reference any credentials."
-msgstr "Предоставленные удостоверения были не действительны для инициализации контекста, либо обработчик удостоверения не ссылается на удостоверения."
+#: ../camel/camel-sasl-gssapi.c:150
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
+msgstr ""
+"Предоставленные удостоверения были не действительны для инициализации "
+"контекста, либо обработчик удостоверения не ссылается на удостоверения."
 
-#: ../camel/camel-sasl-gssapi.c:154
+#: ../camel/camel-sasl-gssapi.c:155
 msgid "The supplied context handle did not refer to a valid context."
-msgstr "Указанный обработчик контекста не ссылается на действительный контекст."
+msgstr ""
+"Указанный обработчик контекста не ссылается на действительный контекст."
 
-#: ../camel/camel-sasl-gssapi.c:157
+#: ../camel/camel-sasl-gssapi.c:158
 msgid "The consistency checks performed on the input_token failed."
 msgstr "Сбой проверки целостности элемента input_token."
 
-#: ../camel/camel-sasl-gssapi.c:160
+#: ../camel/camel-sasl-gssapi.c:161
 msgid "The consistency checks performed on the credential failed."
 msgstr "Сбой проверки целостности удостоверений."
 
-#: ../camel/camel-sasl-gssapi.c:163
+#: ../camel/camel-sasl-gssapi.c:164
 msgid "The referenced credentials have expired."
 msgstr "Срок действия упомянутых удостоверений истёк."
 
-#: ../camel/camel-sasl-gssapi.c:169
-#: ../camel/camel-sasl-gssapi.c:309
-#: ../camel/camel-sasl-gssapi.c:353
-#: ../camel/camel-sasl-gssapi.c:370
-#: ../camel/providers/smtp/camel-smtp-transport.c:1256
+#: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:312
+#: ../camel/camel-sasl-gssapi.c:356 ../camel/camel-sasl-gssapi.c:373
+#: ../camel/providers/smtp/camel-smtp-transport.c:1336
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "Неверный ответ от сервера при идентификации."
 
-#: ../camel/camel-sasl-gssapi.c:382
+#: ../camel/camel-sasl-gssapi.c:385
 #, c-format
 msgid "Unsupported security layer."
 msgstr "Неподдерживаемый уровень безопасности."
 
-#: ../camel/camel-sasl-login.c:39
+#: ../camel/camel-sasl-login.c:35
 msgid "Login"
 msgstr "Регистрация"
 
-#: ../camel/camel-sasl-login.c:41
-#: ../camel/camel-sasl-plain.c:45
+#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
 msgid "This option will connect to the server using a simple password."
-msgstr "Подключение к серверу будет производиться с использованием незашифрованного пароля."
+msgstr ""
+"Подключение к серверу будет производиться с использованием незашифрованного "
+"пароля."
 
-#: ../camel/camel-sasl-login.c:95
+#: ../camel/camel-sasl-login.c:92
 #, c-format
 msgid "Unknown authentication state."
 msgstr "Неизвестное состояние идентификации."
 
-#: ../camel/camel-sasl-ntlm.c:41
+#: ../camel/camel-sasl-ntlm.c:42
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:43
-msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
-msgstr "Эта опция подключает к серверу, основанному на Windows, используя для аутентификации NTLM / Secure Password Authentication."
+#: ../camel/camel-sasl-ntlm.c:44
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr ""
+"Эта опция подключает к серверу, основанному на Windows, используя для "
+"аутентификации NTLM / Secure Password Authentication."
 
-#: ../camel/camel-sasl-plain.c:43
+#: ../camel/camel-sasl-plain.c:39
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:46
+#: ../camel/camel-sasl-popb4smtp.c:42
 msgid "POP before SMTP"
 msgstr "POP до SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:48
+#: ../camel/camel-sasl-popb4smtp.c:44
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "Будет производиться авторизация POP до попытки передачи почты по SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:83
-msgid "POP Source URI"
-msgstr "URL источника почты POP"
+#: ../camel/camel-sasl-popb4smtp.c:80
+msgid "POP Source UID"
+msgstr "Идентификатор источника POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:90
+#: ../camel/camel-sasl-popb4smtp.c:92
 #, c-format
-#| msgid "POP Before SMTP auth using an unknown transport"
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "Аутентификация POP до SMTP, используя неизвестный транспорт"
 
-#: ../camel/camel-sasl-popb4smtp.c:98
+#: ../camel/camel-sasl-popb4smtp.c:104 ../camel/camel-sasl-popb4smtp.c:114
 #, c-format
-#| msgid "POP Before SMTP auth using a non-pop source"
-msgid "POP Before SMTP authentication using a non-POP source"
-msgstr "Аутентификация POP до SMTP, используя не-POP источник"
+msgid "POP Before SMTP authentication attempted with a %s service"
+msgstr "Аутентификация POP до SMTP посредством службы %s"
 
 #: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Сбой компиляции регулярного выражения: %s: %s"
 
-#: ../camel/camel-service.c:89
+#: ../camel/camel-service.c:492
 #, c-format
-msgid "URL '%s' needs a username component"
-msgstr "URL «%s» нÑ\83ждаеÑ\82Ñ\81Ñ\8f в компоненÑ\82е имени полÑ\8cзоваÑ\82елÑ\8f"
+msgid "URL '%s' needs a user component"
+msgstr "URL «%s» нуждается в компоненте пользователя"
 
-#: ../camel/camel-service.c:93
+#: ../camel/camel-service.c:503
 #, c-format
 msgid "URL '%s' needs a host component"
-msgstr "URL «%s» нÑ\83ждаеÑ\82Ñ\81Ñ\8f в компоненÑ\82е Ñ\85оÑ\81Ñ\82а"
+msgstr "URL «%s» нÑ\83ждаеÑ\82Ñ\81Ñ\8f в компоненÑ\82е Ñ\83зла"
 
-#: ../camel/camel-service.c:97
+#: ../camel/camel-service.c:514
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL «%s» нуждается в компоненте пути"
 
-#: ../camel/camel-session.c:260
+#: ../camel/camel-session.c:361
 #, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"Не удалось создать каталог %s:\n"
-"%s"
+msgid "Invalid GType registered for protocol '%s'"
+msgstr "Некорректный зарегистрированный GType для протокола «%s»"
 
-#: ../camel/camel-session.c:757
+#: ../camel/camel-session.c:907
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "Введите пароль %s для %s на узле %s."
 
-#: ../camel/camel-smime-context.c:348
-#: ../camel/camel-smime-context.c:1052
+#: ../camel/camel-smime-context.c:344 ../camel/camel-smime-context.c:1050
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Не удалось найти сертификат для «%s»"
 
-#: ../camel/camel-smime-context.c:376
+#: ../camel/camel-smime-context.c:372
 msgid "Cannot create CMS message"
 msgstr "Не удалось создать сообщение CMS"
 
-#: ../camel/camel-smime-context.c:381
+#: ../camel/camel-smime-context.c:377
 msgid "Cannot create CMS signed data"
 msgstr "Не удалось создать CMS signedData"
 
-#: ../camel/camel-smime-context.c:387
+#: ../camel/camel-smime-context.c:383
 msgid "Cannot attach CMS signed data"
 msgstr "Не удалось вложить CMS signedData"
 
-#: ../camel/camel-smime-context.c:394
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS data"
 msgstr "Не удалось вложить CMS data"
 
-#: ../camel/camel-smime-context.c:400
+#: ../camel/camel-smime-context.c:396
 msgid "Cannot create CMS Signer information"
 msgstr "Не удалось создать CMS SignerInfo"
 
-#: ../camel/camel-smime-context.c:406
+#: ../camel/camel-smime-context.c:402
 msgid "Cannot find certificate chain"
 msgstr "Не удалось найти цепочку сертификатов"
 
-#: ../camel/camel-smime-context.c:412
+#: ../camel/camel-smime-context.c:408
 msgid "Cannot add CMS Signing time"
 msgstr "Не удалось добавить CMS SigningTime"
 
-#: ../camel/camel-smime-context.c:436
-#: ../camel/camel-smime-context.c:451
+#: ../camel/camel-smime-context.c:432 ../camel/camel-smime-context.c:447
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "Сертификат шифрования для «%s» не существует"
 
-#: ../camel/camel-smime-context.c:458
+#: ../camel/camel-smime-context.c:454
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "Не удалось добавить атрибут SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:463
+#: ../camel/camel-smime-context.c:459
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "Не удалось добавить атрибут MS SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot add encryption certificate"
 msgstr "Не удалось добавить сертификат шифрования"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:470
 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
+#: ../camel/camel-smime-context.c:503
 msgid "Unverified"
 msgstr "Непроверено"
 
-#: ../camel/camel-smime-context.c:509
+#: ../camel/camel-smime-context.c:505
 msgid "Good signature"
 msgstr "Подпись верна"
 
-#: ../camel/camel-smime-context.c:511
+#: ../camel/camel-smime-context.c:507
 msgid "Bad signature"
 msgstr "Подпись неверна"
 
-#: ../camel/camel-smime-context.c:513
+#: ../camel/camel-smime-context.c:509
 msgid "Content tampered with or altered in transit"
 msgstr "Сообщение было подделано или изменено на пути"
 
-#: ../camel/camel-smime-context.c:515
+#: ../camel/camel-smime-context.c:511
 msgid "Signing certificate not found"
 msgstr "Сертификат подписи не найден"
 
-#: ../camel/camel-smime-context.c:517
+#: ../camel/camel-smime-context.c:513
 msgid "Signing certificate not trusted"
 msgstr "Сертификат подписи недостоверен"
 
-#: ../camel/camel-smime-context.c:519
+#: ../camel/camel-smime-context.c:515
 msgid "Signature algorithm unknown"
 msgstr "Неизвестный алгоритм подписи"
 
-#: ../camel/camel-smime-context.c:521
+#: ../camel/camel-smime-context.c:517
 msgid "Signature algorithm unsupported"
 msgstr "Неподдерживаемый алгоритм подписи"
 
-#: ../camel/camel-smime-context.c:523
+#: ../camel/camel-smime-context.c:519
 msgid "Malformed signature"
 msgstr "Неверно сформированная подпись"
 
-#: ../camel/camel-smime-context.c:525
+#: ../camel/camel-smime-context.c:521
 msgid "Processing error"
 msgstr "Ошибка обработки"
 
-#: ../camel/camel-smime-context.c:570
+#: ../camel/camel-smime-context.c:566
 msgid "No signed data in signature"
 msgstr "В подписи отсутствуют данные подписи"
 
-#: ../camel/camel-smime-context.c:575
+#: ../camel/camel-smime-context.c:571
 msgid "Digests missing from enveloped data"
 msgstr "В данных конверта отсутствует сводка"
 
-#: ../camel/camel-smime-context.c:588
-#: ../camel/camel-smime-context.c:599
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
 msgstr "Не удалось вычислить дайджесты"
 
-#: ../camel/camel-smime-context.c:606
-#: ../camel/camel-smime-context.c:610
+#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
 msgstr "Не удалось установить дайджесты сообщения"
 
-#: ../camel/camel-smime-context.c:620
-#: ../camel/camel-smime-context.c:625
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
 msgstr "Сбой импорта сертификата"
 
-#: ../camel/camel-smime-context.c:635
+#: ../camel/camel-smime-context.c:631
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
-msgstr "Сообщение состоит только из сертификатов, Не удалось проверить сертификаты"
+msgstr ""
+"Сообщение состоит только из сертификатов, Не удалось проверить сертификаты"
 
-#: ../camel/camel-smime-context.c:638
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "В сообщении только сертификаты, сертификаты импортированы и проверены"
 
-#: ../camel/camel-smime-context.c:642
+#: ../camel/camel-smime-context.c:638
 msgid "Cannot find signature digests"
 msgstr "Не удалось найти дайджесты подписи"
 
-#: ../camel/camel-smime-context.c:658
+#: ../camel/camel-smime-context.c:654
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Подписано: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:839
-#: ../camel/camel-smime-context.c:1125
+#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1123
 msgid "Cannot create encoder context"
 msgstr "Не удалось создать контекст кодировщика"
 
-#: ../camel/camel-smime-context.c:845
+#: ../camel/camel-smime-context.c:841
 msgid "Failed to add data to CMS encoder"
 msgstr "Не удалось добавить данные к кодировщику CMS"
 
-#: ../camel/camel-smime-context.c:850
-#: ../camel/camel-smime-context.c:1142
+#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1140
 msgid "Failed to encode data"
 msgstr "Ошибка кодирования данных"
 
-#: ../camel/camel-smime-context.c:991
-#: ../camel/camel-smime-context.c:1237
+#: ../camel/camel-smime-context.c:989 ../camel/camel-smime-context.c:1236
 msgid "Decoder failed"
 msgstr "Сбой декодера"
 
-#: ../camel/camel-smime-context.c:1060
+#: ../camel/camel-smime-context.c:1058
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Не удалось найти общий алгоритм шифрования"
 
-#: ../camel/camel-smime-context.c:1068
+#: ../camel/camel-smime-context.c:1066
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Не удалось распределить слот для ключа общего шифрования"
 
-#: ../camel/camel-smime-context.c:1079
+#: ../camel/camel-smime-context.c:1077
 msgid "Cannot create CMS Message"
 msgstr "Не удалось создать сообщение CMS"
 
-#: ../camel/camel-smime-context.c:1085
+#: ../camel/camel-smime-context.c:1083
 msgid "Cannot create CMS Enveloped data"
 msgstr "Не удалось создать CMS EnvelopedData"
 
-#: ../camel/camel-smime-context.c:1091
+#: ../camel/camel-smime-context.c:1089
 msgid "Cannot attach CMS Enveloped data"
 msgstr "Не удалось вложить CMS EnvelopedData"
 
-#: ../camel/camel-smime-context.c:1097
+#: ../camel/camel-smime-context.c:1095
 msgid "Cannot attach CMS data object"
 msgstr "Не удалось вложить объект CMS data"
 
-#: ../camel/camel-smime-context.c:1106
+#: ../camel/camel-smime-context.c:1104
 msgid "Cannot create CMS Recipient information"
 msgstr "Не удалось создать сведения CMS RecipientInfo"
 
-#: ../camel/camel-smime-context.c:1111
+#: ../camel/camel-smime-context.c:1109
 msgid "Cannot add CMS Recipient information"
 msgstr "Не удалось добавить сведения CMS RecipientInfo"
 
-#: ../camel/camel-smime-context.c:1136
+#: ../camel/camel-smime-context.c:1134
 msgid "Failed to add data to encoder"
 msgstr "Не удалось добавить данные к кодировщику"
 
-#: ../camel/camel-smime-context.c:1244
+#: ../camel/camel-smime-context.c:1243
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME Decrypt: Не найдено зашифрованного содержимого"
 
-#: ../camel/camel-store.c:2184
+#: ../camel/camel-store.c:2084
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "Не удалось создать папку «%s»: папка уже существует"
 
+#: ../camel/camel-store.c:2127
+#, c-format
+msgid "Opening folder '%s'"
+msgstr "Открытие папки «%s»"
+
+#: ../camel/camel-store.c:2314
+#, c-format
+msgid "Scanning folders in '%s'"
+msgstr "Сканирование папок на «%s»"
+
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2375
-#: ../camel/camel-store.c:2385
+#: ../camel/camel-store.c:2326 ../camel/camel-store.c:2336
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "Корзина"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2378
-#: ../camel/camel-store.c:2389
+#: ../camel/camel-store.c:2329 ../camel/camel-store.c:2340
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "Спам"
 
-#: ../camel/camel-store.c:2832
+#: ../camel/camel-store.c:2791
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Не удалось создать папку: %s: папка существует"
 
-#: ../camel/camel-store.c:2959
-#: ../camel/camel-vee-store.c:367
+#: ../camel/camel-store.c:2805
+#, c-format
+msgid "Creating folder '%s'"
+msgstr "Создание папки «%s»"
+
+#: ../camel/camel-store.c:2923 ../camel/camel-vee-store.c:350
 #: ../camel/providers/local/camel-maildir-store.c:272
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Не удалось удалить папку: %s: недопустимая операция"
 
-#: ../camel/camel-store.c:3100
-#: ../camel/camel-vee-store.c:417
-#: ../camel/providers/local/camel-maildir-store.c:668
+#: ../camel/camel-store.c:3066 ../camel/camel-vee-store.c:400
+#: ../camel/providers/local/camel-maildir-store.c:704
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Не удалось переименовать папку: %s: недопустимая операция"
 
-#: ../camel/camel-tcp-stream-raw.c:749
-#: ../camel/camel-tcp-stream-raw.c:760
+#: ../camel/camel-stream-filter.c:327
+msgid "Only reset to beginning is supported with CamelStreamFilter"
+msgstr "Для CamelStreamFilter поддерживается только переход к началу"
+
+#: ../camel/camel-stream-process.c:265
+#, c-format
+msgid "Connection cancelled"
+msgstr "Соединение отменено"
+
+#: ../camel/camel-stream-process.c:270
+#, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "Не удалось подключиться командой «%s»: %s"
+
+#: ../camel/camel-tcp-stream-raw.c:749 ../camel/camel-tcp-stream-raw.c:760
 #, c-format
 msgid "The proxy host does not support SOCKS4"
 msgstr "Узел прокси не поддерживает SOCKS4"
@@ -2769,15 +2756,13 @@ msgstr "Узел прокси не поддерживает SOCKS4"
 msgid "The proxy host denied our request: code %d"
 msgstr "Узел прокси отклонил запрос: код %d"
 
-#: ../camel/camel-tcp-stream-raw.c:867
-#: ../camel/camel-tcp-stream-raw.c:873
+#: ../camel/camel-tcp-stream-raw.c:867 ../camel/camel-tcp-stream-raw.c:873
 #, c-format
 msgid "The proxy host does not support SOCKS5"
 msgstr "Узел прокси не поддерживает SOCKS5"
 
 #: ../camel/camel-tcp-stream-raw.c:879
 #, c-format
-#| msgid "No support for authentication type %s"
 msgid "Could not find a suitable authentication type: code 0x%x"
 msgstr "Не удалось найти подходящий тип аутентификации: код 0x%x"
 
@@ -2798,7 +2783,6 @@ msgid "Host is unreachable from SOCKS server"
 msgstr "Узел недоступен через сервер SOCKS"
 
 #: ../camel/camel-tcp-stream-raw.c:895
-#| msgid "Connection canceled"
 msgid "Connection refused"
 msgstr "Соединение отклонено"
 
@@ -2807,17 +2791,14 @@ msgid "Time-to-live expired"
 msgstr "Превышено максимальное время ожидания"
 
 #: ../camel/camel-tcp-stream-raw.c:897
-#| msgid "STLS not supported by server"
 msgid "Command not supported by SOCKS server"
 msgstr "Команда не поддерживается сервером SOCKS"
 
 #: ../camel/camel-tcp-stream-raw.c:898
-#| msgid "STLS not supported by server"
 msgid "Address type not supported by SOCKS server"
 msgstr "Тип адреса не поддерживается сервером SOCKS"
 
 #: ../camel/camel-tcp-stream-raw.c:899
-#| msgid "Unknown error: %s"
 msgid "Unknown error from SOCKS server"
 msgstr "Получена неизвестная ошибка от сервера SOCKS"
 
@@ -2828,7 +2809,6 @@ msgstr "От сервера SOCKS получен адрес неизвестно
 
 #: ../camel/camel-tcp-stream-raw.c:950
 #, c-format
-#| msgid "Invalid response from server"
 msgid "Incomplete reply from SOCKS server"
 msgstr "Получен неполный ответ от сервера SOCKS"
 
@@ -2839,14 +2819,12 @@ msgstr "Слишком длинное имя узла (максимальное
 
 #. SOCKS5
 #. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:1002
-#: ../camel/camel-tcp-stream-raw.c:1012
+#: ../camel/camel-tcp-stream-raw.c:1002 ../camel/camel-tcp-stream-raw.c:1012
 #, c-format
-#| msgid "Invalid response from server"
 msgid "Invalid reply from proxy server"
 msgstr "Недопустимый ответ от прокси-сервера"
 
-#: ../camel/camel-tcp-stream-ssl.c:457
+#: ../camel/camel-tcp-stream-ssl.c:453
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2859,16 +2837,16 @@ msgstr ""
 "Отпечаток:         %s\n"
 "Подпись:           %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:463
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "GOOD"
 msgstr "GOOD"
 
-#: ../camel/camel-tcp-stream-ssl.c:463
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "BAD"
 msgstr "BAD"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:467
+#: ../camel/camel-tcp-stream-ssl.c:463
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2883,7 +2861,7 @@ msgstr ""
 "\n"
 "Всё равно принять?"
 
-#: ../camel/camel-tcp-stream-ssl.c:511
+#: ../camel/camel-tcp-stream-ssl.c:507
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2892,7 +2870,7 @@ msgstr ""
 "Проблема с сертификатом: %s\n"
 "Поставщик: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:563
+#: ../camel/camel-tcp-stream-ssl.c:559
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2901,7 +2879,7 @@ msgstr ""
 "Некорректный домен сертификата: %s\n"
 "Поставщик: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:581
+#: ../camel/camel-tcp-stream-ssl.c:577
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2910,7 +2888,7 @@ msgstr ""
 "Истек срок действия сертификата: %s\n"
 "Поставщик: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:598
+#: ../camel/camel-tcp-stream-ssl.c:594
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2919,40 +2897,38 @@ msgstr ""
 "Истек срок действия списка аннулированных сертификатов: %s\n"
 "Поставщик: %s"
 
-#: ../camel/camel-url.c:316
+#: ../camel/camel-url.c:330
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "Не удалось разобрать URL «%s»"
 
-#: ../camel/camel-vee-folder.c:1240
-#: ../camel/camel-vee-folder.c:1403
+#: ../camel/camel-vee-folder.c:1279 ../camel/camel-vee-folder.c:1442
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Не удалось скопировать или переместить сообщения в виртуальную папку"
 
-#: ../camel/camel-vee-folder.c:1276
+#: ../camel/camel-vee-folder.c:1315
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Нет сообщения %s в %s"
 
-#: ../camel/camel-vee-folder.c:1344
+#: ../camel/camel-vee-folder.c:1383
 #, c-format
-#| msgid "Error storing '%s': %s"
 msgid "Error storing '%s': "
 msgstr "Ошибка при хранении «%s»: "
 
-#: ../camel/camel-vee-store.c:141
-#: ../camel/camel-vee-store.c:143
-#: ../camel/camel-vee-store.c:322
+#. Translators: 'Unmatched' is a folder name under Search folders where are shown
+#. all messages not belonging into any other configured search folder
+#: ../camel/camel-vee-store.c:37
 msgid "Unmatched"
 msgstr "Прочее"
 
-#: ../camel/camel-vee-store.c:393
+#: ../camel/camel-vee-store.c:376
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Не удалось удалить папку: %s: нет такой папки"
 
-#: ../camel/camel-vee-store.c:427
+#: ../camel/camel-vee-store.c:410
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Не удалось переименовать папку: %s: нет такой папки"
@@ -2965,272 +2941,24 @@ msgstr "Не удалось переместить сообщения в кор
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Не удалось переместить сообщения в папку «Спам»"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:958
-#: ../camel/providers/imap/camel-imap-folder.c:395
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "Не удалось загрузить краткую информацию о %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1034
-#, c-format
-msgid "Checking for deleted messages %s"
-msgstr "Проверка удалённых сообщений %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1521
-#: ../camel/providers/groupwise/camel-groupwise-store.c:669
-#: ../camel/providers/groupwise/camel-groupwise-store.c:800
-#: ../camel/providers/imap/camel-imap-folder.c:3965
-#: ../camel/providers/imap/camel-imap-folder.c:4047
-#: ../camel/providers/imapx/camel-imapx-server.c:3871
-#: ../camel/providers/imapx/camel-imapx-server.c:4002
-#, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "Получение краткой информации по новым сообщениям из %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1991
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2044
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2708
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2718
-#, c-format
-msgid "Could not get message"
-msgstr "Не удалось получить сообщение"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2428
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2478
-#, c-format
-msgid "Cannot append message to folder '%s': %s"
-msgstr "Не удалось добавить сообщение к папке «%s»: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2464
-#, c-format
-msgid "Cannot create message: %s"
-msgstr "Не удалось создать сообщение: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2644
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Не удалось получить сообщение: %s\n"
-"  %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2644
-#: ../camel/providers/local/camel-maildir-folder.c:100
-#: ../camel/providers/local/camel-maildir-folder.c:307
-#: ../camel/providers/local/camel-mbox-folder.c:117
-#: ../camel/providers/local/camel-mbox-folder.c:325
-#: ../camel/providers/local/camel-mh-folder.c:156
-msgid "No such message"
-msgstr "Нет такого сообщения"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2663
-#: ../camel/providers/nntp/camel-nntp-folder.c:251
-#: ../camel/providers/nntp/camel-nntp-folder.c:418
-#: ../camel/providers/pop3/camel-pop3-folder.c:455
-#, c-format
-#| msgid "Cannot get message %s: %s"
-msgid "Cannot get message %s: "
-msgstr "Не удалось получить сообщение %s: "
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2681
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2691
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2894
-#, c-format
-msgid "This message is not available in offline mode."
-msgstr "Это сообщение недоступно в автономном режиме."
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:248
-#, c-format
-msgid "Cannot get folder container %s"
-msgstr "Не удалось получить контейнер папки %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:318
-#, c-format
-msgid "Cannot append message in offline mode: cache unavailable"
-msgstr "Невозможно добавить сообщение в автономном режиме: кэш недоступен"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:335
-#| msgid "Cannot append message in offline mode: %s"
-msgid "Cannot append message in offline mode: "
-msgstr "Невозможно добавить сообщение в автономном режиме: "
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
-msgid "Checking for new mail"
-msgstr "Проверка новой почты"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
-#: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
-msgid "C_heck for new messages in all folders"
-msgstr "П_роверять новую почту во всех папках"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imapx/camel-imapx-provider.c:72
-#: ../camel/providers/local/camel-local-provider.c:42
-#: ../camel/providers/local/camel-local-provider.c:82
-#: ../camel/providers/local/camel-local-provider.c:102
-msgid "Options"
-msgstr "Параметры"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
-msgid "_Apply filters to new messages in Inbox on this server"
-msgstr "_Применить фильтры к новым сообщениям в папке «Входящие» на этом сервере"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
-msgid "Check new messages for J_unk contents"
-msgstr "Проверять, являются ли новые сообщения спамом"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imapx/camel-imapx-provider.c:78
-msgid "Only check for Junk messages in the IN_BOX folder"
-msgstr "Проверять, являются ли новые сообщения _спамом, только в папке «Входящие»"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
-msgid "Automatically synchroni_ze account locally"
-msgstr "Автоматически синхрони_зировать учётную запись локально"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
-msgid "SOAP Settings"
-msgstr "Параметры SOAP"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
-msgid "Post Office Agent SOAP _Port:"
-msgstr "_Порт SOAP Агента Post Office:"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
-msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
-msgid "For accessing Novell GroupWise servers"
-msgstr "Для доступа к серверам Novell Groupwise"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:98
-#: ../camel/providers/imap/camel-imap-provider.c:97
-#: ../camel/providers/imapx/camel-imapx-provider.c:104
-#: ../camel/providers/nntp/camel-nntp-provider.c:72
-#: ../camel/providers/pop3/camel-pop3-provider.c:73
-msgid "Password"
-msgstr "Пароль"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:100
-msgid "This option will connect to the GroupWise server using a plaintext password."
-msgstr "Подключение к серверу IMAP будет производиться с использованием незашифрованного пароля."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:107
-#, c-format
-msgid "Host or user not available in url"
-msgstr "Узел или пользователь недоступны в url"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:209
-#: ../camel/providers/imap/camel-imap-store.c:801
-#: ../camel/providers/imapx/camel-imapx-server.c:3085
-#, c-format
-msgid "You did not enter a password."
-msgstr "Вы не ввели пароль."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:332
-msgid "Some features may not work correctly with your current server version"
-msgstr "Некоторые функции могут некорректно работать с вашей версией сервера"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:560
-#: ../camel/providers/imap/camel-imap-store.c:1808
-#: ../camel/providers/imap/camel-imap-store.c:2005
-#: ../camel/providers/imapx/camel-imapx-store.c:342
-#, c-format
-msgid "No such folder %s"
-msgstr "Нет такой папки %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1221
-#, c-format
-msgid "Cannot create GroupWise folders in offline mode."
-msgstr "Невозможно создать папки GroupWise в автономном режиме."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1230
-#, c-format
-#| msgid "Cannot delete folder '%s': Special folder"
-msgid "Cannot create a special system folder"
-msgstr "Не удалось создать особую системную папку"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1240
-#: ../camel/providers/imap/camel-imap-store.c:1886
-#: ../camel/providers/imap/camel-imap-store.c:2323
-#: ../camel/providers/imapx/camel-imapx-store.c:1341
-#, c-format
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "Эта папка не может содержать подпапки"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1325
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1350
-#, c-format
-msgid "Cannot rename GroupWise folder '%s' to '%s'"
-msgstr "Не удалось переименовать папку Groupwise «%s» в «%s»"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1384
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:47
-#, c-format
-msgid "GroupWise server %s"
-msgstr "Сервер GroupWise %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1386
-#, c-format
-msgid "GroupWise service for %s on %s"
-msgstr "Сервис GroupWise для %s на %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:51
-#, c-format
-msgid "GroupWise mail delivery via %s"
-msgstr "Доставка почты Groupwise с помощью %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:97
-msgid "Sending Message"
-msgstr "Отправка сообщения"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:107
-#, c-format
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "Не удалось получить папку: недопустимая операция в этом хранилище"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
-#, c-format
-msgid "You have exceeded this account's storage limit. Your messages are queued in your Outbox. Resend by pressing Send/Receive after deleting/archiving some of your mail.\n"
-msgstr "Вы превысили ограничение места для этой учетной записи. Ваши сообщения поставлены в очередь в папке «Исходящие». Повторите отправку, нажав кнопку «Отправить/Получить», после удаления некоторого количества ваших сообщений.\n"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:159
-#, c-format
-msgid "Could not send message: %s"
-msgstr "Не удалось отправить сообщение: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:197
-#: ../camel/providers/imap/camel-imap-command.c:301
+#: ../camel/providers/imap/camel-imap-command.c:198
+#: ../camel/providers/imap/camel-imap-command.c:293
 #, c-format
 msgid "No output stream"
 msgstr "Отсутствует потока вывода"
 
-#: ../camel/providers/imap/camel-imap-command.c:205
-#: ../camel/providers/imap/camel-imap-command.c:309
+#: ../camel/providers/imap/camel-imap-command.c:206
+#: ../camel/providers/imap/camel-imap-command.c:301
 #, c-format
 msgid "No input stream"
 msgstr "Отсутствует поток ввода"
 
-#: ../camel/providers/imap/camel-imap-command.c:255
-#, c-format
-msgid "Operation cancelled"
-msgstr "Операция отменена"
-
-#: ../camel/providers/imap/camel-imap-command.c:373
+#: ../camel/providers/imap/camel-imap-command.c:365
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Сервер неожиданно отключился: %s"
 
-#. for imap ALERT codes, account user@host
-#. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:394
+#: ../camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -3239,87 +2967,98 @@ msgstr ""
 "Тревожное сообщение от сервера IMAP %s@%s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:468
+#: ../camel/providers/imap/camel-imap-command.c:471
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Неожиданный ответ от сервера IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:480
+#: ../camel/providers/imap/camel-imap-command.c:483
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Сбой команды IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:560
+#: ../camel/providers/imap/camel-imap-command.c:563
 #, c-format
 msgid "Server response ended too soon."
 msgstr "Не полный ответ сервера."
 
-#: ../camel/providers/imap/camel-imap-command.c:771
+#: ../camel/providers/imap/camel-imap-command.c:774
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Ответ сервера IMAP не содержит информации о %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:809
+#: ../camel/providers/imap/camel-imap-command.c:812
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Неожиданный ответ «OK» от сервера IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:296
+#: ../camel/providers/imap/camel-imap-folder.c:293
 msgid "Always check for new mail in this folder"
 msgstr "Всегда проверять наличие новой почты в этой папке"
 
-#: ../camel/providers/imap/camel-imap-folder.c:372
+#: ../camel/providers/imap/camel-imap-folder.c:368
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Не удалось создать каталог %s: %s"
 
+#: ../camel/providers/imap/camel-imap-folder.c:391
+#, c-format
+msgid "Could not load summary for %s"
+msgstr "Не удалось загрузить краткую информацию о %s"
+
 #: ../camel/providers/imap/camel-imap-folder.c:995
-#: ../camel/providers/imapx/camel-imapx-server.c:3915
+#: ../camel/providers/imapx/camel-imapx-server.c:3984
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "Поиск изменённых сообщений в %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3372
-#| msgid "Unable to retrieve message: %s"
+#: ../camel/providers/imap/camel-imap-folder.c:3380
 msgid "Unable to retrieve message: "
 msgstr "Не удалось получить сообщение: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:3407
-#: ../camel/providers/imapx/camel-imapx-server.c:5195
+#: ../camel/providers/imap/camel-imap-folder.c:3415
+#: ../camel/providers/imapx/camel-imapx-server.c:5319
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "Не удалось получить сообщение с идентификатором %s: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3408
-#: ../camel/providers/imapx/camel-imapx-server.c:5196
+#: ../camel/providers/imap/camel-imap-folder.c:3416
+#: ../camel/providers/imapx/camel-imapx-server.c:5320
 msgid "No such message available."
 msgstr "Нет такого сообщения."
 
-#: ../camel/providers/imap/camel-imap-folder.c:3483
-#: ../camel/providers/imap/camel-imap-folder.c:4378
+#: ../camel/providers/imap/camel-imap-folder.c:3491
+#: ../camel/providers/imap/camel-imap-folder.c:4391
 #: ../camel/providers/nntp/camel-nntp-folder.c:407
 #, c-format
 msgid "This message is not currently available"
 msgstr "Это сообщение в настоящий момент недоступно"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4179
+#: ../camel/providers/imap/camel-imap-folder.c:3975
+#: ../camel/providers/imap/camel-imap-folder.c:4058
+#: ../camel/providers/imapx/camel-imapx-server.c:3940
+#: ../camel/providers/imapx/camel-imapx-server.c:4082
+#, c-format
+msgid "Fetching summary information for new messages in %s"
+msgstr "Получение краткой информации по новым сообщениям из %s"
+
+#: ../camel/providers/imap/camel-imap-folder.c:4192
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "Неполный ответ сервера: не предоставлена информация о сообщении %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4189
+#: ../camel/providers/imap/camel-imap-folder.c:4202
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "Неполный ответ сервера: отсутствует UID для сообщения %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4418
+#: ../camel/providers/imap/camel-imap-folder.c:4431
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "Не удалось найти тело сообщения в ответе на команду FETCH."
 
 #: ../camel/providers/imap/camel-imap-message-cache.c:193
 #: ../camel/providers/imap/camel-imap-message-cache.c:253
-#| msgid "Could not open cache directory: %s"
 msgid "Could not open cache directory: "
 msgstr "Не удалось открыть каталог кэша: "
 
@@ -3330,13 +3069,11 @@ msgstr "Сбой при кэшировании сообщения %s: %s"
 
 #: ../camel/providers/imap/camel-imap-message-cache.c:391
 #, c-format
-#| msgid "Failed to cache message %s: %s"
 msgid "Failed to cache message %s: "
 msgstr "Сбой при кэшировании сообщения %s: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:529
+#: ../camel/providers/imap/camel-imap-message-cache.c:531
 #, c-format
-#| msgid "Failed to cache %s: %s"
 msgid "Failed to cache %s: "
 msgstr "Сбой при кэшировании %s: "
 
@@ -3345,6 +3082,11 @@ msgstr "Сбой при кэшировании %s: "
 msgid "Checking for New Mail"
 msgstr "Проверка новой почты"
 
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
+msgid "C_heck for new messages in all folders"
+msgstr "П_роверять новую почту во всех папках"
+
 #: ../camel/providers/imap/camel-imap-provider.c:44
 #: ../camel/providers/imapx/camel-imapx-provider.c:48
 msgid "Ch_eck for new messages in subscribed folders"
@@ -3361,7 +3103,6 @@ msgid "_Use custom command to connect to server"
 msgstr "_Использовать свою строку для подключения к серверу"
 
 #: ../camel/providers/imap/camel-imap-provider.c:52
-#| msgid "Command:"
 msgid "Co_mmand:"
 msgstr "Ко_манда:"
 
@@ -3382,109 +3123,123 @@ msgid "O_verride server-supplied folder namespace"
 msgstr "Пе_реопределять предлагаемое сервером пространство имён папок"
 
 #: ../camel/providers/imap/camel-imap-provider.c:62
-#| msgid "Namespace:"
 msgid "Names_pace:"
 msgstr "Пространство _имён:"
 
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imapx/camel-imapx-provider.c:72
+#: ../camel/providers/local/camel-local-provider.c:42
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:105
+msgid "Options"
+msgstr "Параметры"
+
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
+msgid "_Apply filters to new messages in Inbox on this server"
+msgstr ""
+"_Применить фильтры к новым сообщениям в папке «Входящие» на этом сервере"
+
 #: ../camel/providers/imap/camel-imap-provider.c:68
 #: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "Check new messages for Jun_k contents"
 msgstr "Проверять, являются ли новые сообщения _спамом"
 
+#: ../camel/providers/imap/camel-imap-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:78
+msgid "Only check for Junk messages in the IN_BOX folder"
+msgstr ""
+"Проверять, являются ли новые сообщения _спамом, только в папке «Входящие»"
+
 #: ../camel/providers/imap/camel-imap-provider.c:72
 #: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "Автоматически синхрони_зировать удаленную почту локально"
 
+#: ../camel/providers/imap/camel-imap-provider.c:78
+msgid "IMAP default port"
+msgstr "Порт по умолчанию для IMAP"
+
 #: ../camel/providers/imap/camel-imap-provider.c:79
+#: ../camel/providers/imapx/camel-imapx-provider.c:87
+msgid "IMAP over SSL"
+msgstr "IMAP поверх SSL"
+
+#: ../camel/providers/imap/camel-imap-provider.c:85
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:81
-#: ../camel/providers/imapx/camel-imapx-provider.c:90
+#: ../camel/providers/imap/camel-imap-provider.c:87
+#: ../camel/providers/imapx/camel-imapx-provider.c:96
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Для чтения и хранения почты на серверах IMAP."
 
-#: ../camel/providers/imap/camel-imap-provider.c:99
-#: ../camel/providers/imapx/camel-imapx-provider.c:106
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "Подключение к серверу IMAP будет производиться с использованием незашифрованного пароля."
-
-#: ../camel/providers/imap/camel-imap-store.c:243
-#: ../camel/providers/nntp/camel-nntp-store.c:313
-#: ../camel/providers/pop3/camel-pop3-store.c:135
-#: ../camel/providers/smtp/camel-smtp-transport.c:151
-#, c-format
-msgid "Could not connect to %s: %s"
-msgstr "Не удалось подключиться к %s: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:244
-#: ../camel/providers/nntp/camel-nntp-store.c:314
-#: ../camel/providers/pop3/camel-pop3-store.c:136
-#: ../camel/providers/smtp/camel-smtp-transport.c:152
-msgid "SSL unavailable"
-msgstr "SSL недоступен"
+#: ../camel/providers/imap/camel-imap-provider.c:105
+#: ../camel/providers/imapx/camel-imapx-provider.c:113
+#: ../camel/providers/nntp/camel-nntp-provider.c:80
+#: ../camel/providers/pop3/camel-pop3-provider.c:81
+msgid "Password"
+msgstr "Пароль"
 
-#: ../camel/providers/imap/camel-imap-store.c:264
-#: ../camel/providers/nntp/camel-nntp-store.c:333
-#, c-format
-#| msgid "Could not connect to %s: %s"
-msgid "Could not connect to %s: "
-msgstr "Не удалось подключиться к %s: "
+#: ../camel/providers/imap/camel-imap-provider.c:107
+#: ../camel/providers/imapx/camel-imapx-provider.c:115
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr ""
+"Подключение к серверу IMAP будет производиться с использованием "
+"незашифрованного пароля."
 
-#: ../camel/providers/imap/camel-imap-store.c:370
-#: ../camel/providers/imap/camel-imap-store.c:390
-#: ../camel/providers/imap/camel-imap-store.c:397
-#: ../camel/providers/imap/camel-imap-store.c:424
-#: ../camel/providers/imapx/camel-imapx-server.c:2927
-#: ../camel/providers/imapx/camel-imapx-server.c:2967
+#: ../camel/providers/imap/camel-imap-store.c:330
+#: ../camel/providers/imap/camel-imap-store.c:357
+#: ../camel/providers/imap/camel-imap-store.c:384
+#: ../camel/providers/imapx/camel-imapx-server.c:2964
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Не удалось подключиться к серверу IMAP %s в защищенном режиме:%s"
+msgstr "Не удалось подключиться к IMAP-серверу %s в защищенном режиме:%s"
 
-#: ../camel/providers/imap/camel-imap-store.c:371
-#: ../camel/providers/imapx/camel-imapx-server.c:2928
-#: ../camel/providers/smtp/camel-smtp-transport.c:238
+#: ../camel/providers/imap/camel-imap-store.c:331
+#: ../camel/providers/imapx/camel-imapx-server.c:2965
+#: ../camel/providers/smtp/camel-smtp-transport.c:198
 msgid "STARTTLS not supported"
 msgstr "STARTTLS не поддерживается"
 
-#: ../camel/providers/imap/camel-imap-store.c:391
-#: ../camel/providers/imapx/camel-imapx-server.c:2968
-msgid "SSL negotiations failed"
-msgstr "Сбой согласований SSL"
+#: ../camel/providers/imap/camel-imap-store.c:350
+#: ../camel/providers/imapx/camel-imapx-server.c:3003
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: "
+msgstr "Не удалось подключиться к IMAP-серверу %s в защищённом режиме: "
 
-#: ../camel/providers/imap/camel-imap-store.c:398
-#: ../camel/providers/smtp/camel-smtp-transport.c:285
+#: ../camel/providers/imap/camel-imap-store.c:358
+#: ../camel/providers/smtp/camel-smtp-transport.c:244
 msgid "SSL is not available in this build"
 msgstr "SSL не поддерживается в этой сборке"
 
-#: ../camel/providers/imap/camel-imap-store.c:549
-#: ../camel/providers/imapx/camel-imapx-server.c:2755
-#, c-format
-msgid "Connection cancelled"
-msgstr "Соединение отменено"
-
-#: ../camel/providers/imap/camel-imap-store.c:554
-#: ../camel/providers/imapx/camel-imapx-server.c:2760
-#, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "Не удалось подключиться командой «%s»: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:740
-#: ../camel/providers/imapx/camel-imapx-server.c:3041
+#: ../camel/providers/imap/camel-imap-store.c:681
+#: ../camel/providers/imapx/camel-imapx-server.c:3087
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Сервер IMAP %s не поддерживает затребованный тип аутентификации %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:752
-#: ../camel/providers/imapx/camel-imapx-server.c:3053
-#: ../camel/providers/smtp/camel-smtp-transport.c:420
+#: ../camel/providers/imap/camel-imap-store.c:692
+#: ../camel/providers/imapx/camel-imapx-server.c:3099
+#: ../camel/providers/smtp/camel-smtp-transport.c:428
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Аутентификация %s не поддерживается"
 
-#: ../camel/providers/imap/camel-imap-store.c:836
-#: ../camel/providers/imapx/camel-imapx-server.c:3129
+#: ../camel/providers/imap/camel-imap-store.c:703
+#: ../camel/providers/smtp/camel-smtp-transport.c:441
+#, c-format
+msgid "Error creating SASL authentication object."
+msgstr "Ошибка при создании объекта аутентификации SASL."
+
+#: ../camel/providers/imap/camel-imap-store.c:751
+#: ../camel/providers/imapx/camel-imapx-server.c:3143
+#, c-format
+msgid "You did not enter a password."
+msgstr "Вы не ввели пароль."
+
+#: ../camel/providers/imap/camel-imap-store.c:792
+#: ../camel/providers/imapx/camel-imapx-server.c:3188
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3495,60 +3250,74 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:997
-#: ../camel/providers/imapx/camel-imapx-store.c:183
+#: ../camel/providers/imap/camel-imap-store.c:927
+#: ../camel/providers/imapx/camel-imapx-store.c:252
 #, c-format
 msgid "IMAP server %s"
 msgstr "Сервер IMAP %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1001
-#: ../camel/providers/imapx/camel-imapx-store.c:185
+#: ../camel/providers/imap/camel-imap-store.c:930
+#: ../camel/providers/imapx/camel-imapx-store.c:255
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Сервис IMAP для %s на %s"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1367
-#: ../camel/providers/imap/camel-imap-store.c:2416
-#: ../camel/providers/imapx/camel-imapx-store.c:372
-#: ../camel/providers/imapx/camel-imapx-store.c:794
-#: ../camel/providers/local/camel-maildir-folder.c:409
+#: ../camel/providers/imap/camel-imap-store.c:1471
+#: ../camel/providers/imap/camel-imap-store.c:2555
+#: ../camel/providers/imapx/camel-imapx-store.c:443
+#: ../camel/providers/imapx/camel-imapx-store.c:860
+#: ../camel/providers/local/camel-maildir-folder.c:434
 #: ../camel/providers/local/camel-maildir-store.c:273
-#: ../camel/providers/local/camel-maildir-store.c:615
-#: ../camel/providers/local/camel-maildir-store.c:621
-#: ../camel/providers/local/camel-maildir-store.c:669
-#: ../camel/providers/local/camel-spool-store.c:289
+#: ../camel/providers/local/camel-maildir-store.c:619
+#: ../camel/providers/local/camel-maildir-store.c:625
+#: ../camel/providers/local/camel-maildir-store.c:705
+#: ../camel/providers/local/camel-spool-store.c:324
 msgid "Inbox"
 msgstr "Входящие"
 
-#: ../camel/providers/imap/camel-imap-store.c:1822
-#: ../camel/providers/imap/camel-imap-store.c:2259
-#: ../camel/providers/imapx/camel-imapx-store.c:1320
+#: ../camel/providers/imap/camel-imap-store.c:1938
+#: ../camel/providers/imap/camel-imap-store.c:2140
+#: ../camel/providers/imapx/camel-imapx-store.c:419
+#, c-format
+msgid "No such folder %s"
+msgstr "Нет такой папки %s"
+
+#: ../camel/providers/imap/camel-imap-store.c:1952
+#: ../camel/providers/imap/camel-imap-store.c:2399
+#: ../camel/providers/imapx/camel-imapx-store.c:1385
 #, c-format
-msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "Недопустимое имя папки «%s»: имя содержит символ «%c»"
 
-#: ../camel/providers/imap/camel-imap-store.c:1939
+#: ../camel/providers/imap/camel-imap-store.c:2016
+#: ../camel/providers/imap/camel-imap-store.c:2463
+#: ../camel/providers/imapx/camel-imapx-store.c:1406
+#, c-format
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "Эта папка не может содержать подпапки"
+
+#: ../camel/providers/imap/camel-imap-store.c:2069
 #: ../camel/providers/local/camel-maildir-store.c:244
-#: ../camel/providers/local/camel-mbox-store.c:407
-#: ../camel/providers/local/camel-mh-store.c:504
+#: ../camel/providers/local/camel-mbox-store.c:416
+#: ../camel/providers/local/camel-mh-store.c:566
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "Не удалось создать папку «%s»: папка существует."
 
-#: ../camel/providers/imap/camel-imap-store.c:2272
-#: ../camel/providers/imapx/camel-imapx-store.c:1331
+#: ../camel/providers/imap/camel-imap-store.c:2412
+#: ../camel/providers/imapx/camel-imapx-store.c:1396
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Неизвестная родительская папка: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3137
+#: ../camel/providers/imap/camel-imap-store.c:3248
 #, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "Сервер неожиданно отключился"
 
-#: ../camel/providers/imap/camel-imap-store.c:3140
-#| msgid "Server unexpectedly disconnected: %s"
+#: ../camel/providers/imap/camel-imap-store.c:3251
 msgid "Server unexpectedly disconnected: "
 msgstr "Сервер неожиданно отключился: "
 
@@ -3559,14 +3328,14 @@ msgstr "Не удалось создать краткую информацию 
 
 #: ../camel/providers/imapx/camel-imapx-folder.c:82
 #, c-format
-#| msgid "Could not create cache for %s"
 msgid "Could not create cache for %s: "
 msgstr "Не удалось создать кэш для %s:"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:42
-#| msgid "Use I_dle if the server supports it"
 msgid "Use _Quick Resync if the server supports it"
-msgstr "Использовать _быструю синхронизацию, если сервер поддерживает такую возможность"
+msgstr ""
+"Использовать _быструю синхронизацию, если сервер поддерживает такую "
+"возможность"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:44
 msgid "Use I_dle if the server supports it"
@@ -3584,40 +3353,34 @@ msgstr "Используемое _количество кэшируемых со
 msgid "Namespace:"
 msgstr "Пространство имён:"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
+#: ../camel/providers/imapx/camel-imapx-provider.c:86
+msgid "Default IMAP port"
+msgstr "Порт по умолчанию для IMAP"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:94
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1404
-#| msgid "Error writing mail temp file: %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:1488
 msgid "Error writing to cache stream: "
 msgstr "Ошибка записи в поток кэша: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2083
+#: ../camel/providers/imapx/camel-imapx-server.c:2172
 #, c-format
-#| msgid "Cannot authenticate user"
 msgid "Not authenticated"
 msgstr "Не удалось выполнить аутентификацию"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2850
-#, c-format
-#| msgid "Could not connect to %s (port %s): %s"
-msgid "Could not connect to %s (port %s): "
-msgstr "Не удалось подключиться к %s (порт %s): "
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3311
-#| msgid "Posting failed: %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:3370
 msgid "Closing tmp stream failed: "
 msgstr "Произошёл сбок при попытке закрыть временный поток: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5345
-#: ../camel/providers/imapx/camel-imapx-server.c:5360
-#| msgid "Cannot create message: %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:5465
+#: ../camel/providers/imapx/camel-imapx-server.c:5480
 msgid "Cannot create spool file: "
 msgstr "Не удалось создать файл спула: "
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1136
-#: ../camel/providers/nntp/camel-nntp-store.c:1610
+#: ../camel/providers/imapx/camel-imapx-store.c:1181
+#: ../camel/providers/nntp/camel-nntp-store.c:1778
 #, c-format
 msgid "No such folder: %s"
 msgstr "Нет такой папки: %s"
@@ -3629,35 +3392,31 @@ msgstr "Поток не вернул данные"
 
 #: ../camel/providers/imapx/camel-imapx-stream.c:79
 #, c-format
-#| msgid "service unavailable"
 msgid "Source stream unavailable"
 msgstr "Поток недоступен"
 
-#: ../camel/providers/local/camel-local-folder.c:182
+#: ../camel/providers/local/camel-local-folder.c:178
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:192
-#: ../camel/providers/local/camel-local-folder.c:201
+#: ../camel/providers/local/camel-local-folder.c:188
+#: ../camel/providers/local/camel-local-folder.c:197
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "почтовый ящик: %s: (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:210
+#: ../camel/providers/local/camel-local-folder.c:206
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:470
+#: ../camel/providers/local/camel-local-folder.c:466
 msgid "Index message body data"
 msgstr "Индексировать данные тела сообщения"
 
-#: ../camel/providers/local/camel-local-folder.c:683
+#: ../camel/providers/local/camel-local-folder.c:700
 #, c-format
-#| msgid ""
-#| "Cannot get message: %s from folder %s\n"
-#| "  %s"
 msgid ""
 "Cannot get message %s from folder %s\n"
 "%s"
@@ -3677,37 +3436,41 @@ msgstr "Почтовые каталоги в формате UNIX MH"
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Для хранения локальной почты в почтовых каталогах типа MH."
 
-#: ../camel/providers/local/camel-local-provider.c:69
+#: ../camel/providers/local/camel-local-provider.c:70
 msgid "Local delivery"
 msgstr "Локальная доставка"
 
-#: ../camel/providers/local/camel-local-provider.c:70
-msgid "For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by Evolution."
-msgstr "Для получения (перемещения) локальной почты из очередей в стандартном формате mbox в папки, управляемые Evolution."
+#: ../camel/providers/local/camel-local-provider.c:71
+msgid ""
+"For retrieving (moving) local mail from standard mbox-formatted spools into "
+"folders managed by Evolution."
+msgstr ""
+"Для получения (перемещения) локальной почты из очередей в стандартном "
+"формате mbox в папки, управляемые Evolution."
 
-#: ../camel/providers/local/camel-local-provider.c:84
-#: ../camel/providers/local/camel-local-provider.c:103
+#: ../camel/providers/local/camel-local-provider.c:86
+#: ../camel/providers/local/camel-local-provider.c:106
 msgid "_Apply filters to new messages in INBOX"
 msgstr "_Применить фильтры к новым сообщениям в папке «Входящие»"
 
-#: ../camel/providers/local/camel-local-provider.c:91
+#: ../camel/providers/local/camel-local-provider.c:93
 msgid "Maildir-format mail directories"
 msgstr "Почтовые каталоги в формате Maildir"
 
-#: ../camel/providers/local/camel-local-provider.c:92
+#: ../camel/providers/local/camel-local-provider.c:94
 msgid "For storing local mail in maildir directories."
 msgstr "Для хранения локальной почты в почтовых каталогах maildir."
 
-#: ../camel/providers/local/camel-local-provider.c:104
+#: ../camel/providers/local/camel-local-provider.c:107
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "_Сохранять заголовки статуса в формате Elm/Pine/Mutt"
 
-#: ../camel/providers/local/camel-local-provider.c:111
+#: ../camel/providers/local/camel-local-provider.c:114
 msgid "Standard Unix mbox spool file"
 msgstr "Стандартная для Unix очередь типа mbox"
 
-#: ../camel/providers/local/camel-local-provider.c:112
-#: ../camel/providers/local/camel-local-provider.c:123
+#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:127
 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."
@@ -3716,124 +3479,125 @@ msgstr ""
 "спула в формате mbox. Также может использоваться для чтения дерева\n"
 "папок в стиле Elm, Pine или Mutt."
 
-#: ../camel/providers/local/camel-local-provider.c:122
+#: ../camel/providers/local/camel-local-provider.c:126
 msgid "Standard Unix mbox spool directory"
 msgstr "Стандартный для Unix каталог очередей типа mbox"
 
-#: ../camel/providers/local/camel-local-store.c:174
-#: ../camel/providers/local/camel-local-store.c:319
+#: ../camel/providers/local/camel-local-store.c:79
+#, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "Не удалось переименовать папку %s в %s: %s"
+
+#: ../camel/providers/local/camel-local-store.c:156
+#, c-format
+msgid "Local mail file %s"
+msgstr "Локальный почтовый файл %s"
+
+#: ../camel/providers/local/camel-local-store.c:187
+#: ../camel/providers/local/camel-local-store.c:329
 #: ../camel/providers/local/camel-maildir-store.c:92
-#: ../camel/providers/local/camel-mbox-store.c:526
-#: ../camel/providers/local/camel-spool-store.c:318
+#: ../camel/providers/local/camel-mbox-store.c:534
+#: ../camel/providers/local/camel-spool-store.c:570
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Относительный путь к хранилищу %s"
 
-#: ../camel/providers/local/camel-local-store.c:183
+#: ../camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Хранилище %s не является каталогом"
 
-#: ../camel/providers/local/camel-local-store.c:194
-#: ../camel/providers/local/camel-local-store.c:204
-#: ../camel/providers/local/camel-local-store.c:332
+#: ../camel/providers/local/camel-local-store.c:207
+#: ../camel/providers/local/camel-local-store.c:217
+#: ../camel/providers/local/camel-local-store.c:342
 #: ../camel/providers/local/camel-maildir-store.c:124
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Не удалось получить папку: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:220
+#: ../camel/providers/local/camel-local-store.c:249
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "Локальное хранилище не имеет папки Входящие"
 
-#: ../camel/providers/local/camel-local-store.c:281
-#, c-format
-msgid "Local mail file %s"
-msgstr "Локальный почтовый файл %s"
-
-#: ../camel/providers/local/camel-local-store.c:393
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "Не удалось переименовать папку %s в %s: %s"
-
-#: ../camel/providers/local/camel-local-store.c:467
-#, c-format
-msgid "Could not rename '%s': %s"
-msgstr "Не удалось переименовать «%s»: %s"
-
-#: ../camel/providers/local/camel-local-store.c:498
-#: ../camel/providers/local/camel-mbox-store.c:695
+#: ../camel/providers/local/camel-local-store.c:387
+#: ../camel/providers/local/camel-mbox-store.c:708
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "Не удалось удалить индексный файл папки «%s»: %s"
 
-#: ../camel/providers/local/camel-local-store.c:526
-#: ../camel/providers/local/camel-mbox-store.c:724
+#: ../camel/providers/local/camel-local-store.c:415
+#: ../camel/providers/local/camel-mbox-store.c:738
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "Не удалось удалить мета-файл папки «%s»: %s"
 
+#: ../camel/providers/local/camel-local-store.c:501
+#, c-format
+msgid "Could not rename '%s': %s"
+msgstr "Не удалось переименовать «%s»: %s"
+
 #: ../camel/providers/local/camel-local-summary.c:548
 #, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Не удалось добавить сообщение к краткой информации: причина неизвестна"
 
-#: ../camel/providers/local/camel-maildir-folder.c:198
+#: ../camel/providers/local/camel-maildir-folder.c:100
+#: ../camel/providers/local/camel-maildir-folder.c:332
+#: ../camel/providers/local/camel-mbox-folder.c:117
+#: ../camel/providers/local/camel-mbox-folder.c:325
+#: ../camel/providers/local/camel-mh-folder.c:156
+msgid "No such message"
+msgstr "Нет такого сообщения"
+
+#: ../camel/providers/local/camel-maildir-folder.c:223
 #, c-format
-#| msgid "Cannot append message to maildir folder: %s: %s"
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "Не удалось добавить сообщение в папку почтового каталога: %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:246
-#: ../camel/providers/local/camel-maildir-folder.c:256
+#: ../camel/providers/local/camel-maildir-folder.c:271
+#: ../camel/providers/local/camel-maildir-folder.c:281
 #: ../camel/providers/local/camel-mbox-folder.c:386
 #: ../camel/providers/local/camel-mh-folder.c:168
 #: ../camel/providers/local/camel-mh-folder.c:178
 #, c-format
-#| msgid ""
-#| "Cannot get message: %s from folder %s\n"
-#| "  %s"
 msgid "Cannot get message %s from folder %s: "
 msgstr "Не удалось получить сообщение %s из папки %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:326
+#: ../camel/providers/local/camel-maildir-folder.c:351
 #, c-format
-#| msgid "Cannot transfer message to destination folder"
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "Не удалось переместить сообщение в папку: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:100
 #, c-format
-#| msgid "Cannot create folder: %s: folder exists"
 msgid "Cannot create folder: %s : Folder name cannot contain a dot"
 msgstr "Не удалось создать папку: %s. Имя папки не должно содержать точек"
 
 #: ../camel/providers/local/camel-maildir-store.c:109
-#: ../camel/providers/local/camel-maildir-store.c:686
+#: ../camel/providers/local/camel-maildir-store.c:722
 #, c-format
-#| msgid "Folder already exists"
 msgid "Folder %s already exists"
 msgstr "Папка %s уже существует"
 
 #: ../camel/providers/local/camel-maildir-store.c:191
 #: ../camel/providers/local/camel-maildir-store.c:222
-#: ../camel/providers/local/camel-mbox-store.c:375
-#: ../camel/providers/local/camel-mbox-store.c:389
+#: ../camel/providers/local/camel-mbox-store.c:384
+#: ../camel/providers/local/camel-mbox-store.c:398
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "Не удалось создать папку: «%s»: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:206
-#: ../camel/providers/local/camel-mbox-store.c:341
-#: ../camel/providers/local/camel-mh-store.c:464
+#: ../camel/providers/local/camel-mbox-store.c:350
+#: ../camel/providers/local/camel-mh-store.c:521
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "Не удалось получить папку: «%s»: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:212
-#: ../camel/providers/local/camel-mbox-store.c:351
-#: ../camel/providers/local/camel-mh-store.c:473
+#: ../camel/providers/local/camel-mbox-store.c:360
+#: ../camel/providers/local/camel-mh-store.c:530
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "Не удалось получить папку «%s»: папка не существует."
@@ -3845,7 +3609,7 @@ msgstr "Не удалось получить папку «%s»: не являе
 
 #: ../camel/providers/local/camel-maildir-store.c:293
 #: ../camel/providers/local/camel-maildir-store.c:333
-#: ../camel/providers/local/camel-mh-store.c:584
+#: ../camel/providers/local/camel-mh-store.c:656
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "Не удалось удалить папку «%s»: %s"
@@ -3854,51 +3618,49 @@ msgstr "Не удалось удалить папку «%s»: %s"
 msgid "not a maildir directory"
 msgstr "не является почтовым каталогом"
 
-#: ../camel/providers/local/camel-maildir-store.c:508
-#: ../camel/providers/local/camel-maildir-store.c:825
-#: ../camel/providers/local/camel-spool-store.c:143
-#: ../camel/providers/local/camel-spool-store.c:159
+#: ../camel/providers/local/camel-maildir-store.c:510
+#: ../camel/providers/local/camel-maildir-store.c:874
+#: ../camel/providers/local/camel-spool-store.c:160
+#: ../camel/providers/local/camel-spool-store.c:179
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "Не удалось просканировать папку «%s»: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:677
+#: ../camel/providers/local/camel-maildir-store.c:713
 #, c-format
-#| msgid "Cannot create folder: %s: folder exists"
 msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
-msgstr "Не удалось переименовать папку: %s. Имя папки не должно содержать точек"
+msgstr ""
+"Не удалось переименовать папку: %s. Имя папки не должно содержать точек"
 
-#: ../camel/providers/local/camel-maildir-summary.c:435
-#: ../camel/providers/local/camel-maildir-summary.c:565
+#: ../camel/providers/local/camel-maildir-summary.c:436
+#: ../camel/providers/local/camel-maildir-summary.c:566
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Не удалось открыть путь к папке почтового каталога: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:556
+#: ../camel/providers/local/camel-maildir-summary.c:557
 msgid "Checking folder consistency"
 msgstr "Проверка содержания каталогов"
 
-#: ../camel/providers/local/camel-maildir-summary.c:649
+#: ../camel/providers/local/camel-maildir-summary.c:650
 msgid "Checking for new messages"
 msgstr "Проверка новых сообщений"
 
-#: ../camel/providers/local/camel-maildir-summary.c:742
+#: ../camel/providers/local/camel-maildir-summary.c:743
 #: ../camel/providers/local/camel-mbox-summary.c:468
-#: ../camel/providers/local/camel-mbox-summary.c:690
-#: ../camel/providers/local/camel-mbox-summary.c:826
+#: ../camel/providers/local/camel-mbox-summary.c:699
+#: ../camel/providers/local/camel-mbox-summary.c:839
 #: ../camel/providers/local/camel-spool-summary.c:131
 msgid "Storing folder"
 msgstr "Сохранение папки"
 
 #: ../camel/providers/local/camel-mbox-folder.c:183
 #, c-format
-#| msgid "Cannot open mailbox: %s: %s\n"
 msgid "Cannot open mailbox: %s: "
 msgstr "Не удалось открыть почтовый ящик: %s:"
 
 #: ../camel/providers/local/camel-mbox-folder.c:249
 #, c-format
-#| msgid "Cannot append message to mbox file: %s: %s"
 msgid "Cannot append message to mbox file: %s: "
 msgstr "Не удалось добавить сообщение в файл почтового ящика: %s:"
 
@@ -3912,34 +3674,34 @@ msgstr "Видимо, папка невостановимо испорчена."
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Не удалось заблокировать папку %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:363
-#: ../camel/providers/local/camel-mbox-store.c:534
+#: ../camel/providers/local/camel-mbox-store.c:372
+#: ../camel/providers/local/camel-mbox-store.c:542
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "Не удалось создать папку с таким именем."
 
-#: ../camel/providers/local/camel-mbox-store.c:400
+#: ../camel/providers/local/camel-mbox-store.c:409
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "Не удалось получить папку «%s»: не является обычным файлом."
 
-#: ../camel/providers/local/camel-mbox-store.c:550
+#: ../camel/providers/local/camel-mbox-store.c:558
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "Не удалось создать каталог «%s»: %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:566
+#: ../camel/providers/local/camel-mbox-store.c:574
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Не удалось создать папку: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:568
+#: ../camel/providers/local/camel-mbox-store.c:576
 msgid "Folder already exists"
 msgstr "Папка уже существует"
 
-#: ../camel/providers/local/camel-mbox-store.c:609
-#: ../camel/providers/local/camel-mbox-store.c:622
-#: ../camel/providers/local/camel-mbox-store.c:651
+#: ../camel/providers/local/camel-mbox-store.c:619
+#: ../camel/providers/local/camel-mbox-store.c:632
+#: ../camel/providers/local/camel-mbox-store.c:661
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3948,164 +3710,156 @@ msgstr ""
 "Не удалось удалить папку «%s»:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:632
+#: ../camel/providers/local/camel-mbox-store.c:642
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "«%s» не является обычным файлом."
 
-#: ../camel/providers/local/camel-mbox-store.c:641
+#: ../camel/providers/local/camel-mbox-store.c:651
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "Папка «%s» не пуста. Не удалена."
 
-#: ../camel/providers/local/camel-mbox-store.c:667
-#: ../camel/providers/local/camel-mbox-store.c:681
+#: ../camel/providers/local/camel-mbox-store.c:678
+#: ../camel/providers/local/camel-mbox-store.c:693
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "Не удалось удалить файл краткой информации «%s»: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:761
+#: ../camel/providers/local/camel-mbox-store.c:775
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "Имя новой папки недопустимо."
 
-#: ../camel/providers/local/camel-mbox-store.c:776
+#: ../camel/providers/local/camel-mbox-store.c:791
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "Не удалось переименовать «%s»: «%s»: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:859
+#: ../camel/providers/local/camel-mbox-store.c:874
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Не удалось переименовать «%s» в %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:476
+#: ../camel/providers/local/camel-mbox-summary.c:478
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Не удалось открыть папку: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:537
+#: ../camel/providers/local/camel-mbox-summary.c:539
 #, c-format
-#| msgid "Fatal mail parser error near position %ld in folder %s"
 msgid "Fatal mail parser error near position %s in folder %s"
 msgstr "Фатальная ошибка почтового анализатора возле позиции %s в папке %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:622
+#: ../camel/providers/local/camel-mbox-summary.c:628
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Не удалось проверить папку: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:697
-#: ../camel/providers/local/camel-mbox-summary.c:833
+#: ../camel/providers/local/camel-mbox-summary.c:708
+#: ../camel/providers/local/camel-mbox-summary.c:848
 #: ../camel/providers/local/camel-spool-summary.c:138
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Не удалось открыть файл: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:711
+#: ../camel/providers/local/camel-mbox-summary.c:722
 #: ../camel/providers/local/camel-spool-summary.c:153
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Не удалось открыть временный почтовый ящик: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:728
-#: ../camel/providers/local/camel-mbox-summary.c:949
+#: ../camel/providers/local/camel-mbox-summary.c:739
+#: ../camel/providers/local/camel-mbox-summary.c:964
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Не удалось закрыть исходную папку %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:739
+#: ../camel/providers/local/camel-mbox-summary.c:750
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "Не удалось закрыть временную папку: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:756
+#: ../camel/providers/local/camel-mbox-summary.c:767
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Не удалось переименовать папку: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:846
-#: ../camel/providers/local/camel-mbox-summary.c:1099
+#: ../camel/providers/local/camel-mbox-summary.c:862
+#: ../camel/providers/local/camel-mbox-summary.c:1129
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Не удалось сохранить папку: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:886
-#: ../camel/providers/local/camel-mbox-summary.c:1131
+#: ../camel/providers/local/camel-mbox-summary.c:901
+#: ../camel/providers/local/camel-mbox-summary.c:1160
 #, c-format
-msgid "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get it.)"
-msgstr "Файл почтового ящика повреждён, исправьте его. (Ожидалась строка «От», но она не была получена.)"
+msgid ""
+"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
+"it.)"
+msgstr ""
+"Файл почтового ящика повреждён, исправьте его. (Ожидалась строка «От», но она "
+"не была получена.)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:895
-#: ../camel/providers/local/camel-mbox-summary.c:1140
+#: ../camel/providers/local/camel-mbox-summary.c:910
+#: ../camel/providers/local/camel-mbox-summary.c:1169
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Сводка и папка расходятся даже после синхронизации"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1052
+#: ../camel/providers/local/camel-mbox-summary.c:1075
 #: ../camel/providers/local/camel-spool-summary.c:343
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Неизвестная ошибка: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1210
-#: ../camel/providers/local/camel-mbox-summary.c:1240
+#: ../camel/providers/local/camel-mbox-summary.c:1239
+#: ../camel/providers/local/camel-mbox-summary.c:1269
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "Сбой записи во временный почтовый ящик: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1229
+#: ../camel/providers/local/camel-mbox-summary.c:1258
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "Сбой записи во временный почтовый ящик: %s: %s"
 
 #: ../camel/providers/local/camel-mh-folder.c:115
 #, c-format
-#| msgid "Cannot append message to mh folder: %s: %s"
 msgid "Cannot append message to mh folder: %s: "
 msgstr "Не удалось добавить сообщение в папку mh: %s:"
 
-#: ../camel/providers/local/camel-mh-store.c:483
+#: ../camel/providers/local/camel-mh-store.c:541
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "Не удалось создать папку «%s»: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:497
+#: ../camel/providers/local/camel-mh-store.c:558
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "Не удалось получить папку «%s»: не является каталогом."
 
-#: ../camel/providers/local/camel-mh-summary.c:230
+#: ../camel/providers/local/camel-mh-summary.c:227
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Не удалось открыть MH каталог: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:327
-#, c-format
-msgid "Spool '%s' cannot be opened: %s"
-msgstr "Не удалось открыть файл накопления «%s»: %s"
-
-#: ../camel/providers/local/camel-spool-store.c:341
-#, c-format
-msgid "Spool '%s' is not a regular file or directory"
-msgstr "Накопитель «%s» не является обычным файлом или каталогом"
-
-#: ../camel/providers/local/camel-spool-store.c:357
+#: ../camel/providers/local/camel-spool-store.c:346
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Файл почтового спула %s"
 
-#: ../camel/providers/local/camel-spool-store.c:357
+#: ../camel/providers/local/camel-spool-store.c:349
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Дерево папки спула %s"
 
-#: ../camel/providers/local/camel-spool-store.c:391
+#: ../camel/providers/local/camel-spool-store.c:390
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "Папка «%s/%s» не существует."
 
-#: ../camel/providers/local/camel-spool-store.c:403
+#: ../camel/providers/local/camel-spool-store.c:404
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -4114,12 +3868,12 @@ msgstr ""
 "Не удалось открыть папку «%s»:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:409
+#: ../camel/providers/local/camel-spool-store.c:410
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "Папка «%s» не существует."
 
-#: ../camel/providers/local/camel-spool-store.c:416
+#: ../camel/providers/local/camel-spool-store.c:417
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -4128,37 +3882,45 @@ msgstr ""
 "Не удалось создать папку «%s»:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:426
+#: ../camel/providers/local/camel-spool-store.c:429
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "«%s» не является файлом почтового ящика."
 
-#: ../camel/providers/local/camel-spool-store.c:462
+#: ../camel/providers/local/camel-spool-store.c:477
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "Хранилище не поддерживает INBOX"
 
-#: ../camel/providers/local/camel-spool-store.c:476
+#: ../camel/providers/local/camel-spool-store.c:491
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "Папки спула не могут быть удалены"
 
-#: ../camel/providers/local/camel-spool-store.c:491
+#: ../camel/providers/local/camel-spool-store.c:506
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "Папки спула не могут быть переименованы"
 
+#: ../camel/providers/local/camel-spool-store.c:579
+#, c-format
+msgid "Spool '%s' cannot be opened: %s"
+msgstr "Не удалось открыть файл накопления «%s»: %s"
+
+#: ../camel/providers/local/camel-spool-store.c:595
+#, c-format
+msgid "Spool '%s' is not a regular file or directory"
+msgstr "Накопитель «%s» не является обычным файлом или каталогом"
+
 #: ../camel/providers/local/camel-spool-summary.c:169
 #: ../camel/providers/local/camel-spool-summary.c:181
 #: ../camel/providers/local/camel-spool-summary.c:193
 #, c-format
-#| msgid "Could not sync temporary folder %s: %s"
 msgid "Could not synchronize temporary folder %s: %s"
 msgstr "Не удалось синхронизировать временную папку %s: %s"
 
 #: ../camel/providers/local/camel-spool-summary.c:211
 #, c-format
-#| msgid "Could not sync spool folder %s: %s"
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "Не удалось синхронизировать папку спула %s: %s"
 
@@ -4166,9 +3928,6 @@ msgstr "Не удалось синхронизировать папку спул
 #: ../camel/providers/local/camel-spool-summary.c:262
 #: ../camel/providers/local/camel-spool-summary.c:275
 #, c-format
-#| msgid ""
-#| "Could not sync spool folder %s: %s\n"
-#| "Folder may be corrupt, copy saved in '%s'"
 msgid ""
 "Could not synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in '%s'"
@@ -4176,7 +3935,7 @@ msgstr ""
 "Не удалось синхронизировать папку спула %s: %s\n"
 "Папка может быть повреждена, копия сохранена в «%s»"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:200
+#: ../camel/providers/nntp/camel-nntp-folder.c:194
 #: ../camel/providers/nntp/camel-nntp-folder.c:279
 #: ../camel/providers/nntp/camel-nntp-folder.c:393
 #, c-format
@@ -4185,14 +3944,21 @@ msgstr "Внутренняя ошибка: UID в неверном формат
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:241
 #: ../camel/providers/nntp/camel-nntp-folder.c:245
-#: ../camel/providers/pop3/camel-pop3-folder.c:369
-#: ../camel/providers/pop3/camel-pop3-folder.c:434
-#: ../camel/providers/pop3/camel-pop3-folder.c:446
-#: ../camel/providers/pop3/camel-pop3-folder.c:695
+#: ../camel/providers/pop3/camel-pop3-folder.c:429
+#: ../camel/providers/pop3/camel-pop3-folder.c:681
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Не удалось получить сообщение %s: %s"
 
+#: ../camel/providers/nntp/camel-nntp-folder.c:251
+#: ../camel/providers/nntp/camel-nntp-folder.c:418
+#: ../camel/providers/pop3/camel-pop3-folder.c:366
+#: ../camel/providers/pop3/camel-pop3-folder.c:418
+#: ../camel/providers/pop3/camel-pop3-folder.c:438
+#, c-format
+msgid "Cannot get message %s: "
+msgstr "Не удалось получить сообщение %s: "
+
 #: ../camel/providers/nntp/camel-nntp-folder.c:477
 #: ../camel/providers/nntp/camel-nntp-folder.c:483
 #: ../camel/providers/nntp/camel-nntp-folder.c:530
@@ -4201,7 +3967,6 @@ msgid "Posting failed: %s"
 msgstr "Ошибка отправки сообщения: %s"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:525
-#| msgid "Posting failed: %s"
 msgid "Posting failed: "
 msgstr "Ошибка отправки сообщения: "
 
@@ -4216,52 +3981,67 @@ msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Вы не можете копировать сообщения из папки NNTP!"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr "_Показывать папки в сокращённой форме (то есть c.o.linux вместо comp.os.linux)"
+msgid ""
+"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr ""
+"_Показывать папки в сокращённой форме (то есть c.o.linux вместо comp.os."
+"linux)"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "По_казывать относительные имена папок в диалоге подписки"
 
+#: ../camel/providers/nntp/camel-nntp-provider.c:52
+msgid "Default NNTP port"
+msgstr "Порт по умолчанию для NNTP"
+
 #: ../camel/providers/nntp/camel-nntp-provider.c:53
+msgid "NNTP over SSL"
+msgstr "NNTP поверх SSL"
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:59
 msgid "USENET news"
 msgstr "Новости USENET"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:61
 msgid "This is a provider for reading from and posting to USENET newsgroups."
-msgstr "Это проводник для чтения и отправки сообщений в группы новостей USENET."
+msgstr ""
+"Это проводник для чтения и отправки сообщений в группы новостей USENET."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
-msgid "This option will authenticate with the NNTP server using a plaintext password."
-msgstr "Подключение к серверу NNTP будет производиться с использованием незашифрованного пароля."
+#: ../camel/providers/nntp/camel-nntp-provider.c:82
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr ""
+"Подключение к серверу NNTP будет производиться с использованием "
+"незашифрованного пароля."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:77
+#: ../camel/providers/nntp/camel-nntp-store.c:107
 #, c-format
 msgid "Authentication requested but no username provided"
 msgstr "Требуется проверка подлинности, но имя пользователя не указано"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:89
+#: ../camel/providers/nntp/camel-nntp-store.c:119
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "Не удалось пройти проверку подлинности на сервере: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:346
+#: ../camel/providers/nntp/camel-nntp-store.c:442
 #, c-format
-#| msgid "Could not read greeting from %s: %s"
 msgid "Could not read greeting from %s: "
 msgstr "Не удалось прочитать приветствие из %s: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:359
+#: ../camel/providers/nntp/camel-nntp-store.c:455
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "Сервер NNTP %s вернул код ошибки %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:527
+#: ../camel/providers/nntp/camel-nntp-store.c:612
 #, c-format
 msgid "USENET News via %s"
 msgstr "Новости USENET через %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1045
+#: ../camel/providers/nntp/camel-nntp-store.c:1119
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4272,7 +4052,7 @@ msgstr ""
 "\n"
 " %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1160
+#: ../camel/providers/nntp/camel-nntp-store.c:1234
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4281,9 +4061,10 @@ msgid ""
 msgstr ""
 "Вы не можете подписаться на эту группу новостей:\n"
 "\n"
-"Нет такой группы новостей. Выбранный элемент скорее всего является родительской папкой."
+"Нет такой группы новостей. Выбранный элемент скорее всего является "
+"родительской папкой."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1202
+#: ../camel/providers/nntp/camel-nntp-store.c:1276
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4294,81 +4075,83 @@ msgstr ""
 "\n"
 "Группа новостей не существует!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1235
+#: ../camel/providers/nntp/camel-nntp-store.c:1309
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr "Вы не можете создать папку в группах новостей: вместо этого следует подписаться."
+msgstr ""
+"Вы не можете создать папку в группах новостей: вместо этого следует "
+"подписаться."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1251
+#: ../camel/providers/nntp/camel-nntp-store.c:1325
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "Вы не можете переименовать папку в группах новостей."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1268
+#: ../camel/providers/nntp/camel-nntp-store.c:1342
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr "Вы не можете удалить папку в группах новостей: вместо этого следует отписаться."
+msgstr ""
+"Вы не можете удалить папку в группах новостей: вместо этого следует "
+"отписаться."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1479
-#| msgid "NNTP Command failed: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1647
 msgid "NNTP Command failed: "
 msgstr "Сбой команды NNTP: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1553
+#: ../camel/providers/nntp/camel-nntp-store.c:1721
 #, c-format
 msgid "Not connected."
 msgstr "Не подключен."
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:234
-#: ../camel/providers/nntp/camel-nntp-summary.c:345
+#: ../camel/providers/nntp/camel-nntp-summary.c:235
+#: ../camel/providers/nntp/camel-nntp-summary.c:353
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Поиск новых сообщений"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:246
+#: ../camel/providers/nntp/camel-nntp-summary.c:251
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "Неожиданный ответ сервера от xover: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:362
+#: ../camel/providers/nntp/camel-nntp-summary.c:369
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "Неожиданный ответ сервера от head: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:407
+#: ../camel/providers/nntp/camel-nntp-summary.c:414
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Сбой операции: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:277
-#: ../camel/providers/pop3/camel-pop3-folder.c:334
+#: ../camel/providers/pop3/camel-pop3-folder.c:283
+#: ../camel/providers/pop3/camel-pop3-folder.c:342
 #, c-format
 msgid "No message with UID %s"
 msgstr "Нет сообщения с UID %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:342
+#: ../camel/providers/pop3/camel-pop3-folder.c:350
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Получение сообщения %d по POP"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:447
+#: ../camel/providers/pop3/camel-pop3-folder.c:430
 msgid "Unknown reason"
 msgstr "Неизвестная причина"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:486
+#: ../camel/providers/pop3/camel-pop3-folder.c:470
 msgid "Retrieving POP summary"
 msgstr "Получение краткой информации от сервера POP"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:509
-#, c-format
-msgid "Cannot get POP summary: %s"
-msgstr "Не удалось получить общие данные POP: %s"
+#: ../camel/providers/pop3/camel-pop3-folder.c:485
+msgid "Cannot get POP summary: "
+msgstr "Невозможно получить общие данные POP: "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:561
+#: ../camel/providers/pop3/camel-pop3-folder.c:542
 msgid "Expunging old messages"
 msgstr "Уничтожение старых сообщений"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:575
+#: ../camel/providers/pop3/camel-pop3-folder.c:556
 msgid "Expunging deleted messages"
 msgstr "Уничтожение сообщений, помеченных как удалённые"
 
@@ -4394,137 +4177,162 @@ msgstr "_Удалить сообщения, удалённые из локаль
 msgid "Disable _support for all POP3 extensions"
 msgstr "Запретить _поддержку всех расширений POP3"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:56
+#: ../camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Default POP3 port"
+msgstr "Порт по умолчанию для POP3"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
+msgid "POP3 over SSL"
+msgstr "POP3 поверх SSL"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:62
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:58
+#: ../camel/providers/pop3/camel-pop3-provider.c:64
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Для подключения и принятия почты с серверов POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:75
-msgid "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers."
-msgstr "Подключение к серверу POP будет производиться с использованием незашифрованного пароля. Большинством серверов POP поддерживается только этот вариант."
+#: ../camel/providers/pop3/camel-pop3-provider.c:83
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
+msgstr ""
+"Подключение к серверу POP будет производиться с использованием "
+"незашифрованного пароля. Большинством серверов POP поддерживается только "
+"этот вариант."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:85
-msgid "This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for all users even on servers that claim to support it."
-msgstr "Подключение к серверу POP будет производиться с использованием шифрованного пароля по протоколу APOP. Это может работать не для всех пользователей даже на серверах, якобы поддерживающих его."
+#: ../camel/providers/pop3/camel-pop3-provider.c:93
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
+msgstr ""
+"Подключение к серверу POP будет производиться с использованием шифрованного "
+"пароля по протоколу APOP. Это может работать не для всех пользователей даже "
+"на серверах, якобы поддерживающих его."
 
 #. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:98
+#: ../camel/providers/pop3/camel-pop3-store.c:97
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:181
+#: ../camel/providers/pop3/camel-pop3-store.c:151
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "Не удалось получить приглашение от POP-сервера %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/pop3/camel-pop3-store.c:230
-#: ../camel/providers/pop3/camel-pop3-store.c:237
+#: ../camel/providers/pop3/camel-pop3-store.c:169
+#: ../camel/providers/pop3/camel-pop3-store.c:208
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Сбой при подключении к серверу POP %s в защищенном режиме: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:200
+#: ../camel/providers/pop3/camel-pop3-store.c:170
 msgid "STLS not supported by server"
 msgstr "STLS не поддерживается сервером"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:218
+#: ../camel/providers/pop3/camel-pop3-store.c:188
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr "Сбой при подключении к серверу POP %s в защищённом режиме%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:231
-msgid "TLS negotiations failed"
-msgstr "Сбой согласования TLS"
+#: ../camel/providers/pop3/camel-pop3-store.c:201
+#, c-format
+msgid "Failed to connect to POP server %s in secure mode: "
+msgstr "Не удалось подключиться к POP-серверу %s в защищённом режиме: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:238
+#: ../camel/providers/pop3/camel-pop3-store.c:209
 msgid "TLS is not available in this build"
 msgstr "TLS не поддерживается в этой сборке"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:317
-#: ../camel/providers/pop3/camel-pop3-store.c:472
+#: ../camel/providers/pop3/camel-pop3-store.c:260
+#: ../camel/providers/pop3/camel-pop3-store.c:433
 #, c-format
-msgid "Unable to connect to POP server %s: No support for requested authentication mechanism."
-msgstr "Не удалось подключиться к серверу POP %s: Не поддерживается затребованный механизм идентификации."
+msgid ""
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
+msgstr ""
+"Не удалось подключиться к POP-серверу %s: Не поддерживается затребованный "
+"механизм идентификации."
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:340
+#: ../camel/providers/pop3/camel-pop3-store.c:288
 #, c-format
 msgid "SASL '%s' Login failed for POP server %s%s"
 msgstr "SASL «%s» Ошибка регистрации на сервере POP %s%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:357
+#: ../camel/providers/pop3/camel-pop3-store.c:305
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Не удалось зарегистрироваться на сервере POP %s: Ошибка протокола SASL"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:374
+#: ../camel/providers/pop3/camel-pop3-store.c:327
 #, c-format
-#| msgid "Failed to authenticate on POP server %s: %s"
 msgid "Failed to authenticate on POP server %s: "
 msgstr "Сбой аутентификации на сервере POP %s: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:439
+#: ../camel/providers/pop3/camel-pop3-store.c:399
 #, c-format
-msgid "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation attack suspected. Please contact your admin."
-msgstr "Не удалось соединиться с сервером %s по протоколу POP:\t  Получен некорректный идентификатор APOP. Возникает подозрение о проведение атаки на персонификацию. Пожалуйста, свяжитесь с администратором."
+msgid ""
+"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
+"attack suspected. Please contact your admin."
+msgstr ""
+"Не удалось соединиться с сервером %s по протоколу POP:\t  Получен "
+"некорректный идентификатор APOP. Возникает подозрение о проведение атаки на "
+"персонификацию. Пожалуйста, свяжитесь с администратором."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:492
+#: ../camel/providers/pop3/camel-pop3-store.c:446
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending password: %s"
+"Error sending password: "
 msgstr ""
-"Не удалось подключиться к серверу POP%s.\n"
-"Ошибка отправки пароля: %s"
+"Не удалось подключиться к POP-серверу %s.\n"
+"Ошибка отправки пароля: "
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:505
+#: ../camel/providers/pop3/camel-pop3-store.c:456
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending username%s"
 msgstr ""
-"Не удалось подключиться к серверу POP %s.\n"
+"Не удалось подключиться к POP-серверу %s.\n"
 "Ошибка отправки имени пользователя%s"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:518
+#: ../camel/providers/pop3/camel-pop3-store.c:468
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password%s"
 msgstr ""
-"Не удалось подключиться к серверу POP%s.\n"
+"Не удалось подключиться к POP-серверу %s.\n"
 "Ошибка отправки пароля%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:558
+#: ../camel/providers/pop3/camel-pop3-store.c:586
 #, c-format
-#| msgid "IMAP server %s"
 msgid "POP3 server %s"
 msgstr "Сервер POP3 %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:562
+#: ../camel/providers/pop3/camel-pop3-store.c:589
 #, c-format
-#| msgid "IMAP service for %s on %s"
 msgid "POP3 server for %s on %s"
-msgstr "СеÑ\80виÑ\81 POP3 для %s на %s"
+msgstr "СеÑ\80веÑ\80 POP3 для %s на %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:693
+#: ../camel/providers/pop3/camel-pop3-store.c:720
 #, c-format
 msgid "Could not connect to POP server %s"
-msgstr "Не удалось подключиться к серверу POP %s"
+msgstr "Не удалось подключиться к POP-серверу %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:720
+#: ../camel/providers/pop3/camel-pop3-store.c:747
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Нет такой папки «%s»."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:737
+#: ../camel/providers/pop3/camel-pop3-store.c:764
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "В хранилищах POP3 отсутствует иерархия папок"
@@ -4534,7 +4342,9 @@ msgid "Sendmail"
 msgstr "Sendmail"
 
 #: ../camel/providers/sendmail/camel-sendmail-provider.c:38
-msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
 msgstr "Доставка почты с помощью программы «sendmail» на локальной системе."
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:49
@@ -4561,7 +4371,6 @@ msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Не удалось запустить Sendmail: %s: почта не отправлена"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:182
-#| msgid "Could not send message: %s"
 msgid "Could not send message: "
 msgstr "Не удалось отправить сообщение:"
 
@@ -4580,391 +4389,480 @@ msgstr "Не удалось выполнить %s: почта не отправ
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "Sendmail завершила работу с результатом %d: почта не отправлена."
 
+#: ../camel/providers/smtp/camel-smtp-provider.c:42
+msgid "Default SMTP port"
+msgstr "Порт по умолчанию для SMTP"
+
 #: ../camel/providers/smtp/camel-smtp-provider.c:43
+msgid "SMTP over SSL"
+msgstr "SMTP поверх SSL"
+
+#: ../camel/providers/smtp/camel-smtp-provider.c:44
+msgid "Message submission port"
+msgstr "Порт отсылки сообщений"
+
+#: ../camel/providers/smtp/camel-smtp-provider.c:50
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:45
+#: ../camel/providers/smtp/camel-smtp-provider.c:52
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr "Для доставки почты путем подключения к удалённому почтовому концентратору по протоколу SMTP."
+msgstr ""
+"Для доставки почты путем подключения к удалённому почтовому концентратору по "
+"протоколу SMTP."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:193
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
-#| msgid "Welcome response error"
+#: ../camel/providers/smtp/camel-smtp-transport.c:155
+#: ../camel/providers/smtp/camel-smtp-transport.c:162
 msgid "Welcome response error: "
 msgstr "Ошибка ответа на приветствие: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:237
-#: ../camel/providers/smtp/camel-smtp-transport.c:277
-#: ../camel/providers/smtp/camel-smtp-transport.c:284
+#: ../camel/providers/smtp/camel-smtp-transport.c:197
+#: ../camel/providers/smtp/camel-smtp-transport.c:243
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "Не удалось подключиться к серверу SMTP %s в защищенном режиме: %s"
+msgstr "Не удалось подключиться к SMTP-серверу %s в защищенном режиме: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:246
-#: ../camel/providers/smtp/camel-smtp-transport.c:259
-#: ../camel/providers/smtp/camel-smtp-transport.c:266
-#| msgid "STARTTLS command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:206
+#: ../camel/providers/smtp/camel-smtp-transport.c:219
+#: ../camel/providers/smtp/camel-smtp-transport.c:226
 msgid "STARTTLS command failed: "
 msgstr "Сбой команды STARTTLS: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:357
+#: ../camel/providers/smtp/camel-smtp-transport.c:236
 #, c-format
-msgid "SMTP server %s"
-msgstr "SMTP сервер %s"
+msgid "Failed to connect to SMTP server %s in secure mode: "
+msgstr "Не удалось подключиться к SMTP-серверу %s в защищённом режиме: "
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:361
 #, c-format
+msgid "SMTP server %s"
+msgstr "SMTP-сервер %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:365
+#, c-format
 msgid "SMTP mail delivery via %s"
-msgstr "Доставка SMTP почты через %s"
+msgstr "SMTP-доставка почты через %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:408
+#: ../camel/providers/smtp/camel-smtp-transport.c:416
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "Сервер SMTP %s не поддерживает затребованный тип идентификации %s"
+msgstr "SMTP-сервер  %s не поддерживает затребованный тип идентификации %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:495
+#: ../camel/providers/smtp/camel-smtp-transport.c:518
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
 "%s\n"
 "\n"
 msgstr ""
-"Ð\9dе Ñ\83далоÑ\81Ñ\8c аÑ\83Ñ\82енÑ\82иÑ\84иÑ\86иÑ\80оваÑ\82Ñ\8cÑ\81Ñ\8f на сервере SMTP.\n"
+"Ð\9dе Ñ\83далоÑ\81Ñ\8c пÑ\80ойÑ\82и пÑ\80овеÑ\80кÑ\83 подлинноÑ\81Ñ\82и на сервере SMTP.\n"
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:613
+#: ../camel/providers/smtp/camel-smtp-transport.c:635
 #, c-format
 msgid "Cannot send message: service not connected."
-msgstr "Не удалось отправить сообщение: сервис не подключен."
+msgstr "Не удалось отправить сообщение: сервис не подключён."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:620
+#: ../camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "Не удалось отправить сообщение: неверный адрес отправителя."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:624
+#: ../camel/providers/smtp/camel-smtp-transport.c:646
 msgid "Sending message"
 msgstr "Отправка сообщения"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:649
+#: ../camel/providers/smtp/camel-smtp-transport.c:671
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "Не удалось отправить сообщение: не определены получатели."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:662
+#: ../camel/providers/smtp/camel-smtp-transport.c:684
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
-msgstr "Не удалось отправить сообщение: указан один или  несколько некорректных получателей"
+msgstr ""
+"Не удалось отправить сообщение: указан один или  несколько некорректных "
+"получателей"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:725
+#: ../camel/providers/smtp/camel-smtp-transport.c:814
 msgid "Syntax error, command unrecognized"
 msgstr "Синтаксическая ошибка, команда не распознана"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:816
 msgid "Syntax error in parameters or arguments"
 msgstr "Синтаксическая ошибка в параметрах или аргументах"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:729
+#: ../camel/providers/smtp/camel-smtp-transport.c:818
 msgid "Command not implemented"
 msgstr "Команда не реализована"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:731
+#: ../camel/providers/smtp/camel-smtp-transport.c:820
 msgid "Command parameter not implemented"
 msgstr "Параметр команды не реализован"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:733
+#: ../camel/providers/smtp/camel-smtp-transport.c:822
 msgid "System status, or system help reply"
 msgstr "Состояние системы или ответ системной справки"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:735
+#: ../camel/providers/smtp/camel-smtp-transport.c:824
 msgid "Help message"
 msgstr "Справочное сообщение"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:737
+#: ../camel/providers/smtp/camel-smtp-transport.c:826
 msgid "Service ready"
 msgstr "Сервис готов"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:739
+#: ../camel/providers/smtp/camel-smtp-transport.c:828
 msgid "Service closing transmission channel"
 msgstr "Сервис закрывает канал передачи"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:741
+#: ../camel/providers/smtp/camel-smtp-transport.c:830
 msgid "Service not available, closing transmission channel"
 msgstr "Сервис не доступен, закрытие канала передачи"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:743
+#: ../camel/providers/smtp/camel-smtp-transport.c:832
 msgid "Requested mail action okay, completed"
 msgstr "Запрошенное почтовое действие выполнено"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
+#: ../camel/providers/smtp/camel-smtp-transport.c:834
 msgid "User not local; will forward to <forward-path>"
-msgstr "Не локальный пользователь; будет отправлено в соответствии с <forward-path>"
+msgstr ""
+"Не локальный пользователь; будет отправлено в соответствии с <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:747
+#: ../camel/providers/smtp/camel-smtp-transport.c:836
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Запрошенное действие с почтой не выполнено: почтовый ящик недоступен"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:749
+#: ../camel/providers/smtp/camel-smtp-transport.c:838
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Запрошенное действие не выполнено: почтовый ящик недоступен"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:751
+#: ../camel/providers/smtp/camel-smtp-transport.c:840
 msgid "Requested action aborted: error in processing"
 msgstr "Запрошенное действие прервано: ошибка при обработке"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:753
+#: ../camel/providers/smtp/camel-smtp-transport.c:842
 msgid "User not local; please try <forward-path>"
 msgstr "Пользователь не локальный; установите <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:755
+#: ../camel/providers/smtp/camel-smtp-transport.c:844
 msgid "Requested action not taken: insufficient system storage"
-msgstr "Запрошенное действие не выполнено: недостаточно места в системном хранилище"
+msgstr ""
+"Запрошенное действие не выполнено: недостаточно места в системном хранилище"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:757
+#: ../camel/providers/smtp/camel-smtp-transport.c:846
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Запрошенное действие прервано: исчерпано место в хранилище"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:759
+#: ../camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Запрошенное действие прервано: имя почтового ящика недопустимо"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:761
+#: ../camel/providers/smtp/camel-smtp-transport.c:850
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Начало ввода почты; окончание после <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:763
+#: ../camel/providers/smtp/camel-smtp-transport.c:852
 msgid "Transaction failed"
 msgstr "Сбой транзакции"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:767
+#: ../camel/providers/smtp/camel-smtp-transport.c:856
 msgid "A password transition is needed"
 msgstr "Необходима передача пароля"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:769
+#: ../camel/providers/smtp/camel-smtp-transport.c:858
 msgid "Authentication mechanism is too weak"
 msgstr "Слишком слабый механизм аутентификации"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:771
+#: ../camel/providers/smtp/camel-smtp-transport.c:860
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Для запрошенного механизма аутентификации требуется шифрование"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:773
+#: ../camel/providers/smtp/camel-smtp-transport.c:862
 msgid "Temporary authentication failure"
 msgstr "Временный сбой аутентификации"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1030
+#: ../camel/providers/smtp/camel-smtp-transport.c:1112
 msgid "SMTP Greeting"
 msgstr "Приветствие SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1057
-#: ../camel/providers/smtp/camel-smtp-transport.c:1074
-#: ../camel/providers/smtp/camel-smtp-transport.c:1082
-#| msgid "HELO command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1139
+#: ../camel/providers/smtp/camel-smtp-transport.c:1156
+#: ../camel/providers/smtp/camel-smtp-transport.c:1164
 msgid "HELO command failed: "
 msgstr "Сбой команды HELO: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1150
+#: ../camel/providers/smtp/camel-smtp-transport.c:1233
 msgid "SMTP Authentication"
 msgstr "Аутентификация SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1157
-#, c-format
-msgid "Error creating SASL authentication object."
-msgstr "Ошибка при создании объекта аутентификации SASL."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1176
-#: ../camel/providers/smtp/camel-smtp-transport.c:1187
-#: ../camel/providers/smtp/camel-smtp-transport.c:1196
-#| msgid "AUTH command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1252
+#: ../camel/providers/smtp/camel-smtp-transport.c:1263
+#: ../camel/providers/smtp/camel-smtp-transport.c:1276
 msgid "AUTH command failed: "
 msgstr "Сбой команды AUTH: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1304
-#: ../camel/providers/smtp/camel-smtp-transport.c:1318
-#: ../camel/providers/smtp/camel-smtp-transport.c:1327
-#| msgid "MAIL FROM command failed"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1384
+#: ../camel/providers/smtp/camel-smtp-transport.c:1398
+#: ../camel/providers/smtp/camel-smtp-transport.c:1407
 msgid "MAIL FROM command failed: "
 msgstr "Сбой команды MAIL FROM: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1354
-#| msgid "RSET command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1434
 msgid "RCPT TO command failed: "
 msgstr "Сбой команды RCPT TO: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1370
-#: ../camel/providers/smtp/camel-smtp-transport.c:1379
+#: ../camel/providers/smtp/camel-smtp-transport.c:1450
+#: ../camel/providers/smtp/camel-smtp-transport.c:1459
 #, c-format
-#| msgid "RCPT TO <%s> failed"
 msgid "RCPT TO <%s> failed: "
 msgstr "Сбой RCPT TO <%s>: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1421
-#: ../camel/providers/smtp/camel-smtp-transport.c:1431
-#: ../camel/providers/smtp/camel-smtp-transport.c:1441
-#: ../camel/providers/smtp/camel-smtp-transport.c:1500
-#: ../camel/providers/smtp/camel-smtp-transport.c:1519
-#: ../camel/providers/smtp/camel-smtp-transport.c:1532
-#: ../camel/providers/smtp/camel-smtp-transport.c:1540
-#| msgid "DATA command failed"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1501
+#: ../camel/providers/smtp/camel-smtp-transport.c:1511
+#: ../camel/providers/smtp/camel-smtp-transport.c:1521
+#: ../camel/providers/smtp/camel-smtp-transport.c:1580
+#: ../camel/providers/smtp/camel-smtp-transport.c:1599
+#: ../camel/providers/smtp/camel-smtp-transport.c:1612
+#: ../camel/providers/smtp/camel-smtp-transport.c:1620
 msgid "DATA command failed: "
 msgstr "Сбой команды DATA: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1565
-#: ../camel/providers/smtp/camel-smtp-transport.c:1579
-#: ../camel/providers/smtp/camel-smtp-transport.c:1587
-#| msgid "RSET command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1645
+#: ../camel/providers/smtp/camel-smtp-transport.c:1659
+#: ../camel/providers/smtp/camel-smtp-transport.c:1667
 msgid "RSET command failed: "
 msgstr "Сбой команды RSET: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1612
-#: ../camel/providers/smtp/camel-smtp-transport.c:1626
-#: ../camel/providers/smtp/camel-smtp-transport.c:1633
-#| msgid "QUIT command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1692
+#: ../camel/providers/smtp/camel-smtp-transport.c:1706
+#: ../camel/providers/smtp/camel-smtp-transport.c:1713
 msgid "QUIT command failed: "
 msgstr "Сбой команды QUIT: "
 
 #: ../libedataserver/e-categories.c:47
-#| msgid "Anniversary"
 msgctxt "CategoryName"
 msgid "Anniversary"
 msgstr "Годовщина"
 
 #: ../libedataserver/e-categories.c:48
-#| msgid "Birthday"
 msgctxt "CategoryName"
 msgid "Birthday"
 msgstr "День рождения"
 
 #: ../libedataserver/e-categories.c:49
-#| msgid "Business"
 msgctxt "CategoryName"
 msgid "Business"
 msgstr "Бизнес"
 
 #: ../libedataserver/e-categories.c:50
-#| msgid "Competition"
 msgctxt "CategoryName"
 msgid "Competition"
 msgstr "Конкуренция"
 
 #: ../libedataserver/e-categories.c:51
-#| msgid "Favorites"
 msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "Избранные"
 
 #: ../libedataserver/e-categories.c:52
-#| msgid "Gifts"
 msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "Подарки"
 
 #: ../libedataserver/e-categories.c:53
-#| msgid "Goals/Objectives"
 msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "Цели и задачи"
 
 #: ../libedataserver/e-categories.c:54
-#| msgid "Holiday"
 msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "Праздник (выходной)"
 
 #: ../libedataserver/e-categories.c:55
-#| msgid "Holiday Cards"
 msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "Поздравительные открытки"
 
 #. important people (e.g. new business partners)
 #: ../libedataserver/e-categories.c:57
-#| msgid "Hot Contacts"
 msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "Важные контакты"
 
 #: ../libedataserver/e-categories.c:58
-#| msgid "Ideas"
 msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "Идеи"
 
 #: ../libedataserver/e-categories.c:59
-#| msgid "International"
 msgctxt "CategoryName"
 msgid "International"
 msgstr "Международные"
 
 #: ../libedataserver/e-categories.c:60
-#| msgid "Key Customer"
 msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "Ключевой потребитель"
 
 #: ../libedataserver/e-categories.c:61
-#| msgid "Miscellaneous"
 msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "Разное"
 
 #: ../libedataserver/e-categories.c:62
-#| msgid "Personal"
 msgctxt "CategoryName"
 msgid "Personal"
 msgstr "Личное"
 
 #: ../libedataserver/e-categories.c:63
-#| msgid "Phone Calls"
 msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "Телефонные звонки"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
 #: ../libedataserver/e-categories.c:65
-#| msgid "Status"
 msgctxt "CategoryName"
 msgid "Status"
 msgstr "Состояние"
 
 #: ../libedataserver/e-categories.c:66
-#| msgid "Strategies"
 msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "Стратегии"
 
 #: ../libedataserver/e-categories.c:67
-#| msgid "Suppliers"
 msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "Поставщики"
 
 #: ../libedataserver/e-categories.c:68
-#| msgid "Time & Expenses"
 msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "Время и расходы"
 
 #: ../libedataserver/e-categories.c:69
-#| msgid "VIP"
 msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
 #: ../libedataserver/e-categories.c:70
-#| msgid "Waiting"
 msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "Ожидание"
 
+#: ../libedataserver/e-client.c:106
+msgctxt "ClientError"
+msgid "Invalid argument"
+msgstr "Недопустимый аргумент"
+
+#: ../libedataserver/e-client.c:108
+msgctxt "ClientError"
+msgid "Backend is busy"
+msgstr "Драйвер занят"
+
+#: ../libedataserver/e-client.c:110
+msgctxt "ClientError"
+msgid "Source not loaded"
+msgstr "Источник не загружен"
+
+#: ../libedataserver/e-client.c:112
+msgctxt "ClientError"
+msgid "Source already loaded"
+msgstr "Источник уже загружен"
+
+#: ../libedataserver/e-client.c:114
+msgctxt "ClientError"
+msgid "Authentication failed"
+msgstr "Сбой проверки подлинности"
+
+#: ../libedataserver/e-client.c:116
+msgctxt "ClientError"
+msgid "Authentication required"
+msgstr "Требуется проверка подлинности"
+
+#: ../libedataserver/e-client.c:118
+msgctxt "ClientError"
+msgid "Repository offline"
+msgstr "Репозиторий отключён от сети"
+
+#: ../libedataserver/e-client.c:120
+msgctxt "ClientError"
+msgid "Offline unavailable"
+msgstr "Режим «вне сети» недоступен"
+
+#: ../libedataserver/e-client.c:122
+msgctxt "ClientError"
+msgid "Permission denied"
+msgstr "Доступ запрещён"
+
+#: ../libedataserver/e-client.c:124
+msgctxt "ClientError"
+msgid "Cancelled"
+msgstr "Отменено"
+
+#: ../libedataserver/e-client.c:126
+msgctxt "ClientError"
+msgid "Could not cancel"
+msgstr "Невозможно отменить"
+
+#: ../libedataserver/e-client.c:128
+msgctxt "ClientError"
+msgid "Not supported"
+msgstr "Не поддерживается"
+
+#: ../libedataserver/e-client.c:130
+msgctxt "ClientError"
+msgid "Unsupported authentication method"
+msgstr "Неподдерживаемый метод проверки подлинности"
+
+#: ../libedataserver/e-client.c:132
+msgctxt "ClientError"
+msgid "TLS not available"
+msgstr "TLS недоступен"
+
+#: ../libedataserver/e-client.c:134
+msgctxt "ClientError"
+msgid "Search size limit exceeded"
+msgstr "Превышено ограничение на размер результатов поиска"
+
+#: ../libedataserver/e-client.c:136
+msgctxt "ClientError"
+msgid "Search time limit exceeded"
+msgstr "Превышено ограничение на время поиска"
+
+#: ../libedataserver/e-client.c:138
+msgctxt "ClientError"
+msgid "Invalid query"
+msgstr "Некорректный запрос"
+
+#: ../libedataserver/e-client.c:140
+msgctxt "ClientError"
+msgid "Query refused"
+msgstr "Запрос отклонён"
+
+#: ../libedataserver/e-client.c:142
+msgctxt "ClientError"
+msgid "D-Bus error"
+msgstr "Ошибка D-Bus"
+
+#: ../libedataserver/e-client.c:144
+msgctxt "ClientError"
+msgid "Other error"
+msgstr "Другая ошибка"
+
+#: ../libedataserver/e-client.c:147
+msgctxt "ClientError"
+msgid "Unknown error"
+msgstr "Неизвестная ошибка"
+
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1635
-#: ../libedataserver/e-time-utils.c:1902
+#: ../libedataserver/e-time-utils.c:1634 ../libedataserver/e-time-utils.c:1930
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
@@ -4972,8 +4870,7 @@ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1640
-#: ../libedataserver/e-time-utils.c:1893
+#: ../libedataserver/e-time-utils.c:1639 ../libedataserver/e-time-utils.c:1921
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
@@ -4981,8 +4878,7 @@ msgstr "%a %d/%m/%Y %H:%M:%S"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1645
-#: ../libedataserver/e-time-utils.c:1898
+#: ../libedataserver/e-time-utils.c:1644 ../libedataserver/e-time-utils.c:1926
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
@@ -4990,83 +4886,78 @@ msgstr "%a %d/%m/%Y %I:%M %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1650
-#: ../libedataserver/e-time-utils.c:1889
+#: ../libedataserver/e-time-utils.c:1649 ../libedataserver/e-time-utils.c:1917
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1655
+#: ../libedataserver/e-time-utils.c:1654
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%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:1660
+#: ../libedataserver/e-time-utils.c:1659
 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:1663
-#: ../libedataserver/e-time-utils.c:1765
-#: ../libedataserver/e-time-utils.c:1884
+#: ../libedataserver/e-time-utils.c:1662 ../libedataserver/e-time-utils.c:1782
+#: ../libedataserver/e-time-utils.c:1912
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1670
+#: ../libedataserver/e-time-utils.c:1669
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1674
+#: ../libedataserver/e-time-utils.c:1673
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1679
+#: ../libedataserver/e-time-utils.c:1678
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d/%m/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1684
+#: ../libedataserver/e-time-utils.c:1683
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d/%m/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1689
+#: ../libedataserver/e-time-utils.c:1688
 msgid "%m/%d/%Y %I %p"
 msgstr "%d/%m/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1694
+#: ../libedataserver/e-time-utils.c:1693
 msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1697
-#: ../libedataserver/e-time-utils.c:1768
+#: ../libedataserver/e-time-utils.c:1696 ../libedataserver/e-time-utils.c:1785
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1826
-#: ../libedataserver/e-time-utils.c:1946
+#: ../libedataserver/e-time-utils.c:1854 ../libedataserver/e-time-utils.c:1974
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1830
-#: ../libedataserver/e-time-utils.c:1938
+#: ../libedataserver/e-time-utils.c:1858 ../libedataserver/e-time-utils.c:1966
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -5074,226 +4965,220 @@ msgstr "%H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1835
-#: ../libedataserver/e-time-utils.c:1943
+#: ../libedataserver/e-time-utils.c:1863 ../libedataserver/e-time-utils.c:1971
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1839
-#: ../libedataserver/e-time-utils.c:1935
+#: ../libedataserver/e-time-utils.c:1867 ../libedataserver/e-time-utils.c:1963
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1842
+#: ../libedataserver/e-time-utils.c:1870
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1846
+#: ../libedataserver/e-time-utils.c:1874
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-book-auth-util.c:93
-#: ../libedataserverui/e-book-auth-util.c:673
+#: ../libedataserverui/e-book-auth-util.c:98
+#: ../libedataserverui/e-book-auth-util.c:661
 msgid "Accessing LDAP Server anonymously"
 msgstr "Анонимный доступ к серверу LDAP"
 
-#: ../libedataserverui/e-book-auth-util.c:199
-#: ../libedataserverui/e-book-auth-util.c:435
+#: ../libedataserverui/e-book-auth-util.c:197
+#: ../libedataserverui/e-book-auth-util.c:422
 msgid "Failed to authenticate.\n"
 msgstr "Ошибка авторизации.\n"
 
-#: ../libedataserverui/e-categories-dialog.c:131
-msgid "Category Properties"
-msgstr "Свойства категории"
-
-#: ../libedataserverui/e-categories-dialog.c:142
-msgid "Category _Name"
-msgstr "_Имя категории"
-
-#: ../libedataserverui/e-categories-dialog.c:148
-msgid "Category _Icon"
-msgstr "_Значок категории"
-
-#: ../libedataserverui/e-categories-dialog.c:189
-msgid "Category Icon"
-msgstr "Значок категории"
-
-#: ../libedataserverui/e-categories-dialog.c:195
-msgid "_No Image"
-msgstr "Нет _изображения"
-
-#: ../libedataserverui/e-categories-dialog.c:406
-#, c-format
-msgid "There is already a category '%s' in the configuration. Please use another name"
-msgstr "Категория с именем «%s» уже есть. Используйте другое имя"
-
-#: ../libedataserverui/e-categories-dialog.c:661
+#: ../libedataserverui/e-categories-editor.c:221
 msgid "Currently _used categories:"
 msgstr "_Используемые категории:"
 
-#: ../libedataserverui/e-categories-dialog.c:668
+#: ../libedataserverui/e-categories-editor.c:230
 msgid "_Available Categories:"
 msgstr "_оступные категории:"
 
-#: ../libedataserverui/e-categories-dialog.c:711
-msgid "_Edit"
-msgstr "_Правка"
-
-#: ../libedataserverui/e-categories-dialog.c:767
+#: ../libedataserverui/e-categories-selector.c:320
 msgid "Icon"
 msgstr "Значок"
 
-#: ../libedataserverui/e-categories-dialog.c:772
+#: ../libedataserverui/e-categories-selector.c:325
 msgid "Category"
 msgstr "Категория"
 
-#: ../libedataserverui/e-category-completion.c:292
+#: ../libedataserverui/e-category-completion.c:294
 #, c-format
 msgid "Create category \"%s\""
 msgstr "Создать категорию «%s»"
 
-#: ../libedataserverui/e-name-selector-dialog.c:169
-#| msgid "Hot Contacts"
+#: ../libedataserverui/e-category-editor.c:132
+msgid "Category Icon"
+msgstr "Значок категории"
+
+#: ../libedataserverui/e-category-editor.c:136
+msgid "_No Image"
+msgstr "Нет _изображения"
+
+#: ../libedataserverui/e-category-editor.c:173
+msgid "Category _Name"
+msgstr "_Имя категории"
+
+#: ../libedataserverui/e-category-editor.c:181
+msgid "Category _Icon"
+msgstr "_Значок категории"
+
+#: ../libedataserverui/e-category-editor.c:221
+msgid "Category Properties"
+msgstr "Свойства категории"
+
+#: ../libedataserverui/e-category-editor.c:282
+#, c-format
+msgid ""
+"There is already a category '%s' in the configuration. Please use another "
+"name"
+msgstr "Категория с именем «%s» уже есть. Используйте другое имя"
+
+#: ../libedataserverui/e-client-utils.c:756
+#, c-format
+msgid ""
+"Enter password for %s (user %s)\n"
+"Reason: %s"
+msgstr ""
+"Введите пароль для %s (пользователь %s)\n"
+"Причина: %s"
+
+#: ../libedataserverui/e-client-utils.c:850
+msgid "Enter Passphrase"
+msgstr "Введите ключевую фразу"
+
+#: ../libedataserverui/e-client-utils.c:852
+msgid "Enter Password"
+msgstr "Введите пароль"
+
+#: ../libedataserverui/e-name-selector-dialog.c:184
 msgid "Show Contacts"
 msgstr "Показать контакты"
 
-#: ../libedataserverui/e-name-selector-dialog.c:191
+#: ../libedataserverui/e-name-selector-dialog.c:206
 msgid "Address B_ook:"
 msgstr "Адресная к_нига:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:199
+#: ../libedataserverui/e-name-selector-dialog.c:214
 msgid "Cate_gory:"
 msgstr "К_атегория:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:217
+#: ../libedataserverui/e-name-selector-dialog.c:232
 msgid "_Search:"
 msgstr "_Искать:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:235
-#: ../libedataserverui/e-name-selector-dialog.c:970
+#: ../libedataserverui/e-name-selector-dialog.c:250
+#: ../libedataserverui/e-name-selector-dialog.c:1011
 msgid "Any Category"
 msgstr "Любая категория"
 
-#: ../libedataserverui/e-name-selector-dialog.c:237
-#| msgid "Contacts"
+#: ../libedataserverui/e-name-selector-dialog.c:252
 msgid "Co_ntacts"
 msgstr "Ко_нтакты"
 
-#: ../libedataserverui/e-name-selector-dialog.c:282
+#: ../libedataserverui/e-name-selector-dialog.c:307
 msgid "Search"
 msgstr "Поиск"
 
-#: ../libedataserverui/e-name-selector-dialog.c:285
+#: ../libedataserverui/e-name-selector-dialog.c:310
 msgid "Address Book"
 msgstr "Адресная книга"
 
-#: ../libedataserverui/e-name-selector-dialog.c:288
+#: ../libedataserverui/e-name-selector-dialog.c:313
 msgid "Contacts"
 msgstr "Контакты"
 
-#: ../libedataserverui/e-name-selector-dialog.c:405
+#: ../libedataserverui/e-name-selector-dialog.c:430
 msgid "Select Contacts from Address Book"
 msgstr "Выбор контактов из адресной книги"
 
-#: ../libedataserverui/e-name-selector-dialog.c:740
+#: ../libedataserverui/e-name-selector-dialog.c:766
 msgid "_Add"
 msgstr "_Добавить"
 
-#: ../libedataserverui/e-name-selector-dialog.c:744
+#: ../libedataserverui/e-name-selector-dialog.c:770
 msgid "_Remove"
 msgstr "_Удалить"
 
-#: ../libedataserverui/e-name-selector-dialog.c:884
+#: ../libedataserverui/e-name-selector-dialog.c:930
 #, c-format
-#| msgid "Error reading mail file: %s"
 msgid "Error loading address book: %s"
 msgstr "Ошибка загрузки адресной книги: %s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2665
+#: ../libedataserverui/e-name-selector-entry.c:2704
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "_Развернуть %s"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2680
+#: ../libedataserverui/e-name-selector-entry.c:2719
 #, c-format
 msgid "Cop_y %s"
 msgstr "К_опировать %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2690
+#: ../libedataserverui/e-name-selector-entry.c:2729
 #, c-format
 msgid "C_ut %s"
 msgstr "В_ырезать %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2707
+#: ../libedataserverui/e-name-selector-entry.c:2746
 #, c-format
 msgid "_Edit %s"
 msgstr "_Правка %s"
 
-#: ../libedataserverui/e-name-selector-list.c:513
+#: ../libedataserverui/e-name-selector-list.c:509
 #, c-format
 msgid "_Delete %s"
 msgstr "_Удалить %s"
 
-#: ../libedataserverui/e-passwords.c:127
-#, c-format
+#: ../libedataserverui/e-passwords.c:126
 msgid "Keyring key is unusable: no user or host name"
 msgstr "Ключ из брелока некорректен: отсутствует имя пользователя или узла"
 
-#: ../libedataserverui/e-passwords.c:701
+#: ../libedataserverui/e-passwords.c:699
+#: ../libedataserverui/e-passwords-win32.c:612
 msgid "You have the Caps Lock key on."
 msgstr "На клавиатуре включён Caps Lock."
 
-#: ../libedataserverui/e-passwords.c:821
+#: ../libedataserverui/e-passwords.c:819
+#: ../libedataserverui/e-passwords-win32.c:735
 msgid "_Remember this passphrase"
 msgstr "_Запомнить эту ключевую фразу"
 
-#: ../libedataserverui/e-passwords.c:822
+#: ../libedataserverui/e-passwords.c:820
+#: ../libedataserverui/e-passwords-win32.c:736
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "_Запомнить этот пароль до окончания этого сеанса"
 
-#: ../libedataserverui/e-passwords.c:827
+#: ../libedataserverui/e-passwords.c:825
+#: ../libedataserverui/e-passwords-win32.c:741
 msgid "_Remember this password"
 msgstr "_Запомнить этот пароль"
 
-#: ../libedataserverui/e-passwords.c:828
+#: ../libedataserverui/e-passwords.c:826
+#: ../libedataserverui/e-passwords-win32.c:742
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Запомнить этот пароль до конца сеанса"
 
 #. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:100
+#: ../libedataserverui/e-source-selector-dialog.c:99
 msgid "Select destination"
 msgstr "Выберите назначение"
 
-#: ../libedataserverui/e-source-selector-dialog.c:170
+#: ../libedataserverui/e-source-selector-dialog.c:169
 msgid "_Destination"
 msgstr "_Назначение"
 
-#: ../servers/groupwise/e-gw-connection.c:227
-msgid "Invalid connection"
-msgstr "Недопустимое соединение"
-
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "Invalid response from server"
-msgstr "Недопустимый ответ от сервера"
-
-#: ../servers/groupwise/e-gw-connection.c:233
-msgid "No response from the server"
-msgstr "Нет ответа от сервера"
-
-#: ../servers/groupwise/e-gw-connection.c:239
-msgid "Bad parameter"
-msgstr "Неверный параметр"
-
-
-#: ../calendar/libecal/e-cal.c:1049
-msgid "On This Computer"
-msgstr "На этом компьютере"