[evolution-data-server] Updated Russian translation
- From: Yuri Myasoedov <ymyasoedov src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Updated Russian translation
- Date: Sat, 5 Mar 2011 18:20:50 +0000 (UTC)
commit be9c96aa35af2da1b219e32d6bde42de45f4fbd3
Author: Yuri Myasoedov <omerta13 yandex ru>
Date: Sat Mar 5 21:19:27 2011 +0300
Updated Russian translation
po/ru.po | 4723 ++++++++++++++++++++++++++++++++------------------------------
1 files changed, 2450 insertions(+), 2273 deletions(-)
---
diff --git a/po/ru.po b/po/ru.po
index ba7cb06..3a682bc 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,83 +10,172 @@
msgid ""
msgstr ""
"Project-Id-Version: evolution-data-server trunk\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=evolution-data-server&component=general\n"
-"POT-Creation-Date: 2010-02-22 12:31+0000\n"
-"PO-Revision-Date: 2010-02-22 10:04+0300\n"
-"Last-Translator: Yuri Kozlov <yuray komyakino ru>\n"
-"Language-Team: Russian <debian-l10n-russian lists debian org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-data-server&component=Misc.\n"
+"POT-Creation-Date: 2011-02-17 18:29+0000\n"
+"PO-Revision-Date: 2011-03-05 21:18+0400\n"
+"Last-Translator: Yuri Myaseodov <omerta13 yandex ru>\n"
+"Language-Team: Russian <gnome-cyr gnome org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../addressbook/backends/file/e-book-backend-file.c:560
+#: ../addressbook/backends/file/e-book-backend-file.c:570
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
msgid "Loading..."
-msgstr "Ð?агÑ?Ñ?зка..."
+msgstr "Ð?агÑ?Ñ?зкаâ?¦"
-#: ../addressbook/backends/file/e-book-backend-file.c:563
+#: ../addressbook/backends/file/e-book-backend-file.c:573
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4551
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4506
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
msgid "Searching..."
-msgstr "Ð?оиÑ?к..."
+msgstr "Ð?оиÑ?кâ?¦"
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4715
+#. Query for new contacts asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:589
+msgid "Querying for updated contactsâ?¦"
+msgstr "Ð?апÑ?оÑ? обновлÑ?ннÑ?Ñ? конÑ?акÑ?овâ?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:624
+msgid "Personal"
+msgstr "Ð?иÑ?ное"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:626
+#| msgid "Favorites"
+msgid "Friends"
+msgstr "Ð?Ñ?Ñ?зÑ?Ñ?"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:628
+#| msgid "Family Name"
+msgid "Family"
+msgstr "СемÑ?Ñ?"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:630
+msgid "Coworkers"
+msgstr "СоÑ?Ñ?Ñ?дники"
+
+#. Run the query asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:707
+msgid "Querying for updated groupsâ?¦"
+msgstr "Ð?апÑ?оÑ? обновлÑ?ннÑ?Ñ? гÑ?Ñ?ппâ?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:891
+#| msgid "Cannot get contact"
+msgid "Creating new contactâ?¦"
+msgstr "Создание нового конÑ?акÑ?аâ?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:984
+msgid "Deleting contactâ?¦"
+msgstr "Удаление конÑ?акÑ?аâ?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1092
+#| msgid "Cannot modify contact"
+msgid "Modifying contactâ?¦"
+msgstr "Ð?зменение конÑ?акÑ?аâ?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1199
+#| msgid "Loading..."
+msgid "Loadingâ?¦"
+msgstr "Ð?агÑ?Ñ?зкаâ?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1346
+#| msgid "Authentication required"
+msgid "Authenticating with the serverâ?¦"
+msgstr "Ð?Ñ?полнÑ?еÑ?Ñ?Ñ? аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ? на Ñ?еÑ?веÑ?еâ?¦"
+
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2699
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4665
#, c-format
msgid "Downloading contacts (%d)... "
-msgstr "СкаÑ?иваÑ?Ñ?Ñ?Ñ? конÑ?акÑ?Ñ? (%d)... "
+msgstr "Ð?агÑ?Ñ?зка конÑ?акÑ?ов (%d)â?¦"
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2845
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3029
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3073
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2847
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3028
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3075
#, c-format
msgid "Updating contacts cache (%d)... "
-msgstr "Ð?бновлÑ?еÑ?Ñ?Ñ? кÑ?Ñ? конÑ?акÑ?ов (%d)... "
+msgstr "Ð?бновление кÑ?Ñ?а конÑ?акÑ?ов (%d)â?¦"
+
+#. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
+#| msgid "Not connected."
+msgid "Not connected"
+msgstr "Ð?е подклÑ?Ñ?Ñ?н"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:816
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:764
msgid "Using Distinguished Name (DN)"
msgstr "Ð?Ñ?полÑ?зÑ?Ñ? оÑ?лиÑ?иÑ?елÑ?ное имÑ? (DN)"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:819
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:767
msgid "Using Email Address"
-msgstr "Ð?Ñ?полÑ?зÑ?Ñ? поÑ?Ñ?овÑ?й адÑ?еÑ?"
+msgstr "Ð?Ñ?полÑ?зÑ?Ñ? адÑ?еÑ? Ñ?л. поÑ?Ñ?Ñ?"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1096
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1033
msgid "Reconnecting to LDAP server..."
-msgstr "Ð?овÑ?оÑ?ное подклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ? LDAP..."
+msgstr "Ð?овÑ?оÑ?ное подклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ? LDAPâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1738
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1158
+#| msgid "Invalid argument"
+msgid "Invalid DN syntax"
+msgstr "Ð?едопÑ?Ñ?Ñ?имÑ?й Ñ?инÑ?акÑ?иÑ? в оÑ?лиÑ?иÑ?елÑ?ном имени (DN)"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1675
msgid "Adding contact to LDAP server..."
-msgstr "Создание конÑ?акÑ?а на Ñ?еÑ?веÑ?е LDAP..."
+msgstr "Создание конÑ?акÑ?а на Ñ?еÑ?веÑ?е LDAPâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1872
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1807
msgid "Removing contact from LDAP server..."
-msgstr "Удаление конÑ?акÑ?а Ñ? Ñ?еÑ?веÑ?а LDAP..."
+msgstr "Удаление конÑ?акÑ?а Ñ? Ñ?еÑ?веÑ?а LDAPâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2309
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2243
msgid "Modifying contact from LDAP server..."
-msgstr "Ð?зменение конÑ?акÑ?а на Ñ?еÑ?веÑ?е LDAP..."
+msgstr "Ð?зменение конÑ?акÑ?а на Ñ?еÑ?веÑ?е LDAPâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4412
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4356
msgid "Receiving LDAP search results..."
-msgstr "Ð?олÑ?Ñ?ение Ñ?езÑ?лÑ?Ñ?аÑ?ов поиÑ?ка Ñ? Ñ?еÑ?веÑ?а LDAP..."
+msgstr "Ð?олÑ?Ñ?ение Ñ?езÑ?лÑ?Ñ?аÑ?ов поиÑ?ка Ñ? Ñ?еÑ?веÑ?а LDAPâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4573
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4528
msgid "Error performing search"
msgstr "Ð?Ñ?ибка вÑ?полнениÑ? поиÑ?ка"
-#: ../addressbook/libebook/e-book.c:2149
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:273
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:881
+#: ../addressbook/libedata-book/e-data-book.c:441
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:523
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:552
+#: ../calendar/backends/http/e-cal-backend-http.c:435
+#: ../calendar/libecal/e-cal.c:4177
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:160
+#: ../camel/providers/imap/camel-imap-command.c:481
+#: ../camel/providers/imap/camel-imap-store.c:425
+#: ../camel/providers/pop3/camel-pop3-store.c:495
+#: ../camel/providers/smtp/camel-smtp-transport.c:497
+#: ../servers/groupwise/e-gw-connection.c:243
+msgid "Unknown error"
+msgstr "Ð?еизвеÑ?Ñ?наÑ? оÑ?ибка"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:335
+#, c-format
+msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgstr "Ð?Ñ?и Ñ?оздании Ñ?еÑ?Ñ?Ñ?Ñ?а «%s» пÑ?оизоÑ?Ñ?л Ñ?бой Ñ? кодом Ñ?оÑ?Ñ?оÑ?ниÑ? HTTP: %d (%s)"
+
+#: ../addressbook/libebook/e-book.c:3064
#, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
-msgstr "%s: иÑ?Ñ?оÑ?ник длÑ? uid «%s» не Ñ?оÑ?Ñ?анен в gconf."
+#| msgid "%s: there was no source for uid `%s' stored in gconf."
+msgid "%s: there was no source for UID '%s' stored in GConf."
+msgstr "%s: иÑ?Ñ?оÑ?ник длÑ? UID «%s» не бÑ?л Ñ?оÑ?Ñ?анÑ?н в GConf."
+
+#: ../addressbook/libebook/e-book.c:3420
+#: ../addressbook/libedata-book/e-data-book.c:183
+#| msgid "Folder '%s/%s' does not exist."
+msgid "Address book does not exist"
+msgstr "Ð?дÑ?еÑ?наÑ? книга не Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?"
#. Dummy row as EContactField starts from 1
#: ../addressbook/libebook/e-contact.c:115
@@ -274,7 +363,7 @@ msgstr "URL веблога"
#. Contact categories
#: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:671
+#: ../libedataserverui/e-categories-dialog.c:756
msgid "Categories"
msgstr "Ð?аÑ?егоÑ?ии"
@@ -285,7 +374,7 @@ msgstr "URI календаÑ?Ñ?"
#: ../addressbook/libebook/e-contact.c:182
msgid "Free/Busy URL"
-msgstr "СÑ?Ñ?лка (URL) \"Ñ?вободен/занÑ?Ñ?\":"
+msgstr "СÑ?Ñ?лка (URL) «Ñ?вободен/занÑ?Ñ?»"
#: ../addressbook/libebook/e-contact.c:183
msgid "ICS Calendar"
@@ -298,7 +387,7 @@ msgstr "URL видеоконÑ?еÑ?енÑ?ий"
#. Misc fields
#: ../addressbook/libebook/e-contact.c:187
msgid "Spouse's Name"
-msgstr "Ð?мÑ? Ñ?Ñ?пÑ?Ñ?г(и)"
+msgstr "Ð?мÑ? Ñ?Ñ?пÑ?Ñ?га(и)"
#: ../addressbook/libebook/e-contact.c:188
msgid "Note"
@@ -354,28 +443,34 @@ msgid "GroupWise Work Screen Name 3"
msgstr "Groupwise - Ñ?абоÑ?ее Ñ?кÑ?анное имÑ? 3"
#: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 1"
-msgstr "Jabber - домаÑ?ний иденÑ?иÑ?икаÑ?оÑ? 1"
+#| msgid "Jabber Home Id 1"
+msgid "Jabber Home ID 1"
+msgstr "Jabber â?? домаÑ?ний иденÑ?иÑ?икаÑ?оÑ? 1"
#: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Home Id 2"
-msgstr "Jabber - домаÑ?ний иденÑ?иÑ?икаÑ?оÑ? 2"
+#| msgid "Jabber Home Id 2"
+msgid "Jabber Home ID 2"
+msgstr "Jabber â?? домаÑ?ний иденÑ?иÑ?икаÑ?оÑ? 2"
#: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Home Id 3"
-msgstr "Jabber - домаÑ?ний иденÑ?иÑ?икаÑ?оÑ? 3"
+#| msgid "Jabber Home Id 3"
+msgid "Jabber Home ID 3"
+msgstr "Jabber â?? домаÑ?ний иденÑ?иÑ?икаÑ?оÑ? 3"
#: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 1"
-msgstr "Jabber - Ñ?абоÑ?ий иденÑ?иÑ?икаÑ?оÑ? 1"
+#| msgid "Jabber Work Id 1"
+msgid "Jabber Work ID 1"
+msgstr "Jabber â?? Ñ?абоÑ?ий иденÑ?иÑ?икаÑ?оÑ? 1"
#: ../addressbook/libebook/e-contact.c:207
-msgid "Jabber Work Id 2"
-msgstr "Jabber - Ñ?абоÑ?ий иденÑ?иÑ?икаÑ?оÑ? 2"
+#| msgid "Jabber Work Id 2"
+msgid "Jabber Work ID 2"
+msgstr "Jabber â?? Ñ?абоÑ?ий иденÑ?иÑ?икаÑ?оÑ? 2"
#: ../addressbook/libebook/e-contact.c:208
-msgid "Jabber Work Id 3"
-msgstr "Jabber - Ñ?абоÑ?ий иденÑ?иÑ?икаÑ?оÑ? 3"
+#| msgid "Jabber Work Id 3"
+msgid "Jabber Work ID 3"
+msgstr "Jabber â?? Ñ?абоÑ?ий иденÑ?иÑ?икаÑ?оÑ? 3"
#: ../addressbook/libebook/e-contact.c:209
msgid "Yahoo! Home Screen Name 1"
@@ -426,28 +521,34 @@ msgid "MSN Work Screen Name 3"
msgstr "MSN - Ñ?абоÑ?ее Ñ?кÑ?анное имÑ? 3"
#: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 1"
-msgstr "ICQ - домаÑ?ний иденÑ?иÑ?икаÑ?оÑ? 1"
+#| msgid "ICQ Home Id 1"
+msgid "ICQ Home ID 1"
+msgstr "ICQ â?? домаÑ?ний иденÑ?иÑ?икаÑ?оÑ? 1"
#: ../addressbook/libebook/e-contact.c:222
-msgid "ICQ Home Id 2"
-msgstr "ICQ - домаÑ?ний иденÑ?иÑ?икаÑ?оÑ? 2"
+#| msgid "ICQ Home Id 2"
+msgid "ICQ Home ID 2"
+msgstr "ICQ â?? домаÑ?ний иденÑ?иÑ?икаÑ?оÑ? 2"
#: ../addressbook/libebook/e-contact.c:223
-msgid "ICQ Home Id 3"
-msgstr "ICQ - домаÑ?ний иденÑ?иÑ?икаÑ?оÑ? 3"
+#| msgid "ICQ Home Id 3"
+msgid "ICQ Home ID 3"
+msgstr "ICQ â?? домаÑ?ний иденÑ?иÑ?икаÑ?оÑ? 3"
#: ../addressbook/libebook/e-contact.c:224
-msgid "ICQ Work Id 1"
-msgstr "ICQ - Ñ?абоÑ?ий иденÑ?иÑ?икаÑ?оÑ? 1"
+#| msgid "ICQ Work Id 1"
+msgid "ICQ Work ID 1"
+msgstr "ICQ â?? Ñ?абоÑ?ий иденÑ?иÑ?икаÑ?оÑ? 1"
#: ../addressbook/libebook/e-contact.c:225
-msgid "ICQ Work Id 2"
-msgstr "ICQ - Ñ?абоÑ?ий иденÑ?иÑ?икаÑ?оÑ? 2"
+#| msgid "ICQ Work Id 2"
+msgid "ICQ Work ID 2"
+msgstr "ICQ â?? Ñ?абоÑ?ий иденÑ?иÑ?икаÑ?оÑ? 2"
#: ../addressbook/libebook/e-contact.c:226
-msgid "ICQ Work Id 3"
-msgstr "ICQ - Ñ?абоÑ?ий иденÑ?иÑ?икаÑ?оÑ? 3"
+#| msgid "ICQ Work Id 3"
+msgid "ICQ Work ID 3"
+msgstr "ICQ â?? Ñ?абоÑ?ий иденÑ?иÑ?икаÑ?оÑ? 3"
#. Last modified time
#: ../addressbook/libebook/e-contact.c:229
@@ -503,11 +604,13 @@ msgid "AIM Screen Name List"
msgstr "СпиÑ?ок Ñ?кÑ?аннÑ?Ñ? имен AIM"
#: ../addressbook/libebook/e-contact.c:250
-msgid "GroupWise Id List"
+#| msgid "GroupWise Id List"
+msgid "GroupWise ID List"
msgstr "СпиÑ?ок иденÑ?иÑ?икаÑ?оÑ?ов Groupwise"
#: ../addressbook/libebook/e-contact.c:251
-msgid "Jabber Id List"
+#| msgid "Jabber Id List"
+msgid "Jabber ID List"
msgstr "СпиÑ?ок иденÑ?иÑ?икаÑ?оÑ?ов Jabber"
#: ../addressbook/libebook/e-contact.c:252
@@ -519,7 +622,8 @@ msgid "MSN Screen Name List"
msgstr "СпиÑ?ок Ñ?кÑ?аннÑ?Ñ? имен MSN"
#: ../addressbook/libebook/e-contact.c:254
-msgid "ICQ Id List"
+#| msgid "ICQ Id List"
+msgid "ICQ ID List"
msgstr "СпиÑ?ок иденÑ?иÑ?икаÑ?оÑ?ов ICQ"
#: ../addressbook/libebook/e-contact.c:256
@@ -539,8 +643,7 @@ msgid "Birth Date"
msgstr "Ð?аÑ?а Ñ?ождениÑ?"
#: ../addressbook/libebook/e-contact.c:262
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:715
-#: ../libedataserver/e-categories.c:45
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
msgid "Anniversary"
msgstr "Ð?одовÑ?ина"
@@ -550,31 +653,38 @@ msgid "X.509 Certificate"
msgstr "СеÑ?Ñ?иÑ?икаÑ? X.509"
#: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 1"
-msgstr "Gadu-Gadu - домаÑ?ний иденÑ?иÑ?икаÑ?оÑ? 1"
+#| msgid "Gadu-Gadu Home Id 1"
+msgid "Gadu-Gadu Home ID 1"
+msgstr "Gadu-Gadu â?? домаÑ?ний иденÑ?иÑ?икаÑ?оÑ? 1"
#: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Home Id 2"
-msgstr "Gadu-Gadu - домаÑ?ний иденÑ?иÑ?икаÑ?оÑ? 2"
+#| msgid "Gadu-Gadu Home Id 2"
+msgid "Gadu-Gadu Home ID 2"
+msgstr "Gadu-Gadu â?? домаÑ?ний иденÑ?иÑ?икаÑ?оÑ? 2"
#: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Home Id 3"
-msgstr "Gadu-Gadu - домаÑ?ний иденÑ?иÑ?икаÑ?оÑ? 3"
+#| msgid "Gadu-Gadu Home Id 3"
+msgid "Gadu-Gadu Home ID 3"
+msgstr "Gadu-Gadu â?? домаÑ?ний иденÑ?иÑ?икаÑ?оÑ? 3"
#: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 1"
-msgstr "Gadu-Gadu - Ñ?абоÑ?ий иденÑ?иÑ?икаÑ?оÑ? 1"
+#| msgid "Gadu-Gadu Work Id 1"
+msgid "Gadu-Gadu Work ID 1"
+msgstr "Gadu-Gadu â?? Ñ?абоÑ?ий иденÑ?иÑ?икаÑ?оÑ? 1"
#: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Work Id 2"
-msgstr "Gadu-Gadu - Ñ?абоÑ?ий иденÑ?иÑ?икаÑ?оÑ? 2"
+#| msgid "Gadu-Gadu Work Id 2"
+msgid "Gadu-Gadu Work ID 2"
+msgstr "Gadu-Gadu â?? Ñ?абоÑ?ий иденÑ?иÑ?икаÑ?оÑ? 2"
#: ../addressbook/libebook/e-contact.c:272
-msgid "Gadu-Gadu Work Id 3"
-msgstr "Gadu-Gadu - Ñ?абоÑ?ий иденÑ?иÑ?икаÑ?оÑ? 3"
+#| msgid "Gadu-Gadu Work Id 3"
+msgid "Gadu-Gadu Work ID 3"
+msgstr "Gadu-Gadu â?? Ñ?абоÑ?ий иденÑ?иÑ?икаÑ?оÑ? 3"
#: ../addressbook/libebook/e-contact.c:273
-msgid "Gadu-Gadu Id List"
+#| msgid "Gadu-Gadu Id List"
+msgid "Gadu-Gadu ID List"
msgstr "СпиÑ?ок иденÑ?иÑ?икаÑ?оÑ?ов Gadu-Gadu"
#. Geo information
@@ -618,354 +728,562 @@ msgstr "СпиÑ?ок Ñ?кÑ?аннÑ?Ñ? имен Skype"
msgid "SIP address"
msgstr "Ð?дÑ?еÑ? SIP"
-#: ../addressbook/libebook/e-contact.c:1513
+#: ../addressbook/libebook/e-contact.c:1517
#: ../addressbook/libebook/e-destination.c:739
msgid "Unnamed List"
msgstr "Ð?езÑ?мÑ?ннÑ?й Ñ?пиÑ?ок"
-#: ../addressbook/libedata-book/e-data-book-factory.c:290
+#: ../addressbook/libedata-book/e-data-book-factory.c:304
#, c-format
msgid "Empty URI"
msgstr "Ð?Ñ?Ñ?Ñ?ой URI"
-#: ../addressbook/libedata-book/e-data-book-factory.c:305
-#: ../addressbook/libedata-book/e-data-book-factory.c:332
-#: ../calendar/libedata-cal/e-data-cal-factory.c:323
-#: ../calendar/libedata-cal/e-data-cal-factory.c:332
+#: ../addressbook/libedata-book/e-data-book-factory.c:323
+#: ../addressbook/libedata-book/e-data-book-factory.c:361
+#: ../calendar/libedata-cal/e-data-cal-factory.c:352
+#: ../calendar/libedata-cal/e-data-cal-factory.c:364
#, c-format
msgid "Invalid source"
msgstr "Ð?евеÑ?нÑ?й иÑ?Ñ?оÑ?ник"
-#: ../addressbook/libedata-book/e-data-book.c:301
-msgid "Cannot open book"
-msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? книгÑ?"
+#: ../addressbook/libedata-book/e-data-book.c:173
+#: ../calendar/libedata-cal/e-data-cal.c:110
+msgid "Success"
+msgstr "УÑ?пеÑ?но"
+
+#: ../addressbook/libedata-book/e-data-book.c:174
+#: ../calendar/libedata-cal/e-data-cal.c:111
+#| msgid "Repository is offline"
+msgid "Repository offline"
+msgstr "РепозиÑ?оÑ?ий оÑ?клÑ?Ñ?Ñ?н оÑ? Ñ?еÑ?и"
+
+#: ../addressbook/libedata-book/e-data-book.c:175
+#: ../calendar/libecal/e-cal.c:4159
+#: ../calendar/libedata-cal/e-data-cal.c:112
+msgid "Permission denied"
+msgstr "Ð?оÑ?Ñ?Ñ?п запÑ?еÑ?ен"
-#: ../addressbook/libedata-book/e-data-book.c:319
-msgid "Cannot remove book"
-msgstr "Ð?евозможно Ñ?далиÑ?Ñ? пÑ?Ñ?Ñ?Ñ?Ñ? книгÑ?"
+#: ../addressbook/libedata-book/e-data-book.c:176
+#| msgid "Object not found"
+msgid "Contact not found"
+msgstr "Ð?онÑ?акÑ? не найден"
+
+#: ../addressbook/libedata-book/e-data-book.c:177
+#| msgid "Object ID already exists"
+msgid "Contact ID already exists"
+msgstr "Ð?денÑ?иÑ?икаÑ?оÑ? конÑ?акÑ?а Ñ?же Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?"
+
+#: ../addressbook/libedata-book/e-data-book.c:178
+#: ../calendar/libedata-cal/e-data-cal.c:117
+#| msgid "Authentication failed"
+msgid "Authentication Failed"
+msgstr "Сбой аÑ?Ñ?енÑ?иÑ?икаÑ?ии"
+
+#: ../addressbook/libedata-book/e-data-book.c:179
+#: ../calendar/libedata-cal/e-data-cal.c:118
+#| msgid "Authentication required"
+msgid "Authentication Required"
+msgstr "ТÑ?ебÑ?еÑ?Ñ?Ñ? аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?"
-#: ../addressbook/libedata-book/e-data-book.c:331
-#: ../addressbook/libedata-book/e-data-book.c:346
-msgid "Cannot get contact"
-msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? конÑ?акÑ?"
+#: ../addressbook/libedata-book/e-data-book.c:180
+#: ../calendar/libedata-cal/e-data-cal.c:119
+msgid "Unsupported field"
+msgstr "Ð?еподдеÑ?живаемое поле"
-#: ../addressbook/libedata-book/e-data-book.c:358
-msgid "Empty query"
-msgstr "Ð?Ñ?Ñ?Ñ?ой запÑ?оÑ?"
+#: ../addressbook/libedata-book/e-data-book.c:181
+#: ../calendar/libedata-cal/e-data-cal.c:121
+msgid "Unsupported authentication method"
+msgstr "Ð?еподдеÑ?живаемÑ?й меÑ?од аÑ?Ñ?енÑ?иÑ?икаÑ?ии"
-#: ../addressbook/libedata-book/e-data-book.c:402
-msgid "Cannot authenticate user"
-msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?овеÑ?Ñ?и пÑ?овеÑ?кÑ? подлинноÑ?Ñ?и полÑ?зоваÑ?елÑ?"
+#: ../addressbook/libedata-book/e-data-book.c:182
+#: ../calendar/libedata-cal/e-data-cal.c:122
+msgid "TLS not available"
+msgstr "TLS недоÑ?Ñ?Ñ?пен"
-#: ../addressbook/libedata-book/e-data-book.c:414
-#: ../addressbook/libedata-book/e-data-book.c:429
-msgid "Cannot add contact"
-msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? конÑ?акÑ?"
+#: ../addressbook/libedata-book/e-data-book.c:184
+msgid "Book removed"
+msgstr "Ð?нига Ñ?далена"
-#: ../addressbook/libedata-book/e-data-book.c:444
-#: ../addressbook/libedata-book/e-data-book.c:459
-msgid "Cannot modify contact"
-msgstr "Ð?е Ñ?далоÑ?Ñ? измениÑ?Ñ? конÑ?акÑ?"
+#: ../addressbook/libedata-book/e-data-book.c:185
+#: ../calendar/libedata-cal/e-data-cal.c:125
+#| msgid "This message is not available in offline mode."
+msgid "Not available in offline mode"
+msgstr "Ð?едоÑ?Ñ?Ñ?пно в авÑ?ономном Ñ?ежиме"
+
+#: ../addressbook/libedata-book/e-data-book.c:186
+#: ../calendar/libedata-cal/e-data-cal.c:126
+msgid "Search size limit exceeded"
+msgstr "Ð?Ñ?евÑ?Ñ?ено огÑ?аниÑ?ение на Ñ?азмеÑ? Ñ?езÑ?лÑ?Ñ?аÑ?ов поиÑ?ка"
-#: ../addressbook/libedata-book/e-data-book.c:494
-msgid "Cannot remove contacts"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?далиÑ?Ñ? конÑ?акÑ?"
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libedata-cal/e-data-cal.c:127
+msgid "Search time limit exceeded"
+msgstr "Ð?Ñ?евÑ?Ñ?ено огÑ?аниÑ?ение на вÑ?емÑ? поиÑ?ка"
-#: ../addressbook/libedata-book/e-data-book.c:569
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
+#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../calendar/libedata-cal/e-data-cal.c:128
msgid "Invalid query"
msgstr "Ð?екоÑ?Ñ?екÑ?нÑ?й запÑ?оÑ?"
-#: ../addressbook/libedata-book/e-data-book.c:598
-msgid "Cannot get changes"
-msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? изменениÑ?"
+#: ../addressbook/libedata-book/e-data-book.c:189
+#: ../calendar/libedata-cal/e-data-cal.c:129
+msgid "Query refused"
+msgstr "Ð?апÑ?оÑ? оÑ?клонÑ?н"
+
+#: ../addressbook/libedata-book/e-data-book.c:190
+#: ../calendar/libedata-cal/e-data-cal.c:130
+#| msgid "Could not cancel operation"
+msgid "Could not cancel"
+msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?мениÑ?Ñ?"
+
+#. { E_DATA_BOOK_STATUS_OTHER_ERROR, N_("Other error") },
+#. { OtherError, N_("Other error") },
+#: ../addressbook/libedata-book/e-data-book.c:192
+#: ../calendar/libedata-cal/e-data-cal.c:132
+msgid "Invalid server version"
+msgstr "Ð?едопÑ?Ñ?Ñ?имаÑ? веÑ?Ñ?иÑ? Ñ?еÑ?веÑ?а"
+
+#: ../addressbook/libedata-book/e-data-book.c:193
+#| msgid "Namespace"
+msgid "No space"
+msgstr "Ð?едоÑ?Ñ?аÑ?оÑ?но меÑ?Ñ?а"
+
+#: ../addressbook/libedata-book/e-data-book.c:194
+#: ../calendar/libecal/e-cal.c:4143
+#: ../calendar/libedata-cal/e-data-cal.c:133
+msgid "Invalid argument"
+msgstr "Ð?едопÑ?Ñ?Ñ?имÑ?й аÑ?гÑ?менÑ?"
+
+#. Translators: The string for NOT_SUPPORTED error
+#: ../addressbook/libedata-book/e-data-book.c:196
+#: ../calendar/libecal/e-cal.c:4182
+#: ../calendar/libedata-cal/e-data-cal.c:135
+#| msgid "Protocol not supported"
+msgid "Not supported"
+msgstr "Ð?е поддеÑ?живаеÑ?Ñ?Ñ?"
+
+#: ../addressbook/libedata-book/e-data-book.c:204
+#: ../calendar/libedata-cal/e-data-cal.c:143
+#| msgid "Other Phone"
+msgid "Other error"
+msgstr "Ð?Ñ?Ñ?гаÑ? оÑ?ибка"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:325
+#, c-format
+#| msgid "Cannot open book"
+msgid "Cannot open book: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? книгÑ?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:347
+#, c-format
+#| msgid "Cannot remove book"
+msgid "Cannot remove book: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? книгÑ?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:364
+#: ../addressbook/libedata-book/e-data-book.c:383
+#, c-format
+#| msgid "Cannot get contact"
+msgid "Cannot get contact: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? конÑ?акÑ?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:402
+#, c-format
+#| msgid "Empty query"
+msgid "Empty query: %s"
+msgstr "Ð?Ñ?Ñ?Ñ?ой запÑ?оÑ?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:418
+#, c-format
+#| msgid "Cannot get contact"
+msgid "Cannot get contact list: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?пиÑ?ок конÑ?акÑ?ов: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:457
+#, c-format
+#| msgid "Cannot authenticate user"
+msgid "Cannot authenticate user: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? аÑ?Ñ?енÑ?иÑ?иÑ?иÑ?оваÑ?Ñ? полÑ?зоваÑ?елÑ?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:472
+#: ../addressbook/libedata-book/e-data-book.c:491
+#, c-format
+#| msgid "Cannot add contact"
+msgid "Cannot add contact: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? конÑ?акÑ?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:513
+#: ../addressbook/libedata-book/e-data-book.c:532
+#, c-format
+#| msgid "Cannot modify contact"
+msgid "Cannot modify contact: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? измениÑ?Ñ? конÑ?акÑ?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:571
+#, c-format
+#| msgid "Cannot remove contacts"
+msgid "Cannot remove contacts: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?далиÑ?Ñ? конÑ?акÑ?Ñ?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:610
+#, c-format
+#| msgid "Cannot get message %s: %s"
+msgid "Cannot get supported fields: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? поддеÑ?живаемÑ?е полÑ?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:625
+#, c-format
+#| msgid "Cannot get message %s: %s"
+msgid "Cannot get required fields: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? необÑ?одимÑ?е полÑ?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:640
+#, c-format
+#| msgid "Unsupported authentication method"
+msgid "Cannot get supported authentication methods: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? поддеÑ?живаемÑ?е меÑ?одÑ? аÑ?Ñ?енÑ?иÑ?икаÑ?ии: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:666
+#: ../addressbook/libedata-book/e-data-book.c:677
+#, c-format
+#| msgid "Invalid query"
+msgid "Invalid query: %s"
+msgstr "Ð?едопÑ?Ñ?Ñ?имÑ?й запÑ?оÑ?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:713
+#, c-format
+#| msgid "Cannot get changes"
+msgid "Cannot get changes: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? изменениÑ?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:755
+#, c-format
+#| msgid "Operation failed: %s"
+msgid "Cancel operation failed: %s"
+msgstr "Ð?Ñ?оизоÑ?Ñ?л Ñ?бой пÑ?и оÑ?мене опеÑ?аÑ?ии: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:521
+#, c-format
+msgid "Server is unreachable (%s)"
+msgstr "СеÑ?веÑ? недоÑ?Ñ?Ñ?пен (%s)"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:549
+#, c-format
+#| msgid ""
+#| "Unexpected GnuPG status message encountered:\n"
+#| "\n"
+#| "%s"
+msgid "Unexpected HTTP status code %d returned (%s)"
+msgstr "Ð?олÑ?Ñ?ен неожиданнÑ?й код (%d) Ñ?оÑ?Ñ?оÑ?ниÑ? HTTP (%s)"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2090
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2490
+#, c-format
+msgid ""
+"Server is unreachable, calendar is opened in read-only mode.\n"
+"Error message: %s"
+msgstr ""
+"СеÑ?веÑ? недоÑ?Ñ?Ñ?пен, календаÑ?Ñ? оÑ?кÑ?Ñ?Ñ? в Ñ?ежиме «Ñ?олÑ?ко Ñ?Ñ?ение».\n"
+"СообÑ?ение об оÑ?ибке: %s"
-#: ../addressbook/libedata-book/e-data-book.c:699
-msgid "Cannot complete operation"
-msgstr "Ð?е Ñ?далоÑ?Ñ? завеÑ?Ñ?иÑ?Ñ? опеÑ?аÑ?иÑ?"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4241
+msgid "Calendar doesn't support Free/Busy"
+msgstr "Ð?алендаÑ?Ñ? не поддеÑ?живаеÑ? инÑ?оÑ?маÑ?иÑ? о занÑ?Ñ?оÑ?Ñ?и"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
-#: ../libedataserver/e-categories.c:46
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:725
msgid "Birthday"
msgstr "Ð?енÑ? Ñ?ождениÑ?"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:746
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:754
#, c-format
msgid "Birthday: %s"
msgstr "Ð?енÑ? Ñ?ождениÑ?: %s"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:770
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:778
#, c-format
msgid "Anniversary: %s"
msgstr "Ð?одовÑ?ина: %s"
-#: ../calendar/backends/file/e-cal-backend-file.c:236
+#: ../calendar/backends/file/e-cal-backend-file.c:251
msgid "Cannot save calendar data: Malformed URI."
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оÑ?Ñ?аниÑ?Ñ? даннÑ?е календаÑ?Ñ?: Ð?евеÑ?нÑ?й URI."
-#: ../calendar/backends/file/e-cal-backend-file.c:243
-#: ../calendar/backends/file/e-cal-backend-file.c:249
+#: ../calendar/backends/file/e-cal-backend-file.c:258
+#: ../calendar/backends/file/e-cal-backend-file.c:264
msgid "Cannot save calendar data"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оÑ?Ñ?аниÑ?Ñ? даннÑ?е календаÑ?Ñ?"
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:342
-msgid "Could not create thread for getting deltas"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? поÑ?ок длÑ? полÑ?Ñ?ениÑ? Ñ?аÑ?Ñ?ождений"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:374
-#: ../calendar/backends/google/e-cal-backend-google.c:1144
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1081
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1382
-#: ../calendar/backends/http/e-cal-backend-http.c:678
-#: ../calendar/backends/weather/e-cal-backend-weather.c:492
-msgid "Could not create cache file"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? Ñ?айл кÑ?Ñ?а"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:387
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1094
-msgid "Could not create thread for populating cache"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? поÑ?ок длÑ? заполнениÑ? кÑ?Ñ?а"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2121
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2105
msgid "Reply Requested: by "
msgstr "Ð?апÑ?оÑ?ен оÑ?веÑ?: "
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2126
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2110
msgid "Reply Requested: When convenient"
msgstr "Ð?апÑ?оÑ?ен оÑ?веÑ?: Ð?огда Ñ?добно"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:283
-#, c-format
-msgid "Loading %s items"
-msgstr "Ð?агÑ?Ñ?жаÑ?Ñ?Ñ?Ñ? %s Ñ?леменÑ?ов"
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:329
+#| msgid "Loading %s items"
+msgid "Loading Appointment items"
+msgstr "Ð?агÑ?Ñ?зка Ñ?леменÑ?ов «Ð?Ñ?Ñ?Ñ?еÑ?а»"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:331
+#| msgid "Loading %s items"
+msgid "Loading Task items"
+msgstr "Ð?агÑ?Ñ?зка Ñ?леменÑ?ов «Ð?адаÑ?а»"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:333
+#| msgid "Loading %s items"
+msgid "Loading Note items"
+msgstr "Ð?агÑ?Ñ?зка Ñ?леменÑ?ов «Ð?Ñ?имеÑ?ание»"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:335
+#| msgid "Loading %s items"
+msgid "Loading items"
+msgstr "Ð?агÑ?Ñ?зка Ñ?леменÑ?ов"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:919
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:951
msgid "Calendar"
msgstr "Ð?алендаÑ?Ñ?"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:977
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1014
msgid "Invalid server URI"
msgstr "Ð?евеÑ?нÑ?й URI Ñ?еÑ?веÑ?а"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:996
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1005
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1099
-#: ../calendar/libecal/e-cal.c:4020
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1334
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1370
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1385
-#: ../camel/providers/groupwise/camel-groupwise-store.c:591
-#: ../camel/providers/groupwise/camel-groupwise-store.c:766
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:181
-msgid "Authentication failed"
-msgstr "Сбой пÑ?овеÑ?ки подлинноÑ?Ñ?и"
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1115
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1361
+#: ../calendar/backends/http/e-cal-backend-http.c:783
+#: ../calendar/backends/weather/e-cal-backend-weather.c:520
+msgid "Could not create cache file"
+msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? Ñ?айл кÑ?Ñ?а"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1127
+msgid "Could not create thread for populating cache"
+msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? поÑ?ок длÑ? заполнениÑ? кÑ?Ñ?а"
-#: ../calendar/backends/http/e-cal-backend-http.c:335
+#: ../calendar/backends/http/e-cal-backend-http.c:423
msgid "Redirected to Invalid URI"
msgstr "Ð?еÑ?еадÑ?еÑ?ован на недопÑ?Ñ?Ñ?имÑ?й URI"
-#: ../calendar/backends/http/e-cal-backend-http.c:358
+#: ../calendar/backends/http/e-cal-backend-http.c:456
msgid "Bad file format."
msgstr "Ð?евеÑ?нÑ?й Ñ?оÑ?маÑ? Ñ?айла."
-#: ../calendar/backends/http/e-cal-backend-http.c:365
+#: ../calendar/backends/http/e-cal-backend-http.c:463
msgid "Not a calendar."
-msgstr "Ð?е Ñ?влÑ?еÑ?Ñ?Ñ? календаÑ?ем."
+msgstr "Ð?е Ñ?влÑ?еÑ?Ñ?Ñ? календаÑ?Ñ?м."
-#: ../calendar/backends/weather/e-cal-backend-weather.c:152
+#: ../calendar/backends/weather/e-cal-backend-weather.c:186
msgid "Could not retrieve weather data"
-msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? даннÑ?е погодÑ?"
+msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? инÑ?оÑ?маÑ?иÑ? о погоде"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
msgid "Weather: Fog"
msgstr "Ð?огода: ТÑ?ман"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
msgid "Weather: Cloudy Night"
msgstr "Ð?огода: Ð?блаÑ?наÑ? ноÑ?Ñ?"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
msgid "Weather: Cloudy"
msgstr "Ð?огода: Ð?блаÑ?но"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
msgid "Weather: Overcast"
msgstr "Ð?огода: Ð?аÑ?мÑ?Ñ?но"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
msgid "Weather: Showers"
msgstr "Ð?огода: Ð?ожди"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:256
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
msgid "Weather: Snow"
msgstr "Ð?огода: Снег"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:257
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
msgid "Weather: Clear Night"
msgstr "Ð?огода: ЯÑ?наÑ? ноÑ?Ñ?"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:258
+#: ../calendar/backends/weather/e-cal-backend-weather.c:293
msgid "Weather: Sunny"
msgstr "Ð?огода: СолнеÑ?но"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:259
+#: ../calendar/backends/weather/e-cal-backend-weather.c:294
msgid "Weather: Thunderstorms"
msgstr "Ð?огода: Ð?Ñ?озÑ?"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:405
+#: ../calendar/backends/weather/e-cal-backend-weather.c:440
msgid "Forecast"
msgstr "Ð?Ñ?огноз"
-#: ../calendar/libecal/e-cal-component.c:1286
+#: ../calendar/libecal/e-cal-component.c:1299
msgid "Untitled appointment"
msgstr "Ð?еозаглавленнаÑ? вÑ?Ñ?Ñ?еÑ?а"
-#: ../calendar/libecal/e-cal-recur.c:3951
+#: ../calendar/libecal/e-cal-recur.c:3979
msgid "1st"
msgstr "1-ое"
-#: ../calendar/libecal/e-cal-recur.c:3952
+#: ../calendar/libecal/e-cal-recur.c:3980
msgid "2nd"
msgstr "2-ое"
-#: ../calendar/libecal/e-cal-recur.c:3953
+#: ../calendar/libecal/e-cal-recur.c:3981
msgid "3rd"
msgstr "3-е"
-#: ../calendar/libecal/e-cal-recur.c:3954
+#: ../calendar/libecal/e-cal-recur.c:3982
msgid "4th"
msgstr "4-ое"
-#: ../calendar/libecal/e-cal-recur.c:3955
+#: ../calendar/libecal/e-cal-recur.c:3983
msgid "5th"
msgstr "5-ое"
-#: ../calendar/libecal/e-cal-recur.c:3956
+#: ../calendar/libecal/e-cal-recur.c:3984
msgid "6th"
msgstr "6-ое"
-#: ../calendar/libecal/e-cal-recur.c:3957
+#: ../calendar/libecal/e-cal-recur.c:3985
msgid "7th"
msgstr "7-ое"
-#: ../calendar/libecal/e-cal-recur.c:3958
+#: ../calendar/libecal/e-cal-recur.c:3986
msgid "8th"
msgstr "8-ое"
-#: ../calendar/libecal/e-cal-recur.c:3959
+#: ../calendar/libecal/e-cal-recur.c:3987
msgid "9th"
msgstr "9-ое"
-#: ../calendar/libecal/e-cal-recur.c:3960
+#: ../calendar/libecal/e-cal-recur.c:3988
msgid "10th"
msgstr "10-ое"
-#: ../calendar/libecal/e-cal-recur.c:3961
+#: ../calendar/libecal/e-cal-recur.c:3989
msgid "11th"
msgstr "11-ое"
-#: ../calendar/libecal/e-cal-recur.c:3962
+#: ../calendar/libecal/e-cal-recur.c:3990
msgid "12th"
msgstr "12-ое"
-#: ../calendar/libecal/e-cal-recur.c:3963
+#: ../calendar/libecal/e-cal-recur.c:3991
msgid "13th"
msgstr "13-ое"
-#: ../calendar/libecal/e-cal-recur.c:3964
+#: ../calendar/libecal/e-cal-recur.c:3992
msgid "14th"
msgstr "14-ое"
-#: ../calendar/libecal/e-cal-recur.c:3965
+#: ../calendar/libecal/e-cal-recur.c:3993
msgid "15th"
msgstr "15-ое"
-#: ../calendar/libecal/e-cal-recur.c:3966
+#: ../calendar/libecal/e-cal-recur.c:3994
msgid "16th"
msgstr "16-ое"
-#: ../calendar/libecal/e-cal-recur.c:3967
+#: ../calendar/libecal/e-cal-recur.c:3995
msgid "17th"
msgstr "17-ое"
-#: ../calendar/libecal/e-cal-recur.c:3968
+#: ../calendar/libecal/e-cal-recur.c:3996
msgid "18th"
msgstr "18-ое"
-#: ../calendar/libecal/e-cal-recur.c:3969
+#: ../calendar/libecal/e-cal-recur.c:3997
msgid "19th"
msgstr "19-ое"
-#: ../calendar/libecal/e-cal-recur.c:3970
+#: ../calendar/libecal/e-cal-recur.c:3998
msgid "20th"
msgstr "20-ое"
-#: ../calendar/libecal/e-cal-recur.c:3971
+#: ../calendar/libecal/e-cal-recur.c:3999
msgid "21st"
msgstr "21-ое"
-#: ../calendar/libecal/e-cal-recur.c:3972
+#: ../calendar/libecal/e-cal-recur.c:4000
msgid "22nd"
msgstr "22-ое"
-#: ../calendar/libecal/e-cal-recur.c:3973
+#: ../calendar/libecal/e-cal-recur.c:4001
msgid "23rd"
msgstr "23-е"
-#: ../calendar/libecal/e-cal-recur.c:3974
+#: ../calendar/libecal/e-cal-recur.c:4002
msgid "24th"
msgstr "24-ое"
-#: ../calendar/libecal/e-cal-recur.c:3975
+#: ../calendar/libecal/e-cal-recur.c:4003
msgid "25th"
msgstr "25-ое"
-#: ../calendar/libecal/e-cal-recur.c:3976
+#: ../calendar/libecal/e-cal-recur.c:4004
msgid "26th"
msgstr "26-ое"
-#: ../calendar/libecal/e-cal-recur.c:3977
+#: ../calendar/libecal/e-cal-recur.c:4005
msgid "27th"
msgstr "27-ое"
-#: ../calendar/libecal/e-cal-recur.c:3978
+#: ../calendar/libecal/e-cal-recur.c:4006
msgid "28th"
msgstr "28-ое"
-#: ../calendar/libecal/e-cal-recur.c:3979
+#: ../calendar/libecal/e-cal-recur.c:4007
msgid "29th"
msgstr "29-ое"
-#: ../calendar/libecal/e-cal-recur.c:3980
+#: ../calendar/libecal/e-cal-recur.c:4008
msgid "30th"
msgstr "30-ое"
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:4009
msgid "31st"
msgstr "31-ое"
-#: ../calendar/libecal/e-cal-util.c:688 ../calendar/libecal/e-cal-util.c:715
+#: ../calendar/libecal/e-cal-util.c:678
+#: ../calendar/libecal/e-cal-util.c:705
msgid "High"
msgstr "Ð?Ñ?Ñ?окий"
-#: ../calendar/libecal/e-cal-util.c:690 ../calendar/libecal/e-cal-util.c:717
+#: ../calendar/libecal/e-cal-util.c:680
+#: ../calendar/libecal/e-cal-util.c:707
msgid "Normal"
msgstr "Ð?оÑ?малÑ?нÑ?й"
-#: ../calendar/libecal/e-cal-util.c:692 ../calendar/libecal/e-cal-util.c:719
+#: ../calendar/libecal/e-cal-util.c:682
+#: ../calendar/libecal/e-cal-util.c:709
msgid "Low"
msgstr "Ð?изкий"
#. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:713
+#: ../calendar/libecal/e-cal-util.c:703
msgid "Undefined"
-msgstr "Ð?еопÑ?еделено"
+msgstr "Ð?еопÑ?еделÑ?ннÑ?й"
-#: ../calendar/libecal/e-cal.c:1173 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1236
+#: ../libedataserverui/e-book-auth-util.c:206
+#: ../libedataserverui/e-book-auth-util.c:440
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "Ð?ведиÑ?е паÑ?олÑ? длÑ? %s (полÑ?зоваÑ?елÑ? %s)"
@@ -974,107 +1292,87 @@ msgstr "Ð?ведиÑ?е паÑ?олÑ? длÑ? %s (полÑ?зоваÑ?елÑ? %s)"
#. This password prompt will be prompted rarely. Since the key that is passed to
#. the auth_func corresponds to the parent user.
#.
-#: ../calendar/libecal/e-cal.c:1187
+#: ../calendar/libecal/e-cal.c:1250
#, c-format
msgid "Enter password for %s to enable proxy for user %s"
msgstr "Ð?ведиÑ?е паÑ?олÑ? к %s длÑ? вклÑ?Ñ?ениÑ? пÑ?окÑ?и длÑ? полÑ?зоваÑ?елÑ? %s"
-#: ../calendar/libecal/e-cal.c:3992
-msgid "Invalid argument"
-msgstr "Ð?едопÑ?Ñ?Ñ?имÑ?й аÑ?гÑ?менÑ?"
-
-#: ../calendar/libecal/e-cal.c:3994
+#: ../calendar/libecal/e-cal.c:4145
msgid "Backend is busy"
msgstr "Ð?омпоненÑ? занÑ?Ñ?"
-#: ../calendar/libecal/e-cal.c:3996
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:4147
msgid "Repository is offline"
-msgstr "РепозиÑ?оÑ?ий оÑ?клÑ?Ñ?ен оÑ? Ñ?еÑ?и"
+msgstr "РепозиÑ?оÑ?ий наÑ?одиÑ?Ñ?Ñ? в авÑ?ономном Ñ?ежиме"
-#: ../calendar/libecal/e-cal.c:3998
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
+#: ../calendar/libecal/e-cal.c:4149
msgid "No such calendar"
msgstr "Ð?еÑ? Ñ?акого календаÑ?Ñ?"
-#: ../calendar/libecal/e-cal.c:4000
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
+#: ../calendar/libecal/e-cal.c:4151
+#: ../calendar/libedata-cal/e-data-cal.c:114
#: ../servers/groupwise/e-gw-connection.c:235
msgid "Object not found"
msgstr "Ð?бÑ?екÑ? не найден"
-#: ../calendar/libecal/e-cal.c:4002
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
+#: ../calendar/libecal/e-cal.c:4153
+#: ../calendar/libedata-cal/e-data-cal.c:115
#: ../servers/groupwise/e-gw-connection.c:229
msgid "Invalid object"
msgstr "Ð?евеÑ?нÑ?й обÑ?екÑ?"
-#: ../calendar/libecal/e-cal.c:4004
+#: ../calendar/libecal/e-cal.c:4155
msgid "URI not loaded"
msgstr "URI не загÑ?Ñ?жен"
-#: ../calendar/libecal/e-cal.c:4006
+#: ../calendar/libecal/e-cal.c:4157
msgid "URI already loaded"
msgstr "URI Ñ?же загÑ?Ñ?жен"
-#: ../calendar/libecal/e-cal.c:4008
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
-msgid "Permission denied"
-msgstr "Ð?оÑ?Ñ?Ñ?п запÑ?еÑ?ен"
-
-#: ../calendar/libecal/e-cal.c:4010
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
+#: ../calendar/libecal/e-cal.c:4161
#: ../servers/groupwise/e-gw-connection.c:237
msgid "Unknown User"
msgstr "Ð?еизвеÑ?Ñ?нÑ?й полÑ?зоваÑ?елÑ?"
-#: ../calendar/libecal/e-cal.c:4012
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../calendar/libecal/e-cal.c:4163
+#: ../calendar/libedata-cal/e-data-cal.c:116
msgid "Object ID already exists"
msgstr "Ð?денÑ?иÑ?икаÑ?оÑ? обÑ?екÑ?а Ñ?же Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?"
-#: ../calendar/libecal/e-cal.c:4014
+#: ../calendar/libecal/e-cal.c:4165
msgid "Protocol not supported"
msgstr "Ð?Ñ?оÑ?окол не поддеÑ?живаеÑ?Ñ?Ñ?"
-#: ../calendar/libecal/e-cal.c:4016
+#: ../calendar/libecal/e-cal.c:4167
msgid "Operation has been canceled"
-msgstr "Ð?пеÑ?аÑ?иÑ? бÑ?ла оÑ?менена"
+msgstr "Ð?пеÑ?аÑ?иÑ? оÑ?менена"
-#: ../calendar/libecal/e-cal.c:4018
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
+#: ../calendar/libecal/e-cal.c:4169
msgid "Could not cancel operation"
msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?мениÑ?Ñ? опеÑ?аÑ?иÑ?"
-#: ../calendar/libecal/e-cal.c:4022
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:217
+#: ../calendar/libecal/e-cal.c:4171
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1310
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1328
+#: ../camel/providers/groupwise/camel-groupwise-store.c:632
+#: ../camel/providers/groupwise/camel-groupwise-store.c:814
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:87
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#, c-format
+msgid "Authentication failed"
+msgstr "Сбой пÑ?овеÑ?ки подлинноÑ?Ñ?и"
+
+#: ../calendar/libecal/e-cal.c:4173
+#: ../camel/providers/smtp/camel-smtp-transport.c:775
msgid "Authentication required"
msgstr "ТÑ?ебÑ?еÑ?Ñ?Ñ? аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?"
-#: ../calendar/libecal/e-cal.c:4024
-msgid "A CORBA exception has occurred"
-msgstr "Ð?Ñ?оизоÑ?ло иÑ?клÑ?Ñ?ение CORBA"
-
-#: ../calendar/libecal/e-cal.c:4026
-#: ../calendar/libedata-cal/e-cal-backend-util.c:146
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
-#: ../camel/providers/imap/camel-imap-command.c:432
-#: ../camel/providers/imap/camel-imap-store.c:741
-#: ../camel/providers/imap4/camel-imap4-engine.c:1547
-#: ../camel/providers/imap4/camel-imap4-engine.c:1585
-#: ../camel/providers/imap4/camel-imap4-engine.c:1629
-#: ../camel/providers/imap4/camel-imap4-engine.c:1684
-#: ../camel/providers/imap4/camel-imap4-store.c:311
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-#: ../camel/providers/pop3/camel-pop3-store.c:582
-#: ../servers/groupwise/e-gw-connection.c:243
-msgid "Unknown error"
-msgstr "Ð?еизвеÑ?Ñ?наÑ? оÑ?ибка"
+#: ../calendar/libecal/e-cal.c:4175
+#| msgid "A CORBA exception has occurred"
+msgid "A D-Bus exception has occurred"
+msgstr "Ð?Ñ?оизоÑ?ло иÑ?клÑ?Ñ?ение D-Bus"
-#: ../calendar/libecal/e-cal.c:4028
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
+#: ../calendar/libecal/e-cal.c:4179
msgid "No error"
msgstr "Ð?еÑ? оÑ?ибки"
@@ -1109,9 +1407,7 @@ msgstr "«%s» пÑ?едполагаеÑ? Ñ?Ñ?Ñ?окÑ? в каÑ?еÑ?Ñ?ве аÑ?г
#: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
#, c-format
msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
-msgstr ""
-"%s пÑ?едÑ?Ñ?маÑ?Ñ?иваеÑ?, Ñ?Ñ?о аÑ?гÑ?менÑ? 1 должен бÑ?Ñ?Ñ? Ñ?Ñ?Ñ?окой даÑ?Ñ? в Ñ?оÑ?маÑ?е ISO "
-"8601"
+msgstr "«%s» пÑ?едÑ?Ñ?маÑ?Ñ?иваеÑ?, Ñ?Ñ?о аÑ?гÑ?менÑ? 1 должен бÑ?Ñ?Ñ? Ñ?Ñ?Ñ?окой даÑ?Ñ? в Ñ?оÑ?маÑ?е ISO 8601"
#: ../calendar/libedata-cal/e-cal-backend-sexp.c:162
#: ../calendar/libedata-cal/e-cal-backend-sexp.c:363
@@ -1152,13 +1448,8 @@ msgstr "«%s» пÑ?едполагаеÑ? Ñ?Ñ?Ñ?окÑ? в каÑ?еÑ?Ñ?ве аÑ?г
#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
#, c-format
-msgid ""
-"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
-"\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
-"\"classification\""
-msgstr ""
-"«%s» пÑ?едполагаеÑ? одно из «any», «summary», «description», «location», «attendee», "
-"«organizer» или «classification» в каÑ?еÑ?Ñ?ве аÑ?гÑ?менÑ?а 1"
+msgid "\"%s\" expects the first argument to be either \"any\", \"summary\", or \"description\", or \"location\", or \"attendee\", or \"organizer\", or \"classification\""
+msgstr "«%s» пÑ?едполагаеÑ? одно из «any», «summary», «description», «location», «attendee», «organizer» или «classification» в каÑ?еÑ?Ñ?ве аÑ?гÑ?менÑ?а 1"
#: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
#, c-format
@@ -1167,237 +1458,267 @@ msgstr "«%s» пÑ?едполагаеÑ? по кÑ?айней меÑ?е 1 аÑ?гÑ?
#: ../calendar/libedata-cal/e-cal-backend-sexp.c:941
#, c-format
-msgid ""
-"\"%s\" expects all arguments to be strings or one and only one argument to "
-"be a boolean false (#f)"
-msgstr ""
-"«%s» пÑ?едполагаеÑ?, Ñ?Ñ?о вÑ?е аÑ?гÑ?менÑ?Ñ? - Ñ?Ñ?Ñ?оки или единÑ?Ñ?веннÑ?й аÑ?гÑ?менÑ? - "
-"логиÑ?еÑ?каÑ? ложÑ? (#f)"
+msgid "\"%s\" expects all arguments to be strings or one and only one argument to be a boolean false (#f)"
+msgstr "«%s» пÑ?едполагаеÑ?, Ñ?Ñ?о вÑ?е аÑ?гÑ?менÑ?Ñ? - Ñ?Ñ?Ñ?оки или единÑ?Ñ?веннÑ?й аÑ?гÑ?менÑ? - логиÑ?еÑ?каÑ? ложÑ? (#f)"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+#: ../calendar/libedata-cal/e-data-cal.c:113
msgid "Invalid range"
-msgstr "Ð?едопÑ?Ñ?Ñ?имÑ?й пÑ?омежÑ?Ñ?ок"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
-msgid "Unsupported field"
-msgstr "Ð?еподдеÑ?живаемое поле"
+msgstr "Ð?едопÑ?Ñ?Ñ?имÑ?й диапазон"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-data-cal.c:120
msgid "Unsupported method"
msgstr "Ð?еподдеÑ?живаемÑ?й меÑ?од"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
-msgid "Unsupported authentication method"
-msgstr "Ð?еподдеÑ?живаемÑ?й меÑ?од аÑ?Ñ?енÑ?иÑ?икаÑ?ии"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-msgid "TLS not available"
-msgstr "TLS недоÑ?Ñ?Ñ?пен"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-msgid "Offline mode unavailable"
-msgstr "Режим «вне Ñ?еÑ?и» недоÑ?Ñ?Ñ?пен"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-msgid "Search size limit exceeded"
-msgstr "Ð?Ñ?евÑ?Ñ?ено огÑ?аниÑ?ение на Ñ?азмеÑ? Ñ?езÑ?лÑ?Ñ?аÑ?ов поиÑ?ка"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-msgid "Search time limit exceeded"
-msgstr "Ð?Ñ?евÑ?Ñ?ено огÑ?аниÑ?ение на вÑ?емÑ? поиÑ?ка"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
-msgid "Query refused"
-msgstr "Ð?апÑ?оÑ? оÑ?клонÑ?н"
+#: ../calendar/libedata-cal/e-data-cal.c:123
+#| msgid "Folder '%s' does not exist."
+msgid "Calendar does not exist"
+msgstr "Ð?алендаÑ?Ñ? не Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
-msgid "Invalid server version"
-msgstr "Ð?евеÑ?наÑ? веÑ?Ñ?иÑ? Ñ?еÑ?веÑ?а"
+#: ../calendar/libedata-cal/e-data-cal.c:124
+#| msgid "Unknown User"
+msgid "Unknown user"
+msgstr "Ð?еизвеÑ?Ñ?нÑ?й полÑ?зоваÑ?елÑ?"
-#: ../calendar/libedata-cal/e-data-cal.c:491
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:610
#, c-format
-msgid "Cannot retrieve calendar address"
-msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? адÑ?еÑ? календаÑ?Ñ?"
+#| msgid "Cannot retrieve calendar address"
+msgid "Cannot retrieve calendar address: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? адÑ?еÑ? календаÑ?Ñ?: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:509
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:635
#, c-format
-msgid "Cannot retrieve calendar alarm e-mail address"
-msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? адÑ?еÑ? Ñ?л. поÑ?Ñ?Ñ? длÑ? оÑ?пÑ?авки Ñ?ведомлений календаÑ?Ñ?"
+#| msgid "Cannot retrieve calendar alarm e-mail address"
+msgid "Cannot retrieve calendar alarm e-mail address: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? адÑ?еÑ? Ñ?л. поÑ?Ñ?Ñ? длÑ? оÑ?пÑ?авки Ñ?ведомлений календаÑ?Ñ?: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:527
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:660
#, c-format
-msgid "Cannot retrieve calendar's ldap attribute"
-msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? аÑ?Ñ?ибÑ?Ñ? ldap календаÑ?Ñ?"
+#| msgid "Cannot retrieve calendar's ldap attribute"
+msgid "Cannot retrieve calendar's LDAP attribute: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? аÑ?Ñ?ибÑ?Ñ? LDAP: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:545
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:685
#, c-format
-msgid "Cannot retrieve calendar scheduling information"
-msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?аÑ?пиÑ?ание календаÑ?Ñ?"
+#| msgid "Cannot retrieve calendar scheduling information"
+msgid "Cannot retrieve calendar scheduling information: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?аÑ?пиÑ?ание календаÑ?Ñ?: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:562
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:709
#, c-format
-msgid "Cannot open calendar"
-msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? календаÑ?Ñ?"
+#| msgid "Cannot open calendar"
+msgid "Cannot open calendar: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? календаÑ?Ñ?: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:579
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:730
#, c-format
-msgid "Cannot refresh calendar"
-msgstr "Ð?е Ñ?далоÑ?Ñ? обновиÑ?Ñ? даннÑ?е календаÑ?Ñ?"
+#| msgid "Cannot refresh calendar"
+msgid "Cannot refresh calendar: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? обновиÑ?Ñ? даннÑ?е календаÑ?Ñ?: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:596
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:749
#, c-format
-msgid "Cannot remove calendar"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?далиÑ?Ñ? календаÑ?Ñ?"
+#| msgid "Cannot remove calendar"
+msgid "Cannot remove calendar: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?далиÑ?Ñ? календаÑ?Ñ?: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:615
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:770
#, c-format
-msgid "Cannot create calendar object"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? обÑ?екÑ? календаÑ?Ñ?"
+#| msgid "Cannot create calendar object"
+msgid "Cannot create calendar object: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? обÑ?екÑ? календаÑ?Ñ?: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:637
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:798
#, c-format
-msgid "Cannot modify calendar object"
-msgstr "Ð?е Ñ?далоÑ?Ñ? измениÑ?Ñ? обÑ?екÑ? календаÑ?Ñ?"
+#| msgid "Cannot modify calendar object"
+msgid "Cannot modify calendar object: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? измениÑ?Ñ? обÑ?екÑ? календаÑ?Ñ?: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:661
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:824
#, c-format
-msgid "Cannot remove calendar object"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?далиÑ?Ñ? обÑ?екÑ? календаÑ?Ñ?"
+#| msgid "Cannot remove calendar object"
+msgid "Cannot remove calendar object: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?далиÑ?Ñ? обÑ?екÑ? календаÑ?Ñ?: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:680
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:845
#, c-format
-msgid "Cannot receive calendar objects"
-msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? обÑ?екÑ?Ñ? календаÑ?Ñ?"
+#| msgid "Cannot receive calendar objects"
+msgid "Cannot receive calendar objects: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? обÑ?екÑ?Ñ? календаÑ?Ñ?: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:697
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:864
#, c-format
-msgid "Cannot discard calendar alarm"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?нÑ?Ñ?Ñ? Ñ?ведомление календаÑ?Ñ?"
+#| msgid "Cannot discard calendar alarm"
+msgid "Cannot discard calendar alarm: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?нÑ?Ñ?Ñ? Ñ?ведомление календаÑ?Ñ?: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:716
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:885
#, c-format
-msgid "Cannot send calendar objects"
-msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?пÑ?авиÑ?Ñ? обÑ?екÑ?Ñ? календаÑ?Ñ?"
+#| msgid "Cannot send calendar objects"
+msgid "Cannot send calendar objects: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?пÑ?авиÑ?Ñ? обÑ?екÑ?Ñ? календаÑ?Ñ?: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:751
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:912
#, c-format
-msgid "Cannot retrieve default calendar object path"
-msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? пÑ?Ñ?Ñ? обÑ?екÑ?а календаÑ?Ñ? по Ñ?молÑ?аниÑ?"
+#| msgid "Cannot retrieve default calendar object path"
+msgid "Cannot retrieve default calendar object path: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? пÑ?Ñ?Ñ? к обÑ?екÑ?Ñ? календаÑ?Ñ? по Ñ?молÑ?аниÑ?: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:769
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:937
#, c-format
-msgid "Cannot retrieve calendar object path"
-msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? пÑ?Ñ?Ñ? обÑ?екÑ?а календаÑ?Ñ?"
+#| msgid "Cannot retrieve calendar object path"
+msgid "Cannot retrieve calendar object path: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? пÑ?Ñ?Ñ? к обÑ?екÑ?Ñ? календаÑ?Ñ?: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:787
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:962
#, c-format
-msgid "Cannot retrieve calendar object list"
-msgstr "Ð?евозможно полÑ?Ñ?иÑ?Ñ? Ñ?пиÑ?ок обÑ?екÑ?ов календаÑ?Ñ?"
+#| msgid "Cannot retrieve calendar object list"
+msgid "Cannot retrieve calendar object list: %s"
+msgstr "Ð?евозможно полÑ?Ñ?иÑ?Ñ? Ñ?пиÑ?ок обÑ?екÑ?ов календаÑ?Ñ?: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:825
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:990
#, c-format
-msgid "Could not retrieve attachment list"
-msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?пиÑ?ок обÑ?екÑ?ов календаÑ?Ñ?"
+#| msgid "Could not retrieve attachment list"
+msgid "Could not retrieve attachment list: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?пиÑ?ок вложений: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:847
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1016
#, c-format
-msgid "Could not complete calendar query"
-msgstr "Ð?е Ñ?далоÑ?Ñ? завеÑ?Ñ?иÑ?Ñ? запÑ?оÑ? календаÑ?Ñ?"
+#| msgid "Could not complete calendar query"
+msgid "Could not complete calendar query: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? завеÑ?Ñ?иÑ?Ñ? запÑ?оÑ? календаÑ?Ñ?: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:865
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1041
#, c-format
-msgid "Could not retrieve calendar time zone"
-msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?аÑ?овой поÑ?Ñ? календаÑ?Ñ?"
+#| msgid "Could not retrieve calendar time zone"
+msgid "Could not retrieve calendar time zone: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?аÑ?овой поÑ?Ñ? календаÑ?Ñ?: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:883
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1066
#, c-format
-msgid "Could not add calendar time zone"
-msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? Ñ?аÑ?овой поÑ?Ñ? календаÑ?Ñ?"
+#| msgid "Could not add calendar time zone"
+msgid "Could not add calendar time zone: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? Ñ?аÑ?овой поÑ?Ñ? календаÑ?Ñ?: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:900
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1085
#, c-format
-msgid "Could not set default calendar time zone"
-msgstr "Ð?е Ñ?далоÑ?Ñ? задаÑ?Ñ? Ñ?аÑ?овой поÑ?Ñ? календаÑ?Ñ? по Ñ?молÑ?аниÑ?"
+#| msgid "Could not set default calendar time zone"
+msgid "Could not set default calendar time zone: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? задаÑ?Ñ? Ñ?аÑ?овой поÑ?Ñ? календаÑ?Ñ? по Ñ?молÑ?аниÑ?: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:921
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1108
#, c-format
-msgid "Cannot retrieve calendar changes"
-msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? изменениÑ? календаÑ?Ñ?"
+#| msgid "Cannot retrieve calendar changes"
+msgid "Cannot retrieve calendar changes: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? изменениÑ? календаÑ?Ñ?: %s"
-#: ../calendar/libedata-cal/e-data-cal.c:971
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1139
#, c-format
-msgid "Cannot retrieve calendar free/busy list"
-msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?пиÑ?ок Ñ?вободнÑ?Ñ?/занÑ?Ñ?Ñ?Ñ? дней календаÑ?Ñ?"
+#| msgid "Cannot retrieve calendar free/busy list"
+msgid "Cannot retrieve calendar free/busy list: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?пиÑ?ок занÑ?Ñ?оÑ?Ñ?и дней: %s"
-#: ../calendar/libedata-cal/e-data-cal-factory.c:339
+#: ../calendar/libedata-cal/e-data-cal-factory.c:374
#, c-format
msgid "Invalid URI"
msgstr "Ð?евеÑ?нÑ?й URI"
-#: ../calendar/libedata-cal/e-data-cal-factory.c:350
+#: ../calendar/libedata-cal/e-data-cal-factory.c:392
#, c-format
msgid "No backend factory for '%s' of '%s'"
msgstr "Ð?е Ñ?казан дÑ?айвеÑ? Ñ?абÑ?ики длÑ? «%s» Ñ? «%s»"
-#: ../calendar/libedata-cal/e-data-cal-factory.c:390
+#: ../calendar/libedata-cal/e-data-cal-factory.c:442
#, c-format
msgid "Could not instantiate backend"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? обÑ?екÑ? дÑ?айвеÑ?а"
-#: ../camel/camel-cipher-context.c:102
+#: ../camel/camel-cipher-context.c:204
+#, c-format
msgid "Signing is not supported by this cipher"
msgstr "Ð?одпиÑ?Ñ? не поддеÑ?живаеÑ?Ñ?Ñ? Ñ?Ñ?им Ñ?иÑ?Ñ?ом"
-#: ../camel/camel-cipher-context.c:128
-msgid "Signing message"
-msgstr "СообÑ?ение подпиÑ?Ñ?ваеÑ?Ñ?Ñ?"
-
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:217
+#, c-format
msgid "Verifying is not supported by this cipher"
msgstr "Ð?Ñ?овеÑ?ка не поддеÑ?живаеÑ?Ñ?Ñ? Ñ?Ñ?им Ñ?иÑ?Ñ?ом"
-#: ../camel/camel-cipher-context.c:171
-msgid "Verifying message"
-msgstr "СообÑ?ение пÑ?овеÑ?Ñ?еÑ?Ñ?Ñ?"
-
-#: ../camel/camel-cipher-context.c:189
+#: ../camel/camel-cipher-context.c:233
+#, c-format
msgid "Encryption is not supported by this cipher"
msgstr "ШиÑ?Ñ?ование не поддеÑ?живаеÑ?Ñ?Ñ? Ñ?Ñ?им Ñ?иÑ?Ñ?ом"
-#: ../camel/camel-cipher-context.c:215
-msgid "Encrypting message"
-msgstr "СообÑ?ение Ñ?иÑ?Ñ?Ñ?еÑ?Ñ?Ñ?"
-
-#: ../camel/camel-cipher-context.c:232
+#: ../camel/camel-cipher-context.c:247
+#, c-format
msgid "Decryption is not supported by this cipher"
msgstr "РаÑ?Ñ?иÑ?Ñ?овка не поддеÑ?живаеÑ?Ñ?Ñ? Ñ?Ñ?им Ñ?иÑ?Ñ?ом"
-#: ../camel/camel-cipher-context.c:254
-msgid "Decrypting message"
-msgstr "СообÑ?ение Ñ?аÑ?Ñ?иÑ?Ñ?овÑ?ваеÑ?Ñ?Ñ?"
-
-#: ../camel/camel-cipher-context.c:271
+#: ../camel/camel-cipher-context.c:260
+#, c-format
msgid "You may not import keys with this cipher"
msgstr "Ð?мпоÑ?Ñ? клÑ?Ñ?ей не поддеÑ?живаеÑ?Ñ?Ñ? Ñ?Ñ?им Ñ?иÑ?Ñ?ом"
-#: ../camel/camel-cipher-context.c:301
+#: ../camel/camel-cipher-context.c:274
+#, c-format
msgid "You may not export keys with this cipher"
msgstr "ÐкÑ?поÑ?Ñ? клÑ?Ñ?ей не поддеÑ?живаеÑ?Ñ?Ñ? Ñ?Ñ?им Ñ?иÑ?Ñ?ом"
-#: ../camel/camel-data-cache.c:135
+#: ../camel/camel-cipher-context.c:815
+msgid "Signing message"
+msgstr "СообÑ?ение подпиÑ?Ñ?ваеÑ?Ñ?Ñ?"
+
+#: ../camel/camel-cipher-context.c:1056
+msgid "Encrypting message"
+msgstr "СообÑ?ение Ñ?иÑ?Ñ?Ñ?еÑ?Ñ?Ñ?"
+
+#: ../camel/camel-cipher-context.c:1183
+msgid "Decrypting message"
+msgstr "СообÑ?ение Ñ?аÑ?Ñ?иÑ?Ñ?овÑ?ваеÑ?Ñ?Ñ?"
+
+#: ../camel/camel-data-cache.c:181
+#, c-format
msgid "Unable to create cache path"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? пÑ?Ñ?Ñ? длÑ? кÑ?Ñ?а"
-#: ../camel/camel-data-cache.c:401
+#: ../camel/camel-data-cache.c:499
#, c-format
msgid "Could not remove cache entry: %s: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?далиÑ?Ñ? кÑ?Ñ?иÑ?ованнÑ?й Ñ?леменÑ?: %s: %s"
-#: ../camel/camel-db.c:411
+#: ../camel/camel-data-wrapper.c:147
+#, c-format
+#| msgid "No such message available."
+msgid "No stream available"
+msgstr "Ð?оÑ?ок недоÑ?Ñ?Ñ?пен"
+
+#: ../camel/camel-db.c:455
+#, c-format
msgid "Insufficient memory"
msgstr "Ð?едоÑ?Ñ?аÑ?оÑ?но памÑ?Ñ?и"
-#: ../camel/camel-disco-diary.c:197
+#: ../camel/camel-disco-diary.c:195
#, c-format
msgid ""
"Could not write log entry: %s\n"
@@ -1409,7 +1730,7 @@ msgstr ""
"воÑ?пÑ?оизведенÑ? поÑ?ле подклÑ?Ñ?ениÑ? к Ñ?еÑ?веÑ?Ñ?."
#: ../camel/camel-disco-diary.c:260
-#: ../camel/providers/imap/camel-imap-journal.c:320
+#: ../camel/providers/imap/camel-imap-journal.c:300
#, c-format
msgid ""
"Could not open '%s':\n"
@@ -1420,120 +1741,141 @@ msgstr ""
"%s\n"
"Ð?зменениÑ?, Ñ?деланнÑ?е в Ñ?Ñ?ой папке, не бÑ?дÑ?Ñ? Ñ?инÑ?Ñ?онизиÑ?ованÑ?."
-#: ../camel/camel-disco-diary.c:296
+#: ../camel/camel-disco-diary.c:304
msgid "Resynchronizing with server"
msgstr "СинÑ?Ñ?онизаÑ?иÑ? Ñ? Ñ?еÑ?веÑ?ом"
-#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:51
-msgid "Copy folder content locally for offline operation"
-msgstr "СкопиÑ?оваÑ?Ñ? Ñ?одеÑ?жимое папки на локалÑ?нÑ?Ñ? маÑ?инÑ? длÑ? авÑ?ономной Ñ?абоÑ?Ñ?"
-
-#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:107
+#: ../camel/camel-disco-folder.c:67
+#: ../camel/camel-offline-folder.c:83
msgid "Downloading new messages for offline mode"
msgstr "Ð?овÑ?е Ñ?ообÑ?ениÑ? загÑ?Ñ?жаÑ?Ñ?Ñ?Ñ? длÑ? авÑ?ономной Ñ?абоÑ?Ñ?"
-#: ../camel/camel-disco-folder.c:466
+#: ../camel/camel-disco-folder.c:402
#, c-format
msgid "Preparing folder '%s' for offline"
msgstr "Ð?одгоÑ?овка папки «%s» длÑ? авÑ?ономной Ñ?абоÑ?Ñ?"
-#: ../camel/camel-disco-store.c:400
-#: ../camel/providers/groupwise/camel-groupwise-store.c:216
-#: ../camel/providers/imap/camel-imap-store.c:1001
-#: ../camel/providers/imap/camel-imap-store.c:1843
-#: ../camel/providers/imap/camel-imap-store.c:2259
-#: ../camel/providers/imap/camel-imap-store.c:3068
+#: ../camel/camel-disco-folder.c:468
+#: ../camel/camel-offline-folder.c:316
+msgid "Copy folder content locally for offline operation"
+msgstr "СкопиÑ?оваÑ?Ñ? Ñ?одеÑ?жимое папки на локалÑ?нÑ?Ñ? маÑ?инÑ? длÑ? авÑ?ономной Ñ?абоÑ?Ñ?"
+
+#: ../camel/camel-disco-store.c:420
+#: ../camel/providers/groupwise/camel-groupwise-store.c:232
+#: ../camel/providers/imap/camel-imap-store.c:1250
+#: ../camel/providers/imap/camel-imap-store.c:1771
+#: ../camel/providers/imap/camel-imap-store.c:2244
+#: ../camel/providers/imap/camel-imap-store.c:3094
+#: ../camel/providers/imapx/camel-imapx-folder.c:298
+#: ../camel/providers/imapx/camel-imapx-folder.c:331
+#: ../camel/providers/imapx/camel-imapx-folder.c:385
+#: ../camel/providers/imapx/camel-imapx-folder.c:431
+#: ../camel/providers/imapx/camel-imapx-folder.c:465
+#: ../camel/providers/imapx/camel-imapx-folder.c:505
+#: ../camel/providers/imapx/camel-imapx-folder.c:541
+#: ../camel/providers/imapx/camel-imapx-store.c:277
+#: ../camel/providers/imapx/camel-imapx-store.c:1299
+#: ../camel/providers/imapx/camel-imapx-store.c:1387
+#: ../camel/providers/imapx/camel-imapx-store.c:1422
+#, c-format
msgid "You must be working online to complete this operation"
msgstr "Ð?лÑ? завеÑ?Ñ?ениÑ? данной опеÑ?аÑ?ии необÑ?одимо подклÑ?Ñ?ение к Ñ?еÑ?и"
-#: ../camel/camel-exception.c:260
-msgid "No description available"
-msgstr "Ð?пиÑ?ание недоÑ?Ñ?Ñ?пно"
+#: ../camel/camel-file-utils.c:719
+#, c-format
+msgid "Canceled"
+msgstr "Ð?Ñ?менено"
-#: ../camel/camel-filter-driver.c:794 ../camel/camel-filter-search.c:579
+#: ../camel/camel-filter-driver.c:839
+#: ../camel/camel-filter-search.c:582
#, c-format
msgid "Failed to create child process '%s': %s"
msgstr "Сбой пÑ?и Ñ?оздании доÑ?еÑ?него пÑ?оÑ?еÑ?Ñ?а «%s»: %s"
-#: ../camel/camel-filter-driver.c:836
+#: ../camel/camel-filter-driver.c:886
#, c-format
msgid "Invalid message stream received from %s: %s"
msgstr "Ð?евеÑ?нÑ?й поÑ?ок Ñ?ообÑ?ений полÑ?Ñ?ен из %s: %s"
-#: ../camel/camel-filter-driver.c:1025 ../camel/camel-filter-driver.c:1034
+#: ../camel/camel-filter-driver.c:1073
+#: ../camel/camel-filter-driver.c:1082
msgid "Syncing folders"
msgstr "СинÑ?Ñ?онизаÑ?иÑ? папок"
-#: ../camel/camel-filter-driver.c:1121 ../camel/camel-filter-driver.c:1522
+#: ../camel/camel-filter-driver.c:1170
+#: ../camel/camel-filter-driver.c:1620
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?азобÑ?аÑ?Ñ? Ñ?илÑ?Ñ?Ñ?: %s: %s"
-#: ../camel/camel-filter-driver.c:1130 ../camel/camel-filter-driver.c:1531
+#: ../camel/camel-filter-driver.c:1181
+#: ../camel/camel-filter-driver.c:1631
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "Ð?Ñ?ибка вÑ?полнениÑ? Ñ?илÑ?Ñ?Ñ?а: %s: %s"
-#: ../camel/camel-filter-driver.c:1216
+#: ../camel/camel-filter-driver.c:1278
+#, c-format
msgid "Unable to open spool folder"
msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? папкÑ? Ñ?пÑ?ла"
-#: ../camel/camel-filter-driver.c:1225
+#: ../camel/camel-filter-driver.c:1289
+#, c-format
msgid "Unable to process spool folder"
msgstr "Ð?е Ñ?далоÑ?Ñ? обÑ?абоÑ?аÑ?Ñ? папкÑ? Ñ?пÑ?ла"
-#: ../camel/camel-filter-driver.c:1241
+#: ../camel/camel-filter-driver.c:1307
#, c-format
msgid "Getting message %d (%d%%)"
msgstr "Ð?олÑ?Ñ?ение Ñ?ообÑ?ениÑ? %d (%d%%)"
-#: ../camel/camel-filter-driver.c:1245
-msgid "Cannot open message"
-msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? Ñ?ообÑ?ение"
-
-#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1264
+#: ../camel/camel-filter-driver.c:1314
+#: ../camel/camel-filter-driver.c:1336
#, c-format
msgid "Failed on message %d"
msgstr "Сбой на Ñ?ообÑ?ении %d"
-#: ../camel/camel-filter-driver.c:1278 ../camel/camel-filter-driver.c:1368
+#: ../camel/camel-filter-driver.c:1351
+#: ../camel/camel-filter-driver.c:1456
msgid "Syncing folder"
msgstr "СинÑ?Ñ?онизаÑ?иÑ? папки"
-#: ../camel/camel-filter-driver.c:1282 ../camel/camel-filter-driver.c:1373
+#: ../camel/camel-filter-driver.c:1356
+#: ../camel/camel-filter-driver.c:1462
msgid "Complete"
msgstr "Ð?авеÑ?Ñ?ена"
-#: ../camel/camel-filter-driver.c:1338
+#: ../camel/camel-filter-driver.c:1420
#, c-format
msgid "Getting message %d of %d"
msgstr "Ð?олÑ?Ñ?ение Ñ?ообÑ?ениÑ? %d из %d"
-#: ../camel/camel-filter-driver.c:1353
+#: ../camel/camel-filter-driver.c:1438
#, c-format
msgid "Failed at message %d of %d"
msgstr "Сбой на Ñ?ообÑ?ении %d из %d"
-#: ../camel/camel-filter-search.c:137
+#: ../camel/camel-filter-search.c:135
msgid "Failed to retrieve message"
msgstr "Сбой пÑ?и полÑ?Ñ?ении Ñ?ообÑ?ениÑ?"
-#: ../camel/camel-filter-search.c:399
+#: ../camel/camel-filter-search.c:401
msgid "Invalid arguments to (system-flag)"
msgstr "Ð?едопÑ?Ñ?Ñ?имÑ?е аÑ?гÑ?менÑ?Ñ? длÑ? system-flag"
-#: ../camel/camel-filter-search.c:414
+#: ../camel/camel-filter-search.c:416
msgid "Invalid arguments to (user-tag)"
msgstr "Ð?едопÑ?Ñ?Ñ?имÑ?е аÑ?гÑ?менÑ?Ñ? длÑ? user-tag"
-#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:735 ../camel/camel-filter-search.c:743
+#: ../camel/camel-filter-search.c:744
+#: ../camel/camel-filter-search.c:753
#, c-format
msgid "Error executing filter search: %s: %s"
msgstr "Ð?Ñ?ибка вÑ?полнениÑ? поиÑ?ка Ñ?илÑ?Ñ?Ñ?а: %s: %s"
-#: ../camel/camel-folder-search.c:351 ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:608
+#: ../camel/camel-folder-search.c:345
+#: ../camel/camel-folder-search.c:456
+#: ../camel/camel-folder-search.c:627
#, c-format
msgid ""
"Cannot parse search expression: %s:\n"
@@ -1542,8 +1884,9 @@ msgstr ""
"Ð?Ñ?ибка в Ñ?егÑ?лÑ?Ñ?ном вÑ?Ñ?ажении «%s»:\n"
"%s"
-#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:463
-#: ../camel/camel-folder-search.c:618
+#: ../camel/camel-folder-search.c:357
+#: ../camel/camel-folder-search.c:468
+#: ../camel/camel-folder-search.c:639
#, c-format
msgid ""
"Error executing search expression: %s:\n"
@@ -1552,73 +1895,89 @@ msgstr ""
"Ð?Ñ?ибка пÑ?и вÑ?полнении вÑ?Ñ?ажениÑ? поиÑ?ка «%s»:\n"
"%s"
-#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:852
+#: ../camel/camel-folder-search.c:843
+#: ../camel/camel-folder-search.c:885
#, c-format
msgid "(%s) requires a single bool result"
msgstr "(%s) Ñ?Ñ?ебÑ?еÑ? единÑ?Ñ?венного логиÑ?еÑ?кого Ñ?езÑ?лÑ?Ñ?аÑ?а"
-#: ../camel/camel-folder-search.c:905
+#: ../camel/camel-folder-search.c:938
#, c-format
msgid "(%s) not allowed inside %s"
-msgstr "(%s) не позволÑ?еÑ?Ñ?Ñ? внÑ?Ñ?Ñ?и %s"
+msgstr "(%s) запÑ?еÑ?ено в %s"
-#: ../camel/camel-folder-search.c:911 ../camel/camel-folder-search.c:918
+#: ../camel/camel-folder-search.c:944
+#: ../camel/camel-folder-search.c:951
#, c-format
msgid "(%s) requires a match type string"
msgstr "(%s) Ñ?Ñ?ебÑ?еÑ? Ñ?Ñ?Ñ?окÑ? Ñ?ооÑ?веÑ?Ñ?Ñ?виÑ?"
-#: ../camel/camel-folder-search.c:945
+#: ../camel/camel-folder-search.c:978
#, c-format
msgid "(%s) expects an array result"
msgstr "(%s) ожидаеÑ? Ñ?езÑ?лÑ?Ñ?аÑ? в виде маÑ?Ñ?ива"
-#: ../camel/camel-folder-search.c:954
+#: ../camel/camel-folder-search.c:987
#, c-format
msgid "(%s) requires the folder set"
msgstr "(%s) Ñ?Ñ?ебÑ?еÑ? набоÑ? папок"
-#: ../camel/camel-folder.c:676
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Ð?еподдеÑ?живаемаÑ? опеÑ?аÑ?иÑ?: добавиÑ?Ñ? Ñ?ообÑ?ение: длÑ? %s"
-
-#: ../camel/camel-folder.c:1381
+#: ../camel/camel-folder.c:220
#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Ð?еподдеÑ?живаемаÑ? опеÑ?аÑ?иÑ?: поиÑ?к вÑ?Ñ?ажениÑ?: длÑ? %s"
+#| msgid "Scanning for changed messages in %s"
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "Ð?зÑ?Ñ?ение нового Ñ?пам-Ñ?ообÑ?ениÑ? в «%s»"
+msgstr[1] "Ð?зÑ?Ñ?ение новÑ?Ñ? Ñ?пам-Ñ?ообÑ?ений в «%s»"
+msgstr[2] "Ð?зÑ?Ñ?ение новÑ?Ñ? Ñ?пам-Ñ?ообÑ?ений в «%s»"
-#: ../camel/camel-folder.c:1422
+#: ../camel/camel-folder.c:244
#, c-format
-msgid "Unsupported operation: count by expression: for %s"
-msgstr "Ð?еподдеÑ?живаемаÑ? опеÑ?аÑ?иÑ? опÑ?еделениÑ? колиÑ?еÑ?Ñ?ва по вÑ?Ñ?ажениÑ?: длÑ? %s"
+#| msgid "Scanning for changed messages in %s"
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "Ð?зÑ?Ñ?ение нового Ñ?ообÑ?ениÑ? в «%s»"
+msgstr[1] "Ð?зÑ?Ñ?ение новÑ?Ñ? Ñ?ообÑ?ений в «%s»"
+msgstr[2] "Ð?зÑ?Ñ?ение новÑ?Ñ? Ñ?ообÑ?ений в «%s»"
-#: ../camel/camel-folder.c:1461
+#: ../camel/camel-folder.c:270
#, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "Ð?еподдеÑ?живаемаÑ? опеÑ?аÑ?иÑ?: поиÑ?к по UID: длÑ? %s"
+#| msgid "Filtering new message(s)"
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "ФилÑ?Ñ?Ñ?аÑ?иÑ? нового Ñ?ообÑ?ениÑ? в «%s»"
+msgstr[1] "ФилÑ?Ñ?Ñ?аÑ?иÑ? новÑ?Ñ? Ñ?ообÑ?ений в «%s»"
+msgstr[2] "ФилÑ?Ñ?Ñ?аÑ?иÑ? новÑ?Ñ? Ñ?ообÑ?ений в «%s»"
-#: ../camel/camel-folder.c:1574
-#: ../camel/providers/local/camel-maildir-folder.c:387
+#: ../camel/camel-folder.c:879
+#: ../camel/providers/local/camel-maildir-folder.c:293
msgid "Moving messages"
msgstr "Ð?еÑ?емеÑ?ение Ñ?ообÑ?ений"
-#: ../camel/camel-folder.c:1574
+#: ../camel/camel-folder.c:882
msgid "Copying messages"
msgstr "Ð?опиÑ?ование Ñ?ообÑ?ений"
-#: ../camel/camel-folder.c:1915
-msgid "Learning junk"
-msgstr "Ð?зÑ?Ñ?аеÑ?Ñ?Ñ? Ñ?пам"
+#: ../camel/camel-folder.c:3251
+#, c-format
+#| msgid "Retrieving POP message %d"
+msgid "Retrieving message '%s'"
+msgstr "Ð?олÑ?Ñ?ение Ñ?ообÑ?ениÑ? «%s»"
-#: ../camel/camel-folder.c:1933
-msgid "Learning non-junk"
-msgstr "Ð?зÑ?Ñ?аеÑ?Ñ?Ñ? Ñ?ообÑ?ение, не Ñ?влÑ?Ñ?Ñ?ееÑ?Ñ? Ñ?памом"
+#: ../camel/camel-gpg-context.c:646
+#: ../camel/camel-gpg-context.c:651
+#: ../camel/camel-gpg-context.c:1276
+#, c-format
+msgid "Failed to execute gpg: %s"
+msgstr "Сбой пÑ?и иÑ?полнении gpg: %s"
-#: ../camel/camel-folder.c:1953
-msgid "Filtering new message(s)"
-msgstr "ФилÑ?Ñ?Ñ?аÑ?иÑ? новÑ?Ñ? Ñ?ообÑ?ений"
+#: ../camel/camel-gpg-context.c:651
+#: ../camel/providers/smtp/camel-smtp-transport.c:723
+#: ../camel/providers/smtp/camel-smtp-transport.c:778
+msgid "Unknown"
+msgstr "Ð?еизвеÑ?Ñ?но"
-#: ../camel/camel-gpg-context.c:760
+#: ../camel/camel-gpg-context.c:715
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -1629,22 +1988,25 @@ msgstr ""
"\n"
"%s"
-#: ../camel/camel-gpg-context.c:775
+#: ../camel/camel-gpg-context.c:732
+#, c-format
msgid "Failed to parse gpg userid hint."
msgstr "Ð?Ñ?ибка пÑ?и обÑ?абоÑ?ке подÑ?казки gpg userid."
-#: ../camel/camel-gpg-context.c:799 ../camel/camel-gpg-context.c:813
+#: ../camel/camel-gpg-context.c:757
+#: ../camel/camel-gpg-context.c:772
+#, c-format
msgid "Failed to parse gpg passphrase request."
msgstr "Ð?Ñ?ибка пÑ?и обÑ?абоÑ?ке запÑ?оÑ?а паÑ?олÑ?ной Ñ?Ñ?азÑ? gpg."
-#: ../camel/camel-gpg-context.c:833
+#: ../camel/camel-gpg-context.c:793
#, c-format
msgid ""
"You need a PIN to unlock the key for your\n"
"SmartCard: \"%s\""
msgstr "Ð?лÑ? Ñ?азблокиÑ?ованиÑ? Ñ?маÑ?Ñ?каÑ?Ñ?Ñ? необÑ?одимо ввеÑ?Ñ?и PIN: «%s»"
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:797
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
@@ -1653,141 +2015,143 @@ msgstr ""
"Ð?ведиÑ?е клÑ?Ñ?евÑ?Ñ? Ñ?Ñ?азÑ?, Ñ?Ñ?обÑ? Ñ?азблокиÑ?оваÑ?Ñ?\n"
"клÑ?Ñ? полÑ?зоваÑ?елÑ?: «%s»"
-#: ../camel/camel-gpg-context.c:842
+#: ../camel/camel-gpg-context.c:803
#, c-format
msgid "Unexpected request from GnuPG for '%s'"
msgstr "Ð?еожиданнÑ?й запÑ?оÑ? оÑ? GnuPG длÑ? «%s»"
-#: ../camel/camel-gpg-context.c:867 ../camel/camel-gpg-context.c:1113
-#: ../camel/providers/nntp/camel-nntp-store.c:1313
-msgid "Canceled."
-msgstr "Ð?Ñ?менено."
+#: ../camel/camel-gpg-context.c:832
+#: ../camel/camel-net-utils.c:515
+#: ../camel/camel-tcp-stream-raw.c:255
+#: ../camel/providers/imapx/camel-imapx-server.c:4894
+#: ../camel/providers/imapx/camel-imapx-server.c:4911
+#: ../camel/providers/imapx/camel-imapx-store.c:199
+#: ../camel/providers/nntp/camel-nntp-summary.c:402
+#: ../camel/providers/pop3/camel-pop3-folder.c:364
+#: ../camel/providers/pop3/camel-pop3-folder.c:429
+#: ../camel/providers/pop3/camel-pop3-folder.c:504
+#: ../camel/providers/pop3/camel-pop3-store.c:487
+#: ../libedataserverui/e-book-auth-util.c:229
+#, c-format
+#| msgid "Canceled"
+msgid "Cancelled"
+msgstr "Ð?Ñ?менено"
-#: ../camel/camel-gpg-context.c:881
+#: ../camel/camel-gpg-context.c:850
+#, c-format
msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr ""
-"Сбой пÑ?и Ñ?азблокиÑ?овании Ñ?екÑ?еÑ?ного клÑ?Ñ?а: Ñ?казано 3 некоÑ?Ñ?екÑ?нÑ?Ñ? паÑ?олÑ?нÑ?Ñ? "
-"Ñ?Ñ?азÑ?."
+msgstr "Сбой пÑ?и Ñ?азблокиÑ?овании Ñ?екÑ?еÑ?ного клÑ?Ñ?а: Ñ?казано 3 некоÑ?Ñ?екÑ?нÑ?Ñ? паÑ?олÑ?нÑ?Ñ? Ñ?Ñ?азÑ?."
-#: ../camel/camel-gpg-context.c:889
+#: ../camel/camel-gpg-context.c:862
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "Ð?еожиданнÑ?й оÑ?веÑ? оÑ? GnuPG: %s"
-#: ../camel/camel-gpg-context.c:988
-msgid "Failed to encrypt: No valid recipients specified."
-msgstr ""
-"Ð?е Ñ?далоÑ?Ñ? заÑ?иÑ?Ñ?оваÑ?Ñ? Ñ?Ñ?о Ñ?ообÑ?ение: Ð?е опÑ?еделенÑ? коÑ?Ñ?екÑ?нÑ?е полÑ?Ñ?аÑ?ели"
-
-#. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1262 ../camel/camel-gpg-context.c:1387
-#: ../camel/camel-gpg-context.c:1953 ../camel/camel-gpg-context.c:1998
-#, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "Сбой пÑ?и иÑ?полнении gpg: %s"
-
-#: ../camel/camel-gpg-context.c:1355 ../camel/camel-smime-context.c:605
+#: ../camel/camel-gpg-context.c:993
#, c-format
-msgid "Could not generate signing data: %s"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?генеÑ?иÑ?оваÑ?Ñ? даннÑ?е подпиÑ?и: %s"
-
-#: ../camel/camel-gpg-context.c:1402 ../camel/camel-gpg-context.c:1630
-#: ../camel/camel-gpg-context.c:1646 ../camel/camel-gpg-context.c:1728
-#: ../camel/camel-gpg-context.c:1743 ../camel/camel-gpg-context.c:1859
-#: ../camel/camel-gpg-context.c:1874 ../camel/camel-gpg-context.c:1969
-#: ../camel/camel-gpg-context.c:2014
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Ð?е Ñ?далоÑ?Ñ? заÑ?иÑ?Ñ?оваÑ?Ñ? Ñ?Ñ?о Ñ?ообÑ?ение: Ð?е опÑ?еделенÑ? коÑ?Ñ?екÑ?нÑ?е полÑ?Ñ?аÑ?ели"
+
+#: ../camel/camel-gpg-context.c:1539
+#: ../camel/camel-smime-context.c:828
+#| msgid "Could not generate signing data: %s"
+msgid "Could not generate signing data: "
+msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? даннÑ?е подпиÑ?и: "
+
+#: ../camel/camel-gpg-context.c:1586
+#: ../camel/camel-gpg-context.c:1786
+#: ../camel/camel-gpg-context.c:1896
+#: ../camel/camel-gpg-context.c:2042
+#: ../camel/camel-gpg-context.c:2141
+#: ../camel/camel-gpg-context.c:2189
msgid "Failed to execute gpg."
msgstr "Сбой пÑ?и иÑ?полнении gpg."
-#: ../camel/camel-gpg-context.c:1534 ../camel/camel-gpg-context.c:1540
-#: ../camel/camel-gpg-context.c:1546 ../camel/camel-gpg-context.c:1561
-#: ../camel/camel-smime-context.c:929 ../camel/camel-smime-context.c:940
-#: ../camel/camel-smime-context.c:947
+#: ../camel/camel-gpg-context.c:1666
+#: ../camel/camel-gpg-context.c:1674
+#: ../camel/camel-gpg-context.c:1682
+#: ../camel/camel-gpg-context.c:1701
+#: ../camel/camel-smime-context.c:952
+#: ../camel/camel-smime-context.c:966
+#: ../camel/camel-smime-context.c:975
+#, c-format
msgid "Cannot verify message signature: Incorrect message format"
msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?овеÑ?иÑ?Ñ? подпиÑ?Ñ? Ñ?ообÑ?ениÑ?: Ð?евеÑ?нÑ?й Ñ?оÑ?маÑ? Ñ?ообÑ?ениÑ?"
-#: ../camel/camel-gpg-context.c:1600
-#, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr ""
-"Ð?е Ñ?далоÑ?Ñ? пÑ?овеÑ?иÑ?Ñ? подпиÑ?Ñ? Ñ?ообÑ?ениÑ?: Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? вÑ?еменнÑ?й Ñ?айл: %s"
+#: ../camel/camel-gpg-context.c:1741
+#| msgid "Cannot verify message signature: Incorrect message format"
+msgid "Cannot verify message signature: "
+msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?овеÑ?иÑ?Ñ? подпиÑ?Ñ? Ñ?ообÑ?ениÑ?: "
-#: ../camel/camel-gpg-context.c:1711
-#, c-format
-msgid "Could not generate encrypting data: %s"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?генеÑ?иÑ?оваÑ?Ñ? даннÑ?е Ñ?иÑ?Ñ?ованиÑ?: %s"
+#: ../camel/camel-gpg-context.c:1862
+#| msgid "Could not generate encrypting data: %s"
+msgid "Could not generate encrypting data: "
+msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? даннÑ?е Ñ?иÑ?Ñ?ованиÑ?: "
-#: ../camel/camel-gpg-context.c:1761
+#: ../camel/camel-gpg-context.c:1915
msgid "This is a digitally encrypted message part"
msgstr "ÐÑ?о заÑ?иÑ?Ñ?ованнаÑ? Ñ?аÑ?Ñ?Ñ? Ñ?ообÑ?ениÑ?"
-#: ../camel/camel-gpg-context.c:1814 ../camel/camel-gpg-context.c:1822
-#: ../camel/camel-gpg-context.c:1841
+#: ../camel/camel-gpg-context.c:1973
+#: ../camel/camel-gpg-context.c:1982
+#: ../camel/camel-gpg-context.c:2005
+#, c-format
msgid "Cannot decrypt message: Incorrect message format"
msgstr "Ð?е Ñ?далоÑ?Ñ? декодиÑ?оваÑ?Ñ? Ñ?ообÑ?ение: Ð?евеÑ?нÑ?й Ñ?оÑ?маÑ? Ñ?ообÑ?ениÑ?"
-#: ../camel/camel-gpg-context.c:1831
+#: ../camel/camel-gpg-context.c:1993
+#, c-format
msgid "Failed to decrypt MIME part: protocol error"
msgstr "Сбой пÑ?и декодиÑ?овании Ñ?аÑ?Ñ?и MIME: оÑ?ибка пÑ?оÑ?окола"
-#: ../camel/camel-gpg-context.c:1909 ../camel/camel-smime-context.c:1205
+#: ../camel/camel-gpg-context.c:2082
+#: ../camel/camel-smime-context.c:1259
msgid "Encrypted content"
msgstr "Ð?аÑ?иÑ?Ñ?ованное Ñ?одеÑ?жимое"
-#: ../camel/camel-gpg-context.c:1930
-msgid "Unable to parse message content"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?азобÑ?аÑ?Ñ? Ñ?одеÑ?жимое Ñ?ообÑ?ениÑ?"
-
-#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:1999
-#: ../camel/providers/imap4/camel-imap4-utils.c:614
-#: ../camel/providers/smtp/camel-smtp-transport.c:165
-#: ../camel/providers/smtp/camel-smtp-transport.c:220
-msgid "Unknown"
-msgstr "Ð?еизвеÑ?Ñ?но"
-
-#: ../camel/camel-lock-client.c:104
+#: ../camel/camel-lock-client.c:106
#, c-format
msgid "Cannot build locking helper pipe: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? канал к блокиÑ?аÑ?оÑ?Ñ?: %s"
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock-client.c:130
#, c-format
msgid "Cannot fork locking helper: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? запÑ?Ñ?Ñ?иÑ?Ñ? блокиÑ?аÑ?оÑ?: %s"
-#: ../camel/camel-lock-client.c:203 ../camel/camel-lock-client.c:226
+#: ../camel/camel-lock-client.c:211
+#: ../camel/camel-lock-client.c:239
#, c-format
msgid "Could not lock '%s': protocol error with lock-helper"
msgstr "Ð?е Ñ?далоÑ?Ñ? заблокиÑ?оваÑ?Ñ? «%s»: оÑ?ибка пÑ?оÑ?окола Ñ? блокиÑ?аÑ?оÑ?ом"
-#: ../camel/camel-lock-client.c:216
+#: ../camel/camel-lock-client.c:227
#, c-format
msgid "Could not lock '%s'"
msgstr "Ð?е Ñ?далоÑ?Ñ? заблокиÑ?оваÑ?Ñ? «%s»"
-#: ../camel/camel-lock.c:103
+#: ../camel/camel-lock.c:102
#, c-format
msgid "Could not create lock file for %s: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? Ñ?айл блокиÑ?овки длÑ? %s: %s"
-#: ../camel/camel-lock.c:144
+#: ../camel/camel-lock.c:145
#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"Ð?Ñ?евÑ?Ñ?ение вÑ?емени ожиданиÑ? пÑ?и попÑ?Ñ?ке заблокиÑ?оваÑ?Ñ? Ñ?айл %s. Ð?опÑ?обÑ?йÑ?е "
-"еÑ?е Ñ?аз позже."
+#| msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr "Ð?Ñ?евÑ?Ñ?ено вÑ?емÑ? ожиданиÑ? блокиÑ?овки Ñ?айла %s. Ð?опÑ?обÑ?йÑ?е позже."
-#: ../camel/camel-lock.c:199
+#: ../camel/camel-lock.c:205
#, c-format
msgid "Failed to get lock using fcntl(2): %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? блокиÑ?овкÑ? иÑ?полÑ?зÑ?Ñ? fcntl(2): %s"
-#: ../camel/camel-lock.c:262
+#: ../camel/camel-lock.c:272
#, c-format
msgid "Failed to get lock using flock(2): %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? блокиÑ?овкÑ? иÑ?полÑ?зÑ?Ñ? flock(2): %s"
-#: ../camel/camel-movemail.c:106
+#: ../camel/camel-movemail.c:105
#, c-format
msgid "Could not check mail file %s: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?овеÑ?иÑ?Ñ? поÑ?Ñ?овÑ?й Ñ?айл %s: %s"
@@ -1797,144 +2161,149 @@ msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?овеÑ?иÑ?Ñ? поÑ?Ñ?овÑ?й Ñ?айл %s: %s"
msgid "Could not open mail file %s: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? поÑ?Ñ?овÑ?й Ñ?айл %s: %s"
-#: ../camel/camel-movemail.c:127
+#: ../camel/camel-movemail.c:129
#, c-format
msgid "Could not open temporary mail file %s: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? вÑ?еменнÑ?й поÑ?Ñ?овÑ?й Ñ?айл %s: %s"
-#: ../camel/camel-movemail.c:156
+#: ../camel/camel-movemail.c:159
#, c-format
msgid "Failed to store mail in temp file %s: %s"
msgstr "Сбой пÑ?и Ñ?оÑ?Ñ?анении поÑ?Ñ?Ñ? во вÑ?еменном Ñ?айле %s: %s"
-#: ../camel/camel-movemail.c:186
+#: ../camel/camel-movemail.c:193
#, c-format
msgid "Could not create pipe: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? канал: %s"
-#: ../camel/camel-movemail.c:198
+#: ../camel/camel-movemail.c:207
#, c-format
msgid "Could not fork: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? запÑ?Ñ?Ñ?иÑ?Ñ?: %s"
-#: ../camel/camel-movemail.c:236
+#: ../camel/camel-movemail.c:245
#, c-format
msgid "Movemail program failed: %s"
msgstr "Сбой пÑ?огÑ?аммÑ? Ñ?азбоÑ?а поÑ?Ñ?Ñ?: %s"
-#: ../camel/camel-movemail.c:237
+#: ../camel/camel-movemail.c:246
msgid "(Unknown error)"
msgstr "(Ð?еизвеÑ?Ñ?наÑ? оÑ?ибка)"
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:273
#, c-format
msgid "Error reading mail file: %s"
msgstr "Ð?Ñ?ибка пÑ?и Ñ?Ñ?ении поÑ?Ñ?ового Ñ?айла: %s"
-#: ../camel/camel-movemail.c:271
+#: ../camel/camel-movemail.c:286
#, c-format
msgid "Error writing mail temp file: %s"
msgstr "Ð?Ñ?ибка Ñ?оÑ?Ñ?анениÑ? вÑ?еменного поÑ?Ñ?ового Ñ?айла: %s"
-#: ../camel/camel-movemail.c:464 ../camel/camel-movemail.c:531
+#: ../camel/camel-movemail.c:483
+#: ../camel/camel-movemail.c:552
#, c-format
msgid "Error copying mail temp file: %s"
msgstr "Ð?Ñ?ибка копиÑ?ованиÑ? вÑ?еменного поÑ?Ñ?ового Ñ?айла: %s"
-#: ../camel/camel-multipart-signed.c:592
-msgid "parse error"
-msgstr "Ð?Ñ?ибка обÑ?абоÑ?ки"
+#: ../camel/camel-multipart-signed.c:322
+#, c-format
+#| msgid "No description available"
+msgid "No content available"
+msgstr "СодеÑ?жимое недоÑ?Ñ?Ñ?пно"
-#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:674
-#: ../camel/camel-net-utils.c:805
-#: ../camel/providers/pop3/camel-pop3-store.c:476
-#: ../camel/providers/pop3/camel-pop3-store.c:576
-msgid "Canceled"
-msgstr "Ð?Ñ?менено"
+#: ../camel/camel-multipart-signed.c:330
+#, c-format
+#| msgid "No description available"
+msgid "No signature available"
+msgstr "Ð?одпиÑ?Ñ? недоÑ?Ñ?Ñ?пна"
-#: ../camel/camel-net-utils.c:521
-msgid "cannot create thread"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? поÑ?ок"
+#: ../camel/camel-multipart-signed.c:658
+#, c-format
+msgid "parse error"
+msgstr "Ð?Ñ?ибка обÑ?абоÑ?ки"
-#: ../camel/camel-net-utils.c:678
+#: ../camel/camel-net-utils.c:695
#, c-format
msgid "Resolving: %s"
msgstr "Ð?оиÑ?к Ñ?зла: %s"
-#: ../camel/camel-net-utils.c:700
+#: ../camel/camel-net-utils.c:718
msgid "Host lookup failed"
msgstr "Сбой поиÑ?ка Ñ?зла"
-#: ../camel/camel-net-utils.c:702
+#: ../camel/camel-net-utils.c:724
#, c-format
msgid "Host lookup failed: %s: %s"
msgstr "Сбой поиÑ?ка Ñ?зла: %s: %s"
-#: ../camel/camel-net-utils.c:809
+#: ../camel/camel-net-utils.c:845
msgid "Resolving address"
msgstr "Ð?оиÑ?к адÑ?еÑ?а"
-#: ../camel/camel-net-utils.c:829
+#: ../camel/camel-net-utils.c:866
msgid "Name lookup failed"
msgstr "Ð?е Ñ?далоÑ?Ñ? опÑ?еделиÑ?Ñ? Ñ?зел"
-#: ../camel/camel-net-utils.c:832
+#: ../camel/camel-net-utils.c:872
#, c-format
msgid "Name lookup failed: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? опÑ?еделиÑ?Ñ? Ñ?зел: %s"
-#: ../camel/camel-offline-folder.c:249
+#: ../camel/camel-offline-folder.c:193
#, c-format
msgid "Syncing messages in folder '%s' to disk"
msgstr "СинÑ?Ñ?онизаÑ?иÑ? Ñ?ообÑ?ений в папке «%s» на диÑ?к"
-#: ../camel/camel-offline-journal.c:159 ../camel/camel-offline-journal.c:182
+#: ../camel/camel-offline-journal.c:144
+#: ../camel/camel-offline-journal.c:174
#, c-format
msgid "Cannot write offline journal for folder '%s': %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? запиÑ?аÑ?Ñ? жÑ?Ñ?нал авÑ?ономной Ñ?абоÑ?Ñ? длÑ? папки «%s»: %s"
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:58
msgid "Virtual folder email provider"
-msgstr "Ð?Ñ?овайдеÑ? виÑ?Ñ?Ñ?алÑ?нÑ?Ñ? папок Ñ?лекÑ?Ñ?онной поÑ?Ñ?Ñ?"
+msgstr "Ð?Ñ?овайдеÑ? виÑ?Ñ?Ñ?алÑ?нÑ?Ñ? папок Ñ?л. поÑ?Ñ?Ñ?"
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:60
msgid "For reading mail as a query of another set of folders"
msgstr "Ð?лÑ? Ñ?Ñ?ениÑ? поÑ?Ñ?Ñ? по запÑ?оÑ?Ñ? к дÑ?Ñ?гомÑ? набоÑ?Ñ? папок"
-#: ../camel/camel-provider.c:184
+#: ../camel/camel-provider.c:188
#, c-format
msgid "Could not load %s: Module loading not supported on this system."
-msgstr ""
-"Ð?е Ñ?далоÑ?Ñ? загÑ?Ñ?зиÑ?Ñ? %s: Ð?агÑ?Ñ?зка модÑ?лей не поддеÑ?живаеÑ?Ñ?Ñ? в Ñ?Ñ?ой Ñ?иÑ?Ñ?еме."
+msgstr "Ð?е Ñ?далоÑ?Ñ? загÑ?Ñ?зиÑ?Ñ? %s: Ð?агÑ?Ñ?зка модÑ?лей не поддеÑ?живаеÑ?Ñ?Ñ? в Ñ?Ñ?ой Ñ?иÑ?Ñ?еме."
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:197
#, c-format
msgid "Could not load %s: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? загÑ?Ñ?зиÑ?Ñ? %s: %s"
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:206
#, c-format
msgid "Could not load %s: No initialization code in module."
msgstr "Ð?е Ñ?далоÑ?Ñ? загÑ?Ñ?зиÑ?Ñ? %s: в модÑ?ле неÑ? иниÑ?иализиÑ?Ñ?Ñ?Ñ?его кода."
-#: ../camel/camel-provider.c:379 ../camel/camel-session.c:180
+#: ../camel/camel-provider.c:388
+#: ../camel/camel-session.c:206
#, c-format
msgid "No provider available for protocol '%s'"
msgstr "Ð?Ñ?овайдеÑ? длÑ? пÑ?оÑ?окола «%s» не доÑ?Ñ?Ñ?пен"
-#: ../camel/camel-sasl-anonymous.c:36
+#: ../camel/camel-sasl-anonymous.c:35
msgid "Anonymous"
-msgstr "Anonymous"
+msgstr "Ð?нонимнÑ?й"
-#: ../camel/camel-sasl-anonymous.c:38
+#: ../camel/camel-sasl-anonymous.c:37
msgid "This option will connect to the server using an anonymous login."
msgstr "Ð?Ñ?деÑ? пÑ?оизводиÑ?Ñ?Ñ?Ñ? анонимное (anonymous) подклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ?."
-#: ../camel/camel-sasl-anonymous.c:121 ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:70
+#, c-format
msgid "Authentication failed."
msgstr "Сбой пÑ?овеÑ?ки подлинноÑ?Ñ?и."
-#: ../camel/camel-sasl-anonymous.c:130
+#: ../camel/camel-sasl-anonymous.c:81
#, c-format
msgid ""
"Invalid email address trace information:\n"
@@ -1943,7 +2312,7 @@ msgstr ""
"Ð?евеÑ?наÑ? Ñ?Ñ?аÑ?Ñ?иÑ?овоÑ?наÑ? инÑ?оÑ?маÑ?иÑ? Ñ?л.адÑ?еÑ?а:\n"
"%s"
-#: ../camel/camel-sasl-anonymous.c:142
+#: ../camel/camel-sasl-anonymous.c:95
#, c-format
msgid ""
"Invalid opaque trace information:\n"
@@ -1952,7 +2321,7 @@ msgstr ""
"Ð?евеÑ?наÑ? Ñ?кÑ?Ñ?Ñ?аÑ? Ñ?Ñ?аÑ?Ñ?иÑ?овоÑ?наÑ? инÑ?оÑ?маÑ?иÑ?:\n"
"%s"
-#: ../camel/camel-sasl-anonymous.c:154
+#: ../camel/camel-sasl-anonymous.c:109
#, c-format
msgid ""
"Invalid trace information:\n"
@@ -1961,204 +2330,185 @@ msgstr ""
"Ð?евеÑ?наÑ? Ñ?Ñ?аÑ?Ñ?иÑ?овоÑ?наÑ? инÑ?оÑ?маÑ?иÑ?:\n"
"%s"
-#: ../camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:45
msgid "CRAM-MD5"
msgstr "CRAM-MD5"
-#: ../camel/camel-sasl-cram-md5.c:40
-msgid ""
-"This option will connect to the server using a secure CRAM-MD5 password, if "
-"the server supports it."
-msgstr ""
-"Ð?одклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ? бÑ?деÑ? пÑ?оизводиÑ?Ñ?Ñ?Ñ? Ñ? иÑ?полÑ?зованием длÑ? иденÑ?иÑ?икаÑ?ии "
-"пÑ?оÑ?окола CRAM-MD5, еÑ?ли Ñ?еÑ?веÑ? его поддеÑ?живаеÑ?."
+#: ../camel/camel-sasl-cram-md5.c:47
+msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
+msgstr "Ð?одклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ? бÑ?деÑ? пÑ?оизводиÑ?Ñ?Ñ?Ñ? Ñ? иÑ?полÑ?зованием длÑ? иденÑ?иÑ?икаÑ?ии пÑ?оÑ?окола CRAM-MD5, еÑ?ли Ñ?еÑ?веÑ? его поддеÑ?живаеÑ?."
-#: ../camel/camel-sasl-digest-md5.c:48
+#: ../camel/camel-sasl-digest-md5.c:58
msgid "DIGEST-MD5"
msgstr "DIGEST-MD5"
-#: ../camel/camel-sasl-digest-md5.c:50
-msgid ""
-"This option will connect to the server using a secure DIGEST-MD5 password, "
-"if the server supports it."
-msgstr ""
-"Ð?одклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ? бÑ?деÑ? пÑ?оизводиÑ?Ñ?Ñ?Ñ? Ñ? иÑ?полÑ?зованием заÑ?иÑ?Ñ?ованного "
-"паÑ?олÑ? DIGEST-MD5, еÑ?ли Ñ?еÑ?веÑ? его поддеÑ?живаеÑ?."
+#: ../camel/camel-sasl-digest-md5.c:60
+msgid "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it."
+msgstr "Ð?одклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ? бÑ?деÑ? пÑ?оизводиÑ?Ñ?Ñ?Ñ? Ñ? иÑ?полÑ?зованием заÑ?иÑ?Ñ?ованного паÑ?олÑ? DIGEST-MD5, еÑ?ли Ñ?еÑ?веÑ? его поддеÑ?живаеÑ?."
-#: ../camel/camel-sasl-digest-md5.c:844
+#: ../camel/camel-sasl-digest-md5.c:821
+#, c-format
msgid "Server challenge too long (>2048 octets)"
-msgstr "Ð?Ñ?веÑ? Ñ?еÑ?веÑ?а Ñ?лиÑ?ком длиннÑ?й (>2048 байÑ?)"
+msgstr "СлиÑ?ком длиннÑ?й оÑ?веÑ? оÑ? Ñ?еÑ?веÑ?а (>2048 байÑ?)"
-#: ../camel/camel-sasl-digest-md5.c:853
+#: ../camel/camel-sasl-digest-md5.c:832
+#, c-format
msgid "Server challenge invalid\n"
msgstr "Ð?едопÑ?Ñ?Ñ?имÑ?й оÑ?веÑ? Ñ?еÑ?веÑ?а\n"
-#: ../camel/camel-sasl-digest-md5.c:859
+#: ../camel/camel-sasl-digest-md5.c:840
+#, c-format
msgid "Server challenge contained invalid \"Quality of Protection\" token"
-msgstr "Ð?Ñ?веÑ? Ñ?еÑ?веÑ?а Ñ?одеÑ?жиÑ? недопÑ?Ñ?Ñ?имÑ?й жеÑ?он \"Ð?аÑ?еÑ?Ñ?во заÑ?иÑ?Ñ?\""
+msgstr "Ð?Ñ?веÑ? Ñ?еÑ?веÑ?а Ñ?одеÑ?жиÑ? недопÑ?Ñ?Ñ?имÑ?й жеÑ?он «Ð?аÑ?еÑ?Ñ?во заÑ?иÑ?Ñ?»"
-#: ../camel/camel-sasl-digest-md5.c:889
+#: ../camel/camel-sasl-digest-md5.c:875
+#, c-format
msgid "Server response did not contain authorization data"
msgstr "Ð?Ñ?веÑ? Ñ?еÑ?веÑ?а не Ñ?одеÑ?жиÑ? инÑ?оÑ?маÑ?ии об авÑ?оÑ?изаÑ?ии"
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:896
+#, c-format
msgid "Server response contained incomplete authorization data"
msgstr "Ð?Ñ?веÑ? Ñ?еÑ?веÑ?а Ñ?одеÑ?жиÑ? неполнÑ?Ñ? инÑ?оÑ?маÑ?иÑ? об авÑ?оÑ?изаÑ?ии"
-#: ../camel/camel-sasl-digest-md5.c:917
+#: ../camel/camel-sasl-digest-md5.c:909
+#, c-format
msgid "Server response does not match"
msgstr "Ð?Ñ?веÑ? Ñ?еÑ?веÑ?а не Ñ?овпадаеÑ?"
-#: ../camel/camel-sasl-gssapi.c:72
+#: ../camel/camel-sasl-gssapi.c:85
msgid "GSSAPI"
msgstr "GSSAPI"
-#: ../camel/camel-sasl-gssapi.c:74
+#: ../camel/camel-sasl-gssapi.c:87
msgid "This option will connect to the server using Kerberos 5 authentication."
msgstr "Ð?одклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ? бÑ?деÑ? пÑ?оизводиÑ?Ñ?Ñ?Ñ? Ñ? иÑ?полÑ?зованием Kerberos 5."
-#: ../camel/camel-sasl-gssapi.c:168
-msgid ""
-"The specified mechanism is not supported by the provided credential, or is "
-"unrecognized by the implementation."
-msgstr ""
-"УказаннÑ?й меÑ?анизм не поддеÑ?живаеÑ?Ñ?Ñ? пÑ?едоÑ?Ñ?авленнÑ?ми Ñ?Ñ?едÑ?Ñ?вами, либо не "
-"Ñ?аÑ?познаеÑ?Ñ?Ñ? в Ñ?Ñ?ой Ñ?еализаÑ?ии."
+#: ../camel/camel-sasl-gssapi.c:128
+msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation."
+msgstr "УказаннÑ?й меÑ?анизм не поддеÑ?живаеÑ?Ñ?Ñ? пÑ?едоÑ?Ñ?авленнÑ?ми Ñ?Ñ?едÑ?Ñ?вами, либо не Ñ?аÑ?познаеÑ?Ñ?Ñ? в Ñ?Ñ?ой Ñ?еализаÑ?ии."
-#: ../camel/camel-sasl-gssapi.c:173
+#: ../camel/camel-sasl-gssapi.c:133
msgid "The provided target_name parameter was ill-formed."
msgstr "Ð?Ñ?едоÑ?Ñ?авленнÑ?й паÑ?амеÑ?Ñ? target_name Ñ?Ñ?оÑ?миÑ?ован невеÑ?но."
-#: ../camel/camel-sasl-gssapi.c:176
-msgid ""
-"The provided target_name parameter contained an invalid or unsupported type "
-"of name."
-msgstr ""
-"Ð?Ñ?едоÑ?Ñ?авленнÑ?й паÑ?амеÑ?Ñ? target_name Ñ?одеÑ?жиÑ? невеÑ?нÑ?й или неподдеÑ?живаемÑ?й "
-"Ñ?ип имени."
+#: ../camel/camel-sasl-gssapi.c:136
+msgid "The provided target_name parameter contained an invalid or unsupported type of name."
+msgstr "Ð?Ñ?едоÑ?Ñ?авленнÑ?й паÑ?амеÑ?Ñ? target_name Ñ?одеÑ?жиÑ? невеÑ?нÑ?й или неподдеÑ?живаемÑ?й Ñ?ип имени."
-#: ../camel/camel-sasl-gssapi.c:180
-msgid ""
-"The input_token contains different channel bindings to those specified via "
-"the input_chan_bindings parameter."
-msgstr ""
-"input_token Ñ?одеÑ?жиÑ? не Ñ?акÑ?Ñ? пÑ?ивÑ?зкÑ? к каналам, как Ñ?казано в паÑ?амеÑ?Ñ?е "
-"input_chan_bindings."
+#: ../camel/camel-sasl-gssapi.c:140
+msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
+msgstr "input_token Ñ?одеÑ?жиÑ? не Ñ?акÑ?Ñ? пÑ?ивÑ?зкÑ? к каналам, как Ñ?казано в паÑ?амеÑ?Ñ?е input_chan_bindings."
-#: ../camel/camel-sasl-gssapi.c:185
-msgid ""
-"The input_token contains an invalid signature, or a signature that could not "
-"be verified."
-msgstr ""
-"input_token Ñ?одеÑ?жиÑ? невеÑ?нÑ?Ñ? подпиÑ?Ñ?, или подпиÑ?Ñ?, коÑ?оÑ?аÑ? не можеÑ? бÑ?Ñ?Ñ? "
-"пÑ?овеÑ?ена."
+#: ../camel/camel-sasl-gssapi.c:145
+msgid "The input_token contains an invalid signature, or a signature that could not be verified."
+msgstr "input_token Ñ?одеÑ?жиÑ? невеÑ?нÑ?Ñ? подпиÑ?Ñ?, или подпиÑ?Ñ?, коÑ?оÑ?аÑ? не можеÑ? бÑ?Ñ?Ñ? пÑ?овеÑ?ена."
-#: ../camel/camel-sasl-gssapi.c:189
-msgid ""
-"The supplied credentials were not valid for context initiation, or the "
-"credential handle did not reference any credentials."
-msgstr ""
-"Ð?Ñ?едоÑ?Ñ?авленнÑ?е Ñ?доÑ?Ñ?овеÑ?ениÑ? бÑ?ли не дейÑ?Ñ?виÑ?елÑ?нÑ? длÑ? иниÑ?иализаÑ?ии "
-"конÑ?екÑ?Ñ?а, либо обÑ?абоÑ?Ñ?ик Ñ?доÑ?Ñ?овеÑ?ениÑ? не Ñ?Ñ?Ñ?лаеÑ?Ñ?Ñ? на Ñ?доÑ?Ñ?овеÑ?ениÑ?."
+#: ../camel/camel-sasl-gssapi.c:149
+msgid "The supplied credentials were not valid for context initiation, or the credential handle did not reference any credentials."
+msgstr "Ð?Ñ?едоÑ?Ñ?авленнÑ?е Ñ?доÑ?Ñ?овеÑ?ениÑ? бÑ?ли не дейÑ?Ñ?виÑ?елÑ?нÑ? длÑ? иниÑ?иализаÑ?ии конÑ?екÑ?Ñ?а, либо обÑ?абоÑ?Ñ?ик Ñ?доÑ?Ñ?овеÑ?ениÑ? не Ñ?Ñ?Ñ?лаеÑ?Ñ?Ñ? на Ñ?доÑ?Ñ?овеÑ?ениÑ?."
-#: ../camel/camel-sasl-gssapi.c:194
+#: ../camel/camel-sasl-gssapi.c:154
msgid "The supplied context handle did not refer to a valid context."
-msgstr ""
-"УказаннÑ?й обÑ?абоÑ?Ñ?ик конÑ?екÑ?Ñ?а не Ñ?Ñ?Ñ?лаеÑ?Ñ?Ñ? на дейÑ?Ñ?виÑ?елÑ?нÑ?й конÑ?екÑ?Ñ?."
+msgstr "УказаннÑ?й обÑ?абоÑ?Ñ?ик конÑ?екÑ?Ñ?а не Ñ?Ñ?Ñ?лаеÑ?Ñ?Ñ? на дейÑ?Ñ?виÑ?елÑ?нÑ?й конÑ?екÑ?Ñ?."
-#: ../camel/camel-sasl-gssapi.c:197
+#: ../camel/camel-sasl-gssapi.c:157
msgid "The consistency checks performed on the input_token failed."
msgstr "Сбой пÑ?овеÑ?ки Ñ?елоÑ?Ñ?ноÑ?Ñ?и Ñ?леменÑ?а input_token."
-#: ../camel/camel-sasl-gssapi.c:200
+#: ../camel/camel-sasl-gssapi.c:160
msgid "The consistency checks performed on the credential failed."
msgstr "Сбой пÑ?овеÑ?ки Ñ?елоÑ?Ñ?ноÑ?Ñ?и Ñ?доÑ?Ñ?овеÑ?ений."
-#: ../camel/camel-sasl-gssapi.c:203
+#: ../camel/camel-sasl-gssapi.c:163
msgid "The referenced credentials have expired."
msgstr "СÑ?ок дейÑ?Ñ?виÑ? Ñ?помÑ?нÑ?Ñ?Ñ?Ñ? Ñ?доÑ?Ñ?овеÑ?ений иÑ?Ñ?Ñ?к."
-#: ../camel/camel-sasl-gssapi.c:209 ../camel/camel-sasl-gssapi.c:316
-#: ../camel/camel-sasl-gssapi.c:358 ../camel/camel-sasl-gssapi.c:373
-#: ../camel/providers/imap/camel-imap-store.c:1272
+#: ../camel/camel-sasl-gssapi.c:169
+#: ../camel/camel-sasl-gssapi.c:309
+#: ../camel/camel-sasl-gssapi.c:353
+#: ../camel/camel-sasl-gssapi.c:370
+#: ../camel/providers/smtp/camel-smtp-transport.c:1256
+#, c-format
msgid "Bad authentication response from server."
msgstr "Ð?евеÑ?нÑ?й оÑ?веÑ? оÑ? Ñ?еÑ?веÑ?а пÑ?и иденÑ?иÑ?икаÑ?ии."
-#: ../camel/camel-sasl-gssapi.c:383
+#: ../camel/camel-sasl-gssapi.c:382
+#, c-format
msgid "Unsupported security layer."
msgstr "Ð?еподдеÑ?живаемÑ?й Ñ?Ñ?овенÑ? безопаÑ?ноÑ?Ñ?и."
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:39
msgid "Login"
msgstr "РегиÑ?Ñ?Ñ?аÑ?иÑ?"
-#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:38
+#: ../camel/camel-sasl-login.c:41
+#: ../camel/camel-sasl-plain.c:45
msgid "This option will connect to the server using a simple password."
-msgstr ""
-"Ð?одклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ? бÑ?деÑ? пÑ?оизводиÑ?Ñ?Ñ?Ñ? Ñ? иÑ?полÑ?зованием незаÑ?иÑ?Ñ?ованного "
-"паÑ?олÑ?."
+msgstr "Ð?одклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ? бÑ?деÑ? пÑ?оизводиÑ?Ñ?Ñ?Ñ? Ñ? иÑ?полÑ?зованием незаÑ?иÑ?Ñ?ованного паÑ?олÑ?."
-#: ../camel/camel-sasl-login.c:134
+#: ../camel/camel-sasl-login.c:95
+#, c-format
msgid "Unknown authentication state."
msgstr "Ð?еизвеÑ?Ñ?ное Ñ?оÑ?Ñ?оÑ?ние иденÑ?иÑ?икаÑ?ии."
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:41
msgid "NTLM / SPA"
msgstr "NTLM / SPA"
-#: ../camel/camel-sasl-ntlm.c:36
-msgid ""
-"This option will connect to a Windows-based server using NTLM / Secure "
-"Password Authentication."
-msgstr ""
-"ÐÑ?а опÑ?иÑ? подклÑ?Ñ?аеÑ? к Ñ?еÑ?веÑ?Ñ?, оÑ?нованномÑ? на Windows, иÑ?полÑ?зÑ?Ñ? длÑ? "
-"аÑ?Ñ?енÑ?иÑ?икаÑ?ии NTLM / Secure Password Authentication."
+#: ../camel/camel-sasl-ntlm.c:43
+msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
+msgstr "ÐÑ?а опÑ?иÑ? подклÑ?Ñ?аеÑ? к Ñ?еÑ?веÑ?Ñ?, оÑ?нованномÑ? на Windows, иÑ?полÑ?зÑ?Ñ? длÑ? аÑ?Ñ?енÑ?иÑ?икаÑ?ии NTLM / Secure Password Authentication."
-#: ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-plain.c:43
msgid "PLAIN"
msgstr "PLAIN"
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:46
msgid "POP before SMTP"
msgstr "POP до SMTP"
-#: ../camel/camel-sasl-popb4smtp.c:41
+#: ../camel/camel-sasl-popb4smtp.c:48
msgid "This option will authorise a POP connection before attempting SMTP"
msgstr "Ð?Ñ?деÑ? пÑ?оизводиÑ?Ñ?Ñ?Ñ? авÑ?оÑ?изаÑ?иÑ? POP до попÑ?Ñ?ки пеÑ?едаÑ?и поÑ?Ñ?Ñ? по SMTP"
-#: ../camel/camel-sasl-popb4smtp.c:106
+#: ../camel/camel-sasl-popb4smtp.c:83
msgid "POP Source URI"
msgstr "URL иÑ?Ñ?оÑ?ника поÑ?Ñ?Ñ? POP"
-#: ../camel/camel-sasl-popb4smtp.c:109
-msgid "POP Before SMTP auth using an unknown transport"
-msgstr "POP до SMTP авÑ?оÑ?изаÑ?иÑ?, иÑ?полÑ?зÑ?Ñ? неизвеÑ?Ñ?нÑ?й Ñ?Ñ?анÑ?поÑ?Ñ?"
+#: ../camel/camel-sasl-popb4smtp.c:90
+#, c-format
+#| msgid "POP Before SMTP auth using an unknown transport"
+msgid "POP Before SMTP authentication using an unknown transport"
+msgstr "Ð?Ñ?Ñ?енÑ?иÑ?икаÑ?иÑ? POP до SMTP, иÑ?полÑ?зÑ?Ñ? неизвеÑ?Ñ?нÑ?й Ñ?Ñ?анÑ?поÑ?Ñ?"
-#: ../camel/camel-sasl-popb4smtp.c:114
-msgid "POP Before SMTP auth using a non-pop source"
-msgstr "POP до SMTP, иÑ?полÑ?зÑ?Ñ? не-POP иÑ?Ñ?оÑ?ник"
+#: ../camel/camel-sasl-popb4smtp.c:98
+#, c-format
+#| msgid "POP Before SMTP auth using a non-pop source"
+msgid "POP Before SMTP authentication using a non-POP source"
+msgstr "Ð?Ñ?Ñ?енÑ?иÑ?икаÑ?иÑ? POP до SMTP, иÑ?полÑ?зÑ?Ñ? не-POP иÑ?Ñ?оÑ?ник"
-#: ../camel/camel-search-private.c:147
+#: ../camel/camel-search-private.c:112
#, c-format
msgid "Regular expression compilation failed: %s: %s"
msgstr "Сбой компилÑ?Ñ?ии Ñ?егÑ?лÑ?Ñ?ного вÑ?Ñ?ажениÑ?: %s: %s"
-#: ../camel/camel-service.c:265
+#: ../camel/camel-service.c:89
#, c-format
msgid "URL '%s' needs a username component"
msgstr "URL «%s» нÑ?ждаеÑ?Ñ?Ñ? в компоненÑ?е имени полÑ?зоваÑ?елÑ?"
-#: ../camel/camel-service.c:269
+#: ../camel/camel-service.c:93
#, c-format
msgid "URL '%s' needs a host component"
msgstr "URL «%s» нÑ?ждаеÑ?Ñ?Ñ? в компоненÑ?е Ñ?оÑ?Ñ?а"
-#: ../camel/camel-service.c:273
+#: ../camel/camel-service.c:97
#, c-format
msgid "URL '%s' needs a path component"
msgstr "URL «%s» нÑ?ждаеÑ?Ñ?Ñ? в компоненÑ?е пÑ?Ñ?и"
-#: ../camel/camel-session.c:305
+#: ../camel/camel-session.c:260
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -2167,255 +2517,336 @@ msgstr ""
"Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? каÑ?алог %s:\n"
"%s"
-#: ../camel/camel-session.c:477
+#: ../camel/camel-session.c:757
#, c-format
msgid "Please enter the %s password for %s on host %s."
msgstr "Ð?ведиÑ?е паÑ?олÑ? %s длÑ? %s на Ñ?зле %s."
-#: ../camel/camel-session.c:815
-msgid "Camel session doesn't support forwarding of a message."
-msgstr "СеанÑ? camel не поддеÑ?живаеÑ? пеÑ?еÑ?Ñ?лкÑ? Ñ?ообÑ?ений."
-
-#: ../camel/camel-smime-context.c:447 ../camel/camel-smime-context.c:1012
+#: ../camel/camel-smime-context.c:348
+#: ../camel/camel-smime-context.c:1052
#, c-format
msgid "Cannot find certificate for '%s'"
msgstr "Ð?е Ñ?далоÑ?Ñ? найÑ?и Ñ?еÑ?Ñ?иÑ?икаÑ? длÑ? «%s»"
-#: ../camel/camel-smime-context.c:453
+#: ../camel/camel-smime-context.c:376
msgid "Cannot create CMS message"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? Ñ?ообÑ?ение CMS"
-#: ../camel/camel-smime-context.c:458
+#: ../camel/camel-smime-context.c:381
msgid "Cannot create CMS signed data"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? CMS signedData"
-#: ../camel/camel-smime-context.c:464
+#: ../camel/camel-smime-context.c:387
msgid "Cannot attach CMS signed data"
msgstr "Ð?е Ñ?далоÑ?Ñ? вложиÑ?Ñ? CMS signedData"
-#: ../camel/camel-smime-context.c:471
+#: ../camel/camel-smime-context.c:394
msgid "Cannot attach CMS data"
msgstr "Ð?е Ñ?далоÑ?Ñ? вложиÑ?Ñ? CMS data"
-#: ../camel/camel-smime-context.c:477
+#: ../camel/camel-smime-context.c:400
msgid "Cannot create CMS Signer information"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? CMS SignerInfo"
-#: ../camel/camel-smime-context.c:483
+#: ../camel/camel-smime-context.c:406
msgid "Cannot find certificate chain"
msgstr "Ð?е Ñ?далоÑ?Ñ? найÑ?и Ñ?епоÑ?кÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?ов"
-#: ../camel/camel-smime-context.c:489
+#: ../camel/camel-smime-context.c:412
msgid "Cannot add CMS Signing time"
msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? CMS SigningTime"
-#: ../camel/camel-smime-context.c:511 ../camel/camel-smime-context.c:523
+#: ../camel/camel-smime-context.c:436
+#: ../camel/camel-smime-context.c:451
#, c-format
msgid "Encryption certificate for '%s' does not exist"
msgstr "СеÑ?Ñ?иÑ?икаÑ? Ñ?иÑ?Ñ?ованиÑ? длÑ? «%s» не Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?"
-#: ../camel/camel-smime-context.c:530
+#: ../camel/camel-smime-context.c:458
msgid "Cannot add SMIMEEncKeyPrefs attribute"
msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? аÑ?Ñ?ибÑ?Ñ? SMIMEEncKeyPrefs"
-#: ../camel/camel-smime-context.c:535
+#: ../camel/camel-smime-context.c:463
msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? аÑ?Ñ?ибÑ?Ñ? MS SMIMEEncKeyPrefs"
-#: ../camel/camel-smime-context.c:540
+#: ../camel/camel-smime-context.c:468
msgid "Cannot add encryption certificate"
msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ? Ñ?иÑ?Ñ?ованиÑ?"
-#: ../camel/camel-smime-context.c:546
+#: ../camel/camel-smime-context.c:474
msgid "Cannot add CMS Signer information"
msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? CMS SignerInfo"
-#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:1084
-msgid "Cannot create encoder context"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? конÑ?екÑ?Ñ? кодиÑ?овÑ?ика"
-
-#: ../camel/camel-smime-context.c:622
-msgid "Failed to add data to CMS encoder"
-msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? даннÑ?е к кодиÑ?овÑ?икÑ? CMS"
-
-#: ../camel/camel-smime-context.c:627 ../camel/camel-smime-context.c:1101
-msgid "Failed to encode data"
-msgstr "Ð?Ñ?ибка кодиÑ?ованиÑ? даннÑ?Ñ?"
-
-#: ../camel/camel-smime-context.c:700
+#. Translators: A fallback message when couldn't verify an SMIME signature
+#: ../camel/camel-smime-context.c:507
msgid "Unverified"
msgstr "Ð?епÑ?овеÑ?ено"
-#: ../camel/camel-smime-context.c:702
+#: ../camel/camel-smime-context.c:509
msgid "Good signature"
msgstr "Ð?одпиÑ?Ñ? веÑ?на"
-#: ../camel/camel-smime-context.c:704
+#: ../camel/camel-smime-context.c:511
msgid "Bad signature"
msgstr "Ð?одпиÑ?Ñ? невеÑ?на"
-#: ../camel/camel-smime-context.c:706
+#: ../camel/camel-smime-context.c:513
msgid "Content tampered with or altered in transit"
msgstr "СообÑ?ение бÑ?ло подделано или изменено на пÑ?Ñ?и"
-#: ../camel/camel-smime-context.c:708
+#: ../camel/camel-smime-context.c:515
msgid "Signing certificate not found"
msgstr "СеÑ?Ñ?иÑ?икаÑ? подпиÑ?и не найден"
-#: ../camel/camel-smime-context.c:710
+#: ../camel/camel-smime-context.c:517
msgid "Signing certificate not trusted"
msgstr "СеÑ?Ñ?иÑ?икаÑ? подпиÑ?и недоÑ?Ñ?овеÑ?ен"
-#: ../camel/camel-smime-context.c:712
+#: ../camel/camel-smime-context.c:519
msgid "Signature algorithm unknown"
msgstr "Ð?еизвеÑ?Ñ?нÑ?й алгоÑ?иÑ?м подпиÑ?и"
-#: ../camel/camel-smime-context.c:714
+#: ../camel/camel-smime-context.c:521
msgid "Signature algorithm unsupported"
msgstr "Ð?еподдеÑ?живаемÑ?й алгоÑ?иÑ?м подпиÑ?и"
-#: ../camel/camel-smime-context.c:716
+#: ../camel/camel-smime-context.c:523
msgid "Malformed signature"
msgstr "Ð?евеÑ?но Ñ?Ñ?оÑ?миÑ?ованнаÑ? подпиÑ?Ñ?"
-#: ../camel/camel-smime-context.c:718
+#: ../camel/camel-smime-context.c:525
msgid "Processing error"
msgstr "Ð?Ñ?ибка обÑ?абоÑ?ки"
-#: ../camel/camel-smime-context.c:772
+#: ../camel/camel-smime-context.c:570
msgid "No signed data in signature"
msgstr "Ð? подпиÑ?и оÑ?Ñ?Ñ?Ñ?Ñ?Ñ?вÑ?Ñ?Ñ? даннÑ?е подпиÑ?и"
-#: ../camel/camel-smime-context.c:777
+#: ../camel/camel-smime-context.c:575
msgid "Digests missing from enveloped data"
msgstr "Ð? даннÑ?Ñ? конвеÑ?Ñ?а оÑ?Ñ?Ñ?Ñ?Ñ?Ñ?вÑ?еÑ? Ñ?водка"
-#: ../camel/camel-smime-context.c:790 ../camel/camel-smime-context.c:800
+#: ../camel/camel-smime-context.c:588
+#: ../camel/camel-smime-context.c:599
msgid "Cannot calculate digests"
msgstr "Ð?е Ñ?далоÑ?Ñ? вÑ?Ñ?иÑ?лиÑ?Ñ? дайджеÑ?Ñ?Ñ?"
-#: ../camel/camel-smime-context.c:807 ../camel/camel-smime-context.c:811
+#: ../camel/camel-smime-context.c:606
+#: ../camel/camel-smime-context.c:610
msgid "Cannot set message digests"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?Ñ?Ñ?ановиÑ?Ñ? дайджеÑ?Ñ?Ñ? Ñ?ообÑ?ениÑ?"
-#: ../camel/camel-smime-context.c:821 ../camel/camel-smime-context.c:826
+#: ../camel/camel-smime-context.c:620
+#: ../camel/camel-smime-context.c:625
msgid "Certificate import failed"
msgstr "Сбой импоÑ?Ñ?а Ñ?еÑ?Ñ?иÑ?икаÑ?а"
-#: ../camel/camel-smime-context.c:836
+#: ../camel/camel-smime-context.c:635
#, c-format
msgid "Certificate is the only message, cannot verify certificates"
-msgstr ""
-"СообÑ?ение Ñ?оÑ?Ñ?оиÑ? Ñ?олÑ?ко из Ñ?еÑ?Ñ?иÑ?икаÑ?ов, Ð?е Ñ?далоÑ?Ñ? пÑ?овеÑ?иÑ?Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ?Ñ?"
+msgstr "СообÑ?ение Ñ?оÑ?Ñ?оиÑ? Ñ?олÑ?ко из Ñ?еÑ?Ñ?иÑ?икаÑ?ов, Ð?е Ñ?далоÑ?Ñ? пÑ?овеÑ?иÑ?Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ?Ñ?"
-#: ../camel/camel-smime-context.c:839
+#: ../camel/camel-smime-context.c:638
#, c-format
msgid "Certificate is the only message, certificates imported and verified"
msgstr "Ð? Ñ?ообÑ?ении Ñ?олÑ?ко Ñ?еÑ?Ñ?иÑ?икаÑ?Ñ?, Ñ?еÑ?Ñ?иÑ?икаÑ?Ñ? импоÑ?Ñ?иÑ?ованÑ? и пÑ?овеÑ?енÑ?"
-#: ../camel/camel-smime-context.c:843
+#: ../camel/camel-smime-context.c:642
msgid "Cannot find signature digests"
msgstr "Ð?е Ñ?далоÑ?Ñ? найÑ?и дайджеÑ?Ñ?Ñ? подпиÑ?и"
-#: ../camel/camel-smime-context.c:859
+#: ../camel/camel-smime-context.c:658
#, c-format
msgid "Signer: %s <%s>: %s\n"
msgstr "Ð?одпиÑ?ано: %s <%s>: %s\n"
-#: ../camel/camel-smime-context.c:960 ../camel/camel-smime-context.c:1184
+#: ../camel/camel-smime-context.c:839
+#: ../camel/camel-smime-context.c:1125
+msgid "Cannot create encoder context"
+msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? конÑ?екÑ?Ñ? кодиÑ?овÑ?ика"
+
+#: ../camel/camel-smime-context.c:845
+msgid "Failed to add data to CMS encoder"
+msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? даннÑ?е к кодиÑ?овÑ?икÑ? CMS"
+
+#: ../camel/camel-smime-context.c:850
+#: ../camel/camel-smime-context.c:1142
+msgid "Failed to encode data"
+msgstr "Ð?Ñ?ибка кодиÑ?ованиÑ? даннÑ?Ñ?"
+
+#: ../camel/camel-smime-context.c:991
+#: ../camel/camel-smime-context.c:1237
msgid "Decoder failed"
msgstr "Сбой декодеÑ?а"
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1060
msgid "Cannot find common bulk encryption algorithm"
msgstr "Ð?е Ñ?далоÑ?Ñ? найÑ?и обÑ?ий алгоÑ?иÑ?м Ñ?иÑ?Ñ?ованиÑ?"
-#: ../camel/camel-smime-context.c:1027
+#: ../camel/camel-smime-context.c:1068
msgid "Cannot allocate slot for encryption bulk key"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?аÑ?пÑ?еделиÑ?Ñ? Ñ?лоÑ? длÑ? клÑ?Ñ?а обÑ?его Ñ?иÑ?Ñ?ованиÑ?"
-#: ../camel/camel-smime-context.c:1038
+#: ../camel/camel-smime-context.c:1079
msgid "Cannot create CMS Message"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? Ñ?ообÑ?ение CMS"
-#: ../camel/camel-smime-context.c:1044
+#: ../camel/camel-smime-context.c:1085
msgid "Cannot create CMS Enveloped data"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? CMS EnvelopedData"
-#: ../camel/camel-smime-context.c:1050
+#: ../camel/camel-smime-context.c:1091
msgid "Cannot attach CMS Enveloped data"
msgstr "Ð?е Ñ?далоÑ?Ñ? вложиÑ?Ñ? CMS EnvelopedData"
-#: ../camel/camel-smime-context.c:1056
+#: ../camel/camel-smime-context.c:1097
msgid "Cannot attach CMS data object"
msgstr "Ð?е Ñ?далоÑ?Ñ? вложиÑ?Ñ? обÑ?екÑ? CMS data"
-#: ../camel/camel-smime-context.c:1065
+#: ../camel/camel-smime-context.c:1106
msgid "Cannot create CMS Recipient information"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? Ñ?ведениÑ? CMS RecipientInfo"
-#: ../camel/camel-smime-context.c:1070
+#: ../camel/camel-smime-context.c:1111
msgid "Cannot add CMS Recipient information"
msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? Ñ?ведениÑ? CMS RecipientInfo"
-#: ../camel/camel-smime-context.c:1095
+#: ../camel/camel-smime-context.c:1136
msgid "Failed to add data to encoder"
msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? даннÑ?е к кодиÑ?овÑ?икÑ?"
-#: ../camel/camel-smime-context.c:1191
+#: ../camel/camel-smime-context.c:1244
msgid "S/MIME Decrypt: No encrypted content found"
msgstr "S/MIME Decrypt: Ð?е найдено заÑ?иÑ?Ñ?ованного Ñ?одеÑ?жимого"
-#: ../camel/camel-smime-context.c:1219
-msgid "import keys: unimplemented"
-msgstr "импоÑ?Ñ? клÑ?Ñ?ей: не Ñ?еализовано"
-
-#: ../camel/camel-smime-context.c:1227
-msgid "export keys: unimplemented"
-msgstr "Ñ?кÑ?поÑ?Ñ? клÑ?Ñ?ей: не Ñ?еализовано"
-
-#: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:171
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? папкÑ?: недопÑ?Ñ?Ñ?имаÑ? опеÑ?аÑ?иÑ? в Ñ?Ñ?ом Ñ?Ñ?анилиÑ?е"
-
-#: ../camel/camel-store.c:316
+#: ../camel/camel-store.c:2184
#, c-format
msgid "Cannot create folder '%s': folder exists"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? папкÑ? «%s»: папка Ñ?же Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?"
-#: ../camel/camel-store.c:395
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? папкÑ?: недопÑ?Ñ?Ñ?имаÑ? опеÑ?аÑ?иÑ? в Ñ?Ñ?ом Ñ?Ñ?анилиÑ?е"
+#. the name of the Trash folder, used for deleted messages
+#: ../camel/camel-store.c:2375
+#: ../camel/camel-store.c:2385
+#: ../camel/camel-vtrash-folder.c:48
+msgid "Trash"
+msgstr "Ð?оÑ?зина"
+
+#. the name of the Junk folder, used for spam messages
+#: ../camel/camel-store.c:2378
+#: ../camel/camel-store.c:2389
+#: ../camel/camel-vtrash-folder.c:50
+msgid "Junk"
+msgstr "Спам"
-#: ../camel/camel-store.c:423
+#: ../camel/camel-store.c:2832
#, c-format
msgid "Cannot create folder: %s: folder exists"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? папкÑ?: %s: папка Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?"
-#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:377
-#: ../camel/providers/local/camel-maildir-store.c:219
+#: ../camel/camel-store.c:2959
+#: ../camel/camel-vee-store.c:367
+#: ../camel/providers/local/camel-maildir-store.c:272
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?далиÑ?Ñ? папкÑ?: %s: недопÑ?Ñ?Ñ?имаÑ? опеÑ?аÑ?иÑ?"
-#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:414
-#: ../camel/providers/local/camel-maildir-store.c:291
+#: ../camel/camel-store.c:3100
+#: ../camel/camel-vee-store.c:417
+#: ../camel/providers/local/camel-maildir-store.c:668
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "Ð?е Ñ?далоÑ?Ñ? пеÑ?еименоваÑ?Ñ? папкÑ?: %s: недопÑ?Ñ?Ñ?имаÑ? опеÑ?аÑ?иÑ?"
-#. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:900 ../camel/camel-vtrash-folder.c:54
-msgid "Trash"
-msgstr "Ð?оÑ?зина"
+#: ../camel/camel-tcp-stream-raw.c:749
+#: ../camel/camel-tcp-stream-raw.c:760
+#, c-format
+msgid "The proxy host does not support SOCKS4"
+msgstr "Узел пÑ?окÑ?и не поддеÑ?живаеÑ? SOCKS4"
-#. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:903 ../camel/camel-vtrash-folder.c:56
-msgid "Junk"
-msgstr "Спам"
+#: ../camel/camel-tcp-stream-raw.c:771
+#, c-format
+msgid "The proxy host denied our request: code %d"
+msgstr "Узел пÑ?окÑ?и оÑ?клонил запÑ?оÑ?: код %d"
+
+#: ../camel/camel-tcp-stream-raw.c:867
+#: ../camel/camel-tcp-stream-raw.c:873
+#, c-format
+msgid "The proxy host does not support SOCKS5"
+msgstr "Узел пÑ?окÑ?и не поддеÑ?живаеÑ? SOCKS5"
+
+#: ../camel/camel-tcp-stream-raw.c:879
+#, c-format
+#| msgid "No support for authentication type %s"
+msgid "Could not find a suitable authentication type: code 0x%x"
+msgstr "Ð?е Ñ?далоÑ?Ñ? найÑ?и подÑ?одÑ?Ñ?ий Ñ?ип аÑ?Ñ?енÑ?иÑ?икаÑ?ии: код 0x%x"
+
+#: ../camel/camel-tcp-stream-raw.c:891
+msgid "General SOCKS server failure"
+msgstr "Сбой Ñ?еÑ?веÑ?а SOCKS"
+
+#: ../camel/camel-tcp-stream-raw.c:892
+msgid "SOCKS server's rules do not allow connection"
+msgstr "Ð?Ñ?авила Ñ?еÑ?веÑ?а SOCKS запÑ?еÑ?аÑ?Ñ? подклÑ?Ñ?ение"
+
+#: ../camel/camel-tcp-stream-raw.c:893
+msgid "Network is unreachable from SOCKS server"
+msgstr "СеÑ?Ñ? недоÑ?Ñ?Ñ?пна Ñ?еÑ?ез Ñ?еÑ?веÑ? SOCKS"
+
+#: ../camel/camel-tcp-stream-raw.c:894
+msgid "Host is unreachable from SOCKS server"
+msgstr "Узел недоÑ?Ñ?Ñ?пен Ñ?еÑ?ез Ñ?еÑ?веÑ? SOCKS"
+
+#: ../camel/camel-tcp-stream-raw.c:895
+#| msgid "Connection canceled"
+msgid "Connection refused"
+msgstr "Соединение оÑ?клонено"
+
+#: ../camel/camel-tcp-stream-raw.c:896
+msgid "Time-to-live expired"
+msgstr "Ð?Ñ?евÑ?Ñ?ено макÑ?ималÑ?ное вÑ?емÑ? ожиданиÑ?"
+
+#: ../camel/camel-tcp-stream-raw.c:897
+#| msgid "STLS not supported by server"
+msgid "Command not supported by SOCKS server"
+msgstr "Ð?оманда не поддеÑ?живаеÑ?Ñ?Ñ? Ñ?еÑ?веÑ?ом SOCKS"
+
+#: ../camel/camel-tcp-stream-raw.c:898
+#| msgid "STLS not supported by server"
+msgid "Address type not supported by SOCKS server"
+msgstr "Тип адÑ?еÑ?а не поддеÑ?живаеÑ?Ñ?Ñ? Ñ?еÑ?веÑ?ом SOCKS"
+
+#: ../camel/camel-tcp-stream-raw.c:899
+#| msgid "Unknown error: %s"
+msgid "Unknown error from SOCKS server"
+msgstr "Ð?олÑ?Ñ?ена неизвеÑ?Ñ?наÑ? оÑ?ибка оÑ? Ñ?еÑ?веÑ?а SOCKS"
+
+#: ../camel/camel-tcp-stream-raw.c:932
+#, c-format
+msgid "Got unknown address type from SOCKS server"
+msgstr "Ð?Ñ? Ñ?еÑ?веÑ?а SOCKS полÑ?Ñ?ен адÑ?еÑ? неизвеÑ?Ñ?ного Ñ?ипа"
+
+#: ../camel/camel-tcp-stream-raw.c:950
+#, c-format
+#| msgid "Invalid response from server"
+msgid "Incomplete reply from SOCKS server"
+msgstr "Ð?олÑ?Ñ?ен неполнÑ?й оÑ?веÑ? оÑ? Ñ?еÑ?веÑ?а SOCKS"
-#: ../camel/camel-tcp-stream-ssl.c:870
+#: ../camel/camel-tcp-stream-raw.c:970
+#, c-format
+msgid "Hostname is too long (maximum is 255 characters)"
+msgstr "СлиÑ?ком длинное имÑ? Ñ?зла (макÑ?ималÑ?ное кол-во Ñ?имволов â?? 255)"
+
+#. SOCKS5
+#. reserved - must be 0
+#: ../camel/camel-tcp-stream-raw.c:1002
+#: ../camel/camel-tcp-stream-raw.c:1012
+#, c-format
+#| msgid "Invalid response from server"
+msgid "Invalid reply from proxy server"
+msgstr "Ð?едопÑ?Ñ?Ñ?имÑ?й оÑ?веÑ? оÑ? пÑ?окÑ?и-Ñ?еÑ?веÑ?а"
+
+#: ../camel/camel-tcp-stream-ssl.c:457
#, c-format
msgid ""
"Issuer: %s\n"
@@ -2428,16 +2859,16 @@ msgstr ""
"Ð?Ñ?пеÑ?аÑ?ок: %s\n"
"Ð?одпиÑ?Ñ?: %s"
-#: ../camel/camel-tcp-stream-ssl.c:876
+#: ../camel/camel-tcp-stream-ssl.c:463
msgid "GOOD"
msgstr "GOOD"
-#: ../camel/camel-tcp-stream-ssl.c:876
+#: ../camel/camel-tcp-stream-ssl.c:463
msgid "BAD"
msgstr "BAD"
#. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-ssl.c:467
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -2452,7 +2883,7 @@ msgstr ""
"\n"
"Ð?Ñ?Ñ? Ñ?авно пÑ?инÑ?Ñ?Ñ??"
-#: ../camel/camel-tcp-stream-ssl.c:924
+#: ../camel/camel-tcp-stream-ssl.c:511
#, c-format
msgid ""
"Certificate problem: %s\n"
@@ -2461,7 +2892,7 @@ msgstr ""
"Ð?Ñ?облема Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ?ом: %s\n"
"Ð?оÑ?Ñ?авÑ?ик: %s"
-#: ../camel/camel-tcp-stream-ssl.c:976
+#: ../camel/camel-tcp-stream-ssl.c:563
#, c-format
msgid ""
"Bad certificate domain: %s\n"
@@ -2470,7 +2901,7 @@ msgstr ""
"Ð?екоÑ?Ñ?екÑ?нÑ?й домен Ñ?еÑ?Ñ?иÑ?икаÑ?а: %s\n"
"Ð?оÑ?Ñ?авÑ?ик: %s"
-#: ../camel/camel-tcp-stream-ssl.c:994
+#: ../camel/camel-tcp-stream-ssl.c:581
#, c-format
msgid ""
"Certificate expired: %s\n"
@@ -2479,7 +2910,7 @@ msgstr ""
"Ð?Ñ?Ñ?ек Ñ?Ñ?ок дейÑ?Ñ?виÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?а: %s\n"
"Ð?оÑ?Ñ?авÑ?ик: %s"
-#: ../camel/camel-tcp-stream-ssl.c:1011
+#: ../camel/camel-tcp-stream-ssl.c:598
#, c-format
msgid ""
"Certificate revocation list expired: %s\n"
@@ -2488,400 +2919,318 @@ msgstr ""
"Ð?Ñ?Ñ?ек Ñ?Ñ?ок дейÑ?Ñ?виÑ? Ñ?пиÑ?ка аннÑ?лиÑ?ованнÑ?Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ?ов: %s\n"
"Ð?оÑ?Ñ?авÑ?ик: %s"
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:316
#, c-format
msgid "Could not parse URL '%s'"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?азобÑ?аÑ?Ñ? URL «%s»"
-#: ../camel/camel-vee-folder.c:577
+#: ../camel/camel-vee-folder.c:1240
+#: ../camel/camel-vee-folder.c:1403
#, c-format
-msgid "Error storing '%s': %s"
-msgstr "Ð?Ñ?ибка пÑ?и Ñ?Ñ?анении «%s»: %s"
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?копиÑ?оваÑ?Ñ? или пеÑ?емеÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ениÑ? в виÑ?Ñ?Ñ?алÑ?нÑ?Ñ? папкÑ?"
-#: ../camel/camel-vee-folder.c:654
+#: ../camel/camel-vee-folder.c:1276
#, c-format
msgid "No such message %s in %s"
msgstr "Ð?еÑ? Ñ?ообÑ?ениÑ? %s в %s"
-#: ../camel/camel-vee-folder.c:813 ../camel/camel-vee-folder.c:819
-msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?копиÑ?оваÑ?Ñ? или пеÑ?емеÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ениÑ? в виÑ?Ñ?Ñ?алÑ?нÑ?Ñ? папкÑ?"
+#: ../camel/camel-vee-folder.c:1344
+#, c-format
+#| msgid "Error storing '%s': %s"
+msgid "Error storing '%s': "
+msgstr "Ð?Ñ?ибка пÑ?и Ñ?Ñ?анении «%s»: "
-#: ../camel/camel-vee-store.c:113 ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:353
+#: ../camel/camel-vee-store.c:141
+#: ../camel/camel-vee-store.c:143
+#: ../camel/camel-vee-store.c:322
msgid "Unmatched"
msgstr "Ð?Ñ?оÑ?ее"
-#: ../camel/camel-vee-store.c:400
+#: ../camel/camel-vee-store.c:393
#, c-format
msgid "Cannot delete folder: %s: No such folder"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?далиÑ?Ñ? папкÑ?: %s: неÑ? Ñ?акой папки"
-#: ../camel/camel-vee-store.c:422
+#: ../camel/camel-vee-store.c:427
#, c-format
msgid "Cannot rename folder: %s: No such folder"
msgstr "Ð?е Ñ?далоÑ?Ñ? пеÑ?еименоваÑ?Ñ? папкÑ?: %s: неÑ? Ñ?акой папки"
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-vtrash-folder.c:49
msgid "Cannot copy messages to the Trash folder"
msgstr "Ð?е Ñ?далоÑ?Ñ? пеÑ?емеÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ениÑ? в коÑ?зинÑ?"
-#: ../camel/camel-vtrash-folder.c:57
+#: ../camel/camel-vtrash-folder.c:51
msgid "Cannot copy messages to the Junk folder"
-msgstr "Ð?е Ñ?далоÑ?Ñ? пеÑ?емеÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ениÑ? в папкÑ? \"Спам\""
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-" %s"
-msgstr ""
-"Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ение: %s\n"
-" %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
-#: ../camel/providers/local/camel-maildir-folder.c:264
-#: ../camel/providers/local/camel-maildir-folder.c:293
-#: ../camel/providers/local/camel-maildir-folder.c:401
-#: ../camel/providers/local/camel-mbox-folder.c:363
-#: ../camel/providers/local/camel-mbox-folder.c:414
-#: ../camel/providers/local/camel-mh-folder.c:226
-msgid "No such message"
-msgstr "Ð?еÑ? Ñ?акого Ñ?ообÑ?ениÑ?"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:149
-#: ../camel/providers/imap4/camel-imap4-folder.c:814
-#: ../camel/providers/nntp/camel-nntp-folder.c:173
-#: ../camel/providers/nntp/camel-nntp-folder.c:248
-#: ../camel/providers/nntp/camel-nntp-folder.c:408
-#: ../camel/providers/pop3/camel-pop3-folder.c:268
-#: ../camel/providers/pop3/camel-pop3-folder.c:578
-#: ../camel/providers/pop3/camel-pop3-folder.c:639
-#: ../camel/providers/pop3/camel-pop3-folder.c:657
-msgid "User canceled"
-msgstr "Ð?Ñ?менено полÑ?зоваÑ?елем"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:156
-#: ../camel/providers/imap4/camel-imap4-folder.c:819
-#: ../camel/providers/nntp/camel-nntp-folder.c:164
-#: ../camel/providers/nntp/camel-nntp-folder.c:166
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:250
-#: ../camel/providers/pop3/camel-pop3-folder.c:388
-#: ../camel/providers/pop3/camel-pop3-folder.c:581
-#: ../camel/providers/pop3/camel-pop3-folder.c:642
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-#: ../camel/providers/pop3/camel-pop3-folder.c:660
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ение %s: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:173
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:181
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2506
-#: ../camel/providers/imap4/camel-imap4-folder.c:837
-msgid "This message is not available in offline mode."
-msgstr "ÐÑ?о Ñ?ообÑ?ение недоÑ?Ñ?Ñ?пно в авÑ?ономном Ñ?ежиме."
+msgstr "Ð?е Ñ?далоÑ?Ñ? пеÑ?емеÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ениÑ? в папкÑ? «Спам»"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:195
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2009
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2060
-msgid "Could not get message"
-msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ение"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:982
-#: ../camel/providers/imap/camel-imap-folder.c:295
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:958
+#: ../camel/providers/imap/camel-imap-folder.c:395
#, c-format
msgid "Could not load summary for %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? загÑ?Ñ?зиÑ?Ñ? кÑ?аÑ?кÑ?Ñ? инÑ?оÑ?маÑ?иÑ? о %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1055
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1034
#, c-format
msgid "Checking for deleted messages %s"
msgstr "Ð?Ñ?овеÑ?ка Ñ?далÑ?ннÑ?Ñ? Ñ?ообÑ?ений %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1330
-msgid "Trash Folder Full. Please Empty."
-msgstr "Ð?апка коÑ?зинÑ? пеÑ?еполнена. Ð?Ñ?иÑ?Ñ?иÑ?е, пожалÑ?йÑ?Ñ?а."
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1564
-#: ../camel/providers/groupwise/camel-groupwise-store.c:626
-#: ../camel/providers/groupwise/camel-groupwise-store.c:756
-#: ../camel/providers/imap/camel-imap-folder.c:3429
-#: ../camel/providers/imap/camel-imap-folder.c:3505
-#: ../camel/providers/imapx/camel-imapx-server.c:2728
-#: ../camel/providers/imapx/camel-imapx-server.c:2813
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1521
+#: ../camel/providers/groupwise/camel-groupwise-store.c:669
+#: ../camel/providers/groupwise/camel-groupwise-store.c:800
+#: ../camel/providers/imap/camel-imap-folder.c:3965
+#: ../camel/providers/imap/camel-imap-folder.c:4047
+#: ../camel/providers/imapx/camel-imapx-server.c:3871
+#: ../camel/providers/imapx/camel-imapx-server.c:4002
#, c-format
msgid "Fetching summary information for new messages in %s"
msgstr "Ð?олÑ?Ñ?ение кÑ?аÑ?кой инÑ?оÑ?маÑ?ии по новÑ?м Ñ?ообÑ?ениÑ?м из %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2360
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2403
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1991
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2044
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2708
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2718
+#, c-format
+msgid "Could not get message"
+msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ение"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2428
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2478
#, c-format
msgid "Cannot append message to folder '%s': %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? Ñ?ообÑ?ение к папке «%s»: %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2391
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2464
#, c-format
msgid "Cannot create message: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? Ñ?ообÑ?ение: %s"
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:281
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2644
+#, c-format
+msgid ""
+"Cannot get message: %s\n"
+" %s"
+msgstr ""
+"Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ение: %s\n"
+" %s"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2644
+#: ../camel/providers/local/camel-maildir-folder.c:100
+#: ../camel/providers/local/camel-maildir-folder.c:307
+#: ../camel/providers/local/camel-mbox-folder.c:117
+#: ../camel/providers/local/camel-mbox-folder.c:325
+#: ../camel/providers/local/camel-mh-folder.c:156
+msgid "No such message"
+msgstr "Ð?еÑ? Ñ?акого Ñ?ообÑ?ениÑ?"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2663
+#: ../camel/providers/nntp/camel-nntp-folder.c:251
+#: ../camel/providers/nntp/camel-nntp-folder.c:418
+#: ../camel/providers/pop3/camel-pop3-folder.c:455
+#, c-format
+#| msgid "Cannot get message %s: %s"
+msgid "Cannot get message %s: "
+msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ение %s: "
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2681
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2691
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2894
+#, c-format
+msgid "This message is not available in offline mode."
+msgstr "ÐÑ?о Ñ?ообÑ?ение недоÑ?Ñ?Ñ?пно в авÑ?ономном Ñ?ежиме."
+
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:248
#, c-format
msgid "Cannot get folder container %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? конÑ?ейнеÑ? папки %s"
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:343
-#: ../camel/providers/imap4/camel-imap4-journal.c:311
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:318
+#, c-format
msgid "Cannot append message in offline mode: cache unavailable"
msgstr "Ð?евозможно добавиÑ?Ñ? Ñ?ообÑ?ение в авÑ?ономном Ñ?ежиме: кÑ?Ñ? недоÑ?Ñ?Ñ?пен"
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:359
-#: ../camel/providers/imap4/camel-imap4-journal.c:327
-#, c-format
-msgid "Cannot append message in offline mode: %s"
-msgstr "Ð?евозможно добавиÑ?Ñ? Ñ?ообÑ?ение в авÑ?ономном Ñ?ежиме: %s"
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:335
+#| msgid "Cannot append message in offline mode: %s"
+msgid "Cannot append message in offline mode: "
+msgstr "Ð?евозможно добавиÑ?Ñ? Ñ?ообÑ?ение в авÑ?ономном Ñ?ежиме: "
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:54
-#: ../camel/providers/imap4/camel-imap4-provider.c:38
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
msgid "Checking for new mail"
msgstr "Ð?Ñ?овеÑ?ка новой поÑ?Ñ?Ñ?"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:56
-#: ../camel/providers/hula/camel-hula-provider.c:50
-#: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:40
-#: ../camel/providers/imapx/camel-imapx-provider.c:48
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
msgid "C_heck for new messages in all folders"
msgstr "Ð?_Ñ?овеÑ?Ñ?Ñ?Ñ? новÑ?Ñ? поÑ?Ñ?Ñ? во вÑ?еÑ? папкаÑ?"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:51
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
+#: ../camel/providers/imap/camel-imap-provider.c:64
#: ../camel/providers/imapx/camel-imapx-provider.c:72
-#: ../camel/providers/local/camel-local-provider.c:46
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:106
+#: ../camel/providers/local/camel-local-provider.c:42
+#: ../camel/providers/local/camel-local-provider.c:82
+#: ../camel/providers/local/camel-local-provider.c:102
msgid "Options"
msgstr "Ð?аÑ?амеÑ?Ñ?Ñ?"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
msgid "_Apply filters to new messages in Inbox on this server"
-msgstr ""
-"_Ð?Ñ?имениÑ?Ñ? Ñ?илÑ?Ñ?Ñ?Ñ? к новÑ?м Ñ?ообÑ?ениÑ?м в папке \"Ð?Ñ?одÑ?Ñ?ие\" на Ñ?Ñ?ом Ñ?еÑ?веÑ?е"
+msgstr "_Ð?Ñ?имениÑ?Ñ? Ñ?илÑ?Ñ?Ñ?Ñ? к новÑ?м Ñ?ообÑ?ениÑ?м в папке «Ð?Ñ?одÑ?Ñ?ие» на Ñ?Ñ?ом Ñ?еÑ?веÑ?е"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:63
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
msgid "Check new messages for J_unk contents"
msgstr "Ð?Ñ?овеÑ?Ñ?Ñ?Ñ?, Ñ?влÑ?Ñ?Ñ?Ñ?Ñ? ли новÑ?е Ñ?ообÑ?ениÑ? Ñ?памом"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:74
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
+#: ../camel/providers/imap/camel-imap-provider.c:70
#: ../camel/providers/imapx/camel-imapx-provider.c:78
msgid "Only check for Junk messages in the IN_BOX folder"
-msgstr ""
-"Ð?Ñ?овеÑ?Ñ?Ñ?Ñ?, Ñ?влÑ?Ñ?Ñ?Ñ?Ñ? ли новÑ?е Ñ?ообÑ?ениÑ? Ñ?памом, Ñ?олÑ?ко в папке \"Ð?Ñ?од_Ñ?Ñ?ие\""
+msgstr "Ð?Ñ?овеÑ?Ñ?Ñ?Ñ?, Ñ?влÑ?Ñ?Ñ?Ñ?Ñ? ли новÑ?е Ñ?ообÑ?ениÑ? _Ñ?памом, Ñ?олÑ?ко в папке «Ð?Ñ?одÑ?Ñ?ие»"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:67
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
msgid "Automatically synchroni_ze account locally"
-msgstr "Ð?вÑ?омаÑ?иÑ?еÑ?ки Ñ?инÑ?Ñ?они_зиÑ?оваÑ?Ñ? Ñ?Ñ?еÑ?нÑ?Ñ? запиÑ?Ñ? локалÑ?но"
+msgstr "Ð?вÑ?омаÑ?иÑ?еÑ?ки Ñ?инÑ?Ñ?они_зиÑ?оваÑ?Ñ? Ñ?Ñ?Ñ?Ñ?нÑ?Ñ? запиÑ?Ñ? локалÑ?но"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
msgid "SOAP Settings"
msgstr "Ð?аÑ?амеÑ?Ñ?Ñ? SOAP"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:75
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
msgid "Post Office Agent SOAP _Port:"
msgstr "_Ð?оÑ?Ñ? SOAP Ð?генÑ?а Post Office:"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
msgid "Novell GroupWise"
msgstr "Novell GroupWise"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
msgid "For accessing Novell GroupWise servers"
msgstr "Ð?лÑ? доÑ?Ñ?Ñ?па к Ñ?еÑ?веÑ?ам Novell Groupwise"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:104
-#: ../camel/providers/hula/camel-hula-provider.c:93
-#: ../camel/providers/imap/camel-imap-provider.c:100
-#: ../camel/providers/imap4/camel-imap4-provider.c:83
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:98
+#: ../camel/providers/imap/camel-imap-provider.c:97
#: ../camel/providers/imapx/camel-imapx-provider.c:104
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
+#: ../camel/providers/nntp/camel-nntp-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:73
msgid "Password"
msgstr "Ð?аÑ?олÑ?"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
-msgid ""
-"This option will connect to the GroupWise server using a plaintext password."
-msgstr ""
-"Ð?одклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ? IMAP бÑ?деÑ? пÑ?оизводиÑ?Ñ?Ñ?Ñ? Ñ? иÑ?полÑ?зованием "
-"незаÑ?иÑ?Ñ?ованного паÑ?олÑ?."
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:100
+msgid "This option will connect to the GroupWise server using a plaintext password."
+msgstr "Ð?одклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ? IMAP бÑ?деÑ? пÑ?оизводиÑ?Ñ?Ñ?Ñ? Ñ? иÑ?полÑ?зованием незаÑ?иÑ?Ñ?ованного паÑ?олÑ?."
-#: ../camel/providers/groupwise/camel-groupwise-store.c:102
+#: ../camel/providers/groupwise/camel-groupwise-store.c:107
+#, c-format
msgid "Host or user not available in url"
msgstr "Узел или полÑ?зоваÑ?елÑ? недоÑ?Ñ?Ñ?пнÑ? в url"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:197
-#: ../camel/providers/imap/camel-imap-store.c:1356
+#: ../camel/providers/groupwise/camel-groupwise-store.c:209
+#: ../camel/providers/imap/camel-imap-store.c:801
+#: ../camel/providers/imapx/camel-imapx-server.c:3085
+#, c-format
msgid "You did not enter a password."
msgstr "Ð?Ñ? не ввели паÑ?олÑ?."
-#: ../camel/providers/groupwise/camel-groupwise-store.c:312
+#: ../camel/providers/groupwise/camel-groupwise-store.c:332
msgid "Some features may not work correctly with your current server version"
-msgstr "Ð?екоÑ?оÑ?Ñ?е Ñ?Ñ?нкÑ?ии могÑ?Ñ? Ñ?абоÑ?аÑ?Ñ? некоÑ?Ñ?екÑ?но Ñ? ваÑ?ей веÑ?Ñ?ией Ñ?еÑ?веÑ?а"
+msgstr "Ð?екоÑ?оÑ?Ñ?е Ñ?Ñ?нкÑ?ии могÑ?Ñ? некоÑ?Ñ?екÑ?но Ñ?абоÑ?аÑ?Ñ? Ñ? ваÑ?ей веÑ?Ñ?ией Ñ?еÑ?веÑ?а"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:533
-#: ../camel/providers/imap/camel-imap-store.c:1879
-#: ../camel/providers/imap/camel-imap-store.c:2077
-#: ../camel/providers/imapx/camel-imapx-store.c:297
+#: ../camel/providers/groupwise/camel-groupwise-store.c:560
+#: ../camel/providers/imap/camel-imap-store.c:1808
+#: ../camel/providers/imap/camel-imap-store.c:2005
+#: ../camel/providers/imapx/camel-imapx-store.c:342
#, c-format
msgid "No such folder %s"
msgstr "Ð?еÑ? Ñ?акой папки %s"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1201
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1221
+#, c-format
msgid "Cannot create GroupWise folders in offline mode."
msgstr "Ð?евозможно Ñ?оздаÑ?Ñ? папки GroupWise в авÑ?ономном Ñ?ежиме."
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1215
-#: ../camel/providers/imap/camel-imap-store.c:1954
-#: ../camel/providers/imap/camel-imap-store.c:2334
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1230
+#, c-format
+#| msgid "Cannot delete folder '%s': Special folder"
+msgid "Cannot create a special system folder"
+msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? оÑ?обÑ?Ñ? Ñ?иÑ?Ñ?емнÑ?Ñ? папкÑ?"
+
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1240
+#: ../camel/providers/imap/camel-imap-store.c:1886
+#: ../camel/providers/imap/camel-imap-store.c:2323
+#: ../camel/providers/imapx/camel-imapx-store.c:1341
+#, c-format
msgid "The parent folder is not allowed to contain subfolders"
msgstr "ÐÑ?а папка не можеÑ? Ñ?одеÑ?жаÑ?Ñ? подпапки"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1294
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1317
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1325
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1350
#, c-format
msgid "Cannot rename GroupWise folder '%s' to '%s'"
msgstr "Ð?е Ñ?далоÑ?Ñ? пеÑ?еименоваÑ?Ñ? папкÑ? Groupwise «%s» в «%s»"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1349
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1384
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:47
#, c-format
msgid "GroupWise server %s"
msgstr "СеÑ?веÑ? GroupWise %s"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1351
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1386
#, c-format
msgid "GroupWise service for %s on %s"
msgstr "СеÑ?виÑ? GroupWise длÑ? %s на %s"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:122
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:51
#, c-format
msgid "GroupWise mail delivery via %s"
msgstr "Ð?оÑ?Ñ?авка поÑ?Ñ?Ñ? Groupwise Ñ? помоÑ?Ñ?Ñ? %s"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:164
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:97
msgid "Sending Message"
msgstr "Ð?Ñ?пÑ?авка Ñ?ообÑ?ениÑ?"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:212
-msgid ""
-"You have exceeded this account's storage limit. Your messages are queued in "
-"your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
-"of your mail.\n"
-msgstr ""
-"Ð?Ñ? пÑ?евÑ?Ñ?или огÑ?аниÑ?ение меÑ?Ñ?а длÑ? Ñ?Ñ?ой Ñ?Ñ?еÑ?ной запиÑ?и. Ð?аÑ?и Ñ?ообÑ?ениÑ? "
-"поÑ?Ñ?авленÑ? в оÑ?еÑ?едÑ? в папке \"Ð?Ñ?Ñ?одÑ?Ñ?ие\". Ð?овÑ?оÑ?иÑ?е оÑ?пÑ?авкÑ?, нажав кнопкÑ? "
-"Ð?Ñ?пÑ?авиÑ?Ñ?/Ð?олÑ?Ñ?иÑ?Ñ?, поÑ?ле Ñ?далениÑ? некоÑ?оÑ?ого колиÑ?еÑ?Ñ?ва ваÑ?иÑ? Ñ?ообÑ?ений.\n"
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:107
+#, c-format
+msgid "Cannot get folder: Invalid operation on this store"
+msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? папкÑ?: недопÑ?Ñ?Ñ?имаÑ? опеÑ?аÑ?иÑ? в Ñ?Ñ?ом Ñ?Ñ?анилиÑ?е"
+
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
+#, c-format
+msgid "You have exceeded this account's storage limit. Your messages are queued in your Outbox. Resend by pressing Send/Receive after deleting/archiving some of your mail.\n"
+msgstr "Ð?Ñ? пÑ?евÑ?Ñ?или огÑ?аниÑ?ение меÑ?Ñ?а длÑ? Ñ?Ñ?ой Ñ?Ñ?еÑ?ной запиÑ?и. Ð?аÑ?и Ñ?ообÑ?ениÑ? поÑ?Ñ?авленÑ? в оÑ?еÑ?едÑ? в папке «Ð?Ñ?Ñ?одÑ?Ñ?ие». Ð?овÑ?оÑ?иÑ?е оÑ?пÑ?авкÑ?, нажав кнопкÑ? «Ð?Ñ?пÑ?авиÑ?Ñ?/Ð?олÑ?Ñ?иÑ?Ñ?», поÑ?ле Ñ?далениÑ? некоÑ?оÑ?ого колиÑ?еÑ?Ñ?ва ваÑ?иÑ? Ñ?ообÑ?ений.\n"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:207
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:159
#, c-format
msgid "Could not send message: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?пÑ?авиÑ?Ñ? Ñ?ообÑ?ение: %s"
-#: ../camel/providers/hula/camel-hula-provider.c:48
-#: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
-msgid "Checking for New Mail"
-msgstr "Ð?Ñ?овеÑ?ка новой поÑ?Ñ?Ñ?"
-
-#: ../camel/providers/hula/camel-hula-provider.c:53
-#: ../camel/providers/imap/camel-imap-provider.c:52
-#: ../camel/providers/imapx/camel-imapx-provider.c:54
-msgid "Connection to Server"
-msgstr "Ð?одклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ?"
-
-#: ../camel/providers/hula/camel-hula-provider.c:55
-#: ../camel/providers/imap/camel-imap-provider.c:54
-#: ../camel/providers/imapx/camel-imapx-provider.c:56
-msgid "_Use custom command to connect to server"
-msgstr "_Ð?Ñ?полÑ?зоваÑ?Ñ? Ñ?воÑ? Ñ?Ñ?Ñ?окÑ? длÑ? подклÑ?Ñ?ениÑ? к Ñ?еÑ?веÑ?Ñ?"
-
-#: ../camel/providers/hula/camel-hula-provider.c:57
-#: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:58
-msgid "Command:"
-msgstr "Ð?оманда:"
-
-#: ../camel/providers/hula/camel-hula-provider.c:60
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:43
-#: ../camel/providers/imapx/camel-imapx-provider.c:64
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid "Folders"
-msgstr "Ð?апки"
-
-#: ../camel/providers/hula/camel-hula-provider.c:62
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:45
-#: ../camel/providers/imapx/camel-imapx-provider.c:66
-msgid "_Show only subscribed folders"
-msgstr "_Ð?оказÑ?ваÑ?Ñ? Ñ?олÑ?ко подпиÑ?аннÑ?е папки"
-
-#: ../camel/providers/hula/camel-hula-provider.c:64
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:47
-#: ../camel/providers/imapx/camel-imapx-provider.c:68
-msgid "O_verride server-supplied folder namespace"
-msgstr "Ð?е_Ñ?еопÑ?еделÑ?Ñ?Ñ? пÑ?едлагаемое Ñ?еÑ?веÑ?ом пÑ?оÑ?Ñ?Ñ?анÑ?Ñ?во имÑ?н папок"
-
-#: ../camel/providers/hula/camel-hula-provider.c:66
-msgid "Namespace"
-msgstr "Ð?Ñ?оÑ?Ñ?Ñ?анÑ?Ñ?во имен"
-
-#: ../camel/providers/hula/camel-hula-provider.c:76
-msgid "Hula"
-msgstr "Hula"
-
-#: ../camel/providers/hula/camel-hula-provider.c:78
-msgid "For accessing Hula servers"
-msgstr "Ð?лÑ? доÑ?Ñ?Ñ?па к Ñ?еÑ?веÑ?ам Hula"
-
-#: ../camel/providers/hula/camel-hula-provider.c:95
-msgid "This option will connect to the Hula server using a plaintext password."
-msgstr ""
-"Ð?одклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ? Hula бÑ?деÑ? пÑ?оизводиÑ?Ñ?Ñ?Ñ? Ñ? иÑ?полÑ?зованием "
-"незаÑ?иÑ?Ñ?ованного паÑ?олÑ?."
-
-#: ../camel/providers/imap/camel-imap-command.c:181
-#: ../camel/providers/imap/camel-imap-command.c:265
+#: ../camel/providers/imap/camel-imap-command.c:197
+#: ../camel/providers/imap/camel-imap-command.c:301
+#, c-format
msgid "No output stream"
msgstr "Ð?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?вÑ?еÑ? поÑ?ока вÑ?вода"
-#: ../camel/providers/imap/camel-imap-command.c:186
-#: ../camel/providers/imap/camel-imap-command.c:270
+#: ../camel/providers/imap/camel-imap-command.c:205
+#: ../camel/providers/imap/camel-imap-command.c:309
+#, c-format
msgid "No input stream"
msgstr "Ð?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?вÑ?еÑ? поÑ?ок ввода"
-#: ../camel/providers/imap/camel-imap-command.c:229
-#: ../camel/providers/imap/camel-imap-command.c:278
-#: ../camel/providers/imap/camel-imap-command.c:492
-#: ../camel/providers/imap/camel-imap-store.c:3105
+#: ../camel/providers/imap/camel-imap-command.c:255
+#, c-format
msgid "Operation cancelled"
msgstr "Ð?пеÑ?аÑ?иÑ? оÑ?менена"
-#: ../camel/providers/imap/camel-imap-command.c:331
-#: ../camel/providers/imap/camel-imap-store.c:3110
+#: ../camel/providers/imap/camel-imap-command.c:373
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "СеÑ?веÑ? неожиданно оÑ?клÑ?Ñ?илÑ?Ñ?: %s"
#. for imap ALERT codes, account user host
#. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:352
+#: ../camel/providers/imap/camel-imap-command.c:394
#, c-format
msgid ""
"Alert from IMAP server %s %s:\n"
@@ -2890,262 +3239,252 @@ msgstr ""
"ТÑ?евожное Ñ?ообÑ?ение оÑ? Ñ?еÑ?веÑ?а IMAP %s %s:\n"
"%s"
-#: ../camel/providers/imap/camel-imap-command.c:421
+#: ../camel/providers/imap/camel-imap-command.c:468
#, c-format
msgid "Unexpected response from IMAP server: %s"
msgstr "Ð?еожиданнÑ?й оÑ?веÑ? оÑ? Ñ?еÑ?веÑ?а IMAP: %s"
-#: ../camel/providers/imap/camel-imap-command.c:431
+#: ../camel/providers/imap/camel-imap-command.c:480
#, c-format
msgid "IMAP command failed: %s"
msgstr "Сбой командÑ? IMAP: %s"
-#: ../camel/providers/imap/camel-imap-command.c:506
+#: ../camel/providers/imap/camel-imap-command.c:560
+#, c-format
msgid "Server response ended too soon."
msgstr "Ð?е полнÑ?й оÑ?веÑ? Ñ?еÑ?веÑ?а."
-#: ../camel/providers/imap/camel-imap-command.c:712
+#: ../camel/providers/imap/camel-imap-command.c:771
#, c-format
msgid "IMAP server response did not contain %s information"
msgstr "Ð?Ñ?веÑ? Ñ?еÑ?веÑ?а IMAP не Ñ?одеÑ?жиÑ? инÑ?оÑ?маÑ?ии о %s"
-#: ../camel/providers/imap/camel-imap-command.c:748
+#: ../camel/providers/imap/camel-imap-command.c:809
#, c-format
msgid "Unexpected OK response from IMAP server: %s"
-msgstr "Ð?еожиданнÑ?й оÑ?веÑ? \"OK\" оÑ? Ñ?еÑ?веÑ?а IMAP: %s"
+msgstr "Ð?еожиданнÑ?й оÑ?веÑ? «OK» оÑ? Ñ?еÑ?веÑ?а IMAP: %s"
-#: ../camel/providers/imap/camel-imap-folder.c:90
+#: ../camel/providers/imap/camel-imap-folder.c:296
msgid "Always check for new mail in this folder"
msgstr "Ð?Ñ?егда пÑ?овеÑ?Ñ?Ñ?Ñ? налиÑ?ие новой поÑ?Ñ?Ñ? в Ñ?Ñ?ой папке"
-#: ../camel/providers/imap/camel-imap-folder.c:276
+#: ../camel/providers/imap/camel-imap-folder.c:372
#, c-format
msgid "Could not create directory %s: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? каÑ?алог %s: %s"
-#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:918
-#: ../camel/providers/imapx/camel-imapx-server.c:2758
+#: ../camel/providers/imap/camel-imap-folder.c:995
+#: ../camel/providers/imapx/camel-imapx-server.c:3915
#, c-format
msgid "Scanning for changed messages in %s"
msgstr "Ð?оиÑ?к изменÑ?ннÑ?Ñ? Ñ?ообÑ?ений в %s"
-#: ../camel/providers/imap/camel-imap-folder.c:1986
-#, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr "Ð?еожиданнÑ?й Ñ?Ñ?аÑ?Ñ?Ñ? «%s» в оÑ?веÑ?е на командÑ? APPEND"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2001
-msgid "No response on continuation after APPEND command"
-msgstr "Ð?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?вÑ?еÑ? оÑ?веÑ? или пÑ?одолжение поÑ?ле командÑ? APPEND"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2046
-msgid "Unknown error occurred during APPEND command!"
-msgstr "Ð?о вÑ?емÑ? вÑ?полнениÑ? командÑ? APPEND возникла неизвеÑ?Ñ?наÑ? оÑ?ибка!"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2877
-#, c-format
-msgid "Unable to retrieve message: %s"
-msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ение: %s"
+#: ../camel/providers/imap/camel-imap-folder.c:3372
+#| msgid "Unable to retrieve message: %s"
+msgid "Unable to retrieve message: "
+msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ение: "
-#: ../camel/providers/imap/camel-imap-folder.c:2912
+#: ../camel/providers/imap/camel-imap-folder.c:3407
+#: ../camel/providers/imapx/camel-imapx-server.c:5195
#, c-format
msgid "Cannot get message with message ID %s: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ение Ñ? иденÑ?иÑ?икаÑ?оÑ?ом %s: %s"
-#: ../camel/providers/imap/camel-imap-folder.c:2913
+#: ../camel/providers/imap/camel-imap-folder.c:3408
+#: ../camel/providers/imapx/camel-imapx-server.c:5196
msgid "No such message available."
msgstr "Ð?еÑ? Ñ?акого Ñ?ообÑ?ениÑ?."
-#: ../camel/providers/imap/camel-imap-folder.c:2974
-#: ../camel/providers/imap/camel-imap-folder.c:3819
-#: ../camel/providers/nntp/camel-nntp-folder.c:236
+#: ../camel/providers/imap/camel-imap-folder.c:3483
+#: ../camel/providers/imap/camel-imap-folder.c:4378
+#: ../camel/providers/nntp/camel-nntp-folder.c:407
+#, c-format
msgid "This message is not currently available"
msgstr "ÐÑ?о Ñ?ообÑ?ение в наÑ?Ñ?оÑ?Ñ?ий моменÑ? недоÑ?Ñ?Ñ?пно"
-#: ../camel/providers/imap/camel-imap-folder.c:3632
+#: ../camel/providers/imap/camel-imap-folder.c:4179
#, c-format
msgid "Incomplete server response: no information provided for message %d"
msgstr "Ð?еполнÑ?й оÑ?веÑ? Ñ?еÑ?веÑ?а: не пÑ?едоÑ?Ñ?авлена инÑ?оÑ?маÑ?иÑ? о Ñ?ообÑ?ении %d"
-#: ../camel/providers/imap/camel-imap-folder.c:3640
+#: ../camel/providers/imap/camel-imap-folder.c:4189
#, c-format
msgid "Incomplete server response: no UID provided for message %d"
msgstr "Ð?еполнÑ?й оÑ?веÑ? Ñ?еÑ?веÑ?а: оÑ?Ñ?Ñ?Ñ?Ñ?Ñ?вÑ?еÑ? UID длÑ? Ñ?ообÑ?ениÑ? %d"
-#: ../camel/providers/imap/camel-imap-folder.c:3857
+#: ../camel/providers/imap/camel-imap-folder.c:4418
+#, c-format
msgid "Could not find message body in FETCH response."
msgstr "Ð?е Ñ?далоÑ?Ñ? найÑ?и Ñ?ело Ñ?ообÑ?ениÑ? в оÑ?веÑ?е на командÑ? FETCH."
-#: ../camel/providers/imap/camel-imap-message-cache.c:181
-#: ../camel/providers/imap/camel-imap-message-cache.c:244
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? каÑ?алог кÑ?Ñ?а: %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:193
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
+#| msgid "Could not open cache directory: %s"
+msgid "Could not open cache directory: "
+msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? каÑ?алог кÑ?Ñ?а: "
-#: ../camel/providers/imap/camel-imap-message-cache.c:330
-#: ../camel/providers/imap/camel-imap-message-cache.c:387
-#: ../camel/providers/imap/camel-imap-message-cache.c:418
-#: ../camel/providers/imap/camel-imap-message-cache.c:450
+#: ../camel/providers/imap/camel-imap-message-cache.c:326
#, c-format
msgid "Failed to cache message %s: %s"
msgstr "Сбой пÑ?и кÑ?Ñ?иÑ?овании Ñ?ообÑ?ениÑ? %s: %s"
-#: ../camel/providers/imap/camel-imap-message-cache.c:530
+#: ../camel/providers/imap/camel-imap-message-cache.c:391
#, c-format
-msgid "Failed to cache %s: %s"
-msgstr "Сбой пÑ?и кÑ?Ñ?иÑ?овании %s: %s"
+#| msgid "Failed to cache message %s: %s"
+msgid "Failed to cache message %s: "
+msgstr "Сбой пÑ?и кÑ?Ñ?иÑ?овании Ñ?ообÑ?ениÑ? %s: "
-#: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:50
+#: ../camel/providers/imap/camel-imap-message-cache.c:529
+#, c-format
+#| msgid "Failed to cache %s: %s"
+msgid "Failed to cache %s: "
+msgstr "Сбой пÑ?и кÑ?Ñ?иÑ?овании %s: "
+
+#: ../camel/providers/imap/camel-imap-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
+msgid "Checking for New Mail"
+msgstr "Ð?Ñ?овеÑ?ка новой поÑ?Ñ?Ñ?"
+
+#: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
msgid "Ch_eck for new messages in subscribed folders"
msgstr "Ð?_Ñ?овеÑ?Ñ?Ñ?Ñ? новÑ?Ñ? поÑ?Ñ?Ñ? в подпиÑ?аннÑ?Ñ? папкаÑ?"
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:49
-#: ../camel/providers/imapx/camel-imapx-provider.c:70
-msgid "Namespace:"
-msgstr "Ð?Ñ?оÑ?Ñ?Ñ?анÑ?Ñ?во имÑ?н:"
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:52
+msgid "Connection to Server"
+msgstr "Ð?одклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ?"
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:53
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
-msgid "_Apply filters to new messages in INBOX on this server"
-msgstr ""
-"_Ð?Ñ?имениÑ?Ñ? Ñ?илÑ?Ñ?Ñ?Ñ? к новÑ?м Ñ?ообÑ?ениÑ?м в папке \"Ð?Ñ?одÑ?Ñ?ие\" на Ñ?Ñ?ом Ñ?еÑ?веÑ?е"
+#: ../camel/providers/imap/camel-imap-provider.c:50
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
+msgid "_Use custom command to connect to server"
+msgstr "_Ð?Ñ?полÑ?зоваÑ?Ñ? Ñ?воÑ? Ñ?Ñ?Ñ?окÑ? длÑ? подклÑ?Ñ?ениÑ? к Ñ?еÑ?веÑ?Ñ?"
-#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imap/camel-imap-provider.c:52
+#| msgid "Command:"
+msgid "Co_mmand:"
+msgstr "Ð?о_манда:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:62
+#: ../camel/providers/nntp/camel-nntp-provider.c:42
+msgid "Folders"
+msgstr "Ð?апки"
+
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
+msgid "_Show only subscribed folders"
+msgstr "_Ð?оказÑ?ваÑ?Ñ? Ñ?олÑ?ко подпиÑ?аннÑ?е папки"
+
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
+msgid "O_verride server-supplied folder namespace"
+msgstr "Ð?е_Ñ?еопÑ?еделÑ?Ñ?Ñ? пÑ?едлагаемое Ñ?еÑ?веÑ?ом пÑ?оÑ?Ñ?Ñ?анÑ?Ñ?во имÑ?н папок"
+
+#: ../camel/providers/imap/camel-imap-provider.c:62
+#| msgid "Namespace:"
+msgid "Names_pace:"
+msgstr "Ð?Ñ?оÑ?Ñ?Ñ?анÑ?Ñ?во _имÑ?н:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:68
#: ../camel/providers/imapx/camel-imapx-provider.c:76
msgid "Check new messages for Jun_k contents"
msgstr "Ð?Ñ?овеÑ?Ñ?Ñ?Ñ?, Ñ?влÑ?Ñ?Ñ?Ñ?Ñ? ли новÑ?е Ñ?ообÑ?ениÑ? _Ñ?памом"
-#: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:59
+#: ../camel/providers/imap/camel-imap-provider.c:72
#: ../camel/providers/imapx/camel-imapx-provider.c:80
msgid "Automatically synchroni_ze remote mail locally"
msgstr "Ð?вÑ?омаÑ?иÑ?еÑ?ки Ñ?инÑ?Ñ?они_зиÑ?оваÑ?Ñ? Ñ?даленнÑ?Ñ? поÑ?Ñ?Ñ? локалÑ?но"
-#: ../camel/providers/imap/camel-imap-provider.c:83
+#: ../camel/providers/imap/camel-imap-provider.c:79
msgid "IMAP"
msgstr "IMAP"
-#: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imap/camel-imap-provider.c:81
#: ../camel/providers/imapx/camel-imapx-provider.c:90
msgid "For reading and storing mail on IMAP servers."
msgstr "Ð?лÑ? Ñ?Ñ?ениÑ? и Ñ?Ñ?анениÑ? поÑ?Ñ?Ñ? на Ñ?еÑ?веÑ?аÑ? IMAP."
-#: ../camel/providers/imap/camel-imap-provider.c:102
+#: ../camel/providers/imap/camel-imap-provider.c:99
#: ../camel/providers/imapx/camel-imapx-provider.c:106
msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-"Ð?одклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ? IMAP бÑ?деÑ? пÑ?оизводиÑ?Ñ?Ñ?Ñ? Ñ? иÑ?полÑ?зованием "
-"незаÑ?иÑ?Ñ?ованного паÑ?олÑ?."
+msgstr "Ð?одклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ? IMAP бÑ?деÑ? пÑ?оизводиÑ?Ñ?Ñ?Ñ? Ñ? иÑ?полÑ?зованием незаÑ?иÑ?Ñ?ованного паÑ?олÑ?."
-#: ../camel/providers/imap/camel-imap-store.c:435
-#: ../camel/providers/imap4/camel-imap4-store.c:210
-#: ../camel/providers/imapx/camel-imapx-store.c:167
-#, c-format
-msgid "IMAP server %s"
-msgstr "СеÑ?веÑ? IMAP %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:212
-#: ../camel/providers/imapx/camel-imapx-store.c:169
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "СеÑ?виÑ? IMAP длÑ? %s на %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:566
-#: ../camel/providers/imap/camel-imap-store.c:581
-#: ../camel/providers/imap4/camel-imap4-store.c:247
-#: ../camel/providers/imap4/camel-imap4-store.c:262
-#: ../camel/providers/nntp/camel-nntp-store.c:182
-#: ../camel/providers/nntp/camel-nntp-store.c:197
-#: ../camel/providers/pop3/camel-pop3-store.c:192
-#: ../camel/providers/pop3/camel-pop3-store.c:206
-#: ../camel/providers/smtp/camel-smtp-transport.c:259
-#: ../camel/providers/smtp/camel-smtp-transport.c:274
+#: ../camel/providers/imap/camel-imap-store.c:243
+#: ../camel/providers/nntp/camel-nntp-store.c:313
+#: ../camel/providers/pop3/camel-pop3-store.c:135
+#: ../camel/providers/smtp/camel-smtp-transport.c:151
#, c-format
msgid "Could not connect to %s: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? к %s: %s"
-#: ../camel/providers/imap/camel-imap-store.c:567
-#: ../camel/providers/imap4/camel-imap4-store.c:248
-#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/pop3/camel-pop3-store.c:193
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
+#: ../camel/providers/imap/camel-imap-store.c:244
+#: ../camel/providers/nntp/camel-nntp-store.c:314
+#: ../camel/providers/pop3/camel-pop3-store.c:136
+#: ../camel/providers/smtp/camel-smtp-transport.c:152
msgid "SSL unavailable"
msgstr "SSL недоÑ?Ñ?Ñ?пен"
-#: ../camel/providers/imap/camel-imap-store.c:578
-#: ../camel/providers/imap/camel-imap-store.c:860
-#: ../camel/providers/imapx/camel-imapx-server.c:2017
-msgid "Connection cancelled"
-msgstr "Соединение оÑ?менено"
+#: ../camel/providers/imap/camel-imap-store.c:264
+#: ../camel/providers/nntp/camel-nntp-store.c:333
+#, c-format
+#| msgid "Could not connect to %s: %s"
+msgid "Could not connect to %s: "
+msgstr "Ð?е Ñ?далоÑ?Ñ? подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? к %s: "
-#: ../camel/providers/imap/camel-imap-store.c:689
-#: ../camel/providers/imap/camel-imap-store.c:708
-#: ../camel/providers/imap/camel-imap-store.c:714
-#: ../camel/providers/imap/camel-imap-store.c:740
-#: ../camel/providers/imap4/camel-imap4-store.c:310
-#: ../camel/providers/imap4/camel-imap4-store.c:325
-#: ../camel/providers/imap4/camel-imap4-store.c:334
-#: ../camel/providers/imapx/camel-imapx-server.c:2057
-#: ../camel/providers/imapx/camel-imapx-server.c:2071
+#: ../camel/providers/imap/camel-imap-store.c:370
+#: ../camel/providers/imap/camel-imap-store.c:390
+#: ../camel/providers/imap/camel-imap-store.c:397
+#: ../camel/providers/imap/camel-imap-store.c:424
+#: ../camel/providers/imapx/camel-imapx-server.c:2927
+#: ../camel/providers/imapx/camel-imapx-server.c:2967
#, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? к Ñ?еÑ?веÑ?Ñ? IMAP %s в заÑ?иÑ?енном Ñ?ежиме:%s"
-#: ../camel/providers/imap/camel-imap-store.c:690
-#: ../camel/providers/imapx/camel-imapx-server.c:2058
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
+#: ../camel/providers/imap/camel-imap-store.c:371
+#: ../camel/providers/imapx/camel-imapx-server.c:2928
+#: ../camel/providers/smtp/camel-smtp-transport.c:238
msgid "STARTTLS not supported"
msgstr "STARTTLS не поддеÑ?живаеÑ?Ñ?Ñ?"
-#: ../camel/providers/imap/camel-imap-store.c:709
-#: ../camel/providers/imapx/camel-imapx-server.c:2072
+#: ../camel/providers/imap/camel-imap-store.c:391
+#: ../camel/providers/imapx/camel-imapx-server.c:2968
msgid "SSL negotiations failed"
msgstr "Сбой Ñ?оглаÑ?ований SSL"
-#: ../camel/providers/imap/camel-imap-store.c:715
-#: ../camel/providers/imap4/camel-imap4-store.c:335
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
+#: ../camel/providers/imap/camel-imap-store.c:398
+#: ../camel/providers/smtp/camel-smtp-transport.c:285
msgid "SSL is not available in this build"
msgstr "SSL не поддеÑ?живаеÑ?Ñ?Ñ? в Ñ?Ñ?ой Ñ?боÑ?ке"
-#: ../camel/providers/imap/camel-imap-store.c:863
+#: ../camel/providers/imap/camel-imap-store.c:549
+#: ../camel/providers/imapx/camel-imapx-server.c:2755
+#, c-format
+msgid "Connection cancelled"
+msgstr "Соединение оÑ?менено"
+
+#: ../camel/providers/imap/camel-imap-store.c:554
+#: ../camel/providers/imapx/camel-imapx-server.c:2760
#, c-format
msgid "Could not connect with command \"%s\": %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? командой «%s»: %s"
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1051
-#: ../camel/providers/imap/camel-imap-store.c:2430
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:356
-#: ../camel/providers/imap4/camel-imap4-store.c:1403
-#: ../camel/providers/imapx/camel-imapx-store.c:349
-#: ../camel/providers/imapx/camel-imapx-store.c:578
-#: ../camel/providers/local/camel-maildir-folder.c:81
-#: ../camel/providers/local/camel-maildir-store.c:219
-#: ../camel/providers/local/camel-maildir-store.c:291
-#: ../camel/providers/local/camel-maildir-store.c:517
-#: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:461
-msgid "Inbox"
-msgstr "Ð?Ñ?одÑ?Ñ?ие"
-
-#: ../camel/providers/imap/camel-imap-store.c:1303
+#: ../camel/providers/imap/camel-imap-store.c:740
+#: ../camel/providers/imapx/camel-imapx-server.c:3041
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "СеÑ?веÑ? IMAP %s не поддеÑ?живаеÑ? заÑ?Ñ?ебованнÑ?й Ñ?ип аÑ?Ñ?енÑ?иÑ?икаÑ?ии %s"
-#: ../camel/providers/imap/camel-imap-store.c:1313
-#: ../camel/providers/smtp/camel-smtp-transport.c:506
+#: ../camel/providers/imap/camel-imap-store.c:752
+#: ../camel/providers/imapx/camel-imapx-server.c:3053
+#: ../camel/providers/smtp/camel-smtp-transport.c:420
#, c-format
msgid "No support for authentication type %s"
msgstr "Ð?Ñ?Ñ?енÑ?иÑ?икаÑ?иÑ? %s не поддеÑ?живаеÑ?Ñ?Ñ?"
-#: ../camel/providers/imap/camel-imap-store.c:1387
+#: ../camel/providers/imap/camel-imap-store.c:836
+#: ../camel/providers/imapx/camel-imapx-server.c:3129
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -3156,453 +3495,219 @@ msgstr ""
"%s\n"
"\n"
-#: ../camel/providers/imap/camel-imap-store.c:1891
-#: ../camel/providers/imap/camel-imap-store.c:2272
-#: ../camel/providers/imap4/camel-imap4-store.c:954
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Ð?мÑ? папки «%s» некоÑ?Ñ?екÑ?но, Ñ?ак как Ñ?одеÑ?жиÑ? Ñ?имвол \"%c\""
-
-#: ../camel/providers/imap/camel-imap-store.c:2008
-#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:202
-#: ../camel/providers/local/camel-mh-store.c:249
-#, c-format
-msgid "Cannot create folder '%s': folder exists."
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? папкÑ? «%s»: папка Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?."
-
-#: ../camel/providers/imap/camel-imap-store.c:2283
-#, c-format
-msgid "Unknown parent folder: %s"
-msgstr "Ð?еизвеÑ?Ñ?наÑ? Ñ?одиÑ?елÑ?Ñ?каÑ? папка: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:3107
-msgid "Server unexpectedly disconnected"
-msgstr "СеÑ?веÑ? неожиданно оÑ?клÑ?Ñ?илÑ?Ñ?"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:572
-#: ../camel/providers/imap4/camel-imap4-command.c:579
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "Ð?Ñ?ибка оÑ?пÑ?авки командÑ? на Ñ?еÑ?веÑ? IMAP %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:681
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Ð?еожиданнÑ?й оÑ?веÑ? оÑ? Ñ?еÑ?веÑ?а IMAP4 %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:215
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "Ð?еожиданное пÑ?ивеÑ?Ñ?Ñ?вие оÑ? Ñ?еÑ?веÑ?а IMAP %s."
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:440
-#, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr "Ð?е Ñ?далоÑ?Ñ? вÑ?делиÑ?Ñ? папкÑ? «%s»: невеÑ?ное имÑ? поÑ?Ñ?ового Ñ?Ñ?ика"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:446
-#, c-format
-msgid "Cannot select folder '%s': Bad command"
-msgstr "Ð?е Ñ?далоÑ?Ñ? вÑ?делиÑ?Ñ? папкÑ? «%s»: невеÑ?наÑ? команда"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1414
-#, c-format
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr "Ð?Ñ?ибка оÑ?пÑ?авки командÑ? на Ñ?еÑ?веÑ? IMAP %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1416
-msgid "service unavailable"
-msgstr "Ñ?лÑ?жба недоÑ?Ñ?Ñ?пна"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1546
-#: ../camel/providers/imap4/camel-imap4-engine.c:1584
-#: ../camel/providers/imap4/camel-imap4-engine.c:1628
-#: ../camel/providers/imap4/camel-imap4-engine.c:1683
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "СеÑ?веÑ? IMAP4 %s неожиданно оÑ?клÑ?Ñ?илÑ?Ñ?: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:87
-msgid ""
-"Enable extended Mailing-List detection required for some filter and vFolder "
-"rules"
-msgstr ""
-"Ð?клÑ?Ñ?иÑ?Ñ? опÑ?еделение Ñ?пиÑ?ков Ñ?аÑ?Ñ?Ñ?лки, Ñ?Ñ?ебÑ?Ñ?Ñ?ееÑ?Ñ? длÑ? некоÑ?оÑ?Ñ?Ñ? Ñ?илÑ?Ñ?Ñ?ов и "
-"пÑ?авил vFolder"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:88
-msgid "Expire cached messages that haven't been read in X seconds"
-msgstr "Ð?Ñ?бÑ?аÑ?Ñ?ваÑ?Ñ? Ñ?Ñ?анимÑ?е Ñ?ообÑ?ениÑ?, коÑ?оÑ?Ñ?е не бÑ?ли пÑ?оÑ?иÑ?анÑ? за X Ñ?екÑ?нд"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
-msgid "Expire cached messages older than X seconds"
-msgstr "Ð?Ñ?бÑ?аÑ?Ñ?ваÑ?Ñ? Ñ?ообÑ?ениÑ?, Ñ?Ñ?анимÑ?е болÑ?Ñ?е X Ñ?екÑ?нд"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:427
-#, c-format
-msgid "Cannot access folder '%s': %s"
-msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? доÑ?Ñ?Ñ?п к папке «%s»: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:484
-#, c-format
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?инÑ?Ñ?онизиÑ?оваÑ?Ñ? Ñ?лаги Ñ? папкой «%s»: неизвеÑ?Ñ?наÑ? оÑ?ибка"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:490
-#, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?инÑ?Ñ?онизиÑ?оваÑ?Ñ? Ñ?лаги Ñ? папкой «%s»: невеÑ?наÑ? команда"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:630
-#, c-format
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?иÑ?Ñ?иÑ?Ñ? папкÑ? «%s»: неизвеÑ?Ñ?наÑ? оÑ?ибка"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:635
-#, c-format
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?иÑ?Ñ?иÑ?Ñ? папкÑ? «%s»: невеÑ?наÑ? команда"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:891
-#, c-format
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ение: %s из папки «%s»: неÑ? Ñ?акого Ñ?ообÑ?ениÑ?"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:896
-#, c-format
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ение %s из папки «%s»: невеÑ?наÑ? команда"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:940
-#, c-format
-msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr ""
-"Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? Ñ?ообÑ?ение к папке «%s»: папка доÑ?Ñ?Ñ?пна Ñ?олÑ?ко длÑ? Ñ?Ñ?ениÑ?"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1033
-#, c-format
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? Ñ?ообÑ?ение в папкÑ? «%s»: неизвеÑ?Ñ?наÑ? оÑ?ибка"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1063
-#, c-format
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? Ñ?ообÑ?ение в папкÑ? «%s»: невеÑ?наÑ? команда"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1182
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-msgstr ""
-"Ð?е Ñ?далоÑ?Ñ? пеÑ?емеÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ениÑ? из папки «%s» в папкÑ? «%s»: неизвеÑ?Ñ?наÑ? оÑ?ибка"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1186
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?копиÑ?оваÑ?Ñ? Ñ?ообÑ?ениÑ?: %s из папки %s: неизвеÑ?Ñ?наÑ? оÑ?ибка"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1194
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr ""
-"Ð?е Ñ?далоÑ?Ñ? пеÑ?емеÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ениÑ? из папки «%s» в папкÑ? «%s»: невеÑ?наÑ? команда"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1198
+#: ../camel/providers/imap/camel-imap-store.c:997
+#: ../camel/providers/imapx/camel-imapx-store.c:183
#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-msgstr ""
-"Ð?е Ñ?далоÑ?Ñ? Ñ?копиÑ?оваÑ?Ñ? Ñ?ообÑ?ениÑ? из папки «%s» в папкÑ? «%s»: невеÑ?наÑ? команда"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:55
-msgid "Check new messages for _Junk contents"
-msgstr "Ð?Ñ?овеÑ?Ñ?Ñ?Ñ?, Ñ?влÑ?Ñ?Ñ?Ñ?Ñ? ли новÑ?е Ñ?ообÑ?ениÑ? Ñ?памом"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:57
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr ""
-"Ð?Ñ?овеÑ?Ñ?Ñ?Ñ?, Ñ?влÑ?Ñ?Ñ?Ñ?Ñ? ли новÑ?е Ñ?ообÑ?ениÑ? Ñ?памом, Ñ?олÑ?ко в папке \"Ð?Ñ?одÑ?Ñ?ие\""
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:66
-msgid "IMAP4rev1"
-msgstr "IMAP4rev1"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:68
-msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr "Ð?лÑ? Ñ?Ñ?ениÑ? и Ñ?Ñ?анениÑ? поÑ?Ñ?Ñ? на Ñ?еÑ?веÑ?аÑ? IMAPv4rev."
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:85
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Ð?одклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ? IMAP бÑ?деÑ? пÑ?оизводиÑ?Ñ?Ñ?Ñ? Ñ? иÑ?полÑ?зованием "
-"незаÑ?иÑ?Ñ?ованного паÑ?олÑ?."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:259
-#: ../camel/providers/nntp/camel-nntp-store.c:194
-#: ../camel/providers/nntp/camel-nntp-store.c:213
-#: ../camel/providers/pop3/camel-pop3-store.c:203
-#: ../camel/providers/smtp/camel-smtp-transport.c:271
-msgid "Connection canceled"
-msgstr "Соединение оÑ?менено"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:296
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"Ð?е Ñ?далоÑ?Ñ? подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? к Ñ?еÑ?веÑ?Ñ? IMAP %s в заÑ?иÑ?енном Ñ?ежиме: Ñ?еÑ?веÑ? не "
-"поддеÑ?живаеÑ? STARTTLS"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:326
-#: ../camel/providers/pop3/camel-pop3-store.c:275
-msgid "TLS negotiations failed"
-msgstr "Сбой Ñ?оглаÑ?ованиÑ? TLS"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:411
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr "Ð?е Ñ?далоÑ?Ñ? авÑ?оÑ?изоваÑ?Ñ?Ñ?Ñ? на Ñ?еÑ?веÑ?е IMAP %s иÑ?полÑ?зÑ?Ñ? меÑ?анизм %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:534
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?ойÑ?и пÑ?овеÑ?кÑ? подлинноÑ?Ñ?и на Ñ?еÑ?веÑ?е IMAP %s иÑ?полÑ?зÑ?Ñ? %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:697
-#: ../camel/providers/imap4/camel-imap4-store.c:964
-msgid "Cannot create IMAP folders in offline mode."
-msgstr "Ð?евозможно Ñ?оздаÑ?Ñ? папки IMAP в авÑ?ономном Ñ?ежиме."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:736
-#, c-format
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? папкÑ? «%s» на Ñ?еÑ?веÑ?е IMAP %s: неизвеÑ?Ñ?наÑ? оÑ?ибка"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:816
-#, c-format
-msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?ведениÑ? длÑ? «%s» на Ñ?еÑ?веÑ?е IMAP %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-msgid "Bad command"
-msgstr "Ð?евеÑ?наÑ? команда"
+msgid "IMAP server %s"
+msgstr "СеÑ?веÑ? IMAP %s"
-#: ../camel/providers/imap4/camel-imap4-store.c:897
+#: ../camel/providers/imap/camel-imap-store.c:1001
+#: ../camel/providers/imapx/camel-imapx-store.c:185
#, c-format
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? папкÑ? «%s»: невеÑ?ное имÑ? поÑ?Ñ?ового Ñ?Ñ?ика"
+msgid "IMAP service for %s on %s"
+msgstr "СеÑ?виÑ? IMAP длÑ? %s на %s"
-#: ../camel/providers/imap4/camel-imap4-store.c:902
-#, c-format
-msgid "Cannot create folder '%s': Bad command"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? папкÑ? «%s»: невеÑ?наÑ? команда"
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/providers/imap/camel-imap-store.c:1367
+#: ../camel/providers/imap/camel-imap-store.c:2416
+#: ../camel/providers/imapx/camel-imapx-store.c:372
+#: ../camel/providers/imapx/camel-imapx-store.c:794
+#: ../camel/providers/local/camel-maildir-folder.c:409
+#: ../camel/providers/local/camel-maildir-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:615
+#: ../camel/providers/local/camel-maildir-store.c:621
+#: ../camel/providers/local/camel-maildir-store.c:669
+#: ../camel/providers/local/camel-spool-store.c:289
+msgid "Inbox"
+msgstr "Ð?Ñ?одÑ?Ñ?ие"
-#: ../camel/providers/imap4/camel-imap4-store.c:1008
+#: ../camel/providers/imap/camel-imap-store.c:1822
+#: ../camel/providers/imap/camel-imap-store.c:2259
+#: ../camel/providers/imapx/camel-imapx-store.c:1320
#, c-format
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?далиÑ?Ñ? папкÑ? «%s»: Ñ?пеÑ?иалÑ?наÑ? папка"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1015
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr "Ð?евозможно Ñ?далиÑ?Ñ? папки IMAP в авÑ?ономном Ñ?ежиме."
+msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Ð?едопÑ?Ñ?Ñ?имое имÑ? папки «%s»: имÑ? Ñ?одеÑ?жиÑ? Ñ?имвол «%c»"
-#: ../camel/providers/imap4/camel-imap4-store.c:1074
+#: ../camel/providers/imap/camel-imap-store.c:1939
+#: ../camel/providers/local/camel-maildir-store.c:244
+#: ../camel/providers/local/camel-mbox-store.c:407
+#: ../camel/providers/local/camel-mh-store.c:504
#, c-format
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?далиÑ?Ñ? папкÑ? «%s»: невеÑ?ное имÑ? поÑ?Ñ?ового Ñ?Ñ?ика"
+msgid "Cannot create folder '%s': folder exists."
+msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? папкÑ? «%s»: папка Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?."
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
+#: ../camel/providers/imap/camel-imap-store.c:2272
+#: ../camel/providers/imapx/camel-imapx-store.c:1331
#, c-format
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?далиÑ?Ñ? папкÑ?: «%s»: невеÑ?наÑ? команда"
+msgid "Unknown parent folder: %s"
+msgstr "Ð?еизвеÑ?Ñ?наÑ? Ñ?одиÑ?елÑ?Ñ?каÑ? папка: %s"
-#: ../camel/providers/imap4/camel-imap4-store.c:1099
+#: ../camel/providers/imap/camel-imap-store.c:3137
#, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "Ð?е Ñ?далоÑ?Ñ? пеÑ?еименоваÑ?Ñ? папкÑ? «%s» в «%s»: Ñ?пеÑ?иалÑ?наÑ? папка"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1106
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "Ð?евозможно пеÑ?еименоваÑ?Ñ? папки IMAP в авÑ?ономном Ñ?ежиме."
+msgid "Server unexpectedly disconnected"
+msgstr "СеÑ?веÑ? неожиданно оÑ?клÑ?Ñ?илÑ?Ñ?"
-#: ../camel/providers/imap4/camel-imap4-store.c:1137
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-msgstr "Ð?е Ñ?далоÑ?Ñ? пеÑ?еименоваÑ?Ñ? папкÑ? «%s» в «%s»: невеÑ?ное имÑ? поÑ?Ñ?ового Ñ?Ñ?ика"
+#: ../camel/providers/imap/camel-imap-store.c:3140
+#| msgid "Server unexpectedly disconnected: %s"
+msgid "Server unexpectedly disconnected: "
+msgstr "СеÑ?веÑ? неожиданно оÑ?клÑ?Ñ?илÑ?Ñ?: "
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
+#: ../camel/providers/imapx/camel-imapx-folder.c:74
#, c-format
-msgid "Cannot rename folder '%s' to '%s': Bad command"
-msgstr "Ð?е Ñ?далоÑ?Ñ? пеÑ?еименоваÑ?Ñ? папкÑ? «%s» в «%s»: невеÑ?наÑ? команда"
+msgid "Could not create folder summary for %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? кÑ?аÑ?кÑ?Ñ? инÑ?оÑ?маÑ?иÑ? по папке %s"
-#. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
-#. * The fourth one is an error message.
-#: ../camel/providers/imap4/camel-imap4-store.c:1572
+#: ../camel/providers/imapx/camel-imapx-folder.c:82
#, c-format
-msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?ведениÑ? %s длÑ? Ñ?аблона «%s» на Ñ?еÑ?веÑ?е IMAP %s: %s"
+#| msgid "Could not create cache for %s"
+msgid "Could not create cache for %s: "
+msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? кÑ?Ñ? длÑ? %s:"
-#: ../camel/providers/imap4/camel-imap4-store.c:1633
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "Ð?евозможно подпиÑ?аÑ?Ñ?Ñ?Ñ? на папки IMAP в авÑ?ономном Ñ?ежиме."
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
+#| msgid "Use I_dle if the server supports it"
+msgid "Use _Quick Resync if the server supports it"
+msgstr "Ð?Ñ?полÑ?зоваÑ?Ñ? _бÑ?Ñ?Ñ?Ñ?Ñ?Ñ? Ñ?инÑ?Ñ?онизаÑ?иÑ?, еÑ?ли Ñ?еÑ?веÑ? поддеÑ?живаеÑ? Ñ?акÑ?Ñ? возможноÑ?Ñ?Ñ?"
-#: ../camel/providers/imap4/camel-imap4-store.c:1678
-#, c-format
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr "Ð?е Ñ?далоÑ?Ñ? подпиÑ?аÑ?Ñ?Ñ?Ñ? на папкÑ? «%s»: невеÑ?ное имÑ? поÑ?Ñ?ового Ñ?Ñ?ика"
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
+msgid "Use I_dle if the server supports it"
+msgstr "Ð?Ñ?полÑ?зÑ?йÑ?е Ð?Ñ?оÑ?Ñ?о_й, еÑ?ли Ñ?еÑ?веÑ? поддеÑ?живаеÑ? Ñ?Ñ?Ñ? возможноÑ?Ñ?Ñ?"
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, c-format
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "Ð?е Ñ?далоÑ?Ñ? подпиÑ?аÑ?Ñ?Ñ?Ñ? на папкÑ? «%s»: невеÑ?наÑ? команда"
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "Command:"
+msgstr "Ð?оманда:"
-#: ../camel/providers/imap4/camel-imap4-store.c:1705
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr "Ð?евозможно оÑ?пиÑ?аÑ?Ñ?Ñ?Ñ? оÑ? папок IMAP в авÑ?ономном Ñ?ежиме."
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
+msgid "Numbe_r of cached connections to use"
+msgstr "Ð?Ñ?полÑ?зÑ?емое _колиÑ?еÑ?Ñ?во кÑ?Ñ?иÑ?Ñ?емÑ?Ñ? Ñ?оединений"
-#: ../camel/providers/imap4/camel-imap4-store.c:1750
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?пиÑ?аÑ?Ñ?Ñ?Ñ? оÑ? папки «%s»: невеÑ?ное имÑ? поÑ?Ñ?ового Ñ?Ñ?ика"
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
+msgid "Namespace:"
+msgstr "Ð?Ñ?оÑ?Ñ?Ñ?анÑ?Ñ?во имÑ?н:"
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?пиÑ?аÑ?Ñ?Ñ?Ñ? оÑ? папки «%s»: Ð?евеÑ?наÑ? команда"
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
+msgid "IMAP+"
+msgstr "IMAP+"
-#: ../camel/providers/imap4/camel-imap4-summary.c:1590
-msgid "Scanning for changed messages"
-msgstr "Ð?оиÑ?к изменÑ?ннÑ?Ñ? Ñ?ообÑ?ений"
+#: ../camel/providers/imapx/camel-imapx-server.c:1404
+#| msgid "Error writing mail temp file: %s"
+msgid "Error writing to cache stream: "
+msgstr "Ð?Ñ?ибка запиÑ?и в поÑ?ок кÑ?Ñ?а: "
-#: ../camel/providers/imap4/camel-imap4-summary.c:1611
+#: ../camel/providers/imapx/camel-imapx-server.c:2083
#, c-format
-msgid "IMAP server %s is in an inconsistent state."
-msgstr "СеÑ?веÑ? IMAP %s наÑ?одиÑ?Ñ?Ñ? в неÑ?Ñ?Ñ?ойÑ?ивом Ñ?оÑ?Ñ?оÑ?нии."
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1638
-msgid "Fetching envelopes of new messages"
-msgstr "Ð?олÑ?Ñ?ение конвеÑ?Ñ?ов новÑ?Ñ? Ñ?ообÑ?ений"
+#| msgid "Cannot authenticate user"
+msgid "Not authenticated"
+msgstr "Ð?е Ñ?далоÑ?Ñ? вÑ?полниÑ?Ñ? аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?"
-#: ../camel/providers/imap4/camel-imap4-utils.c:429
+#: ../camel/providers/imapx/camel-imapx-server.c:2850
#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Ð?еожиданнÑ?й Ñ?окен в оÑ?веÑ?е Ñ?еÑ?веÑ?а IMAP %s: "
+#| msgid "Could not connect to %s (port %s): %s"
+msgid "Could not connect to %s (port %s): "
+msgstr "Ð?е Ñ?далоÑ?Ñ? подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? к %s (поÑ?Ñ? %s): "
-#: ../camel/providers/imap4/camel-imap4-utils.c:452
-msgid "No data"
-msgstr "Ð?еÑ? даннÑ?Ñ?"
+#: ../camel/providers/imapx/camel-imapx-server.c:3311
+#| msgid "Posting failed: %s"
+msgid "Closing tmp stream failed: "
+msgstr "Ð?Ñ?оизоÑ?Ñ?л Ñ?бок пÑ?и попÑ?Ñ?ке закÑ?Ñ?Ñ?Ñ? вÑ?еменнÑ?й поÑ?ок: "
-#: ../camel/providers/imap4/camel-imap4-utils.c:613
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "СеÑ?веÑ? IMAP %s неожиданно оÑ?клÑ?Ñ?илÑ?Ñ?: %s"
-
-#: ../camel/providers/imapx/camel-imapx-folder.c:84
-#, c-format
-msgid "Could not create folder summary for %s"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? кÑ?аÑ?кÑ?Ñ? инÑ?оÑ?маÑ?иÑ? по папке %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:5345
+#: ../camel/providers/imapx/camel-imapx-server.c:5360
+#| msgid "Cannot create message: %s"
+msgid "Cannot create spool file: "
+msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? Ñ?айл Ñ?пÑ?ла: "
-#: ../camel/providers/imapx/camel-imapx-folder.c:92
+#: ../camel/providers/imapx/camel-imapx-store.c:1136
+#: ../camel/providers/nntp/camel-nntp-store.c:1610
#, c-format
-msgid "Could not create cache for %s"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? кÑ?Ñ? длÑ? %s"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
-msgid "Use I_dle if the server supports it"
-msgstr "Ð?Ñ?полÑ?зÑ?йÑ?е Ð?Ñ?оÑ?Ñ?о_й, еÑ?ли Ñ?еÑ?веÑ? поддеÑ?живаеÑ? Ñ?Ñ?Ñ? возможноÑ?Ñ?Ñ?"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:60
-msgid "Numbe_r of cached connections to use"
-msgstr "Ð?Ñ?полÑ?зÑ?емое _колиÑ?еÑ?Ñ?во кÑ?Ñ?иÑ?Ñ?емÑ?Ñ? Ñ?оединений"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
-msgid "IMAP+"
-msgstr "IMAP+"
+msgid "No such folder: %s"
+msgstr "Ð?еÑ? Ñ?акой папки: %s"
-#: ../camel/providers/imapx/camel-imapx-server.c:2020
+#: ../camel/providers/imapx/camel-imapx-stream.c:70
#, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "Ð?е Ñ?далоÑ?Ñ? подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? к %s (поÑ?Ñ? %s): %s"
+msgid "Source stream returned no data"
+msgstr "Ð?оÑ?ок не веÑ?нÑ?л даннÑ?е"
-#: ../camel/providers/imapx/camel-imapx-server.c:2100
+#: ../camel/providers/imapx/camel-imapx-stream.c:79
#, c-format
-msgid "%sPlease enter the IMAP password for %s %s"
-msgstr "%sÐ?ведиÑ?е паÑ?олÑ? IMAP длÑ? %s %s"
-
-#: ../camel/providers/local/camel-local-folder.c:178
-msgid "Index message body data"
-msgstr "Ð?ндекÑ?иÑ?оваÑ?Ñ? даннÑ?е Ñ?ела Ñ?ообÑ?ениÑ?"
+#| msgid "service unavailable"
+msgid "Source stream unavailable"
+msgstr "Ð?оÑ?ок недоÑ?Ñ?Ñ?пен"
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:395
+#: ../camel/providers/local/camel-local-folder.c:182
#, c-format
msgid "~%s (%s)"
msgstr "~%s (%s)"
-#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:399
-#: ../camel/providers/local/camel-local-folder.c:402
+#: ../camel/providers/local/camel-local-folder.c:192
+#: ../camel/providers/local/camel-local-folder.c:201
#, c-format
msgid "mailbox: %s (%s)"
msgstr "поÑ?Ñ?овÑ?й Ñ?Ñ?ик: %s: (%s)"
-#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:406
+#: ../camel/providers/local/camel-local-folder.c:210
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../camel/providers/local/camel-local-provider.c:48
+#: ../camel/providers/local/camel-local-folder.c:470
+msgid "Index message body data"
+msgstr "Ð?ндекÑ?иÑ?оваÑ?Ñ? даннÑ?е Ñ?ела Ñ?ообÑ?ениÑ?"
+
+#: ../camel/providers/local/camel-local-folder.c:683
+#, c-format
+#| msgid ""
+#| "Cannot get message: %s from folder %s\n"
+#| " %s"
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
+msgstr ""
+"Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ение %s из папки %s\n"
+"%s"
+
+#: ../camel/providers/local/camel-local-provider.c:44
msgid "_Use the '.folders' folder summary file (exmh)"
msgstr "_Ð?Ñ?полÑ?зоваÑ?Ñ? обÑ?ий Ñ?айл индекÑ?а «.folders» (exmh)"
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-provider.c:51
msgid "MH-format mail directories"
msgstr "Ð?оÑ?Ñ?овÑ?е каÑ?алоги в Ñ?оÑ?маÑ?е UNIX MH"
-#: ../camel/providers/local/camel-local-provider.c:56
+#: ../camel/providers/local/camel-local-provider.c:52
msgid "For storing local mail in MH-like mail directories."
msgstr "Ð?лÑ? Ñ?Ñ?анениÑ? локалÑ?ной поÑ?Ñ?Ñ? в поÑ?Ñ?овÑ?Ñ? каÑ?алогаÑ? Ñ?ипа MH."
-#: ../camel/providers/local/camel-local-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:69
msgid "Local delivery"
msgstr "Ð?окалÑ?наÑ? доÑ?Ñ?авка"
-#: ../camel/providers/local/camel-local-provider.c:74
-msgid ""
-"For retrieving (moving) local mail from standard mbox-formatted spools into "
-"folders managed by Evolution."
-msgstr ""
-"Ð?лÑ? полÑ?Ñ?ениÑ? (пеÑ?емеÑ?ениÑ?) локалÑ?ной поÑ?Ñ?Ñ? из оÑ?еÑ?едей в Ñ?Ñ?андаÑ?Ñ?ном "
-"Ñ?оÑ?маÑ?е mbox в папки, Ñ?пÑ?авлÑ?емÑ?е Evolution."
+#: ../camel/providers/local/camel-local-provider.c:70
+msgid "For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by Evolution."
+msgstr "Ð?лÑ? полÑ?Ñ?ениÑ? (пеÑ?емеÑ?ениÑ?) локалÑ?ной поÑ?Ñ?Ñ? из оÑ?еÑ?едей в Ñ?Ñ?андаÑ?Ñ?ном Ñ?оÑ?маÑ?е mbox в папки, Ñ?пÑ?авлÑ?емÑ?е Evolution."
-#: ../camel/providers/local/camel-local-provider.c:88
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:103
msgid "_Apply filters to new messages in INBOX"
msgstr "_Ð?Ñ?имениÑ?Ñ? Ñ?илÑ?Ñ?Ñ?Ñ? к новÑ?м Ñ?ообÑ?ениÑ?м в папке «Ð?Ñ?одÑ?Ñ?ие»"
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:91
msgid "Maildir-format mail directories"
msgstr "Ð?оÑ?Ñ?овÑ?е каÑ?алоги в Ñ?оÑ?маÑ?е Maildir"
-#: ../camel/providers/local/camel-local-provider.c:96
+#: ../camel/providers/local/camel-local-provider.c:92
msgid "For storing local mail in maildir directories."
msgstr "Ð?лÑ? Ñ?Ñ?анениÑ? локалÑ?ной поÑ?Ñ?Ñ? в поÑ?Ñ?овÑ?Ñ? каÑ?алогаÑ? maildir."
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:104
msgid "_Store status headers in Elm/Pine/Mutt format"
msgstr "_СоÑ?Ñ?анÑ?Ñ?Ñ? заголовки Ñ?Ñ?аÑ?Ñ?Ñ?а в Ñ?оÑ?маÑ?е Elm/Pine/Mutt"
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:111
msgid "Standard Unix mbox spool file"
msgstr "СÑ?андаÑ?Ñ?наÑ? длÑ? Unix оÑ?еÑ?едÑ? Ñ?ипа mbox"
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:112
+#: ../camel/providers/local/camel-local-provider.c:123
msgid ""
"For reading and storing local mail in external standard mbox spool files.\n"
"May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -3611,212 +3716,230 @@ msgstr ""
"Ñ?пÑ?ла в Ñ?оÑ?маÑ?е mbox. Также можеÑ? иÑ?полÑ?зоваÑ?Ñ?Ñ?Ñ? длÑ? Ñ?Ñ?ениÑ? деÑ?ева\n"
"папок в Ñ?Ñ?иле Elm, Pine или Mutt."
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:122
msgid "Standard Unix mbox spool directory"
msgstr "СÑ?андаÑ?Ñ?нÑ?й длÑ? Unix каÑ?алог оÑ?еÑ?едей Ñ?ипа mbox"
-#: ../camel/providers/local/camel-local-store.c:163
-#: ../camel/providers/local/camel-local-store.c:274
-#: ../camel/providers/local/camel-mbox-store.c:357
-#: ../camel/providers/local/camel-spool-store.c:126
+#: ../camel/providers/local/camel-local-store.c:174
+#: ../camel/providers/local/camel-local-store.c:319
+#: ../camel/providers/local/camel-maildir-store.c:92
+#: ../camel/providers/local/camel-mbox-store.c:526
+#: ../camel/providers/local/camel-spool-store.c:318
#, c-format
msgid "Store root %s is not an absolute path"
msgstr "Ð?Ñ?ноÑ?иÑ?елÑ?нÑ?й пÑ?Ñ?Ñ? к Ñ?Ñ?анилиÑ?Ñ? %s"
-#: ../camel/providers/local/camel-local-store.c:170
+#: ../camel/providers/local/camel-local-store.c:183
#, c-format
msgid "Store root %s is not a regular directory"
msgstr "Ð¥Ñ?анилиÑ?е %s не Ñ?влÑ?еÑ?Ñ?Ñ? каÑ?алогом"
-#: ../camel/providers/local/camel-local-store.c:179
-#: ../camel/providers/local/camel-local-store.c:187
-#: ../camel/providers/local/camel-local-store.c:285
+#: ../camel/providers/local/camel-local-store.c:194
+#: ../camel/providers/local/camel-local-store.c:204
+#: ../camel/providers/local/camel-local-store.c:332
+#: ../camel/providers/local/camel-maildir-store.c:124
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? папкÑ?: %s: %s"
-#: ../camel/providers/local/camel-local-store.c:199
+#: ../camel/providers/local/camel-local-store.c:220
+#, c-format
msgid "Local stores do not have an inbox"
msgstr "Ð?окалÑ?ное Ñ?Ñ?анилиÑ?е не имееÑ? папки Ð?Ñ?одÑ?Ñ?ие"
-#: ../camel/providers/local/camel-local-store.c:245
+#: ../camel/providers/local/camel-local-store.c:281
#, c-format
msgid "Local mail file %s"
msgstr "Ð?окалÑ?нÑ?й поÑ?Ñ?овÑ?й Ñ?айл %s"
-#: ../camel/providers/local/camel-local-store.c:340
+#: ../camel/providers/local/camel-local-store.c:393
#, c-format
msgid "Could not rename folder %s to %s: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? пеÑ?еименоваÑ?Ñ? папкÑ? %s в %s: %s"
-#: ../camel/providers/local/camel-local-store.c:408
+#: ../camel/providers/local/camel-local-store.c:467
#, c-format
msgid "Could not rename '%s': %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? пеÑ?еименоваÑ?Ñ? «%s»: %s"
-#: ../camel/providers/local/camel-local-store.c:433
-#: ../camel/providers/local/camel-mbox-store.c:298
+#: ../camel/providers/local/camel-local-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:695
#, c-format
msgid "Could not delete folder index file '%s': %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?далиÑ?Ñ? индекÑ?нÑ?й Ñ?айл папки «%s»: %s"
-#: ../camel/providers/local/camel-local-store.c:456
-#: ../camel/providers/local/camel-mbox-store.c:322
+#: ../camel/providers/local/camel-local-store.c:526
+#: ../camel/providers/local/camel-mbox-store.c:724
#, c-format
msgid "Could not delete folder meta file '%s': %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?далиÑ?Ñ? меÑ?а-Ñ?айл папки «%s»: %s"
-#: ../camel/providers/local/camel-local-summary.c:515
+#: ../camel/providers/local/camel-local-summary.c:548
+#, c-format
msgid "Unable to add message to summary: unknown reason"
msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? Ñ?ообÑ?ение к кÑ?аÑ?кой инÑ?оÑ?маÑ?ии: пÑ?иÑ?ина неизвеÑ?Ñ?на"
-#: ../camel/providers/local/camel-maildir-folder.c:230
-msgid "Maildir append message canceled"
-msgstr "Ð?обавление Ñ?ообÑ?ениÑ? к папке поÑ?Ñ?ового каÑ?алога оÑ?менено"
-
-#: ../camel/providers/local/camel-maildir-folder.c:233
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? Ñ?ообÑ?ение к папке поÑ?Ñ?ового каÑ?алога: %s: %s"
-
-#: ../camel/providers/local/camel-maildir-folder.c:263
-#: ../camel/providers/local/camel-maildir-folder.c:292
-#: ../camel/providers/local/camel-maildir-folder.c:306
-#: ../camel/providers/local/camel-maildir-folder.c:314
-#: ../camel/providers/local/camel-maildir-folder.c:400
-#: ../camel/providers/local/camel-mbox-folder.c:362
-#: ../camel/providers/local/camel-mbox-folder.c:413
-#: ../camel/providers/local/camel-mbox-folder.c:434
-#: ../camel/providers/local/camel-mbox-folder.c:465
-#: ../camel/providers/local/camel-mbox-folder.c:473
-#: ../camel/providers/local/camel-mh-folder.c:225
-#: ../camel/providers/local/camel-mh-folder.c:236
-#: ../camel/providers/local/camel-mh-folder.c:244
+#: ../camel/providers/local/camel-maildir-folder.c:198
#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-" %s"
-msgstr ""
-"Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ение: %s из папки %s\n"
-" %s"
+#| msgid "Cannot append message to maildir folder: %s: %s"
+msgid "Cannot append message to maildir folder: %s: "
+msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? Ñ?ообÑ?ение в папкÑ? поÑ?Ñ?ового каÑ?алога: %s: "
+
+#: ../camel/providers/local/camel-maildir-folder.c:246
+#: ../camel/providers/local/camel-maildir-folder.c:256
+#: ../camel/providers/local/camel-mbox-folder.c:386
+#: ../camel/providers/local/camel-mh-folder.c:168
+#: ../camel/providers/local/camel-mh-folder.c:178
+#, c-format
+#| msgid ""
+#| "Cannot get message: %s from folder %s\n"
+#| " %s"
+msgid "Cannot get message %s from folder %s: "
+msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ение %s из папки %s: "
-#: ../camel/providers/local/camel-maildir-folder.c:315
-msgid "Invalid message contents"
-msgstr "Ð?евеÑ?ное Ñ?одеÑ?жание Ñ?ообÑ?ениÑ?"
+#: ../camel/providers/local/camel-maildir-folder.c:326
+#, c-format
+#| msgid "Cannot transfer message to destination folder"
+msgid "Cannot transfer message to destination folder: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? пеÑ?емеÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ение в папкÑ?: %s"
-#: ../camel/providers/local/camel-maildir-folder.c:418
-msgid "Cannot transfer message to destination folder"
-msgstr "Ð?е Ñ?далоÑ?Ñ? пеÑ?емеÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ение в папкÑ? назнаÑ?ениÑ?"
+#: ../camel/providers/local/camel-maildir-store.c:100
+#, c-format
+#| msgid "Cannot create folder: %s: folder exists"
+msgid "Cannot create folder: %s : Folder name cannot contain a dot"
+msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? папкÑ?: %s. Ð?мÑ? папки не должно Ñ?одеÑ?жаÑ?Ñ? Ñ?оÑ?ек"
-#: ../camel/providers/local/camel-maildir-store.c:148
-#: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:174
-#: ../camel/providers/local/camel-mbox-store.c:186
+#: ../camel/providers/local/camel-maildir-store.c:109
+#: ../camel/providers/local/camel-maildir-store.c:686
+#, c-format
+#| msgid "Folder already exists"
+msgid "Folder %s already exists"
+msgstr "Ð?апка %s Ñ?же Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?"
+
+#: ../camel/providers/local/camel-maildir-store.c:191
+#: ../camel/providers/local/camel-maildir-store.c:222
+#: ../camel/providers/local/camel-mbox-store.c:375
+#: ../camel/providers/local/camel-mbox-store.c:389
#, c-format
msgid "Cannot create folder '%s': %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? папкÑ?: «%s»: %s"
-#: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:145
-#: ../camel/providers/local/camel-mh-store.c:217
+#: ../camel/providers/local/camel-maildir-store.c:206
+#: ../camel/providers/local/camel-mbox-store.c:341
+#: ../camel/providers/local/camel-mh-store.c:464
#, c-format
msgid "Cannot get folder '%s': %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? папкÑ?: «%s»: %s"
-#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:153
-#: ../camel/providers/local/camel-mh-store.c:224
+#: ../camel/providers/local/camel-maildir-store.c:212
+#: ../camel/providers/local/camel-mbox-store.c:351
+#: ../camel/providers/local/camel-mh-store.c:473
#, c-format
msgid "Cannot get folder '%s': folder does not exist."
msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? папкÑ? «%s»: папка не Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?."
-#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-maildir-store.c:239
#, c-format
msgid "Cannot get folder '%s': not a maildir directory."
msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? папкÑ? «%s»: не Ñ?влÑ?еÑ?Ñ?Ñ? поÑ?Ñ?овÑ?м каÑ?алогом."
-#: ../camel/providers/local/camel-maildir-store.c:234
-#: ../camel/providers/local/camel-maildir-store.c:272
-#: ../camel/providers/local/camel-mh-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:293
+#: ../camel/providers/local/camel-maildir-store.c:333
+#: ../camel/providers/local/camel-mh-store.c:584
#, c-format
msgid "Could not delete folder '%s': %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?далиÑ?Ñ? папкÑ? «%s»: %s"
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:295
msgid "not a maildir directory"
msgstr "не Ñ?влÑ?еÑ?Ñ?Ñ? поÑ?Ñ?овÑ?м каÑ?алогом"
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:328
-#: ../camel/providers/local/camel-spool-store.c:342
+#: ../camel/providers/local/camel-maildir-store.c:508
+#: ../camel/providers/local/camel-maildir-store.c:825
+#: ../camel/providers/local/camel-spool-store.c:143
+#: ../camel/providers/local/camel-spool-store.c:159
#, c-format
msgid "Could not scan folder '%s': %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?оÑ?каниÑ?оваÑ?Ñ? папкÑ? «%s»: %s"
-#: ../camel/providers/local/camel-maildir-summary.c:432
-#: ../camel/providers/local/camel-maildir-summary.c:551
+#: ../camel/providers/local/camel-maildir-store.c:677
+#, c-format
+#| msgid "Cannot create folder: %s: folder exists"
+msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
+msgstr "Ð?е Ñ?далоÑ?Ñ? пеÑ?еименоваÑ?Ñ? папкÑ?: %s. Ð?мÑ? папки не должно Ñ?одеÑ?жаÑ?Ñ? Ñ?оÑ?ек"
+
+#: ../camel/providers/local/camel-maildir-summary.c:435
+#: ../camel/providers/local/camel-maildir-summary.c:565
#, c-format
msgid "Cannot open maildir directory path: %s: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? пÑ?Ñ?Ñ? к папке поÑ?Ñ?ового каÑ?алога: %s: %s"
-#: ../camel/providers/local/camel-maildir-summary.c:544
+#: ../camel/providers/local/camel-maildir-summary.c:556
msgid "Checking folder consistency"
msgstr "Ð?Ñ?овеÑ?ка Ñ?одеÑ?жаниÑ? каÑ?алогов"
-#: ../camel/providers/local/camel-maildir-summary.c:637
+#: ../camel/providers/local/camel-maildir-summary.c:649
msgid "Checking for new messages"
msgstr "Ð?Ñ?овеÑ?ка новÑ?Ñ? Ñ?ообÑ?ений"
-#: ../camel/providers/local/camel-maildir-summary.c:724
-#: ../camel/providers/local/camel-mbox-summary.c:526
-#: ../camel/providers/local/camel-mbox-summary.c:722
-#: ../camel/providers/local/camel-mbox-summary.c:842
-#: ../camel/providers/local/camel-spool-summary.c:150
+#: ../camel/providers/local/camel-maildir-summary.c:742
+#: ../camel/providers/local/camel-mbox-summary.c:468
+#: ../camel/providers/local/camel-mbox-summary.c:690
+#: ../camel/providers/local/camel-mbox-summary.c:826
+#: ../camel/providers/local/camel-spool-summary.c:131
msgid "Storing folder"
msgstr "СоÑ?Ñ?анение папки"
-#: ../camel/providers/local/camel-mbox-folder.c:167
-#: ../camel/providers/local/camel-spool-folder.c:150
+#: ../camel/providers/local/camel-mbox-folder.c:183
#, c-format
-msgid "Cannot create folder lock on %s: %s"
-msgstr "Ð?е Ñ?далоÑ?Ñ? заблокиÑ?оваÑ?Ñ? папкÑ? %s: %s"
+#| msgid "Cannot open mailbox: %s: %s\n"
+msgid "Cannot open mailbox: %s: "
+msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? поÑ?Ñ?овÑ?й Ñ?Ñ?ик: %s:"
-#: ../camel/providers/local/camel-mbox-folder.c:231
+#: ../camel/providers/local/camel-mbox-folder.c:249
#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? поÑ?Ñ?овÑ?й Ñ?Ñ?ик: %s: %s\n"
-
-#: ../camel/providers/local/camel-mbox-folder.c:297
-msgid "Mail append canceled"
-msgstr "Ð?обавление поÑ?Ñ?Ñ? оÑ?менено"
+#| msgid "Cannot append message to mbox file: %s: %s"
+msgid "Cannot append message to mbox file: %s: "
+msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? Ñ?ообÑ?ение в Ñ?айл поÑ?Ñ?ового Ñ?Ñ?ика: %s:"
-#: ../camel/providers/local/camel-mbox-folder.c:300
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? Ñ?ообÑ?ение к Ñ?айлÑ? mbox: %s: %s"
-
-#: ../camel/providers/local/camel-mbox-folder.c:466
+#: ../camel/providers/local/camel-mbox-folder.c:378
msgid "The folder appears to be irrecoverably corrupted."
msgstr "Ð?идимо, папка невоÑ?Ñ?ановимо иÑ?поÑ?Ñ?ена."
-#: ../camel/providers/local/camel-mbox-folder.c:474
-#: ../camel/providers/local/camel-mh-folder.c:245
-msgid "Message construction failed."
-msgstr "Сбой пÑ?и Ñ?оздании Ñ?ообÑ?ениÑ?."
+#: ../camel/providers/local/camel-mbox-folder.c:436
+#: ../camel/providers/local/camel-spool-folder.c:70
+#, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? заблокиÑ?оваÑ?Ñ? папкÑ? %s: %s"
-#: ../camel/providers/local/camel-mbox-store.c:164
#: ../camel/providers/local/camel-mbox-store.c:363
+#: ../camel/providers/local/camel-mbox-store.c:534
+#, c-format
msgid "Cannot create a folder by this name."
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? папкÑ? Ñ? Ñ?аким именем."
-#: ../camel/providers/local/camel-mbox-store.c:196
+#: ../camel/providers/local/camel-mbox-store.c:400
#, c-format
msgid "Cannot get folder '%s': not a regular file."
msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? папкÑ? «%s»: не Ñ?влÑ?еÑ?Ñ?Ñ? обÑ?Ñ?нÑ?м Ñ?айлом."
-#: ../camel/providers/local/camel-mbox-store.c:226
-#: ../camel/providers/local/camel-mbox-store.c:237
-#: ../camel/providers/local/camel-mbox-store.c:260
+#: ../camel/providers/local/camel-mbox-store.c:550
+#, c-format
+msgid "Cannot create directory '%s': %s."
+msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? каÑ?алог «%s»: %s."
+
+#: ../camel/providers/local/camel-mbox-store.c:566
+#, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? папкÑ?: %s: %s"
+
+#: ../camel/providers/local/camel-mbox-store.c:568
+msgid "Folder already exists"
+msgstr "Ð?апка Ñ?же Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?"
+
+#: ../camel/providers/local/camel-mbox-store.c:609
+#: ../camel/providers/local/camel-mbox-store.c:622
+#: ../camel/providers/local/camel-mbox-store.c:651
#, c-format
msgid ""
"Could not delete folder '%s':\n"
@@ -3825,164 +3948,164 @@ msgstr ""
"Ð?е Ñ?далоÑ?Ñ? Ñ?далиÑ?Ñ? папкÑ? «%s»:\n"
"%s"
-#: ../camel/providers/local/camel-mbox-store.c:245
+#: ../camel/providers/local/camel-mbox-store.c:632
#, c-format
msgid "'%s' is not a regular file."
msgstr "«%s» не Ñ?влÑ?еÑ?Ñ?Ñ? обÑ?Ñ?нÑ?м Ñ?айлом."
-#: ../camel/providers/local/camel-mbox-store.c:252
+#: ../camel/providers/local/camel-mbox-store.c:641
#, c-format
msgid "Folder '%s' is not empty. Not deleted."
msgstr "Ð?апка «%s» не пÑ?Ñ?Ñ?а. Ð?е Ñ?далена."
-#: ../camel/providers/local/camel-mbox-store.c:274
-#: ../camel/providers/local/camel-mbox-store.c:286
+#: ../camel/providers/local/camel-mbox-store.c:667
+#: ../camel/providers/local/camel-mbox-store.c:681
#, c-format
msgid "Could not delete folder summary file '%s': %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?далиÑ?Ñ? Ñ?айл кÑ?аÑ?кой инÑ?оÑ?маÑ?ии «%s»: %s"
-#: ../camel/providers/local/camel-mbox-store.c:376
-#, c-format
-msgid "Cannot create directory '%s': %s."
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? каÑ?алог «%s»: %s."
-
-#: ../camel/providers/local/camel-mbox-store.c:390
+#: ../camel/providers/local/camel-mbox-store.c:761
#, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? папкÑ?: %s: %s"
-
-#: ../camel/providers/local/camel-mbox-store.c:392
-msgid "Folder already exists"
-msgstr "Ð?апка Ñ?же Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?"
-
-#: ../camel/providers/local/camel-mbox-store.c:483
msgid "The new folder name is illegal."
msgstr "Ð?мÑ? новой папки недопÑ?Ñ?Ñ?имо."
-#: ../camel/providers/local/camel-mbox-store.c:496
+#: ../camel/providers/local/camel-mbox-store.c:776
#, c-format
msgid "Could not rename '%s': '%s': %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? пеÑ?еименоваÑ?Ñ? «%s»: «%s»: %s"
-#: ../camel/providers/local/camel-mbox-store.c:577
+#: ../camel/providers/local/camel-mbox-store.c:859
#, c-format
msgid "Could not rename '%s' to %s: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? пеÑ?еименоваÑ?Ñ? «%s» в %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:532
+#: ../camel/providers/local/camel-mbox-summary.c:476
#, c-format
msgid "Could not open folder: %s: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? папкÑ?: %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:582
+#: ../camel/providers/local/camel-mbox-summary.c:537
#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "ФаÑ?алÑ?наÑ? оÑ?ибка поÑ?Ñ?ового анализаÑ?оÑ?а возле позиÑ?ии %ld в папке %s"
+#| msgid "Fatal mail parser error near position %ld in folder %s"
+msgid "Fatal mail parser error near position %s in folder %s"
+msgstr "ФаÑ?алÑ?наÑ? оÑ?ибка поÑ?Ñ?ового анализаÑ?оÑ?а возле позиÑ?ии %s в папке %s"
-#: ../camel/providers/local/camel-mbox-summary.c:659
+#: ../camel/providers/local/camel-mbox-summary.c:622
#, c-format
msgid "Cannot check folder: %s: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?овеÑ?иÑ?Ñ? папкÑ?: %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:727
-#: ../camel/providers/local/camel-mbox-summary.c:847
-#: ../camel/providers/local/camel-spool-summary.c:155
+#: ../camel/providers/local/camel-mbox-summary.c:697
+#: ../camel/providers/local/camel-mbox-summary.c:833
+#: ../camel/providers/local/camel-spool-summary.c:138
#, c-format
msgid "Could not open file: %s: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? Ñ?айл: %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:739
-#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-mbox-summary.c:711
+#: ../camel/providers/local/camel-spool-summary.c:153
#, c-format
msgid "Cannot open temporary mailbox: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? вÑ?еменнÑ?й поÑ?Ñ?овÑ?й Ñ?Ñ?ик: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:752
-#: ../camel/providers/local/camel-mbox-summary.c:957
+#: ../camel/providers/local/camel-mbox-summary.c:728
+#: ../camel/providers/local/camel-mbox-summary.c:949
#, c-format
msgid "Could not close source folder %s: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? закÑ?Ñ?Ñ?Ñ? иÑ?Ñ?однÑ?Ñ? папкÑ? %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:761
+#: ../camel/providers/local/camel-mbox-summary.c:739
#, c-format
msgid "Could not close temporary folder: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? закÑ?Ñ?Ñ?Ñ? вÑ?еменнÑ?Ñ? папкÑ?: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:776
+#: ../camel/providers/local/camel-mbox-summary.c:756
#, c-format
msgid "Could not rename folder: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? пеÑ?еименоваÑ?Ñ? папкÑ?: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:858
-#: ../camel/providers/local/camel-mbox-summary.c:1084
+#: ../camel/providers/local/camel-mbox-summary.c:846
+#: ../camel/providers/local/camel-mbox-summary.c:1099
#, c-format
msgid "Could not store folder: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оÑ?Ñ?аниÑ?Ñ? папкÑ?: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:897
-#: ../camel/providers/local/camel-mbox-summary.c:905
-#: ../camel/providers/local/camel-mbox-summary.c:1114
-#: ../camel/providers/local/camel-mbox-summary.c:1122
+#: ../camel/providers/local/camel-mbox-summary.c:886
+#: ../camel/providers/local/camel-mbox-summary.c:1131
+#, c-format
+msgid "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get it.)"
+msgstr "Файл поÑ?Ñ?ового Ñ?Ñ?ика повÑ?еждÑ?н, иÑ?пÑ?авÑ?Ñ?е его. (Ð?жидалаÑ?Ñ? Ñ?Ñ?Ñ?ока «Ð?Ñ?», но она не бÑ?ла полÑ?Ñ?ена.)"
+
+#: ../camel/providers/local/camel-mbox-summary.c:895
+#: ../camel/providers/local/camel-mbox-summary.c:1140
+#, c-format
msgid "Summary and folder mismatch, even after a sync"
msgstr "Сводка и папка Ñ?аÑ?Ñ?одÑ?Ñ?Ñ?Ñ? даже поÑ?ле Ñ?инÑ?Ñ?онизаÑ?ии"
-#: ../camel/providers/local/camel-mbox-summary.c:1047
-#: ../camel/providers/local/camel-spool-summary.c:334
+#: ../camel/providers/local/camel-mbox-summary.c:1052
+#: ../camel/providers/local/camel-spool-summary.c:343
#, c-format
msgid "Unknown error: %s"
msgstr "Ð?еизвеÑ?Ñ?наÑ? оÑ?ибка: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:1190
-#: ../camel/providers/local/camel-mbox-summary.c:1216
+#: ../camel/providers/local/camel-mbox-summary.c:1210
+#: ../camel/providers/local/camel-mbox-summary.c:1240
#, c-format
msgid "Writing to temporary mailbox failed: %s"
msgstr "Сбой запиÑ?и во вÑ?еменнÑ?й поÑ?Ñ?овÑ?й Ñ?Ñ?ик: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:1207
+#: ../camel/providers/local/camel-mbox-summary.c:1229
#, c-format
msgid "Writing to temporary mailbox failed: %s: %s"
msgstr "Сбой запиÑ?и во вÑ?еменнÑ?й поÑ?Ñ?овÑ?й Ñ?Ñ?ик: %s: %s"
-#: ../camel/providers/local/camel-mh-folder.c:180
-msgid "MH append message canceled"
-msgstr "Ð?обавление Ñ?ообÑ?ениÑ? в папкÑ? оÑ?менено"
-
-#: ../camel/providers/local/camel-mh-folder.c:183
+#: ../camel/providers/local/camel-mh-folder.c:115
#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? Ñ?ообÑ?ение к папке mh: %s: %s"
+#| msgid "Cannot append message to mh folder: %s: %s"
+msgid "Cannot append message to mh folder: %s: "
+msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? Ñ?ообÑ?ение в папкÑ? mh: %s:"
-#: ../camel/providers/local/camel-mh-store.c:232
+#: ../camel/providers/local/camel-mh-store.c:483
#, c-format
msgid "Could not create folder '%s': %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? папкÑ? «%s»: %s"
-#: ../camel/providers/local/camel-mh-store.c:244
+#: ../camel/providers/local/camel-mh-store.c:497
#, c-format
msgid "Cannot get folder '%s': not a directory."
msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? папкÑ? «%s»: не Ñ?влÑ?еÑ?Ñ?Ñ? каÑ?алогом."
-#: ../camel/providers/local/camel-mh-summary.c:240
+#: ../camel/providers/local/camel-mh-summary.c:230
#, c-format
msgid "Cannot open MH directory path: %s: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? MH каÑ?алог: %s: %s"
-#: ../camel/providers/local/camel-spool-store.c:132
+#: ../camel/providers/local/camel-spool-store.c:327
#, c-format
msgid "Spool '%s' cannot be opened: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? Ñ?айл накоплениÑ? «%s»: %s"
-#: ../camel/providers/local/camel-spool-store.c:144
+#: ../camel/providers/local/camel-spool-store.c:341
#, c-format
msgid "Spool '%s' is not a regular file or directory"
msgstr "Ð?акопиÑ?елÑ? «%s» не Ñ?влÑ?еÑ?Ñ?Ñ? обÑ?Ñ?нÑ?м Ñ?айлом или каÑ?алогом"
-#: ../camel/providers/local/camel-spool-store.c:163
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool mail file %s"
+msgstr "Файл поÑ?Ñ?ового Ñ?пÑ?ла %s"
+
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool folder tree %s"
+msgstr "Ð?еÑ?ево папки Ñ?пÑ?ла %s"
+
+#: ../camel/providers/local/camel-spool-store.c:391
#, c-format
msgid "Folder '%s/%s' does not exist."
msgstr "Ð?апка «%s/%s» не Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?."
-#: ../camel/providers/local/camel-spool-store.c:173
+#: ../camel/providers/local/camel-spool-store.c:403
#, c-format
msgid ""
"Could not open folder '%s':\n"
@@ -3991,12 +4114,12 @@ msgstr ""
"Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? папкÑ? «%s»:\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:177
+#: ../camel/providers/local/camel-spool-store.c:409
#, c-format
msgid "Folder '%s' does not exist."
msgstr "Ð?апка «%s» не Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?."
-#: ../camel/providers/local/camel-spool-store.c:182
+#: ../camel/providers/local/camel-spool-store.c:416
#, c-format
msgid ""
"Could not create folder '%s':\n"
@@ -4005,123 +4128,140 @@ msgstr ""
"Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? папкÑ? «%s»:\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:190
+#: ../camel/providers/local/camel-spool-store.c:426
#, c-format
msgid "'%s' is not a mailbox file."
msgstr "«%s» не Ñ?влÑ?еÑ?Ñ?Ñ? Ñ?айлом поÑ?Ñ?ового Ñ?Ñ?ика."
-#: ../camel/providers/local/camel-spool-store.c:207
+#: ../camel/providers/local/camel-spool-store.c:462
+#, c-format
msgid "Store does not support an INBOX"
msgstr "Ð¥Ñ?анилиÑ?е не поддеÑ?живаеÑ? INBOX"
-#: ../camel/providers/local/camel-spool-store.c:219
+#: ../camel/providers/local/camel-spool-store.c:476
#, c-format
-msgid "Spool mail file %s"
-msgstr "Файл поÑ?Ñ?ового Ñ?пÑ?ла %s"
+msgid "Spool folders cannot be deleted"
+msgstr "Ð?апки Ñ?пÑ?ла не могÑ?Ñ? бÑ?Ñ?Ñ? Ñ?даленÑ?"
-#: ../camel/providers/local/camel-spool-store.c:219
+#: ../camel/providers/local/camel-spool-store.c:491
#, c-format
-msgid "Spool folder tree %s"
-msgstr "Ð?еÑ?ево папки Ñ?пÑ?ла %s"
-
-#: ../camel/providers/local/camel-spool-store.c:227
msgid "Spool folders cannot be renamed"
msgstr "Ð?апки Ñ?пÑ?ла не могÑ?Ñ? бÑ?Ñ?Ñ? пеÑ?еименованÑ?"
-#: ../camel/providers/local/camel-spool-store.c:235
-msgid "Spool folders cannot be deleted"
-msgstr "Ð?апки Ñ?пÑ?ла не могÑ?Ñ? бÑ?Ñ?Ñ? Ñ?даленÑ?"
-
-#: ../camel/providers/local/camel-spool-summary.c:180
-#: ../camel/providers/local/camel-spool-summary.c:190
-#: ../camel/providers/local/camel-spool-summary.c:200
+#: ../camel/providers/local/camel-spool-summary.c:169
+#: ../camel/providers/local/camel-spool-summary.c:181
+#: ../camel/providers/local/camel-spool-summary.c:193
#, c-format
-msgid "Could not sync temporary folder %s: %s"
+#| msgid "Could not sync temporary folder %s: %s"
+msgid "Could not synchronize temporary folder %s: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?инÑ?Ñ?онизиÑ?оваÑ?Ñ? вÑ?еменнÑ?Ñ? папкÑ? %s: %s"
-#: ../camel/providers/local/camel-spool-summary.c:216
+#: ../camel/providers/local/camel-spool-summary.c:211
#, c-format
-msgid "Could not sync spool folder %s: %s"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?инÑ?Ñ?онизиÑ?оваÑ?Ñ? папкÑ? Ñ?пÑ?ла: %s: %s"
+#| msgid "Could not sync spool folder %s: %s"
+msgid "Could not synchronize spool folder %s: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?инÑ?Ñ?онизиÑ?оваÑ?Ñ? папкÑ? Ñ?пÑ?ла %s: %s"
-#: ../camel/providers/local/camel-spool-summary.c:246
-#: ../camel/providers/local/camel-spool-summary.c:263
-#: ../camel/providers/local/camel-spool-summary.c:274
+#: ../camel/providers/local/camel-spool-summary.c:243
+#: ../camel/providers/local/camel-spool-summary.c:262
+#: ../camel/providers/local/camel-spool-summary.c:275
#, c-format
+#| msgid ""
+#| "Could not sync spool folder %s: %s\n"
+#| "Folder may be corrupt, copy saved in '%s'"
msgid ""
-"Could not sync spool folder %s: %s\n"
+"Could not synchronize spool folder %s: %s\n"
"Folder may be corrupt, copy saved in '%s'"
msgstr ""
-"Ð?е Ñ?далоÑ?Ñ? Ñ?инÑ?Ñ?онизиÑ?оваÑ?Ñ? папкÑ? накоплениÑ?: %s: %s\n"
-"Ð?апка можеÑ? бÑ?Ñ?Ñ? иÑ?поÑ?Ñ?ена, копиÑ? Ñ?оÑ?Ñ?анена в «%s»"
+"Ð?е Ñ?далоÑ?Ñ? Ñ?инÑ?Ñ?онизиÑ?оваÑ?Ñ? папкÑ? Ñ?пÑ?ла %s: %s\n"
+"Ð?апка можеÑ? бÑ?Ñ?Ñ? повÑ?еждена, копиÑ? Ñ?оÑ?Ñ?анена в «%s»"
-#: ../camel/providers/nntp/camel-nntp-folder.c:135
-#: ../camel/providers/nntp/camel-nntp-folder.c:192
-#: ../camel/providers/nntp/camel-nntp-folder.c:224
+#: ../camel/providers/nntp/camel-nntp-folder.c:200
+#: ../camel/providers/nntp/camel-nntp-folder.c:279
+#: ../camel/providers/nntp/camel-nntp-folder.c:393
#, c-format
msgid "Internal error: UID in invalid format: %s"
msgstr "Ð?нÑ?Ñ?Ñ?еннÑ?Ñ? оÑ?ибка: UID в невеÑ?ном Ñ?оÑ?маÑ?е: %s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:365
-#: ../camel/providers/nntp/camel-nntp-folder.c:368
-#: ../camel/providers/nntp/camel-nntp-folder.c:410
-#: ../camel/providers/nntp/camel-nntp-folder.c:412
+#: ../camel/providers/nntp/camel-nntp-folder.c:241
+#: ../camel/providers/nntp/camel-nntp-folder.c:245
+#: ../camel/providers/pop3/camel-pop3-folder.c:369
+#: ../camel/providers/pop3/camel-pop3-folder.c:434
+#: ../camel/providers/pop3/camel-pop3-folder.c:446
+#: ../camel/providers/pop3/camel-pop3-folder.c:695
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ение %s: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:477
+#: ../camel/providers/nntp/camel-nntp-folder.c:483
+#: ../camel/providers/nntp/camel-nntp-folder.c:530
#, c-format
msgid "Posting failed: %s"
msgstr "Ð?Ñ?ибка оÑ?пÑ?авки Ñ?ообÑ?ениÑ?: %s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:430
+#: ../camel/providers/nntp/camel-nntp-folder.c:525
+#| msgid "Posting failed: %s"
+msgid "Posting failed: "
+msgstr "Ð?Ñ?ибка оÑ?пÑ?авки Ñ?ообÑ?ениÑ?: "
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:554
+#, c-format
msgid "You cannot post NNTP messages while working offline!"
msgstr "Ð?Ñ? не можеÑ?е оÑ?пÑ?авлÑ?Ñ?Ñ? Ñ?ообÑ?ениÑ? NNTP во вÑ?емÑ? авÑ?ономной Ñ?абоÑ?Ñ?!"
-#: ../camel/providers/nntp/camel-nntp-folder.c:441
+#: ../camel/providers/nntp/camel-nntp-folder.c:574
+#, c-format
msgid "You cannot copy messages from a NNTP folder!"
msgstr "Ð?Ñ? не можеÑ?е копиÑ?оваÑ?Ñ? Ñ?ообÑ?ениÑ? из папки NNTP!"
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
-msgid ""
-"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr ""
-"_Ð?оказÑ?ваÑ?Ñ? папки в Ñ?окÑ?аÑ?Ñ?нной Ñ?оÑ?ме (Ñ?о еÑ?Ñ?Ñ? c.o.linux вмеÑ?Ñ?о comp.os."
-"linux)"
+#: ../camel/providers/nntp/camel-nntp-provider.c:44
+msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr "_Ð?оказÑ?ваÑ?Ñ? папки в Ñ?окÑ?аÑ?Ñ?нной Ñ?оÑ?ме (Ñ?о еÑ?Ñ?Ñ? c.o.linux вмеÑ?Ñ?о comp.os.linux)"
-#: ../camel/providers/nntp/camel-nntp-provider.c:48
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
msgid "In the subscription _dialog, show relative folder names"
msgstr "Ð?о_казÑ?ваÑ?Ñ? оÑ?ноÑ?иÑ?елÑ?нÑ?е имена папок в диалоге подпиÑ?ки"
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:53
msgid "USENET news"
msgstr "Ð?овоÑ?Ñ?и USENET"
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
msgid "This is a provider for reading from and posting to USENET newsgroups."
-msgstr ""
-"ÐÑ?о пÑ?оводник длÑ? Ñ?Ñ?ениÑ? и оÑ?пÑ?авки Ñ?ообÑ?ений в гÑ?Ñ?ппÑ? новоÑ?Ñ?ей USENET."
+msgstr "ÐÑ?о пÑ?оводник длÑ? Ñ?Ñ?ениÑ? и оÑ?пÑ?авки Ñ?ообÑ?ений в гÑ?Ñ?ппÑ? новоÑ?Ñ?ей USENET."
-#: ../camel/providers/nntp/camel-nntp-provider.c:76
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-"Ð?одклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ? NNTP бÑ?деÑ? пÑ?оизводиÑ?Ñ?Ñ?Ñ? Ñ? иÑ?полÑ?зованием "
-"незаÑ?иÑ?Ñ?ованного паÑ?олÑ?."
+#: ../camel/providers/nntp/camel-nntp-provider.c:74
+msgid "This option will authenticate with the NNTP server using a plaintext password."
+msgstr "Ð?одклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ? NNTP бÑ?деÑ? пÑ?оизводиÑ?Ñ?Ñ?Ñ? Ñ? иÑ?полÑ?зованием незаÑ?иÑ?Ñ?ованного паÑ?олÑ?."
-#: ../camel/providers/nntp/camel-nntp-store.c:216
+#: ../camel/providers/nntp/camel-nntp-store.c:77
#, c-format
-msgid "Could not read greeting from %s: %s"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?Ñ?иÑ?аÑ?Ñ? пÑ?ивеÑ?Ñ?Ñ?вие из %s: %s"
+msgid "Authentication requested but no username provided"
+msgstr "ТÑ?ебÑ?еÑ?Ñ?Ñ? пÑ?овеÑ?ка подлинноÑ?Ñ?и, но имÑ? полÑ?зоваÑ?елÑ? не Ñ?казано"
-#: ../camel/providers/nntp/camel-nntp-store.c:228
+#: ../camel/providers/nntp/camel-nntp-store.c:89
+#, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?ойÑ?и пÑ?овеÑ?кÑ? подлинноÑ?Ñ?и на Ñ?еÑ?веÑ?е: %s"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:346
+#, c-format
+#| msgid "Could not read greeting from %s: %s"
+msgid "Could not read greeting from %s: "
+msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?оÑ?иÑ?аÑ?Ñ? пÑ?ивеÑ?Ñ?Ñ?вие из %s: "
+
+#: ../camel/providers/nntp/camel-nntp-store.c:359
#, c-format
msgid "NNTP server %s returned error code %d: %s"
msgstr "СеÑ?веÑ? NNTP %s веÑ?нÑ?л код оÑ?ибки %d: %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:410
+#: ../camel/providers/nntp/camel-nntp-store.c:527
#, c-format
msgid "USENET News via %s"
msgstr "Ð?овоÑ?Ñ?и USENET Ñ?еÑ?ез %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:819
+#: ../camel/providers/nntp/camel-nntp-store.c:1045
#, c-format
msgid ""
"Error retrieving newsgroups:\n"
@@ -4132,7 +4272,8 @@ msgstr ""
"\n"
" %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:913
+#: ../camel/providers/nntp/camel-nntp-store.c:1160
+#, c-format
msgid ""
"You cannot subscribe to this newsgroup:\n"
"\n"
@@ -4140,10 +4281,10 @@ msgid ""
msgstr ""
"Ð?Ñ? не можеÑ?е подпиÑ?аÑ?Ñ?Ñ?Ñ? на Ñ?Ñ?Ñ? гÑ?Ñ?ппÑ? новоÑ?Ñ?ей:\n"
"\n"
-"Ð?еÑ? Ñ?акой гÑ?Ñ?ппÑ? новоÑ?Ñ?ей. Ð?Ñ?бÑ?аннÑ?й Ñ?леменÑ? Ñ?коÑ?ее вÑ?его Ñ?влÑ?еÑ?Ñ?Ñ? "
-"Ñ?одиÑ?елÑ?Ñ?кой папкой."
+"Ð?еÑ? Ñ?акой гÑ?Ñ?ппÑ? новоÑ?Ñ?ей. Ð?Ñ?бÑ?аннÑ?й Ñ?леменÑ? Ñ?коÑ?ее вÑ?его Ñ?влÑ?еÑ?Ñ?Ñ? Ñ?одиÑ?елÑ?Ñ?кой папкой."
-#: ../camel/providers/nntp/camel-nntp-store.c:945
+#: ../camel/providers/nntp/camel-nntp-store.c:1202
+#, c-format
msgid ""
"You cannot unsubscribe to this newsgroup:\n"
"\n"
@@ -4153,214 +4294,186 @@ msgstr ""
"\n"
"Ð?Ñ?Ñ?ппа новоÑ?Ñ?ей не Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?!"
-#: ../camel/providers/nntp/camel-nntp-store.c:970
+#: ../camel/providers/nntp/camel-nntp-store.c:1235
+#, c-format
msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr ""
-"Ð?Ñ? не можеÑ?е Ñ?оздаÑ?Ñ? папкÑ? в гÑ?Ñ?ппаÑ? новоÑ?Ñ?ей: вмеÑ?Ñ?о Ñ?Ñ?ого Ñ?ледÑ?еÑ? "
-"подпиÑ?аÑ?Ñ?Ñ?Ñ?."
+msgstr "Ð?Ñ? не можеÑ?е Ñ?оздаÑ?Ñ? папкÑ? в гÑ?Ñ?ппаÑ? новоÑ?Ñ?ей: вмеÑ?Ñ?о Ñ?Ñ?ого Ñ?ледÑ?еÑ? подпиÑ?аÑ?Ñ?Ñ?Ñ?."
-#: ../camel/providers/nntp/camel-nntp-store.c:978
+#: ../camel/providers/nntp/camel-nntp-store.c:1251
+#, c-format
msgid "You cannot rename a folder in a News store."
msgstr "Ð?Ñ? не можеÑ?е пеÑ?еименоваÑ?Ñ? папкÑ? в гÑ?Ñ?ппаÑ? новоÑ?Ñ?ей."
-#: ../camel/providers/nntp/camel-nntp-store.c:986
+#: ../camel/providers/nntp/camel-nntp-store.c:1268
+#, c-format
msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr ""
-"Ð?Ñ? не можеÑ?е Ñ?далиÑ?Ñ? папкÑ? в гÑ?Ñ?ппаÑ? новоÑ?Ñ?ей: вмеÑ?Ñ?о Ñ?Ñ?ого Ñ?ледÑ?еÑ? "
-"оÑ?пиÑ?аÑ?Ñ?Ñ?Ñ?."
+msgstr "Ð?Ñ? не можеÑ?е Ñ?далиÑ?Ñ? папкÑ? в гÑ?Ñ?ппаÑ? новоÑ?Ñ?ей: вмеÑ?Ñ?о Ñ?Ñ?ого Ñ?ледÑ?еÑ? оÑ?пиÑ?аÑ?Ñ?Ñ?Ñ?."
-#: ../camel/providers/nntp/camel-nntp-store.c:1180
-msgid "Authentication requested but no username provided"
-msgstr "ТÑ?ебÑ?еÑ?Ñ?Ñ? пÑ?овеÑ?ка подлинноÑ?Ñ?и, но имÑ? полÑ?зоваÑ?елÑ? не Ñ?казано"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1192
-#, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?ойÑ?и пÑ?овеÑ?кÑ? подлинноÑ?Ñ?и на Ñ?еÑ?веÑ?е: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1479
+#| msgid "NNTP Command failed: %s"
+msgid "NNTP Command failed: "
+msgstr "Сбой командÑ? NNTP: "
-#: ../camel/providers/nntp/camel-nntp-store.c:1315
+#: ../camel/providers/nntp/camel-nntp-store.c:1553
#, c-format
-msgid "NNTP Command failed: %s"
-msgstr "Сбой командÑ? NNTP: %s"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1369
msgid "Not connected."
msgstr "Ð?е подклÑ?Ñ?ен."
-#: ../camel/providers/nntp/camel-nntp-store.c:1422
-#, c-format
-msgid "No such folder: %s"
-msgstr "Ð?еÑ? Ñ?акой папки: %s"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:272
-#: ../camel/providers/nntp/camel-nntp-summary.c:370
+#: ../camel/providers/nntp/camel-nntp-summary.c:234
+#: ../camel/providers/nntp/camel-nntp-summary.c:345
#, c-format
msgid "%s: Scanning new messages"
msgstr "%s: Ð?оиÑ?к новÑ?Ñ? Ñ?ообÑ?ений"
-#: ../camel/providers/nntp/camel-nntp-summary.c:279
+#: ../camel/providers/nntp/camel-nntp-summary.c:246
#, c-format
msgid "Unexpected server response from xover: %s"
msgstr "Ð?еожиданнÑ?й оÑ?веÑ? Ñ?еÑ?веÑ?а оÑ? xover: %s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:384
+#: ../camel/providers/nntp/camel-nntp-summary.c:362
#, c-format
msgid "Unexpected server response from head: %s"
msgstr "Ð?еожиданнÑ?й оÑ?веÑ? Ñ?еÑ?веÑ?а оÑ? head: %s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:420
-msgid "Use cancel"
-msgstr "Ð?Ñ?полÑ?зование оÑ?менено"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:422
+#: ../camel/providers/nntp/camel-nntp-summary.c:407
#, c-format
msgid "Operation failed: %s"
msgstr "Сбой опеÑ?аÑ?ии: %s"
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
+#: ../camel/providers/pop3/camel-pop3-folder.c:277
+#: ../camel/providers/pop3/camel-pop3-folder.c:334
+#, c-format
+msgid "No message with UID %s"
+msgstr "Ð?еÑ? Ñ?ообÑ?ениÑ? Ñ? UID %s"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:342
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "Ð?олÑ?Ñ?ение Ñ?ообÑ?ениÑ? %d по POP"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:447
+msgid "Unknown reason"
+msgstr "Ð?еизвеÑ?Ñ?наÑ? пÑ?иÑ?ина"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:486
msgid "Retrieving POP summary"
msgstr "Ð?олÑ?Ñ?ение кÑ?аÑ?кой инÑ?оÑ?маÑ?ии оÑ? Ñ?еÑ?веÑ?а POP"
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
+#: ../camel/providers/pop3/camel-pop3-folder.c:509
#, c-format
msgid "Cannot get POP summary: %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? обÑ?ие даннÑ?е POP: %s"
-#: ../camel/providers/pop3/camel-pop3-folder.c:314
+#: ../camel/providers/pop3/camel-pop3-folder.c:561
msgid "Expunging old messages"
msgstr "УниÑ?Ñ?ожение Ñ?Ñ?аÑ?Ñ?Ñ? Ñ?ообÑ?ений"
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
+#: ../camel/providers/pop3/camel-pop3-folder.c:575
msgid "Expunging deleted messages"
msgstr "УниÑ?Ñ?ожение Ñ?ообÑ?ений, помеÑ?еннÑ?Ñ? как Ñ?далÑ?ннÑ?е"
-#: ../camel/providers/pop3/camel-pop3-folder.c:530
-#: ../camel/providers/pop3/camel-pop3-folder.c:552
-#, c-format
-msgid "No message with UID %s"
-msgstr "Ð?еÑ? Ñ?ообÑ?ениÑ? Ñ? UID %s"
-
-#. Sigh, most of the crap in this function is so that the cancel button
-#. returns the proper exception code. Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:559
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "Ð?олÑ?Ñ?ение Ñ?ообÑ?ениÑ? %d по POP"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-msgid "Unknown reason"
-msgstr "Ð?еизвеÑ?Ñ?наÑ? пÑ?иÑ?ина"
-
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
msgid "Message storage"
msgstr "Ð¥Ñ?анилиÑ?е Ñ?ообÑ?ений"
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
msgid "_Leave messages on server"
msgstr "_Ð?Ñ?Ñ?авлÑ?Ñ?Ñ? Ñ?ообÑ?ениÑ? на Ñ?еÑ?веÑ?е"
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#. Translators: '%s' is replaced with a widget, where user can select how many days can be message left on the server
+#: ../camel/providers/pop3/camel-pop3-provider.c:44
#, c-format
msgid "_Delete after %s day(s)"
msgstr "_УдалÑ?Ñ?Ñ? Ñ?еÑ?ез %s дней"
-#: ../camel/providers/pop3/camel-pop3-provider.c:49
+#: ../camel/providers/pop3/camel-pop3-provider.c:46
+msgid "Delete _expunged from local Inbox"
+msgstr "_УдалиÑ?Ñ? Ñ?ообÑ?ениÑ?, Ñ?далÑ?ннÑ?е из локалÑ?ной папки «Ð?Ñ?одÑ?Ñ?ие»"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:48
msgid "Disable _support for all POP3 extensions"
msgstr "Ð?апÑ?еÑ?иÑ?Ñ? _поддеÑ?жкÑ? вÑ?еÑ? Ñ?аÑ?Ñ?иÑ?ений POP3"
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:56
msgid "POP"
msgstr "POP"
-#: ../camel/providers/pop3/camel-pop3-provider.c:59
+#: ../camel/providers/pop3/camel-pop3-provider.c:58
msgid "For connecting to and downloading mail from POP servers."
msgstr "Ð?лÑ? подклÑ?Ñ?ениÑ? и пÑ?инÑ?Ñ?иÑ? поÑ?Ñ?Ñ? Ñ? Ñ?еÑ?веÑ?ов POP"
-#: ../camel/providers/pop3/camel-pop3-provider.c:76
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-"Ð?одклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ? POP бÑ?деÑ? пÑ?оизводиÑ?Ñ?Ñ?Ñ? Ñ? иÑ?полÑ?зованием "
-"незаÑ?иÑ?Ñ?ованного паÑ?олÑ?. Ð?олÑ?Ñ?инÑ?Ñ?вом Ñ?еÑ?веÑ?ов POP поддеÑ?живаеÑ?Ñ?Ñ? Ñ?олÑ?ко "
-"Ñ?Ñ?оÑ? ваÑ?ианÑ?."
+#: ../camel/providers/pop3/camel-pop3-provider.c:75
+msgid "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers."
+msgstr "Ð?одклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ? POP бÑ?деÑ? пÑ?оизводиÑ?Ñ?Ñ?Ñ? Ñ? иÑ?полÑ?зованием незаÑ?иÑ?Ñ?ованного паÑ?олÑ?. Ð?олÑ?Ñ?инÑ?Ñ?вом Ñ?еÑ?веÑ?ов POP поддеÑ?живаеÑ?Ñ?Ñ? Ñ?олÑ?ко Ñ?Ñ?оÑ? ваÑ?ианÑ?."
-#: ../camel/providers/pop3/camel-pop3-provider.c:86
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-"Ð?одклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ? POP бÑ?деÑ? пÑ?оизводиÑ?Ñ?Ñ?Ñ? Ñ? иÑ?полÑ?зованием Ñ?иÑ?Ñ?ованного "
-"паÑ?олÑ? по пÑ?оÑ?околÑ? APOP. ÐÑ?о можеÑ? Ñ?абоÑ?аÑ?Ñ? не длÑ? вÑ?еÑ? полÑ?зоваÑ?елей даже "
-"на Ñ?еÑ?веÑ?аÑ?, Ñ?кобÑ? поддеÑ?живаÑ?Ñ?иÑ? его."
+#: ../camel/providers/pop3/camel-pop3-provider.c:85
+msgid "This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for all users even on servers that claim to support it."
+msgstr "Ð?одклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ? POP бÑ?деÑ? пÑ?оизводиÑ?Ñ?Ñ?Ñ? Ñ? иÑ?полÑ?зованием Ñ?иÑ?Ñ?ованного паÑ?олÑ? по пÑ?оÑ?околÑ? APOP. ÐÑ?о можеÑ? Ñ?абоÑ?аÑ?Ñ? не длÑ? вÑ?еÑ? полÑ?зоваÑ?елей даже на Ñ?еÑ?веÑ?аÑ?, Ñ?кобÑ? поддеÑ?живаÑ?Ñ?иÑ? его."
-#: ../camel/providers/pop3/camel-pop3-store.c:229
+#. Translators: This is the separator between an error and an explanation
+#: ../camel/providers/pop3/camel-pop3-store.c:98
+msgid ": "
+msgstr ": "
+
+#: ../camel/providers/pop3/camel-pop3-store.c:181
#, c-format
msgid "Failed to read a valid greeting from POP server %s"
msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? пÑ?иглаÑ?ение оÑ? POP-Ñ?еÑ?веÑ?а %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:246
-#: ../camel/providers/pop3/camel-pop3-store.c:274
-#: ../camel/providers/pop3/camel-pop3-store.c:280
+#: ../camel/providers/pop3/camel-pop3-store.c:199
+#: ../camel/providers/pop3/camel-pop3-store.c:230
+#: ../camel/providers/pop3/camel-pop3-store.c:237
#, c-format
msgid "Failed to connect to POP server %s in secure mode: %s"
msgstr "Сбой пÑ?и подклÑ?Ñ?ении к Ñ?еÑ?веÑ?Ñ? POP %s в заÑ?иÑ?енном Ñ?ежиме: %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:247
+#: ../camel/providers/pop3/camel-pop3-store.c:200
msgid "STLS not supported by server"
msgstr "STLS не поддеÑ?живаеÑ?Ñ?Ñ? Ñ?еÑ?веÑ?ом"
-#: ../camel/providers/pop3/camel-pop3-store.c:262
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:218
#, c-format
msgid "Failed to connect to POP server %s in secure mode%s"
-msgstr "Сбой пÑ?и подклÑ?Ñ?ении к Ñ?еÑ?веÑ?Ñ? POP %s в заÑ?иÑ?енном Ñ?ежиме%s"
+msgstr "Сбой пÑ?и подклÑ?Ñ?ении к Ñ?еÑ?веÑ?Ñ? POP %s в заÑ?иÑ?Ñ?нном Ñ?ежиме%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:281
+#: ../camel/providers/pop3/camel-pop3-store.c:231
+msgid "TLS negotiations failed"
+msgstr "Сбой Ñ?оглаÑ?ованиÑ? TLS"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:238
msgid "TLS is not available in this build"
msgstr "TLS не поддеÑ?живаеÑ?Ñ?Ñ? в Ñ?Ñ?ой Ñ?боÑ?ке"
-#: ../camel/providers/pop3/camel-pop3-store.c:387
-#, c-format
-msgid "Could not connect to POP server %s"
-msgstr "Ð?е Ñ?далоÑ?Ñ? подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? к Ñ?еÑ?веÑ?Ñ? POP %s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:428
-#: ../camel/providers/pop3/camel-pop3-store.c:565
+#: ../camel/providers/pop3/camel-pop3-store.c:317
+#: ../camel/providers/pop3/camel-pop3-store.c:472
#, c-format
-msgid ""
-"Unable to connect to POP server %s: No support for requested authentication "
-"mechanism."
-msgstr ""
-"Ð?е Ñ?далоÑ?Ñ? подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? к Ñ?еÑ?веÑ?Ñ? POP %s: Ð?е поддеÑ?живаеÑ?Ñ?Ñ? заÑ?Ñ?ебованнÑ?й "
-"меÑ?анизм иденÑ?иÑ?икаÑ?ии."
+msgid "Unable to connect to POP server %s: No support for requested authentication mechanism."
+msgstr "Ð?е Ñ?далоÑ?Ñ? подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? к Ñ?еÑ?веÑ?Ñ? POP %s: Ð?е поддеÑ?живаеÑ?Ñ?Ñ? заÑ?Ñ?ебованнÑ?й меÑ?анизм иденÑ?иÑ?икаÑ?ии."
-#: ../camel/providers/pop3/camel-pop3-store.c:446
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:340
#, c-format
msgid "SASL '%s' Login failed for POP server %s%s"
msgstr "SASL «%s» Ð?Ñ?ибка Ñ?егиÑ?Ñ?Ñ?аÑ?ии на Ñ?еÑ?веÑ?е POP %s%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:460
+#: ../camel/providers/pop3/camel-pop3-store.c:357
#, c-format
msgid "Cannot login to POP server %s: SASL Protocol error"
msgstr "Ð?е Ñ?далоÑ?Ñ? заÑ?егиÑ?Ñ?Ñ?иÑ?оваÑ?Ñ?Ñ?Ñ? на Ñ?еÑ?веÑ?е POP %s: Ð?Ñ?ибка пÑ?оÑ?окола SASL"
-#: ../camel/providers/pop3/camel-pop3-store.c:479
+#: ../camel/providers/pop3/camel-pop3-store.c:374
#, c-format
-msgid "Failed to authenticate on POP server %s: %s"
-msgstr "Сбой иденÑ?иÑ?икаÑ?ии на Ñ?еÑ?веÑ?е POP %s: %s"
+#| msgid "Failed to authenticate on POP server %s: %s"
+msgid "Failed to authenticate on POP server %s: "
+msgstr "Сбой аÑ?Ñ?енÑ?иÑ?икаÑ?ии на Ñ?еÑ?веÑ?е POP %s: "
-#: ../camel/providers/pop3/camel-pop3-store.c:538
+#: ../camel/providers/pop3/camel-pop3-store.c:439
#, c-format
-msgid ""
-"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
-"attack suspected. Please contact your admin."
-msgstr ""
-"Ð?е Ñ?далоÑ?Ñ? Ñ?оединиÑ?Ñ?Ñ?Ñ? Ñ? Ñ?еÑ?веÑ?ом %s по пÑ?оÑ?околÑ? POP:\t Ð?олÑ?Ñ?ен "
-"некоÑ?Ñ?екÑ?нÑ?й иденÑ?иÑ?икаÑ?оÑ? APOP. Ð?озникаеÑ? подозÑ?ение о пÑ?оведение аÑ?аки на "
-"пеÑ?Ñ?ониÑ?икаÑ?иÑ?. Ð?ожалÑ?йÑ?Ñ?а, Ñ?вÑ?жиÑ?еÑ?Ñ? Ñ? админиÑ?Ñ?Ñ?аÑ?оÑ?ом."
+msgid "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation attack suspected. Please contact your admin."
+msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оединиÑ?Ñ?Ñ?Ñ? Ñ? Ñ?еÑ?веÑ?ом %s по пÑ?оÑ?околÑ? POP:\t Ð?олÑ?Ñ?ен некоÑ?Ñ?екÑ?нÑ?й иденÑ?иÑ?икаÑ?оÑ? APOP. Ð?озникаеÑ? подозÑ?ение о пÑ?оведение аÑ?аки на пеÑ?Ñ?ониÑ?икаÑ?иÑ?. Ð?ожалÑ?йÑ?Ñ?а, Ñ?вÑ?жиÑ?еÑ?Ñ? Ñ? админиÑ?Ñ?Ñ?аÑ?оÑ?ом."
-#: ../camel/providers/pop3/camel-pop3-store.c:579
+#: ../camel/providers/pop3/camel-pop3-store.c:492
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4369,7 +4482,8 @@ msgstr ""
"Ð?е Ñ?далоÑ?Ñ? подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? к Ñ?еÑ?веÑ?Ñ? POP%s.\n"
"Ð?Ñ?ибка оÑ?пÑ?авки паÑ?олÑ?: %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:588
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:505
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4378,7 +4492,8 @@ msgstr ""
"Ð?е Ñ?далоÑ?Ñ? подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? к Ñ?еÑ?веÑ?Ñ? POP %s.\n"
"Ð?Ñ?ибка оÑ?пÑ?авки имени полÑ?зоваÑ?елÑ?%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:597
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:518
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4387,401 +4502,460 @@ msgstr ""
"Ð?е Ñ?далоÑ?Ñ? подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? к Ñ?еÑ?веÑ?Ñ? POP%s.\n"
"Ð?Ñ?ибка оÑ?пÑ?авки паÑ?олÑ?%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:703
+#: ../camel/providers/pop3/camel-pop3-store.c:558
+#, c-format
+#| msgid "IMAP server %s"
+msgid "POP3 server %s"
+msgstr "СеÑ?веÑ? POP3 %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:562
+#, c-format
+#| msgid "IMAP service for %s on %s"
+msgid "POP3 server for %s on %s"
+msgstr "СеÑ?виÑ? POP3 длÑ? %s на %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:693
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? к Ñ?еÑ?веÑ?Ñ? POP %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:720
#, c-format
msgid "No such folder '%s'."
msgstr "Ð?еÑ? Ñ?акой папки «%s»."
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/pop3/camel-pop3-store.c:737
+#, c-format
+msgid "POP3 stores have no folder hierarchy"
+msgstr "Ð? Ñ?Ñ?анилиÑ?аÑ? POP3 оÑ?Ñ?Ñ?Ñ?Ñ?Ñ?вÑ?еÑ? иеÑ?аÑ?Ñ?иÑ? папок"
+
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
msgid "Sendmail"
msgstr "Sendmail"
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:40
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-"Ð?лÑ? доÑ?Ñ?авки поÑ?Ñ?Ñ? пÑ?Ñ?ем запÑ?Ñ?ка пÑ?огÑ?аммÑ? \"sendmail\" на локалÑ?ной Ñ?иÑ?Ñ?еме."
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
+msgstr "Ð?оÑ?Ñ?авка поÑ?Ñ?Ñ? Ñ? помоÑ?Ñ?Ñ? пÑ?огÑ?аммÑ? «sendmail» на локалÑ?ной Ñ?иÑ?Ñ?еме."
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:49
+msgid "sendmail"
+msgstr "sendmail"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:51
+msgid "Mail delivery via the sendmail program"
+msgstr "Ð?оÑ?Ñ?авка поÑ?Ñ?Ñ? Ñ?еÑ?ез пÑ?огÑ?аммÑ? sendmail"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:113
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:86
+#, c-format
msgid "Could not parse recipient list"
-msgstr "Ð?е Ñ?далоÑ?Ñ? обÑ?абоÑ?аÑ?Ñ? Ñ?пиÑ?ок полÑ?Ñ?аÑ?елей"
+msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?азобÑ?аÑ?Ñ? Ñ?пиÑ?ок полÑ?Ñ?аÑ?елей"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:144
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:119
#, c-format
msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? канал к Sendmail: %s: поÑ?Ñ?а не оÑ?пÑ?авлена"
+msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? канал к sendmail: %s: поÑ?Ñ?а не оÑ?пÑ?авлена"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:165
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:141
#, c-format
msgid "Could not fork sendmail: %s: mail not sent"
msgstr "Ð?е Ñ?далоÑ?Ñ? запÑ?Ñ?Ñ?иÑ?Ñ? Sendmail: %s: поÑ?Ñ?а не оÑ?пÑ?авлена"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:235
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
+#| msgid "Could not send message: %s"
+msgid "Could not send message: "
+msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?пÑ?авиÑ?Ñ? Ñ?ообÑ?ение:"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
#, c-format
msgid "sendmail exited with signal %s: mail not sent."
msgstr "Sendmail завеÑ?Ñ?ил Ñ?абоÑ?Ñ? Ñ? Ñ?игналом %s: поÑ?Ñ?а не оÑ?пÑ?авлена."
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:242
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:217
#, c-format
msgid "Could not execute %s: mail not sent."
msgstr "Ð?е Ñ?далоÑ?Ñ? вÑ?полниÑ?Ñ? %s: поÑ?Ñ?а не оÑ?пÑ?авлена."
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:247
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
#, c-format
msgid "sendmail exited with status %d: mail not sent."
msgstr "Sendmail завеÑ?Ñ?ила Ñ?абоÑ?Ñ? Ñ? Ñ?езÑ?лÑ?Ñ?аÑ?ом %d: поÑ?Ñ?а не оÑ?пÑ?авлена."
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:261
-msgid "sendmail"
-msgstr "sendmail"
-
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
-msgid "Mail delivery via the sendmail program"
-msgstr "Ð?оÑ?Ñ?авка поÑ?Ñ?Ñ? Ñ?еÑ?ез пÑ?огÑ?аммÑ? sendmail"
-
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
msgid "SMTP"
msgstr "SMTP"
-#: ../camel/providers/smtp/camel-smtp-provider.c:43
+#: ../camel/providers/smtp/camel-smtp-provider.c:45
msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+msgstr "Ð?лÑ? доÑ?Ñ?авки поÑ?Ñ?Ñ? пÑ?Ñ?ем подклÑ?Ñ?ениÑ? к Ñ?далÑ?нномÑ? поÑ?Ñ?овомÑ? конÑ?енÑ?Ñ?аÑ?оÑ?Ñ? по пÑ?оÑ?околÑ? SMTP."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#| msgid "Welcome response error"
+msgid "Welcome response error: "
+msgstr "Ð?Ñ?ибка оÑ?веÑ?а на пÑ?ивеÑ?Ñ?Ñ?вие: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:277
+#: ../camel/providers/smtp/camel-smtp-transport.c:284
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? к Ñ?еÑ?веÑ?Ñ? SMTP %s в заÑ?иÑ?енном Ñ?ежиме: %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:246
+#: ../camel/providers/smtp/camel-smtp-transport.c:259
+#: ../camel/providers/smtp/camel-smtp-transport.c:266
+#| msgid "STARTTLS command failed: %s"
+msgid "STARTTLS command failed: "
+msgstr "Сбой командÑ? STARTTLS: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:357
+#, c-format
+msgid "SMTP server %s"
+msgstr "SMTP Ñ?еÑ?веÑ? %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:361
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "Ð?оÑ?Ñ?авка SMTP поÑ?Ñ?Ñ? Ñ?еÑ?ез %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:408
+#, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
+msgstr "СеÑ?веÑ? SMTP %s не поддеÑ?живаеÑ? заÑ?Ñ?ебованнÑ?й Ñ?ип иденÑ?иÑ?икаÑ?ии %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:495
+#, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
msgstr ""
-"Ð?лÑ? доÑ?Ñ?авки поÑ?Ñ?Ñ? пÑ?Ñ?ем подклÑ?Ñ?ениÑ? к Ñ?далÑ?нномÑ? поÑ?Ñ?овомÑ? конÑ?енÑ?Ñ?аÑ?оÑ?Ñ? по "
-"пÑ?оÑ?околÑ? SMTP."
+"Ð?е Ñ?далоÑ?Ñ? аÑ?Ñ?енÑ?иÑ?иÑ?иÑ?оваÑ?Ñ?Ñ?Ñ? на Ñ?еÑ?веÑ?е SMTP.\n"
+"%s\n"
+"\n"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:613
+#, c-format
+msgid "Cannot send message: service not connected."
+msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?пÑ?авиÑ?Ñ? Ñ?ообÑ?ение: Ñ?еÑ?виÑ? не подклÑ?Ñ?ен."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:620
+#, c-format
+msgid "Cannot send message: sender address not valid."
+msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?пÑ?авиÑ?Ñ? Ñ?ообÑ?ение: невеÑ?нÑ?й адÑ?еÑ? оÑ?пÑ?авиÑ?елÑ?."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:624
+msgid "Sending message"
+msgstr "Ð?Ñ?пÑ?авка Ñ?ообÑ?ениÑ?"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:649
+#, c-format
+msgid "Cannot send message: no recipients defined."
+msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?пÑ?авиÑ?Ñ? Ñ?ообÑ?ение: не опÑ?еделенÑ? полÑ?Ñ?аÑ?ели."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:662
+#, c-format
+msgid "Cannot send message: one or more invalid recipients"
+msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?пÑ?авиÑ?Ñ? Ñ?ообÑ?ение: Ñ?казан один или неÑ?колÑ?ко некоÑ?Ñ?екÑ?нÑ?Ñ? полÑ?Ñ?аÑ?елей"
-#: ../camel/providers/smtp/camel-smtp-transport.c:167
+#: ../camel/providers/smtp/camel-smtp-transport.c:725
msgid "Syntax error, command unrecognized"
msgstr "СинÑ?акÑ?иÑ?еÑ?каÑ? оÑ?ибка, команда не Ñ?аÑ?познана"
-#: ../camel/providers/smtp/camel-smtp-transport.c:169
+#: ../camel/providers/smtp/camel-smtp-transport.c:727
msgid "Syntax error in parameters or arguments"
msgstr "СинÑ?акÑ?иÑ?еÑ?каÑ? оÑ?ибка в паÑ?амеÑ?Ñ?аÑ? или аÑ?гÑ?менÑ?аÑ?"
-#: ../camel/providers/smtp/camel-smtp-transport.c:171
+#: ../camel/providers/smtp/camel-smtp-transport.c:729
msgid "Command not implemented"
msgstr "Ð?оманда не Ñ?еализована"
-#: ../camel/providers/smtp/camel-smtp-transport.c:173
+#: ../camel/providers/smtp/camel-smtp-transport.c:731
msgid "Command parameter not implemented"
msgstr "Ð?аÑ?амеÑ?Ñ? командÑ? не Ñ?еализован"
-#: ../camel/providers/smtp/camel-smtp-transport.c:175
+#: ../camel/providers/smtp/camel-smtp-transport.c:733
msgid "System status, or system help reply"
msgstr "СоÑ?Ñ?оÑ?ние Ñ?иÑ?Ñ?емÑ? или оÑ?веÑ? Ñ?иÑ?Ñ?емной Ñ?пÑ?авки"
-#: ../camel/providers/smtp/camel-smtp-transport.c:177
+#: ../camel/providers/smtp/camel-smtp-transport.c:735
msgid "Help message"
msgstr "СпÑ?авоÑ?ное Ñ?ообÑ?ение"
-#: ../camel/providers/smtp/camel-smtp-transport.c:179
+#: ../camel/providers/smtp/camel-smtp-transport.c:737
msgid "Service ready"
msgstr "СеÑ?виÑ? гоÑ?ов"
-#: ../camel/providers/smtp/camel-smtp-transport.c:181
+#: ../camel/providers/smtp/camel-smtp-transport.c:739
msgid "Service closing transmission channel"
msgstr "СеÑ?виÑ? закÑ?Ñ?ваеÑ? канал пеÑ?едаÑ?и"
-#: ../camel/providers/smtp/camel-smtp-transport.c:183
+#: ../camel/providers/smtp/camel-smtp-transport.c:741
msgid "Service not available, closing transmission channel"
msgstr "СеÑ?виÑ? не доÑ?Ñ?Ñ?пен, закÑ?Ñ?Ñ?ие канала пеÑ?едаÑ?и"
-#: ../camel/providers/smtp/camel-smtp-transport.c:185
+#: ../camel/providers/smtp/camel-smtp-transport.c:743
msgid "Requested mail action okay, completed"
msgstr "Ð?апÑ?оÑ?енное поÑ?Ñ?овое дейÑ?Ñ?вие вÑ?полнено"
-#: ../camel/providers/smtp/camel-smtp-transport.c:187
+#: ../camel/providers/smtp/camel-smtp-transport.c:745
msgid "User not local; will forward to <forward-path>"
-msgstr ""
-"Ð?е локалÑ?нÑ?й полÑ?зоваÑ?елÑ?; бÑ?деÑ? оÑ?пÑ?авлено в Ñ?ооÑ?веÑ?Ñ?Ñ?вии Ñ? <forward-path>"
+msgstr "Ð?е локалÑ?нÑ?й полÑ?зоваÑ?елÑ?; бÑ?деÑ? оÑ?пÑ?авлено в Ñ?ооÑ?веÑ?Ñ?Ñ?вии Ñ? <forward-path>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:189
+#: ../camel/providers/smtp/camel-smtp-transport.c:747
msgid "Requested mail action not taken: mailbox unavailable"
msgstr "Ð?апÑ?оÑ?енное дейÑ?Ñ?вие Ñ? поÑ?Ñ?ой не вÑ?полнено: поÑ?Ñ?овÑ?й Ñ?Ñ?ик недоÑ?Ñ?Ñ?пен"
-#: ../camel/providers/smtp/camel-smtp-transport.c:191
+#: ../camel/providers/smtp/camel-smtp-transport.c:749
msgid "Requested action not taken: mailbox unavailable"
msgstr "Ð?апÑ?оÑ?енное дейÑ?Ñ?вие не вÑ?полнено: поÑ?Ñ?овÑ?й Ñ?Ñ?ик недоÑ?Ñ?Ñ?пен"
-#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:751
msgid "Requested action aborted: error in processing"
msgstr "Ð?апÑ?оÑ?енное дейÑ?Ñ?вие пÑ?еÑ?вано: оÑ?ибка пÑ?и обÑ?абоÑ?ке"
-#: ../camel/providers/smtp/camel-smtp-transport.c:195
+#: ../camel/providers/smtp/camel-smtp-transport.c:753
msgid "User not local; please try <forward-path>"
msgstr "Ð?олÑ?зоваÑ?елÑ? не локалÑ?нÑ?й; Ñ?Ñ?Ñ?ановиÑ?е <forward-path>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:197
+#: ../camel/providers/smtp/camel-smtp-transport.c:755
msgid "Requested action not taken: insufficient system storage"
-msgstr ""
-"Ð?апÑ?оÑ?енное дейÑ?Ñ?вие не вÑ?полнено: недоÑ?Ñ?аÑ?оÑ?но меÑ?Ñ?а в Ñ?иÑ?Ñ?емном Ñ?Ñ?анилиÑ?е"
+msgstr "Ð?апÑ?оÑ?енное дейÑ?Ñ?вие не вÑ?полнено: недоÑ?Ñ?аÑ?оÑ?но меÑ?Ñ?а в Ñ?иÑ?Ñ?емном Ñ?Ñ?анилиÑ?е"
-#: ../camel/providers/smtp/camel-smtp-transport.c:199
+#: ../camel/providers/smtp/camel-smtp-transport.c:757
msgid "Requested mail action aborted: exceeded storage allocation"
msgstr "Ð?апÑ?оÑ?енное дейÑ?Ñ?вие пÑ?еÑ?вано: иÑ?Ñ?еÑ?пано меÑ?Ñ?о в Ñ?Ñ?анилиÑ?е"
-#: ../camel/providers/smtp/camel-smtp-transport.c:201
+#: ../camel/providers/smtp/camel-smtp-transport.c:759
msgid "Requested action not taken: mailbox name not allowed"
msgstr "Ð?апÑ?оÑ?енное дейÑ?Ñ?вие пÑ?еÑ?вано: имÑ? поÑ?Ñ?ового Ñ?Ñ?ика недопÑ?Ñ?Ñ?имо"
-#: ../camel/providers/smtp/camel-smtp-transport.c:203
+#: ../camel/providers/smtp/camel-smtp-transport.c:761
msgid "Start mail input; end with <CRLF>.<CRLF>"
msgstr "Ð?аÑ?ало ввода поÑ?Ñ?Ñ?; оконÑ?ание поÑ?ле <CRLF>.<CRLF>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:205
+#: ../camel/providers/smtp/camel-smtp-transport.c:763
msgid "Transaction failed"
msgstr "Сбой Ñ?Ñ?анзакÑ?ии"
-#: ../camel/providers/smtp/camel-smtp-transport.c:209
+#: ../camel/providers/smtp/camel-smtp-transport.c:767
msgid "A password transition is needed"
msgstr "Ð?еобÑ?одима пеÑ?едаÑ?а паÑ?олÑ?"
-#: ../camel/providers/smtp/camel-smtp-transport.c:211
+#: ../camel/providers/smtp/camel-smtp-transport.c:769
msgid "Authentication mechanism is too weak"
msgstr "СлиÑ?ком Ñ?лабÑ?й меÑ?анизм аÑ?Ñ?енÑ?иÑ?икаÑ?ии"
-#: ../camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/smtp/camel-smtp-transport.c:771
msgid "Encryption required for requested authentication mechanism"
msgstr "Ð?лÑ? запÑ?оÑ?енного меÑ?анизма аÑ?Ñ?енÑ?иÑ?икаÑ?ии Ñ?Ñ?ебÑ?еÑ?Ñ?Ñ? Ñ?иÑ?Ñ?ование"
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
+#: ../camel/providers/smtp/camel-smtp-transport.c:773
msgid "Temporary authentication failure"
msgstr "Ð?Ñ?еменнÑ?й Ñ?бой аÑ?Ñ?енÑ?иÑ?икаÑ?ии"
-#: ../camel/providers/smtp/camel-smtp-transport.c:296
-msgid "Welcome response error"
-msgstr "Ð?Ñ?ибка пÑ?и оÑ?веÑ?е на пÑ?ивеÑ?Ñ?Ñ?вие"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:331
-#: ../camel/providers/smtp/camel-smtp-transport.c:364
-#: ../camel/providers/smtp/camel-smtp-transport.c:370
-#, c-format
-msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "Ð?е Ñ?далоÑ?Ñ? подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? к Ñ?еÑ?веÑ?Ñ? SMTP %s в заÑ?иÑ?енном Ñ?ежиме: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:340
-#, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "Сбой командÑ? STARTTLS: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:355
-msgid "STARTTLS command failed"
-msgstr "Сбой командÑ? STARTTLS"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:496
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "СеÑ?веÑ? SMTP %s не поддеÑ?живаеÑ? заÑ?Ñ?ебованнÑ?й Ñ?ип иденÑ?иÑ?икаÑ?ии %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:567
-#, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"Ð?е Ñ?далоÑ?Ñ? аÑ?Ñ?енÑ?иÑ?иÑ?иÑ?оваÑ?Ñ?Ñ?Ñ? на Ñ?еÑ?веÑ?е SMTP.\n"
-"%s\n"
-"\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:700
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP Ñ?еÑ?веÑ? %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:702
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "Ð?оÑ?Ñ?авка SMTP поÑ?Ñ?Ñ? Ñ?еÑ?ез %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:720
-msgid "Cannot send message: service not connected."
-msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?пÑ?авиÑ?Ñ? Ñ?ообÑ?ение: Ñ?еÑ?виÑ? не подклÑ?Ñ?ен."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:726
-msgid "Cannot send message: sender address not valid."
-msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?пÑ?авиÑ?Ñ? Ñ?ообÑ?ение: невеÑ?нÑ?й адÑ?еÑ? оÑ?пÑ?авиÑ?елÑ?."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:730
-msgid "Sending message"
-msgstr "Ð?Ñ?пÑ?авка Ñ?ообÑ?ениÑ?"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
-msgid "Cannot send message: no recipients defined."
-msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?пÑ?авиÑ?Ñ? Ñ?ообÑ?ение: не опÑ?еделенÑ? полÑ?Ñ?аÑ?ели."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:756
-msgid "Cannot send message: one or more invalid recipients"
-msgstr ""
-"Ð?е Ñ?далоÑ?Ñ? оÑ?пÑ?авиÑ?Ñ? Ñ?ообÑ?ение: Ñ?казан один или неÑ?колÑ?ко некоÑ?Ñ?екÑ?нÑ?Ñ? "
-"полÑ?Ñ?аÑ?елей"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:985
+#: ../camel/providers/smtp/camel-smtp-transport.c:1030
msgid "SMTP Greeting"
msgstr "Ð?Ñ?ивеÑ?Ñ?Ñ?вие SMTP"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1010
-#, c-format
-msgid "HELO command failed: %s"
-msgstr "Сбой командÑ? HELO: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1027
-msgid "HELO command failed"
-msgstr "Сбой командÑ? HELO"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1057
+#: ../camel/providers/smtp/camel-smtp-transport.c:1074
+#: ../camel/providers/smtp/camel-smtp-transport.c:1082
+#| msgid "HELO command failed: %s"
+msgid "HELO command failed: "
+msgstr "Сбой командÑ? HELO: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:1093
+#: ../camel/providers/smtp/camel-smtp-transport.c:1150
msgid "SMTP Authentication"
msgstr "Ð?Ñ?Ñ?енÑ?иÑ?икаÑ?иÑ? SMTP"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1099
+#: ../camel/providers/smtp/camel-smtp-transport.c:1157
+#, c-format
msgid "Error creating SASL authentication object."
msgstr "Ð?Ñ?ибка пÑ?и Ñ?оздании обÑ?екÑ?а аÑ?Ñ?енÑ?иÑ?икаÑ?ии SASL."
-#: ../camel/providers/smtp/camel-smtp-transport.c:1116
-#: ../camel/providers/smtp/camel-smtp-transport.c:1127
-#, c-format
-msgid "AUTH command failed: %s"
-msgstr "Сбой командÑ? AUTH: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1133
-msgid "AUTH command failed"
-msgstr "Сбой командÑ? AUTH"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1203
-msgid "Bad authentication response from server.\n"
-msgstr "Ð?евеÑ?нÑ?й оÑ?веÑ? оÑ? Ñ?еÑ?веÑ?а пÑ?и аÑ?Ñ?енÑ?иÑ?икаÑ?ии.\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1230
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "Сбой командÑ? MAIL FROM: %s: поÑ?Ñ?а не оÑ?пÑ?авлена"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1247
-msgid "MAIL FROM command failed"
-msgstr "Сбой командÑ? MAIL FROM"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1271
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "Ñ?бой командÑ? RCPT TO: %s: поÑ?Ñ?а не оÑ?пÑ?авлена"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1290
-#, c-format
-msgid "RCPT TO <%s> failed"
-msgstr "RCPT TO <%s> не Ñ?далоÑ?Ñ?"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1330
-#: ../camel/providers/smtp/camel-smtp-transport.c:1399
-#: ../camel/providers/smtp/camel-smtp-transport.c:1418
-#, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "Сбой командÑ? DATA: %s: поÑ?Ñ?а не оÑ?пÑ?авлена"
-
-#. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1347
-#: ../camel/providers/smtp/camel-smtp-transport.c:1434
-msgid "DATA command failed"
-msgstr "Сбой командÑ? DATA"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1457
-#, c-format
-msgid "RSET command failed: %s"
-msgstr "Сбой командÑ? RSET: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1473
-msgid "RSET command failed"
-msgstr "Сбой командÑ? RSET"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1176
+#: ../camel/providers/smtp/camel-smtp-transport.c:1187
+#: ../camel/providers/smtp/camel-smtp-transport.c:1196
+#| msgid "AUTH command failed: %s"
+msgid "AUTH command failed: "
+msgstr "Сбой командÑ? AUTH: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1304
+#: ../camel/providers/smtp/camel-smtp-transport.c:1318
+#: ../camel/providers/smtp/camel-smtp-transport.c:1327
+#| msgid "MAIL FROM command failed"
+msgid "MAIL FROM command failed: "
+msgstr "Сбой командÑ? MAIL FROM: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1354
+#| msgid "RSET command failed: %s"
+msgid "RCPT TO command failed: "
+msgstr "Сбой командÑ? RCPT TO: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1370
+#: ../camel/providers/smtp/camel-smtp-transport.c:1379
+#, c-format
+#| msgid "RCPT TO <%s> failed"
+msgid "RCPT TO <%s> failed: "
+msgstr "Сбой RCPT TO <%s>: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1421
+#: ../camel/providers/smtp/camel-smtp-transport.c:1431
+#: ../camel/providers/smtp/camel-smtp-transport.c:1441
+#: ../camel/providers/smtp/camel-smtp-transport.c:1500
+#: ../camel/providers/smtp/camel-smtp-transport.c:1519
+#: ../camel/providers/smtp/camel-smtp-transport.c:1532
+#: ../camel/providers/smtp/camel-smtp-transport.c:1540
+#| msgid "DATA command failed"
+msgid "DATA command failed: "
+msgstr "Сбой командÑ? DATA: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1565
+#: ../camel/providers/smtp/camel-smtp-transport.c:1579
+#: ../camel/providers/smtp/camel-smtp-transport.c:1587
+#| msgid "RSET command failed: %s"
+msgid "RSET command failed: "
+msgstr "Сбой командÑ? RSET: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1612
+#: ../camel/providers/smtp/camel-smtp-transport.c:1626
+#: ../camel/providers/smtp/camel-smtp-transport.c:1633
+#| msgid "QUIT command failed: %s"
+msgid "QUIT command failed: "
+msgstr "Сбой командÑ? QUIT: "
-#: ../camel/providers/smtp/camel-smtp-transport.c:1496
-#, c-format
-msgid "QUIT command failed: %s"
-msgstr "Сбой командÑ? QUIT: %s"
+#: ../libedataserver/e-categories.c:47
+#| msgid "Anniversary"
+msgctxt "CategoryName"
+msgid "Anniversary"
+msgstr "Ð?одовÑ?ина"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1510
-msgid "QUIT command failed"
-msgstr "Сбой командÑ? QUIT"
+#: ../libedataserver/e-categories.c:48
+#| msgid "Birthday"
+msgctxt "CategoryName"
+msgid "Birthday"
+msgstr "Ð?енÑ? Ñ?ождениÑ?"
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:49
+#| msgid "Business"
+msgctxt "CategoryName"
msgid "Business"
msgstr "Ð?изнеÑ?"
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:50
+#| msgid "Competition"
+msgctxt "CategoryName"
msgid "Competition"
msgstr "Ð?онкÑ?Ñ?енÑ?иÑ?"
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:51
+#| msgid "Favorites"
+msgctxt "CategoryName"
msgid "Favorites"
-msgstr "Ð?Ñ?бимое"
+msgstr "Ð?збÑ?аннÑ?е"
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:52
+#| msgid "Gifts"
+msgctxt "CategoryName"
msgid "Gifts"
msgstr "Ð?одаÑ?ки"
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:53
+#| msgid "Goals/Objectives"
+msgctxt "CategoryName"
msgid "Goals/Objectives"
-msgstr "Цели/задаÑ?и"
+msgstr "Цели и задаÑ?и"
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:54
+#| msgid "Holiday"
+msgctxt "CategoryName"
msgid "Holiday"
msgstr "Ð?Ñ?аздник (вÑ?Ñ?одной)"
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:55
+#| msgid "Holiday Cards"
+msgctxt "CategoryName"
msgid "Holiday Cards"
msgstr "Ð?оздÑ?авиÑ?елÑ?нÑ?е оÑ?кÑ?Ñ?Ñ?ки"
#. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:57
+#| msgid "Hot Contacts"
+msgctxt "CategoryName"
msgid "Hot Contacts"
-msgstr "Ð?оÑ?Ñ?Ñ?ие конÑ?акÑ?Ñ?"
+msgstr "Ð?ажнÑ?е конÑ?акÑ?Ñ?"
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:58
+#| msgid "Ideas"
+msgctxt "CategoryName"
msgid "Ideas"
msgstr "Ð?деи"
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:59
+#| msgid "International"
+msgctxt "CategoryName"
msgid "International"
msgstr "Ð?еждÑ?наÑ?однÑ?е"
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:60
+#| msgid "Key Customer"
+msgctxt "CategoryName"
msgid "Key Customer"
msgstr "Ð?лÑ?Ñ?евой поÑ?Ñ?ебиÑ?елÑ?"
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:61
+#| msgid "Miscellaneous"
+msgctxt "CategoryName"
msgid "Miscellaneous"
msgstr "Разное"
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:62
+#| msgid "Personal"
+msgctxt "CategoryName"
msgid "Personal"
msgstr "Ð?иÑ?ное"
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:63
+#| msgid "Phone Calls"
+msgctxt "CategoryName"
msgid "Phone Calls"
msgstr "ТелеÑ?оннÑ?е звонки"
#. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:65
+#| msgid "Status"
+msgctxt "CategoryName"
msgid "Status"
-msgstr "СÑ?аÑ?Ñ?Ñ?"
+msgstr "СоÑ?Ñ?оÑ?ние"
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:66
+#| msgid "Strategies"
+msgctxt "CategoryName"
msgid "Strategies"
msgstr "СÑ?Ñ?аÑ?егии"
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:67
+#| msgid "Suppliers"
+msgctxt "CategoryName"
msgid "Suppliers"
msgstr "Ð?оÑ?Ñ?авÑ?ики"
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:68
+#| msgid "Time & Expenses"
+msgctxt "CategoryName"
msgid "Time & Expenses"
msgstr "Ð?Ñ?емÑ? и Ñ?аÑ?Ñ?одÑ?"
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:69
+#| msgid "VIP"
+msgctxt "CategoryName"
msgid "VIP"
msgstr "VIP"
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:70
+#| msgid "Waiting"
+msgctxt "CategoryName"
msgid "Waiting"
msgstr "Ð?жидание"
@@ -4789,7 +4963,8 @@ msgstr "Ð?жидание"
#. in 12-hour format.
#. strftime format of a weekday, a date and a
#. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1633 ../libedataserver/e-time-utils.c:1898
+#: ../libedataserver/e-time-utils.c:1635
+#: ../libedataserver/e-time-utils.c:1902
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%a, %d.%m.%Y %I:%M:%S %p"
@@ -4797,7 +4972,8 @@ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
#. in 24-hour format.
#. strftime format of a weekday, a date and a
#. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1638 ../libedataserver/e-time-utils.c:1889
+#: ../libedataserver/e-time-utils.c:1640
+#: ../libedataserver/e-time-utils.c:1893
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%a %d/%m/%Y %H:%M:%S"
@@ -4805,7 +4981,8 @@ msgstr "%a %d/%m/%Y %H:%M:%S"
#. in 12-hour format, without seconds.
#. strftime format of a weekday, a date and a
#. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1643 ../libedataserver/e-time-utils.c:1894
+#: ../libedataserver/e-time-utils.c:1645
+#: ../libedataserver/e-time-utils.c:1898
msgid "%a %m/%d/%Y %I:%M %p"
msgstr "%a %d/%m/%Y %I:%M %p"
@@ -4813,78 +4990,83 @@ msgstr "%a %d/%m/%Y %I:%M %p"
#. in 24-hour format, without seconds.
#. strftime format of a weekday, a date and a
#. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1648 ../libedataserver/e-time-utils.c:1885
+#: ../libedataserver/e-time-utils.c:1650
+#: ../libedataserver/e-time-utils.c:1889
msgid "%a %m/%d/%Y %H:%M"
msgstr "%a %d/%m/%Y %H:%M"
#. strptime format of a weekday, a date and a time,
#. in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1653
+#: ../libedataserver/e-time-utils.c:1655
msgid "%a %m/%d/%Y %I %p"
msgstr "%a %d/%m/%Y %I %p"
#. strptime format of a weekday, a date and a time,
#. in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1658
+#: ../libedataserver/e-time-utils.c:1660
msgid "%a %m/%d/%Y %H"
msgstr "%a %d/%m/%Y %H"
#. strptime format of a weekday and a date.
#. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1661 ../libedataserver/e-time-utils.c:1761
-#: ../libedataserver/e-time-utils.c:1880
+#: ../libedataserver/e-time-utils.c:1663
+#: ../libedataserver/e-time-utils.c:1765
+#: ../libedataserver/e-time-utils.c:1884
msgid "%a %m/%d/%Y"
msgstr "%a %d/%m/%Y"
#. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1668
+#: ../libedataserver/e-time-utils.c:1670
msgid "%m/%d/%Y %I:%M:%S %p"
msgstr "%d/%m/%Y %I:%M:%S %p"
#. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1672
+#: ../libedataserver/e-time-utils.c:1674
msgid "%m/%d/%Y %H:%M:%S"
msgstr "%d/%m/%Y %H:%M:%S"
#. strptime format of a date and a time, in 12-hour format,
#. without seconds.
-#: ../libedataserver/e-time-utils.c:1677
+#: ../libedataserver/e-time-utils.c:1679
msgid "%m/%d/%Y %I:%M %p"
msgstr "%d/%m/%Y %I:%M %p"
#. strptime format of a date and a time, in 24-hour format,
#. without seconds.
-#: ../libedataserver/e-time-utils.c:1682
+#: ../libedataserver/e-time-utils.c:1684
msgid "%m/%d/%Y %H:%M"
msgstr "%d/%m/%Y %H:%M"
#. strptime format of a date and a time, in 12-hour format,
#. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1687
+#: ../libedataserver/e-time-utils.c:1689
msgid "%m/%d/%Y %I %p"
msgstr "%d/%m/%Y %I %p"
#. strptime format of a date and a time, in 24-hour format,
#. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1692
+#: ../libedataserver/e-time-utils.c:1694
msgid "%m/%d/%Y %H"
msgstr "%d/%m/%Y %H"
#. strptime format of a weekday and a date.
#. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1695 ../libedataserver/e-time-utils.c:1764
+#: ../libedataserver/e-time-utils.c:1697
+#: ../libedataserver/e-time-utils.c:1768
msgid "%m/%d/%Y"
msgstr "%d/%m/%Y"
#. strptime format for a time of day, in 12-hour format.
#. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1822 ../libedataserver/e-time-utils.c:1942
+#: ../libedataserver/e-time-utils.c:1826
+#: ../libedataserver/e-time-utils.c:1946
msgid "%I:%M:%S %p"
msgstr "%I:%M:%S %p"
#. strptime format for a time of day, in 24-hour format.
#. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1826 ../libedataserver/e-time-utils.c:1934
+#: ../libedataserver/e-time-utils.c:1830
+#: ../libedataserver/e-time-utils.c:1938
msgid "%H:%M:%S"
msgstr "%H:%M:%S"
@@ -4892,222 +5074,216 @@ msgstr "%H:%M:%S"
#. in 12-hour format.
#. strftime format of a time in 12-hour format,
#. without seconds.
-#: ../libedataserver/e-time-utils.c:1831 ../libedataserver/e-time-utils.c:1939
+#: ../libedataserver/e-time-utils.c:1835
+#: ../libedataserver/e-time-utils.c:1943
msgid "%I:%M %p"
msgstr "%I:%M %p"
#. strptime format for time of day, without seconds 24-hour format.
#. strftime format of a time in 24-hour format,
#. without seconds.
-#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1931
+#: ../libedataserver/e-time-utils.c:1839
+#: ../libedataserver/e-time-utils.c:1935
msgid "%H:%M"
msgstr "%H:%M"
#. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1838
+#: ../libedataserver/e-time-utils.c:1842
msgid "%H%M"
msgstr "%H%M"
#. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1842
+#: ../libedataserver/e-time-utils.c:1846
msgid "%I %p"
msgstr "%I %p"
-#: ../libedataserverui/e-book-auth-util.c:90
+#: ../libedataserverui/e-book-auth-util.c:93
+#: ../libedataserverui/e-book-auth-util.c:673
msgid "Accessing LDAP Server anonymously"
msgstr "Ð?нонимнÑ?й доÑ?Ñ?Ñ?п к Ñ?еÑ?веÑ?Ñ? LDAP"
-#: ../libedataserverui/e-book-auth-util.c:192
+#: ../libedataserverui/e-book-auth-util.c:199
+#: ../libedataserverui/e-book-auth-util.c:435
msgid "Failed to authenticate.\n"
msgstr "Ð?Ñ?ибка авÑ?оÑ?изаÑ?ии.\n"
-#: ../libedataserverui/e-categories-dialog.c:145
+#: ../libedataserverui/e-categories-dialog.c:131
+msgid "Category Properties"
+msgstr "СвойÑ?Ñ?ва каÑ?егоÑ?ии"
+
+#: ../libedataserverui/e-categories-dialog.c:142
+msgid "Category _Name"
+msgstr "_Ð?мÑ? каÑ?егоÑ?ии"
+
+#: ../libedataserverui/e-categories-dialog.c:148
+msgid "Category _Icon"
+msgstr "_Ð?наÑ?ок каÑ?егоÑ?ии"
+
+#: ../libedataserverui/e-categories-dialog.c:189
msgid "Category Icon"
msgstr "Ð?наÑ?ок каÑ?егоÑ?ии"
-#: ../libedataserverui/e-categories-dialog.c:151
+#: ../libedataserverui/e-categories-dialog.c:195
msgid "_No Image"
msgstr "Ð?еÑ? _изобÑ?ажениÑ?"
-#: ../libedataserverui/e-categories-dialog.c:372
+#: ../libedataserverui/e-categories-dialog.c:406
#, c-format
-msgid ""
-"There is already a category '%s' in the configuration. Please use another "
-"name"
+msgid "There is already a category '%s' in the configuration. Please use another name"
msgstr "Ð?аÑ?егоÑ?иÑ? Ñ? именем «%s» Ñ?же еÑ?Ñ?Ñ?. Ð?Ñ?полÑ?зÑ?йÑ?е дÑ?Ñ?гое имÑ?"
-#: ../libedataserverui/e-categories-dialog.c:680
-msgid "Icon"
-msgstr "Ð?наÑ?ок"
-
-#: ../libedataserverui/e-categories-dialog.c:685
-msgid "Category"
-msgstr "Ð?аÑ?егоÑ?иÑ?"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:1
-msgid "Category Properties"
-msgstr "СвойÑ?Ñ?ва каÑ?егоÑ?ии"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:2
-msgid "Category _Icon"
-msgstr "_Ð?наÑ?ок каÑ?егоÑ?ии"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:3
-msgid "Category _Name"
-msgstr "_Ð?мÑ? каÑ?егоÑ?ии"
+#: ../libedataserverui/e-categories-dialog.c:661
+msgid "Currently _used categories:"
+msgstr "_Ð?Ñ?полÑ?зÑ?емÑ?е каÑ?егоÑ?ии:"
-#: ../libedataserverui/e-categories-dialog.ui.h:4
-msgid "Item(s) _belong to these categories:"
-msgstr "ÐлеменÑ?(Ñ?) пÑ?инадлежаÑ? Ñ?ледÑ?Ñ?Ñ?им _каÑ?егоÑ?иÑ?м:"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:5
+#: ../libedataserverui/e-categories-dialog.c:668
msgid "_Available Categories:"
msgstr "_оÑ?Ñ?Ñ?пнÑ?е каÑ?егоÑ?ии:"
-#: ../libedataserverui/e-categories-dialog.ui.h:6
+#: ../libedataserverui/e-categories-dialog.c:711
msgid "_Edit"
msgstr "_Ð?Ñ?авка"
-#: ../libedataserverui/e-categories-dialog.ui.h:7
-msgid "categories"
-msgstr "каÑ?егоÑ?ии"
+#: ../libedataserverui/e-categories-dialog.c:767
+msgid "Icon"
+msgstr "Ð?наÑ?ок"
+
+#: ../libedataserverui/e-categories-dialog.c:772
+msgid "Category"
+msgstr "Ð?аÑ?егоÑ?иÑ?"
#: ../libedataserverui/e-category-completion.c:292
#, c-format
msgid "Create category \"%s\""
msgstr "СоздаÑ?Ñ? каÑ?егоÑ?иÑ? «%s»"
-#: ../libedataserverui/e-cell-renderer-color.c:222
-msgid "Color Info"
-msgstr "Ð?нÑ?оÑ?маÑ?иÑ? о Ñ?веÑ?е"
+#: ../libedataserverui/e-name-selector-dialog.c:169
+#| msgid "Hot Contacts"
+msgid "Show Contacts"
+msgstr "Ð?оказаÑ?Ñ? конÑ?акÑ?Ñ?"
-#: ../libedataserverui/e-cell-renderer-color.c:223
-msgid "The color to render"
-msgstr "ЦвеÑ? длÑ? оÑ?обÑ?ажениÑ?"
-
-#: ../libedataserverui/e-name-selector-dialog.c:292
-msgid "Select Contacts from Address Book"
-msgstr "Ð?Ñ?боÑ? конÑ?акÑ?ов из адÑ?еÑ?ной книги"
+#: ../libedataserverui/e-name-selector-dialog.c:191
+msgid "Address B_ook:"
+msgstr "Ð?дÑ?еÑ?наÑ? к_нига:"
-#: ../libedataserverui/e-name-selector-dialog.c:587
-msgid "_Add"
-msgstr "_Ð?обавиÑ?Ñ?"
+#: ../libedataserverui/e-name-selector-dialog.c:199
+msgid "Cate_gory:"
+msgstr "Ð?_аÑ?егоÑ?иÑ?:"
-#: ../libedataserverui/e-name-selector-dialog.c:612
-msgid "_Remove"
-msgstr "_УдалиÑ?Ñ?"
+#: ../libedataserverui/e-name-selector-dialog.c:217
+msgid "_Search:"
+msgstr "_Ð?Ñ?каÑ?Ñ?:"
-#: ../libedataserverui/e-name-selector-dialog.c:789
-#: ../libedataserverui/e-name-selector-dialog.ui.h:6
+#: ../libedataserverui/e-name-selector-dialog.c:235
+#: ../libedataserverui/e-name-selector-dialog.c:970
msgid "Any Category"
msgstr "Ð?Ñ?баÑ? каÑ?егоÑ?иÑ?"
-#: ../libedataserverui/e-name-selector-dialog.ui.h:1
-msgid "*"
-msgstr "*"
-
-#: ../libedataserverui/e-name-selector-dialog.ui.h:2
-msgid "<b>Co_ntacts</b>"
-msgstr "<b>_Ð?онÑ?акÑ?Ñ?</b> "
+#: ../libedataserverui/e-name-selector-dialog.c:237
+#| msgid "Contacts"
+msgid "Co_ntacts"
+msgstr "Ð?о_нÑ?акÑ?Ñ?"
-#: ../libedataserverui/e-name-selector-dialog.ui.h:3
-msgid "<b>Show Contacts</b>"
-msgstr "<b>Ð?оказаÑ?Ñ? конÑ?акÑ?Ñ?</b>"
-
-#: ../libedataserverui/e-name-selector-dialog.ui.h:4
-msgid "Address B_ook:"
-msgstr "Ð?дÑ?еÑ?наÑ? к_нига:"
+#: ../libedataserverui/e-name-selector-dialog.c:282
+msgid "Search"
+msgstr "Ð?оиÑ?к"
-#: ../libedataserverui/e-name-selector-dialog.ui.h:5
+#: ../libedataserverui/e-name-selector-dialog.c:285
msgid "Address Book"
msgstr "Ð?дÑ?еÑ?наÑ? книга"
-#: ../libedataserverui/e-name-selector-dialog.ui.h:7
-msgid "Cate_gory:"
-msgstr "Ð?_аÑ?егоÑ?иÑ?:"
-
-#: ../libedataserverui/e-name-selector-dialog.ui.h:8
+#: ../libedataserverui/e-name-selector-dialog.c:288
msgid "Contacts"
msgstr "Ð?онÑ?акÑ?Ñ?"
-#: ../libedataserverui/e-name-selector-dialog.ui.h:9
-msgid "Search"
-msgstr "Ð?оиÑ?к"
+#: ../libedataserverui/e-name-selector-dialog.c:405
+msgid "Select Contacts from Address Book"
+msgstr "Ð?Ñ?боÑ? конÑ?акÑ?ов из адÑ?еÑ?ной книги"
-#: ../libedataserverui/e-name-selector-dialog.ui.h:10
-msgid "_Search:"
-msgstr "_Ð?Ñ?каÑ?Ñ?:"
+#: ../libedataserverui/e-name-selector-dialog.c:740
+msgid "_Add"
+msgstr "_Ð?обавиÑ?Ñ?"
+
+#: ../libedataserverui/e-name-selector-dialog.c:744
+msgid "_Remove"
+msgstr "_УдалиÑ?Ñ?"
+
+#: ../libedataserverui/e-name-selector-dialog.c:884
+#, c-format
+#| msgid "Error reading mail file: %s"
+msgid "Error loading address book: %s"
+msgstr "Ð?Ñ?ибка загÑ?Ñ?зки адÑ?еÑ?ной книги: %s"
#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2508
+#: ../libedataserverui/e-name-selector-entry.c:2665
#, c-format
msgid "E_xpand %s Inline"
msgstr "_РазвеÑ?нÑ?Ñ?Ñ? %s"
#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2523
+#: ../libedataserverui/e-name-selector-entry.c:2680
#, c-format
msgid "Cop_y %s"
msgstr "Ð?_опиÑ?оваÑ?Ñ? %s"
#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2533
+#: ../libedataserverui/e-name-selector-entry.c:2690
#, c-format
msgid "C_ut %s"
msgstr "Ð?_Ñ?Ñ?езаÑ?Ñ? %s"
#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2550
+#: ../libedataserverui/e-name-selector-entry.c:2707
#, c-format
msgid "_Edit %s"
msgstr "_Ð?Ñ?авка %s"
-#: ../libedataserverui/e-name-selector-list.c:469
+#: ../libedataserverui/e-name-selector-list.c:513
#, c-format
msgid "_Delete %s"
msgstr "_УдалиÑ?Ñ? %s"
-#: ../libedataserverui/e-passwords.c:234
+#: ../libedataserverui/e-passwords.c:127
#, c-format
msgid "Keyring key is unusable: no user or host name"
msgstr "Ð?лÑ?Ñ? из бÑ?елока некоÑ?Ñ?екÑ?ен: оÑ?Ñ?Ñ?Ñ?Ñ?Ñ?вÑ?еÑ? имÑ? полÑ?зоваÑ?елÑ? или Ñ?зла"
-#: ../libedataserverui/e-passwords.c:1093
+#: ../libedataserverui/e-passwords.c:701
msgid "You have the Caps Lock key on."
msgstr "Ð?а клавиаÑ?Ñ?Ñ?е вклÑ?Ñ?Ñ?н Caps Lock."
-#: ../libedataserverui/e-passwords.c:1215
+#: ../libedataserverui/e-passwords.c:821
msgid "_Remember this passphrase"
msgstr "_Ð?апомниÑ?Ñ? Ñ?Ñ?Ñ? клÑ?Ñ?евÑ?Ñ? Ñ?Ñ?азÑ?"
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:822
msgid "_Remember this passphrase for the remainder of this session"
msgstr "_Ð?апомниÑ?Ñ? Ñ?Ñ?оÑ? паÑ?олÑ? до оконÑ?аниÑ? Ñ?Ñ?ого Ñ?еанÑ?а"
-#: ../libedataserverui/e-passwords.c:1221
+#: ../libedataserverui/e-passwords.c:827
msgid "_Remember this password"
msgstr "_Ð?апомниÑ?Ñ? Ñ?Ñ?оÑ? паÑ?олÑ?"
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:828
msgid "_Remember this password for the remainder of this session"
-msgstr "_Ð?апомниÑ?Ñ? Ñ?Ñ?оÑ? паÑ?олÑ? до конÑ?а Ñ?еÑ?Ñ?ии"
+msgstr "_Ð?апомниÑ?Ñ? Ñ?Ñ?оÑ? паÑ?олÑ? до конÑ?а Ñ?еанÑ?а"
#. prepare the dialog
#: ../libedataserverui/e-source-selector-dialog.c:100
msgid "Select destination"
msgstr "Ð?Ñ?беÑ?иÑ?е назнаÑ?ение"
-#: ../libedataserverui/e-source-selector-dialog.c:156
+#: ../libedataserverui/e-source-selector-dialog.c:170
msgid "_Destination"
msgstr "_Ð?азнаÑ?ение"
#: ../servers/groupwise/e-gw-connection.c:227
msgid "Invalid connection"
-msgstr "Ð?екоÑ?Ñ?екÑ?ное Ñ?оединение"
+msgstr "Ð?едопÑ?Ñ?Ñ?имое Ñ?оединение"
#: ../servers/groupwise/e-gw-connection.c:231
msgid "Invalid response from server"
-msgstr "Ð?евеÑ?нÑ?й оÑ?веÑ? оÑ? Ñ?еÑ?веÑ?а"
+msgstr "Ð?едопÑ?Ñ?Ñ?имÑ?й оÑ?веÑ? оÑ? Ñ?еÑ?веÑ?а"
#: ../servers/groupwise/e-gw-connection.c:233
msgid "No response from the server"
@@ -5115,4 +5291,5 @@ msgstr "Ð?еÑ? оÑ?веÑ?а оÑ? Ñ?еÑ?веÑ?а"
#: ../servers/groupwise/e-gw-connection.c:239
msgid "Bad parameter"
-msgstr "Ð?лоÑ?ой паÑ?амеÑ?Ñ?"
+msgstr "Ð?евеÑ?нÑ?й паÑ?амеÑ?Ñ?"
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]