[evolution-data-server] Updated Russian translation
- From: Damned-Lies <translations src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Updated Russian translation
- Date: Thu, 3 Mar 2016 20:15:38 +0000 (UTC)
commit e7ab94d92ba88db05a80c4b594db102f79930516
Author: Stas Solovey <whats_up tut by>
Date: Thu Mar 3 20:15:31 2016 +0000
Updated Russian translation
po/ru.po | 1109 ++++++++++++++++++++++++++++++++++++--------------------------
1 files changed, 652 insertions(+), 457 deletions(-)
---
diff --git a/po/ru.po b/po/ru.po
index 848ced2..ad75f36 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,15 +8,15 @@
# Michael Yakhontov <mvy asplinux ru>, 2003.
# Yuri Kozlov <yuray komyakino ru>, 2010, 2011, 2012.
# Yuri Myasoedov <ymyasoedov yandex ru>, 2012, 2013, 2015.
-# Stas Solovey <whats_up tut by>, 2015.
+# Stas Solovey <whats_up tut by>, 2015, 2016.
#
msgid ""
msgstr ""
"Project-Id-Version: evolution-data-server trunk\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
"product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
-"POT-Creation-Date: 2015-09-17 16:50+0000\n"
-"PO-Revision-Date: 2015-09-18 00:12+0300\n"
+"POT-Creation-Date: 2016-03-03 18:14+0000\n"
+"PO-Revision-Date: 2016-03-03 21:37+0300\n"
"Last-Translator: Stas Solovey <whats_up tut by>\n"
"Language-Team: Русский <gnome-cyr gnome org>\n"
"Language: ru\n"
@@ -115,64 +115,64 @@ msgstr "Не удалось переименовать базу данных и
#: ../addressbook/libebook/e-book-client.c:3424
#: ../addressbook/libebook/e-book-client.c:3642
#: ../addressbook/libedata-book/e-book-backend-sexp.c:877
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:585
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:616
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:633
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:670
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:701
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:718
#: ../calendar/backends/contacts/e-cal-backend-contacts.c:274
#: ../calendar/libecal/e-cal.c:2336 ../calendar/libecal/e-cal-client.c:279
-#: ../calendar/libecal/e-cal-client.c:3492
-#: ../calendar/libecal/e-cal-client.c:3665
-#: ../calendar/libecal/e-cal-client.c:3929
-#: ../calendar/libecal/e-cal-client.c:4170
-#: ../calendar/libecal/e-cal-client.c:4360
-#: ../calendar/libecal/e-cal-client.c:4553
-#: ../calendar/libecal/e-cal-client.c:4762
-#: ../calendar/libecal/e-cal-client.c:4931
-#: ../calendar/libecal/e-cal-client.c:5134
-#: ../calendar/libecal/e-cal-client.c:5284
-#: ../calendar/libecal/e-cal-client.c:5478
-#: ../calendar/libecal/e-cal-client.c:5631
-#: ../calendar/libecal/e-cal-client.c:5848
-#: ../calendar/libecal/e-cal-client.c:6002
-#: ../calendar/libecal/e-cal-client.c:6228
-#: ../calendar/libecal/e-cal-client.c:6424
-#: ../calendar/libecal/e-cal-client.c:6787
-#: ../calendar/libecal/e-cal-client.c:7009
-#: ../camel/providers/imapx/camel-imapx-server.c:2940
-#: ../camel/providers/imapx/camel-imapx-server.c:2950
-#: ../camel/providers/imapx/camel-imapx-server.c:2962
+#: ../calendar/libecal/e-cal-client.c:3520
+#: ../calendar/libecal/e-cal-client.c:3693
+#: ../calendar/libecal/e-cal-client.c:3957
+#: ../calendar/libecal/e-cal-client.c:4198
+#: ../calendar/libecal/e-cal-client.c:4388
+#: ../calendar/libecal/e-cal-client.c:4581
+#: ../calendar/libecal/e-cal-client.c:4790
+#: ../calendar/libecal/e-cal-client.c:4959
+#: ../calendar/libecal/e-cal-client.c:5162
+#: ../calendar/libecal/e-cal-client.c:5312
+#: ../calendar/libecal/e-cal-client.c:5506
+#: ../calendar/libecal/e-cal-client.c:5659
+#: ../calendar/libecal/e-cal-client.c:5876
+#: ../calendar/libecal/e-cal-client.c:6030
+#: ../calendar/libecal/e-cal-client.c:6256
+#: ../calendar/libecal/e-cal-client.c:6452
+#: ../calendar/libecal/e-cal-client.c:6815
+#: ../calendar/libecal/e-cal-client.c:7037
+#: ../camel/providers/imapx/camel-imapx-server.c:2979
+#: ../camel/providers/imapx/camel-imapx-server.c:2989
+#: ../camel/providers/imapx/camel-imapx-server.c:3001
#: ../libebackend/e-server-side-source.c:497 ../libedataserver/e-client.c:190
msgid "Unknown error"
msgstr "Неизвестная ошибка"
#. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:814
+#: ../addressbook/backends/google/e-book-backend-google.c:781
msgid "Querying for updated contacts…"
msgstr "Запрос обновлённых контактов…"
#. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:998
+#: ../addressbook/backends/google/e-book-backend-google.c:965
msgid "Querying for updated groups…"
msgstr "Запрос обновлённых групп…"
-#: ../addressbook/backends/google/e-book-backend-google.c:1792
+#: ../addressbook/backends/google/e-book-backend-google.c:1748
#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4999
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1482
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1503
msgid "The backend does not support bulk additions"
msgstr "Драйвер не поддерживает общие добавления"
-#: ../addressbook/backends/google/e-book-backend-google.c:1949
+#: ../addressbook/backends/google/e-book-backend-google.c:1905
#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5135
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1604
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1625
msgid "The backend does not support bulk modifications"
msgstr "Драйвер не поддерживает общие изменения"
-#: ../addressbook/backends/google/e-book-backend-google.c:2158
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1704
+#: ../addressbook/backends/google/e-book-backend-google.c:2114
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1725
msgid "The backend does not support bulk removals"
msgstr "Драйвер не поддерживает общие удаления"
-#: ../addressbook/backends/google/e-book-backend-google.c:2280
+#: ../addressbook/backends/google/e-book-backend-google.c:2236
msgid "Loading…"
msgstr "Загрузка…"
@@ -300,24 +300,24 @@ msgstr "Загрузка контактов (%d%%)"
msgid "Cannot transform SoupURI to string"
msgstr "Не удалось преобразовать SoupURI в строку"
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1533
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1554
#, c-format
msgid "Create resource '%s' failed with HTTP status %d (%s)"
msgstr ""
"При создании ресурса «%s» произошёл сбой с кодом состояния HTTP: %d (%s)"
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1635
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1656
msgid "Contact on server changed -> not modifying"
msgstr "Контакт на сервере изменён -> нет изменения"
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1643
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1664
#, c-format
msgid "Modify contact failed with HTTP status %d (%s)"
msgstr ""
"При изменении контакта произошла ошибка с кодом состояния HTTP: %d (%s)"
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1736
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1752
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1757
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1773
#, c-format
msgid "DELETE failed with HTTP status %d"
msgstr "Ошибка метода DELETE с кодом HTTP %d"
@@ -822,7 +822,6 @@ msgid "X.509 Certificate"
msgstr "Сертификат X.509"
#: ../addressbook/libebook-contacts/e-contact.c:297
-#| msgid "Certificate"
msgid "PGP Certificate"
msgstr "Сертификат PGP"
@@ -980,7 +979,7 @@ msgstr "Невозможно изменить значение свойства
msgid "Unable to connect to '%s': "
msgstr "Не удалось подключиться к «%s»: "
-#: ../addressbook/libebook/e-book-client-view.c:868
+#: ../addressbook/libebook/e-book-client-view.c:870
#: ../calendar/libecal/e-cal-client-view.c:681
#, c-format
msgid "Client disappeared"
@@ -998,7 +997,7 @@ msgid "Error parsing regular expression"
msgstr "Ошибка разбора регулярного выражения"
#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1560
-#: ../addressbook/libedata-book/e-book-sqlite.c:1852 ../camel/camel-db.c:721
+#: ../addressbook/libedata-book/e-book-sqlite.c:1852 ../camel/camel-db.c:751
#, c-format
msgid "Insufficient memory"
msgstr "Недостаточно памяти"
@@ -1332,36 +1331,37 @@ msgstr "Ревизия рассинхронизировалась во врем
msgid "Alphabetic index was set for incorrect locale"
msgstr "Алфавитный индекс был установлен для неверной локали"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:583
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:668
#, c-format
msgid "Server is unreachable (%s)"
msgstr "Сервер недоступен (%s)"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:614
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:699
#, c-format
-msgid "Failed to connect to a server using SSL: %s"
-msgstr "Сбой при подключении к серверу с использованием SSL: %s"
+#| msgid "Failed to connect to a server using SSL: %s"
+msgid "Failed to connect to a server using SSL/TLS: %s"
+msgstr "Сбой при подключении к серверу с использованием SSL/TLS: %s"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:630
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:715
#, c-format
msgid "Unexpected HTTP status code %d returned (%s) for URI: %s"
msgstr "Получен неожиданный код (%d) состояния HTTP (%s) для URI: %s"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:651
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:736
msgid "CalDAV backend is not loaded yet"
msgstr "Драйвер CalDAV ещё не загружен"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1100
-#: ../libedataserver/e-webdav-discover.c:146
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1173
+#: ../libedataserver/e-webdav-discover.c:147
msgid "Invalid Redirect URL"
msgstr "Неверный перенаправляющий URL"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2926
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3030
#, c-format
msgid "Cannot create local cache folder '%s'"
msgstr "Не удалось создать локальную кэш-папку «%s»"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3006
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3113
#, c-format
msgid ""
"Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1370,27 +1370,27 @@ msgstr ""
"Сервер недоступен, календарь открыт в режиме «только чтение».\n"
"Сообщение об ошибке: %s"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4087
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4208
msgid "CalDAV does not support bulk additions"
msgstr "CalDAV не поддерживает пакетные добавления"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4190
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4311
msgid "CalDAV does not support bulk modifications"
msgstr "CalDAV не поддерживает пакетные изменения"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4471
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4592
msgid "CalDAV does not support bulk removals"
msgstr "CalDAV не поддерживает пакетные удаления"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5153
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5274
msgid "Calendar doesn't support Free/Busy"
msgstr "Календарь не поддерживает информацию о занятости"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5162
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5283
msgid "Schedule outbox url not found"
msgstr "Не найден url исходящего расписания"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5259
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5380
msgid "Unexpected result in schedule-response"
msgstr "Неожиданный результат в ответе-расписании"
@@ -1433,75 +1433,75 @@ msgid "Not a calendar."
msgstr "Не является календарём."
#: ../calendar/backends/http/e-cal-backend-http.c:954
-#: ../calendar/backends/weather/e-cal-backend-weather.c:699
+#: ../calendar/backends/weather/e-cal-backend-weather.c:709
msgid "Could not create cache file"
msgstr "Не удалось создать файл кэша"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:193
+#: ../calendar/backends/weather/e-cal-backend-weather.c:195
msgid "Could not retrieve weather data"
msgstr "Не удалось получить информацию о погоде"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:368
+#: ../calendar/backends/weather/e-cal-backend-weather.c:378
msgid "Weather: Fog"
msgstr "Погода: Туман"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:369
+#: ../calendar/backends/weather/e-cal-backend-weather.c:379
msgid "Weather: Cloudy Night"
msgstr "Погода: Облачная ночь"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:370
+#: ../calendar/backends/weather/e-cal-backend-weather.c:380
msgid "Weather: Cloudy"
msgstr "Погода: Облачно"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:371
+#: ../calendar/backends/weather/e-cal-backend-weather.c:381
msgid "Weather: Overcast"
msgstr "Погода: Пасмурно"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:372
+#: ../calendar/backends/weather/e-cal-backend-weather.c:382
msgid "Weather: Showers"
msgstr "Погода: Дожди"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:373
+#: ../calendar/backends/weather/e-cal-backend-weather.c:383
msgid "Weather: Snow"
msgstr "Погода: Снег"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:374
+#: ../calendar/backends/weather/e-cal-backend-weather.c:384
msgid "Weather: Clear Night"
msgstr "Погода: Ясная ночь"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:375
+#: ../calendar/backends/weather/e-cal-backend-weather.c:385
msgid "Weather: Sunny"
msgstr "Погода: Солнечно"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:376
+#: ../calendar/backends/weather/e-cal-backend-weather.c:386
msgid "Weather: Thunderstorms"
msgstr "Погода: Грозы"
#. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN)
-#: ../calendar/backends/weather/e-cal-backend-weather.c:402
+#: ../calendar/backends/weather/e-cal-backend-weather.c:412
#, c-format
msgid "%.1f °F"
msgstr "%.1f °F"
#. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN)
-#: ../calendar/backends/weather/e-cal-backend-weather.c:405
+#: ../calendar/backends/weather/e-cal-backend-weather.c:415
#, c-format
msgid "%.1f °C"
msgstr "%.1f °C"
#. TRANSLATOR: This is the temperature in kelvin
-#: ../calendar/backends/weather/e-cal-backend-weather.c:408
+#: ../calendar/backends/weather/e-cal-backend-weather.c:418
#, c-format
msgid "%.1f K"
msgstr "%.1f K"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:414
+#: ../calendar/backends/weather/e-cal-backend-weather.c:424
#, c-format
msgid "%.1f"
msgstr "%.1f"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:579
-#: ../calendar/backends/weather/e-cal-backend-weather.c:607
+#: ../calendar/backends/weather/e-cal-backend-weather.c:589
+#: ../calendar/backends/weather/e-cal-backend-weather.c:617
msgid "Forecast"
msgstr "Прогноз"
@@ -1557,7 +1557,7 @@ msgid "Authentication failed"
msgstr "Сбой проверки подлинности"
#: ../calendar/libecal/e-cal.c:2332
-#: ../camel/providers/smtp/camel-smtp-transport.c:1078
+#: ../camel/providers/smtp/camel-smtp-transport.c:1127
#: ../libedataserver/e-client.c:152
msgid "Authentication required"
msgstr "Требуется аутентификация"
@@ -1590,131 +1590,131 @@ msgstr "Неизвестное свойство календаря «%s»"
msgid "Cannot change value of calendar property '%s'"
msgstr "Невозможно изменить значение свойства календаря «%s»"
-#: ../calendar/libecal/e-cal-component.c:1349
+#: ../calendar/libecal/e-cal-component.c:1357
msgid "Untitled appointment"
msgstr "Неозаглавленная встреча"
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:4744
msgid "1st"
msgstr "1-ое"
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:4745
msgid "2nd"
msgstr "2-ое"
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:4746
msgid "3rd"
msgstr "3-е"
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:4747
msgid "4th"
msgstr "4-ое"
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:4748
msgid "5th"
msgstr "5-ое"
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:4749
msgid "6th"
msgstr "6-ое"
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:4750
msgid "7th"
msgstr "7-ое"
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:4751
msgid "8th"
msgstr "8-ое"
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:4752
msgid "9th"
msgstr "9-ое"
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:4753
msgid "10th"
msgstr "10-ое"
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:4754
msgid "11th"
msgstr "11-ое"
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:4755
msgid "12th"
msgstr "12-ое"
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:4756
msgid "13th"
msgstr "13-ое"
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:4757
msgid "14th"
msgstr "14-ое"
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:4758
msgid "15th"
msgstr "15-ое"
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:4759
msgid "16th"
msgstr "16-ое"
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:4760
msgid "17th"
msgstr "17-ое"
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:4761
msgid "18th"
msgstr "18-ое"
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:4762
msgid "19th"
msgstr "19-ое"
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:4763
msgid "20th"
msgstr "20-ое"
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:4764
msgid "21st"
msgstr "21-ое"
-#: ../calendar/libecal/e-cal-recur.c:4067
+#: ../calendar/libecal/e-cal-recur.c:4765
msgid "22nd"
msgstr "22-ое"
-#: ../calendar/libecal/e-cal-recur.c:4068
+#: ../calendar/libecal/e-cal-recur.c:4766
msgid "23rd"
msgstr "23-е"
-#: ../calendar/libecal/e-cal-recur.c:4069
+#: ../calendar/libecal/e-cal-recur.c:4767
msgid "24th"
msgstr "24-ое"
-#: ../calendar/libecal/e-cal-recur.c:4070
+#: ../calendar/libecal/e-cal-recur.c:4768
msgid "25th"
msgstr "25-ое"
-#: ../calendar/libecal/e-cal-recur.c:4071
+#: ../calendar/libecal/e-cal-recur.c:4769
msgid "26th"
msgstr "26-ое"
-#: ../calendar/libecal/e-cal-recur.c:4072
+#: ../calendar/libecal/e-cal-recur.c:4770
msgid "27th"
msgstr "27-ое"
-#: ../calendar/libecal/e-cal-recur.c:4073
+#: ../calendar/libecal/e-cal-recur.c:4771
msgid "28th"
msgstr "28-ое"
-#: ../calendar/libecal/e-cal-recur.c:4074
+#: ../calendar/libecal/e-cal-recur.c:4772
msgid "29th"
msgstr "29-ое"
-#: ../calendar/libecal/e-cal-recur.c:4075
+#: ../calendar/libecal/e-cal-recur.c:4773
msgid "30th"
msgstr "30-ое"
-#: ../calendar/libecal/e-cal-recur.c:4076
+#: ../calendar/libecal/e-cal-recur.c:4774
msgid "31st"
msgstr "31-ое"
@@ -1929,35 +1929,35 @@ msgstr "Невозможно получить часовой пояс кален
msgid "Could not add calendar time zone: "
msgstr "Невозможно добавить часовой пояс календаря: "
-#: ../camel/camel-cipher-context.c:199
+#: ../camel/camel-cipher-context.c:204
#, c-format
msgid "Signing is not supported by this cipher"
msgstr "Подпись не поддерживается этим шифром"
-#: ../camel/camel-cipher-context.c:212
+#: ../camel/camel-cipher-context.c:217
#, c-format
msgid "Verifying is not supported by this cipher"
msgstr "Проверка не поддерживается этим шифром"
-#: ../camel/camel-cipher-context.c:228
+#: ../camel/camel-cipher-context.c:233
#, c-format
msgid "Encryption is not supported by this cipher"
msgstr "Шифрование не поддерживается этим шифром"
-#: ../camel/camel-cipher-context.c:242
+#: ../camel/camel-cipher-context.c:247
#, c-format
msgid "Decryption is not supported by this cipher"
msgstr "Расшифровка не поддерживается этим шифром"
-#: ../camel/camel-cipher-context.c:358
+#: ../camel/camel-cipher-context.c:363
msgid "Signing message"
msgstr "Сообщение подписывается"
-#: ../camel/camel-cipher-context.c:648
+#: ../camel/camel-cipher-context.c:653
msgid "Encrypting message"
msgstr "Сообщение шифруется"
-#: ../camel/camel-cipher-context.c:820
+#: ../camel/camel-cipher-context.c:825
msgid "Decrypting message"
msgstr "Сообщение расшифровывается"
@@ -1966,88 +1966,93 @@ msgstr "Сообщение расшифровывается"
msgid "Unable to create cache path"
msgstr "Не удалось создать путь для кэша"
-#: ../camel/camel-data-cache.c:449
+#: ../camel/camel-data-cache.c:457
msgid "Empty cache file"
msgstr "Кэш-файл пуст"
-#: ../camel/camel-data-cache.c:522
+#: ../camel/camel-data-cache.c:534
#, c-format
msgid "Could not remove cache entry: %s: %s"
msgstr "Не удалось удалить кэшированный элемент: %s: %s"
-#: ../camel/camel-filter-driver.c:914 ../camel/camel-filter-search.c:798
+#: ../camel/camel-db.c:810 ../camel/providers/local/camel-mbox-store.c:906
+#, c-format
+msgid "Could not rename '%s' to %s: %s"
+msgstr "Не удалось переименовать «%s» в %s: %s"
+
+#: ../camel/camel-filter-driver.c:934 ../camel/camel-filter-search.c:798
#, c-format
msgid "Failed to create child process '%s': %s"
msgstr "Сбой при создании дочернего процесса «%s»: %s"
-#: ../camel/camel-filter-driver.c:962
+#: ../camel/camel-filter-driver.c:982
#, c-format
msgid "Invalid message stream received from %s: %s"
msgstr "Неверный поток сообщений получен из %s: %s"
-#: ../camel/camel-filter-driver.c:1169 ../camel/camel-filter-driver.c:1178
+#: ../camel/camel-filter-driver.c:1189 ../camel/camel-filter-driver.c:1198
msgid "Syncing folders"
msgstr "Синхронизация папок"
-#: ../camel/camel-filter-driver.c:1276
+#: ../camel/camel-filter-driver.c:1296
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "Не удалось разобрать фильтр: %s: %s"
-#: ../camel/camel-filter-driver.c:1287
+#: ../camel/camel-filter-driver.c:1307
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "Ошибка выполнения фильтра: %s: %s"
-#: ../camel/camel-filter-driver.c:1383
+#: ../camel/camel-filter-driver.c:1403
#, c-format
msgid "Unable to open spool folder"
msgstr "Не удалось открыть папку спула"
-#: ../camel/camel-filter-driver.c:1395
+#: ../camel/camel-filter-driver.c:1415
#, c-format
msgid "Unable to process spool folder"
msgstr "Не удалось обработать папку спула"
-#: ../camel/camel-filter-driver.c:1418
+#: ../camel/camel-filter-driver.c:1438
#, c-format
msgid "Getting message %d (%d%%)"
msgstr "Получение сообщения %d (%d%%)"
-#: ../camel/camel-filter-driver.c:1427 ../camel/camel-filter-driver.c:1449
+#: ../camel/camel-filter-driver.c:1447 ../camel/camel-filter-driver.c:1469
#, c-format
msgid "Failed on message %d"
msgstr "Сбой на сообщении %d"
-#: ../camel/camel-filter-driver.c:1468 ../camel/camel-filter-driver.c:1582
+#: ../camel/camel-filter-driver.c:1488 ../camel/camel-filter-driver.c:1602
msgid "Syncing folder"
msgstr "Синхронизация папки"
-#: ../camel/camel-filter-driver.c:1473 ../camel/camel-filter-driver.c:1590
+#: ../camel/camel-filter-driver.c:1493 ../camel/camel-filter-driver.c:1610
msgid "Complete"
msgstr "Завершена"
-#: ../camel/camel-filter-driver.c:1536
+#: ../camel/camel-filter-driver.c:1556
#, c-format
msgid "Getting message %d of %d"
msgstr "Получение сообщения %d из %d"
-#: ../camel/camel-filter-driver.c:1554
+#: ../camel/camel-filter-driver.c:1574
#, c-format
msgid "Failed at message %d of %d"
msgstr "Сбой на сообщении %d из %d"
-#: ../camel/camel-filter-driver.c:1749 ../camel/camel-filter-driver.c:1776
+#: ../camel/camel-filter-driver.c:1769 ../camel/camel-filter-driver.c:1796
#, c-format
msgid "Execution of filter '%s' failed: "
msgstr "Ошибка выполнения фильтра «%s»: "
-#: ../camel/camel-filter-driver.c:1766
+#: ../camel/camel-filter-driver.c:1786
#, c-format
msgid "Error parsing filter '%s': %s: %s"
msgstr "Ошибка разбора фильтра «%s»: %s; %s"
-#: ../camel/camel-filter-driver.c:1785
+#: ../camel/camel-filter-driver.c:1805
#, c-format
msgid "Error executing filter '%s': %s: %s"
msgstr "Ошибка выполнения фильтра «%s»: %s; %s"
@@ -2073,7 +2078,7 @@ msgstr "Недопустимые аргументы для (message-location)"
msgid "Error executing filter search: %s: %s"
msgstr "Ошибка выполнения поиска фильтра: %s: %s"
-#: ../camel/camel-folder.c:321
+#: ../camel/camel-folder.c:326
#, c-format
msgid "Learning new spam message in '%s'"
msgid_plural "Learning new spam messages in '%s'"
@@ -2081,7 +2086,7 @@ msgstr[0] "Изучение нового спам-сообщения в «%s»"
msgstr[1] "Изучение новых спам-сообщений в «%s»"
msgstr[2] "Изучение новых спам-сообщений в «%s»"
-#: ../camel/camel-folder.c:361
+#: ../camel/camel-folder.c:366
#, c-format
msgid "Learning new ham message in '%s'"
msgid_plural "Learning new ham messages in '%s'"
@@ -2089,7 +2094,7 @@ msgstr[0] "Изучение нового сообщения в «%s»"
msgstr[1] "Изучение новых сообщений в «%s»"
msgstr[2] "Изучение новых сообщений в «%s»"
-#: ../camel/camel-folder.c:409
+#: ../camel/camel-folder.c:414
#, c-format
msgid "Filtering new message in '%s'"
msgid_plural "Filtering new messages in '%s'"
@@ -2097,41 +2102,41 @@ msgstr[0] "Фильтрация нового сообщения в «%s»"
msgstr[1] "Фильтрация новых сообщений в «%s»"
msgstr[2] "Фильтрация новых сообщений в «%s»"
-#: ../camel/camel-folder.c:1015
+#: ../camel/camel-folder.c:1020
#: ../camel/providers/local/camel-maildir-folder.c:330
msgid "Moving messages"
msgstr "Перемещение сообщений"
-#: ../camel/camel-folder.c:1018
+#: ../camel/camel-folder.c:1023
msgid "Copying messages"
msgstr "Копирование сообщений"
-#: ../camel/camel-folder.c:1060
+#: ../camel/camel-folder.c:1065
#, c-format
msgid "Quota information not supported for folder '%s'"
msgstr "Информация о квоте не поддерживается для папки «%s»"
-#: ../camel/camel-folder.c:1152
+#: ../camel/camel-folder.c:1160
#, c-format
msgid "Filtering folder '%s'"
msgstr "Фильтрация папки «%s»"
-#: ../camel/camel-folder.c:2878
+#: ../camel/camel-folder.c:2896
#, c-format
msgid "Expunging folder '%s'"
msgstr "Уничтожение папки «%s»"
-#: ../camel/camel-folder.c:3009
+#: ../camel/camel-folder.c:3027
#, c-format
msgid "Retrieving message '%s' in %s"
msgstr "Получение сообщения «%s» в %s"
-#: ../camel/camel-folder.c:3200
+#: ../camel/camel-folder.c:3218
#, c-format
msgid "Retrieving quota information for '%s'"
msgstr "Получение информации о квоте для «%s»"
-#: ../camel/camel-folder.c:3497
+#: ../camel/camel-folder.c:3515
#, c-format
msgid "Refreshing folder '%s'"
msgstr "Обновление папки «%s»"
@@ -2166,7 +2171,7 @@ msgstr "(%s) ожидает результат в виде массива"
msgid "(%s) requires the folder set"
msgstr "(%s) требует набор папок"
-#: ../camel/camel-folder-search.c:1962 ../camel/camel-folder-search.c:2131
+#: ../camel/camel-folder-search.c:1963 ../camel/camel-folder-search.c:2132
#, c-format
msgid ""
"Cannot parse search expression: %s:\n"
@@ -2175,7 +2180,7 @@ msgstr ""
"Ошибка в регулярном выражении «%s»:\n"
"%s"
-#: ../camel/camel-folder-search.c:1974 ../camel/camel-folder-search.c:2143
+#: ../camel/camel-folder-search.c:1975 ../camel/camel-folder-search.c:2144
#, c-format
msgid ""
"Error executing search expression: %s:\n"
@@ -2184,28 +2189,28 @@ msgstr ""
"Ошибка при выполнении выражения поиска «%s»:\n"
"%s"
-#: ../camel/camel-folder-summary.c:2139
+#: ../camel/camel-folder-summary.c:2156
#, c-format
msgid "Release unused memory for folder '%s'"
msgstr "Освобождение неиспользуемой памяти для папки «%s»"
-#: ../camel/camel-folder-summary.c:2351
+#: ../camel/camel-folder-summary.c:2368
#, c-format
msgid "Update preview data for folder '%s'"
msgstr "Обновление данных для предварительного просмотра папки «%s»"
-#: ../camel/camel-gpg-context.c:728 ../camel/camel-gpg-context.c:733
-#: ../camel/camel-gpg-context.c:1400
+#: ../camel/camel-gpg-context.c:770 ../camel/camel-gpg-context.c:775
+#: ../camel/camel-gpg-context.c:1442
#, c-format
msgid "Failed to execute gpg: %s"
msgstr "Сбой при исполнении gpg: %s"
-#: ../camel/camel-gpg-context.c:733
-#: ../camel/providers/smtp/camel-smtp-transport.c:1081
+#: ../camel/camel-gpg-context.c:775
+#: ../camel/providers/smtp/camel-smtp-transport.c:1130
msgid "Unknown"
msgstr "Неизвестно"
-#: ../camel/camel-gpg-context.c:798
+#: ../camel/camel-gpg-context.c:840
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -2216,24 +2221,24 @@ msgstr ""
"\n"
"%s"
-#: ../camel/camel-gpg-context.c:834
+#: ../camel/camel-gpg-context.c:876
#, c-format
msgid "Failed to parse gpg userid hint."
msgstr "Ошибка при обработке подсказки gpg userid."
-#: ../camel/camel-gpg-context.c:859 ../camel/camel-gpg-context.c:874
+#: ../camel/camel-gpg-context.c:901 ../camel/camel-gpg-context.c:916
#, c-format
msgid "Failed to parse gpg passphrase request."
msgstr "Ошибка при обработке запроса парольной фразы gpg."
-#: ../camel/camel-gpg-context.c:895
+#: ../camel/camel-gpg-context.c:937
#, c-format
msgid ""
"You need a PIN to unlock the key for your\n"
"SmartCard: \"%s\""
msgstr "Для разблокирования смарткарты необходимо ввести PIN: «%s»"
-#: ../camel/camel-gpg-context.c:899
+#: ../camel/camel-gpg-context.c:941
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
@@ -2242,12 +2247,12 @@ msgstr ""
"Введите ключевую фразу, чтобы разблокировать\n"
"ключ пользователя: «%s»"
-#: ../camel/camel-gpg-context.c:905
+#: ../camel/camel-gpg-context.c:947
#, c-format
msgid "Unexpected request from GnuPG for '%s'"
msgstr "Неожиданный запрос от GnuPG для «%s»"
-#: ../camel/camel-gpg-context.c:917
+#: ../camel/camel-gpg-context.c:959
msgid ""
"Note the encrypted content doesn't contain information about a recipient, "
"thus there will be a password prompt for each of stored private key."
@@ -2255,78 +2260,77 @@ msgstr ""
"Зашифрованные данные не содержат сведений о получателе. Для каждого "
"закрытого ключа будет предложено ввести пароль."
-#: ../camel/camel-gpg-context.c:948 ../camel/camel-net-utils.c:524
+#: ../camel/camel-gpg-context.c:990 ../camel/camel-net-utils.c:524
#: ../camel/providers/nntp/camel-nntp-summary.c:401
#: ../libedataserver/e-client.c:163
#, c-format
msgid "Cancelled"
msgstr "Отменено"
-#: ../camel/camel-gpg-context.c:969
+#: ../camel/camel-gpg-context.c:1011
#, c-format
msgid "Failed to unlock secret key: 3 bad passphrases given."
msgstr ""
"Сбой при разблокировании секретного ключа: указано 3 некорректных парольных "
"фразы."
-#: ../camel/camel-gpg-context.c:982
+#: ../camel/camel-gpg-context.c:1024
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "Неожиданный ответ от GnuPG: %s"
-#: ../camel/camel-gpg-context.c:1120
+#: ../camel/camel-gpg-context.c:1162
#, c-format
msgid "Failed to encrypt: No valid recipients specified."
msgstr ""
"Не удалось зашифровать это сообщение: Не определены корректные получатели"
-#: ../camel/camel-gpg-context.c:1675 ../camel/camel-smime-context.c:843
+#: ../camel/camel-gpg-context.c:1761 ../camel/camel-smime-context.c:843
msgid "Could not generate signing data: "
msgstr "Не удалось создать данные подписи: "
-#: ../camel/camel-gpg-context.c:1725 ../camel/camel-gpg-context.c:1937
-#: ../camel/camel-gpg-context.c:2047 ../camel/camel-gpg-context.c:2198
+#: ../camel/camel-gpg-context.c:1812 ../camel/camel-gpg-context.c:2047
+#: ../camel/camel-gpg-context.c:2163 ../camel/camel-gpg-context.c:2338
msgid "Failed to execute gpg."
msgstr "Сбой при исполнении gpg."
-#: ../camel/camel-gpg-context.c:1808 ../camel/camel-gpg-context.c:1816
-#: ../camel/camel-gpg-context.c:1824 ../camel/camel-gpg-context.c:1844
+#: ../camel/camel-gpg-context.c:1918 ../camel/camel-gpg-context.c:1926
+#: ../camel/camel-gpg-context.c:1934 ../camel/camel-gpg-context.c:1954
#: ../camel/camel-smime-context.c:972 ../camel/camel-smime-context.c:986
#: ../camel/camel-smime-context.c:995
#, c-format
msgid "Cannot verify message signature: Incorrect message format"
msgstr "Не удалось проверить подпись сообщения: Неверный формат сообщения"
-#: ../camel/camel-gpg-context.c:1890
+#: ../camel/camel-gpg-context.c:2000
msgid "Cannot verify message signature: "
msgstr "Не удалось проверить подпись сообщения: "
-#: ../camel/camel-gpg-context.c:2013
+#: ../camel/camel-gpg-context.c:2128
msgid "Could not generate encrypting data: "
msgstr "Не удалось создать данные шифрования: "
-#: ../camel/camel-gpg-context.c:2066
+#: ../camel/camel-gpg-context.c:2203
msgid "This is a digitally encrypted message part"
msgstr "Это зашифрованная часть сообщения"
-#: ../camel/camel-gpg-context.c:2122 ../camel/camel-gpg-context.c:2131
-#: ../camel/camel-gpg-context.c:2154
+#: ../camel/camel-gpg-context.c:2262 ../camel/camel-gpg-context.c:2271
+#: ../camel/camel-gpg-context.c:2294
#, c-format
msgid "Cannot decrypt message: Incorrect message format"
msgstr "Не удалось декодировать сообщение: Неверный формат сообщения"
-#: ../camel/camel-gpg-context.c:2142
+#: ../camel/camel-gpg-context.c:2282
#, c-format
msgid "Failed to decrypt MIME part: protocol error"
msgstr "Сбой при декодировании части MIME: ошибка протокола"
-#: ../camel/camel-gpg-context.c:2208
+#: ../camel/camel-gpg-context.c:2348
#, c-format
-#| msgid "Failed to decrypt MIME part: protocol error"
msgid "Failed to decrypt MIME part: Secret key not found"
msgstr "Сбой при декодировании части MIME: секретный ключ не найден"
-#: ../camel/camel-gpg-context.c:2244 ../camel/camel-smime-context.c:1288
+#: ../camel/camel-gpg-context.c:2384 ../camel/camel-smime-context.c:1288
msgid "Encrypted content"
msgstr "Зашифрованное содержимое"
@@ -2443,21 +2447,21 @@ msgstr "Подпись недоступна"
msgid "parse error"
msgstr "Ошибка обработки"
-#: ../camel/camel-net-utils.c:706
+#: ../camel/camel-net-utils.c:708
#, c-format
msgid "Resolving: %s"
msgstr "Поиск узла: %s"
-#: ../camel/camel-net-utils.c:731
+#: ../camel/camel-net-utils.c:733
msgid "Host lookup failed"
msgstr "Узел не найден"
-#: ../camel/camel-net-utils.c:737
+#: ../camel/camel-net-utils.c:739
#, c-format
msgid "Host lookup '%s' failed. Check your host name for spelling errors."
msgstr "Узел «%s» не найден. Проверьте правильность имени узла."
-#: ../camel/camel-net-utils.c:741
+#: ../camel/camel-net-utils.c:743
#, c-format
msgid "Host lookup '%s' failed: %s"
msgstr "Узел «%s» не найден: %s"
@@ -2469,23 +2473,22 @@ msgstr "Загрузка новых сообщений в «%s» для авто
#: ../camel/camel-offline-folder.c:160
#, c-format
-#| msgid "Syncing messages in folder '%s' to disk"
msgid "Storing changes in folder '%s'"
msgstr "Сохранение изменений в папке «%s»"
-#: ../camel/camel-offline-folder.c:259
+#: ../camel/camel-offline-folder.c:262
#, c-format
msgid "Checking download of new messages for offline in '%s'"
msgstr ""
"Проверка на необходимость загрузки новых сообщений в «%s» для автономной "
"работы"
-#: ../camel/camel-offline-folder.c:372
+#: ../camel/camel-offline-folder.c:375
#, c-format
msgid "Syncing messages in folder '%s' to disk"
msgstr "Синхронизация сообщений в папке «%s» на диск"
-#: ../camel/camel-offline-folder.c:435
+#: ../camel/camel-offline-folder.c:438
msgid "Copy folder content locally for _offline operation"
msgstr ""
"Скопировать содержимое папки на локальную машину для _автономной работы"
@@ -2690,7 +2693,7 @@ msgstr "Срок действия упомянутых удостоверени
#: ../camel/camel-sasl-gssapi.c:222 ../camel/camel-sasl-gssapi.c:404
#: ../camel/camel-sasl-gssapi.c:453 ../camel/camel-sasl-gssapi.c:470
-#: ../camel/providers/smtp/camel-smtp-transport.c:749
+#: ../camel/providers/smtp/camel-smtp-transport.c:798
#, c-format
msgid "Bad authentication response from server."
msgstr "Неверный ответ от сервера при идентификации."
@@ -2739,16 +2742,16 @@ msgstr "POP до SMTP"
msgid "This option will authorise a POP connection before attempting SMTP"
msgstr "Будет производиться авторизация POP до попытки передачи почты по SMTP"
-#: ../camel/camel-sasl-popb4smtp.c:81
+#: ../camel/camel-sasl-popb4smtp.c:83
msgid "POP Source UID"
msgstr "Идентификатор источника POP"
-#: ../camel/camel-sasl-popb4smtp.c:95
+#: ../camel/camel-sasl-popb4smtp.c:97
#, c-format
msgid "POP Before SMTP authentication using an unknown transport"
msgstr "Аутентификация POP до SMTP, используя неизвестный транспорт"
-#: ../camel/camel-sasl-popb4smtp.c:107 ../camel/camel-sasl-popb4smtp.c:116
+#: ../camel/camel-sasl-popb4smtp.c:109 ../camel/camel-sasl-popb4smtp.c:118
#, c-format
msgid "POP Before SMTP authentication attempted with a %s service"
msgstr "Аутентификация POP до SMTP посредством службы %s"
@@ -2764,10 +2767,10 @@ msgid "Invalid GType registered for protocol '%s'"
msgstr "Некорректный зарегистрированный GType для протокола «%s»"
#: ../camel/camel-session.c:499
-#: ../camel/providers/imapx/camel-imapx-server.c:2892
+#: ../camel/providers/imapx/camel-imapx-server.c:2928
#: ../camel/providers/pop3/camel-pop3-store.c:308
#: ../camel/providers/pop3/camel-pop3-store.c:786
-#: ../camel/providers/smtp/camel-smtp-transport.c:627
+#: ../camel/providers/smtp/camel-smtp-transport.c:672
#, c-format
msgid "No support for %s authentication"
msgstr "Аутентификация %s не поддерживается"
@@ -2972,43 +2975,43 @@ msgstr "Не удалось добавить данные к кодировщи
msgid "S/MIME Decrypt: No encrypted content found"
msgstr "S/MIME Decrypt: Не найдено зашифрованного содержимого"
-#: ../camel/camel-store.c:1248
+#: ../camel/camel-store.c:1280
#, c-format
msgid "Opening folder '%s'"
msgstr "Открытие папки «%s»"
-#: ../camel/camel-store.c:1539
+#: ../camel/camel-store.c:1571
#, c-format
msgid "Scanning folders in '%s'"
msgstr "Сканирование папок на «%s»"
-#: ../camel/camel-store.c:1567 ../camel/camel-store.c:1612
+#: ../camel/camel-store.c:1599 ../camel/camel-store.c:1644
#: ../camel/camel-vtrash-folder.c:45
msgid "Trash"
msgstr "Корзина"
-#: ../camel/camel-store.c:1581 ../camel/camel-store.c:1629
+#: ../camel/camel-store.c:1613 ../camel/camel-store.c:1661
#: ../camel/camel-vtrash-folder.c:47
msgid "Junk"
msgstr "Спам"
-#: ../camel/camel-store.c:2230
+#: ../camel/camel-store.c:2262
#, c-format
msgid "Cannot create folder: %s: folder exists"
msgstr "Не удалось создать папку: %s: папка существует"
-#: ../camel/camel-store.c:2237
+#: ../camel/camel-store.c:2269
#, c-format
msgid "Creating folder '%s'"
msgstr "Создание папки «%s»"
-#: ../camel/camel-store.c:2414 ../camel/camel-vee-store.c:410
+#: ../camel/camel-store.c:2446 ../camel/camel-vee-store.c:410
#: ../camel/providers/local/camel-maildir-store.c:346
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "Не удалось удалить папку: %s: недопустимая операция"
-#: ../camel/camel-store.c:2604 ../camel/camel-vee-store.c:461
+#: ../camel/camel-store.c:2636 ../camel/camel-vee-store.c:461
#: ../camel/providers/local/camel-maildir-store.c:914
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
@@ -3032,6 +3035,7 @@ msgid "Only reset to beginning is supported with CamelHttpStream"
msgstr "Для CamelHttpStream поддерживается только переход к началу"
#: ../camel/camel-stream-process.c:278
+#: ../camel/providers/smtp/camel-smtp-transport.c:719
#, c-format
msgid "Connection cancelled"
msgstr "Соединение отменено"
@@ -3076,7 +3080,7 @@ msgstr "Нет сообщения %s в %s"
msgid "Error storing '%s': "
msgstr "Ошибка при хранении «%s»: "
-#: ../camel/camel-vee-folder.c:1191
+#: ../camel/camel-vee-folder.c:1193
msgid "Automatically _update on change in source folders"
msgstr "Автоматически _обновлять при изменении папок-источников"
@@ -3100,7 +3104,7 @@ msgstr "Не удалось переименовать папку: %s: нет т
msgid "Enable _Unmatched folder"
msgstr "Включить папку «_Прочее»"
-#: ../camel/camel-vee-store.c:1025
+#: ../camel/camel-vee-store.c:1030
msgid "Updating Unmatched search folder"
msgstr "Обновление папки поиска «Прочее»"
@@ -3112,37 +3116,42 @@ msgstr "Не удалось переместить сообщения в кор
msgid "Cannot copy messages to the Junk folder"
msgstr "Не удалось переместить сообщения в папку «Спам»"
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:769
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:953
#, c-format
msgid "You must be working online to complete this operation (%s)"
msgstr "Для завершения данной операции необходимо подключение к сети (%s)"
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:777
-#: ../camel/providers/nntp/camel-nntp-store.c:1256
-#: ../camel/providers/pop3/camel-pop3-folder.c:448
-#: ../camel/providers/pop3/camel-pop3-folder.c:620
-#: ../camel/providers/pop3/camel-pop3-folder.c:822
-#: ../camel/providers/pop3/camel-pop3-folder.c:1032
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:961
+#: ../camel/providers/imapx/camel-imapx-server.c:3060
+#: ../camel/providers/nntp/camel-nntp-store.c:349
+#: ../camel/providers/nntp/camel-nntp-store.c:1291
+#: ../camel/providers/nntp/camel-nntp-store.c:2099
+#: ../camel/providers/nntp/camel-nntp-store.c:2243
+#: ../camel/providers/pop3/camel-pop3-folder.c:449
+#: ../camel/providers/pop3/camel-pop3-folder.c:632
+#: ../camel/providers/pop3/camel-pop3-folder.c:834
+#: ../camel/providers/pop3/camel-pop3-folder.c:1044
#: ../camel/providers/pop3/camel-pop3-store.c:296
#: ../camel/providers/pop3/camel-pop3-store.c:529
#: ../camel/providers/pop3/camel-pop3-store.c:577
#: ../camel/providers/pop3/camel-pop3-store.c:672
#: ../camel/providers/pop3/camel-pop3-store.c:1103
+#: ../camel/providers/smtp/camel-smtp-transport.c:543
#, c-format
msgid "You must be working online to complete this operation"
msgstr "Для завершения данной операции необходимо подключение к сети"
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1270
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1358
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1533
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1621
#, c-format
msgid "No destination folder specified"
msgstr "Не указана целевая папка"
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1297
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1560
msgid "Unable to move junk messages"
msgstr "Не удалось переместить сообщения, содержащие спам"
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1392
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1655
msgid "Unable to move deleted messages"
msgstr "Не удалось переместить удалённые сообщения"
@@ -3264,8 +3273,9 @@ msgid "Default IMAP port"
msgstr "Порт по умолчанию для IMAP"
#: ../camel/providers/imapx/camel-imapx-provider.c:81
-msgid "IMAP over SSL"
-msgstr "IMAP поверх SSL"
+#| msgid "IMAP over SSL"
+msgid "IMAP over TLS"
+msgstr "IMAP поверх TLS"
#: ../camel/providers/imapx/camel-imapx-provider.c:88
msgid "IMAP+"
@@ -3275,212 +3285,197 @@ msgstr "IMAP+"
msgid "For reading and storing mail on IMAP servers."
msgstr "Для чтения и хранения почты на серверах IMAP."
-#: ../camel/providers/imapx/camel-imapx-server.c:1116
+#: ../camel/providers/imapx/camel-imapx-server.c:1134
msgid "Error writing to cache stream"
msgstr "Ошибка записи в поток кэша"
-#: ../camel/providers/imapx/camel-imapx-server.c:2730
-#: ../camel/providers/imapx/camel-imapx-server.c:2804
-#: ../camel/providers/imapx/camel-imapx-server.c:3039
-#| msgid "Failed to store mail in temp file %s: %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:2745
+#: ../camel/providers/imapx/camel-imapx-server.c:2832
+#: ../camel/providers/imapx/camel-imapx-server.c:3093
msgid "Failed to get capabilities"
msgstr "Не удалось получить возможности"
-#: ../camel/providers/imapx/camel-imapx-server.c:2744
+#: ../camel/providers/imapx/camel-imapx-server.c:2764
#, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr "Не удалось подключиться к IMAP-серверу %s в защищённом режиме:%s"
-#: ../camel/providers/imapx/camel-imapx-server.c:2745
-#: ../camel/providers/smtp/camel-smtp-transport.c:271
+#: ../camel/providers/imapx/camel-imapx-server.c:2765
+#: ../camel/providers/smtp/camel-smtp-transport.c:281
msgid "STARTTLS not supported"
msgstr "STARTTLS не поддерживается"
-#: ../camel/providers/imapx/camel-imapx-server.c:2751
+#: ../camel/providers/imapx/camel-imapx-server.c:2773
msgid "Failed to issue STARTTLS"
msgstr "Не удалось оформить STARTTLS"
-#: ../camel/providers/imapx/camel-imapx-server.c:2795
+#: ../camel/providers/imapx/camel-imapx-server.c:2821
#, c-format
msgid "Failed to connect to IMAP server %s in secure mode: "
msgstr "Не удалось подключиться к IMAP-серверу %s в защищённом режиме: "
-#: ../camel/providers/imapx/camel-imapx-server.c:2881
+#: ../camel/providers/imapx/camel-imapx-server.c:2915
#, c-format
msgid "IMAP server %s does not support %s authentication"
msgstr "Сервер IMAP %s не поддерживает аутентификацию %s"
-#: ../camel/providers/imapx/camel-imapx-server.c:2910
-#: ../camel/providers/nntp/camel-nntp-store.c:393
-#: ../camel/providers/nntp/camel-nntp-store.c:535
+#: ../camel/providers/imapx/camel-imapx-server.c:2946
+#: ../camel/providers/nntp/camel-nntp-store.c:400
+#: ../camel/providers/nntp/camel-nntp-store.c:542
msgid "Cannot authenticate without a username"
msgstr "Невозможно выполнить проверку подлинности без имени пользователя"
-#: ../camel/providers/imapx/camel-imapx-server.c:2919
-#: ../camel/providers/nntp/camel-nntp-store.c:544
+#: ../camel/providers/imapx/camel-imapx-server.c:2955
+#: ../camel/providers/nntp/camel-nntp-store.c:551
#: ../camel/providers/pop3/camel-pop3-store.c:690
#: ../camel/providers/pop3/camel-pop3-store.c:728
msgid "Authentication password not available"
msgstr "Пароль аутентификации недоступен"
-#: ../camel/providers/imapx/camel-imapx-server.c:2927
-#| msgid "Not authenticated"
+#: ../camel/providers/imapx/camel-imapx-server.c:2963
msgid "Failed to authenticate"
msgstr "Не удалось выполнить аутентификацию"
-#: ../camel/providers/imapx/camel-imapx-server.c:3056
+#: ../camel/providers/imapx/camel-imapx-server.c:3115
msgid "Failed to issue NAMESPACE"
msgstr "Не удалось оформить NAMESPACE"
-#: ../camel/providers/imapx/camel-imapx-server.c:3070
-#| msgid "Failed to encode data"
+#: ../camel/providers/imapx/camel-imapx-server.c:3133
msgid "Failed to enable QResync"
msgstr "Не удалось включить QResync"
-#: ../camel/providers/imapx/camel-imapx-server.c:3098
-#| msgid "Failed on message %d"
+#: ../camel/providers/imapx/camel-imapx-server.c:3165
msgid "Failed to issue NOTIFY"
msgstr "Не удалось оформить NOTIFY"
-#: ../camel/providers/imapx/camel-imapx-server.c:3576
-#| msgid "Failed to execute gpg."
+#: ../camel/providers/imapx/camel-imapx-server.c:3624
msgid "Failed to select mailbox"
msgstr "Не удалось выбрать почтовый ящик"
-#: ../camel/providers/imapx/camel-imapx-server.c:3674
-#| msgid "Source stream unavailable"
+#: ../camel/providers/imapx/camel-imapx-server.c:3722
msgid "Cannot issue command, no stream available"
msgstr "Невозможно оформить команду, нет доступного потока"
-#: ../camel/providers/imapx/camel-imapx-server.c:3925
+#: ../camel/providers/imapx/camel-imapx-server.c:3985
#, c-format
msgid "Cannot get message with message ID %s: %s"
msgstr "Не удалось получить сообщение с идентификатором %s: %s"
-#: ../camel/providers/imapx/camel-imapx-server.c:3926
+#: ../camel/providers/imapx/camel-imapx-server.c:3986
msgid "No such message available."
msgstr "Нет такого сообщения."
-#: ../camel/providers/imapx/camel-imapx-server.c:3960
-#: ../camel/providers/imapx/camel-imapx-server.c:3985
-#: ../camel/providers/imapx/camel-imapx-server.c:4004
+#: ../camel/providers/imapx/camel-imapx-server.c:4022
+#: ../camel/providers/imapx/camel-imapx-server.c:4047
+#: ../camel/providers/imapx/camel-imapx-server.c:4066
msgid "Error fetching message"
msgstr "Ошибка при получении сообщения"
-#: ../camel/providers/imapx/camel-imapx-server.c:3997
+#: ../camel/providers/imapx/camel-imapx-server.c:4059
msgid "Failed to close the tmp stream"
msgstr "Сбой при закрытии временного потока"
-#: ../camel/providers/imapx/camel-imapx-server.c:4028
+#: ../camel/providers/imapx/camel-imapx-server.c:4090
msgid "Failed to copy the tmp file"
msgstr "Сбой при копировании временного файла"
-#: ../camel/providers/imapx/camel-imapx-server.c:4187
+#: ../camel/providers/imapx/camel-imapx-server.c:4253
msgid "Error moving messages"
msgstr "Ошибка при перемещении сообщений"
-#: ../camel/providers/imapx/camel-imapx-server.c:4187
+#: ../camel/providers/imapx/camel-imapx-server.c:4253
msgid "Error copying messages"
msgstr "Ошибка при копировании сообщений"
-#: ../camel/providers/imapx/camel-imapx-server.c:4367
-#: ../camel/providers/imapx/camel-imapx-server.c:4388
+#: ../camel/providers/imapx/camel-imapx-server.c:4437
+#: ../camel/providers/imapx/camel-imapx-server.c:4458
msgid "Cannot create spool file: "
msgstr "Не удалось создать файл спула: "
-#: ../camel/providers/imapx/camel-imapx-server.c:4479
+#: ../camel/providers/imapx/camel-imapx-server.c:4549
msgid "Error appending message"
msgstr "Ошибка при присоединении сообщения"
-#: ../camel/providers/imapx/camel-imapx-server.c:4569
+#: ../camel/providers/imapx/camel-imapx-server.c:4639
msgid "Error performing NOOP"
msgstr "Ошибка выполнения команды NOOP"
-#: ../camel/providers/imapx/camel-imapx-server.c:4717
+#: ../camel/providers/imapx/camel-imapx-server.c:4787
#, c-format
msgid "Scanning for changed messages in '%s'"
msgstr "Поиск изменённых сообщений в «%s»"
-#: ../camel/providers/imapx/camel-imapx-server.c:4720
-#| msgid "Error syncing changes"
+#: ../camel/providers/imapx/camel-imapx-server.c:4790
msgid "Error scanning changes"
msgstr "Ошибка при сканировании изменений"
-#: ../camel/providers/imapx/camel-imapx-server.c:4738
+#: ../camel/providers/imapx/camel-imapx-server.c:4808
#, c-format
msgid "Fetching summary information for new messages in '%s'"
msgstr "Получение краткой информации о новых сообщениях «%s»"
-#: ../camel/providers/imapx/camel-imapx-server.c:4755
-#| msgid "Error fetching message"
+#: ../camel/providers/imapx/camel-imapx-server.c:4825
msgid "Error fetching message info"
msgstr "Ошибка при получении информацию сообщения"
-#: ../camel/providers/imapx/camel-imapx-server.c:4817
+#: ../camel/providers/imapx/camel-imapx-server.c:4887
msgid "Error running STATUS"
msgstr "Ошибка выполнения STATUS"
-#: ../camel/providers/imapx/camel-imapx-server.c:5300
-#: ../camel/providers/imapx/camel-imapx-server.c:5352
+#: ../camel/providers/imapx/camel-imapx-server.c:5370
+#: ../camel/providers/imapx/camel-imapx-server.c:5422
msgid "Error syncing changes"
msgstr "Ошибка при синхронизации изменений"
-#: ../camel/providers/imapx/camel-imapx-server.c:5463
+#: ../camel/providers/imapx/camel-imapx-server.c:5533
msgid "Error expunging message"
msgstr "Ошибка уничтожения сообщений"
-#: ../camel/providers/imapx/camel-imapx-server.c:5533
+#: ../camel/providers/imapx/camel-imapx-server.c:5603
msgid "Error fetching folders"
msgstr "Ошибка при получении папок"
-#: ../camel/providers/imapx/camel-imapx-server.c:5544
-#| msgid "Error fetching folders"
+#: ../camel/providers/imapx/camel-imapx-server.c:5614
msgid "Error fetching subscribed folders"
msgstr "Ошибка при получении подписных папок"
-#: ../camel/providers/imapx/camel-imapx-server.c:5566
+#: ../camel/providers/imapx/camel-imapx-server.c:5636
msgid "Error creating folder"
msgstr "Ошибка при создании папки"
-#: ../camel/providers/imapx/camel-imapx-server.c:5622
+#: ../camel/providers/imapx/camel-imapx-server.c:5692
msgid "Error deleting folder"
msgstr "Ошибка при удалении папки"
-#: ../camel/providers/imapx/camel-imapx-server.c:5668
+#: ../camel/providers/imapx/camel-imapx-server.c:5738
msgid "Error renaming folder"
msgstr "Ошибка при переименовании папки"
-#: ../camel/providers/imapx/camel-imapx-server.c:5700
+#: ../camel/providers/imapx/camel-imapx-server.c:5770
msgid "Error subscribing to folder"
msgstr "Ошибка подписывания на папку"
-#: ../camel/providers/imapx/camel-imapx-server.c:5736
+#: ../camel/providers/imapx/camel-imapx-server.c:5806
msgid "Error unsubscribing from folder"
msgstr "Ошибка отписывания от папки"
-#: ../camel/providers/imapx/camel-imapx-server.c:5772
+#: ../camel/providers/imapx/camel-imapx-server.c:5846
msgid "IMAP server does not support quotas"
msgstr "Сервер IMAP не поддерживает квоты"
-#: ../camel/providers/imapx/camel-imapx-server.c:5782
+#: ../camel/providers/imapx/camel-imapx-server.c:5858
msgid "Error retrieving quota information"
msgstr "Ошибка получения информации о квоте"
-#: ../camel/providers/imapx/camel-imapx-server.c:5829
+#: ../camel/providers/imapx/camel-imapx-server.c:5905
msgid "Search failed"
msgstr "Ошибка поиска"
#. Blocks, until the DONE is issued or on inactivity timeout, error, ...
-#: ../camel/providers/imapx/camel-imapx-server.c:5940
-#| msgid "Error performing IDLE"
+#: ../camel/providers/imapx/camel-imapx-server.c:6023
msgid "Error running IDLE"
msgstr "Ошибка выполнения IDLE"
-#: ../camel/providers/imapx/camel-imapx-server.c:6132
-#| msgid "Failed on message %d"
-msgid "Failed to issue DONE"
-msgstr "Не удалось оформить DONE"
-
#. create a dummy "." parent inbox, use to scan, then put back at the top level
#: ../camel/providers/imapx/camel-imapx-store.c:224
#: ../camel/providers/local/camel-maildir-folder.c:482
@@ -3523,23 +3518,113 @@ msgstr ""
msgid "No such folder %s"
msgstr "Нет папки с именем %s"
-#: ../camel/providers/imapx/camel-imapx-store.c:1353
+#: ../camel/providers/imapx/camel-imapx-store.c:1381
#, c-format
msgid "No IMAP namespace for folder path '%s'"
msgstr "Нет пространства имён IMAP для папки с путём «%s»"
-#: ../camel/providers/imapx/camel-imapx-store.c:1614
-#: ../camel/providers/imapx/camel-imapx-store.c:1847
+#: ../camel/providers/imapx/camel-imapx-store.c:1642
+#: ../camel/providers/imapx/camel-imapx-store.c:1876
#, c-format
msgid "Retrieving folder list for '%s'"
msgstr "Получение списка папок для «%s»"
-#: ../camel/providers/imapx/camel-imapx-store.c:2063
+#: ../camel/providers/imapx/camel-imapx-store.c:2093
#, c-format
msgid ""
"The folder name \"%s\" is invalid because it contains the character \"%c\""
msgstr "Недопустимое имя папки «%s»: имя содержит символ «%c»"
+#: ../camel/providers/imapx/camel-imapx-store.c:2444
+msgctxt "IMAPDefaults"
+msgid "[Gmail]/Drafts"
+msgstr "[Gmail]/Черновики"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2445
+msgctxt "IMAPDefaults"
+msgid "Drafts"
+msgstr "Черновики"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2446
+msgctxt "IMAPDefaults"
+msgid "Draft"
+msgstr "Черновик"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2449
+msgctxt "IMAPDefaults"
+msgid "Templates"
+msgstr "Шаблоны"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2452
+msgctxt "IMAPDefaults"
+msgid "Archive"
+msgstr "Архив"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2455
+msgctxt "IMAPDefaults"
+msgid "[Gmail]/Sent Mail"
+msgstr "[Gmail]/Отправленные"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2456
+msgctxt "IMAPDefaults"
+msgid "Sent"
+msgstr "Отправленные"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2457
+msgctxt "IMAPDefaults"
+msgid "Sent Items"
+msgstr "Отправленные объекты"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2460
+msgctxt "IMAPDefaults"
+msgid "[Gmail]/Spam"
+msgstr "[Gmail]/Спам"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2461
+#| msgid "Junk"
+msgctxt "IMAPDefaults"
+msgid "Junk"
+msgstr "Спам"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2462
+#| msgid "Email"
+msgctxt "IMAPDefaults"
+msgid "Junk E-mail"
+msgstr "Нежелательная почта"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2463
+#| msgid "Email"
+msgctxt "IMAPDefaults"
+msgid "Junk Email"
+msgstr "Нежелательная почта"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2464
+msgctxt "IMAPDefaults"
+msgid "Spam"
+msgstr "Спам"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2465
+#| msgid "Mail"
+msgctxt "IMAPDefaults"
+msgid "Bulk Mail"
+msgstr "Массовые рассылки"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2468
+msgctxt "IMAPDefaults"
+msgid "[Gmail]/Trash"
+msgstr "[Gmail]/Корзина"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2469
+#| msgid "Trash"
+msgctxt "IMAPDefaults"
+msgid "Trash"
+msgstr "Корзина"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2470
+msgctxt "IMAPDefaults"
+msgid "Deleted Items"
+msgstr "Удаленные объекты"
+
#: ../camel/providers/local/camel-local-folder.c:194
#, c-format
msgid "~%s (%s)"
@@ -3768,21 +3853,21 @@ msgstr "не является почтовым каталогом"
msgid "Could not scan folder '%s': %s"
msgstr "Не удалось просканировать папку «%s»: %s"
-#: ../camel/providers/local/camel-maildir-summary.c:465
-#: ../camel/providers/local/camel-maildir-summary.c:605
+#: ../camel/providers/local/camel-maildir-summary.c:476
+#: ../camel/providers/local/camel-maildir-summary.c:616
#, c-format
msgid "Cannot open maildir directory path: %s: %s"
msgstr "Не удалось открыть путь к папке почтового каталога: %s: %s"
-#: ../camel/providers/local/camel-maildir-summary.c:596
+#: ../camel/providers/local/camel-maildir-summary.c:607
msgid "Checking folder consistency"
msgstr "Проверка содержания каталогов"
-#: ../camel/providers/local/camel-maildir-summary.c:696
+#: ../camel/providers/local/camel-maildir-summary.c:707
msgid "Checking for new messages"
msgstr "Проверка новых сообщений"
-#: ../camel/providers/local/camel-maildir-summary.c:799
+#: ../camel/providers/local/camel-maildir-summary.c:810
#: ../camel/providers/local/camel-mbox-summary.c:466
#: ../camel/providers/local/camel-mbox-summary.c:687
#: ../camel/providers/local/camel-mbox-summary.c:836
@@ -3872,11 +3957,6 @@ msgstr "Имя новой папки недопустимо."
msgid "Could not rename '%s': '%s': %s"
msgstr "Не удалось переименовать «%s»: «%s»: %s"
-#: ../camel/providers/local/camel-mbox-store.c:906
-#, c-format
-msgid "Could not rename '%s' to %s: %s"
-msgstr "Не удалось переименовать «%s» в %s: %s"
-
#: ../camel/providers/local/camel-mbox-summary.c:476
#, c-format
msgid "Could not open folder: %s: %s"
@@ -4078,19 +4158,19 @@ msgstr "Внутренняя ошибка: UID в неверном формат
#: ../camel/providers/nntp/camel-nntp-folder.c:297
#: ../camel/providers/nntp/camel-nntp-folder.c:302
-#: ../camel/providers/pop3/camel-pop3-folder.c:572
-#: ../camel/providers/pop3/camel-pop3-folder.c:990
+#: ../camel/providers/pop3/camel-pop3-folder.c:574
+#: ../camel/providers/pop3/camel-pop3-folder.c:1002
#, c-format
msgid "Cannot get message %s: %s"
msgstr "Не удалось получить сообщение %s: %s"
#: ../camel/providers/nntp/camel-nntp-folder.c:309
#: ../camel/providers/nntp/camel-nntp-folder.c:629
-#: ../camel/providers/pop3/camel-pop3-folder.c:477
-#: ../camel/providers/pop3/camel-pop3-folder.c:508
-#: ../camel/providers/pop3/camel-pop3-folder.c:540
-#: ../camel/providers/pop3/camel-pop3-folder.c:562
-#: ../camel/providers/pop3/camel-pop3-folder.c:581
+#: ../camel/providers/pop3/camel-pop3-folder.c:478
+#: ../camel/providers/pop3/camel-pop3-folder.c:510
+#: ../camel/providers/pop3/camel-pop3-folder.c:542
+#: ../camel/providers/pop3/camel-pop3-folder.c:564
+#: ../camel/providers/pop3/camel-pop3-folder.c:583
#, c-format
msgid "Cannot get message %s: "
msgstr "Не удалось получить сообщение %s: "
@@ -4131,8 +4211,9 @@ msgid "Default NNTP port"
msgstr "Порт по умолчанию для NNTP"
#: ../camel/providers/nntp/camel-nntp-provider.c:55
-msgid "NNTP over SSL"
-msgstr "NNTP поверх SSL"
+#| msgid "NNTP over SSL"
+msgid "NNTP over TLS"
+msgstr "NNTP поверх TLS"
#: ../camel/providers/nntp/camel-nntp-provider.c:61
msgid "USENET news"
@@ -4157,22 +4238,22 @@ msgstr ""
"Подключение к серверу NNTP будет производиться с использованием "
"незашифрованного пароля."
-#: ../camel/providers/nntp/camel-nntp-store.c:370
+#: ../camel/providers/nntp/camel-nntp-store.c:377
#, c-format
msgid "Could not read greeting from %s: "
msgstr "Не удалось прочитать приветствие из %s: "
-#: ../camel/providers/nntp/camel-nntp-store.c:378
+#: ../camel/providers/nntp/camel-nntp-store.c:385
#, c-format
msgid "NNTP server %s returned error code %d: %s"
msgstr "Сервер NNTP %s вернул код ошибки %d: %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:448
+#: ../camel/providers/nntp/camel-nntp-store.c:455
#, c-format
msgid "USENET News via %s"
msgstr "Новости USENET через %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1157
+#: ../camel/providers/nntp/camel-nntp-store.c:1192
#, c-format
msgid ""
"Error retrieving newsgroups:\n"
@@ -4183,26 +4264,26 @@ msgstr ""
"\n"
" %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1273
+#: ../camel/providers/nntp/camel-nntp-store.c:1308
#, c-format
msgid "You cannot create a folder in a News store: subscribe instead."
msgstr ""
"Вы не можете создать папку в группах новостей: вместо этого следует "
"подписаться."
-#: ../camel/providers/nntp/camel-nntp-store.c:1289
+#: ../camel/providers/nntp/camel-nntp-store.c:1324
#, c-format
msgid "You cannot rename a folder in a News store."
msgstr "Вы не можете переименовать папку в группах новостей."
-#: ../camel/providers/nntp/camel-nntp-store.c:1312
+#: ../camel/providers/nntp/camel-nntp-store.c:1347
#, c-format
msgid "You cannot remove a folder in a News store: unsubscribe instead."
msgstr ""
"Вы не можете удалить папку в группах новостей: вместо этого следует "
"отписаться."
-#: ../camel/providers/nntp/camel-nntp-store.c:1522
+#: ../camel/providers/nntp/camel-nntp-store.c:1557
#, c-format
msgid ""
"You cannot subscribe to this newsgroup:\n"
@@ -4214,7 +4295,7 @@ msgstr ""
"Нет такой группы новостей. Выбранный элемент скорее всего является "
"родительской папкой."
-#: ../camel/providers/nntp/camel-nntp-store.c:1589
+#: ../camel/providers/nntp/camel-nntp-store.c:1624
#, c-format
msgid ""
"You cannot unsubscribe to this newsgroup:\n"
@@ -4225,16 +4306,16 @@ msgstr ""
"\n"
"Группа новостей не существует!"
-#: ../camel/providers/nntp/camel-nntp-store.c:2015
+#: ../camel/providers/nntp/camel-nntp-store.c:2050
msgid "NNTP Command failed: "
msgstr "Сбой команды NNTP: "
-#: ../camel/providers/nntp/camel-nntp-store.c:2113
+#: ../camel/providers/nntp/camel-nntp-store.c:2155
#, c-format
msgid "Not connected."
msgstr "Не подключён."
-#: ../camel/providers/nntp/camel-nntp-store.c:2207
+#: ../camel/providers/nntp/camel-nntp-store.c:2257
#, c-format
msgid "No such folder: %s"
msgstr "Нет такой папки: %s"
@@ -4261,37 +4342,37 @@ msgid "Operation failed: %s"
msgstr "Сбой операции: %s"
#: ../camel/providers/pop3/camel-pop3-folder.c:357
-#: ../camel/providers/pop3/camel-pop3-folder.c:440
+#: ../camel/providers/pop3/camel-pop3-folder.c:441
#, c-format
msgid "No message with UID %s"
msgstr "Нет сообщения с UID %s"
-#: ../camel/providers/pop3/camel-pop3-folder.c:456
+#: ../camel/providers/pop3/camel-pop3-folder.c:457
#, c-format
msgid "Retrieving POP message %d"
msgstr "Получение сообщения %d по POP"
-#: ../camel/providers/pop3/camel-pop3-folder.c:573
+#: ../camel/providers/pop3/camel-pop3-folder.c:575
msgid "Unknown reason"
msgstr "Неизвестная причина"
-#: ../camel/providers/pop3/camel-pop3-folder.c:632
+#: ../camel/providers/pop3/camel-pop3-folder.c:644
msgid "Retrieving POP summary"
msgstr "Получение краткой информации от сервера POP"
-#: ../camel/providers/pop3/camel-pop3-folder.c:691
-#: ../camel/providers/pop3/camel-pop3-folder.c:694
-#: ../camel/providers/pop3/camel-pop3-folder.c:707
-#: ../camel/providers/pop3/camel-pop3-folder.c:720
-#: ../camel/providers/pop3/camel-pop3-folder.c:734
+#: ../camel/providers/pop3/camel-pop3-folder.c:703
+#: ../camel/providers/pop3/camel-pop3-folder.c:706
+#: ../camel/providers/pop3/camel-pop3-folder.c:719
+#: ../camel/providers/pop3/camel-pop3-folder.c:732
+#: ../camel/providers/pop3/camel-pop3-folder.c:746
msgid "Cannot get POP summary: "
msgstr "Невозможно получить общие данные POP: "
-#: ../camel/providers/pop3/camel-pop3-folder.c:799
+#: ../camel/providers/pop3/camel-pop3-folder.c:811
msgid "Expunging old messages"
msgstr "Уничтожение старых сообщений"
-#: ../camel/providers/pop3/camel-pop3-folder.c:827
+#: ../camel/providers/pop3/camel-pop3-folder.c:839
msgid "Expunging deleted messages"
msgstr "Уничтожение сообщений, помеченных как удалённые"
@@ -4323,8 +4404,9 @@ msgid "Default POP3 port"
msgstr "Порт по умолчанию для POP3"
#: ../camel/providers/pop3/camel-pop3-provider.c:53
-msgid "POP3 over SSL"
-msgstr "POP3 поверх SSL"
+#| msgid "POP3 over SSL"
+msgid "POP3 over TLS"
+msgstr "POP3 поверх TLS"
#: ../camel/providers/pop3/camel-pop3-provider.c:60
msgid "POP"
@@ -4519,8 +4601,9 @@ msgid "Default SMTP port"
msgstr "Порт по умолчанию для SMTP"
#: ../camel/providers/smtp/camel-smtp-provider.c:40
-msgid "SMTP over SSL"
-msgstr "SMTP поверх SSL"
+#| msgid "SMTP over SSL"
+msgid "SMTP over TLS"
+msgstr "SMTP поверх TLS"
#: ../camel/providers/smtp/camel-smtp-provider.c:41
msgid "Message submission port"
@@ -4536,227 +4619,226 @@ msgstr ""
"Для доставки почты путём подключения к удалённому почтовому концентратору по "
"протоколу SMTP."
-#: ../camel/providers/smtp/camel-smtp-transport.c:227
-#: ../camel/providers/smtp/camel-smtp-transport.c:234
+#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:244
msgid "Welcome response error: "
msgstr "Ошибка ответа на приветствие: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:270
+#: ../camel/providers/smtp/camel-smtp-transport.c:280
#, 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:279
-#: ../camel/providers/smtp/camel-smtp-transport.c:292
-#: ../camel/providers/smtp/camel-smtp-transport.c:299
+#: ../camel/providers/smtp/camel-smtp-transport.c:289
+#: ../camel/providers/smtp/camel-smtp-transport.c:302
+#: ../camel/providers/smtp/camel-smtp-transport.c:309
msgid "STARTTLS command failed: "
msgstr "Сбой команды STARTTLS: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:318
+#: ../camel/providers/smtp/camel-smtp-transport.c:328
#, c-format
msgid "Failed to connect to SMTP server %s in secure mode: "
msgstr "Не удалось подключиться к SMTP-серверу %s в защищённом режиме: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:429
+#: ../camel/providers/smtp/camel-smtp-transport.c:439
#, c-format
msgid "SMTP server %s"
msgstr "SMTP-сервер %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:432
+#: ../camel/providers/smtp/camel-smtp-transport.c:442
#, c-format
msgid "SMTP mail delivery via %s"
msgstr "SMTP-доставка почты через %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:537
+#: ../camel/providers/smtp/camel-smtp-transport.c:582
#, c-format
msgid "SMTP server %s does not support %s authentication"
msgstr "Сервер SMTP %s не поддерживает аутентификацию %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:618
+#: ../camel/providers/smtp/camel-smtp-transport.c:663
#, c-format
msgid "No SASL mechanism was specified"
msgstr "Не указан механизм SASL"
-#: ../camel/providers/smtp/camel-smtp-transport.c:654
-#| msgid "AUTH command failed: "
+#: ../camel/providers/smtp/camel-smtp-transport.c:699
msgid "AUTH command failed: Not connected."
msgstr "Сбой команды AUTH: не подключён."
-#: ../camel/providers/smtp/camel-smtp-transport.c:661
-#: ../camel/providers/smtp/camel-smtp-transport.c:671
-#: ../camel/providers/smtp/camel-smtp-transport.c:683
+#: ../camel/providers/smtp/camel-smtp-transport.c:706
+#: ../camel/providers/smtp/camel-smtp-transport.c:720
+#: ../camel/providers/smtp/camel-smtp-transport.c:732
msgid "AUTH command failed: "
msgstr "Сбой команды AUTH: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:839
+#: ../camel/providers/smtp/camel-smtp-transport.c:888
#, c-format
msgid "Cannot send message: service not connected."
msgstr "Не удалось отправить сообщение: сервис не подключён."
-#: ../camel/providers/smtp/camel-smtp-transport.c:848
+#: ../camel/providers/smtp/camel-smtp-transport.c:897
#, c-format
msgid "Cannot send message: sender address not valid."
msgstr "Не удалось отправить сообщение: неверный адрес отправителя."
-#: ../camel/providers/smtp/camel-smtp-transport.c:852
+#: ../camel/providers/smtp/camel-smtp-transport.c:901
msgid "Sending message"
msgstr "Отправка сообщения"
-#: ../camel/providers/smtp/camel-smtp-transport.c:881
+#: ../camel/providers/smtp/camel-smtp-transport.c:930
#, c-format
msgid "Cannot send message: no recipients defined."
msgstr "Не удалось отправить сообщение: не определены получатели."
-#: ../camel/providers/smtp/camel-smtp-transport.c:896
+#: ../camel/providers/smtp/camel-smtp-transport.c:945
#, c-format
msgid "Cannot send message: one or more invalid recipients"
msgstr ""
"Не удалось отправить сообщение: указан один или несколько некорректных "
"получателей"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1028
+#: ../camel/providers/smtp/camel-smtp-transport.c:1077
msgid "Syntax error, command unrecognized"
msgstr "Синтаксическая ошибка, команда не распознана"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1030
+#: ../camel/providers/smtp/camel-smtp-transport.c:1079
msgid "Syntax error in parameters or arguments"
msgstr "Синтаксическая ошибка в параметрах или аргументах"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1032
+#: ../camel/providers/smtp/camel-smtp-transport.c:1081
msgid "Command not implemented"
msgstr "Команда не реализована"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1034
+#: ../camel/providers/smtp/camel-smtp-transport.c:1083
msgid "Command parameter not implemented"
msgstr "Параметр команды не реализован"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1036
+#: ../camel/providers/smtp/camel-smtp-transport.c:1085
msgid "System status, or system help reply"
msgstr "Состояние системы или ответ системной справки"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1038
+#: ../camel/providers/smtp/camel-smtp-transport.c:1087
msgid "Help message"
msgstr "Справочное сообщение"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1040
+#: ../camel/providers/smtp/camel-smtp-transport.c:1089
msgid "Service ready"
msgstr "Сервис готов"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1042
+#: ../camel/providers/smtp/camel-smtp-transport.c:1091
msgid "Service closing transmission channel"
msgstr "Сервис закрывает канал передачи"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1044
+#: ../camel/providers/smtp/camel-smtp-transport.c:1093
msgid "Service not available, closing transmission channel"
msgstr "Сервис не доступен, закрытие канала передачи"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1046
+#: ../camel/providers/smtp/camel-smtp-transport.c:1095
msgid "Requested mail action okay, completed"
msgstr "Запрошенное почтовое действие выполнено"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1048
+#: ../camel/providers/smtp/camel-smtp-transport.c:1097
msgid "User not local; will forward to <forward-path>"
msgstr ""
"Не локальный пользователь; будет отправлено в соответствии с <forward-path>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1050
+#: ../camel/providers/smtp/camel-smtp-transport.c:1099
msgid "Requested mail action not taken: mailbox unavailable"
msgstr "Запрошенное действие с почтой не выполнено: почтовый ящик недоступен"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1052
+#: ../camel/providers/smtp/camel-smtp-transport.c:1101
msgid "Requested action not taken: mailbox unavailable"
msgstr "Запрошенное действие не выполнено: почтовый ящик недоступен"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1054
+#: ../camel/providers/smtp/camel-smtp-transport.c:1103
msgid "Requested action aborted: error in processing"
msgstr "Запрошенное действие прервано: ошибка при обработке"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1056
+#: ../camel/providers/smtp/camel-smtp-transport.c:1105
msgid "User not local; please try <forward-path>"
msgstr "Пользователь не локальный; установите <forward-path>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1058
+#: ../camel/providers/smtp/camel-smtp-transport.c:1107
msgid "Requested action not taken: insufficient system storage"
msgstr ""
"Запрошенное действие не выполнено: недостаточно места в системном хранилище"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1060
+#: ../camel/providers/smtp/camel-smtp-transport.c:1109
msgid "Requested mail action aborted: exceeded storage allocation"
msgstr "Запрошенное действие прервано: исчерпано место в хранилище"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1062
+#: ../camel/providers/smtp/camel-smtp-transport.c:1111
msgid "Requested action not taken: mailbox name not allowed"
msgstr "Запрошенное действие прервано: имя почтового ящика недопустимо"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1064
+#: ../camel/providers/smtp/camel-smtp-transport.c:1113
msgid "Start mail input; end with <CRLF>.<CRLF>"
msgstr "Начало ввода почты; окончание после <CRLF>.<CRLF>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1066
+#: ../camel/providers/smtp/camel-smtp-transport.c:1115
msgid "Transaction failed"
msgstr "Сбой транзакции"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1070
+#: ../camel/providers/smtp/camel-smtp-transport.c:1119
msgid "A password transition is needed"
msgstr "Необходима передача пароля"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1072
+#: ../camel/providers/smtp/camel-smtp-transport.c:1121
msgid "Authentication mechanism is too weak"
msgstr "Слишком слабый механизм аутентификации"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1074
+#: ../camel/providers/smtp/camel-smtp-transport.c:1123
msgid "Encryption required for requested authentication mechanism"
msgstr "Для запрошенного механизма аутентификации требуется шифрование"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1076
+#: ../camel/providers/smtp/camel-smtp-transport.c:1125
msgid "Temporary authentication failure"
msgstr "Временный сбой аутентификации"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1366
+#: ../camel/providers/smtp/camel-smtp-transport.c:1415
msgid "SMTP Greeting"
msgstr "Приветствие SMTP"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1375
-#: ../camel/providers/smtp/camel-smtp-transport.c:1388
-#: ../camel/providers/smtp/camel-smtp-transport.c:1395
+#: ../camel/providers/smtp/camel-smtp-transport.c:1424
+#: ../camel/providers/smtp/camel-smtp-transport.c:1437
+#: ../camel/providers/smtp/camel-smtp-transport.c:1444
msgid "HELO command failed: "
msgstr "Сбой команды HELO: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:1471
-#: ../camel/providers/smtp/camel-smtp-transport.c:1485
-#: ../camel/providers/smtp/camel-smtp-transport.c:1494
+#: ../camel/providers/smtp/camel-smtp-transport.c:1520
+#: ../camel/providers/smtp/camel-smtp-transport.c:1534
+#: ../camel/providers/smtp/camel-smtp-transport.c:1543
msgid "MAIL FROM command failed: "
msgstr "Сбой команды MAIL FROM: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:1522
+#: ../camel/providers/smtp/camel-smtp-transport.c:1571
msgid "RCPT TO command failed: "
msgstr "Сбой команды RCPT TO: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:1538
-#: ../camel/providers/smtp/camel-smtp-transport.c:1547
+#: ../camel/providers/smtp/camel-smtp-transport.c:1587
+#: ../camel/providers/smtp/camel-smtp-transport.c:1596
#, c-format
msgid "RCPT TO <%s> failed: "
msgstr "Сбой команды RCPT TO <%s>: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:1619
-#: ../camel/providers/smtp/camel-smtp-transport.c:1630
-#: ../camel/providers/smtp/camel-smtp-transport.c:1641
-#: ../camel/providers/smtp/camel-smtp-transport.c:1703
-#: ../camel/providers/smtp/camel-smtp-transport.c:1721
-#: ../camel/providers/smtp/camel-smtp-transport.c:1734
-#: ../camel/providers/smtp/camel-smtp-transport.c:1742
+#: ../camel/providers/smtp/camel-smtp-transport.c:1668
+#: ../camel/providers/smtp/camel-smtp-transport.c:1679
+#: ../camel/providers/smtp/camel-smtp-transport.c:1690
+#: ../camel/providers/smtp/camel-smtp-transport.c:1752
+#: ../camel/providers/smtp/camel-smtp-transport.c:1770
+#: ../camel/providers/smtp/camel-smtp-transport.c:1783
+#: ../camel/providers/smtp/camel-smtp-transport.c:1791
msgid "DATA command failed: "
msgstr "Сбой команды DATA: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:1768
-#: ../camel/providers/smtp/camel-smtp-transport.c:1782
-#: ../camel/providers/smtp/camel-smtp-transport.c:1790
+#: ../camel/providers/smtp/camel-smtp-transport.c:1817
+#: ../camel/providers/smtp/camel-smtp-transport.c:1831
+#: ../camel/providers/smtp/camel-smtp-transport.c:1839
msgid "RSET command failed: "
msgstr "Сбой команды RSET: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:1816
-#: ../camel/providers/smtp/camel-smtp-transport.c:1828
-#: ../camel/providers/smtp/camel-smtp-transport.c:1834
+#: ../camel/providers/smtp/camel-smtp-transport.c:1865
+#: ../camel/providers/smtp/camel-smtp-transport.c:1877
+#: ../camel/providers/smtp/camel-smtp-transport.c:1883
msgid "QUIT command failed: "
msgstr "Сбой команды QUIT: "
@@ -4797,6 +4879,18 @@ msgstr ""
msgid "Whether the migration of old setting was already done"
msgstr "Сделана ли уже миграция старого параметра"
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:2
+msgid "An absolute path where the gpg (or gpg2) binary is"
+msgstr "Абсолютный путь, где находится бинарный файл gpg (или gpg2)"
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:3
+msgid ""
+"An example is '/usr/bin/gpg'; if it is not filled, or doesn't exist, then it "
+"is searched for it. Change requires restart of the application."
+msgstr ""
+"Например: «/usr/bin/gpg»; если не заполнено, или не существует, то это "
+"ищется. Изменение требует перезапуск приложения."
+
#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
msgid "(Deprecated) Proxy type to use"
msgstr "(Устарело) Тип прокси"
@@ -4869,7 +4963,7 @@ msgstr "%s не поддерживает создание удалённых р
msgid "%s does not support deleting remote resources"
msgstr "%s не поддерживает удаление удалённых ресурсов"
-#: ../libebackend/e-data-factory.c:1292
+#: ../libebackend/e-data-factory.c:1294
#, c-format
msgid "Backend factory for source '%s' and extension '%s' cannot be found."
msgstr ""
@@ -4881,7 +4975,6 @@ msgid "Data source is missing a [%s] group"
msgstr "В источнике данных нет группы [%s]"
#: ../libebackend/e-server-side-source.c:466
-#| msgid "Failed to get lock using fcntl(2): %s"
msgid "Failed to lookup credentials: "
msgstr "Не удалось найти учётные данные: "
@@ -4908,7 +5001,7 @@ msgid ""
msgstr "У источника данных «%s» нет бэкэнда для удаления удалённого ресурса"
#: ../libebackend/e-server-side-source.c:1478 ../libedataserver/e-source.c:1804
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1046
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1079
#, c-format
msgid "Data source '%s' does not support OAuth 2.0 authentication"
msgstr "Источник данных «%s» не поддерживает аутентификацию OAuth 2.0"
@@ -5099,6 +5192,26 @@ msgstr "Сохранение учётных данных не поддержив
msgid "Credentials delete is not supported"
msgstr "Удаление учётных данных не поддерживается"
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:114
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:169
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:208
+#| msgid "Credentials store is not supported"
+msgid "Google authentication is not supported"
+msgstr "Аутентификация Google не поддерживается"
+
+#. Translators: The first %s is a display name of the source, the second is its UID.
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:121
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:176
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:215
+#, c-format
+msgid "Source '%s' (%s) is not a valid Google source"
+msgstr "Источник «%s» (%s) не является действительным источником Google"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:135
+#| msgid "Object not found"
+msgid "Google secret not found"
+msgstr "Секретный ключ Google не найден"
+
#: ../libedataserver/e-source-credentials-provider-impl-password.c:81
msgid "Password not found"
msgstr "Пароль не найден"
@@ -5242,110 +5355,199 @@ msgstr "%H%M"
msgid "%I %p"
msgstr "%I %p"
-#: ../libedataserver/e-webdav-discover.c:468
-#: ../libedataserver/e-webdav-discover.c:477
+#: ../libedataserver/e-webdav-discover.c:484
+#: ../libedataserver/e-webdav-discover.c:493
#, c-format
msgid "HTTP Error: %s"
msgstr "Ошибка HTTP: %s"
-#: ../libedataserver/e-webdav-discover.c:507
-#| msgid "Could not parse arguments"
+#: ../libedataserver/e-webdav-discover.c:523
msgid "Could not parse response"
msgstr "Не удалось разобрать ответ"
-#: ../libedataserver/e-webdav-discover.c:516
+#: ../libedataserver/e-webdav-discover.c:532
msgid "Empty response"
msgstr "Пустой ответ"
-#: ../libedataserver/e-webdav-discover.c:524
-#| msgid "Code: %u - Unexpected response from server"
+#: ../libedataserver/e-webdav-discover.c:540
msgid "Unexpected reply from server"
msgstr "Неожиданный ответ от сервера"
-#: ../libedataserverui/e-credentials-prompter.c:259
-#: ../libedataserverui/e-credentials-prompter.c:1561
-#: ../libedataserverui/e-credentials-prompter.c:1605
+#: ../libedataserverui/e-credentials-prompter.c:260
+#: ../libedataserverui/e-credentials-prompter.c:1563
+#: ../libedataserverui/e-credentials-prompter.c:1607
msgid "Credentials prompt was cancelled"
msgstr "Запрос учётных данных был отменён"
-#: ../libedataserverui/e-credentials-prompter.c:663
+#: ../libedataserverui/e-credentials-prompter.c:664
#, c-format
msgid "Source '%s' doesn't support prompt for credentials"
msgstr "Источник «%s» не поддерживает запрос учётных данных"
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:133
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:440
+#, fuzzy, c-format
+#| msgid "Failed to obtain an access token for '%s': "
+msgid "Failed to obtain access token from address '%s'. Error code %d (%s)"
+msgstr "Не удалось получить маркер доступа для «%s»: "
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:486
+msgid "Requesting access token, please wait..."
+msgstr ""
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:588
+#| msgid "Address book authentication request"
+msgid "Google Address book authentication request"
+msgstr "Запрос аутентификации адресной книги Google"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:591
+#| msgid "Calendar authentication request"
+msgid "Google Calendar authentication request"
+msgstr "Запрос аутентификации календаря Google"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:594
+#| msgid "Mail authentication request"
+msgid "Google Memo List authentication request"
+msgstr "Запрос аутентификации списка заметок Google"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:597
+#| msgid "Mail authentication request"
+msgid "Google Task List authentication request"
+msgstr "Запрос аутентификации списка задач Google"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:601
+#| msgid "Mail authentication request"
+msgid "Google Mail authentication request"
+msgstr "Запрос аутентификации почты Google"
+
+#. generic account prompt
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:604
+#| msgid "Calendar authentication request"
+msgid "Google account authentication request"
+msgstr "Запрос аутентификации учётной записи Google"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:615
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"address book \"%s\"."
+msgstr ""
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:619
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"calendar \"%s\"."
+msgstr ""
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:623
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"mail account \"%s\"."
+msgstr ""
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:627
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"mail transport \"%s\"."
+msgstr ""
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:631
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"memo list \"%s\"."
+msgstr ""
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:635
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"task list \"%s\"."
+msgstr ""
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:639
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"account \"%s\"."
+msgstr ""
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:683
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:232
+#: ../libedataserverui/e-trust-prompt.c:114
+#: ../libedataserverui/e-webdav-discover-widget.c:1063
+msgid "_Cancel"
+msgstr "_Отменить"
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:134
msgid "Address book authentication request"
msgstr "Запрос аутентификации от адресной книги"
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:138
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:139
msgid "Calendar authentication request"
msgstr "Запрос аутентификации от календаря"
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:142
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:143
msgid "Mail authentication request"
msgstr "Запрос аутентификации от почты"
#. generic account prompt
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:145
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:146
msgid "Authentication request"
msgstr "Запрос аутентификации"
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:156
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:157
#, c-format
msgid "Please enter the password for address book \"%s\"."
msgstr "Введите пароль для адресной книги «%s»."
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:160
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:161
#, c-format
msgid "Please enter the password for calendar \"%s\"."
msgstr "Введите пароль для календаря «%s»."
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:164
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:165
#, c-format
msgid "Please enter the password for mail account \"%s\"."
msgstr "Введите пароль для учётной записи почты «%s»."
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:168
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:169
#, c-format
msgid "Please enter the password for mail transport \"%s\"."
msgstr "Введите пароль для транспорта почты «%s»."
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:172
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:173
#, c-format
msgid "Please enter the password for memo list \"%s\"."
msgstr "Введите пароль для списка заметок «%s»."
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:176
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:177
#, c-format
msgid "Please enter the password for task list \"%s\"."
msgstr "Введите пароль для списка задач «%s»."
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:180
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:181
#, c-format
msgid "Please enter the password for account \"%s\"."
msgstr "Введите пароль для учётной записи «%s»."
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:229
-#: ../libedataserverui/e-trust-prompt.c:114
-#: ../libedataserverui/e-webdav-discover-widget.c:1063
-msgid "_Cancel"
-msgstr "_Отменить"
-
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:230
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:233
#: ../libedataserverui/e-webdav-discover-widget.c:1064
msgid "_OK"
msgstr "_ОК"
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:340
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:343
msgid "_User Name:"
msgstr "_Имя пользователя:"
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:352
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:355
msgid "_Password:"
msgstr "_Пароль:"
#. Remember password check
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:368
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:371
msgid "_Add this password to your keyring"
msgstr "_Добавить этот пароль к связке ключей"
@@ -5371,8 +5573,9 @@ msgstr "_Принять"
#: ../libedataserverui/e-trust-prompt.c:188
#: ../modules/trust-prompt/trust-prompt-gtk.c:159
-#, c-format
-msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?"
+#, fuzzy, c-format
+#| msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?"
+msgid "SSL/TLS certificate for '%s' is not trusted. Do you wish to accept it?"
msgstr "Сертификат SSL для «%s» не является доверенным. Принять сертификат?"
#: ../libedataserverui/e-trust-prompt.c:210
@@ -5421,18 +5624,14 @@ msgid "The certificate's algorithm is considered insecure."
msgstr "Алгоритм сертификата считается небезопасным."
#: ../libedataserverui/e-webdav-discover-widget.c:166
-#| msgctxt "CategoryName"
-#| msgid "Suppliers"
msgid "Supports"
msgstr "Поддержка"
#: ../libedataserverui/e-webdav-discover-widget.c:177
-#| msgid "_User Name:"
msgid "_User mail:"
msgstr "_Почта пользователя:"
#: ../libedataserverui/e-webdav-discover-widget.c:523
-#| msgid "Contacts"
msgctxt "WebDAVDiscover"
msgid "Contacts"
msgstr "Контакты"
@@ -5448,13 +5647,11 @@ msgid "Memos"
msgstr "Записки"
#: ../libedataserverui/e-webdav-discover-widget.c:526
-#| msgid "Tasks"
msgctxt "WebDAVDiscover"
msgid "Tasks"
msgstr "Задачи"
#: ../libedataserverui/e-webdav-discover-widget.c:825
-#| msgid "Invalid Redirect URL"
msgid "Invalid URL"
msgstr "Неверный URL"
@@ -5463,12 +5660,10 @@ msgid "User name not filled"
msgstr "Имя пользователя не заполнено"
#: ../libedataserverui/e-webdav-discover-widget.c:880
-#| msgid "_Cancel"
msgid "Cancel"
msgstr "Отменить"
#: ../libedataserverui/e-webdav-discover-widget.c:883
-#| msgid "Searching..."
msgid "Searching server sources..."
msgstr "Поиск источников сервера…"
@@ -5482,7 +5677,6 @@ msgstr ""
"OnlineAccounts, с помощью которой можно получить пароль для «%s»"
#: ../modules/gnome-online-accounts/e-goa-password-based.c:273
-#| msgid "Failed to read From address"
msgid "Failed to get password from GOA: "
msgstr "Не удалось получить пароль из GOA: "
@@ -5536,12 +5730,12 @@ msgstr ""
msgid "Failed to obtain an access token for '%s': "
msgstr "Не удалось получить маркер доступа для «%s»: "
-#: ../modules/google-backend/module-google-backend.c:461
+#: ../modules/google-backend/module-google-backend.c:568
#: ../modules/yahoo-backend/module-yahoo-backend.c:226
msgid "Tasks"
msgstr "Задачи"
-#: ../modules/google-backend/module-google-backend.c:515
+#: ../modules/google-backend/module-google-backend.c:625
#: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
#: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
msgid "Contacts"
@@ -5560,7 +5754,7 @@ msgstr "Интеграция ваших календарей"
msgid "Integrate your contacts"
msgstr "Интеграция ваших контаков"
-#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:273
+#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:272
msgid "Signon service did not return a secret"
msgstr "Служба регистрации не вернула секрет"
@@ -5592,7 +5786,7 @@ msgstr "Почта"
msgid "Integrate your mailboxes"
msgstr "Интегрировать ваши почтовые ящики"
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1027
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1060
#, c-format
msgid ""
"Cannot find a corresponding account service in the accounts database from "
@@ -5640,13 +5834,13 @@ msgid "Yahoo! Mail"
msgstr "Почта Yahoo!"
#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:36
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:40
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:38
#: ../services/evolution-user-prompter/evolution-user-prompter.c:32
msgid "Keep running after the last client is closed"
msgstr "Сохранять запущенным после закрытия последнего клиента"
#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:38
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:42
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:40
msgid "Wait running until at least one client is connected"
msgstr "Работает до тех пор, пока подключён хотя бы один клиент"
@@ -5697,6 +5891,10 @@ msgstr "Не переносить пользовательские данные
msgid "_Dismiss"
msgstr "_Отклонить"
+#~| msgid "Failed on message %d"
+#~ msgid "Failed to issue DONE"
+#~ msgstr "Не удалось оформить DONE"
+
#~ msgid "Server disconnected"
#~ msgstr "Сервер отключился"
@@ -6098,9 +6296,6 @@ msgstr "_Отклонить"
#~ msgid "Error: Unable to process extension"
#~ msgstr "Ошибка: невозможно обработать расширение"
-#~ msgid "Email"
-#~ msgstr "Эл. почта"
-
#~ msgid "Object Signer"
#~ msgstr "Подписчик объекта"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
