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=general\n"
-"POT-Creation-Date: 2010-02-22 12:31+0000\n"
-"PO-Revision-Date: 2010-02-22 10:04+0300\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\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"
+"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"
+"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"
-#: ../addressbook/backends/file/e-book-backend-file.c:560
+#: ../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:474
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
msgid "Loading..."
-msgstr "Загрузка..."
+msgstr "Загрузка…"
-#: ../addressbook/backends/file/e-book-backend-file.c:563
+#: ../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:4551
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4506
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
msgid "Searching..."
-msgstr "Поиск..."
+msgstr "Поиск…"
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4715
+#. Query for new contacts asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:589
+msgid "Querying for updated contacts…"
+msgstr "Запрос обновлённых контактов…"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:624
+msgid "Personal"
+msgstr "Личное"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:626
+#| msgid "Favorites"
+msgid "Friends"
+msgstr "Друзья"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:628
+#| msgid "Family Name"
+msgid "Family"
+msgstr "Семья"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:630
+msgid "Coworkers"
+msgstr "Сотрудники"
+
+#. Run the query asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:707
+msgid "Querying for updated groups…"
+msgstr "Запрос обновлённых групп…"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:891
+#| msgid "Cannot get contact"
+msgid "Creating new contact…"
+msgstr "Создание нового контакта…"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:984
+msgid "Deleting contact…"
+msgstr "Удаление контакта…"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1092
+#| msgid "Cannot modify contact"
+msgid "Modifying contact…"
+msgstr "Изменение контакта…"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1199
+#| msgid "Loading..."
+msgid "Loading…"
+msgstr "Загрузка…"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1346
+#| msgid "Authentication required"
+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 "СкаÑ\87иваÑ\8eÑ\82Ñ\81Ñ\8f конÑ\82акÑ\82Ñ\8b (%d)... "
+msgstr "Ð\97агÑ\80Ñ\83зка конÑ\82акÑ\82ов (%d)â\80¦"
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2845
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3029
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3073
+#: ../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)... "
+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:816
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:764
msgid "Using Distinguished Name (DN)"
msgstr "Используя отличительное имя (DN)"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:819
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:767
msgid "Using Email Address"
-msgstr "Ð\98Ñ\81полÑ\8cзÑ\83Ñ\8f поÑ\87Ñ\82овÑ\8bй адÑ\80еÑ\81"
+msgstr "Ð\98Ñ\81полÑ\8cзÑ\83Ñ\8f адÑ\80еÑ\81 Ñ\8dл. поÑ\87Ñ\82Ñ\8b"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1096
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1033
msgid "Reconnecting to LDAP server..."
-msgstr "Повторное подключение к серверу LDAP..."
+msgstr "Повторное подключение к серверу LDAP…"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1738
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1158
+#| msgid "Invalid argument"
+msgid "Invalid DN syntax"
+msgstr "Недопустимый синтаксис в отличительном имени (DN)"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1675
msgid "Adding contact to LDAP server..."
-msgstr "Создание контакта на сервере LDAP..."
+msgstr "Создание контакта на сервере LDAP…"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1872
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1807
msgid "Removing contact from LDAP server..."
-msgstr "Удаление контакта с сервера LDAP..."
+msgstr "Удаление контакта с сервера LDAP…"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2309
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2243
msgid "Modifying contact from LDAP server..."
-msgstr "Изменение контакта на сервере LDAP..."
+msgstr "Изменение контакта на сервере LDAP…"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4412
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4356
msgid "Receiving LDAP search results..."
-msgstr "Получение результатов поиска с сервера LDAP..."
+msgstr "Получение результатов поиска с сервера LDAP…"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4573
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4528
msgid "Error performing search"
msgstr "Ошибка выполнения поиска"
-#: ../addressbook/libebook/e-book.c:2149
+#: ../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
+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)"
+
+#: ../addressbook/libebook/e-book.c:3064
#, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
-msgstr "%s: источник для uid «%s» не сохранен в gconf."
+#| 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."
+msgid "Address book does not exist"
+msgstr "Адресная книга не существует"
#. Dummy row as EContactField starts from 1
#: ../addressbook/libebook/e-contact.c:115
#. Contact categories
#: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:671
+#: ../libedataserverui/e-categories-dialog.c:756
msgid "Categories"
msgstr "Категории"
#: ../addressbook/libebook/e-contact.c:182
msgid "Free/Busy URL"
-msgstr "Ссылка (URL) \"свободен/занят\":"
+msgstr "Ссылка (URL) «свободен/занят»"
#: ../addressbook/libebook/e-contact.c:183
msgid "ICS Calendar"
#. Misc fields
#: ../addressbook/libebook/e-contact.c:187
msgid "Spouse's Name"
-msgstr "Имя супруг(и)"
+msgstr "Имя супруга(и)"
#: ../addressbook/libebook/e-contact.c:188
msgid "Note"
msgstr "Groupwise - рабочее экранное имя 3"
#: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 1"
-msgstr "Jabber - домашний идентификатор 1"
+#| msgid "Jabber Home Id 1"
+msgid "Jabber Home ID 1"
+msgstr "Jabber — домашний идентификатор 1"
#: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Home Id 2"
-msgstr "Jabber - домашний идентификатор 2"
+#| msgid "Jabber Home Id 2"
+msgid "Jabber Home ID 2"
+msgstr "Jabber — домашний идентификатор 2"
#: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Home Id 3"
-msgstr "Jabber - домашний идентификатор 3"
+#| msgid "Jabber Home Id 3"
+msgid "Jabber Home ID 3"
+msgstr "Jabber — домашний идентификатор 3"
#: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 1"
-msgstr "Jabber - рабочий идентификатор 1"
+#| msgid "Jabber Work Id 1"
+msgid "Jabber Work ID 1"
+msgstr "Jabber — рабочий идентификатор 1"
#: ../addressbook/libebook/e-contact.c:207
-msgid "Jabber Work Id 2"
-msgstr "Jabber - рабочий идентификатор 2"
+#| msgid "Jabber Work Id 2"
+msgid "Jabber Work ID 2"
+msgstr "Jabber — рабочий идентификатор 2"
#: ../addressbook/libebook/e-contact.c:208
-msgid "Jabber Work Id 3"
-msgstr "Jabber - рабочий идентификатор 3"
+#| msgid "Jabber Work Id 3"
+msgid "Jabber Work ID 3"
+msgstr "Jabber — рабочий идентификатор 3"
#: ../addressbook/libebook/e-contact.c:209
msgid "Yahoo! Home Screen Name 1"
msgstr "MSN - рабочее экранное имя 3"
#: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 1"
-msgstr "ICQ - домашний идентификатор 1"
+#| msgid "ICQ Home Id 1"
+msgid "ICQ Home ID 1"
+msgstr "ICQ — домашний идентификатор 1"
#: ../addressbook/libebook/e-contact.c:222
-msgid "ICQ Home Id 2"
-msgstr "ICQ - домашний идентификатор 2"
+#| msgid "ICQ Home Id 2"
+msgid "ICQ Home ID 2"
+msgstr "ICQ — домашний идентификатор 2"
#: ../addressbook/libebook/e-contact.c:223
-msgid "ICQ Home Id 3"
-msgstr "ICQ - домашний идентификатор 3"
+#| msgid "ICQ Home Id 3"
+msgid "ICQ Home ID 3"
+msgstr "ICQ — домашний идентификатор 3"
#: ../addressbook/libebook/e-contact.c:224
-msgid "ICQ Work Id 1"
-msgstr "ICQ - рабочий идентификатор 1"
+#| msgid "ICQ Work Id 1"
+msgid "ICQ Work ID 1"
+msgstr "ICQ — рабочий идентификатор 1"
#: ../addressbook/libebook/e-contact.c:225
-msgid "ICQ Work Id 2"
-msgstr "ICQ - рабочий идентификатор 2"
+#| msgid "ICQ Work Id 2"
+msgid "ICQ Work ID 2"
+msgstr "ICQ — рабочий идентификатор 2"
#: ../addressbook/libebook/e-contact.c:226
-msgid "ICQ Work Id 3"
-msgstr "ICQ - рабочий идентификатор 3"
+#| msgid "ICQ Work Id 3"
+msgid "ICQ Work ID 3"
+msgstr "ICQ — рабочий идентификатор 3"
#. Last modified time
#: ../addressbook/libebook/e-contact.c:229
msgstr "Список экранных имен AIM"
#: ../addressbook/libebook/e-contact.c:250
-msgid "GroupWise Id List"
+#| msgid "GroupWise Id List"
+msgid "GroupWise ID List"
msgstr "Список идентификаторов Groupwise"
#: ../addressbook/libebook/e-contact.c:251
-msgid "Jabber Id List"
+#| msgid "Jabber Id List"
+msgid "Jabber ID List"
msgstr "Список идентификаторов Jabber"
#: ../addressbook/libebook/e-contact.c:252
msgstr "Список экранных имен MSN"
#: ../addressbook/libebook/e-contact.c:254
-msgid "ICQ Id List"
+#| msgid "ICQ Id List"
+msgid "ICQ ID List"
msgstr "Список идентификаторов ICQ"
#: ../addressbook/libebook/e-contact.c:256
msgstr "Дата рождения"
#: ../addressbook/libebook/e-contact.c:262
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:715
-#: ../libedataserver/e-categories.c:45
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
msgid "Anniversary"
msgstr "Годовщина"
msgstr "Сертификат X.509"
#: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 1"
-msgstr "Gadu-Gadu - домашний идентификатор 1"
+#| msgid "Gadu-Gadu Home Id 1"
+msgid "Gadu-Gadu Home ID 1"
+msgstr "Gadu-Gadu — домашний идентификатор 1"
#: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Home Id 2"
-msgstr "Gadu-Gadu - домашний идентификатор 2"
+#| msgid "Gadu-Gadu Home Id 2"
+msgid "Gadu-Gadu Home ID 2"
+msgstr "Gadu-Gadu — домашний идентификатор 2"
#: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Home Id 3"
-msgstr "Gadu-Gadu - домашний идентификатор 3"
+#| msgid "Gadu-Gadu Home Id 3"
+msgid "Gadu-Gadu Home ID 3"
+msgstr "Gadu-Gadu — домашний идентификатор 3"
#: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 1"
-msgstr "Gadu-Gadu - рабочий идентификатор 1"
+#| msgid "Gadu-Gadu Work Id 1"
+msgid "Gadu-Gadu Work ID 1"
+msgstr "Gadu-Gadu — рабочий идентификатор 1"
#: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Work Id 2"
-msgstr "Gadu-Gadu - рабочий идентификатор 2"
+#| msgid "Gadu-Gadu Work Id 2"
+msgid "Gadu-Gadu Work ID 2"
+msgstr "Gadu-Gadu — рабочий идентификатор 2"
#: ../addressbook/libebook/e-contact.c:272
-msgid "Gadu-Gadu Work Id 3"
-msgstr "Gadu-Gadu - рабочий идентификатор 3"
+#| msgid "Gadu-Gadu Work Id 3"
+msgid "Gadu-Gadu Work ID 3"
+msgstr "Gadu-Gadu — рабочий идентификатор 3"
#: ../addressbook/libebook/e-contact.c:273
-msgid "Gadu-Gadu Id List"
+#| msgid "Gadu-Gadu Id List"
+msgid "Gadu-Gadu ID List"
msgstr "Список идентификаторов Gadu-Gadu"
#. Geo information
msgid "SIP address"
msgstr "Адрес SIP"
-#: ../addressbook/libebook/e-contact.c:1513
+#: ../addressbook/libebook/e-contact.c:1517
#: ../addressbook/libebook/e-destination.c:739
msgid "Unnamed List"
msgstr "Безымянный список"
-#: ../addressbook/libedata-book/e-data-book-factory.c:290
+#: ../addressbook/libedata-book/e-data-book-factory.c:304
#, c-format
msgid "Empty URI"
msgstr "Пустой URI"
-#: ../addressbook/libedata-book/e-data-book-factory.c:305
-#: ../addressbook/libedata-book/e-data-book-factory.c:332
-#: ../calendar/libedata-cal/e-data-cal-factory.c:323
-#: ../calendar/libedata-cal/e-data-cal-factory.c:332
+#: ../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
#, c-format
msgid "Invalid source"
msgstr "Неверный источник"
-#: ../addressbook/libedata-book/e-data-book.c:301
-msgid "Cannot open book"
-msgstr "Не удалось открыть книгу"
+#: ../addressbook/libedata-book/e-data-book.c:173
+#: ../calendar/libedata-cal/e-data-cal.c:110
+msgid "Success"
+msgstr "Успешно"
+
+#: ../addressbook/libedata-book/e-data-book.c:174
+#: ../calendar/libedata-cal/e-data-cal.c:111
+#| msgid "Repository is offline"
+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
+msgid "Permission denied"
+msgstr "Доступ запрещен"
-#: ../addressbook/libedata-book/e-data-book.c:319
-msgid "Cannot remove book"
-msgstr "Невозможно удалить пустую книгу"
+#: ../addressbook/libedata-book/e-data-book.c:176
+#| msgid "Object not found"
+msgid "Contact not found"
+msgstr "Контакт не найден"
+
+#: ../addressbook/libedata-book/e-data-book.c:177
+#| msgid "Object ID already exists"
+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"
+msgid "Authentication Failed"
+msgstr "Сбой аутентификации"
+
+#: ../addressbook/libedata-book/e-data-book.c:179
+#: ../calendar/libedata-cal/e-data-cal.c:118
+#| msgid "Authentication required"
+msgid "Authentication Required"
+msgstr "Требуется аутентификация"
-#: ../addressbook/libedata-book/e-data-book.c:331
-#: ../addressbook/libedata-book/e-data-book.c:346
-msgid "Cannot get contact"
-msgstr "Не удалось получить контакт"
+#: ../addressbook/libedata-book/e-data-book.c:180
+#: ../calendar/libedata-cal/e-data-cal.c:119
+msgid "Unsupported field"
+msgstr "Неподдерживаемое поле"
-#: ../addressbook/libedata-book/e-data-book.c:358
-msgid "Empty query"
-msgstr "Пустой запрос"
+#: ../addressbook/libedata-book/e-data-book.c:181
+#: ../calendar/libedata-cal/e-data-cal.c:121
+msgid "Unsupported authentication method"
+msgstr "Неподдерживаемый метод аутентификации"
-#: ../addressbook/libedata-book/e-data-book.c:402
-msgid "Cannot authenticate user"
-msgstr "Не удалось провести проверку подлинности пользователя"
+#: ../addressbook/libedata-book/e-data-book.c:182
+#: ../calendar/libedata-cal/e-data-cal.c:122
+msgid "TLS not available"
+msgstr "TLS недоступен"
-#: ../addressbook/libedata-book/e-data-book.c:414
-#: ../addressbook/libedata-book/e-data-book.c:429
-msgid "Cannot add contact"
-msgstr "Не удалось добавить контакт"
+#: ../addressbook/libedata-book/e-data-book.c:184
+msgid "Book removed"
+msgstr "Книга удалена"
-#: ../addressbook/libedata-book/e-data-book.c:444
-#: ../addressbook/libedata-book/e-data-book.c:459
-msgid "Cannot modify contact"
-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."
+msgid "Not available in offline mode"
+msgstr "Недоступно в автономном режиме"
+
+#: ../addressbook/libedata-book/e-data-book.c:186
+#: ../calendar/libedata-cal/e-data-cal.c:126
+msgid "Search size limit exceeded"
+msgstr "Превышено ограничение на размер результатов поиска"
-#: ../addressbook/libedata-book/e-data-book.c:494
-msgid "Cannot remove contacts"
-msgstr "Не удалось удалить контакт"
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libedata-cal/e-data-cal.c:127
+msgid "Search time limit exceeded"
+msgstr "Превышено ограничение на время поиска"
-#: ../addressbook/libedata-book/e-data-book.c:569
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
+#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../calendar/libedata-cal/e-data-cal.c:128
msgid "Invalid query"
msgstr "Некорректный запрос"
-#: ../addressbook/libedata-book/e-data-book.c:598
-msgid "Cannot get changes"
-msgstr "Не удалось получить изменения"
+#: ../addressbook/libedata-book/e-data-book.c:189
+#: ../calendar/libedata-cal/e-data-cal.c:129
+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"
+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
+msgid "Invalid server version"
+msgstr "Недопустимая версия сервера"
+
+#: ../addressbook/libedata-book/e-data-book.c:193
+#| msgid "Namespace"
+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
+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"
+msgid "Not supported"
+msgstr "Не поддерживается"
+
+#: ../addressbook/libedata-book/e-data-book.c:204
+#: ../calendar/libedata-cal/e-data-cal.c:143
+#| msgid "Other Phone"
+msgid "Other error"
+msgstr "Другая ошибка"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:325
+#, c-format
+#| msgid "Cannot open book"
+msgid "Cannot open book: %s"
+msgstr "Не удалось открыть книгу: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:347
+#, c-format
+#| msgid "Cannot remove book"
+msgid "Cannot remove book: %s"
+msgstr "Не удалось открыть книгу: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:364
+#: ../addressbook/libedata-book/e-data-book.c:383
+#, c-format
+#| msgid "Cannot get contact"
+msgid "Cannot get contact: %s"
+msgstr "Не удалось получить контакт: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:402
+#, c-format
+#| msgid "Empty query"
+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
+#, c-format
+msgid ""
+"Server is unreachable, calendar is opened in read-only mode.\n"
+"Error message: %s"
+msgstr ""
+"Сервер недоступен, календарь открыт в режиме «только чтение».\n"
+"Сообщение об ошибке: %s"
-#: ../addressbook/libedata-book/e-data-book.c:699
-msgid "Cannot complete operation"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c завеÑ\80Ñ\88иÑ\82Ñ\8c опеÑ\80аÑ\86иÑ\8e"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4241
+msgid "Calendar doesn't support Free/Busy"
+msgstr "Ð\9aалендаÑ\80Ñ\8c не поддеÑ\80живаеÑ\82 инÑ\84оÑ\80маÑ\86иÑ\8e о занÑ\8fÑ\82оÑ\81Ñ\82и"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
-#: ../libedataserver/e-categories.c:46
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:725
msgid "Birthday"
msgstr "День рождения"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:746
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:754
#, c-format
msgid "Birthday: %s"
msgstr "День рождения: %s"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:770
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:778
#, c-format
msgid "Anniversary: %s"
msgstr "Годовщина: %s"
-#: ../calendar/backends/file/e-cal-backend-file.c:236
+#: ../calendar/backends/file/e-cal-backend-file.c:251
msgid "Cannot save calendar data: Malformed URI."
msgstr "Не удалось сохранить данные календаря: Неверный URI."
-#: ../calendar/backends/file/e-cal-backend-file.c:243
-#: ../calendar/backends/file/e-cal-backend-file.c:249
+#: ../calendar/backends/file/e-cal-backend-file.c:258
+#: ../calendar/backends/file/e-cal-backend-file.c:264
msgid "Cannot save calendar data"
msgstr "Не удалось сохранить данные календаря"
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:342
-msgid "Could not create thread for getting deltas"
-msgstr "Не удалось создать поток для получения расхождений"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:374
-#: ../calendar/backends/google/e-cal-backend-google.c:1144
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1081
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1382
-#: ../calendar/backends/http/e-cal-backend-http.c:678
-#: ../calendar/backends/weather/e-cal-backend-weather.c:492
-msgid "Could not create cache file"
-msgstr "Не удалось создать файл кэша"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:387
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1094
-msgid "Could not create thread for populating cache"
-msgstr "Не удалось создать поток для заполнения кэша"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2121
+#: ../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:1087
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2126
+#: ../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:283
-#, c-format
-msgid "Loading %s items"
-msgstr "Загружаются %s элементов"
+#: ../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:919
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:951
msgid "Calendar"
msgstr "Календарь"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:977
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1014
msgid "Invalid server URI"
msgstr "Неверный URI сервера"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:996
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1005
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1099
-#: ../calendar/libecal/e-cal.c:4020
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1334
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1370
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1385
-#: ../camel/providers/groupwise/camel-groupwise-store.c:591
-#: ../camel/providers/groupwise/camel-groupwise-store.c:766
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:181
-msgid "Authentication failed"
-msgstr "Сбой проверки подлинности"
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1115
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1361
+#: ../calendar/backends/http/e-cal-backend-http.c:783
+#: ../calendar/backends/weather/e-cal-backend-weather.c:520
+msgid "Could not create cache file"
+msgstr "Не удалось создать файл кэша"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1127
+msgid "Could not create thread for populating cache"
+msgstr "Не удалось создать поток для заполнения кэша"
-#: ../calendar/backends/http/e-cal-backend-http.c:335
+#: ../calendar/backends/http/e-cal-backend-http.c:423
msgid "Redirected to Invalid URI"
msgstr "Переадресован на недопустимый URI"
-#: ../calendar/backends/http/e-cal-backend-http.c:358
+#: ../calendar/backends/http/e-cal-backend-http.c:456
msgid "Bad file format."
msgstr "Неверный формат файла."
-#: ../calendar/backends/http/e-cal-backend-http.c:365
+#: ../calendar/backends/http/e-cal-backend-http.c:463
msgid "Not a calendar."
-msgstr "Не является календарем."
+msgstr "Не является календарём."
-#: ../calendar/backends/weather/e-cal-backend-weather.c:152
+#: ../calendar/backends/weather/e-cal-backend-weather.c:186
msgid "Could not retrieve weather data"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c полÑ\83Ñ\87иÑ\82Ñ\8c даннÑ\8bе погодÑ\8b"
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c полÑ\83Ñ\87иÑ\82Ñ\8c инÑ\84оÑ\80маÑ\86иÑ\8e о погоде"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
msgid "Weather: Fog"
msgstr "Погода: Туман"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
msgid "Weather: Cloudy Night"
msgstr "Погода: Облачная ночь"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
msgid "Weather: Cloudy"
msgstr "Погода: Облачно"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
msgid "Weather: Overcast"
msgstr "Погода: Пасмурно"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
msgid "Weather: Showers"
msgstr "Погода: Дожди"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:256
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
msgid "Weather: Snow"
msgstr "Погода: Снег"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:257
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
msgid "Weather: Clear Night"
msgstr "Погода: Ясная ночь"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:258
+#: ../calendar/backends/weather/e-cal-backend-weather.c:293
msgid "Weather: Sunny"
msgstr "Погода: Солнечно"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:259
+#: ../calendar/backends/weather/e-cal-backend-weather.c:294
msgid "Weather: Thunderstorms"
msgstr "Погода: Грозы"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:405
+#: ../calendar/backends/weather/e-cal-backend-weather.c:440
msgid "Forecast"
msgstr "Прогноз"
-#: ../calendar/libecal/e-cal-component.c:1286
+#: ../calendar/libecal/e-cal-component.c:1299
msgid "Untitled appointment"
msgstr "Неозаглавленная встреча"
-#: ../calendar/libecal/e-cal-recur.c:3951
+#: ../calendar/libecal/e-cal-recur.c:3979
msgid "1st"
msgstr "1-ое"
-#: ../calendar/libecal/e-cal-recur.c:3952
+#: ../calendar/libecal/e-cal-recur.c:3980
msgid "2nd"
msgstr "2-ое"
-#: ../calendar/libecal/e-cal-recur.c:3953
+#: ../calendar/libecal/e-cal-recur.c:3981
msgid "3rd"
msgstr "3-е"
-#: ../calendar/libecal/e-cal-recur.c:3954
+#: ../calendar/libecal/e-cal-recur.c:3982
msgid "4th"
msgstr "4-ое"
-#: ../calendar/libecal/e-cal-recur.c:3955
+#: ../calendar/libecal/e-cal-recur.c:3983
msgid "5th"
msgstr "5-ое"
-#: ../calendar/libecal/e-cal-recur.c:3956
+#: ../calendar/libecal/e-cal-recur.c:3984
msgid "6th"
msgstr "6-ое"
-#: ../calendar/libecal/e-cal-recur.c:3957
+#: ../calendar/libecal/e-cal-recur.c:3985
msgid "7th"
msgstr "7-ое"
-#: ../calendar/libecal/e-cal-recur.c:3958
+#: ../calendar/libecal/e-cal-recur.c:3986
msgid "8th"
msgstr "8-ое"
-#: ../calendar/libecal/e-cal-recur.c:3959
+#: ../calendar/libecal/e-cal-recur.c:3987
msgid "9th"
msgstr "9-ое"
-#: ../calendar/libecal/e-cal-recur.c:3960
+#: ../calendar/libecal/e-cal-recur.c:3988
msgid "10th"
msgstr "10-ое"
-#: ../calendar/libecal/e-cal-recur.c:3961
+#: ../calendar/libecal/e-cal-recur.c:3989
msgid "11th"
msgstr "11-ое"
-#: ../calendar/libecal/e-cal-recur.c:3962
+#: ../calendar/libecal/e-cal-recur.c:3990
msgid "12th"
msgstr "12-ое"
-#: ../calendar/libecal/e-cal-recur.c:3963
+#: ../calendar/libecal/e-cal-recur.c:3991
msgid "13th"
msgstr "13-ое"
-#: ../calendar/libecal/e-cal-recur.c:3964
+#: ../calendar/libecal/e-cal-recur.c:3992
msgid "14th"
msgstr "14-ое"
-#: ../calendar/libecal/e-cal-recur.c:3965
+#: ../calendar/libecal/e-cal-recur.c:3993
msgid "15th"
msgstr "15-ое"
-#: ../calendar/libecal/e-cal-recur.c:3966
+#: ../calendar/libecal/e-cal-recur.c:3994
msgid "16th"
msgstr "16-ое"
-#: ../calendar/libecal/e-cal-recur.c:3967
+#: ../calendar/libecal/e-cal-recur.c:3995
msgid "17th"
msgstr "17-ое"
-#: ../calendar/libecal/e-cal-recur.c:3968
+#: ../calendar/libecal/e-cal-recur.c:3996
msgid "18th"
msgstr "18-ое"
-#: ../calendar/libecal/e-cal-recur.c:3969
+#: ../calendar/libecal/e-cal-recur.c:3997
msgid "19th"
msgstr "19-ое"
-#: ../calendar/libecal/e-cal-recur.c:3970
+#: ../calendar/libecal/e-cal-recur.c:3998
msgid "20th"
msgstr "20-ое"
-#: ../calendar/libecal/e-cal-recur.c:3971
+#: ../calendar/libecal/e-cal-recur.c:3999
msgid "21st"
msgstr "21-ое"
-#: ../calendar/libecal/e-cal-recur.c:3972
+#: ../calendar/libecal/e-cal-recur.c:4000
msgid "22nd"
msgstr "22-ое"
-#: ../calendar/libecal/e-cal-recur.c:3973
+#: ../calendar/libecal/e-cal-recur.c:4001
msgid "23rd"
msgstr "23-е"
-#: ../calendar/libecal/e-cal-recur.c:3974
+#: ../calendar/libecal/e-cal-recur.c:4002
msgid "24th"
msgstr "24-ое"
-#: ../calendar/libecal/e-cal-recur.c:3975
+#: ../calendar/libecal/e-cal-recur.c:4003
msgid "25th"
msgstr "25-ое"
-#: ../calendar/libecal/e-cal-recur.c:3976
+#: ../calendar/libecal/e-cal-recur.c:4004
msgid "26th"
msgstr "26-ое"
-#: ../calendar/libecal/e-cal-recur.c:3977
+#: ../calendar/libecal/e-cal-recur.c:4005
msgid "27th"
msgstr "27-ое"
-#: ../calendar/libecal/e-cal-recur.c:3978
+#: ../calendar/libecal/e-cal-recur.c:4006
msgid "28th"
msgstr "28-ое"
-#: ../calendar/libecal/e-cal-recur.c:3979
+#: ../calendar/libecal/e-cal-recur.c:4007
msgid "29th"
msgstr "29-ое"
-#: ../calendar/libecal/e-cal-recur.c:3980
+#: ../calendar/libecal/e-cal-recur.c:4008
msgid "30th"
msgstr "30-ое"
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:4009
msgid "31st"
msgstr "31-ое"
-#: ../calendar/libecal/e-cal-util.c:688 ../calendar/libecal/e-cal-util.c:715
+#: ../calendar/libecal/e-cal-util.c:678
+#: ../calendar/libecal/e-cal-util.c:705
msgid "High"
msgstr "Высокий"
-#: ../calendar/libecal/e-cal-util.c:690 ../calendar/libecal/e-cal-util.c:717
+#: ../calendar/libecal/e-cal-util.c:680
+#: ../calendar/libecal/e-cal-util.c:707
msgid "Normal"
msgstr "Нормальный"
-#: ../calendar/libecal/e-cal-util.c:692 ../calendar/libecal/e-cal-util.c:719
+#: ../calendar/libecal/e-cal-util.c:682
+#: ../calendar/libecal/e-cal-util.c:709
msgid "Low"
msgstr "Низкий"
#. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:713
+#: ../calendar/libecal/e-cal-util.c:703
msgid "Undefined"
-msgstr "Неопределено"
+msgstr "Неопределённый"
-#: ../calendar/libecal/e-cal.c:1173 ../libedataserverui/e-book-auth-util.c:199
+#: ../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)"
#. 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:1187
+#: ../calendar/libecal/e-cal.c:1250
#, c-format
msgid "Enter password for %s to enable proxy for user %s"
msgstr "Введите пароль к %s для включения прокси для пользователя %s"
-#: ../calendar/libecal/e-cal.c:3992
-msgid "Invalid argument"
-msgstr "Недопустимый аргумент"
-
-#: ../calendar/libecal/e-cal.c:3994
+#: ../calendar/libecal/e-cal.c:4145
msgid "Backend is busy"
msgstr "Компонент занят"
-#: ../calendar/libecal/e-cal.c:3996
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:4147
msgid "Repository is offline"
-msgstr "РепозиÑ\82оÑ\80ий оÑ\82клÑ\8eÑ\87ен оÑ\82 Ñ\81еÑ\82и"
+msgstr "РепозиÑ\82оÑ\80ий наÑ\85одиÑ\82Ñ\81Ñ\8f в авÑ\82ономном Ñ\80ежиме"
-#: ../calendar/libecal/e-cal.c:3998
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
+#: ../calendar/libecal/e-cal.c:4149
msgid "No such calendar"
msgstr "Нет такого календаря"
-#: ../calendar/libecal/e-cal.c:4000
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
+#: ../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:4002
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
+#: ../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:4004
+#: ../calendar/libecal/e-cal.c:4155
msgid "URI not loaded"
msgstr "URI не загружен"
-#: ../calendar/libecal/e-cal.c:4006
+#: ../calendar/libecal/e-cal.c:4157
msgid "URI already loaded"
msgstr "URI уже загружен"
-#: ../calendar/libecal/e-cal.c:4008
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
-msgid "Permission denied"
-msgstr "Доступ запрещен"
-
-#: ../calendar/libecal/e-cal.c:4010
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
+#: ../calendar/libecal/e-cal.c:4161
#: ../servers/groupwise/e-gw-connection.c:237
msgid "Unknown User"
msgstr "Неизвестный пользователь"
-#: ../calendar/libecal/e-cal.c:4012
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../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:4014
+#: ../calendar/libecal/e-cal.c:4165
msgid "Protocol not supported"
msgstr "Протокол не поддерживается"
-#: ../calendar/libecal/e-cal.c:4016
+#: ../calendar/libecal/e-cal.c:4167
msgid "Operation has been canceled"
-msgstr "Ð\9eпеÑ\80аÑ\86иÑ\8f бÑ\8bла оÑ\82менена"
+msgstr "Операция отменена"
-#: ../calendar/libecal/e-cal.c:4018
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
+#: ../calendar/libecal/e-cal.c:4169
msgid "Could not cancel operation"
msgstr "Не удалось отменить операцию"
-#: ../calendar/libecal/e-cal.c:4022
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:217
+#: ../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
+#, 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:4024
-msgid "A CORBA exception has occurred"
-msgstr "Произошло исключение CORBA"
-
-#: ../calendar/libecal/e-cal.c:4026
-#: ../calendar/libedata-cal/e-cal-backend-util.c:146
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
-#: ../camel/providers/imap/camel-imap-command.c:432
-#: ../camel/providers/imap/camel-imap-store.c:741
-#: ../camel/providers/imap4/camel-imap4-engine.c:1547
-#: ../camel/providers/imap4/camel-imap4-engine.c:1585
-#: ../camel/providers/imap4/camel-imap4-engine.c:1629
-#: ../camel/providers/imap4/camel-imap4-engine.c:1684
-#: ../camel/providers/imap4/camel-imap4-store.c:311
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-#: ../camel/providers/pop3/camel-pop3-store.c:582
-#: ../servers/groupwise/e-gw-connection.c:243
-msgid "Unknown error"
-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:4028
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
+#: ../calendar/libecal/e-cal.c:4179
msgid "No error"
msgstr "Нет ошибки"
#: ../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:775
#, 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
#, c-format
#: ../calendar/libedata-cal/e-cal-backend-sexp.c:941
#, c-format
-msgid ""
-"\"%s\" expects all arguments to be strings or one and only one argument to "
-"be a boolean false (#f)"
-msgstr ""
-"«%s» предполагает, что все аргументы - строки или единственный аргумент - "
-"логическая ложь (#f)"
+msgid "\"%s\" expects all arguments to be strings or one and only one argument to be a boolean false (#f)"
+msgstr "«%s» предполагает, что все аргументы - строки или единственный аргумент - логическая ложь (#f)"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+#: ../calendar/libedata-cal/e-data-cal.c:113
msgid "Invalid range"
-msgstr "Недопустимый промежуток"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
-msgid "Unsupported field"
-msgstr "Неподдерживаемое поле"
+msgstr "Недопустимый диапазон"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-data-cal.c:120
msgid "Unsupported method"
msgstr "Неподдерживаемый метод"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
-msgid "Unsupported authentication method"
-msgstr "Неподдерживаемый метод аутентификации"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-msgid "TLS not available"
-msgstr "TLS недоступен"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-msgid "Offline mode unavailable"
-msgstr "Режим «вне сети» недоступен"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-msgid "Search size limit exceeded"
-msgstr "Превышено ограничение на размер результатов поиска"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-msgid "Search time limit exceeded"
-msgstr "Превышено ограничение на время поиска"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
-msgid "Query refused"
-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-cal-backend-util.c:148
-msgid "Invalid server version"
-msgstr "Неверная версия сервера"
+#: ../calendar/libedata-cal/e-data-cal.c:124
+#| msgid "Unknown User"
+msgid "Unknown user"
+msgstr "Неизвестный пользователь"
-#: ../calendar/libedata-cal/e-data-cal.c:491
+#. 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"
-msgstr "Не удалось получить адрес календаря"
+#| msgid "Cannot retrieve calendar address"
+msgid "Cannot retrieve calendar address: %s"
+msgstr "Не удалось получить адрес календаря: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:509
+#. 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"
-msgstr "Не удалось получить адрес эл. почты для отправки уведомлений календаря"
+#| msgid "Cannot retrieve calendar alarm e-mail address"
+msgid "Cannot retrieve calendar alarm e-mail address: %s"
+msgstr "Не удалось получить адрес эл. почты для отправки уведомлений календаря: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:527
+#. 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"
-msgstr "Не удалось получить атрибут ldap календаря"
+#| msgid "Cannot retrieve calendar's ldap attribute"
+msgid "Cannot retrieve calendar's LDAP attribute: %s"
+msgstr "Не удалось получить атрибут LDAP: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:545
+#. 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"
-msgstr "Не удалось получить расписание календаря"
+#| msgid "Cannot retrieve calendar scheduling information"
+msgid "Cannot retrieve calendar scheduling information: %s"
+msgstr "Не удалось получить расписание календаря: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:562
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:709
#, c-format
-msgid "Cannot open calendar"
-msgstr "Не удалось открыть календарь"
+#| msgid "Cannot open calendar"
+msgid "Cannot open calendar: %s"
+msgstr "Не удалось открыть календарь: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:579
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:730
#, c-format
-msgid "Cannot refresh calendar"
-msgstr "Не удалось обновить данные календаря"
+#| msgid "Cannot refresh calendar"
+msgid "Cannot refresh calendar: %s"
+msgstr "Не удалось обновить данные календаря: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:596
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:749
#, c-format
-msgid "Cannot remove calendar"
-msgstr "Не удалось удалить календарь"
+#| msgid "Cannot remove calendar"
+msgid "Cannot remove calendar: %s"
+msgstr "Не удалось удалить календарь: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:615
+#. 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"
-msgstr "Не удалось создать объект календаря"
+#| msgid "Cannot create calendar object"
+msgid "Cannot create calendar object: %s"
+msgstr "Не удалось создать объект календаря: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:637
+#. 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"
-msgstr "Не удалось изменить объект календаря"
+#| msgid "Cannot modify calendar object"
+msgid "Cannot modify calendar object: %s"
+msgstr "Не удалось изменить объект календаря: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:661
+#. 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"
-msgstr "Не удалось удалить объект календаря"
+#| msgid "Cannot remove calendar object"
+msgid "Cannot remove calendar object: %s"
+msgstr "Не удалось удалить объект календаря: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:680
+#. 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"
-msgstr "Не удалось получить объекты календаря"
+#| msgid "Cannot receive calendar objects"
+msgid "Cannot receive calendar objects: %s"
+msgstr "Не удалось получить объекты календаря: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:697
+#. 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"
-msgstr "Не удалось снять уведомление календаря"
+#| msgid "Cannot discard calendar alarm"
+msgid "Cannot discard calendar alarm: %s"
+msgstr "Не удалось снять уведомление календаря: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:716
+#. 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"
-msgstr "Не удалось отправить объекты календаря"
+#| msgid "Cannot send calendar objects"
+msgid "Cannot send calendar objects: %s"
+msgstr "Не удалось отправить объекты календаря: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:751
+#. 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"
-msgstr "Не удалось получить путь объекта календаря по умолчанию"
+#| msgid "Cannot retrieve default calendar object path"
+msgid "Cannot retrieve default calendar object path: %s"
+msgstr "Не удалось получить путь к объекту календаря по умолчанию: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:769
+#. 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"
-msgstr "Не удалось получить путь объекта календаря"
+#| msgid "Cannot retrieve calendar object path"
+msgid "Cannot retrieve calendar object path: %s"
+msgstr "Не удалось получить путь к объекту календаря: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:787
+#. 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"
-msgstr "Невозможно получить список объектов календаря"
+#| msgid "Cannot retrieve calendar object list"
+msgid "Cannot retrieve calendar object list: %s"
+msgstr "Невозможно получить список объектов календаря: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:825
+#. 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"
-msgstr "Не удалось получить список объектов календаря"
+#| msgid "Could not retrieve attachment list"
+msgid "Could not retrieve attachment list: %s"
+msgstr "Не удалось получить список вложений: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:847
+#. 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"
-msgstr "Не удалось завершить запрос календаря"
+#| msgid "Could not complete calendar query"
+msgid "Could not complete calendar query: %s"
+msgstr "Не удалось завершить запрос календаря: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:865
+#. 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"
-msgstr "Не удалось получить часовой пояс календаря"
+#| msgid "Could not retrieve calendar time zone"
+msgid "Could not retrieve calendar time zone: %s"
+msgstr "Не удалось получить часовой пояс календаря: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:883
+#. 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"
-msgstr "Не удалось добавить часовой пояс календаря"
+#| msgid "Could not add calendar time zone"
+msgid "Could not add calendar time zone: %s"
+msgstr "Не удалось добавить часовой пояс календаря: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:900
+#. 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"
-msgstr "Не удалось задать часовой пояс календаря по умолчанию"
+#| msgid "Could not set default calendar time zone"
+msgid "Could not set default calendar time zone: %s"
+msgstr "Не удалось задать часовой пояс календаря по умолчанию: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:921
+#. 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"
-msgstr "Не удалось получить изменения календаря"
+#| msgid "Cannot retrieve calendar changes"
+msgid "Cannot retrieve calendar changes: %s"
+msgstr "Не удалось получить изменения календаря: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:971
+#. 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"
-msgstr "Не удалось получить список свободных/занятых дней календаря"
+#| 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:339
+#: ../calendar/libedata-cal/e-data-cal-factory.c:374
#, c-format
msgid "Invalid URI"
msgstr "Неверный URI"
-#: ../calendar/libedata-cal/e-data-cal-factory.c:350
+#: ../calendar/libedata-cal/e-data-cal-factory.c:392
#, c-format
msgid "No backend factory for '%s' of '%s'"
msgstr "Не указан драйвер фабрики для «%s» у «%s»"
-#: ../calendar/libedata-cal/e-data-cal-factory.c:390
+#: ../calendar/libedata-cal/e-data-cal-factory.c:442
#, c-format
msgid "Could not instantiate backend"
msgstr "Не удалось создать объект драйвера"
-#: ../camel/camel-cipher-context.c:102
+#: ../camel/camel-cipher-context.c:204
+#, c-format
msgid "Signing is not supported by this cipher"
msgstr "Подпись не поддерживается этим шифром"
-#: ../camel/camel-cipher-context.c:128
-msgid "Signing message"
-msgstr "Сообщение подписывается"
-
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:217
+#, c-format
msgid "Verifying is not supported by this cipher"
msgstr "Проверка не поддерживается этим шифром"
-#: ../camel/camel-cipher-context.c:171
-msgid "Verifying message"
-msgstr "Сообщение проверяется"
-
-#: ../camel/camel-cipher-context.c:189
+#: ../camel/camel-cipher-context.c:233
+#, c-format
msgid "Encryption is not supported by this cipher"
msgstr "Шифрование не поддерживается этим шифром"
-#: ../camel/camel-cipher-context.c:215
-msgid "Encrypting message"
-msgstr "Сообщение шифруется"
-
-#: ../camel/camel-cipher-context.c:232
+#: ../camel/camel-cipher-context.c:247
+#, c-format
msgid "Decryption is not supported by this cipher"
msgstr "Расшифровка не поддерживается этим шифром"
-#: ../camel/camel-cipher-context.c:254
-msgid "Decrypting message"
-msgstr "Сообщение расшифровывается"
-
-#: ../camel/camel-cipher-context.c:271
+#: ../camel/camel-cipher-context.c:260
+#, c-format
msgid "You may not import keys with this cipher"
msgstr "Импорт ключей не поддерживается этим шифром"
-#: ../camel/camel-cipher-context.c:301
+#: ../camel/camel-cipher-context.c:274
+#, c-format
msgid "You may not export keys with this cipher"
msgstr "Экспорт ключей не поддерживается этим шифром"
-#: ../camel/camel-data-cache.c:135
+#: ../camel/camel-cipher-context.c:815
+msgid "Signing message"
+msgstr "Сообщение подписывается"
+
+#: ../camel/camel-cipher-context.c:1056
+msgid "Encrypting message"
+msgstr "Сообщение шифруется"
+
+#: ../camel/camel-cipher-context.c:1183
+msgid "Decrypting message"
+msgstr "Сообщение расшифровывается"
+
+#: ../camel/camel-data-cache.c:181
+#, c-format
msgid "Unable to create cache path"
msgstr "Не удалось создать путь для кэша"
-#: ../camel/camel-data-cache.c:401
+#: ../camel/camel-data-cache.c:499
#, c-format
msgid "Could not remove cache entry: %s: %s"
msgstr "Не удалось удалить кэшированный элемент: %s: %s"
-#: ../camel/camel-db.c:411
+#: ../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:197
+#: ../camel/camel-disco-diary.c:195
#, c-format
msgid ""
"Could not write log entry: %s\n"
"воспроизведены после подключения к серверу."
#: ../camel/camel-disco-diary.c:260
-#: ../camel/providers/imap/camel-imap-journal.c:320
+#: ../camel/providers/imap/camel-imap-journal.c:300
#, c-format
msgid ""
"Could not open '%s':\n"
"%s\n"
"Изменения, сделанные в этой папке, не будут синхронизированы."
-#: ../camel/camel-disco-diary.c:296
+#: ../camel/camel-disco-diary.c:304
msgid "Resynchronizing with server"
msgstr "Синхронизация с сервером"
-#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:51
-msgid "Copy folder content locally for offline operation"
-msgstr "Скопировать содержимое папки на локальную машину для автономной работы"
-
-#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:107
+#: ../camel/camel-disco-folder.c:67
+#: ../camel/camel-offline-folder.c:83
msgid "Downloading new messages for offline mode"
msgstr "Новые сообщения загружаются для автономной работы"
-#: ../camel/camel-disco-folder.c:466
+#: ../camel/camel-disco-folder.c:402
#, c-format
msgid "Preparing folder '%s' for offline"
msgstr "Подготовка папки «%s» для автономной работы"
-#: ../camel/camel-disco-store.c:400
-#: ../camel/providers/groupwise/camel-groupwise-store.c:216
-#: ../camel/providers/imap/camel-imap-store.c:1001
-#: ../camel/providers/imap/camel-imap-store.c:1843
-#: ../camel/providers/imap/camel-imap-store.c:2259
-#: ../camel/providers/imap/camel-imap-store.c:3068
+#: ../camel/camel-disco-folder.c:468
+#: ../camel/camel-offline-folder.c:316
+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/providers/imapx/camel-imapx-folder.c:298
+#: ../camel/providers/imapx/camel-imapx-folder.c:331
+#: ../camel/providers/imapx/camel-imapx-folder.c:385
+#: ../camel/providers/imapx/camel-imapx-folder.c:431
+#: ../camel/providers/imapx/camel-imapx-folder.c:465
+#: ../camel/providers/imapx/camel-imapx-folder.c:505
+#: ../camel/providers/imapx/camel-imapx-folder.c:541
+#: ../camel/providers/imapx/camel-imapx-store.c: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
+#, c-format
msgid "You must be working online to complete this operation"
msgstr "Для завершения данной операции необходимо подключение к сети"
-#: ../camel/camel-exception.c:260
-msgid "No description available"
-msgstr "Описание недоступно"
+#: ../camel/camel-file-utils.c:719
+#, c-format
+msgid "Canceled"
+msgstr "Отменено"
-#: ../camel/camel-filter-driver.c:794 ../camel/camel-filter-search.c:579
+#: ../camel/camel-filter-driver.c:839
+#: ../camel/camel-filter-search.c:582
#, c-format
msgid "Failed to create child process '%s': %s"
msgstr "Сбой при создании дочернего процесса «%s»: %s"
-#: ../camel/camel-filter-driver.c:836
+#: ../camel/camel-filter-driver.c:886
#, c-format
msgid "Invalid message stream received from %s: %s"
msgstr "Неверный поток сообщений получен из %s: %s"
-#: ../camel/camel-filter-driver.c:1025 ../camel/camel-filter-driver.c:1034
+#: ../camel/camel-filter-driver.c:1073
+#: ../camel/camel-filter-driver.c:1082
msgid "Syncing folders"
msgstr "Синхронизация папок"
-#: ../camel/camel-filter-driver.c:1121 ../camel/camel-filter-driver.c:1522
+#: ../camel/camel-filter-driver.c:1170
+#: ../camel/camel-filter-driver.c:1620
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "Не удалось разобрать фильтр: %s: %s"
-#: ../camel/camel-filter-driver.c:1130 ../camel/camel-filter-driver.c:1531
+#: ../camel/camel-filter-driver.c:1181
+#: ../camel/camel-filter-driver.c:1631
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "Ошибка выполнения фильтра: %s: %s"
-#: ../camel/camel-filter-driver.c:1216
+#: ../camel/camel-filter-driver.c:1278
+#, c-format
msgid "Unable to open spool folder"
msgstr "Не удалось открыть папку спула"
-#: ../camel/camel-filter-driver.c:1225
+#: ../camel/camel-filter-driver.c:1289
+#, c-format
msgid "Unable to process spool folder"
msgstr "Не удалось обработать папку спула"
-#: ../camel/camel-filter-driver.c:1241
+#: ../camel/camel-filter-driver.c:1307
#, c-format
msgid "Getting message %d (%d%%)"
msgstr "Получение сообщения %d (%d%%)"
-#: ../camel/camel-filter-driver.c:1245
-msgid "Cannot open message"
-msgstr "Не удалось открыть сообщение"
-
-#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1264
+#: ../camel/camel-filter-driver.c:1314
+#: ../camel/camel-filter-driver.c:1336
#, c-format
msgid "Failed on message %d"
msgstr "Сбой на сообщении %d"
-#: ../camel/camel-filter-driver.c:1278 ../camel/camel-filter-driver.c:1368
+#: ../camel/camel-filter-driver.c:1351
+#: ../camel/camel-filter-driver.c:1456
msgid "Syncing folder"
msgstr "Синхронизация папки"
-#: ../camel/camel-filter-driver.c:1282 ../camel/camel-filter-driver.c:1373
+#: ../camel/camel-filter-driver.c:1356
+#: ../camel/camel-filter-driver.c:1462
msgid "Complete"
msgstr "Завершена"
-#: ../camel/camel-filter-driver.c:1338
+#: ../camel/camel-filter-driver.c:1420
#, c-format
msgid "Getting message %d of %d"
msgstr "Получение сообщения %d из %d"
-#: ../camel/camel-filter-driver.c:1353
+#: ../camel/camel-filter-driver.c:1438
#, c-format
msgid "Failed at message %d of %d"
msgstr "Сбой на сообщении %d из %d"
-#: ../camel/camel-filter-search.c:137
+#: ../camel/camel-filter-search.c:135
msgid "Failed to retrieve message"
msgstr "Сбой при получении сообщения"
-#: ../camel/camel-filter-search.c:399
+#: ../camel/camel-filter-search.c:401
msgid "Invalid arguments to (system-flag)"
msgstr "Недопустимые аргументы для system-flag"
-#: ../camel/camel-filter-search.c:414
+#: ../camel/camel-filter-search.c:416
msgid "Invalid arguments to (user-tag)"
msgstr "Недопустимые аргументы для user-tag"
-#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:735 ../camel/camel-filter-search.c:743
+#: ../camel/camel-filter-search.c:744
+#: ../camel/camel-filter-search.c:753
#, c-format
msgid "Error executing filter search: %s: %s"
msgstr "Ошибка выполнения поиска фильтра: %s: %s"
-#: ../camel/camel-folder-search.c:351 ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:608
+#: ../camel/camel-folder-search.c:345
+#: ../camel/camel-folder-search.c:456
+#: ../camel/camel-folder-search.c:627
#, c-format
msgid ""
"Cannot parse search expression: %s:\n"
"Ошибка в регулярном выражении «%s»:\n"
"%s"
-#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:463
-#: ../camel/camel-folder-search.c:618
+#: ../camel/camel-folder-search.c:357
+#: ../camel/camel-folder-search.c:468
+#: ../camel/camel-folder-search.c:639
#, c-format
msgid ""
"Error executing search expression: %s:\n"
"Ошибка при выполнении выражения поиска «%s»:\n"
"%s"
-#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:852
+#: ../camel/camel-folder-search.c:843
+#: ../camel/camel-folder-search.c:885
#, c-format
msgid "(%s) requires a single bool result"
msgstr "(%s) требует единственного логического результата"
-#: ../camel/camel-folder-search.c:905
+#: ../camel/camel-folder-search.c:938
#, c-format
msgid "(%s) not allowed inside %s"
-msgstr "(%s) не позволÑ\8fеÑ\82Ñ\81Ñ\8f внÑ\83Ñ\82Ñ\80и %s"
+msgstr "(%s) запÑ\80еÑ\89ено в %s"
-#: ../camel/camel-folder-search.c:911 ../camel/camel-folder-search.c:918
+#: ../camel/camel-folder-search.c:944
+#: ../camel/camel-folder-search.c:951
#, c-format
msgid "(%s) requires a match type string"
msgstr "(%s) требует строку соответствия"
-#: ../camel/camel-folder-search.c:945
+#: ../camel/camel-folder-search.c:978
#, c-format
msgid "(%s) expects an array result"
msgstr "(%s) ожидает результат в виде массива"
-#: ../camel/camel-folder-search.c:954
+#: ../camel/camel-folder-search.c:987
#, c-format
msgid "(%s) requires the folder set"
msgstr "(%s) требует набор папок"
-#: ../camel/camel-folder.c:676
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Неподдерживаемая операция: добавить сообщение: для %s"
-
-#: ../camel/camel-folder.c:1381
+#: ../camel/camel-folder.c:220
#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Неподдерживаемая операция: поиск выражения: для %s"
+#| 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:1422
+#: ../camel/camel-folder.c:244
#, c-format
-msgid "Unsupported operation: count by expression: for %s"
-msgstr "Неподдерживаемая операция определения количества по выражению: для %s"
+#| 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:1461
+#: ../camel/camel-folder.c:270
#, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "Неподдерживаемая операция: поиск по UID: для %s"
+#| 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:1574
-#: ../camel/providers/local/camel-maildir-folder.c:387
+#: ../camel/camel-folder.c:879
+#: ../camel/providers/local/camel-maildir-folder.c:293
msgid "Moving messages"
msgstr "Перемещение сообщений"
-#: ../camel/camel-folder.c:1574
+#: ../camel/camel-folder.c:882
msgid "Copying messages"
msgstr "Копирование сообщений"
-#: ../camel/camel-folder.c:1915
-msgid "Learning junk"
-msgstr "Изучается спам"
+#: ../camel/camel-folder.c:3251
+#, c-format
+#| msgid "Retrieving POP message %d"
+msgid "Retrieving message '%s'"
+msgstr "Получение сообщения «%s»"
-#: ../camel/camel-folder.c:1933
-msgid "Learning non-junk"
-msgstr "Изучается сообщение, не являющееся спамом"
+#: ../camel/camel-gpg-context.c:646
+#: ../camel/camel-gpg-context.c:651
+#: ../camel/camel-gpg-context.c:1276
+#, c-format
+msgid "Failed to execute gpg: %s"
+msgstr "Сбой при исполнении gpg: %s"
-#: ../camel/camel-folder.c:1953
-msgid "Filtering new message(s)"
-msgstr "Фильтрация новых сообщений"
+#: ../camel/camel-gpg-context.c:651
+#: ../camel/providers/smtp/camel-smtp-transport.c:723
+#: ../camel/providers/smtp/camel-smtp-transport.c:778
+msgid "Unknown"
+msgstr "Неизвестно"
-#: ../camel/camel-gpg-context.c:760
+#: ../camel/camel-gpg-context.c:715
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
"\n"
"%s"
-#: ../camel/camel-gpg-context.c:775
+#: ../camel/camel-gpg-context.c:732
+#, c-format
msgid "Failed to parse gpg userid hint."
msgstr "Ошибка при обработке подсказки gpg userid."
-#: ../camel/camel-gpg-context.c:799 ../camel/camel-gpg-context.c:813
+#: ../camel/camel-gpg-context.c:757
+#: ../camel/camel-gpg-context.c:772
+#, c-format
msgid "Failed to parse gpg passphrase request."
msgstr "Ошибка при обработке запроса парольной фразы gpg."
-#: ../camel/camel-gpg-context.c:833
+#: ../camel/camel-gpg-context.c:793
#, c-format
msgid ""
"You need a PIN to unlock the key for your\n"
"SmartCard: \"%s\""
msgstr "Для разблокирования смарткарты необходимо ввести PIN: «%s»"
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:797
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
"Введите ключевую фразу, чтобы разблокировать\n"
"ключ пользователя: «%s»"
-#: ../camel/camel-gpg-context.c:842
+#: ../camel/camel-gpg-context.c:803
#, c-format
msgid "Unexpected request from GnuPG for '%s'"
msgstr "Неожиданный запрос от GnuPG для «%s»"
-#: ../camel/camel-gpg-context.c:867 ../camel/camel-gpg-context.c:1113
-#: ../camel/providers/nntp/camel-nntp-store.c:1313
-msgid "Canceled."
-msgstr "Отменено."
+#: ../camel/camel-gpg-context.c:832
+#: ../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
+#, c-format
+#| msgid "Canceled"
+msgid "Cancelled"
+msgstr "Отменено"
-#: ../camel/camel-gpg-context.c:881
+#: ../camel/camel-gpg-context.c:850
+#, c-format
msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr ""
-"Сбой при разблокировании секретного ключа: указано 3 некорректных парольных "
-"фразы."
+msgstr "Сбой при разблокировании секретного ключа: указано 3 некорректных парольных фразы."
-#: ../camel/camel-gpg-context.c:889
+#: ../camel/camel-gpg-context.c:862
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "Неожиданный ответ от GnuPG: %s"
-#: ../camel/camel-gpg-context.c:988
-msgid "Failed to encrypt: No valid recipients specified."
-msgstr ""
-"Не удалось зашифровать это сообщение: Не определены корректные получатели"
-
-#. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1262 ../camel/camel-gpg-context.c:1387
-#: ../camel/camel-gpg-context.c:1953 ../camel/camel-gpg-context.c:1998
-#, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "Сбой при исполнении gpg: %s"
-
-#: ../camel/camel-gpg-context.c:1355 ../camel/camel-smime-context.c:605
+#: ../camel/camel-gpg-context.c:993
#, c-format
-msgid "Could not generate signing data: %s"
-msgstr "Не удалось сгенерировать данные подписи: %s"
-
-#: ../camel/camel-gpg-context.c:1402 ../camel/camel-gpg-context.c:1630
-#: ../camel/camel-gpg-context.c:1646 ../camel/camel-gpg-context.c:1728
-#: ../camel/camel-gpg-context.c:1743 ../camel/camel-gpg-context.c:1859
-#: ../camel/camel-gpg-context.c:1874 ../camel/camel-gpg-context.c:1969
-#: ../camel/camel-gpg-context.c:2014
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Не удалось зашифровать это сообщение: Не определены корректные получатели"
+
+#: ../camel/camel-gpg-context.c:1539
+#: ../camel/camel-smime-context.c:828
+#| msgid "Could not generate signing data: %s"
+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
msgid "Failed to execute gpg."
msgstr "Сбой при исполнении gpg."
-#: ../camel/camel-gpg-context.c:1534 ../camel/camel-gpg-context.c:1540
-#: ../camel/camel-gpg-context.c:1546 ../camel/camel-gpg-context.c:1561
-#: ../camel/camel-smime-context.c:929 ../camel/camel-smime-context.c:940
-#: ../camel/camel-smime-context.c:947
+#: ../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
+#, c-format
msgid "Cannot verify message signature: Incorrect message format"
msgstr "Не удалось проверить подпись сообщения: Неверный формат сообщения"
-#: ../camel/camel-gpg-context.c:1600
-#, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr ""
-"Не удалось проверить подпись сообщения: Не удалось создать временный файл: %s"
+#: ../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:1711
-#, c-format
-msgid "Could not generate encrypting data: %s"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\81генеÑ\80иÑ\80оваÑ\82Ñ\8c даннÑ\8bе Ñ\88иÑ\84Ñ\80ованиÑ\8f: %s"
+#: ../camel/camel-gpg-context.c:1862
+#| msgid "Could not generate encrypting data: %s"
+msgid "Could not generate encrypting data: "
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\81оздаÑ\82Ñ\8c даннÑ\8bе Ñ\88иÑ\84Ñ\80ованиÑ\8f: "
-#: ../camel/camel-gpg-context.c:1761
+#: ../camel/camel-gpg-context.c:1915
msgid "This is a digitally encrypted message part"
msgstr "Это зашифрованная часть сообщения"
-#: ../camel/camel-gpg-context.c:1814 ../camel/camel-gpg-context.c:1822
-#: ../camel/camel-gpg-context.c:1841
+#: ../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:1831
+#: ../camel/camel-gpg-context.c:1993
+#, c-format
msgid "Failed to decrypt MIME part: protocol error"
msgstr "Сбой при декодировании части MIME: ошибка протокола"
-#: ../camel/camel-gpg-context.c:1909 ../camel/camel-smime-context.c:1205
+#: ../camel/camel-gpg-context.c:2082
+#: ../camel/camel-smime-context.c:1259
msgid "Encrypted content"
msgstr "Зашифрованное содержимое"
-#: ../camel/camel-gpg-context.c:1930
-msgid "Unable to parse message content"
-msgstr "Не удалось разобрать содержимое сообщения"
-
-#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:1999
-#: ../camel/providers/imap4/camel-imap4-utils.c:614
-#: ../camel/providers/smtp/camel-smtp-transport.c:165
-#: ../camel/providers/smtp/camel-smtp-transport.c:220
-msgid "Unknown"
-msgstr "Неизвестно"
-
-#: ../camel/camel-lock-client.c:104
+#: ../camel/camel-lock-client.c:106
#, c-format
msgid "Cannot build locking helper pipe: %s"
msgstr "Не удалось создать канал к блокиратору: %s"
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock-client.c:130
#, c-format
msgid "Cannot fork locking helper: %s"
msgstr "Не удалось запустить блокиратор: %s"
-#: ../camel/camel-lock-client.c:203 ../camel/camel-lock-client.c:226
+#: ../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:216
+#: ../camel/camel-lock-client.c:227
#, c-format
msgid "Could not lock '%s'"
msgstr "Не удалось заблокировать «%s»"
-#: ../camel/camel-lock.c:103
+#: ../camel/camel-lock.c:102
#, c-format
msgid "Could not create lock file for %s: %s"
msgstr "Не удалось создать файл блокировки для %s: %s"
-#: ../camel/camel-lock.c:144
+#: ../camel/camel-lock.c:145
#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"Превышение времени ожидания при попытке заблокировать файл %s. Попробуйте "
-"еще раз позже."
+#| 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. Попробуйте позже."
-#: ../camel/camel-lock.c:199
+#: ../camel/camel-lock.c:205
#, c-format
msgid "Failed to get lock using fcntl(2): %s"
msgstr "Не удалось получить блокировку используя fcntl(2): %s"
-#: ../camel/camel-lock.c:262
+#: ../camel/camel-lock.c:272
#, c-format
msgid "Failed to get lock using flock(2): %s"
msgstr "Не удалось получить блокировку используя flock(2): %s"
-#: ../camel/camel-movemail.c:106
+#: ../camel/camel-movemail.c:105
#, c-format
msgid "Could not check mail file %s: %s"
msgstr "Не удалось проверить почтовый файл %s: %s"
msgid "Could not open mail file %s: %s"
msgstr "Не удалось открыть почтовый файл %s: %s"
-#: ../camel/camel-movemail.c:127
+#: ../camel/camel-movemail.c:129
#, c-format
msgid "Could not open temporary mail file %s: %s"
msgstr "Не удалось открыть временный почтовый файл %s: %s"
-#: ../camel/camel-movemail.c:156
+#: ../camel/camel-movemail.c:159
#, c-format
msgid "Failed to store mail in temp file %s: %s"
msgstr "Сбой при сохранении почты во временном файле %s: %s"
-#: ../camel/camel-movemail.c:186
+#: ../camel/camel-movemail.c:193
#, c-format
msgid "Could not create pipe: %s"
msgstr "Не удалось создать канал: %s"
-#: ../camel/camel-movemail.c:198
+#: ../camel/camel-movemail.c:207
#, c-format
msgid "Could not fork: %s"
msgstr "Не удалось запустить: %s"
-#: ../camel/camel-movemail.c:236
+#: ../camel/camel-movemail.c:245
#, c-format
msgid "Movemail program failed: %s"
msgstr "Сбой программы разбора почты: %s"
-#: ../camel/camel-movemail.c:237
+#: ../camel/camel-movemail.c:246
msgid "(Unknown error)"
msgstr "(Неизвестная ошибка)"
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:273
#, c-format
msgid "Error reading mail file: %s"
msgstr "Ошибка при чтении почтового файла: %s"
-#: ../camel/camel-movemail.c:271
+#: ../camel/camel-movemail.c:286
#, c-format
msgid "Error writing mail temp file: %s"
msgstr "Ошибка сохранения временного почтового файла: %s"
-#: ../camel/camel-movemail.c:464 ../camel/camel-movemail.c:531
+#: ../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:592
-msgid "parse error"
-msgstr "Ошибка обработки"
+#: ../camel/camel-multipart-signed.c:322
+#, c-format
+#| msgid "No description available"
+msgid "No content available"
+msgstr "Содержимое недоступно"
-#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:674
-#: ../camel/camel-net-utils.c:805
-#: ../camel/providers/pop3/camel-pop3-store.c:476
-#: ../camel/providers/pop3/camel-pop3-store.c:576
-msgid "Canceled"
-msgstr "Отменено"
+#: ../camel/camel-multipart-signed.c:330
+#, c-format
+#| msgid "No description available"
+msgid "No signature available"
+msgstr "Подпись недоступна"
-#: ../camel/camel-net-utils.c:521
-msgid "cannot create thread"
-msgstr "Не удалось создать поток"
+#: ../camel/camel-multipart-signed.c:658
+#, c-format
+msgid "parse error"
+msgstr "Ошибка обработки"
-#: ../camel/camel-net-utils.c:678
+#: ../camel/camel-net-utils.c:695
#, c-format
msgid "Resolving: %s"
msgstr "Поиск узла: %s"
-#: ../camel/camel-net-utils.c:700
+#: ../camel/camel-net-utils.c:718
msgid "Host lookup failed"
msgstr "Сбой поиска узла"
-#: ../camel/camel-net-utils.c:702
+#: ../camel/camel-net-utils.c:724
#, c-format
msgid "Host lookup failed: %s: %s"
msgstr "Сбой поиска узла: %s: %s"
-#: ../camel/camel-net-utils.c:809
+#: ../camel/camel-net-utils.c:845
msgid "Resolving address"
msgstr "Поиск адреса"
-#: ../camel/camel-net-utils.c:829
+#: ../camel/camel-net-utils.c:866
msgid "Name lookup failed"
msgstr "Не удалось определить узел"
-#: ../camel/camel-net-utils.c:832
+#: ../camel/camel-net-utils.c:872
#, c-format
msgid "Name lookup failed: %s"
msgstr "Не удалось определить узел: %s"
-#: ../camel/camel-offline-folder.c:249
+#: ../camel/camel-offline-folder.c:193
#, c-format
msgid "Syncing messages in folder '%s' to disk"
msgstr "Синхронизация сообщений в папке «%s» на диск"
-#: ../camel/camel-offline-journal.c:159 ../camel/camel-offline-journal.c:182
+#: ../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"
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:58
msgid "Virtual folder email provider"
-msgstr "Провайдер виртуальных папок электронной почты"
+msgstr "Провайдер виртуальных папок эл. почты"
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:60
msgid "For reading mail as a query of another set of folders"
msgstr "Для чтения почты по запросу к другому набору папок"
-#: ../camel/camel-provider.c:184
+#: ../camel/camel-provider.c:188
#, c-format
msgid "Could not load %s: Module loading not supported on this system."
-msgstr ""
-"Не удалось загрузить %s: Загрузка модулей не поддерживается в этой системе."
+msgstr "Не удалось загрузить %s: Загрузка модулей не поддерживается в этой системе."
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:197
#, c-format
msgid "Could not load %s: %s"
msgstr "Не удалось загрузить %s: %s"
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:206
#, c-format
msgid "Could not load %s: No initialization code in module."
msgstr "Не удалось загрузить %s: в модуле нет инициализирующего кода."
-#: ../camel/camel-provider.c:379 ../camel/camel-session.c:180
+#: ../camel/camel-provider.c:388
+#: ../camel/camel-session.c:206
#, c-format
msgid "No provider available for protocol '%s'"
msgstr "Провайдер для протокола «%s» не доступен"
-#: ../camel/camel-sasl-anonymous.c:36
+#: ../camel/camel-sasl-anonymous.c:35
msgid "Anonymous"
-msgstr "Anonymous"
+msgstr "Анонимный"
-#: ../camel/camel-sasl-anonymous.c:38
+#: ../camel/camel-sasl-anonymous.c:37
msgid "This option will connect to the server using an anonymous login."
msgstr "Будет производиться анонимное (anonymous) подключение к серверу."
-#: ../camel/camel-sasl-anonymous.c:121 ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:70
+#, c-format
msgid "Authentication failed."
msgstr "Сбой проверки подлинности."
-#: ../camel/camel-sasl-anonymous.c:130
+#: ../camel/camel-sasl-anonymous.c:81
#, c-format
msgid ""
"Invalid email address trace information:\n"
"Неверная трассировочная информация эл.адреса:\n"
"%s"
-#: ../camel/camel-sasl-anonymous.c:142
+#: ../camel/camel-sasl-anonymous.c:95
#, c-format
msgid ""
"Invalid opaque trace information:\n"
"Неверная скрытая трассировочная информация:\n"
"%s"
-#: ../camel/camel-sasl-anonymous.c:154
+#: ../camel/camel-sasl-anonymous.c:109
#, c-format
msgid ""
"Invalid trace information:\n"
"Неверная трассировочная информация:\n"
"%s"
-#: ../camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:45
msgid "CRAM-MD5"
msgstr "CRAM-MD5"
-#: ../camel/camel-sasl-cram-md5.c:40
-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: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-digest-md5.c:48
+#: ../camel/camel-sasl-digest-md5.c:58
msgid "DIGEST-MD5"
msgstr "DIGEST-MD5"
-#: ../camel/camel-sasl-digest-md5.c:50
-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: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:844
+#: ../camel/camel-sasl-digest-md5.c:821
+#, c-format
msgid "Server challenge too long (>2048 octets)"
-msgstr "Ð\9eÑ\82веÑ\82 Ñ\81еÑ\80веÑ\80а Ñ\81лиÑ\88ком длиннÑ\8bй (>2048 байт)"
+msgstr "СлиÑ\88ком длиннÑ\8bй оÑ\82веÑ\82 оÑ\82 Ñ\81еÑ\80веÑ\80а (>2048 байт)"
-#: ../camel/camel-sasl-digest-md5.c:853
+#: ../camel/camel-sasl-digest-md5.c:832
+#, c-format
msgid "Server challenge invalid\n"
msgstr "Недопустимый ответ сервера\n"
-#: ../camel/camel-sasl-digest-md5.c:859
+#: ../camel/camel-sasl-digest-md5.c:840
+#, c-format
msgid "Server challenge contained invalid \"Quality of Protection\" token"
-msgstr "Ответ сервера содержит недопустимый жетон \"Качество защиты\""
+msgstr "Ответ сервера содержит недопустимый жетон «Качество защиты»"
-#: ../camel/camel-sasl-digest-md5.c:889
+#: ../camel/camel-sasl-digest-md5.c:875
+#, c-format
msgid "Server response did not contain authorization data"
msgstr "Ответ сервера не содержит информации об авторизации"
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:896
+#, c-format
msgid "Server response contained incomplete authorization data"
msgstr "Ответ сервера содержит неполную информацию об авторизации"
-#: ../camel/camel-sasl-digest-md5.c:917
+#: ../camel/camel-sasl-digest-md5.c:909
+#, c-format
msgid "Server response does not match"
msgstr "Ответ сервера не совпадает"
-#: ../camel/camel-sasl-gssapi.c:72
+#: ../camel/camel-sasl-gssapi.c:85
msgid "GSSAPI"
msgstr "GSSAPI"
-#: ../camel/camel-sasl-gssapi.c:74
+#: ../camel/camel-sasl-gssapi.c:87
msgid "This option will connect to the server using Kerberos 5 authentication."
msgstr "Подключение к серверу будет производиться с использованием Kerberos 5."
-#: ../camel/camel-sasl-gssapi.c:168
-msgid ""
-"The specified mechanism is not supported by the provided credential, or is "
-"unrecognized by the implementation."
-msgstr ""
-"Указанный механизм не поддерживается предоставленными средствами, либо не "
-"распознается в этой реализации."
+#: ../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:173
+#: ../camel/camel-sasl-gssapi.c:133
msgid "The provided target_name parameter was ill-formed."
msgstr "Предоставленный параметр target_name сформирован неверно."
-#: ../camel/camel-sasl-gssapi.c:176
-msgid ""
-"The provided target_name parameter contained an invalid or unsupported type "
-"of name."
-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:180
-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: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:185
-msgid ""
-"The input_token contains an invalid signature, or a signature that could not "
-"be verified."
-msgstr ""
-"input_token содержит неверную подпись, или подпись, которая не может быть "
-"проверена."
+#: ../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:189
-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: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:194
+#: ../camel/camel-sasl-gssapi.c:154
msgid "The supplied context handle did not refer to a valid context."
-msgstr ""
-"Указанный обработчик контекста не ссылается на действительный контекст."
+msgstr "Указанный обработчик контекста не ссылается на действительный контекст."
-#: ../camel/camel-sasl-gssapi.c:197
+#: ../camel/camel-sasl-gssapi.c:157
msgid "The consistency checks performed on the input_token failed."
msgstr "Сбой проверки целостности элемента input_token."
-#: ../camel/camel-sasl-gssapi.c:200
+#: ../camel/camel-sasl-gssapi.c:160
msgid "The consistency checks performed on the credential failed."
msgstr "Сбой проверки целостности удостоверений."
-#: ../camel/camel-sasl-gssapi.c:203
+#: ../camel/camel-sasl-gssapi.c:163
msgid "The referenced credentials have expired."
msgstr "Срок действия упомянутых удостоверений истёк."
-#: ../camel/camel-sasl-gssapi.c:209 ../camel/camel-sasl-gssapi.c:316
-#: ../camel/camel-sasl-gssapi.c:358 ../camel/camel-sasl-gssapi.c:373
-#: ../camel/providers/imap/camel-imap-store.c:1272
+#: ../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
+#, c-format
msgid "Bad authentication response from server."
msgstr "Неверный ответ от сервера при идентификации."
-#: ../camel/camel-sasl-gssapi.c:383
+#: ../camel/camel-sasl-gssapi.c:382
+#, c-format
msgid "Unsupported security layer."
msgstr "Неподдерживаемый уровень безопасности."
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:39
msgid "Login"
msgstr "Регистрация"
-#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:38
+#: ../camel/camel-sasl-login.c:41
+#: ../camel/camel-sasl-plain.c:45
msgid "This option will connect to the server using a simple password."
-msgstr ""
-"Подключение к серверу будет производиться с использованием незашифрованного "
-"пароля."
+msgstr "Подключение к серверу будет производиться с использованием незашифрованного пароля."
-#: ../camel/camel-sasl-login.c:134
+#: ../camel/camel-sasl-login.c:95
+#, c-format
msgid "Unknown authentication state."
msgstr "Неизвестное состояние идентификации."
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:41
msgid "NTLM / SPA"
msgstr "NTLM / SPA"
-#: ../camel/camel-sasl-ntlm.c:36
-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: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-plain.c:36
+#: ../camel/camel-sasl-plain.c:43
msgid "PLAIN"
msgstr "PLAIN"
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:46
msgid "POP before SMTP"
msgstr "POP до SMTP"
-#: ../camel/camel-sasl-popb4smtp.c:41
+#: ../camel/camel-sasl-popb4smtp.c:48
msgid "This option will authorise a POP connection before attempting SMTP"
msgstr "Будет производиться авторизация POP до попытки передачи почты по SMTP"
-#: ../camel/camel-sasl-popb4smtp.c:106
+#: ../camel/camel-sasl-popb4smtp.c:83
msgid "POP Source URI"
msgstr "URL источника почты POP"
-#: ../camel/camel-sasl-popb4smtp.c:109
-msgid "POP Before SMTP auth using an unknown transport"
-msgstr "POP до SMTP авторизация, используя неизвестный транспорт"
+#: ../camel/camel-sasl-popb4smtp.c:90
+#, 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:114
-msgid "POP Before SMTP auth using a non-pop source"
-msgstr "POP до SMTP, используя не-POP источник"
+#: ../camel/camel-sasl-popb4smtp.c:98
+#, 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 источник"
-#: ../camel/camel-search-private.c:147
+#: ../camel/camel-search-private.c:112
#, c-format
msgid "Regular expression compilation failed: %s: %s"
msgstr "Сбой компиляции регулярного выражения: %s: %s"
-#: ../camel/camel-service.c:265
+#: ../camel/camel-service.c:89
#, c-format
msgid "URL '%s' needs a username component"
msgstr "URL «%s» нуждается в компоненте имени пользователя"
-#: ../camel/camel-service.c:269
+#: ../camel/camel-service.c:93
#, c-format
msgid "URL '%s' needs a host component"
msgstr "URL «%s» нуждается в компоненте хоста"
-#: ../camel/camel-service.c:273
+#: ../camel/camel-service.c:97
#, c-format
msgid "URL '%s' needs a path component"
msgstr "URL «%s» нуждается в компоненте пути"
-#: ../camel/camel-session.c:305
+#: ../camel/camel-session.c:260
#, c-format
msgid ""
"Could not create directory %s:\n"
"Не удалось создать каталог %s:\n"
"%s"
-#: ../camel/camel-session.c:477
+#: ../camel/camel-session.c:757
#, c-format
msgid "Please enter the %s password for %s on host %s."
msgstr "Введите пароль %s для %s на узле %s."
-#: ../camel/camel-session.c:815
-msgid "Camel session doesn't support forwarding of a message."
-msgstr "Сеанс camel не поддерживает пересылку сообщений."
-
-#: ../camel/camel-smime-context.c:447 ../camel/camel-smime-context.c:1012
+#: ../camel/camel-smime-context.c:348
+#: ../camel/camel-smime-context.c:1052
#, c-format
msgid "Cannot find certificate for '%s'"
msgstr "Не удалось найти сертификат для «%s»"
-#: ../camel/camel-smime-context.c:453
+#: ../camel/camel-smime-context.c:376
msgid "Cannot create CMS message"
msgstr "Не удалось создать сообщение CMS"
-#: ../camel/camel-smime-context.c:458
+#: ../camel/camel-smime-context.c:381
msgid "Cannot create CMS signed data"
msgstr "Не удалось создать CMS signedData"
-#: ../camel/camel-smime-context.c:464
+#: ../camel/camel-smime-context.c:387
msgid "Cannot attach CMS signed data"
msgstr "Не удалось вложить CMS signedData"
-#: ../camel/camel-smime-context.c:471
+#: ../camel/camel-smime-context.c:394
msgid "Cannot attach CMS data"
msgstr "Не удалось вложить CMS data"
-#: ../camel/camel-smime-context.c:477
+#: ../camel/camel-smime-context.c:400
msgid "Cannot create CMS Signer information"
msgstr "Не удалось создать CMS SignerInfo"
-#: ../camel/camel-smime-context.c:483
+#: ../camel/camel-smime-context.c:406
msgid "Cannot find certificate chain"
msgstr "Не удалось найти цепочку сертификатов"
-#: ../camel/camel-smime-context.c:489
+#: ../camel/camel-smime-context.c:412
msgid "Cannot add CMS Signing time"
msgstr "Не удалось добавить CMS SigningTime"
-#: ../camel/camel-smime-context.c:511 ../camel/camel-smime-context.c:523
+#: ../camel/camel-smime-context.c:436
+#: ../camel/camel-smime-context.c:451
#, c-format
msgid "Encryption certificate for '%s' does not exist"
msgstr "Сертификат шифрования для «%s» не существует"
-#: ../camel/camel-smime-context.c:530
+#: ../camel/camel-smime-context.c:458
msgid "Cannot add SMIMEEncKeyPrefs attribute"
msgstr "Не удалось добавить атрибут SMIMEEncKeyPrefs"
-#: ../camel/camel-smime-context.c:535
+#: ../camel/camel-smime-context.c:463
msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
msgstr "Не удалось добавить атрибут MS SMIMEEncKeyPrefs"
-#: ../camel/camel-smime-context.c:540
+#: ../camel/camel-smime-context.c:468
msgid "Cannot add encryption certificate"
msgstr "Не удалось добавить сертификат шифрования"
-#: ../camel/camel-smime-context.c:546
+#: ../camel/camel-smime-context.c:474
msgid "Cannot add CMS Signer information"
msgstr "Не удалось добавить CMS SignerInfo"
-#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:1084
-msgid "Cannot create encoder context"
-msgstr "Не удалось создать контекст кодировщика"
-
-#: ../camel/camel-smime-context.c:622
-msgid "Failed to add data to CMS encoder"
-msgstr "Не удалось добавить данные к кодировщику CMS"
-
-#: ../camel/camel-smime-context.c:627 ../camel/camel-smime-context.c:1101
-msgid "Failed to encode data"
-msgstr "Ошибка кодирования данных"
-
-#: ../camel/camel-smime-context.c:700
+#. Translators: A fallback message when couldn't verify an SMIME signature
+#: ../camel/camel-smime-context.c:507
msgid "Unverified"
msgstr "Непроверено"
-#: ../camel/camel-smime-context.c:702
+#: ../camel/camel-smime-context.c:509
msgid "Good signature"
msgstr "Подпись верна"
-#: ../camel/camel-smime-context.c:704
+#: ../camel/camel-smime-context.c:511
msgid "Bad signature"
msgstr "Подпись неверна"
-#: ../camel/camel-smime-context.c:706
+#: ../camel/camel-smime-context.c:513
msgid "Content tampered with or altered in transit"
msgstr "Сообщение было подделано или изменено на пути"
-#: ../camel/camel-smime-context.c:708
+#: ../camel/camel-smime-context.c:515
msgid "Signing certificate not found"
msgstr "Сертификат подписи не найден"
-#: ../camel/camel-smime-context.c:710
+#: ../camel/camel-smime-context.c:517
msgid "Signing certificate not trusted"
msgstr "Сертификат подписи недостоверен"
-#: ../camel/camel-smime-context.c:712
+#: ../camel/camel-smime-context.c:519
msgid "Signature algorithm unknown"
msgstr "Неизвестный алгоритм подписи"
-#: ../camel/camel-smime-context.c:714
+#: ../camel/camel-smime-context.c:521
msgid "Signature algorithm unsupported"
msgstr "Неподдерживаемый алгоритм подписи"
-#: ../camel/camel-smime-context.c:716
+#: ../camel/camel-smime-context.c:523
msgid "Malformed signature"
msgstr "Неверно сформированная подпись"
-#: ../camel/camel-smime-context.c:718
+#: ../camel/camel-smime-context.c:525
msgid "Processing error"
msgstr "Ошибка обработки"
-#: ../camel/camel-smime-context.c:772
+#: ../camel/camel-smime-context.c:570
msgid "No signed data in signature"
msgstr "В подписи отсутствуют данные подписи"
-#: ../camel/camel-smime-context.c:777
+#: ../camel/camel-smime-context.c:575
msgid "Digests missing from enveloped data"
msgstr "В данных конверта отсутствует сводка"
-#: ../camel/camel-smime-context.c:790 ../camel/camel-smime-context.c:800
+#: ../camel/camel-smime-context.c:588
+#: ../camel/camel-smime-context.c:599
msgid "Cannot calculate digests"
msgstr "Не удалось вычислить дайджесты"
-#: ../camel/camel-smime-context.c:807 ../camel/camel-smime-context.c:811
+#: ../camel/camel-smime-context.c:606
+#: ../camel/camel-smime-context.c:610
msgid "Cannot set message digests"
msgstr "Не удалось установить дайджесты сообщения"
-#: ../camel/camel-smime-context.c:821 ../camel/camel-smime-context.c:826
+#: ../camel/camel-smime-context.c:620
+#: ../camel/camel-smime-context.c:625
msgid "Certificate import failed"
msgstr "Сбой импорта сертификата"
-#: ../camel/camel-smime-context.c:836
+#: ../camel/camel-smime-context.c:635
#, c-format
msgid "Certificate is the only message, cannot verify certificates"
-msgstr ""
-"Сообщение состоит только из сертификатов, Не удалось проверить сертификаты"
+msgstr "Сообщение состоит только из сертификатов, Не удалось проверить сертификаты"
-#: ../camel/camel-smime-context.c:839
+#: ../camel/camel-smime-context.c:638
#, c-format
msgid "Certificate is the only message, certificates imported and verified"
msgstr "В сообщении только сертификаты, сертификаты импортированы и проверены"
-#: ../camel/camel-smime-context.c:843
+#: ../camel/camel-smime-context.c:642
msgid "Cannot find signature digests"
msgstr "Не удалось найти дайджесты подписи"
-#: ../camel/camel-smime-context.c:859
+#: ../camel/camel-smime-context.c:658
#, c-format
msgid "Signer: %s <%s>: %s\n"
msgstr "Подписано: %s <%s>: %s\n"
-#: ../camel/camel-smime-context.c:960 ../camel/camel-smime-context.c:1184
+#: ../camel/camel-smime-context.c:839
+#: ../camel/camel-smime-context.c:1125
+msgid "Cannot create encoder context"
+msgstr "Не удалось создать контекст кодировщика"
+
+#: ../camel/camel-smime-context.c:845
+msgid "Failed to add data to CMS encoder"
+msgstr "Не удалось добавить данные к кодировщику CMS"
+
+#: ../camel/camel-smime-context.c:850
+#: ../camel/camel-smime-context.c:1142
+msgid "Failed to encode data"
+msgstr "Ошибка кодирования данных"
+
+#: ../camel/camel-smime-context.c:991
+#: ../camel/camel-smime-context.c:1237
msgid "Decoder failed"
msgstr "Сбой декодера"
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1060
msgid "Cannot find common bulk encryption algorithm"
msgstr "Не удалось найти общий алгоритм шифрования"
-#: ../camel/camel-smime-context.c:1027
+#: ../camel/camel-smime-context.c:1068
msgid "Cannot allocate slot for encryption bulk key"
msgstr "Не удалось распределить слот для ключа общего шифрования"
-#: ../camel/camel-smime-context.c:1038
+#: ../camel/camel-smime-context.c:1079
msgid "Cannot create CMS Message"
msgstr "Не удалось создать сообщение CMS"
-#: ../camel/camel-smime-context.c:1044
+#: ../camel/camel-smime-context.c:1085
msgid "Cannot create CMS Enveloped data"
msgstr "Не удалось создать CMS EnvelopedData"
-#: ../camel/camel-smime-context.c:1050
+#: ../camel/camel-smime-context.c:1091
msgid "Cannot attach CMS Enveloped data"
msgstr "Не удалось вложить CMS EnvelopedData"
-#: ../camel/camel-smime-context.c:1056
+#: ../camel/camel-smime-context.c:1097
msgid "Cannot attach CMS data object"
msgstr "Не удалось вложить объект CMS data"
-#: ../camel/camel-smime-context.c:1065
+#: ../camel/camel-smime-context.c:1106
msgid "Cannot create CMS Recipient information"
msgstr "Не удалось создать сведения CMS RecipientInfo"
-#: ../camel/camel-smime-context.c:1070
+#: ../camel/camel-smime-context.c:1111
msgid "Cannot add CMS Recipient information"
msgstr "Не удалось добавить сведения CMS RecipientInfo"
-#: ../camel/camel-smime-context.c:1095
+#: ../camel/camel-smime-context.c:1136
msgid "Failed to add data to encoder"
msgstr "Не удалось добавить данные к кодировщику"
-#: ../camel/camel-smime-context.c:1191
+#: ../camel/camel-smime-context.c:1244
msgid "S/MIME Decrypt: No encrypted content found"
msgstr "S/MIME Decrypt: Не найдено зашифрованного содержимого"
-#: ../camel/camel-smime-context.c:1219
-msgid "import keys: unimplemented"
-msgstr "импорт ключей: не реализовано"
-
-#: ../camel/camel-smime-context.c:1227
-msgid "export keys: unimplemented"
-msgstr "экспорт ключей: не реализовано"
-
-#: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:171
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "Не удалось получить папку: недопустимая операция в этом хранилище"
-
-#: ../camel/camel-store.c:316
+#: ../camel/camel-store.c:2184
#, c-format
msgid "Cannot create folder '%s': folder exists"
msgstr "Не удалось создать папку «%s»: папка уже существует"
-#: ../camel/camel-store.c:395
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr "Не удалось создать папку: недопустимая операция в этом хранилище"
+#. the name of the Trash folder, used for deleted messages
+#: ../camel/camel-store.c:2375
+#: ../camel/camel-store.c:2385
+#: ../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-vtrash-folder.c:50
+msgid "Junk"
+msgstr "Спам"
-#: ../camel/camel-store.c:423
+#: ../camel/camel-store.c:2832
#, c-format
msgid "Cannot create folder: %s: folder exists"
msgstr "Не удалось создать папку: %s: папка существует"
-#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:377
-#: ../camel/providers/local/camel-maildir-store.c:219
+#: ../camel/camel-store.c:2959
+#: ../camel/camel-vee-store.c:367
+#: ../camel/providers/local/camel-maildir-store.c:272
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "Не удалось удалить папку: %s: недопустимая операция"
-#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:414
-#: ../camel/providers/local/camel-maildir-store.c:291
+#: ../camel/camel-store.c:3100
+#: ../camel/camel-vee-store.c:417
+#: ../camel/providers/local/camel-maildir-store.c:668
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "Не удалось переименовать папку: %s: недопустимая операция"
-#. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:900 ../camel/camel-vtrash-folder.c:54
-msgid "Trash"
-msgstr "Корзина"
+#: ../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"
-#. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:903 ../camel/camel-vtrash-folder.c:56
-msgid "Junk"
-msgstr "Спам"
+#: ../camel/camel-tcp-stream-raw.c:771
+#, c-format
+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
+#, 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"
+
+#: ../camel/camel-tcp-stream-raw.c:891
+msgid "General SOCKS server failure"
+msgstr "Сбой сервера SOCKS"
+
+#: ../camel/camel-tcp-stream-raw.c:892
+msgid "SOCKS server's rules do not allow connection"
+msgstr "Правила сервера SOCKS запрещают подключение"
+
+#: ../camel/camel-tcp-stream-raw.c:893
+msgid "Network is unreachable from SOCKS server"
+msgstr "Сеть недоступна через сервер SOCKS"
+
+#: ../camel/camel-tcp-stream-raw.c:894
+msgid "Host is unreachable from SOCKS server"
+msgstr "Узел недоступен через сервер SOCKS"
+
+#: ../camel/camel-tcp-stream-raw.c:895
+#| msgid "Connection canceled"
+msgid "Connection refused"
+msgstr "Соединение отклонено"
+
+#: ../camel/camel-tcp-stream-raw.c:896
+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"
+
+#: ../camel/camel-tcp-stream-raw.c:932
+#, c-format
+msgid "Got unknown address type from SOCKS server"
+msgstr "От сервера SOCKS получен адрес неизвестного типа"
+
+#: ../camel/camel-tcp-stream-raw.c:950
+#, c-format
+#| msgid "Invalid response from server"
+msgid "Incomplete reply from SOCKS server"
+msgstr "Получен неполный ответ от сервера SOCKS"
-#: ../camel/camel-tcp-stream-ssl.c:870
+#: ../camel/camel-tcp-stream-raw.c:970
+#, c-format
+msgid "Hostname is too long (maximum is 255 characters)"
+msgstr "Слишком длинное имя узла (максимальное кол-во символов — 255)"
+
+#. SOCKS5
+#. reserved - must be 0
+#: ../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
#, c-format
msgid ""
"Issuer: %s\n"
"Отпечаток: %s\n"
"Подпись: %s"
-#: ../camel/camel-tcp-stream-ssl.c:876
+#: ../camel/camel-tcp-stream-ssl.c:463
msgid "GOOD"
msgstr "GOOD"
-#: ../camel/camel-tcp-stream-ssl.c:876
+#: ../camel/camel-tcp-stream-ssl.c:463
msgid "BAD"
msgstr "BAD"
#. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-ssl.c:467
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
"\n"
"Всё равно принять?"
-#: ../camel/camel-tcp-stream-ssl.c:924
+#: ../camel/camel-tcp-stream-ssl.c:511
#, c-format
msgid ""
"Certificate problem: %s\n"
"Проблема с сертификатом: %s\n"
"Поставщик: %s"
-#: ../camel/camel-tcp-stream-ssl.c:976
+#: ../camel/camel-tcp-stream-ssl.c:563
#, c-format
msgid ""
"Bad certificate domain: %s\n"
"Некорректный домен сертификата: %s\n"
"Поставщик: %s"
-#: ../camel/camel-tcp-stream-ssl.c:994
+#: ../camel/camel-tcp-stream-ssl.c:581
#, c-format
msgid ""
"Certificate expired: %s\n"
"Истек срок действия сертификата: %s\n"
"Поставщик: %s"
-#: ../camel/camel-tcp-stream-ssl.c:1011
+#: ../camel/camel-tcp-stream-ssl.c:598
#, c-format
msgid ""
"Certificate revocation list expired: %s\n"
"Истек срок действия списка аннулированных сертификатов: %s\n"
"Поставщик: %s"
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:316
#, c-format
msgid "Could not parse URL '%s'"
msgstr "Не удалось разобрать URL «%s»"
-#: ../camel/camel-vee-folder.c:577
+#: ../camel/camel-vee-folder.c:1240
+#: ../camel/camel-vee-folder.c:1403
#, c-format
-msgid "Error storing '%s': %s"
-msgstr "Ð\9eÑ\88ибка пÑ\80и Ñ\85Ñ\80анении «%s»: %s"
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\81копиÑ\80оваÑ\82Ñ\8c или пеÑ\80емеÑ\81Ñ\82иÑ\82Ñ\8c Ñ\81ообÑ\89ениÑ\8f в виÑ\80Ñ\82Ñ\83алÑ\8cнÑ\83Ñ\8e папкÑ\83"
-#: ../camel/camel-vee-folder.c:654
+#: ../camel/camel-vee-folder.c:1276
#, c-format
msgid "No such message %s in %s"
msgstr "Нет сообщения %s в %s"
-#: ../camel/camel-vee-folder.c:813 ../camel/camel-vee-folder.c:819
-msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "Не удалось скопировать или переместить сообщения в виртуальную папку"
+#: ../camel/camel-vee-folder.c:1344
+#, c-format
+#| msgid "Error storing '%s': %s"
+msgid "Error storing '%s': "
+msgstr "Ошибка при хранении «%s»: "
-#: ../camel/camel-vee-store.c:113 ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:353
+#: ../camel/camel-vee-store.c:141
+#: ../camel/camel-vee-store.c:143
+#: ../camel/camel-vee-store.c:322
msgid "Unmatched"
msgstr "Прочее"
-#: ../camel/camel-vee-store.c:400
+#: ../camel/camel-vee-store.c:393
#, c-format
msgid "Cannot delete folder: %s: No such folder"
msgstr "Не удалось удалить папку: %s: нет такой папки"
-#: ../camel/camel-vee-store.c:422
+#: ../camel/camel-vee-store.c:427
#, c-format
msgid "Cannot rename folder: %s: No such folder"
msgstr "Не удалось переименовать папку: %s: нет такой папки"
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-vtrash-folder.c:49
msgid "Cannot copy messages to the Trash folder"
msgstr "Не удалось переместить сообщения в корзину"
-#: ../camel/camel-vtrash-folder.c:57
+#: ../camel/camel-vtrash-folder.c:51
msgid "Cannot copy messages to the Junk folder"
-msgstr "Не удалось переместить сообщения в папку \"Спам\""
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-" %s"
-msgstr ""
-"Не удалось получить сообщение: %s\n"
-" %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
-#: ../camel/providers/local/camel-maildir-folder.c:264
-#: ../camel/providers/local/camel-maildir-folder.c:293
-#: ../camel/providers/local/camel-maildir-folder.c:401
-#: ../camel/providers/local/camel-mbox-folder.c:363
-#: ../camel/providers/local/camel-mbox-folder.c:414
-#: ../camel/providers/local/camel-mh-folder.c:226
-msgid "No such message"
-msgstr "Нет такого сообщения"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:149
-#: ../camel/providers/imap4/camel-imap4-folder.c:814
-#: ../camel/providers/nntp/camel-nntp-folder.c:173
-#: ../camel/providers/nntp/camel-nntp-folder.c:248
-#: ../camel/providers/nntp/camel-nntp-folder.c:408
-#: ../camel/providers/pop3/camel-pop3-folder.c:268
-#: ../camel/providers/pop3/camel-pop3-folder.c:578
-#: ../camel/providers/pop3/camel-pop3-folder.c:639
-#: ../camel/providers/pop3/camel-pop3-folder.c:657
-msgid "User canceled"
-msgstr "Отменено пользователем"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:156
-#: ../camel/providers/imap4/camel-imap4-folder.c:819
-#: ../camel/providers/nntp/camel-nntp-folder.c:164
-#: ../camel/providers/nntp/camel-nntp-folder.c:166
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:250
-#: ../camel/providers/pop3/camel-pop3-folder.c:388
-#: ../camel/providers/pop3/camel-pop3-folder.c:581
-#: ../camel/providers/pop3/camel-pop3-folder.c:642
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-#: ../camel/providers/pop3/camel-pop3-folder.c:660
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Не удалось получить сообщение %s: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:173
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:181
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2506
-#: ../camel/providers/imap4/camel-imap4-folder.c:837
-msgid "This message is not available in offline mode."
-msgstr "Это сообщение недоступно в автономном режиме."
+msgstr "Не удалось переместить сообщения в папку «Спам»"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:195
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2009
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2060
-msgid "Could not get message"
-msgstr "Не удалось получить сообщение"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:982
-#: ../camel/providers/imap/camel-imap-folder.c:295
+#: ../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:1055
+#: ../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:1330
-msgid "Trash Folder Full. Please Empty."
-msgstr "Папка корзины переполнена. Очистите, пожалуйста."
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1564
-#: ../camel/providers/groupwise/camel-groupwise-store.c:626
-#: ../camel/providers/groupwise/camel-groupwise-store.c:756
-#: ../camel/providers/imap/camel-imap-folder.c:3429
-#: ../camel/providers/imap/camel-imap-folder.c:3505
-#: ../camel/providers/imapx/camel-imapx-server.c:2728
-#: ../camel/providers/imapx/camel-imapx-server.c:2813
+#: ../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:2360
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2403
+#: ../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:2391
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2464
#, c-format
msgid "Cannot create message: %s"
msgstr "Не удалось создать сообщение: %s"
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:281
+#: ../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:343
-#: ../camel/providers/imap4/camel-imap4-journal.c:311
+#: ../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:359
-#: ../camel/providers/imap4/camel-imap4-journal.c:327
-#, c-format
-msgid "Cannot append message in offline mode: %s"
-msgstr "Невозможно добавить сообщение в автономном режиме: %s"
+#: ../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:54
-#: ../camel/providers/imap4/camel-imap4-provider.c:38
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
msgid "Checking for new mail"
msgstr "Проверка новой почты"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:56
-#: ../camel/providers/hula/camel-hula-provider.c:50
-#: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:40
-#: ../camel/providers/imapx/camel-imapx-provider.c:48
+#: ../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:59
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:51
+#: ../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:46
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:106
+#: ../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:61
+#: ../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 ""
-"_Применить фильтры к новым сообщениям в папке \"Входящие\" на этом сервере"
+msgstr "_Применить фильтры к новым сообщениям в папке «Входящие» на этом сервере"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:63
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
msgid "Check new messages for J_unk contents"
msgstr "Проверять, являются ли новые сообщения спамом"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:74
+#: ../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 ""
-"Проверять, являются ли новые сообщения спамом, только в папке \"Вход_ящие\""
+msgstr "Проверять, являются ли новые сообщения _спамом, только в папке «Входящие»"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:67
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
msgid "Automatically synchroni_ze account locally"
-msgstr "Автоматически синхрони_зировать учетную запись локально"
+msgstr "Автоматически синхрони_зировать учётную запись локально"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
msgid "SOAP Settings"
msgstr "Параметры SOAP"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:75
+#: ../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:87
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
msgid "Novell GroupWise"
msgstr "Novell GroupWise"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
msgid "For accessing Novell GroupWise servers"
msgstr "Для доступа к серверам Novell Groupwise"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:104
-#: ../camel/providers/hula/camel-hula-provider.c:93
-#: ../camel/providers/imap/camel-imap-provider.c:100
-#: ../camel/providers/imap4/camel-imap4-provider.c:83
+#: ../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:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
+#: ../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:106
-msgid ""
-"This option will connect to the GroupWise server using a plaintext password."
-msgstr ""
-"Подключение к серверу IMAP будет производиться с использованием "
-"незашифрованного пароля."
+#: ../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:102
+#: ../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:197
-#: ../camel/providers/imap/camel-imap-store.c:1356
+#: ../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:312
+#: ../camel/providers/groupwise/camel-groupwise-store.c:332
msgid "Some features may not work correctly with your current server version"
-msgstr "Некоторые функции могут работать некорректно с вашей версией сервера"
+msgstr "Некоторые функции могут некорректно работать с вашей версией сервера"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:533
-#: ../camel/providers/imap/camel-imap-store.c:1879
-#: ../camel/providers/imap/camel-imap-store.c:2077
-#: ../camel/providers/imapx/camel-imapx-store.c:297
+#: ../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:1201
+#: ../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:1215
-#: ../camel/providers/imap/camel-imap-store.c:1954
-#: ../camel/providers/imap/camel-imap-store.c:2334
+#: ../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:1294
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1317
+#: ../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:1349
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#: ../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:1351
+#: ../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:122
+#: ../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:164
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:97
msgid "Sending Message"
msgstr "Отправка сообщения"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:212
-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: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:214
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:207
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:159
#, c-format
msgid "Could not send message: %s"
msgstr "Не удалось отправить сообщение: %s"
-#: ../camel/providers/hula/camel-hula-provider.c:48
-#: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
-msgid "Checking for New Mail"
-msgstr "Проверка новой почты"
-
-#: ../camel/providers/hula/camel-hula-provider.c:53
-#: ../camel/providers/imap/camel-imap-provider.c:52
-#: ../camel/providers/imapx/camel-imapx-provider.c:54
-msgid "Connection to Server"
-msgstr "Подключение к серверу"
-
-#: ../camel/providers/hula/camel-hula-provider.c:55
-#: ../camel/providers/imap/camel-imap-provider.c:54
-#: ../camel/providers/imapx/camel-imapx-provider.c:56
-msgid "_Use custom command to connect to server"
-msgstr "_Использовать свою строку для подключения к серверу"
-
-#: ../camel/providers/hula/camel-hula-provider.c:57
-#: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:58
-msgid "Command:"
-msgstr "Команда:"
-
-#: ../camel/providers/hula/camel-hula-provider.c:60
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:43
-#: ../camel/providers/imapx/camel-imapx-provider.c:64
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid "Folders"
-msgstr "Папки"
-
-#: ../camel/providers/hula/camel-hula-provider.c:62
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:45
-#: ../camel/providers/imapx/camel-imapx-provider.c:66
-msgid "_Show only subscribed folders"
-msgstr "_Показывать только подписанные папки"
-
-#: ../camel/providers/hula/camel-hula-provider.c:64
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:47
-#: ../camel/providers/imapx/camel-imapx-provider.c:68
-msgid "O_verride server-supplied folder namespace"
-msgstr "Пе_реопределять предлагаемое сервером пространство имён папок"
-
-#: ../camel/providers/hula/camel-hula-provider.c:66
-msgid "Namespace"
-msgstr "Пространство имен"
-
-#: ../camel/providers/hula/camel-hula-provider.c:76
-msgid "Hula"
-msgstr "Hula"
-
-#: ../camel/providers/hula/camel-hula-provider.c:78
-msgid "For accessing Hula servers"
-msgstr "Для доступа к серверам Hula"
-
-#: ../camel/providers/hula/camel-hula-provider.c:95
-msgid "This option will connect to the Hula server using a plaintext password."
-msgstr ""
-"Подключение к серверу Hula будет производиться с использованием "
-"незашифрованного пароля."
-
-#: ../camel/providers/imap/camel-imap-command.c:181
-#: ../camel/providers/imap/camel-imap-command.c:265
+#: ../camel/providers/imap/camel-imap-command.c:197
+#: ../camel/providers/imap/camel-imap-command.c:301
+#, c-format
msgid "No output stream"
msgstr "Отсутствует потока вывода"
-#: ../camel/providers/imap/camel-imap-command.c:186
-#: ../camel/providers/imap/camel-imap-command.c:270
+#: ../camel/providers/imap/camel-imap-command.c:205
+#: ../camel/providers/imap/camel-imap-command.c:309
+#, c-format
msgid "No input stream"
msgstr "Отсутствует поток ввода"
-#: ../camel/providers/imap/camel-imap-command.c:229
-#: ../camel/providers/imap/camel-imap-command.c:278
-#: ../camel/providers/imap/camel-imap-command.c:492
-#: ../camel/providers/imap/camel-imap-store.c:3105
+#: ../camel/providers/imap/camel-imap-command.c:255
+#, c-format
msgid "Operation cancelled"
msgstr "Операция отменена"
-#: ../camel/providers/imap/camel-imap-command.c:331
-#: ../camel/providers/imap/camel-imap-store.c:3110
+#: ../camel/providers/imap/camel-imap-command.c:373
#, 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:352
+#: ../camel/providers/imap/camel-imap-command.c:394
#, c-format
msgid ""
"Alert from IMAP server %s@%s:\n"
"Тревожное сообщение от сервера IMAP %s@%s:\n"
"%s"
-#: ../camel/providers/imap/camel-imap-command.c:421
+#: ../camel/providers/imap/camel-imap-command.c:468
#, c-format
msgid "Unexpected response from IMAP server: %s"
msgstr "Неожиданный ответ от сервера IMAP: %s"
-#: ../camel/providers/imap/camel-imap-command.c:431
+#: ../camel/providers/imap/camel-imap-command.c:480
#, c-format
msgid "IMAP command failed: %s"
msgstr "Сбой команды IMAP: %s"
-#: ../camel/providers/imap/camel-imap-command.c:506
+#: ../camel/providers/imap/camel-imap-command.c:560
+#, c-format
msgid "Server response ended too soon."
msgstr "Не полный ответ сервера."
-#: ../camel/providers/imap/camel-imap-command.c:712
+#: ../camel/providers/imap/camel-imap-command.c:771
#, c-format
msgid "IMAP server response did not contain %s information"
msgstr "Ответ сервера IMAP не содержит информации о %s"
-#: ../camel/providers/imap/camel-imap-command.c:748
+#: ../camel/providers/imap/camel-imap-command.c:809
#, c-format
msgid "Unexpected OK response from IMAP server: %s"
-msgstr "Неожиданный ответ \"OK\" от сервера IMAP: %s"
+msgstr "Неожиданный ответ «OK» от сервера IMAP: %s"
-#: ../camel/providers/imap/camel-imap-folder.c:90
+#: ../camel/providers/imap/camel-imap-folder.c:296
msgid "Always check for new mail in this folder"
msgstr "Всегда проверять наличие новой почты в этой папке"
-#: ../camel/providers/imap/camel-imap-folder.c:276
+#: ../camel/providers/imap/camel-imap-folder.c:372
#, c-format
msgid "Could not create directory %s: %s"
msgstr "Не удалось создать каталог %s: %s"
-#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:918
-#: ../camel/providers/imapx/camel-imapx-server.c:2758
+#: ../camel/providers/imap/camel-imap-folder.c:995
+#: ../camel/providers/imapx/camel-imapx-server.c:3915
#, c-format
msgid "Scanning for changed messages in %s"
msgstr "Поиск изменённых сообщений в %s"
-#: ../camel/providers/imap/camel-imap-folder.c:1986
-#, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr "Неожиданный статус «%s» в ответе на команду APPEND"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2001
-msgid "No response on continuation after APPEND command"
-msgstr "Отсутствует ответ или продолжение после команды APPEND"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2046
-msgid "Unknown error occurred during APPEND command!"
-msgstr "Во время выполнения команды APPEND возникла неизвестная ошибка!"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2877
-#, c-format
-msgid "Unable to retrieve message: %s"
-msgstr "Не удалось получить сообщение: %s"
+#: ../camel/providers/imap/camel-imap-folder.c:3372
+#| msgid "Unable to retrieve message: %s"
+msgid "Unable to retrieve message: "
+msgstr "Не удалось получить сообщение: "
-#: ../camel/providers/imap/camel-imap-folder.c:2912
+#: ../camel/providers/imap/camel-imap-folder.c:3407
+#: ../camel/providers/imapx/camel-imapx-server.c:5195
#, c-format
msgid "Cannot get message with message ID %s: %s"
msgstr "Не удалось получить сообщение с идентификатором %s: %s"
-#: ../camel/providers/imap/camel-imap-folder.c:2913
+#: ../camel/providers/imap/camel-imap-folder.c:3408
+#: ../camel/providers/imapx/camel-imapx-server.c:5196
msgid "No such message available."
msgstr "Нет такого сообщения."
-#: ../camel/providers/imap/camel-imap-folder.c:2974
-#: ../camel/providers/imap/camel-imap-folder.c:3819
-#: ../camel/providers/nntp/camel-nntp-folder.c:236
+#: ../camel/providers/imap/camel-imap-folder.c:3483
+#: ../camel/providers/imap/camel-imap-folder.c:4378
+#: ../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:3632
+#: ../camel/providers/imap/camel-imap-folder.c:4179
#, c-format
msgid "Incomplete server response: no information provided for message %d"
msgstr "Неполный ответ сервера: не предоставлена информация о сообщении %d"
-#: ../camel/providers/imap/camel-imap-folder.c:3640
+#: ../camel/providers/imap/camel-imap-folder.c:4189
#, c-format
msgid "Incomplete server response: no UID provided for message %d"
msgstr "Неполный ответ сервера: отсутствует UID для сообщения %d"
-#: ../camel/providers/imap/camel-imap-folder.c:3857
+#: ../camel/providers/imap/camel-imap-folder.c:4418
+#, c-format
msgid "Could not find message body in FETCH response."
msgstr "Не удалось найти тело сообщения в ответе на команду FETCH."
-#: ../camel/providers/imap/camel-imap-message-cache.c:181
-#: ../camel/providers/imap/camel-imap-message-cache.c:244
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Не удалось открыть каталог кэша: %s"
+#: ../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 "Не удалось открыть каталог кэша: "
-#: ../camel/providers/imap/camel-imap-message-cache.c:330
-#: ../camel/providers/imap/camel-imap-message-cache.c:387
-#: ../camel/providers/imap/camel-imap-message-cache.c:418
-#: ../camel/providers/imap/camel-imap-message-cache.c:450
+#: ../camel/providers/imap/camel-imap-message-cache.c:326
#, c-format
msgid "Failed to cache message %s: %s"
msgstr "Сбой при кэшировании сообщения %s: %s"
-#: ../camel/providers/imap/camel-imap-message-cache.c:530
+#: ../camel/providers/imap/camel-imap-message-cache.c:391
#, c-format
-msgid "Failed to cache %s: %s"
-msgstr "Сбой при кэшировании %s: %s"
+#| msgid "Failed to cache message %s: %s"
+msgid "Failed to cache message %s: "
+msgstr "Сбой при кэшировании сообщения %s: "
-#: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:50
+#: ../camel/providers/imap/camel-imap-message-cache.c:529
+#, c-format
+#| msgid "Failed to cache %s: %s"
+msgid "Failed to cache %s: "
+msgstr "Сбой при кэшировании %s: "
+
+#: ../camel/providers/imap/camel-imap-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
+msgid "Checking for New Mail"
+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"
msgstr "П_роверять новую почту в подписанных папках"
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:49
-#: ../camel/providers/imapx/camel-imapx-provider.c:70
-msgid "Namespace:"
-msgstr "Пространство имён:"
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:52
+msgid "Connection to Server"
+msgstr "Подключение к серверу"
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:53
-#: ../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:50
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
+msgid "_Use custom command to connect to server"
+msgstr "_Использовать свою строку для подключения к серверу"
-#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imap/camel-imap-provider.c:52
+#| msgid "Command:"
+msgid "Co_mmand:"
+msgstr "Ко_манда:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:62
+#: ../camel/providers/nntp/camel-nntp-provider.c:42
+msgid "Folders"
+msgstr "Папки"
+
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
+msgid "_Show only subscribed folders"
+msgstr "_Показывать только подписанные папки"
+
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
+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: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:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:59
+#: ../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:83
+#: ../camel/providers/imap/camel-imap-provider.c:79
msgid "IMAP"
msgstr "IMAP"
-#: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imap/camel-imap-provider.c:81
#: ../camel/providers/imapx/camel-imapx-provider.c:90
msgid "For reading and storing mail on IMAP servers."
msgstr "Для чтения и хранения почты на серверах IMAP."
-#: ../camel/providers/imap/camel-imap-provider.c:102
+#: ../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 будет производиться с использованием "
-"незашифрованного пароля."
+msgstr "Подключение к серверу IMAP будет производиться с использованием незашифрованного пароля."
-#: ../camel/providers/imap/camel-imap-store.c:435
-#: ../camel/providers/imap4/camel-imap4-store.c:210
-#: ../camel/providers/imapx/camel-imapx-store.c:167
-#, c-format
-msgid "IMAP server %s"
-msgstr "Сервер IMAP %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:212
-#: ../camel/providers/imapx/camel-imapx-store.c:169
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "Сервис IMAP для %s на %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:566
-#: ../camel/providers/imap/camel-imap-store.c:581
-#: ../camel/providers/imap4/camel-imap4-store.c:247
-#: ../camel/providers/imap4/camel-imap4-store.c:262
-#: ../camel/providers/nntp/camel-nntp-store.c:182
-#: ../camel/providers/nntp/camel-nntp-store.c:197
-#: ../camel/providers/pop3/camel-pop3-store.c:192
-#: ../camel/providers/pop3/camel-pop3-store.c:206
-#: ../camel/providers/smtp/camel-smtp-transport.c:259
-#: ../camel/providers/smtp/camel-smtp-transport.c:274
+#: ../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:567
-#: ../camel/providers/imap4/camel-imap4-store.c:248
-#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/pop3/camel-pop3-store.c:193
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
+#: ../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-store.c:578
-#: ../camel/providers/imap/camel-imap-store.c:860
-#: ../camel/providers/imapx/camel-imapx-server.c:2017
-msgid "Connection cancelled"
-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-store.c:689
-#: ../camel/providers/imap/camel-imap-store.c:708
-#: ../camel/providers/imap/camel-imap-store.c:714
-#: ../camel/providers/imap/camel-imap-store.c:740
-#: ../camel/providers/imap4/camel-imap4-store.c:310
-#: ../camel/providers/imap4/camel-imap4-store.c:325
-#: ../camel/providers/imap4/camel-imap4-store.c:334
-#: ../camel/providers/imapx/camel-imapx-server.c:2057
-#: ../camel/providers/imapx/camel-imapx-server.c:2071
+#: ../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
#, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr "Не удалось подключиться к серверу IMAP %s в защищенном режиме:%s"
-#: ../camel/providers/imap/camel-imap-store.c:690
-#: ../camel/providers/imapx/camel-imapx-server.c:2058
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
+#: ../camel/providers/imap/camel-imap-store.c:371
+#: ../camel/providers/imapx/camel-imapx-server.c:2928
+#: ../camel/providers/smtp/camel-smtp-transport.c:238
msgid "STARTTLS not supported"
msgstr "STARTTLS не поддерживается"
-#: ../camel/providers/imap/camel-imap-store.c:709
-#: ../camel/providers/imapx/camel-imapx-server.c:2072
+#: ../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:715
-#: ../camel/providers/imap4/camel-imap4-store.c:335
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
+#: ../camel/providers/imap/camel-imap-store.c:398
+#: ../camel/providers/smtp/camel-smtp-transport.c:285
msgid "SSL is not available in this build"
msgstr "SSL не поддерживается в этой сборке"
-#: ../camel/providers/imap/camel-imap-store.c:863
+#: ../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"
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1051
-#: ../camel/providers/imap/camel-imap-store.c:2430
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:356
-#: ../camel/providers/imap4/camel-imap4-store.c:1403
-#: ../camel/providers/imapx/camel-imapx-store.c:349
-#: ../camel/providers/imapx/camel-imapx-store.c:578
-#: ../camel/providers/local/camel-maildir-folder.c:81
-#: ../camel/providers/local/camel-maildir-store.c:219
-#: ../camel/providers/local/camel-maildir-store.c:291
-#: ../camel/providers/local/camel-maildir-store.c:517
-#: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:461
-msgid "Inbox"
-msgstr "Входящие"
-
-#: ../camel/providers/imap/camel-imap-store.c:1303
+#: ../camel/providers/imap/camel-imap-store.c:740
+#: ../camel/providers/imapx/camel-imapx-server.c:3041
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "Сервер IMAP %s не поддерживает затребованный тип аутентификации %s"
-#: ../camel/providers/imap/camel-imap-store.c:1313
-#: ../camel/providers/smtp/camel-smtp-transport.c:506
+#: ../camel/providers/imap/camel-imap-store.c:752
+#: ../camel/providers/imapx/camel-imapx-server.c:3053
+#: ../camel/providers/smtp/camel-smtp-transport.c:420
#, c-format
msgid "No support for authentication type %s"
msgstr "Аутентификация %s не поддерживается"
-#: ../camel/providers/imap/camel-imap-store.c:1387
+#: ../camel/providers/imap/camel-imap-store.c:836
+#: ../camel/providers/imapx/camel-imapx-server.c:3129
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
"%s\n"
"\n"
-#: ../camel/providers/imap/camel-imap-store.c:1891
-#: ../camel/providers/imap/camel-imap-store.c:2272
-#: ../camel/providers/imap4/camel-imap4-store.c:954
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Имя папки «%s» некорректно, так как содержит символ \"%c\""
-
-#: ../camel/providers/imap/camel-imap-store.c:2008
-#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:202
-#: ../camel/providers/local/camel-mh-store.c:249
-#, c-format
-msgid "Cannot create folder '%s': folder exists."
-msgstr "Не удалось создать папку «%s»: папка существует."
-
-#: ../camel/providers/imap/camel-imap-store.c:2283
-#, c-format
-msgid "Unknown parent folder: %s"
-msgstr "Неизвестная родительская папка: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:3107
-msgid "Server unexpectedly disconnected"
-msgstr "Сервер неожиданно отключился"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:572
-#: ../camel/providers/imap4/camel-imap4-command.c:579
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "Ошибка отправки команды на сервер IMAP %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:681
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Неожиданный ответ от сервера IMAP4 %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:215
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "Неожиданное приветствие от сервера IMAP %s."
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:440
-#, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr "Не удалось выделить папку «%s»: неверное имя почтового ящика"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:446
-#, c-format
-msgid "Cannot select folder '%s': Bad command"
-msgstr "Не удалось выделить папку «%s»: неверная команда"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1414
-#, c-format
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr "Ошибка отправки команды на сервер IMAP %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1416
-msgid "service unavailable"
-msgstr "служба недоступна"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1546
-#: ../camel/providers/imap4/camel-imap4-engine.c:1584
-#: ../camel/providers/imap4/camel-imap4-engine.c:1628
-#: ../camel/providers/imap4/camel-imap4-engine.c:1683
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Сервер IMAP4 %s неожиданно отключился: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:87
-msgid ""
-"Enable extended Mailing-List detection required for some filter and vFolder "
-"rules"
-msgstr ""
-"Включить определение списков рассылки, требующееся для некоторых фильтров и "
-"правил vFolder"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:88
-msgid "Expire cached messages that haven't been read in X seconds"
-msgstr "Отбрасывать хранимые сообщения, которые не были прочитаны за X секунд"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
-msgid "Expire cached messages older than X seconds"
-msgstr "Отбрасывать сообщения, хранимые больше X секунд"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:427
-#, c-format
-msgid "Cannot access folder '%s': %s"
-msgstr "Не удалось получить доступ к папке «%s»: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:484
-#, c-format
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr "Не удалось синхронизировать флаги с папкой «%s»: неизвестная ошибка"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:490
-#, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr "Не удалось синхронизировать флаги с папкой «%s»: неверная команда"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:630
-#, c-format
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "Не удалось очистить папку «%s»: неизвестная ошибка"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:635
-#, c-format
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "Не удалось очистить папку «%s»: неверная команда"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:891
-#, c-format
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr "Не удалось получить сообщение: %s из папки «%s»: нет такого сообщения"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:896
-#, c-format
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr "Не удалось получить сообщение %s из папки «%s»: неверная команда"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:940
-#, c-format
-msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr ""
-"Не удалось добавить сообщение к папке «%s»: папка доступна только для чтения"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1033
-#, c-format
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "Не удалось добавить сообщение в папку «%s»: неизвестная ошибка"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1063
-#, c-format
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr "Не удалось добавить сообщение в папку «%s»: неверная команда"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1182
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-msgstr ""
-"Не удалось переместить сообщения из папки «%s» в папку «%s»: неизвестная ошибка"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1186
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-msgstr "Не удалось скопировать сообщения: %s из папки %s: неизвестная ошибка"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1194
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr ""
-"Не удалось переместить сообщения из папки «%s» в папку «%s»: неверная команда"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1198
+#: ../camel/providers/imap/camel-imap-store.c:997
+#: ../camel/providers/imapx/camel-imapx-store.c:183
#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-msgstr ""
-"Не удалось скопировать сообщения из папки «%s» в папку «%s»: неверная команда"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:55
-msgid "Check new messages for _Junk contents"
-msgstr "Проверять, являются ли новые сообщения спамом"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:57
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr ""
-"Проверять, являются ли новые сообщения спамом, только в папке \"Входящие\""
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:66
-msgid "IMAP4rev1"
-msgstr "IMAP4rev1"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:68
-msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr "Для чтения и хранения почты на серверах IMAPv4rev."
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:85
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Подключение к серверу IMAP будет производиться с использованием "
-"незашифрованного пароля."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:259
-#: ../camel/providers/nntp/camel-nntp-store.c:194
-#: ../camel/providers/nntp/camel-nntp-store.c:213
-#: ../camel/providers/pop3/camel-pop3-store.c:203
-#: ../camel/providers/smtp/camel-smtp-transport.c:271
-msgid "Connection canceled"
-msgstr "Соединение отменено"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:296
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"Не удалось подключиться к серверу IMAP %s в защищенном режиме: сервер не "
-"поддерживает STARTTLS"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:326
-#: ../camel/providers/pop3/camel-pop3-store.c:275
-msgid "TLS negotiations failed"
-msgstr "Сбой согласования TLS"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:411
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr "Не удалось авторизоваться на сервере IMAP %s используя механизм %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:534
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Не удалось пройти проверку подлинности на сервере IMAP %s используя %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:697
-#: ../camel/providers/imap4/camel-imap4-store.c:964
-msgid "Cannot create IMAP folders in offline mode."
-msgstr "Невозможно создать папки IMAP в автономном режиме."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:736
-#, c-format
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr "Не удалось получить папку «%s» на сервере IMAP %s: неизвестная ошибка"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:816
-#, c-format
-msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-msgstr "Не удалось получить сведения для «%s» на сервере IMAP %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-msgid "Bad command"
-msgstr "Неверная команда"
+msgid "IMAP server %s"
+msgstr "Сервер IMAP %s"
-#: ../camel/providers/imap4/camel-imap4-store.c:897
+#: ../camel/providers/imap/camel-imap-store.c:1001
+#: ../camel/providers/imapx/camel-imapx-store.c:185
#, c-format
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\81оздаÑ\82Ñ\8c папкÑ\83 «%s»: невеÑ\80ное имÑ\8f поÑ\87Ñ\82ового Ñ\8fÑ\89ика"
+msgid "IMAP service for %s on %s"
+msgstr "СеÑ\80виÑ\81 IMAP длÑ\8f %s на %s"
-#: ../camel/providers/imap4/camel-imap4-store.c:902
-#, c-format
-msgid "Cannot create folder '%s': Bad command"
-msgstr "Не удалось создать папку «%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/local/camel-maildir-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:615
+#: ../camel/providers/local/camel-maildir-store.c:621
+#: ../camel/providers/local/camel-maildir-store.c:669
+#: ../camel/providers/local/camel-spool-store.c:289
+msgid "Inbox"
+msgstr "Входящие"
-#: ../camel/providers/imap4/camel-imap4-store.c:1008
+#: ../camel/providers/imap/camel-imap-store.c:1822
+#: ../camel/providers/imap/camel-imap-store.c:2259
+#: ../camel/providers/imapx/camel-imapx-store.c:1320
#, c-format
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "Не удалось удалить папку «%s»: специальная папка"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1015
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr "Невозможно удалить папки IMAP в автономном режиме."
+msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Недопустимое имя папки «%s»: имя содержит символ «%c»"
-#: ../camel/providers/imap4/camel-imap4-store.c:1074
+#: ../camel/providers/imap/camel-imap-store.c:1939
+#: ../camel/providers/local/camel-maildir-store.c:244
+#: ../camel/providers/local/camel-mbox-store.c:407
+#: ../camel/providers/local/camel-mh-store.c:504
#, c-format
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\83далиÑ\82Ñ\8c папкÑ\83 «%s»: невеÑ\80ное имÑ\8f поÑ\87Ñ\82ового Ñ\8fÑ\89ика"
+msgid "Cannot create folder '%s': folder exists."
+msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\81оздаÑ\82Ñ\8c папкÑ\83 «%s»: папка Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83еÑ\82."
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
+#: ../camel/providers/imap/camel-imap-store.c:2272
+#: ../camel/providers/imapx/camel-imapx-store.c:1331
#, c-format
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "Не удалось удалить папку: «%s»: неверная команда"
+msgid "Unknown parent folder: %s"
+msgstr "Неизвестная родительская папка: %s"
-#: ../camel/providers/imap4/camel-imap4-store.c:1099
+#: ../camel/providers/imap/camel-imap-store.c:3137
#, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "Не удалось переименовать папку «%s» в «%s»: специальная папка"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1106
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "Невозможно переименовать папки IMAP в автономном режиме."
+msgid "Server unexpectedly disconnected"
+msgstr "Сервер неожиданно отключился"
-#: ../camel/providers/imap4/camel-imap4-store.c:1137
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c пеÑ\80еименоваÑ\82Ñ\8c папкÑ\83 «%s» в «%s»: невеÑ\80ное имÑ\8f поÑ\87Ñ\82ового Ñ\8fÑ\89ика"
+#: ../camel/providers/imap/camel-imap-store.c:3140
+#| msgid "Server unexpectedly disconnected: %s"
+msgid "Server unexpectedly disconnected: "
+msgstr "СеÑ\80веÑ\80 неожиданно оÑ\82клÑ\8eÑ\87илÑ\81Ñ\8f: "
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
+#: ../camel/providers/imapx/camel-imapx-folder.c:74
#, c-format
-msgid "Cannot rename folder '%s' to '%s': Bad command"
-msgstr "Не удалось переименовать папку «%s» в «%s»: неверная команда"
+msgid "Could not create folder summary for %s"
+msgstr "Не удалось создать краткую информацию по папке %s"
-#. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
-#. * The fourth one is an error message.
-#: ../camel/providers/imap4/camel-imap4-store.c:1572
+#: ../camel/providers/imapx/camel-imapx-folder.c:82
#, c-format
-msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-msgstr "Не удалось получить сведения %s для шаблона «%s» на сервере IMAP %s: %s"
+#| msgid "Could not create cache for %s"
+msgid "Could not create cache for %s: "
+msgstr "Не удалось создать кэш для %s:"
-#: ../camel/providers/imap4/camel-imap4-store.c:1633
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "Невозможно подписаться на папки IMAP в автономном режиме."
+#: ../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 "Использовать _быструю синхронизацию, если сервер поддерживает такую возможность"
-#: ../camel/providers/imap4/camel-imap4-store.c:1678
-#, c-format
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr "Не удалось подписаться на папку «%s»: неверное имя почтового ящика"
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
+msgid "Use I_dle if the server supports it"
+msgstr "Используйте Просто_й, если сервер поддерживает эту возможность"
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, c-format
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "Не удалось подписаться на папку «%s»: неверная команда"
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "Command:"
+msgstr "Команда:"
-#: ../camel/providers/imap4/camel-imap4-store.c:1705
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr "Ð\9dевозможно оÑ\82пиÑ\81аÑ\82Ñ\8cÑ\81Ñ\8f оÑ\82 папок IMAP в авÑ\82ономном Ñ\80ежиме."
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
+msgid "Numbe_r of cached connections to use"
+msgstr "Ð\98Ñ\81полÑ\8cзÑ\83емое _колиÑ\87еÑ\81Ñ\82во кÑ\8dÑ\88иÑ\80Ñ\83емÑ\8bÑ\85 Ñ\81оединений"
-#: ../camel/providers/imap4/camel-imap4-store.c:1750
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr "Не удалось отписаться от папки «%s»: неверное имя почтового ящика"
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
+msgid "Namespace:"
+msgstr "Пространство имён:"
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr "Не удалось отписаться от папки «%s»: Неверная команда"
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
+msgid "IMAP+"
+msgstr "IMAP+"
-#: ../camel/providers/imap4/camel-imap4-summary.c:1590
-msgid "Scanning for changed messages"
-msgstr "Поиск изменённых сообщений"
+#: ../camel/providers/imapx/camel-imapx-server.c:1404
+#| msgid "Error writing mail temp file: %s"
+msgid "Error writing to cache stream: "
+msgstr "Ошибка записи в поток кэша: "
-#: ../camel/providers/imap4/camel-imap4-summary.c:1611
+#: ../camel/providers/imapx/camel-imapx-server.c:2083
#, c-format
-msgid "IMAP server %s is in an inconsistent state."
-msgstr "Сервер IMAP %s находится в неустойчивом состоянии."
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1638
-msgid "Fetching envelopes of new messages"
-msgstr "Получение конвертов новых сообщений"
+#| msgid "Cannot authenticate user"
+msgid "Not authenticated"
+msgstr "Не удалось выполнить аутентификацию"
-#: ../camel/providers/imap4/camel-imap4-utils.c:429
+#: ../camel/providers/imapx/camel-imapx-server.c:2850
#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Неожиданный токен в ответе сервера IMAP %s: "
+#| msgid "Could not connect to %s (port %s): %s"
+msgid "Could not connect to %s (port %s): "
+msgstr "Не удалось подключиться к %s (порт %s): "
-#: ../camel/providers/imap4/camel-imap4-utils.c:452
-msgid "No data"
-msgstr "Нет данных"
+#: ../camel/providers/imapx/camel-imapx-server.c:3311
+#| msgid "Posting failed: %s"
+msgid "Closing tmp stream failed: "
+msgstr "Произошёл сбок при попытке закрыть временный поток: "
-#: ../camel/providers/imap4/camel-imap4-utils.c:613
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Сервер IMAP %s неожиданно отключился: %s"
-
-#: ../camel/providers/imapx/camel-imapx-folder.c:84
-#, c-format
-msgid "Could not create folder summary for %s"
-msgstr "Не удалось создать краткую информацию по папке %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:5345
+#: ../camel/providers/imapx/camel-imapx-server.c:5360
+#| msgid "Cannot create message: %s"
+msgid "Cannot create spool file: "
+msgstr "Не удалось создать файл спула: "
-#: ../camel/providers/imapx/camel-imapx-folder.c:92
+#: ../camel/providers/imapx/camel-imapx-store.c:1136
+#: ../camel/providers/nntp/camel-nntp-store.c:1610
#, c-format
-msgid "Could not create cache for %s"
-msgstr "Не удалось создать кэш для %s"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
-msgid "Use I_dle if the server supports it"
-msgstr "Используйте Просто_й, если сервер поддерживает эту возможность"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:60
-msgid "Numbe_r of cached connections to use"
-msgstr "Используемое _количество кэшируемых соединений"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
-msgid "IMAP+"
-msgstr "IMAP+"
+msgid "No such folder: %s"
+msgstr "Нет такой папки: %s"
-#: ../camel/providers/imapx/camel-imapx-server.c:2020
+#: ../camel/providers/imapx/camel-imapx-stream.c:70
#, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c подклÑ\8eÑ\87иÑ\82Ñ\8cÑ\81Ñ\8f к %s (поÑ\80Ñ\82 %s): %s"
+msgid "Source stream returned no data"
+msgstr "Ð\9fоÑ\82ок не веÑ\80нÑ\83л даннÑ\8bе"
-#: ../camel/providers/imapx/camel-imapx-server.c:2100
+#: ../camel/providers/imapx/camel-imapx-stream.c:79
#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr "%sВведите пароль IMAP для %s@%s"
-
-#: ../camel/providers/local/camel-local-folder.c:178
-msgid "Index message body data"
-msgstr "Индексировать данные тела сообщения"
+#| msgid "service unavailable"
+msgid "Source stream unavailable"
+msgstr "Поток недоступен"
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:395
+#: ../camel/providers/local/camel-local-folder.c:182
#, c-format
msgid "~%s (%s)"
msgstr "~%s (%s)"
-#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:399
-#: ../camel/providers/local/camel-local-folder.c:402
+#: ../camel/providers/local/camel-local-folder.c:192
+#: ../camel/providers/local/camel-local-folder.c:201
#, c-format
msgid "mailbox: %s (%s)"
msgstr "почтовый ящик: %s: (%s)"
-#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:406
+#: ../camel/providers/local/camel-local-folder.c:210
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../camel/providers/local/camel-local-provider.c:48
+#: ../camel/providers/local/camel-local-folder.c:470
+msgid "Index message body data"
+msgstr "Индексировать данные тела сообщения"
+
+#: ../camel/providers/local/camel-local-folder.c:683
+#, c-format
+#| msgid ""
+#| "Cannot get message: %s from folder %s\n"
+#| " %s"
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
+msgstr ""
+"Не удалось получить сообщение %s из папки %s\n"
+"%s"
+
+#: ../camel/providers/local/camel-local-provider.c:44
msgid "_Use the '.folders' folder summary file (exmh)"
msgstr "_Использовать общий файл индекса «.folders» (exmh)"
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-provider.c:51
msgid "MH-format mail directories"
msgstr "Почтовые каталоги в формате UNIX MH"
-#: ../camel/providers/local/camel-local-provider.c:56
+#: ../camel/providers/local/camel-local-provider.c:52
msgid "For storing local mail in MH-like mail directories."
msgstr "Для хранения локальной почты в почтовых каталогах типа MH."
-#: ../camel/providers/local/camel-local-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:69
msgid "Local delivery"
msgstr "Локальная доставка"
-#: ../camel/providers/local/camel-local-provider.c:74
-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: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:88
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:103
msgid "_Apply filters to new messages in INBOX"
msgstr "_Применить фильтры к новым сообщениям в папке «Входящие»"
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:91
msgid "Maildir-format mail directories"
msgstr "Почтовые каталоги в формате Maildir"
-#: ../camel/providers/local/camel-local-provider.c:96
+#: ../camel/providers/local/camel-local-provider.c:92
msgid "For storing local mail in maildir directories."
msgstr "Для хранения локальной почты в почтовых каталогах maildir."
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:104
msgid "_Store status headers in Elm/Pine/Mutt format"
msgstr "_Сохранять заголовки статуса в формате Elm/Pine/Mutt"
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:111
msgid "Standard Unix mbox spool file"
msgstr "Стандартная для Unix очередь типа mbox"
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:112
+#: ../camel/providers/local/camel-local-provider.c:123
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."
"спула в формате mbox. Также может использоваться для чтения дерева\n"
"папок в стиле Elm, Pine или Mutt."
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:122
msgid "Standard Unix mbox spool directory"
msgstr "Стандартный для Unix каталог очередей типа mbox"
-#: ../camel/providers/local/camel-local-store.c:163
-#: ../camel/providers/local/camel-local-store.c:274
-#: ../camel/providers/local/camel-mbox-store.c:357
-#: ../camel/providers/local/camel-spool-store.c:126
+#: ../camel/providers/local/camel-local-store.c:174
+#: ../camel/providers/local/camel-local-store.c:319
+#: ../camel/providers/local/camel-maildir-store.c:92
+#: ../camel/providers/local/camel-mbox-store.c:526
+#: ../camel/providers/local/camel-spool-store.c:318
#, c-format
msgid "Store root %s is not an absolute path"
msgstr "Относительный путь к хранилищу %s"
-#: ../camel/providers/local/camel-local-store.c:170
+#: ../camel/providers/local/camel-local-store.c:183
#, c-format
msgid "Store root %s is not a regular directory"
msgstr "Хранилище %s не является каталогом"
-#: ../camel/providers/local/camel-local-store.c:179
-#: ../camel/providers/local/camel-local-store.c:187
-#: ../camel/providers/local/camel-local-store.c:285
+#: ../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-maildir-store.c:124
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr "Не удалось получить папку: %s: %s"
-#: ../camel/providers/local/camel-local-store.c:199
+#: ../camel/providers/local/camel-local-store.c:220
+#, c-format
msgid "Local stores do not have an inbox"
msgstr "Локальное хранилище не имеет папки Входящие"
-#: ../camel/providers/local/camel-local-store.c:245
+#: ../camel/providers/local/camel-local-store.c:281
#, c-format
msgid "Local mail file %s"
msgstr "Локальный почтовый файл %s"
-#: ../camel/providers/local/camel-local-store.c:340
+#: ../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:408
+#: ../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:433
-#: ../camel/providers/local/camel-mbox-store.c:298
+#: ../camel/providers/local/camel-local-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:695
#, c-format
msgid "Could not delete folder index file '%s': %s"
msgstr "Не удалось удалить индексный файл папки «%s»: %s"
-#: ../camel/providers/local/camel-local-store.c:456
-#: ../camel/providers/local/camel-mbox-store.c:322
+#: ../camel/providers/local/camel-local-store.c:526
+#: ../camel/providers/local/camel-mbox-store.c:724
#, c-format
msgid "Could not delete folder meta file '%s': %s"
msgstr "Не удалось удалить мета-файл папки «%s»: %s"
-#: ../camel/providers/local/camel-local-summary.c:515
+#: ../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:230
-msgid "Maildir append message canceled"
-msgstr "Добавление сообщения к папке почтового каталога отменено"
-
-#: ../camel/providers/local/camel-maildir-folder.c:233
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Не удалось добавить сообщение к папке почтового каталога: %s: %s"
-
-#: ../camel/providers/local/camel-maildir-folder.c:263
-#: ../camel/providers/local/camel-maildir-folder.c:292
-#: ../camel/providers/local/camel-maildir-folder.c:306
-#: ../camel/providers/local/camel-maildir-folder.c:314
-#: ../camel/providers/local/camel-maildir-folder.c:400
-#: ../camel/providers/local/camel-mbox-folder.c:362
-#: ../camel/providers/local/camel-mbox-folder.c:413
-#: ../camel/providers/local/camel-mbox-folder.c:434
-#: ../camel/providers/local/camel-mbox-folder.c:465
-#: ../camel/providers/local/camel-mbox-folder.c:473
-#: ../camel/providers/local/camel-mh-folder.c:225
-#: ../camel/providers/local/camel-mh-folder.c:236
-#: ../camel/providers/local/camel-mh-folder.c:244
+#: ../camel/providers/local/camel-maildir-folder.c:198
#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-" %s"
-msgstr ""
-"Не удалось получить сообщение: %s из папки %s\n"
-" %s"
+#| 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-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:315
-msgid "Invalid message contents"
-msgstr "Неверное содержание сообщения"
+#: ../camel/providers/local/camel-maildir-folder.c:326
+#, c-format
+#| msgid "Cannot transfer message to destination folder"
+msgid "Cannot transfer message to destination folder: %s"
+msgstr "Не удалось переместить сообщение в папку: %s"
-#: ../camel/providers/local/camel-maildir-folder.c:418
-msgid "Cannot transfer message to destination folder"
-msgstr "Не удалось переместить сообщение в папку назначения"
+#: ../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:148
-#: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:174
-#: ../camel/providers/local/camel-mbox-store.c:186
+#: ../camel/providers/local/camel-maildir-store.c:109
+#: ../camel/providers/local/camel-maildir-store.c:686
+#, 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
#, c-format
msgid "Cannot create folder '%s': %s"
msgstr "Не удалось создать папку: «%s»: %s"
-#: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:145
-#: ../camel/providers/local/camel-mh-store.c:217
+#: ../camel/providers/local/camel-maildir-store.c:206
+#: ../camel/providers/local/camel-mbox-store.c:341
+#: ../camel/providers/local/camel-mh-store.c:464
#, c-format
msgid "Cannot get folder '%s': %s"
msgstr "Не удалось получить папку: «%s»: %s"
-#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:153
-#: ../camel/providers/local/camel-mh-store.c:224
+#: ../camel/providers/local/camel-maildir-store.c:212
+#: ../camel/providers/local/camel-mbox-store.c:351
+#: ../camel/providers/local/camel-mh-store.c:473
#, c-format
msgid "Cannot get folder '%s': folder does not exist."
msgstr "Не удалось получить папку «%s»: папка не существует."
-#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-maildir-store.c:239
#, c-format
msgid "Cannot get folder '%s': not a maildir directory."
msgstr "Не удалось получить папку «%s»: не является почтовым каталогом."
-#: ../camel/providers/local/camel-maildir-store.c:234
-#: ../camel/providers/local/camel-maildir-store.c:272
-#: ../camel/providers/local/camel-mh-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:293
+#: ../camel/providers/local/camel-maildir-store.c:333
+#: ../camel/providers/local/camel-mh-store.c:584
#, c-format
msgid "Could not delete folder '%s': %s"
msgstr "Не удалось удалить папку «%s»: %s"
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:295
msgid "not a maildir directory"
msgstr "не является почтовым каталогом"
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:328
-#: ../camel/providers/local/camel-spool-store.c:342
+#: ../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
#, c-format
msgid "Could not scan folder '%s': %s"
msgstr "Не удалось просканировать папку «%s»: %s"
-#: ../camel/providers/local/camel-maildir-summary.c:432
-#: ../camel/providers/local/camel-maildir-summary.c:551
+#: ../camel/providers/local/camel-maildir-store.c:677
+#, c-format
+#| msgid "Cannot create folder: %s: folder exists"
+msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
+msgstr "Не удалось переименовать папку: %s. Имя папки не должно содержать точек"
+
+#: ../camel/providers/local/camel-maildir-summary.c:435
+#: ../camel/providers/local/camel-maildir-summary.c:565
#, c-format
msgid "Cannot open maildir directory path: %s: %s"
msgstr "Не удалось открыть путь к папке почтового каталога: %s: %s"
-#: ../camel/providers/local/camel-maildir-summary.c:544
+#: ../camel/providers/local/camel-maildir-summary.c:556
msgid "Checking folder consistency"
msgstr "Проверка содержания каталогов"
-#: ../camel/providers/local/camel-maildir-summary.c:637
+#: ../camel/providers/local/camel-maildir-summary.c:649
msgid "Checking for new messages"
msgstr "Проверка новых сообщений"
-#: ../camel/providers/local/camel-maildir-summary.c:724
-#: ../camel/providers/local/camel-mbox-summary.c:526
-#: ../camel/providers/local/camel-mbox-summary.c:722
-#: ../camel/providers/local/camel-mbox-summary.c:842
-#: ../camel/providers/local/camel-spool-summary.c:150
+#: ../camel/providers/local/camel-maildir-summary.c:742
+#: ../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-spool-summary.c:131
msgid "Storing folder"
msgstr "Сохранение папки"
-#: ../camel/providers/local/camel-mbox-folder.c:167
-#: ../camel/providers/local/camel-spool-folder.c:150
+#: ../camel/providers/local/camel-mbox-folder.c:183
#, c-format
-msgid "Cannot create folder lock on %s: %s"
-msgstr "Не удалось заблокировать папку %s: %s"
+#| msgid "Cannot open mailbox: %s: %s\n"
+msgid "Cannot open mailbox: %s: "
+msgstr "Не удалось открыть почтовый ящик: %s:"
-#: ../camel/providers/local/camel-mbox-folder.c:231
+#: ../camel/providers/local/camel-mbox-folder.c:249
#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Не удалось открыть почтовый ящик: %s: %s\n"
-
-#: ../camel/providers/local/camel-mbox-folder.c:297
-msgid "Mail append canceled"
-msgstr "Добавление почты отменено"
+#| msgid "Cannot append message to mbox file: %s: %s"
+msgid "Cannot append message to mbox file: %s: "
+msgstr "Не удалось добавить сообщение в файл почтового ящика: %s:"
-#: ../camel/providers/local/camel-mbox-folder.c:300
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Не удалось добавить сообщение к файлу mbox: %s: %s"
-
-#: ../camel/providers/local/camel-mbox-folder.c:466
+#: ../camel/providers/local/camel-mbox-folder.c:378
msgid "The folder appears to be irrecoverably corrupted."
msgstr "Видимо, папка невостановимо испорчена."
-#: ../camel/providers/local/camel-mbox-folder.c:474
-#: ../camel/providers/local/camel-mh-folder.c:245
-msgid "Message construction failed."
-msgstr "Сбой при создании сообщения."
+#: ../camel/providers/local/camel-mbox-folder.c:436
+#: ../camel/providers/local/camel-spool-folder.c:70
+#, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "Не удалось заблокировать папку %s: %s"
-#: ../camel/providers/local/camel-mbox-store.c:164
#: ../camel/providers/local/camel-mbox-store.c:363
+#: ../camel/providers/local/camel-mbox-store.c:534
+#, c-format
msgid "Cannot create a folder by this name."
msgstr "Не удалось создать папку с таким именем."
-#: ../camel/providers/local/camel-mbox-store.c:196
+#: ../camel/providers/local/camel-mbox-store.c:400
#, c-format
msgid "Cannot get folder '%s': not a regular file."
msgstr "Не удалось получить папку «%s»: не является обычным файлом."
-#: ../camel/providers/local/camel-mbox-store.c:226
-#: ../camel/providers/local/camel-mbox-store.c:237
-#: ../camel/providers/local/camel-mbox-store.c:260
+#: ../camel/providers/local/camel-mbox-store.c:550
+#, c-format
+msgid "Cannot create directory '%s': %s."
+msgstr "Не удалось создать каталог «%s»: %s."
+
+#: ../camel/providers/local/camel-mbox-store.c:566
+#, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "Не удалось создать папку: %s: %s"
+
+#: ../camel/providers/local/camel-mbox-store.c:568
+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
#, c-format
msgid ""
"Could not delete folder '%s':\n"
"Не удалось удалить папку «%s»:\n"
"%s"
-#: ../camel/providers/local/camel-mbox-store.c:245
+#: ../camel/providers/local/camel-mbox-store.c:632
#, c-format
msgid "'%s' is not a regular file."
msgstr "«%s» не является обычным файлом."
-#: ../camel/providers/local/camel-mbox-store.c:252
+#: ../camel/providers/local/camel-mbox-store.c:641
#, c-format
msgid "Folder '%s' is not empty. Not deleted."
msgstr "Папка «%s» не пуста. Не удалена."
-#: ../camel/providers/local/camel-mbox-store.c:274
-#: ../camel/providers/local/camel-mbox-store.c:286
+#: ../camel/providers/local/camel-mbox-store.c:667
+#: ../camel/providers/local/camel-mbox-store.c:681
#, c-format
msgid "Could not delete folder summary file '%s': %s"
msgstr "Не удалось удалить файл краткой информации «%s»: %s"
-#: ../camel/providers/local/camel-mbox-store.c:376
-#, c-format
-msgid "Cannot create directory '%s': %s."
-msgstr "Не удалось создать каталог «%s»: %s."
-
-#: ../camel/providers/local/camel-mbox-store.c:390
+#: ../camel/providers/local/camel-mbox-store.c:761
#, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "Не удалось создать папку: %s: %s"
-
-#: ../camel/providers/local/camel-mbox-store.c:392
-msgid "Folder already exists"
-msgstr "Папка уже существует"
-
-#: ../camel/providers/local/camel-mbox-store.c:483
msgid "The new folder name is illegal."
msgstr "Имя новой папки недопустимо."
-#: ../camel/providers/local/camel-mbox-store.c:496
+#: ../camel/providers/local/camel-mbox-store.c:776
#, c-format
msgid "Could not rename '%s': '%s': %s"
msgstr "Не удалось переименовать «%s»: «%s»: %s"
-#: ../camel/providers/local/camel-mbox-store.c:577
+#: ../camel/providers/local/camel-mbox-store.c:859
#, c-format
msgid "Could not rename '%s' to %s: %s"
msgstr "Не удалось переименовать «%s» в %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:532
+#: ../camel/providers/local/camel-mbox-summary.c:476
#, c-format
msgid "Could not open folder: %s: %s"
msgstr "Не удалось открыть папку: %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:582
+#: ../camel/providers/local/camel-mbox-summary.c:537
#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Фатальная ошибка почтового анализатора возле позиции %ld в папке %s"
+#| 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:659
+#: ../camel/providers/local/camel-mbox-summary.c:622
#, c-format
msgid "Cannot check folder: %s: %s"
msgstr "Не удалось проверить папку: %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:727
-#: ../camel/providers/local/camel-mbox-summary.c:847
-#: ../camel/providers/local/camel-spool-summary.c:155
+#: ../camel/providers/local/camel-mbox-summary.c:697
+#: ../camel/providers/local/camel-mbox-summary.c:833
+#: ../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:739
-#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-mbox-summary.c:711
+#: ../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:752
-#: ../camel/providers/local/camel-mbox-summary.c:957
+#: ../camel/providers/local/camel-mbox-summary.c:728
+#: ../camel/providers/local/camel-mbox-summary.c:949
#, c-format
msgid "Could not close source folder %s: %s"
msgstr "Не удалось закрыть исходную папку %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:761
+#: ../camel/providers/local/camel-mbox-summary.c:739
#, c-format
msgid "Could not close temporary folder: %s"
msgstr "Не удалось закрыть временную папку: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:776
+#: ../camel/providers/local/camel-mbox-summary.c:756
#, c-format
msgid "Could not rename folder: %s"
msgstr "Не удалось переименовать папку: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:858
-#: ../camel/providers/local/camel-mbox-summary.c:1084
+#: ../camel/providers/local/camel-mbox-summary.c:846
+#: ../camel/providers/local/camel-mbox-summary.c:1099
#, c-format
msgid "Could not store folder: %s"
msgstr "Не удалось сохранить папку: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:897
-#: ../camel/providers/local/camel-mbox-summary.c:905
-#: ../camel/providers/local/camel-mbox-summary.c:1114
-#: ../camel/providers/local/camel-mbox-summary.c:1122
+#: ../camel/providers/local/camel-mbox-summary.c:886
+#: ../camel/providers/local/camel-mbox-summary.c:1131
+#, c-format
+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
+#, c-format
msgid "Summary and folder mismatch, even after a sync"
msgstr "Сводка и папка расходятся даже после синхронизации"
-#: ../camel/providers/local/camel-mbox-summary.c:1047
-#: ../camel/providers/local/camel-spool-summary.c:334
+#: ../camel/providers/local/camel-mbox-summary.c:1052
+#: ../camel/providers/local/camel-spool-summary.c:343
#, c-format
msgid "Unknown error: %s"
msgstr "Неизвестная ошибка: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:1190
-#: ../camel/providers/local/camel-mbox-summary.c:1216
+#: ../camel/providers/local/camel-mbox-summary.c:1210
+#: ../camel/providers/local/camel-mbox-summary.c:1240
#, c-format
msgid "Writing to temporary mailbox failed: %s"
msgstr "Сбой записи во временный почтовый ящик: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:1207
+#: ../camel/providers/local/camel-mbox-summary.c:1229
#, c-format
msgid "Writing to temporary mailbox failed: %s: %s"
msgstr "Сбой записи во временный почтовый ящик: %s: %s"
-#: ../camel/providers/local/camel-mh-folder.c:180
-msgid "MH append message canceled"
-msgstr "Добавление сообщения в папку отменено"
-
-#: ../camel/providers/local/camel-mh-folder.c:183
+#: ../camel/providers/local/camel-mh-folder.c:115
#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Не удалось добавить сообщение к папке mh: %s: %s"
+#| 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:232
+#: ../camel/providers/local/camel-mh-store.c:483
#, c-format
msgid "Could not create folder '%s': %s"
msgstr "Не удалось создать папку «%s»: %s"
-#: ../camel/providers/local/camel-mh-store.c:244
+#: ../camel/providers/local/camel-mh-store.c:497
#, c-format
msgid "Cannot get folder '%s': not a directory."
msgstr "Не удалось получить папку «%s»: не является каталогом."
-#: ../camel/providers/local/camel-mh-summary.c:240
+#: ../camel/providers/local/camel-mh-summary.c:230
#, c-format
msgid "Cannot open MH directory path: %s: %s"
msgstr "Не удалось открыть MH каталог: %s: %s"
-#: ../camel/providers/local/camel-spool-store.c:132
+#: ../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:144
+#: ../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:163
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool mail file %s"
+msgstr "Файл почтового спула %s"
+
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool folder tree %s"
+msgstr "Дерево папки спула %s"
+
+#: ../camel/providers/local/camel-spool-store.c:391
#, c-format
msgid "Folder '%s/%s' does not exist."
msgstr "Папка «%s/%s» не существует."
-#: ../camel/providers/local/camel-spool-store.c:173
+#: ../camel/providers/local/camel-spool-store.c:403
#, c-format
msgid ""
"Could not open folder '%s':\n"
"Не удалось открыть папку «%s»:\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:177
+#: ../camel/providers/local/camel-spool-store.c:409
#, c-format
msgid "Folder '%s' does not exist."
msgstr "Папка «%s» не существует."
-#: ../camel/providers/local/camel-spool-store.c:182
+#: ../camel/providers/local/camel-spool-store.c:416
#, c-format
msgid ""
"Could not create folder '%s':\n"
"Не удалось создать папку «%s»:\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:190
+#: ../camel/providers/local/camel-spool-store.c:426
#, c-format
msgid "'%s' is not a mailbox file."
msgstr "«%s» не является файлом почтового ящика."
-#: ../camel/providers/local/camel-spool-store.c:207
+#: ../camel/providers/local/camel-spool-store.c:462
+#, c-format
msgid "Store does not support an INBOX"
msgstr "Хранилище не поддерживает INBOX"
-#: ../camel/providers/local/camel-spool-store.c:219
+#: ../camel/providers/local/camel-spool-store.c:476
#, c-format
-msgid "Spool mail file %s"
-msgstr "Файл поÑ\87Ñ\82ового Ñ\81пÑ\83ла %s"
+msgid "Spool folders cannot be deleted"
+msgstr "Ð\9fапки Ñ\81пÑ\83ла не могÑ\83Ñ\82 бÑ\8bÑ\82Ñ\8c Ñ\83даленÑ\8b"
-#: ../camel/providers/local/camel-spool-store.c:219
+#: ../camel/providers/local/camel-spool-store.c:491
#, c-format
-msgid "Spool folder tree %s"
-msgstr "Дерево папки спула %s"
-
-#: ../camel/providers/local/camel-spool-store.c:227
msgid "Spool folders cannot be renamed"
msgstr "Папки спула не могут быть переименованы"
-#: ../camel/providers/local/camel-spool-store.c:235
-msgid "Spool folders cannot be deleted"
-msgstr "Папки спула не могут быть удалены"
-
-#: ../camel/providers/local/camel-spool-summary.c:180
-#: ../camel/providers/local/camel-spool-summary.c:190
-#: ../camel/providers/local/camel-spool-summary.c:200
+#: ../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 sync temporary folder %s: %s"
+msgid "Could not synchronize temporary folder %s: %s"
msgstr "Не удалось синхронизировать временную папку %s: %s"
-#: ../camel/providers/local/camel-spool-summary.c:216
+#: ../camel/providers/local/camel-spool-summary.c:211
#, c-format
-msgid "Could not sync spool folder %s: %s"
-msgstr "Не удалось синхронизировать папку спула: %s: %s"
+#| msgid "Could not sync spool folder %s: %s"
+msgid "Could not synchronize spool folder %s: %s"
+msgstr "Не удалось синхронизировать папку спула %s: %s"
-#: ../camel/providers/local/camel-spool-summary.c:246
-#: ../camel/providers/local/camel-spool-summary.c:263
-#: ../camel/providers/local/camel-spool-summary.c:274
+#: ../camel/providers/local/camel-spool-summary.c:243
+#: ../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 sync spool folder %s: %s\n"
+"Could not synchronize spool folder %s: %s\n"
"Folder may be corrupt, copy saved in '%s'"
msgstr ""
-"Не удалось синхронизировать папку накопления: %s: %s\n"
-"Ð\9fапка можеÑ\82 бÑ\8bÑ\82Ñ\8c иÑ\81поÑ\80Ñ\87ена, копия сохранена в «%s»"
+"Не удалось синхронизировать папку спула %s: %s\n"
+"Ð\9fапка можеÑ\82 бÑ\8bÑ\82Ñ\8c повÑ\80еждена, копия сохранена в «%s»"
-#: ../camel/providers/nntp/camel-nntp-folder.c:135
-#: ../camel/providers/nntp/camel-nntp-folder.c:192
-#: ../camel/providers/nntp/camel-nntp-folder.c:224
+#: ../camel/providers/nntp/camel-nntp-folder.c:200
+#: ../camel/providers/nntp/camel-nntp-folder.c:279
+#: ../camel/providers/nntp/camel-nntp-folder.c:393
#, c-format
msgid "Internal error: UID in invalid format: %s"
msgstr "Внутренняя ошибка: UID в неверном формате: %s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:365
-#: ../camel/providers/nntp/camel-nntp-folder.c:368
-#: ../camel/providers/nntp/camel-nntp-folder.c:410
-#: ../camel/providers/nntp/camel-nntp-folder.c:412
+#: ../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
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Не удалось получить сообщение %s: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:477
+#: ../camel/providers/nntp/camel-nntp-folder.c:483
+#: ../camel/providers/nntp/camel-nntp-folder.c:530
#, c-format
msgid "Posting failed: %s"
msgstr "Ошибка отправки сообщения: %s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:430
+#: ../camel/providers/nntp/camel-nntp-folder.c:525
+#| msgid "Posting failed: %s"
+msgid "Posting failed: "
+msgstr "Ошибка отправки сообщения: "
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:554
+#, c-format
msgid "You cannot post NNTP messages while working offline!"
msgstr "Вы не можете отправлять сообщения NNTP во время автономной работы!"
-#: ../camel/providers/nntp/camel-nntp-folder.c:441
+#: ../camel/providers/nntp/camel-nntp-folder.c:574
+#, c-format
msgid "You cannot copy messages from a NNTP folder!"
msgstr "Вы не можете копировать сообщения из папки NNTP!"
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
-msgid ""
-"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr ""
-"_Показывать папки в сокращённой форме (то есть c.o.linux вместо comp.os."
-"linux)"
+#: ../camel/providers/nntp/camel-nntp-provider.c:44
+msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr "_Показывать папки в сокращённой форме (то есть c.o.linux вместо comp.os.linux)"
-#: ../camel/providers/nntp/camel-nntp-provider.c:48
+#: ../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:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:53
msgid "USENET news"
msgstr "Новости USENET"
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
msgid "This is a provider for reading from and posting to USENET newsgroups."
-msgstr ""
-"Это проводник для чтения и отправки сообщений в группы новостей USENET."
+msgstr "Это проводник для чтения и отправки сообщений в группы новостей USENET."
-#: ../camel/providers/nntp/camel-nntp-provider.c:76
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-"Подключение к серверу NNTP будет производиться с использованием "
-"незашифрованного пароля."
+#: ../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-store.c:216
+#: ../camel/providers/nntp/camel-nntp-store.c:77
#, c-format
-msgid "Could not read greeting from %s: %s"
-msgstr "Ð\9dе Ñ\83далоÑ\81Ñ\8c Ñ\81Ñ\87иÑ\82аÑ\82Ñ\8c пÑ\80ивеÑ\82Ñ\81Ñ\82вие из %s: %s"
+msgid "Authentication requested but no username provided"
+msgstr "ТÑ\80ебÑ\83еÑ\82Ñ\81Ñ\8f пÑ\80овеÑ\80ка подлинноÑ\81Ñ\82и, но имÑ\8f полÑ\8cзоваÑ\82елÑ\8f не Ñ\83казано"
-#: ../camel/providers/nntp/camel-nntp-store.c:228
+#: ../camel/providers/nntp/camel-nntp-store.c:89
+#, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Не удалось пройти проверку подлинности на сервере: %s"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:346
+#, 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
#, c-format
msgid "NNTP server %s returned error code %d: %s"
msgstr "Сервер NNTP %s вернул код ошибки %d: %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:410
+#: ../camel/providers/nntp/camel-nntp-store.c:527
#, c-format
msgid "USENET News via %s"
msgstr "Новости USENET через %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:819
+#: ../camel/providers/nntp/camel-nntp-store.c:1045
#, c-format
msgid ""
"Error retrieving newsgroups:\n"
"\n"
" %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:913
+#: ../camel/providers/nntp/camel-nntp-store.c:1160
+#, c-format
msgid ""
"You cannot subscribe to this newsgroup:\n"
"\n"
msgstr ""
"Вы не можете подписаться на эту группу новостей:\n"
"\n"
-"Нет такой группы новостей. Выбранный элемент скорее всего является "
-"родительской папкой."
+"Нет такой группы новостей. Выбранный элемент скорее всего является родительской папкой."
-#: ../camel/providers/nntp/camel-nntp-store.c:945
+#: ../camel/providers/nntp/camel-nntp-store.c:1202
+#, c-format
msgid ""
"You cannot unsubscribe to this newsgroup:\n"
"\n"
"\n"
"Группа новостей не существует!"
-#: ../camel/providers/nntp/camel-nntp-store.c:970
+#: ../camel/providers/nntp/camel-nntp-store.c:1235
+#, c-format
msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr ""
-"Вы не можете создать папку в группах новостей: вместо этого следует "
-"подписаться."
+msgstr "Вы не можете создать папку в группах новостей: вместо этого следует подписаться."
-#: ../camel/providers/nntp/camel-nntp-store.c:978
+#: ../camel/providers/nntp/camel-nntp-store.c:1251
+#, c-format
msgid "You cannot rename a folder in a News store."
msgstr "Вы не можете переименовать папку в группах новостей."
-#: ../camel/providers/nntp/camel-nntp-store.c:986
+#: ../camel/providers/nntp/camel-nntp-store.c:1268
+#, c-format
msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr ""
-"Вы не можете удалить папку в группах новостей: вместо этого следует "
-"отписаться."
+msgstr "Вы не можете удалить папку в группах новостей: вместо этого следует отписаться."
-#: ../camel/providers/nntp/camel-nntp-store.c:1180
-msgid "Authentication requested but no username provided"
-msgstr "Требуется проверка подлинности, но имя пользователя не указано"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1192
-#, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "Не удалось пройти проверку подлинности на сервере: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1479
+#| msgid "NNTP Command failed: %s"
+msgid "NNTP Command failed: "
+msgstr "Сбой команды NNTP: "
-#: ../camel/providers/nntp/camel-nntp-store.c:1315
+#: ../camel/providers/nntp/camel-nntp-store.c:1553
#, c-format
-msgid "NNTP Command failed: %s"
-msgstr "Сбой команды NNTP: %s"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1369
msgid "Not connected."
msgstr "Не подключен."
-#: ../camel/providers/nntp/camel-nntp-store.c:1422
-#, c-format
-msgid "No such folder: %s"
-msgstr "Нет такой папки: %s"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:272
-#: ../camel/providers/nntp/camel-nntp-summary.c:370
+#: ../camel/providers/nntp/camel-nntp-summary.c:234
+#: ../camel/providers/nntp/camel-nntp-summary.c:345
#, c-format
msgid "%s: Scanning new messages"
msgstr "%s: Поиск новых сообщений"
-#: ../camel/providers/nntp/camel-nntp-summary.c:279
+#: ../camel/providers/nntp/camel-nntp-summary.c:246
#, c-format
msgid "Unexpected server response from xover: %s"
msgstr "Неожиданный ответ сервера от xover: %s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:384
+#: ../camel/providers/nntp/camel-nntp-summary.c:362
#, c-format
msgid "Unexpected server response from head: %s"
msgstr "Неожиданный ответ сервера от head: %s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:420
-msgid "Use cancel"
-msgstr "Использование отменено"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:422
+#: ../camel/providers/nntp/camel-nntp-summary.c:407
#, c-format
msgid "Operation failed: %s"
msgstr "Сбой операции: %s"
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
+#: ../camel/providers/pop3/camel-pop3-folder.c:277
+#: ../camel/providers/pop3/camel-pop3-folder.c:334
+#, c-format
+msgid "No message with UID %s"
+msgstr "Нет сообщения с UID %s"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:342
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "Получение сообщения %d по POP"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:447
+msgid "Unknown reason"
+msgstr "Неизвестная причина"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:486
msgid "Retrieving POP summary"
msgstr "Получение краткой информации от сервера POP"
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
+#: ../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:314
+#: ../camel/providers/pop3/camel-pop3-folder.c:561
msgid "Expunging old messages"
msgstr "Уничтожение старых сообщений"
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
+#: ../camel/providers/pop3/camel-pop3-folder.c:575
msgid "Expunging deleted messages"
msgstr "Уничтожение сообщений, помеченных как удалённые"
-#: ../camel/providers/pop3/camel-pop3-folder.c:530
-#: ../camel/providers/pop3/camel-pop3-folder.c:552
-#, c-format
-msgid "No message with UID %s"
-msgstr "Нет сообщения с UID %s"
-
-#. Sigh, most of the crap in this function is so that the cancel button
-#. returns the proper exception code. Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:559
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "Получение сообщения %d по POP"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-msgid "Unknown reason"
-msgstr "Неизвестная причина"
-
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
msgid "Message storage"
msgstr "Хранилище сообщений"
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
msgid "_Leave messages on server"
msgstr "_Оставлять сообщения на сервере"
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#. Translators: '%s' is replaced with a widget, where user can select how many days can be message left on the server
+#: ../camel/providers/pop3/camel-pop3-provider.c:44
#, c-format
msgid "_Delete after %s day(s)"
msgstr "_Удалять через %s дней"
-#: ../camel/providers/pop3/camel-pop3-provider.c:49
+#: ../camel/providers/pop3/camel-pop3-provider.c:46
+msgid "Delete _expunged from local Inbox"
+msgstr "_Удалить сообщения, удалённые из локальной папки «Входящие»"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:48
msgid "Disable _support for all POP3 extensions"
msgstr "Запретить _поддержку всех расширений POP3"
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:56
msgid "POP"
msgstr "POP"
-#: ../camel/providers/pop3/camel-pop3-provider.c:59
+#: ../camel/providers/pop3/camel-pop3-provider.c:58
msgid "For connecting to and downloading mail from POP servers."
msgstr "Для подключения и принятия почты с серверов POP"
-#: ../camel/providers/pop3/camel-pop3-provider.c:76
-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: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:86
-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: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-store.c:229
+#. Translators: This is the separator between an error and an explanation
+#: ../camel/providers/pop3/camel-pop3-store.c:98
+msgid ": "
+msgstr ": "
+
+#: ../camel/providers/pop3/camel-pop3-store.c:181
#, c-format
msgid "Failed to read a valid greeting from POP server %s"
msgstr "Не удалось получить приглашение от POP-сервера %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:246
-#: ../camel/providers/pop3/camel-pop3-store.c:274
-#: ../camel/providers/pop3/camel-pop3-store.c:280
+#: ../camel/providers/pop3/camel-pop3-store.c:199
+#: ../camel/providers/pop3/camel-pop3-store.c:230
+#: ../camel/providers/pop3/camel-pop3-store.c:237
#, 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:247
+#: ../camel/providers/pop3/camel-pop3-store.c:200
msgid "STLS not supported by server"
msgstr "STLS не поддерживается сервером"
-#: ../camel/providers/pop3/camel-pop3-store.c:262
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:218
#, c-format
msgid "Failed to connect to POP server %s in secure mode%s"
-msgstr "Сбой при подключении к серверу POP %s в защищенном режиме%s"
+msgstr "Сбой при подключении к серверу POP %s в защищённом режиме%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:281
+#: ../camel/providers/pop3/camel-pop3-store.c:231
+msgid "TLS negotiations failed"
+msgstr "Сбой согласования TLS"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:238
msgid "TLS is not available in this build"
msgstr "TLS не поддерживается в этой сборке"
-#: ../camel/providers/pop3/camel-pop3-store.c:387
-#, c-format
-msgid "Could not connect to POP server %s"
-msgstr "Не удалось подключиться к серверу POP %s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:428
-#: ../camel/providers/pop3/camel-pop3-store.c:565
+#: ../camel/providers/pop3/camel-pop3-store.c:317
+#: ../camel/providers/pop3/camel-pop3-store.c:472
#, 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: Не поддерживается затребованный механизм идентификации."
-#: ../camel/providers/pop3/camel-pop3-store.c:446
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:340
#, 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:460
+#: ../camel/providers/pop3/camel-pop3-store.c:357
#, c-format
msgid "Cannot login to POP server %s: SASL Protocol error"
msgstr "Не удалось зарегистрироваться на сервере POP %s: Ошибка протокола SASL"
-#: ../camel/providers/pop3/camel-pop3-store.c:479
+#: ../camel/providers/pop3/camel-pop3-store.c:374
#, c-format
-msgid "Failed to authenticate on POP server %s: %s"
-msgstr "Сбой идентификации на сервере POP %s: %s"
+#| 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:538
+#: ../camel/providers/pop3/camel-pop3-store.c:439
#, 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:579
+#: ../camel/providers/pop3/camel-pop3-store.c:492
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
"Не удалось подключиться к серверу POP%s.\n"
"Ошибка отправки пароля: %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:588
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:505
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
"Не удалось подключиться к серверу POP %s.\n"
"Ошибка отправки имени пользователя%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:597
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:518
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
"Не удалось подключиться к серверу POP%s.\n"
"Ошибка отправки пароля%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:703
+#: ../camel/providers/pop3/camel-pop3-store.c:558
+#, c-format
+#| msgid "IMAP server %s"
+msgid "POP3 server %s"
+msgstr "Сервер POP3 %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:562
+#, c-format
+#| msgid "IMAP service for %s on %s"
+msgid "POP3 server for %s on %s"
+msgstr "Сервис POP3 для %s на %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:693
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr "Не удалось подключиться к серверу POP %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:720
#, c-format
msgid "No such folder '%s'."
msgstr "Нет такой папки «%s»."
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/pop3/camel-pop3-store.c:737
+#, c-format
+msgid "POP3 stores have no folder hierarchy"
+msgstr "В хранилищах POP3 отсутствует иерархия папок"
+
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
msgid "Sendmail"
msgstr "Sendmail"
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:40
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-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."
+msgstr "Доставка почты с помощью программы «sendmail» на локальной системе."
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:49
+msgid "sendmail"
+msgstr "sendmail"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:51
+msgid "Mail delivery via the sendmail program"
+msgstr "Доставка почты через программу sendmail"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:113
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:86
+#, c-format
msgid "Could not parse recipient list"
-msgstr "Не удалось обработать список получателей"
+msgstr "Не удалось разобрать список получателей"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:144
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:119
#, c-format
msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "Не удалось создать канал к Sendmail: %s: почта не отправлена"
+msgstr "Не удалось создать канал к sendmail: %s: почта не отправлена"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:165
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:141
#, c-format
msgid "Could not fork sendmail: %s: mail not sent"
msgstr "Не удалось запустить Sendmail: %s: почта не отправлена"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:235
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
+#| msgid "Could not send message: %s"
+msgid "Could not send message: "
+msgstr "Не удалось отправить сообщение:"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
#, c-format
msgid "sendmail exited with signal %s: mail not sent."
msgstr "Sendmail завершил работу с сигналом %s: почта не отправлена."
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:242
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:217
#, c-format
msgid "Could not execute %s: mail not sent."
msgstr "Не удалось выполнить %s: почта не отправлена."
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:247
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
#, c-format
msgid "sendmail exited with status %d: mail not sent."
msgstr "Sendmail завершила работу с результатом %d: почта не отправлена."
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:261
-msgid "sendmail"
-msgstr "sendmail"
-
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
-msgid "Mail delivery via the sendmail program"
-msgstr "Доставка почты через программу sendmail"
-
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
msgid "SMTP"
msgstr "SMTP"
-#: ../camel/providers/smtp/camel-smtp-provider.c:43
+#: ../camel/providers/smtp/camel-smtp-provider.c:45
msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+msgstr "Для доставки почты путем подключения к удалённому почтовому концентратору по протоколу SMTP."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#| msgid "Welcome response error"
+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
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr "Не удалось подключиться к серверу SMTP %s в защищенном режиме: %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:246
+#: ../camel/providers/smtp/camel-smtp-transport.c:259
+#: ../camel/providers/smtp/camel-smtp-transport.c:266
+#| msgid "STARTTLS command failed: %s"
+msgid "STARTTLS command failed: "
+msgstr "Сбой команды STARTTLS: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:357
+#, c-format
+msgid "SMTP server %s"
+msgstr "SMTP сервер %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:361
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "Доставка SMTP почты через %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:408
+#, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
+msgstr "Сервер SMTP %s не поддерживает затребованный тип идентификации %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:495
+#, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
msgstr ""
-"Для доставки почты путем подключения к удалённому почтовому концентратору по "
-"протоколу SMTP."
+"Не удалось аутентифицироваться на сервере SMTP.\n"
+"%s\n"
+"\n"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:613
+#, c-format
+msgid "Cannot send message: service not connected."
+msgstr "Не удалось отправить сообщение: сервис не подключен."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:620
+#, c-format
+msgid "Cannot send message: sender address not valid."
+msgstr "Не удалось отправить сообщение: неверный адрес отправителя."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:624
+msgid "Sending message"
+msgstr "Отправка сообщения"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:649
+#, c-format
+msgid "Cannot send message: no recipients defined."
+msgstr "Не удалось отправить сообщение: не определены получатели."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:662
+#, c-format
+msgid "Cannot send message: one or more invalid recipients"
+msgstr "Не удалось отправить сообщение: указан один или несколько некорректных получателей"
-#: ../camel/providers/smtp/camel-smtp-transport.c:167
+#: ../camel/providers/smtp/camel-smtp-transport.c:725
msgid "Syntax error, command unrecognized"
msgstr "Синтаксическая ошибка, команда не распознана"
-#: ../camel/providers/smtp/camel-smtp-transport.c:169
+#: ../camel/providers/smtp/camel-smtp-transport.c:727
msgid "Syntax error in parameters or arguments"
msgstr "Синтаксическая ошибка в параметрах или аргументах"
-#: ../camel/providers/smtp/camel-smtp-transport.c:171
+#: ../camel/providers/smtp/camel-smtp-transport.c:729
msgid "Command not implemented"
msgstr "Команда не реализована"
-#: ../camel/providers/smtp/camel-smtp-transport.c:173
+#: ../camel/providers/smtp/camel-smtp-transport.c:731
msgid "Command parameter not implemented"
msgstr "Параметр команды не реализован"
-#: ../camel/providers/smtp/camel-smtp-transport.c:175
+#: ../camel/providers/smtp/camel-smtp-transport.c:733
msgid "System status, or system help reply"
msgstr "Состояние системы или ответ системной справки"
-#: ../camel/providers/smtp/camel-smtp-transport.c:177
+#: ../camel/providers/smtp/camel-smtp-transport.c:735
msgid "Help message"
msgstr "Справочное сообщение"
-#: ../camel/providers/smtp/camel-smtp-transport.c:179
+#: ../camel/providers/smtp/camel-smtp-transport.c:737
msgid "Service ready"
msgstr "Сервис готов"
-#: ../camel/providers/smtp/camel-smtp-transport.c:181
+#: ../camel/providers/smtp/camel-smtp-transport.c:739
msgid "Service closing transmission channel"
msgstr "Сервис закрывает канал передачи"
-#: ../camel/providers/smtp/camel-smtp-transport.c:183
+#: ../camel/providers/smtp/camel-smtp-transport.c:741
msgid "Service not available, closing transmission channel"
msgstr "Сервис не доступен, закрытие канала передачи"
-#: ../camel/providers/smtp/camel-smtp-transport.c:185
+#: ../camel/providers/smtp/camel-smtp-transport.c:743
msgid "Requested mail action okay, completed"
msgstr "Запрошенное почтовое действие выполнено"
-#: ../camel/providers/smtp/camel-smtp-transport.c:187
+#: ../camel/providers/smtp/camel-smtp-transport.c:745
msgid "User not local; will forward to <forward-path>"
-msgstr ""
-"Не локальный пользователь; будет отправлено в соответствии с <forward-path>"
+msgstr "Не локальный пользователь; будет отправлено в соответствии с <forward-path>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:189
+#: ../camel/providers/smtp/camel-smtp-transport.c:747
msgid "Requested mail action not taken: mailbox unavailable"
msgstr "Запрошенное действие с почтой не выполнено: почтовый ящик недоступен"
-#: ../camel/providers/smtp/camel-smtp-transport.c:191
+#: ../camel/providers/smtp/camel-smtp-transport.c:749
msgid "Requested action not taken: mailbox unavailable"
msgstr "Запрошенное действие не выполнено: почтовый ящик недоступен"
-#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:751
msgid "Requested action aborted: error in processing"
msgstr "Запрошенное действие прервано: ошибка при обработке"
-#: ../camel/providers/smtp/camel-smtp-transport.c:195
+#: ../camel/providers/smtp/camel-smtp-transport.c:753
msgid "User not local; please try <forward-path>"
msgstr "Пользователь не локальный; установите <forward-path>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:197
+#: ../camel/providers/smtp/camel-smtp-transport.c:755
msgid "Requested action not taken: insufficient system storage"
-msgstr ""
-"Запрошенное действие не выполнено: недостаточно места в системном хранилище"
+msgstr "Запрошенное действие не выполнено: недостаточно места в системном хранилище"
-#: ../camel/providers/smtp/camel-smtp-transport.c:199
+#: ../camel/providers/smtp/camel-smtp-transport.c:757
msgid "Requested mail action aborted: exceeded storage allocation"
msgstr "Запрошенное действие прервано: исчерпано место в хранилище"
-#: ../camel/providers/smtp/camel-smtp-transport.c:201
+#: ../camel/providers/smtp/camel-smtp-transport.c:759
msgid "Requested action not taken: mailbox name not allowed"
msgstr "Запрошенное действие прервано: имя почтового ящика недопустимо"
-#: ../camel/providers/smtp/camel-smtp-transport.c:203
+#: ../camel/providers/smtp/camel-smtp-transport.c:761
msgid "Start mail input; end with <CRLF>.<CRLF>"
msgstr "Начало ввода почты; окончание после <CRLF>.<CRLF>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:205
+#: ../camel/providers/smtp/camel-smtp-transport.c:763
msgid "Transaction failed"
msgstr "Сбой транзакции"
-#: ../camel/providers/smtp/camel-smtp-transport.c:209
+#: ../camel/providers/smtp/camel-smtp-transport.c:767
msgid "A password transition is needed"
msgstr "Необходима передача пароля"
-#: ../camel/providers/smtp/camel-smtp-transport.c:211
+#: ../camel/providers/smtp/camel-smtp-transport.c:769
msgid "Authentication mechanism is too weak"
msgstr "Слишком слабый механизм аутентификации"
-#: ../camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/smtp/camel-smtp-transport.c:771
msgid "Encryption required for requested authentication mechanism"
msgstr "Для запрошенного механизма аутентификации требуется шифрование"
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
+#: ../camel/providers/smtp/camel-smtp-transport.c:773
msgid "Temporary authentication failure"
msgstr "Временный сбой аутентификации"
-#: ../camel/providers/smtp/camel-smtp-transport.c:296
-msgid "Welcome response error"
-msgstr "Ошибка при ответе на приветствие"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:331
-#: ../camel/providers/smtp/camel-smtp-transport.c:364
-#: ../camel/providers/smtp/camel-smtp-transport.c:370
-#, c-format
-msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "Не удалось подключиться к серверу SMTP %s в защищенном режиме: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:340
-#, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "Сбой команды STARTTLS: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:355
-msgid "STARTTLS command failed"
-msgstr "Сбой команды STARTTLS"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:496
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "Сервер SMTP %s не поддерживает затребованный тип идентификации %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:567
-#, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"Не удалось аутентифицироваться на сервере SMTP.\n"
-"%s\n"
-"\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:700
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP сервер %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:702
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "Доставка SMTP почты через %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:720
-msgid "Cannot send message: service not connected."
-msgstr "Не удалось отправить сообщение: сервис не подключен."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:726
-msgid "Cannot send message: sender address not valid."
-msgstr "Не удалось отправить сообщение: неверный адрес отправителя."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:730
-msgid "Sending message"
-msgstr "Отправка сообщения"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
-msgid "Cannot send message: no recipients defined."
-msgstr "Не удалось отправить сообщение: не определены получатели."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:756
-msgid "Cannot send message: one or more invalid recipients"
-msgstr ""
-"Не удалось отправить сообщение: указан один или несколько некорректных "
-"получателей"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:985
+#: ../camel/providers/smtp/camel-smtp-transport.c:1030
msgid "SMTP Greeting"
msgstr "Приветствие SMTP"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1010
-#, c-format
-msgid "HELO command failed: %s"
-msgstr "Сбой команды HELO: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1027
-msgid "HELO command failed"
-msgstr "Сбой команды HELO"
+#: ../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"
+msgid "HELO command failed: "
+msgstr "Сбой команды HELO: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:1093
+#: ../camel/providers/smtp/camel-smtp-transport.c:1150
msgid "SMTP Authentication"
msgstr "Аутентификация SMTP"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1099
+#: ../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:1116
-#: ../camel/providers/smtp/camel-smtp-transport.c:1127
-#, c-format
-msgid "AUTH command failed: %s"
-msgstr "Сбой команды AUTH: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1133
-msgid "AUTH command failed"
-msgstr "Сбой команды AUTH"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1203
-msgid "Bad authentication response from server.\n"
-msgstr "Неверный ответ от сервера при аутентификации.\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1230
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "Сбой команды MAIL FROM: %s: почта не отправлена"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1247
-msgid "MAIL FROM command failed"
-msgstr "Сбой команды MAIL FROM"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1271
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "сбой команды RCPT TO: %s: почта не отправлена"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1290
-#, c-format
-msgid "RCPT TO <%s> failed"
-msgstr "RCPT TO <%s> не удалось"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1330
-#: ../camel/providers/smtp/camel-smtp-transport.c:1399
-#: ../camel/providers/smtp/camel-smtp-transport.c:1418
-#, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "Сбой команды DATA: %s: почта не отправлена"
-
-#. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1347
-#: ../camel/providers/smtp/camel-smtp-transport.c:1434
-msgid "DATA command failed"
-msgstr "Сбой команды DATA"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1457
-#, c-format
-msgid "RSET command failed: %s"
-msgstr "Сбой команды RSET: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1473
-msgid "RSET command failed"
-msgstr "Сбой команды RSET"
+#: ../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"
+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"
+msgid "MAIL FROM command failed: "
+msgstr "Сбой команды MAIL FROM: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1354
+#| msgid "RSET command failed: %s"
+msgid "RCPT TO command failed: "
+msgstr "Сбой команды RCPT TO: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1370
+#: ../camel/providers/smtp/camel-smtp-transport.c:1379
+#, 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"
+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"
+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"
+msgid "QUIT command failed: "
+msgstr "Сбой команды QUIT: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:1496
-#, c-format
-msgid "QUIT command failed: %s"
-msgstr "Сбой команды QUIT: %s"
+#: ../libedataserver/e-categories.c:47
+#| msgid "Anniversary"
+msgctxt "CategoryName"
+msgid "Anniversary"
+msgstr "Годовщина"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1510
-msgid "QUIT command failed"
-msgstr "Сбой команды QUIT"
+#: ../libedataserver/e-categories.c:48
+#| msgid "Birthday"
+msgctxt "CategoryName"
+msgid "Birthday"
+msgstr "День рождения"
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:49
+#| msgid "Business"
+msgctxt "CategoryName"
msgid "Business"
msgstr "Бизнес"
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:50
+#| msgid "Competition"
+msgctxt "CategoryName"
msgid "Competition"
msgstr "Конкуренция"
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:51
+#| msgid "Favorites"
+msgctxt "CategoryName"
msgid "Favorites"
-msgstr "Ð\9bÑ\8eбимое"
+msgstr "Ð\98збÑ\80аннÑ\8bе"
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:52
+#| msgid "Gifts"
+msgctxt "CategoryName"
msgid "Gifts"
msgstr "Подарки"
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:53
+#| msgid "Goals/Objectives"
+msgctxt "CategoryName"
msgid "Goals/Objectives"
-msgstr "Цели/задачи"
+msgstr "Цели и задачи"
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:54
+#| msgid "Holiday"
+msgctxt "CategoryName"
msgid "Holiday"
msgstr "Праздник (выходной)"
-#: ../libedataserver/e-categories.c:53
+#: ../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:55
+#: ../libedataserver/e-categories.c:57
+#| msgid "Hot Contacts"
+msgctxt "CategoryName"
msgid "Hot Contacts"
-msgstr "Ð\93оÑ\80Ñ\8fÑ\87ие контакты"
+msgstr "Ð\92ажнÑ\8bе контакты"
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:58
+#| msgid "Ideas"
+msgctxt "CategoryName"
msgid "Ideas"
msgstr "Идеи"
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:59
+#| msgid "International"
+msgctxt "CategoryName"
msgid "International"
msgstr "Международные"
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:60
+#| msgid "Key Customer"
+msgctxt "CategoryName"
msgid "Key Customer"
msgstr "Ключевой потребитель"
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:61
+#| msgid "Miscellaneous"
+msgctxt "CategoryName"
msgid "Miscellaneous"
msgstr "Разное"
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:62
+#| msgid "Personal"
+msgctxt "CategoryName"
msgid "Personal"
msgstr "Личное"
-#: ../libedataserver/e-categories.c:61
+#: ../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:63
+#: ../libedataserver/e-categories.c:65
+#| msgid "Status"
+msgctxt "CategoryName"
msgid "Status"
-msgstr "Статус"
+msgstr "Состояние"
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:66
+#| msgid "Strategies"
+msgctxt "CategoryName"
msgid "Strategies"
msgstr "Стратегии"
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:67
+#| msgid "Suppliers"
+msgctxt "CategoryName"
msgid "Suppliers"
msgstr "Поставщики"
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:68
+#| msgid "Time & Expenses"
+msgctxt "CategoryName"
msgid "Time & Expenses"
msgstr "Время и расходы"
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:69
+#| msgid "VIP"
+msgctxt "CategoryName"
msgid "VIP"
msgstr "VIP"
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:70
+#| msgid "Waiting"
+msgctxt "CategoryName"
msgid "Waiting"
msgstr "Ожидание"
#. in 12-hour format.
#. strftime format of a weekday, a date and a
#. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1633 ../libedataserver/e-time-utils.c:1898
+#: ../libedataserver/e-time-utils.c:1635
+#: ../libedataserver/e-time-utils.c:1902
msgid "%a %m/%d/%Y %I:%M:%S %p"
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:1638 ../libedataserver/e-time-utils.c:1889
+#: ../libedataserver/e-time-utils.c:1640
+#: ../libedataserver/e-time-utils.c:1893
msgid "%a %m/%d/%Y %H:%M:%S"
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:1643 ../libedataserver/e-time-utils.c:1894
+#: ../libedataserver/e-time-utils.c:1645
+#: ../libedataserver/e-time-utils.c:1898
msgid "%a %m/%d/%Y %I:%M %p"
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:1648 ../libedataserver/e-time-utils.c:1885
+#: ../libedataserver/e-time-utils.c:1650
+#: ../libedataserver/e-time-utils.c:1889
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:1653
+#: ../libedataserver/e-time-utils.c:1655
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:1658
+#: ../libedataserver/e-time-utils.c:1660
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:1661 ../libedataserver/e-time-utils.c:1761
-#: ../libedataserver/e-time-utils.c:1880
+#: ../libedataserver/e-time-utils.c:1663
+#: ../libedataserver/e-time-utils.c:1765
+#: ../libedataserver/e-time-utils.c:1884
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:1668
+#: ../libedataserver/e-time-utils.c:1670
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:1672
+#: ../libedataserver/e-time-utils.c:1674
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:1677
+#: ../libedataserver/e-time-utils.c:1679
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:1682
+#: ../libedataserver/e-time-utils.c:1684
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:1687
+#: ../libedataserver/e-time-utils.c:1689
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:1692
+#: ../libedataserver/e-time-utils.c:1694
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:1695 ../libedataserver/e-time-utils.c:1764
+#: ../libedataserver/e-time-utils.c:1697
+#: ../libedataserver/e-time-utils.c:1768
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:1822 ../libedataserver/e-time-utils.c:1942
+#: ../libedataserver/e-time-utils.c:1826
+#: ../libedataserver/e-time-utils.c:1946
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:1826 ../libedataserver/e-time-utils.c:1934
+#: ../libedataserver/e-time-utils.c:1830
+#: ../libedataserver/e-time-utils.c:1938
msgid "%H:%M:%S"
msgstr "%H:%M:%S"
#. in 12-hour format.
#. strftime format of a time in 12-hour format,
#. without seconds.
-#: ../libedataserver/e-time-utils.c:1831 ../libedataserver/e-time-utils.c:1939
+#: ../libedataserver/e-time-utils.c:1835
+#: ../libedataserver/e-time-utils.c:1943
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:1835 ../libedataserver/e-time-utils.c:1931
+#: ../libedataserver/e-time-utils.c:1839
+#: ../libedataserver/e-time-utils.c:1935
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:1838
+#: ../libedataserver/e-time-utils.c:1842
msgid "%H%M"
msgstr "%H%M"
#. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1842
+#: ../libedataserver/e-time-utils.c:1846
msgid "%I %p"
msgstr "%I %p"
-#: ../libedataserverui/e-book-auth-util.c:90
+#: ../libedataserverui/e-book-auth-util.c:93
+#: ../libedataserverui/e-book-auth-util.c:673
msgid "Accessing LDAP Server anonymously"
msgstr "Анонимный доступ к серверу LDAP"
-#: ../libedataserverui/e-book-auth-util.c:192
+#: ../libedataserverui/e-book-auth-util.c:199
+#: ../libedataserverui/e-book-auth-util.c:435
msgid "Failed to authenticate.\n"
msgstr "Ошибка авторизации.\n"
-#: ../libedataserverui/e-categories-dialog.c:145
+#: ../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:151
+#: ../libedataserverui/e-categories-dialog.c:195
msgid "_No Image"
msgstr "Нет _изображения"
-#: ../libedataserverui/e-categories-dialog.c:372
+#: ../libedataserverui/e-categories-dialog.c:406
#, c-format
-msgid ""
-"There is already a category '%s' in the configuration. Please use another "
-"name"
+msgid "There is already a category '%s' in the configuration. Please use another name"
msgstr "Категория с именем «%s» уже есть. Используйте другое имя"
-#: ../libedataserverui/e-categories-dialog.c:680
-msgid "Icon"
-msgstr "Значок"
-
-#: ../libedataserverui/e-categories-dialog.c:685
-msgid "Category"
-msgstr "Категория"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:1
-msgid "Category Properties"
-msgstr "Свойства категории"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:2
-msgid "Category _Icon"
-msgstr "_Значок категории"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:3
-msgid "Category _Name"
-msgstr "_Имя категории"
+#: ../libedataserverui/e-categories-dialog.c:661
+msgid "Currently _used categories:"
+msgstr "_Используемые категории:"
-#: ../libedataserverui/e-categories-dialog.ui.h:4
-msgid "Item(s) _belong to these categories:"
-msgstr "Элемент(ы) принадлежат следующим _категориям:"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:5
+#: ../libedataserverui/e-categories-dialog.c:668
msgid "_Available Categories:"
msgstr "_оступные категории:"
-#: ../libedataserverui/e-categories-dialog.ui.h:6
+#: ../libedataserverui/e-categories-dialog.c:711
msgid "_Edit"
msgstr "_Правка"
-#: ../libedataserverui/e-categories-dialog.ui.h:7
-msgid "categories"
-msgstr "категории"
+#: ../libedataserverui/e-categories-dialog.c:767
+msgid "Icon"
+msgstr "Значок"
+
+#: ../libedataserverui/e-categories-dialog.c:772
+msgid "Category"
+msgstr "Категория"
#: ../libedataserverui/e-category-completion.c:292
#, c-format
msgid "Create category \"%s\""
msgstr "Создать категорию «%s»"
-#: ../libedataserverui/e-cell-renderer-color.c:222
-msgid "Color Info"
-msgstr "Информация о цвете"
+#: ../libedataserverui/e-name-selector-dialog.c:169
+#| msgid "Hot Contacts"
+msgid "Show Contacts"
+msgstr "Показать контакты"
-#: ../libedataserverui/e-cell-renderer-color.c:223
-msgid "The color to render"
-msgstr "Цвет для отображения"
-
-#: ../libedataserverui/e-name-selector-dialog.c:292
-msgid "Select Contacts from Address Book"
-msgstr "Выбор контактов из адресной книги"
+#: ../libedataserverui/e-name-selector-dialog.c:191
+msgid "Address B_ook:"
+msgstr "Адресная к_нига:"
-#: ../libedataserverui/e-name-selector-dialog.c:587
-msgid "_Add"
-msgstr "_Добавить"
+#: ../libedataserverui/e-name-selector-dialog.c:199
+msgid "Cate_gory:"
+msgstr "К_атегория:"
-#: ../libedataserverui/e-name-selector-dialog.c:612
-msgid "_Remove"
-msgstr "_УдалиÑ\82Ñ\8c"
+#: ../libedataserverui/e-name-selector-dialog.c:217
+msgid "_Search:"
+msgstr "_Ð\98Ñ\81каÑ\82Ñ\8c:"
-#: ../libedataserverui/e-name-selector-dialog.c:789
-#: ../libedataserverui/e-name-selector-dialog.ui.h:6
+#: ../libedataserverui/e-name-selector-dialog.c:235
+#: ../libedataserverui/e-name-selector-dialog.c:970
msgid "Any Category"
msgstr "Любая категория"
-#: ../libedataserverui/e-name-selector-dialog.ui.h:1
-msgid "*"
-msgstr "*"
-
-#: ../libedataserverui/e-name-selector-dialog.ui.h:2
-msgid "<b>Co_ntacts</b>"
-msgstr "<b>_Контакты</b> "
+#: ../libedataserverui/e-name-selector-dialog.c:237
+#| msgid "Contacts"
+msgid "Co_ntacts"
+msgstr "Ко_нтакты"
-#: ../libedataserverui/e-name-selector-dialog.ui.h:3
-msgid "<b>Show Contacts</b>"
-msgstr "<b>Показать контакты</b>"
-
-#: ../libedataserverui/e-name-selector-dialog.ui.h:4
-msgid "Address B_ook:"
-msgstr "Адресная к_нига:"
+#: ../libedataserverui/e-name-selector-dialog.c:282
+msgid "Search"
+msgstr "Поиск"
-#: ../libedataserverui/e-name-selector-dialog.ui.h:5
+#: ../libedataserverui/e-name-selector-dialog.c:285
msgid "Address Book"
msgstr "Адресная книга"
-#: ../libedataserverui/e-name-selector-dialog.ui.h:7
-msgid "Cate_gory:"
-msgstr "К_атегория:"
-
-#: ../libedataserverui/e-name-selector-dialog.ui.h:8
+#: ../libedataserverui/e-name-selector-dialog.c:288
msgid "Contacts"
msgstr "Контакты"
-#: ../libedataserverui/e-name-selector-dialog.ui.h:9
-msgid "Search"
-msgstr "Ð\9fоиÑ\81к"
+#: ../libedataserverui/e-name-selector-dialog.c:405
+msgid "Select Contacts from Address Book"
+msgstr "Ð\92Ñ\8bбоÑ\80 конÑ\82акÑ\82ов из адÑ\80еÑ\81ной книги"
-#: ../libedataserverui/e-name-selector-dialog.ui.h:10
-msgid "_Search:"
-msgstr "_Искать:"
+#: ../libedataserverui/e-name-selector-dialog.c:740
+msgid "_Add"
+msgstr "_Добавить"
+
+#: ../libedataserverui/e-name-selector-dialog.c:744
+msgid "_Remove"
+msgstr "_Удалить"
+
+#: ../libedataserverui/e-name-selector-dialog.c:884
+#, 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:2508
+#: ../libedataserverui/e-name-selector-entry.c:2665
#, c-format
msgid "E_xpand %s Inline"
msgstr "_Развернуть %s"
#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2523
+#: ../libedataserverui/e-name-selector-entry.c:2680
#, c-format
msgid "Cop_y %s"
msgstr "К_опировать %s"
#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2533
+#: ../libedataserverui/e-name-selector-entry.c:2690
#, c-format
msgid "C_ut %s"
msgstr "В_ырезать %s"
#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2550
+#: ../libedataserverui/e-name-selector-entry.c:2707
#, c-format
msgid "_Edit %s"
msgstr "_Правка %s"
-#: ../libedataserverui/e-name-selector-list.c:469
+#: ../libedataserverui/e-name-selector-list.c:513
#, c-format
msgid "_Delete %s"
msgstr "_Удалить %s"
-#: ../libedataserverui/e-passwords.c:234
+#: ../libedataserverui/e-passwords.c:127
#, c-format
msgid "Keyring key is unusable: no user or host name"
msgstr "Ключ из брелока некорректен: отсутствует имя пользователя или узла"
-#: ../libedataserverui/e-passwords.c:1093
+#: ../libedataserverui/e-passwords.c:701
msgid "You have the Caps Lock key on."
msgstr "На клавиатуре включён Caps Lock."
-#: ../libedataserverui/e-passwords.c:1215
+#: ../libedataserverui/e-passwords.c:821
msgid "_Remember this passphrase"
msgstr "_Запомнить эту ключевую фразу"
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:822
msgid "_Remember this passphrase for the remainder of this session"
msgstr "_Запомнить этот пароль до окончания этого сеанса"
-#: ../libedataserverui/e-passwords.c:1221
+#: ../libedataserverui/e-passwords.c:827
msgid "_Remember this password"
msgstr "_Запомнить этот пароль"
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:828
msgid "_Remember this password for the remainder of this session"
-msgstr "_Запомнить этот пароль до конца сессии"
+msgstr "_Запомнить этот пароль до конца сеанса"
#. prepare the dialog
#: ../libedataserverui/e-source-selector-dialog.c:100
msgid "Select destination"
msgstr "Выберите назначение"
-#: ../libedataserverui/e-source-selector-dialog.c:156
+#: ../libedataserverui/e-source-selector-dialog.c:170
msgid "_Destination"
msgstr "_Назначение"
#: ../servers/groupwise/e-gw-connection.c:227
msgid "Invalid connection"
-msgstr "Ð\9dекоÑ\80Ñ\80екÑ\82ное соединение"
+msgstr "Ð\9dедопÑ\83Ñ\81Ñ\82имое соединение"
#: ../servers/groupwise/e-gw-connection.c:231
msgid "Invalid response from server"
-msgstr "Ð\9dевеÑ\80ный ответ от сервера"
+msgstr "Ð\9dедопÑ\83Ñ\81Ñ\82имый ответ от сервера"
#: ../servers/groupwise/e-gw-connection.c:233
msgid "No response from the server"
#: ../servers/groupwise/e-gw-connection.c:239
msgid "Bad parameter"
-msgstr "Плохой параметр"
+msgstr "Неверный параметр"
+
projects / platform / upstream / evolution-data-server.git / commitdiff