[evolution-data-server/gnome-2-28] Updated Russian translation



commit 153056c911228f6932b8adca94cbf1f672c81e9c
Author: Leonid Kanter <leon asplinux ru>
Date:   Tue Oct 20 12:18:26 2009 +0300

    Updated Russian translation

 po/ru.po | 1843 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 928 insertions(+), 915 deletions(-)
---
diff --git a/po/ru.po b/po/ru.po
index 6caeaf8..1ef6588 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-15 20:29+0300\n"
-"PO-Revision-Date: 2009-03-15 16:17+0300\n"
+"POT-Creation-Date: 2009-10-20 12:18+0300\n"
+"PO-Revision-Date: 2009-10-08 21:21+0400\n"
 "Last-Translator: Yuriy Penkin <yuriy penkin gmail com>\n"
 "Language-Team: Russian <gnome-cyr gnome org>\n"
 "MIME-Version: 1.0\n"
@@ -20,62 +20,62 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../addressbook/backends/file/e-book-backend-file.c:560
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2391
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2329
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
 msgid "Loading..."
 msgstr "Ð?агÑ?Ñ?зка..."
 
 #: ../addressbook/backends/file/e-book-backend-file.c:563
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2322
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2344
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2389
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4288
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2260
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2282
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2327
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4510
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
 msgid "Searching..."
 msgstr "Ð?оиÑ?к..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2759
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4452
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2695
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4674
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "СкаÑ?иваÑ?Ñ?Ñ?Ñ? конÑ?акÑ?Ñ? (%d)... "
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2908
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3093
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3137
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2844
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3028
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3072
 #, c-format
 msgid "Updating contacts cache (%d)... "
 msgstr "Ð?бновлÑ?еÑ?Ñ?Ñ? кÑ?Ñ? конÑ?акÑ?ов (%d)... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:751
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:788
 msgid "Using Distinguished Name (DN)"
 msgstr "Ð?Ñ?полÑ?зÑ?Ñ? оÑ?лиÑ?иÑ?елÑ?ное именÑ? (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:754
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:791
 msgid "Using Email Address"
 msgstr "Ð?Ñ?полÑ?зÑ?Ñ? поÑ?Ñ?овÑ?й адÑ?еÑ?"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1019
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1067
 msgid "Reconnecting to LDAP server..."
 msgstr "Ð?овÑ?оÑ?ное подклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ? LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1617
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1711
 msgid "Adding contact to LDAP server..."
 msgstr "Создание конÑ?акÑ?а на Ñ?еÑ?веÑ?е LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1845
 msgid "Removing contact from LDAP server..."
 msgstr "Удаление конÑ?акÑ?а Ñ? Ñ?еÑ?веÑ?а LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2064
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2282
 msgid "Modifying contact from LDAP server..."
 msgstr "Ð?зменение конÑ?акÑ?а на Ñ?еÑ?веÑ?е LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4148
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4371
 msgid "Receiving LDAP search results..."
 msgstr "Ð?олÑ?Ñ?ение Ñ?езÑ?лÑ?Ñ?аÑ?ов поиÑ?ка Ñ? Ñ?еÑ?веÑ?а LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4310
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4532
 msgid "Error performing search"
 msgstr "Ð?Ñ?ибка вÑ?полнениÑ? поиÑ?ка"
 
@@ -83,93 +83,93 @@ msgstr "Ð?Ñ?ибка вÑ?полнениÑ? поиÑ?ка"
 #. * function names, e.g.
 #. * "e_book_add_contact" on book before
 #. * "e_book_open
-#: ../addressbook/libebook/e-book.c:288 ../addressbook/libebook/e-book.c:292
-#: ../addressbook/libebook/e-book.c:496 ../addressbook/libebook/e-book.c:500
-#: ../addressbook/libebook/e-book.c:639 ../addressbook/libebook/e-book.c:643
-#: ../addressbook/libebook/e-book.c:730 ../addressbook/libebook/e-book.c:734
-#: ../addressbook/libebook/e-book.c:1028 ../addressbook/libebook/e-book.c:1033
-#: ../addressbook/libebook/e-book.c:1211 ../addressbook/libebook/e-book.c:1215
-#: ../addressbook/libebook/e-book.c:1370 ../addressbook/libebook/e-book.c:1374
-#: ../addressbook/libebook/e-book.c:1575 ../addressbook/libebook/e-book.c:1579
-#: ../addressbook/libebook/e-book.c:1818 ../addressbook/libebook/e-book.c:1822
-#: ../addressbook/libebook/e-book.c:2055 ../addressbook/libebook/e-book.c:2059
-#: ../addressbook/libebook/e-book.c:2263 ../addressbook/libebook/e-book.c:2267
-#: ../addressbook/libebook/e-book.c:3454
+#: ../addressbook/libebook/e-book.c:287 ../addressbook/libebook/e-book.c:291
+#: ../addressbook/libebook/e-book.c:495 ../addressbook/libebook/e-book.c:499
+#: ../addressbook/libebook/e-book.c:637 ../addressbook/libebook/e-book.c:641
+#: ../addressbook/libebook/e-book.c:727 ../addressbook/libebook/e-book.c:731
+#: ../addressbook/libebook/e-book.c:1024 ../addressbook/libebook/e-book.c:1029
+#: ../addressbook/libebook/e-book.c:1206 ../addressbook/libebook/e-book.c:1210
+#: ../addressbook/libebook/e-book.c:1365 ../addressbook/libebook/e-book.c:1369
+#: ../addressbook/libebook/e-book.c:1570 ../addressbook/libebook/e-book.c:1574
+#: ../addressbook/libebook/e-book.c:1813 ../addressbook/libebook/e-book.c:1817
+#: ../addressbook/libebook/e-book.c:2050 ../addressbook/libebook/e-book.c:2054
+#: ../addressbook/libebook/e-book.c:2257 ../addressbook/libebook/e-book.c:2261
+#: ../addressbook/libebook/e-book.c:3445
 #, c-format
 msgid "\"%s\" on book before \"%s\""
 msgstr "«%s» в книге пеÑ?ед «%s»"
 
-#: ../addressbook/libebook/e-book.c:301 ../addressbook/libebook/e-book.c:509
-#: ../addressbook/libebook/e-book.c:652 ../addressbook/libebook/e-book.c:743
-#: ../addressbook/libebook/e-book.c:1043 ../addressbook/libebook/e-book.c:1225
-#: ../addressbook/libebook/e-book.c:1384 ../addressbook/libebook/e-book.c:1588
-#: ../addressbook/libebook/e-book.c:1831 ../addressbook/libebook/e-book.c:2069
-#: ../addressbook/libebook/e-book.c:2276 ../addressbook/libebook/e-book.c:2685
-#: ../addressbook/libebook/e-book.c:2883
+#: ../addressbook/libebook/e-book.c:300 ../addressbook/libebook/e-book.c:508
+#: ../addressbook/libebook/e-book.c:650 ../addressbook/libebook/e-book.c:740
+#: ../addressbook/libebook/e-book.c:1039 ../addressbook/libebook/e-book.c:1220
+#: ../addressbook/libebook/e-book.c:1379 ../addressbook/libebook/e-book.c:1583
+#: ../addressbook/libebook/e-book.c:1826 ../addressbook/libebook/e-book.c:2064
+#: ../addressbook/libebook/e-book.c:2270 ../addressbook/libebook/e-book.c:2679
+#: ../addressbook/libebook/e-book.c:2877
 #, c-format
 msgid "book busy"
 msgstr "книга занÑ?Ñ?а"
 
-#: ../addressbook/libebook/e-book.c:332 ../addressbook/libebook/e-book.c:336
-#: ../addressbook/libebook/e-book.c:540 ../addressbook/libebook/e-book.c:544
-#: ../addressbook/libebook/e-book.c:679 ../addressbook/libebook/e-book.c:683
-#: ../addressbook/libebook/e-book.c:770 ../addressbook/libebook/e-book.c:774
-#: ../addressbook/libebook/e-book.c:1070 ../addressbook/libebook/e-book.c:1073
-#: ../addressbook/libebook/e-book.c:1255 ../addressbook/libebook/e-book.c:1258
-#: ../addressbook/libebook/e-book.c:1411 ../addressbook/libebook/e-book.c:1415
-#: ../addressbook/libebook/e-book.c:1624 ../addressbook/libebook/e-book.c:1628
-#: ../addressbook/libebook/e-book.c:1878 ../addressbook/libebook/e-book.c:1882
-#: ../addressbook/libebook/e-book.c:2099 ../addressbook/libebook/e-book.c:2103
-#: ../addressbook/libebook/e-book.c:2302 ../addressbook/libebook/e-book.c:2306
-#: ../addressbook/libebook/e-book.c:2537 ../addressbook/libebook/e-book.c:2711
-#: ../addressbook/libebook/e-book.c:2715 ../addressbook/libebook/e-book.c:2909
-#: ../addressbook/libebook/e-book.c:2913 ../addressbook/libebook/e-book.c:3463
+#: ../addressbook/libebook/e-book.c:331 ../addressbook/libebook/e-book.c:335
+#: ../addressbook/libebook/e-book.c:539 ../addressbook/libebook/e-book.c:543
+#: ../addressbook/libebook/e-book.c:677 ../addressbook/libebook/e-book.c:681
+#: ../addressbook/libebook/e-book.c:767 ../addressbook/libebook/e-book.c:771
+#: ../addressbook/libebook/e-book.c:1066 ../addressbook/libebook/e-book.c:1069
+#: ../addressbook/libebook/e-book.c:1250 ../addressbook/libebook/e-book.c:1253
+#: ../addressbook/libebook/e-book.c:1406 ../addressbook/libebook/e-book.c:1410
+#: ../addressbook/libebook/e-book.c:1619 ../addressbook/libebook/e-book.c:1623
+#: ../addressbook/libebook/e-book.c:1873 ../addressbook/libebook/e-book.c:1877
+#: ../addressbook/libebook/e-book.c:2094 ../addressbook/libebook/e-book.c:2098
+#: ../addressbook/libebook/e-book.c:2296 ../addressbook/libebook/e-book.c:2300
+#: ../addressbook/libebook/e-book.c:2531 ../addressbook/libebook/e-book.c:2705
+#: ../addressbook/libebook/e-book.c:2709 ../addressbook/libebook/e-book.c:2903
+#: ../addressbook/libebook/e-book.c:2907 ../addressbook/libebook/e-book.c:3454
 #, c-format
 msgid "CORBA exception making \"%s\" call"
 msgstr "Ð?Ñ?клÑ?Ñ?ение CORBA в пÑ?оÑ?еÑ?Ñ?е вÑ?зова «%s»"
 
-#: ../addressbook/libebook/e-book.c:2526
+#: ../addressbook/libebook/e-book.c:2520
 #, c-format
 msgid "%s: there is no current operation"
 msgstr "%s: неÑ? Ñ?екÑ?Ñ?ей опеÑ?аÑ?ии"
 
-#: ../addressbook/libebook/e-book.c:2555 ../addressbook/libebook/e-book.c:2600
-#: ../addressbook/libebook/e-book.c:2639
+#: ../addressbook/libebook/e-book.c:2549 ../addressbook/libebook/e-book.c:2594
+#: ../addressbook/libebook/e-book.c:2633
 #, c-format
 msgid "%s: could not cancel"
 msgstr "%s: невозможно оÑ?мениÑ?Ñ?"
 
-#: ../addressbook/libebook/e-book.c:2671 ../addressbook/libebook/e-book.c:2675
+#: ../addressbook/libebook/e-book.c:2665 ../addressbook/libebook/e-book.c:2669
 #, c-format
 msgid "\"%s\" on book after \"%s\""
 msgstr "«%s» в книге поÑ?ле «%s»"
 
-#: ../addressbook/libebook/e-book.c:2739
+#: ../addressbook/libebook/e-book.c:2733
 #, c-format
 msgid "%s: canceled"
 msgstr "%s: оÑ?менено"
 
-#: ../addressbook/libebook/e-book.c:3318
+#: ../addressbook/libebook/e-book.c:3310
 #, c-format
 msgid "%s: Invalid source."
 msgstr "%s: Ð?евеÑ?нÑ?й иÑ?Ñ?оÑ?ник."
 
-#: ../addressbook/libebook/e-book.c:3326 ../addressbook/libebook/e-book.c:3392
+#: ../addressbook/libebook/e-book.c:3318 ../addressbook/libebook/e-book.c:3383
 #, c-format
 msgid "%s: no factories available for URI `%s'"
 msgstr "%s: неÑ? доÑ?Ñ?Ñ?пнÑ?Ñ? Ñ?абÑ?ик длÑ? URI «%s»"
 
-#: ../addressbook/libebook/e-book.c:3338
+#: ../addressbook/libebook/e-book.c:3329
 #, c-format
 msgid "%s: Could not create EBookListener"
 msgstr "%s: Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? EBookListener"
 
-#: ../addressbook/libebook/e-book.c:3605
+#: ../addressbook/libebook/e-book.c:3595
 #, c-format
 msgid "%s: there was no self contact UID stored in gconf"
 msgstr "%s: UID Ñ?воего конÑ?акÑ?а не Ñ?оÑ?Ñ?анен в gconf"
 
-#: ../addressbook/libebook/e-book.c:3738
+#: ../addressbook/libebook/e-book.c:3727
 #, c-format
 msgid "%s: there was no source for uid `%s' stored in gconf."
 msgstr "%s: иÑ?Ñ?оÑ?ник длÑ? uid «%s» не Ñ?оÑ?Ñ?анен в gconf."
@@ -360,7 +360,7 @@ msgstr "URL веблога"
 
 #. Contact categories
 #: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:517
+#: ../libedataserverui/e-categories-dialog.c:609
 msgid "Categories"
 msgstr "Ð?аÑ?егоÑ?ии"
 
@@ -626,7 +626,7 @@ msgstr "Ð?аÑ?а Ñ?ождениÑ?"
 
 #: ../addressbook/libebook/e-contact.c:260
 #: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
-#: ../libedataserver/e-categories.c:43
+#: ../libedataserver/e-categories.c:45
 msgid "Anniversary"
 msgstr "Ð?одовÑ?ина"
 
@@ -710,7 +710,7 @@ msgid "Unnamed List"
 msgstr "Ð?езÑ?мÑ?ннÑ?й Ñ?пиÑ?ок"
 
 #: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
-#: ../libedataserver/e-categories.c:44
+#: ../libedataserver/e-categories.c:46
 msgid "Birthday"
 msgstr "Ð?енÑ? Ñ?ождениÑ?"
 
@@ -724,274 +724,274 @@ msgstr "Ð?енÑ? Ñ?ождениÑ?: %s"
 msgid "Anniversary: %s"
 msgstr "Ð?одовÑ?ина: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:212
+#: ../calendar/backends/file/e-cal-backend-file.c:234
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оÑ?Ñ?аниÑ?Ñ? даннÑ?е календаÑ?Ñ?: Ð?евеÑ?нÑ?й URI."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:219
-#: ../calendar/backends/file/e-cal-backend-file.c:225
+#: ../calendar/backends/file/e-cal-backend-file.c:241
+#: ../calendar/backends/file/e-cal-backend-file.c:247
 msgid "Cannot save calendar data"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оÑ?Ñ?аниÑ?Ñ? даннÑ?е календаÑ?Ñ?"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:337
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:344
 msgid "Could not create thread for getting deltas"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? поÑ?ок длÑ? полÑ?Ñ?ениÑ? Ñ?аÑ?Ñ?ождений"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:369
-#: ../calendar/backends/google/e-cal-backend-google.c:1192
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1053
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1352
-#: ../calendar/backends/http/e-cal-backend-http.c:561
-#: ../calendar/backends/weather/e-cal-backend-weather.c:484
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:376
+#: ../calendar/backends/google/e-cal-backend-google.c:1189
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1080
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1381
+#: ../calendar/backends/http/e-cal-backend-http.c:659
+#: ../calendar/backends/weather/e-cal-backend-weather.c:486
 msgid "Could not create cache file"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? Ñ?айл кÑ?Ñ?а"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:382
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:389
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1093
 msgid "Could not create thread for populating cache"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? поÑ?ок длÑ? заполнениÑ? кÑ?Ñ?а"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1055
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1918
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2078
 msgid "Reply Requested: by "
 msgstr "Ð?апÑ?оÑ?ен оÑ?веÑ?: "
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1060
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1923
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2083
 msgid "Reply Requested: When convenient"
 msgstr "Ð?апÑ?оÑ?ен оÑ?веÑ?: Ð?огда Ñ?добно"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:277
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:281
 #, c-format
 msgid "Loading %s items"
 msgstr "Ð?агÑ?Ñ?жаÑ?Ñ?Ñ?Ñ? %s Ñ?леменÑ?ов"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:918
 #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
 msgid "Calendar"
 msgstr "Ð?алендаÑ?Ñ?"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:976
 msgid "Invalid server URI"
 msgstr "Ð?евеÑ?нÑ?й URI Ñ?еÑ?веÑ?а"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:966
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1071
-#: ../calendar/libecal/e-cal.c:5098
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:995
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1004
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1098
+#: ../calendar/libecal/e-cal.c:5115
 #: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1156
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1188
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1226
-#: ../camel/providers/groupwise/camel-groupwise-store.c:588
-#: ../camel/providers/groupwise/camel-groupwise-store.c:753
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:184
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1291
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1327
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1342
+#: ../camel/providers/groupwise/camel-groupwise-store.c:598
+#: ../camel/providers/groupwise/camel-groupwise-store.c:773
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:181
 msgid "Authentication failed"
 msgstr "Сбой пÑ?овеÑ?ки подлинноÑ?Ñ?и"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:268
+#: ../calendar/backends/http/e-cal-backend-http.c:316
 msgid "Redirected to Invalid URI"
 msgstr "Ð?еÑ?еадÑ?еÑ?ован на недопÑ?Ñ?Ñ?имÑ?й URI"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:289
+#: ../calendar/backends/http/e-cal-backend-http.c:339
 msgid "Bad file format."
 msgstr "Ð?евеÑ?нÑ?й Ñ?оÑ?маÑ? Ñ?айла."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:295
+#: ../calendar/backends/http/e-cal-backend-http.c:346
 msgid "Not a calendar."
 msgstr "Ð?е Ñ?влÑ?еÑ?Ñ?Ñ? календаÑ?ем."
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:149
+#: ../calendar/backends/weather/e-cal-backend-weather.c:150
 msgid "Could not retrieve weather data"
 msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? даннÑ?е погодÑ?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:246
+#: ../calendar/backends/weather/e-cal-backend-weather.c:247
 msgid "Weather: Fog"
 msgstr "Ð?огода: ТÑ?ман"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
+#: ../calendar/backends/weather/e-cal-backend-weather.c:248
 msgid "Weather: Cloudy"
 msgstr "Ð?огода: Ð?блаÑ?но"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
+#: ../calendar/backends/weather/e-cal-backend-weather.c:249
 msgid "Weather: Cloudy Night"
 msgstr "Ð?огода: Ð?блаÑ?наÑ? ноÑ?Ñ?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
+#: ../calendar/backends/weather/e-cal-backend-weather.c:250
 msgid "Weather: Overcast"
 msgstr "Ð?огода: Ð?аÑ?мÑ?Ñ?но"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
+#: ../calendar/backends/weather/e-cal-backend-weather.c:251
 msgid "Weather: Showers"
 msgstr "Ð?огода: Ð?ожди"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:252
 msgid "Weather: Snow"
 msgstr "Ð?огода: Снег"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:253
 msgid "Weather: Sunny"
 msgstr "Ð?огода: СолнеÑ?но"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:254
 msgid "Weather: Clear Night"
 msgstr "Ð?огода: ЯÑ?наÑ? ноÑ?Ñ?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:255
 msgid "Weather: Thunderstorms"
 msgstr "Ð?огода: Ð?Ñ?озÑ?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:399
+#: ../calendar/backends/weather/e-cal-backend-weather.c:400
 msgid "Forecast"
 msgstr "Ð?Ñ?огноз"
 
-#: ../calendar/libecal/e-cal-component.c:1322
+#: ../calendar/libecal/e-cal-component.c:1320
 msgid "Untitled appointment"
 msgstr "Ð?еозаглавленнаÑ? вÑ?Ñ?Ñ?еÑ?а"
 
-#: ../calendar/libecal/e-cal-recur.c:4041
+#: ../calendar/libecal/e-cal-recur.c:3945
 msgid "1st"
 msgstr "1-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4042
+#: ../calendar/libecal/e-cal-recur.c:3946
 msgid "2nd"
 msgstr "2-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4043
+#: ../calendar/libecal/e-cal-recur.c:3947
 msgid "3rd"
 msgstr "3-е"
 
-#: ../calendar/libecal/e-cal-recur.c:4044
+#: ../calendar/libecal/e-cal-recur.c:3948
 msgid "4th"
 msgstr "4-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4045
+#: ../calendar/libecal/e-cal-recur.c:3949
 msgid "5th"
 msgstr "5-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:3950
 msgid "6th"
 msgstr "6-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:3951
 msgid "7th"
 msgstr "7-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:3952
 msgid "8th"
 msgstr "8-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:3953
 msgid "9th"
 msgstr "9-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:3954
 msgid "10th"
 msgstr "10-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:3955
 msgid "11th"
 msgstr "11-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:3956
 msgid "12th"
 msgstr "12-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:3957
 msgid "13th"
 msgstr "13-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:3958
 msgid "14th"
 msgstr "14-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:3959
 msgid "15th"
 msgstr "15-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:3960
 msgid "16th"
 msgstr "16-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:3961
 msgid "17th"
 msgstr "17-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:3962
 msgid "18th"
 msgstr "18-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:3963
 msgid "19th"
 msgstr "19-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:3964
 msgid "20th"
 msgstr "20-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:3965
 msgid "21st"
 msgstr "21-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:3966
 msgid "22nd"
 msgstr "22-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:3967
 msgid "23rd"
 msgstr "23-е"
 
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:3968
 msgid "24th"
 msgstr "24-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:3969
 msgid "25th"
 msgstr "25-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:3970
 msgid "26th"
 msgstr "26-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4067
+#: ../calendar/libecal/e-cal-recur.c:3971
 msgid "27th"
 msgstr "27-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4068
+#: ../calendar/libecal/e-cal-recur.c:3972
 msgid "28th"
 msgstr "28-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4069
+#: ../calendar/libecal/e-cal-recur.c:3973
 msgid "29th"
 msgstr "29-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4070
+#: ../calendar/libecal/e-cal-recur.c:3974
 msgid "30th"
 msgstr "30-ое"
 
-#: ../calendar/libecal/e-cal-recur.c:4071
+#: ../calendar/libecal/e-cal-recur.c:3975
 msgid "31st"
 msgstr "31-ое"
 
-#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:713
+#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:712
 msgid "High"
 msgstr "Ð?Ñ?Ñ?окий"
 
-#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:715
+#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:714
 msgid "Normal"
 msgstr "Ð?оÑ?малÑ?нÑ?й"
 
-#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:717
+#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:716
 msgid "Low"
 msgstr "Ð?изкий"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:711
+#: ../calendar/libecal/e-cal-util.c:710
 msgid "Undefined"
 msgstr "Ð?еопÑ?еделено"
 
-#: ../calendar/libecal/e-cal.c:1677 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1693 ../libedataserverui/e-book-auth-util.c:199
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Ð?ведиÑ?е паÑ?олÑ? длÑ? %s (полÑ?зоваÑ?елÑ? %s)"
@@ -1000,112 +1000,112 @@ 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:1691
+#: ../calendar/libecal/e-cal.c:1707
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "Ð?ведиÑ?е паÑ?олÑ? к %s длÑ? вклÑ?Ñ?ениÑ? пÑ?окÑ?и длÑ? полÑ?зоваÑ?елÑ? %s"
 
-#: ../calendar/libecal/e-cal.c:5070
+#: ../calendar/libecal/e-cal.c:5087
 msgid "Invalid argument"
 msgstr "Ð?едопÑ?Ñ?Ñ?имÑ?й аÑ?гÑ?менÑ?"
 
-#: ../calendar/libecal/e-cal.c:5072
+#: ../calendar/libecal/e-cal.c:5089
 msgid "Backend is busy"
 msgstr "Ð?омпоненÑ? занÑ?Ñ?"
 
-#: ../calendar/libecal/e-cal.c:5074
+#: ../calendar/libecal/e-cal.c:5091
 #: ../calendar/libedata-cal/e-cal-backend-util.c:105
 msgid "Repository is offline"
 msgstr "РепозиÑ?оÑ?ий оÑ?клÑ?Ñ?ен оÑ? Ñ?еÑ?и"
 
-#: ../calendar/libecal/e-cal.c:5076
+#: ../calendar/libecal/e-cal.c:5093
 #: ../calendar/libedata-cal/e-cal-backend-util.c:129
 msgid "No such calendar"
 msgstr "Ð?еÑ? Ñ?акого календаÑ?Ñ?"
 
-#: ../calendar/libecal/e-cal.c:5078
+#: ../calendar/libecal/e-cal.c:5095
 #: ../calendar/libedata-cal/e-cal-backend-util.c:111
 #: ../servers/groupwise/e-gw-connection.c:233
 msgid "Object not found"
 msgstr "Ð?бÑ?екÑ? не найден"
 
-#: ../calendar/libecal/e-cal.c:5080
+#: ../calendar/libecal/e-cal.c:5097
 #: ../calendar/libedata-cal/e-cal-backend-util.c:113
 #: ../servers/groupwise/e-gw-connection.c:227
 msgid "Invalid object"
 msgstr "Ð?евеÑ?нÑ?й обÑ?екÑ?"
 
-#: ../calendar/libecal/e-cal.c:5082
+#: ../calendar/libecal/e-cal.c:5099
 msgid "URI not loaded"
 msgstr "URI не загÑ?Ñ?жен"
 
-#: ../calendar/libecal/e-cal.c:5084
+#: ../calendar/libecal/e-cal.c:5101
 msgid "URI already loaded"
 msgstr "URI Ñ?же загÑ?Ñ?жен"
 
-#: ../calendar/libecal/e-cal.c:5086
+#: ../calendar/libecal/e-cal.c:5103
 #: ../calendar/libedata-cal/e-cal-backend-util.c:107
-#: ../servers/exchange/storage/e-storage.c:571
+#: ../servers/exchange/storage/e-storage.c:573
 msgid "Permission denied"
 msgstr "Ð?оÑ?Ñ?Ñ?п запÑ?еÑ?ен"
 
-#: ../calendar/libecal/e-cal.c:5088
+#: ../calendar/libecal/e-cal.c:5105
 #: ../calendar/libedata-cal/e-cal-backend-util.c:131
 #: ../servers/groupwise/e-gw-connection.c:235
 msgid "Unknown User"
 msgstr "Ð?еизвеÑ?Ñ?нÑ?й полÑ?зоваÑ?елÑ?"
 
-#: ../calendar/libecal/e-cal.c:5090
+#: ../calendar/libecal/e-cal.c:5107
 #: ../calendar/libedata-cal/e-cal-backend-util.c:115
 msgid "Object ID already exists"
 msgstr "Ð?денÑ?иÑ?икаÑ?оÑ? обÑ?екÑ?а Ñ?же Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?"
 
-#: ../calendar/libecal/e-cal.c:5092
+#: ../calendar/libecal/e-cal.c:5109
 msgid "Protocol not supported"
 msgstr "Ð?Ñ?оÑ?окол не поддеÑ?живаеÑ?Ñ?Ñ?"
 
-#: ../calendar/libecal/e-cal.c:5094
+#: ../calendar/libecal/e-cal.c:5111
 msgid "Operation has been canceled"
 msgstr "Ð?пеÑ?аÑ?иÑ? бÑ?ла оÑ?менена"
 
-#: ../calendar/libecal/e-cal.c:5096
+#: ../calendar/libecal/e-cal.c:5113
 #: ../calendar/libedata-cal/e-cal-backend-util.c:143
 msgid "Could not cancel operation"
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?мениÑ?Ñ? опеÑ?аÑ?иÑ?"
 
-#: ../calendar/libecal/e-cal.c:5100
+#: ../calendar/libecal/e-cal.c:5117
 #: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:218
+#: ../camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication required"
 msgstr "ТÑ?ебÑ?еÑ?Ñ?Ñ? аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?"
 
-#: ../calendar/libecal/e-cal.c:5102
+#: ../calendar/libecal/e-cal.c:5119
 msgid "A CORBA exception has occurred"
 msgstr "Ð?Ñ?оизоÑ?ло иÑ?клÑ?Ñ?ение CORBA"
 
-#: ../calendar/libecal/e-cal.c:5104
+#: ../calendar/libecal/e-cal.c:5121
 #: ../calendar/libedata-cal/e-cal-backend-util.c:146
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/imap/camel-imap-command.c:434
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
+#: ../camel/providers/imap/camel-imap-command.c:432
 #: ../camel/providers/imap/camel-imap-store.c:743
-#: ../camel/providers/imap4/camel-imap4-engine.c:1570
-#: ../camel/providers/imap4/camel-imap4-engine.c:1609
-#: ../camel/providers/imap4/camel-imap4-engine.c:1654
-#: ../camel/providers/imap4/camel-imap4-engine.c:1710
-#: ../camel/providers/imap4/camel-imap4-store.c:315
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
-#: ../camel/providers/pop3/camel-pop3-store.c:554
-#: ../camel/providers/pop3/camel-pop3-store.c:561
-#: ../camel/providers/pop3/camel-pop3-store.c:567
-#: ../servers/exchange/storage/e-storage.c:585
+#: ../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:552
+#: ../camel/providers/pop3/camel-pop3-store.c:559
+#: ../camel/providers/pop3/camel-pop3-store.c:565
+#: ../servers/exchange/storage/e-storage.c:587
 #: ../servers/groupwise/e-gw-connection.c:241
 msgid "Unknown error"
 msgstr "Ð?еизвеÑ?Ñ?наÑ? оÑ?ибка"
 
-#: ../calendar/libecal/e-cal.c:5106
+#: ../calendar/libecal/e-cal.c:5123
 #: ../calendar/libedata-cal/e-cal-backend-util.c:103
-#: ../servers/exchange/storage/e-storage.c:553
+#: ../servers/exchange/storage/e-storage.c:555
 msgid "No error"
 msgstr "Ð?еÑ? оÑ?ибки"
 
@@ -1293,16 +1293,16 @@ msgstr "ЭкÑ?поÑ?Ñ? клÑ?Ñ?ей не поддеÑ?живаеÑ?Ñ?Ñ? Ñ?Ñ?им 
 msgid "Unable to create cache path"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? пÑ?Ñ?Ñ? длÑ? кÑ?Ñ?а"
 
-#: ../camel/camel-data-cache.c:403
+#: ../camel/camel-data-cache.c:402
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?далиÑ?Ñ? кÑ?Ñ?иÑ?ованнÑ?й Ñ?леменÑ?: %s: %s"
 
-#: ../camel/camel-db.c:390
+#: ../camel/camel-db.c:412
 msgid "Insufficient memory"
 msgstr "Ð?едоÑ?Ñ?аÑ?оÑ?но памÑ?Ñ?и"
 
-#: ../camel/camel-disco-diary.c:198
+#: ../camel/camel-disco-diary.c:197
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1313,8 +1313,8 @@ msgstr ""
 "Ð?алÑ?нейÑ?ие опеÑ?аÑ?ии не бÑ?дÑ?Ñ? запиÑ?анÑ? и, Ñ?ооÑ?веÑ?Ñ?Ñ?венно, не бÑ?дÑ?Ñ?\n"
 "воÑ?пÑ?оизведенÑ? поÑ?ле подклÑ?Ñ?ениÑ? к Ñ?еÑ?веÑ?Ñ?."
 
-#: ../camel/camel-disco-diary.c:261
-#: ../camel/providers/imap/camel-imap-journal.c:318
+#: ../camel/camel-disco-diary.c:260
+#: ../camel/providers/imap/camel-imap-journal.c:320
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1325,114 +1325,114 @@ msgstr ""
 "%s\n"
 "Ð?зменениÑ?, Ñ?деланнÑ?е в Ñ?Ñ?ой папке, не бÑ?дÑ?Ñ? Ñ?инÑ?Ñ?онизиÑ?ованÑ?."
 
-#: ../camel/camel-disco-diary.c:297
+#: ../camel/camel-disco-diary.c:296
 msgid "Resynchronizing with server"
 msgstr "СинÑ?Ñ?онизаÑ?иÑ? Ñ? Ñ?еÑ?веÑ?ом"
 
-#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:52
+#: ../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:111
+#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:107
 msgid "Downloading new messages for offline mode"
 msgstr "Ð?овÑ?е Ñ?ообÑ?ениÑ? загÑ?Ñ?жаÑ?Ñ?Ñ?Ñ? длÑ? авÑ?ономной Ñ?абоÑ?Ñ?"
 
-#: ../camel/camel-disco-folder.c:469
+#: ../camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Ð?одгоÑ?овка папки «%s» длÑ? авÑ?ономной Ñ?абоÑ?Ñ?"
 
-#: ../camel/camel-disco-store.c:403
-#: ../camel/providers/groupwise/camel-groupwise-store.c:226
+#: ../camel/camel-disco-store.c:400
+#: ../camel/providers/groupwise/camel-groupwise-store.c:223
 #: ../camel/providers/imap/camel-imap-store.c:1003
 #: ../camel/providers/imap/camel-imap-store.c:1813
 #: ../camel/providers/imap/camel-imap-store.c:2229
-#: ../camel/providers/imap/camel-imap-store.c:2997
+#: ../camel/providers/imap/camel-imap-store.c:3014
 msgid "You must be working online to complete this operation"
 msgstr "Ð?лÑ? завеÑ?Ñ?ениÑ? данной опеÑ?аÑ?ии необÑ?одимо подклÑ?Ñ?ение к Ñ?еÑ?и"
 
-#: ../camel/camel-exception.c:262
+#: ../camel/camel-exception.c:260
 msgid "No description available"
 msgstr "Ð?пиÑ?ание недоÑ?Ñ?Ñ?пно"
 
-#: ../camel/camel-filter-driver.c:795 ../camel/camel-filter-search.c:581
+#: ../camel/camel-filter-driver.c:794 ../camel/camel-filter-search.c:579
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Сбой пÑ?и Ñ?оздании доÑ?еÑ?него пÑ?оÑ?еÑ?Ñ?а «%s»: %s"
 
-#: ../camel/camel-filter-driver.c:837
+#: ../camel/camel-filter-driver.c:836
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ð?евеÑ?нÑ?й поÑ?ок Ñ?ообÑ?ений полÑ?Ñ?ен из %s: %s"
 
-#: ../camel/camel-filter-driver.c:1026 ../camel/camel-filter-driver.c:1035
+#: ../camel/camel-filter-driver.c:1025 ../camel/camel-filter-driver.c:1034
 msgid "Syncing folders"
 msgstr "СинÑ?Ñ?онизаÑ?иÑ? папок"
 
-#: ../camel/camel-filter-driver.c:1124 ../camel/camel-filter-driver.c:1530
+#: ../camel/camel-filter-driver.c:1121 ../camel/camel-filter-driver.c:1522
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?азобÑ?аÑ?Ñ? Ñ?илÑ?Ñ?Ñ?: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1133 ../camel/camel-filter-driver.c:1539
+#: ../camel/camel-filter-driver.c:1130 ../camel/camel-filter-driver.c:1531
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Ð?Ñ?ибка вÑ?полнениÑ? Ñ?илÑ?Ñ?Ñ?а: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1221
+#: ../camel/camel-filter-driver.c:1216
 msgid "Unable to open spool folder"
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? папкÑ? Ñ?пÑ?ла"
 
-#: ../camel/camel-filter-driver.c:1230
+#: ../camel/camel-filter-driver.c:1225
 msgid "Unable to process spool folder"
 msgstr "Ð?е Ñ?далоÑ?Ñ? обÑ?абоÑ?аÑ?Ñ? папкÑ? Ñ?пÑ?ла"
 
-#: ../camel/camel-filter-driver.c:1246
+#: ../camel/camel-filter-driver.c:1241
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Ð?олÑ?Ñ?ение Ñ?ообÑ?ениÑ? %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1250
+#: ../camel/camel-filter-driver.c:1245
 msgid "Cannot open message"
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? Ñ?ообÑ?ение"
 
-#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1269
+#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1264
 #, c-format
 msgid "Failed on message %d"
 msgstr "Сбой на Ñ?ообÑ?ении %d"
 
-#: ../camel/camel-filter-driver.c:1283 ../camel/camel-filter-driver.c:1374
+#: ../camel/camel-filter-driver.c:1278 ../camel/camel-filter-driver.c:1368
 msgid "Syncing folder"
 msgstr "СинÑ?Ñ?онизаÑ?иÑ? папки"
 
-#: ../camel/camel-filter-driver.c:1287 ../camel/camel-filter-driver.c:1379
+#: ../camel/camel-filter-driver.c:1282 ../camel/camel-filter-driver.c:1373
 msgid "Complete"
 msgstr "Ð?авеÑ?Ñ?ена"
 
-#: ../camel/camel-filter-driver.c:1344
+#: ../camel/camel-filter-driver.c:1338
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Ð?олÑ?Ñ?ение Ñ?ообÑ?ениÑ? %d из %d"
 
-#: ../camel/camel-filter-driver.c:1359
+#: ../camel/camel-filter-driver.c:1353
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Сбой на Ñ?ообÑ?ении %d из %d"
 
-#: ../camel/camel-filter-search.c:138
+#: ../camel/camel-filter-search.c:137
 msgid "Failed to retrieve message"
 msgstr "Сбой пÑ?и полÑ?Ñ?ении Ñ?ообÑ?ениÑ?"
 
-#: ../camel/camel-filter-search.c:401
+#: ../camel/camel-filter-search.c:399
 msgid "Invalid arguments to (system-flag)"
 msgstr "Ð?едопÑ?Ñ?Ñ?имÑ?е аÑ?гÑ?менÑ?Ñ? длÑ? system-flag"
 
-#: ../camel/camel-filter-search.c:416
+#: ../camel/camel-filter-search.c:414
 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:737 ../camel/camel-filter-search.c:745
+#: ../camel/camel-filter-search.c:735 ../camel/camel-filter-search.c:743
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Ð?Ñ?ибка вÑ?полнениÑ? поиÑ?ка Ñ?илÑ?Ñ?Ñ?а: %s: %s"
@@ -1457,72 +1457,72 @@ msgstr ""
 "Ð?Ñ?ибка пÑ?и вÑ?полнении вÑ?Ñ?ажениÑ? поиÑ?ка «%s»:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:853
+#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:852
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) Ñ?Ñ?ебÑ?еÑ? единÑ?Ñ?венного логиÑ?еÑ?кого Ñ?езÑ?лÑ?Ñ?аÑ?а"
 
-#: ../camel/camel-folder-search.c:906
+#: ../camel/camel-folder-search.c:905
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) не позволÑ?еÑ?Ñ?Ñ? внÑ?Ñ?Ñ?и %s"
 
-#: ../camel/camel-folder-search.c:912 ../camel/camel-folder-search.c:919
+#: ../camel/camel-folder-search.c:911 ../camel/camel-folder-search.c:918
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) Ñ?Ñ?ебÑ?еÑ? Ñ?Ñ?Ñ?окÑ? Ñ?ооÑ?веÑ?Ñ?Ñ?виÑ?"
 
-#: ../camel/camel-folder-search.c:946
+#: ../camel/camel-folder-search.c:945
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) ожидаеÑ? Ñ?езÑ?лÑ?Ñ?аÑ? в виде маÑ?Ñ?ива"
 
-#: ../camel/camel-folder-search.c:955
+#: ../camel/camel-folder-search.c:954
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) Ñ?Ñ?ебÑ?еÑ? набоÑ? папок"
 
-#: ../camel/camel-folder.c:696
+#: ../camel/camel-folder.c:683
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Ð?еподдеÑ?живаемаÑ? опеÑ?аÑ?иÑ?: добавиÑ?Ñ? Ñ?ообÑ?ение: длÑ? %s"
 
-#: ../camel/camel-folder.c:1398
+#: ../camel/camel-folder.c:1388
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Ð?еподдеÑ?живаемаÑ? опеÑ?аÑ?иÑ?: поиÑ?к вÑ?Ñ?ажениÑ?: длÑ? %s"
 
-#: ../camel/camel-folder.c:1440
+#: ../camel/camel-folder.c:1429
 #, c-format
 msgid "Unsupported operation: count by expression: for %s"
 msgstr "Ð?еподдеÑ?живаемаÑ? опеÑ?аÑ?иÑ? опÑ?еделениÑ? колиÑ?еÑ?Ñ?ва по вÑ?Ñ?ажениÑ?: длÑ? %s"
 
-#: ../camel/camel-folder.c:1480
+#: ../camel/camel-folder.c:1468
 #, c-format
 msgid "Unsupported operation: search by UIDs: for %s"
 msgstr "Ð?еподдеÑ?живаемаÑ? опеÑ?аÑ?иÑ?: поиÑ?к по UID: длÑ? %s"
 
-#: ../camel/camel-folder.c:1596
+#: ../camel/camel-folder.c:1581
 msgid "Moving messages"
 msgstr "Ð?еÑ?емеÑ?ение Ñ?ообÑ?ений"
 
-#: ../camel/camel-folder.c:1596
+#: ../camel/camel-folder.c:1581
 msgid "Copying messages"
 msgstr "Ð?опиÑ?ование Ñ?ообÑ?ений"
 
-#: ../camel/camel-folder.c:1942
+#: ../camel/camel-folder.c:1922
 msgid "Learning junk"
 msgstr "Ð?зÑ?Ñ?аеÑ?Ñ?Ñ? Ñ?пам"
 
-#: ../camel/camel-folder.c:1959
+#: ../camel/camel-folder.c:1939
 msgid "Learning non-junk"
 msgstr "Ð?зÑ?Ñ?аеÑ?Ñ?Ñ? Ñ?ообÑ?ение, не Ñ?влÑ?Ñ?Ñ?ееÑ?Ñ? Ñ?памом"
 
-#: ../camel/camel-folder.c:1978
+#: ../camel/camel-folder.c:1958
 msgid "Filtering new message(s)"
 msgstr "ФилÑ?Ñ?Ñ?аÑ?иÑ? новÑ?Ñ? Ñ?ообÑ?ений"
 
-#: ../camel/camel-gpg-context.c:755
+#: ../camel/camel-gpg-context.c:751
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1533,22 +1533,22 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:770
+#: ../camel/camel-gpg-context.c:766
 msgid "Failed to parse gpg userid hint."
 msgstr "Ð?Ñ?ибка пÑ?и обÑ?абоÑ?ке подÑ?казки gpg userid."
 
-#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:808
+#: ../camel/camel-gpg-context.c:790 ../camel/camel-gpg-context.c:804
 msgid "Failed to parse gpg passphrase request."
 msgstr "Ð?Ñ?ибка пÑ?и обÑ?абоÑ?ке запÑ?оÑ?а паÑ?олÑ?ной Ñ?Ñ?азÑ? gpg."
 
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:824
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
 "SmartCard: \"%s\""
 msgstr "Ð?лÑ? Ñ?азблокиÑ?ованиÑ? Ñ?маÑ?Ñ?каÑ?Ñ?Ñ? необÑ?одимо ввеÑ?Ñ?и PIN: «%s»"
 
-#: ../camel/camel-gpg-context.c:832
+#: ../camel/camel-gpg-context.c:828
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1557,35 +1557,35 @@ msgstr ""
 "Ð?ведиÑ?е клÑ?Ñ?евÑ?Ñ? Ñ?Ñ?азÑ?, Ñ?Ñ?обÑ? Ñ?азблокиÑ?оваÑ?Ñ?\n"
 "клÑ?Ñ? полÑ?зоваÑ?елÑ?: «%s»"
 
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:833
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "Ð?еожиданнÑ?й запÑ?оÑ? оÑ? GnuPG длÑ? «%s»"
 
-#: ../camel/camel-gpg-context.c:862 ../camel/camel-gpg-context.c:1071
-#: ../camel/providers/nntp/camel-nntp-store.c:1304
+#: ../camel/camel-gpg-context.c:858 ../camel/camel-gpg-context.c:1067
+#: ../camel/providers/nntp/camel-nntp-store.c:1313
 msgid "Canceled."
 msgstr "Ð?Ñ?менено."
 
-#: ../camel/camel-gpg-context.c:876
+#: ../camel/camel-gpg-context.c:872
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Сбой пÑ?и Ñ?азблокиÑ?овании Ñ?екÑ?еÑ?ного клÑ?Ñ?а: Ñ?казано 3 некоÑ?Ñ?екÑ?нÑ?Ñ? паÑ?олÑ?нÑ?Ñ? "
 "Ñ?Ñ?азÑ?."
 
-#: ../camel/camel-gpg-context.c:884
+#: ../camel/camel-gpg-context.c:880
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Ð?еожиданнÑ?й оÑ?веÑ? оÑ? GnuPG: %s"
 
-#: ../camel/camel-gpg-context.c:947
+#: ../camel/camel-gpg-context.c:943
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 "Ð?е Ñ?далоÑ?Ñ? заÑ?иÑ?Ñ?оваÑ?Ñ? Ñ?Ñ?о Ñ?ообÑ?ение: Ð?е опÑ?еделенÑ? коÑ?Ñ?екÑ?нÑ?е полÑ?Ñ?аÑ?ели"
 
 #. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1209 ../camel/camel-gpg-context.c:1337
-#: ../camel/camel-gpg-context.c:1850 ../camel/camel-gpg-context.c:1895
+#: ../camel/camel-gpg-context.c:1212 ../camel/camel-gpg-context.c:1337
+#: ../camel/camel-gpg-context.c:1859 ../camel/camel-gpg-context.c:1904
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Сбой пÑ?и иÑ?полнении gpg: %s"
@@ -1595,10 +1595,11 @@ msgstr "Сбой пÑ?и иÑ?полнении gpg: %s"
 msgid "Could not generate signing data: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?генеÑ?иÑ?оваÑ?Ñ? даннÑ?е подпиÑ?и: %s"
 
-#: ../camel/camel-gpg-context.c:1352 ../camel/camel-gpg-context.c:1554
-#: ../camel/camel-gpg-context.c:1640 ../camel/camel-gpg-context.c:1655
-#: ../camel/camel-gpg-context.c:1771 ../camel/camel-gpg-context.c:1786
-#: ../camel/camel-gpg-context.c:1866 ../camel/camel-gpg-context.c:1911
+#: ../camel/camel-gpg-context.c:1352 ../camel/camel-gpg-context.c:1553
+#: ../camel/camel-gpg-context.c:1569 ../camel/camel-gpg-context.c:1649
+#: ../camel/camel-gpg-context.c:1664 ../camel/camel-gpg-context.c:1780
+#: ../camel/camel-gpg-context.c:1795 ../camel/camel-gpg-context.c:1875
+#: ../camel/camel-gpg-context.c:1920
 msgid "Failed to execute gpg."
 msgstr "Сбой пÑ?и иÑ?полнении gpg."
 
@@ -1606,50 +1607,50 @@ msgstr "Сбой пÑ?и иÑ?полнении gpg."
 msgid "This is a digitally signed message part"
 msgstr "ЭÑ?а Ñ?аÑ?Ñ?Ñ? Ñ?ообÑ?ениÑ? подпиÑ?ана Ñ?иÑ?Ñ?овой подпиÑ?Ñ?Ñ?"
 
-#: ../camel/camel-gpg-context.c:1458 ../camel/camel-gpg-context.c:1464
-#: ../camel/camel-gpg-context.c:1470 ../camel/camel-gpg-context.c:1485
+#: ../camel/camel-gpg-context.c:1457 ../camel/camel-gpg-context.c:1463
+#: ../camel/camel-gpg-context.c:1469 ../camel/camel-gpg-context.c:1484
 #: ../camel/camel-smime-context.c:910 ../camel/camel-smime-context.c:921
 #: ../camel/camel-smime-context.c:928
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?овеÑ?иÑ?Ñ? подпиÑ?Ñ? Ñ?ообÑ?ениÑ?: Ð?евеÑ?нÑ?й Ñ?оÑ?маÑ? Ñ?ообÑ?ениÑ?"
 
-#: ../camel/camel-gpg-context.c:1524
+#: ../camel/camel-gpg-context.c:1523
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Ð?е Ñ?далоÑ?Ñ? пÑ?овеÑ?иÑ?Ñ? подпиÑ?Ñ? Ñ?ообÑ?ениÑ?: Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? вÑ?еменнÑ?й Ñ?айл: %s"
 
-#: ../camel/camel-gpg-context.c:1623
+#: ../camel/camel-gpg-context.c:1632
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?генеÑ?иÑ?оваÑ?Ñ? даннÑ?е Ñ?иÑ?Ñ?ованиÑ?: %s"
 
-#: ../camel/camel-gpg-context.c:1673
+#: ../camel/camel-gpg-context.c:1682
 msgid "This is a digitally encrypted message part"
 msgstr "ЭÑ?о заÑ?иÑ?Ñ?ованнаÑ? Ñ?аÑ?Ñ?Ñ? Ñ?ообÑ?ениÑ?"
 
-#: ../camel/camel-gpg-context.c:1726 ../camel/camel-gpg-context.c:1734
-#: ../camel/camel-gpg-context.c:1753
+#: ../camel/camel-gpg-context.c:1735 ../camel/camel-gpg-context.c:1743
+#: ../camel/camel-gpg-context.c:1762
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Ð?е Ñ?далоÑ?Ñ? декодиÑ?оваÑ?Ñ? Ñ?ообÑ?ение: Ð?евеÑ?нÑ?й Ñ?оÑ?маÑ? Ñ?ообÑ?ениÑ?"
 
-#: ../camel/camel-gpg-context.c:1743
+#: ../camel/camel-gpg-context.c:1752
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Сбой пÑ?и декодиÑ?овании Ñ?аÑ?Ñ?и MIME: оÑ?ибка пÑ?оÑ?окола"
 
-#: ../camel/camel-gpg-context.c:1808 ../camel/camel-smime-context.c:1185
+#: ../camel/camel-gpg-context.c:1817 ../camel/camel-smime-context.c:1186
 msgid "Encrypted content"
 msgstr "Ð?аÑ?иÑ?Ñ?ованное Ñ?одеÑ?жимое"
 
-#: ../camel/camel-gpg-context.c:1827
+#: ../camel/camel-gpg-context.c:1836
 msgid "Unable to parse message content"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?азобÑ?аÑ?Ñ? Ñ?одеÑ?жимое Ñ?ообÑ?ениÑ?"
 
-#: ../camel/camel-gpg-context.c:1851 ../camel/camel-gpg-context.c:1896
-#: ../camel/camel-tcp-stream-openssl.c:635
-#: ../camel/providers/imap4/camel-imap4-utils.c:624
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
-#: ../camel/providers/smtp/camel-smtp-transport.c:221
+#: ../camel/camel-gpg-context.c:1860 ../camel/camel-gpg-context.c:1905
+#: ../camel/camel-tcp-stream-openssl.c:627
+#: ../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 "Ð?еизвеÑ?Ñ?но"
 
@@ -1663,12 +1664,12 @@ msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? канал к блокиÑ?аÑ?оÑ?Ñ?:
 msgid "Cannot fork locking helper: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? запÑ?Ñ?Ñ?иÑ?Ñ? блокиÑ?аÑ?оÑ?: %s"
 
-#: ../camel/camel-lock-client.c:204 ../camel/camel-lock-client.c:227
+#: ../camel/camel-lock-client.c:203 ../camel/camel-lock-client.c:226
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "Ð?е Ñ?далоÑ?Ñ? заблокиÑ?оваÑ?Ñ? «%s»: оÑ?ибка пÑ?оÑ?окола Ñ? блокиÑ?аÑ?оÑ?ом"
 
-#: ../camel/camel-lock-client.c:217
+#: ../camel/camel-lock-client.c:216
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Ð?е Ñ?далоÑ?Ñ? заблокиÑ?оваÑ?Ñ? «%s»"
@@ -1749,54 +1750,54 @@ msgstr "Ð?Ñ?ибка Ñ?оÑ?Ñ?анениÑ? вÑ?еменного поÑ?Ñ?овог
 msgid "Error copying mail temp file: %s"
 msgstr "Ð?Ñ?ибка копиÑ?ованиÑ? вÑ?еменного поÑ?Ñ?ового Ñ?айла: %s"
 
-#: ../camel/camel-multipart-signed.c:593
+#: ../camel/camel-multipart-signed.c:592
 msgid "parse error"
 msgstr "Ð?Ñ?ибка обÑ?абоÑ?ки"
 
-#: ../camel/camel-net-utils.c:505 ../camel/camel-net-utils.c:667
-#: ../camel/camel-net-utils.c:799
-#: ../camel/providers/pop3/camel-pop3-store.c:448
-#: ../camel/providers/pop3/camel-pop3-store.c:548
+#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:674
+#: ../camel/camel-net-utils.c:806
+#: ../camel/providers/pop3/camel-pop3-store.c:446
+#: ../camel/providers/pop3/camel-pop3-store.c:546
 msgid "Canceled"
 msgstr "Ð?Ñ?менено"
 
-#: ../camel/camel-net-utils.c:524
+#: ../camel/camel-net-utils.c:522
 msgid "cannot create thread"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? поÑ?ок"
 
-#: ../camel/camel-net-utils.c:671
+#: ../camel/camel-net-utils.c:678
 #, c-format
 msgid "Resolving: %s"
 msgstr "Ð?оиÑ?к Ñ?зла: %s"
 
-#: ../camel/camel-net-utils.c:693
+#: ../camel/camel-net-utils.c:700
 msgid "Host lookup failed"
 msgstr "Сбой поиÑ?ка Ñ?зла"
 
-#: ../camel/camel-net-utils.c:695
+#: ../camel/camel-net-utils.c:702
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "Сбой поиÑ?ка Ñ?зла: %s: %s"
 
-#: ../camel/camel-net-utils.c:803
+#: ../camel/camel-net-utils.c:810
 msgid "Resolving address"
 msgstr "Ð?оиÑ?к адÑ?еÑ?а"
 
-#: ../camel/camel-net-utils.c:823
+#: ../camel/camel-net-utils.c:830
 msgid "Name lookup failed"
 msgstr "Ð?е Ñ?далоÑ?Ñ? опÑ?еделиÑ?Ñ? Ñ?зел"
 
-#: ../camel/camel-net-utils.c:826
+#: ../camel/camel-net-utils.c:833
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? опÑ?еделиÑ?Ñ? Ñ?зел: %s"
 
-#: ../camel/camel-offline-folder.c:253
+#: ../camel/camel-offline-folder.c:249
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "СинÑ?Ñ?онизаÑ?иÑ? Ñ?ообÑ?ений в папке «%s» на диÑ?к"
 
-#: ../camel/camel-offline-journal.c:164 ../camel/camel-offline-journal.c:187
+#: ../camel/camel-offline-journal.c:159 ../camel/camel-offline-journal.c:182
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? запиÑ?аÑ?Ñ? жÑ?Ñ?нал авÑ?ономной Ñ?абоÑ?Ñ? длÑ? папки «%s»: %s"
@@ -1825,24 +1826,24 @@ msgstr "Ð?е Ñ?далоÑ?Ñ? загÑ?Ñ?зиÑ?Ñ? %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Ð?е Ñ?далоÑ?Ñ? загÑ?Ñ?зиÑ?Ñ? %s: в модÑ?ле неÑ? иниÑ?иализиÑ?Ñ?Ñ?Ñ?его кода."
 
-#: ../camel/camel-provider.c:373 ../camel/camel-session.c:182
+#: ../camel/camel-provider.c:379 ../camel/camel-session.c:182
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "Ð?Ñ?овайдеÑ? длÑ? пÑ?оÑ?окола «%s» не доÑ?Ñ?Ñ?пен"
 
-#: ../camel/camel-sasl-anonymous.c:37
+#: ../camel/camel-sasl-anonymous.c:36
 msgid "Anonymous"
 msgstr "Anonymous"
 
-#: ../camel/camel-sasl-anonymous.c:39
+#: ../camel/camel-sasl-anonymous.c:38
 msgid "This option will connect to the server using an anonymous login."
 msgstr "Ð?Ñ?деÑ? пÑ?оизводиÑ?Ñ?Ñ?Ñ? анонимное (anonymous) подклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ?."
 
-#: ../camel/camel-sasl-anonymous.c:124 ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:121 ../camel/camel-sasl-plain.c:91
 msgid "Authentication failed."
 msgstr "Сбой пÑ?овеÑ?ки подлинноÑ?Ñ?и."
 
-#: ../camel/camel-sasl-anonymous.c:133
+#: ../camel/camel-sasl-anonymous.c:130
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -1851,7 +1852,7 @@ msgstr ""
 "Ð?евеÑ?наÑ? Ñ?Ñ?аÑ?Ñ?иÑ?овоÑ?наÑ? инÑ?оÑ?маÑ?иÑ? Ñ?л.адÑ?еÑ?а:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:145
+#: ../camel/camel-sasl-anonymous.c:142
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1860,7 +1861,7 @@ msgstr ""
 "Ð?евеÑ?наÑ? Ñ?кÑ?Ñ?Ñ?аÑ? Ñ?Ñ?аÑ?Ñ?иÑ?овоÑ?наÑ? инÑ?оÑ?маÑ?иÑ?:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:157
+#: ../camel/camel-sasl-anonymous.c:154
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1893,39 +1894,39 @@ msgstr ""
 "Ð?одклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ? бÑ?деÑ? пÑ?оизводиÑ?Ñ?Ñ?Ñ? Ñ? иÑ?полÑ?зованием заÑ?иÑ?Ñ?ованного "
 "паÑ?олÑ? DIGEST-MD5, еÑ?ли Ñ?еÑ?веÑ? его поддеÑ?живаеÑ?."
 
-#: ../camel/camel-sasl-digest-md5.c:845
+#: ../camel/camel-sasl-digest-md5.c:844
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Ð?Ñ?веÑ? Ñ?еÑ?веÑ?а Ñ?лиÑ?ком длиннÑ?й (>2048 байÑ?)"
 
-#: ../camel/camel-sasl-digest-md5.c:854
+#: ../camel/camel-sasl-digest-md5.c:853
 msgid "Server challenge invalid\n"
 msgstr "Ð?едопÑ?Ñ?Ñ?имÑ?й оÑ?веÑ? Ñ?еÑ?веÑ?а\n"
 
-#: ../camel/camel-sasl-digest-md5.c:860
+#: ../camel/camel-sasl-digest-md5.c:859
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "Ð?Ñ?веÑ? Ñ?еÑ?веÑ?а Ñ?одеÑ?жиÑ? недопÑ?Ñ?Ñ?имÑ?й жеÑ?он \"Ð?аÑ?еÑ?Ñ?во заÑ?иÑ?Ñ?\""
 
-#: ../camel/camel-sasl-digest-md5.c:890
+#: ../camel/camel-sasl-digest-md5.c:889
 msgid "Server response did not contain authorization data"
 msgstr "Ð?Ñ?веÑ? Ñ?еÑ?веÑ?а не Ñ?одеÑ?жиÑ? инÑ?оÑ?маÑ?ии об авÑ?оÑ?изаÑ?ии"
 
-#: ../camel/camel-sasl-digest-md5.c:908
+#: ../camel/camel-sasl-digest-md5.c:907
 msgid "Server response contained incomplete authorization data"
 msgstr "Ð?Ñ?веÑ? Ñ?еÑ?веÑ?а Ñ?одеÑ?жиÑ? неполнÑ?Ñ? инÑ?оÑ?маÑ?иÑ? об авÑ?оÑ?изаÑ?ии"
 
-#: ../camel/camel-sasl-digest-md5.c:918
+#: ../camel/camel-sasl-digest-md5.c:917
 msgid "Server response does not match"
 msgstr "Ð?Ñ?веÑ? Ñ?еÑ?веÑ?а не Ñ?овпадаеÑ?"
 
-#: ../camel/camel-sasl-gssapi.c:64
+#: ../camel/camel-sasl-gssapi.c:63
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:66
+#: ../camel/camel-sasl-gssapi.c:65
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "Ð?одклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ? бÑ?деÑ? пÑ?оизводиÑ?Ñ?Ñ?Ñ? Ñ? иÑ?полÑ?зованием Kerberos 5."
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:159
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -1933,11 +1934,11 @@ msgstr ""
 "УказаннÑ?й меÑ?анизм не поддеÑ?живаеÑ?Ñ?Ñ? пÑ?едоÑ?Ñ?авленнÑ?ми Ñ?Ñ?едÑ?Ñ?вами, либо не "
 "Ñ?аÑ?познаеÑ?Ñ?Ñ? в Ñ?Ñ?ой Ñ?еализаÑ?ии."
 
-#: ../camel/camel-sasl-gssapi.c:169
+#: ../camel/camel-sasl-gssapi.c:164
 msgid "The provided target_name parameter was ill-formed."
 msgstr "Ð?Ñ?едоÑ?Ñ?авленнÑ?й паÑ?амеÑ?Ñ? target_name Ñ?Ñ?оÑ?миÑ?ован невеÑ?но."
 
-#: ../camel/camel-sasl-gssapi.c:172
+#: ../camel/camel-sasl-gssapi.c:167
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
@@ -1945,7 +1946,7 @@ msgstr ""
 "Ð?Ñ?едоÑ?Ñ?авленнÑ?й паÑ?амеÑ?Ñ? target_name Ñ?одеÑ?жиÑ? невеÑ?нÑ?й или неподдеÑ?живаемÑ?й "
 "Ñ?ип имени."
 
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../camel/camel-sasl-gssapi.c:171
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -1953,7 +1954,7 @@ msgstr ""
 "input_token Ñ?одеÑ?жиÑ? не Ñ?акÑ?Ñ? пÑ?ивÑ?зкÑ? к каналам, как Ñ?казано в паÑ?амеÑ?Ñ?е "
 "input_chan_bindings."
 
-#: ../camel/camel-sasl-gssapi.c:181
+#: ../camel/camel-sasl-gssapi.c:176
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
@@ -1961,7 +1962,7 @@ msgstr ""
 "input_token Ñ?одеÑ?жиÑ? невеÑ?нÑ?Ñ? подпиÑ?Ñ?, или подпиÑ?Ñ?, коÑ?оÑ?аÑ? не можеÑ? бÑ?Ñ?Ñ? "
 "пÑ?овеÑ?ена."
 
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../camel/camel-sasl-gssapi.c:180
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -1969,31 +1970,31 @@ msgstr ""
 "Ð?Ñ?едоÑ?Ñ?авленнÑ?е Ñ?доÑ?Ñ?овеÑ?ениÑ? бÑ?ли не дейÑ?Ñ?виÑ?елÑ?нÑ? длÑ? иниÑ?иализаÑ?ии "
 "конÑ?екÑ?Ñ?а, либо обÑ?абоÑ?Ñ?ик Ñ?доÑ?Ñ?овеÑ?ениÑ? не Ñ?Ñ?Ñ?лаеÑ?Ñ?Ñ? на Ñ?доÑ?Ñ?овеÑ?ениÑ?."
 
-#: ../camel/camel-sasl-gssapi.c:190
+#: ../camel/camel-sasl-gssapi.c:185
 msgid "The supplied context handle did not refer to a valid context."
 msgstr ""
 "УказаннÑ?й обÑ?абоÑ?Ñ?ик конÑ?екÑ?Ñ?а не Ñ?Ñ?Ñ?лаеÑ?Ñ?Ñ? на дейÑ?Ñ?виÑ?елÑ?нÑ?й конÑ?екÑ?Ñ?."
 
-#: ../camel/camel-sasl-gssapi.c:193
+#: ../camel/camel-sasl-gssapi.c:188
 msgid "The consistency checks performed on the input_token failed."
 msgstr "Сбой пÑ?овеÑ?ки Ñ?елоÑ?Ñ?ноÑ?Ñ?и Ñ?леменÑ?а input_token."
 
-#: ../camel/camel-sasl-gssapi.c:196
+#: ../camel/camel-sasl-gssapi.c:191
 msgid "The consistency checks performed on the credential failed."
 msgstr "Сбой пÑ?овеÑ?ки Ñ?елоÑ?Ñ?ноÑ?Ñ?и Ñ?доÑ?Ñ?овеÑ?ений."
 
-#: ../camel/camel-sasl-gssapi.c:199
+#: ../camel/camel-sasl-gssapi.c:194
 msgid "The referenced credentials have expired."
 msgstr "СÑ?ок дейÑ?Ñ?виÑ? Ñ?помÑ?нÑ?Ñ?Ñ?Ñ? Ñ?доÑ?Ñ?овеÑ?ений иÑ?Ñ?Ñ?к."
 
-#: ../camel/camel-sasl-gssapi.c:205 ../camel/camel-sasl-gssapi.c:253
-#: ../camel/camel-sasl-gssapi.c:289 ../camel/camel-sasl-gssapi.c:304
-#: ../camel/camel-sasl-kerberos4.c:231
-#: ../camel/providers/imap/camel-imap-store.c:1273
+#: ../camel/camel-sasl-gssapi.c:200 ../camel/camel-sasl-gssapi.c:248
+#: ../camel/camel-sasl-gssapi.c:284 ../camel/camel-sasl-gssapi.c:299
+#: ../camel/camel-sasl-kerberos4.c:230
+#: ../camel/providers/imap/camel-imap-store.c:1274
 msgid "Bad authentication response from server."
 msgstr "Ð?евеÑ?нÑ?й оÑ?веÑ? оÑ? Ñ?еÑ?веÑ?а пÑ?и иденÑ?иÑ?икаÑ?ии."
 
-#: ../camel/camel-sasl-gssapi.c:314
+#: ../camel/camel-sasl-gssapi.c:309
 msgid "Unsupported security layer."
 msgstr "Ð?еподдеÑ?живаемÑ?й Ñ?Ñ?овенÑ? безопаÑ?ноÑ?Ñ?и."
 
@@ -2005,7 +2006,7 @@ msgstr "Kerberos 4"
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr "Ð?одклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ? бÑ?деÑ? пÑ?оизводиÑ?Ñ?Ñ?Ñ? Ñ? иÑ?полÑ?зованием Kerberos 4."
 
-#: ../camel/camel-sasl-kerberos4.c:174
+#: ../camel/camel-sasl-kerberos4.c:173
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -2024,7 +2025,7 @@ msgstr ""
 "Ð?одклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ? бÑ?деÑ? пÑ?оизводиÑ?Ñ?Ñ?Ñ? Ñ? иÑ?полÑ?зованием незаÑ?иÑ?Ñ?ованного "
 "паÑ?олÑ?."
 
-#: ../camel/camel-sasl-login.c:135
+#: ../camel/camel-sasl-login.c:134
 msgid "Unknown authentication state."
 msgstr "Ð?еизвеÑ?Ñ?ное Ñ?оÑ?Ñ?оÑ?ние иденÑ?иÑ?икаÑ?ии."
 
@@ -2069,22 +2070,22 @@ msgstr "POP до SMTP, иÑ?полÑ?зÑ?Ñ? не-POP иÑ?Ñ?оÑ?ник"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Сбой компилÑ?Ñ?ии Ñ?егÑ?лÑ?Ñ?ного вÑ?Ñ?ажениÑ?: %s: %s"
 
-#: ../camel/camel-service.c:270
+#: ../camel/camel-service.c:265
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL «%s» нÑ?ждаеÑ?Ñ?Ñ? в компоненÑ?е имени полÑ?зоваÑ?елÑ?"
 
-#: ../camel/camel-service.c:274
+#: ../camel/camel-service.c:269
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL «%s» нÑ?ждаеÑ?Ñ?Ñ? в компоненÑ?е Ñ?оÑ?Ñ?а"
 
-#: ../camel/camel-service.c:278
+#: ../camel/camel-service.c:273
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL «%s» нÑ?ждаеÑ?Ñ?Ñ? в компоненÑ?е пÑ?Ñ?и"
 
-#: ../camel/camel-session.c:308
+#: ../camel/camel-session.c:307
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2093,12 +2094,12 @@ msgstr ""
 "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? каÑ?алог %s:\n"
 "%s"
 
-#: ../camel/camel-session.c:483
+#: ../camel/camel-session.c:479
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "Ð?ведиÑ?е паÑ?олÑ? %s длÑ? %s на Ñ?зле %s."
 
-#: ../camel/camel-session.c:822
+#: ../camel/camel-session.c:817
 msgid "Camel session doesn't support forwarding of a message."
 msgstr "СеанÑ? camel не поддеÑ?живаеÑ? пеÑ?еÑ?Ñ?лкÑ? Ñ?ообÑ?ений."
 
@@ -2292,16 +2293,16 @@ msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? даннÑ?е к кодиÑ?овÑ?и
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME Decrypt: Ð?е найдено заÑ?иÑ?Ñ?ованного Ñ?одеÑ?жимого"
 
-#: ../camel/camel-smime-context.c:1199
+#: ../camel/camel-smime-context.c:1200
 msgid "import keys: unimplemented"
 msgstr "импоÑ?Ñ? клÑ?Ñ?ей: не Ñ?еализовано"
 
-#: ../camel/camel-smime-context.c:1207
+#: ../camel/camel-smime-context.c:1208
 msgid "export keys: unimplemented"
 msgstr "Ñ?кÑ?поÑ?Ñ? клÑ?Ñ?ей: не Ñ?еализовано"
 
 #: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:174
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:171
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? папкÑ?: недопÑ?Ñ?Ñ?имаÑ? опеÑ?аÑ?иÑ? в Ñ?Ñ?ом Ñ?Ñ?анилиÑ?е"
 
@@ -2319,146 +2320,145 @@ msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? папкÑ?: недопÑ?Ñ?Ñ?имаÑ?
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? папкÑ?: %s: папка Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?"
 
-#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:384
+#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:377
 #: ../camel/providers/local/camel-maildir-store.c:219
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?далиÑ?Ñ? папкÑ?: %s: недопÑ?Ñ?Ñ?имаÑ? опеÑ?аÑ?иÑ?"
 
-#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:421
+#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:414
 #: ../camel/providers/local/camel-maildir-store.c:291
 #, 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:899 ../camel/camel-vtrash-folder.c:54
-#: ../camel/providers/imap/camel-imap-store.c:1061
+#: ../camel/camel-store.c:900 ../camel/camel-vtrash-folder.c:54
 msgid "Trash"
 msgstr "Ð?оÑ?зина"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:902 ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-store.c:903 ../camel/camel-vtrash-folder.c:56
 msgid "Junk"
 msgstr "Спам"
 
-#: ../camel/camel-tcp-stream-openssl.c:572
+#: ../camel/camel-tcp-stream-openssl.c:564
 msgid "Unable to get issuer's certificate"
 msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ? поÑ?Ñ?авÑ?ика"
 
-#: ../camel/camel-tcp-stream-openssl.c:574
+#: ../camel/camel-tcp-stream-openssl.c:566
 msgid "Unable to get Certificate Revocation List"
 msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?пиÑ?ок аннÑ?лиÑ?ованнÑ?Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ?ов"
 
-#: ../camel/camel-tcp-stream-openssl.c:576
+#: ../camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to decrypt certificate signature"
 msgstr "Ð?е Ñ?далоÑ?Ñ? декодиÑ?оваÑ?Ñ? подпиÑ?Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ?а"
 
-#: ../camel/camel-tcp-stream-openssl.c:578
+#: ../camel/camel-tcp-stream-openssl.c:570
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr "Ð?е Ñ?далоÑ?Ñ? декодиÑ?оваÑ?Ñ? подпиÑ?Ñ? Ñ?пиÑ?ка аннÑ?лиÑ?ованнÑ?Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ?ов"
 
-#: ../camel/camel-tcp-stream-openssl.c:580
+#: ../camel/camel-tcp-stream-openssl.c:572
 msgid "Unable to decode issuer's public key"
 msgstr "Ð?е Ñ?далоÑ?Ñ? декодиÑ?оваÑ?Ñ? пÑ?блиÑ?нÑ?й клÑ?Ñ? поÑ?Ñ?авÑ?ика"
 
-#: ../camel/camel-tcp-stream-openssl.c:582
+#: ../camel/camel-tcp-stream-openssl.c:574
 msgid "Certificate signature failure"
 msgstr "Ð?Ñ?ибка в подпиÑ?и Ñ?еÑ?Ñ?иÑ?икаÑ?а"
 
-#: ../camel/camel-tcp-stream-openssl.c:584
+#: ../camel/camel-tcp-stream-openssl.c:576
 msgid "Certificate Revocation List signature failure"
 msgstr "Ð?Ñ?ибка в подпиÑ?и Ñ?пиÑ?ка аннÑ?лиÑ?ованнÑ?Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ?ов"
 
-#: ../camel/camel-tcp-stream-openssl.c:586
+#: ../camel/camel-tcp-stream-openssl.c:578
 msgid "Certificate not yet valid"
 msgstr "СеÑ?Ñ?иÑ?икаÑ? пока еÑ?е некоÑ?Ñ?екÑ?ен"
 
-#: ../camel/camel-tcp-stream-openssl.c:588
+#: ../camel/camel-tcp-stream-openssl.c:580
 msgid "Certificate has expired"
 msgstr "Ð?Ñ?Ñ?ек Ñ?Ñ?ок дейÑ?Ñ?виÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?а"
 
-#: ../camel/camel-tcp-stream-openssl.c:590
-msgid "CRL not yet valid"
-msgstr "CRL пока еÑ?е некоÑ?Ñ?екÑ?ен"
+#: ../camel/camel-tcp-stream-openssl.c:582
+msgid "Certificate Revocation List (CRL) not yet valid"
+msgstr "СпиÑ?ок аннÑ?лиÑ?ованнÑ?Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ?ов (CRL) еÑ?е не дейÑ?Ñ?виÑ?елен"
 
-#: ../camel/camel-tcp-stream-openssl.c:592
-msgid "CRL has expired"
-msgstr "Ð?Ñ?Ñ?ек Ñ?Ñ?ок дейÑ?Ñ?виÑ? CRL"
+#: ../camel/camel-tcp-stream-openssl.c:584
+msgid "Certificate Revocation List (CRL) has expired"
+msgstr "СÑ?ок дейÑ?Ñ?виÑ? Ñ?пиÑ?ка аннÑ?лиÑ?ованнÑ?Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ?ов (CRL) законÑ?илÑ?Ñ?"
 
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Error in CRL"
-msgstr "Ð?Ñ?ибка в CRL"
+#: ../camel/camel-tcp-stream-openssl.c:589
+msgid "Error in Certificate Revocation List (CRL)"
+msgstr "Ð?Ñ?ибка Ñ?пиÑ?ка аннÑ?лиÑ?ованнÑ?Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ?ов (CRL)"
 
-#: ../camel/camel-tcp-stream-openssl.c:599
+#: ../camel/camel-tcp-stream-openssl.c:591
 msgid "Out of memory"
 msgstr "Ð?едоÑ?Ñ?аÑ?оÑ?но памÑ?Ñ?и"
 
-#: ../camel/camel-tcp-stream-openssl.c:601
+#: ../camel/camel-tcp-stream-openssl.c:593
 msgid "Zero-depth self-signed certificate"
 msgstr "СамоподпиÑ?аннÑ?й Ñ?еÑ?Ñ?иÑ?икаÑ? нÑ?левой глÑ?бинÑ?"
 
-#: ../camel/camel-tcp-stream-openssl.c:603
+#: ../camel/camel-tcp-stream-openssl.c:595
 msgid "Self-signed certificate in chain"
 msgstr "СамоподпиÑ?аннÑ?й Ñ?еÑ?Ñ?иÑ?икаÑ? в Ñ?епоÑ?ке"
 
-#: ../camel/camel-tcp-stream-openssl.c:605
+#: ../camel/camel-tcp-stream-openssl.c:597
 msgid "Unable to get issuer's certificate locally"
 msgstr "Ð?е Ñ?далоÑ?Ñ? локалÑ?но полÑ?Ñ?иÑ?Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ? поÑ?Ñ?авÑ?ика"
 
-#: ../camel/camel-tcp-stream-openssl.c:607
+#: ../camel/camel-tcp-stream-openssl.c:599
 msgid "Unable to verify leaf signature"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?овеÑ?иÑ?Ñ? лиÑ?Ñ?овÑ?Ñ? подпиÑ?Ñ?"
 
-#: ../camel/camel-tcp-stream-openssl.c:609
+#: ../camel/camel-tcp-stream-openssl.c:601
 msgid "Certificate chain too long"
 msgstr "Ð?оÑ?ледоваÑ?елÑ?ноÑ?Ñ?Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ?а Ñ?лиÑ?ком длиннаÑ?"
 
-#: ../camel/camel-tcp-stream-openssl.c:611
+#: ../camel/camel-tcp-stream-openssl.c:603
 msgid "Certificate Revoked"
 msgstr "СеÑ?Ñ?иÑ?икаÑ? аннÑ?лиÑ?ован"
 
-#: ../camel/camel-tcp-stream-openssl.c:613
+#: ../camel/camel-tcp-stream-openssl.c:605
 msgid "Invalid Certificate Authority (CA)"
 msgstr "Ð?екоÑ?Ñ?екÑ?наÑ? авÑ?оÑ?изаÑ?иÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?а (CA)"
 
-#: ../camel/camel-tcp-stream-openssl.c:615
+#: ../camel/camel-tcp-stream-openssl.c:607
 msgid "Path length exceeded"
 msgstr "Ð?Ñ?евÑ?Ñ?ена длина пÑ?Ñ?и"
 
-#: ../camel/camel-tcp-stream-openssl.c:617
+#: ../camel/camel-tcp-stream-openssl.c:609
 msgid "Invalid purpose"
 msgstr "Ð?екоÑ?Ñ?екÑ?наÑ? пÑ?иÑ?ина"
 
-#: ../camel/camel-tcp-stream-openssl.c:619
+#: ../camel/camel-tcp-stream-openssl.c:611
 msgid "Certificate untrusted"
 msgstr "Ð?едовеÑ?иÑ?елÑ?нÑ?й Ñ?еÑ?Ñ?иÑ?икаÑ?"
 
-#: ../camel/camel-tcp-stream-openssl.c:621
+#: ../camel/camel-tcp-stream-openssl.c:613
 msgid "Certificate rejected"
 msgstr "Ð?Ñ?клоненнÑ?й Ñ?еÑ?Ñ?иÑ?икаÑ?"
 
-#: ../camel/camel-tcp-stream-openssl.c:624
+#: ../camel/camel-tcp-stream-openssl.c:616
 msgid "Subject/Issuer mismatch"
 msgstr "Ð?еÑ?ооÑ?веÑ?Ñ?Ñ?вие ТемÑ?/Ð?оÑ?Ñ?авÑ?ика"
 
-#: ../camel/camel-tcp-stream-openssl.c:626
+#: ../camel/camel-tcp-stream-openssl.c:618
 msgid "AKID/SKID mismatch"
 msgstr "Ð?еÑ?ооÑ?веÑ?Ñ?Ñ?вие AKID/SKID "
 
-#: ../camel/camel-tcp-stream-openssl.c:628
+#: ../camel/camel-tcp-stream-openssl.c:620
 msgid "AKID/Issuer serial mismatch"
 msgstr "Ð?оÑ?ледоваÑ?елÑ?ное неÑ?ооÑ?веÑ?Ñ?Ñ?вие AKID/Ð?оÑ?Ñ?авÑ?ика"
 
-#: ../camel/camel-tcp-stream-openssl.c:630
+#: ../camel/camel-tcp-stream-openssl.c:622
 msgid "Key usage does not support certificate signing"
 msgstr "Ð?Ñ?полÑ?зование клÑ?Ñ?а не обеÑ?пеÑ?иваеÑ? поддеÑ?жкÑ? подпиÑ?и Ñ?еÑ?Ñ?иÑ?икаÑ?а "
 
-#: ../camel/camel-tcp-stream-openssl.c:633
+#: ../camel/camel-tcp-stream-openssl.c:625
 msgid "Error in application verification"
 msgstr "Ð?Ñ?ибка пÑ?и пÑ?овеÑ?ке пÑ?иложениÑ?"
 
-#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-openssl.c:692 ../camel/camel-tcp-stream-ssl.c:873
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2471,15 +2471,15 @@ msgstr ""
 "Ð?Ñ?пеÑ?аÑ?ок:         %s\n"
 "Ð?одпиÑ?Ñ?:           %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
 msgid "GOOD"
 msgstr "GOOD"
 
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
 msgid "BAD"
 msgstr "BAD"
 
-#: ../camel/camel-tcp-stream-openssl.c:708
+#: ../camel/camel-tcp-stream-openssl.c:700
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -2498,7 +2498,7 @@ msgstr ""
 "Ð?Ñ?инÑ?Ñ?Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ? в лÑ?бом Ñ?лÑ?Ñ?ае?"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:890
+#: ../camel/camel-tcp-stream-ssl.c:883
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2513,7 +2513,7 @@ msgstr ""
 "\n"
 "Ð?Ñ?Ñ? Ñ?авно пÑ?инÑ?Ñ?Ñ??"
 
-#: ../camel/camel-tcp-stream-ssl.c:934
+#: ../camel/camel-tcp-stream-ssl.c:927
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2522,7 +2522,7 @@ msgstr ""
 "Ð?Ñ?облема Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ?ом: %s\n"
 "Ð?оÑ?Ñ?авÑ?ик: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:986
+#: ../camel/camel-tcp-stream-ssl.c:979
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2531,7 +2531,7 @@ msgstr ""
 "Ð?екоÑ?Ñ?екÑ?нÑ?й домен Ñ?еÑ?Ñ?иÑ?икаÑ?а: %s\n"
 "Ð?оÑ?Ñ?авÑ?ик: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1004
+#: ../camel/camel-tcp-stream-ssl.c:997
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2540,7 +2540,7 @@ msgstr ""
 "Ð?Ñ?Ñ?ек Ñ?Ñ?ок дейÑ?Ñ?виÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?а: %s\n"
 "Ð?оÑ?Ñ?авÑ?ик: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1021
+#: ../camel/camel-tcp-stream-ssl.c:1014
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2554,31 +2554,31 @@ msgstr ""
 msgid "Could not parse URL '%s'"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?азобÑ?аÑ?Ñ? URL «%s»"
 
-#: ../camel/camel-vee-folder.c:582
+#: ../camel/camel-vee-folder.c:580
 #, c-format
 msgid "Error storing '%s': %s"
 msgstr "Ð?Ñ?ибка пÑ?и Ñ?Ñ?анении «%s»: %s"
 
-#: ../camel/camel-vee-folder.c:660
+#: ../camel/camel-vee-folder.c:657
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Ð?еÑ? Ñ?ообÑ?ениÑ? %s в %s"
 
-#: ../camel/camel-vee-folder.c:820 ../camel/camel-vee-folder.c:826
+#: ../camel/camel-vee-folder.c:816 ../camel/camel-vee-folder.c:822
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?копиÑ?оваÑ?Ñ? или пеÑ?емеÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ениÑ? в виÑ?Ñ?Ñ?алÑ?нÑ?Ñ? папкÑ?"
 
-#: ../camel/camel-vee-store.c:114 ../camel/camel-vee-store.c:115
-#: ../camel/camel-vee-store.c:360
+#: ../camel/camel-vee-store.c:113 ../camel/camel-vee-store.c:114
+#: ../camel/camel-vee-store.c:353
 msgid "Unmatched"
 msgstr "Ð?Ñ?оÑ?ее"
 
-#: ../camel/camel-vee-store.c:407
+#: ../camel/camel-vee-store.c:400
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?далиÑ?Ñ? папкÑ?: %s: неÑ? Ñ?акой папки"
 
-#: ../camel/camel-vee-store.c:429
+#: ../camel/camel-vee-store.c:422
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пеÑ?еименоваÑ?Ñ? папкÑ?: %s: неÑ? Ñ?акой папки"
@@ -2601,19 +2601,19 @@ msgstr ""
 "  %s"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:136
-#: ../camel/providers/local/camel-maildir-folder.c:248
-#: ../camel/providers/local/camel-maildir-folder.c:275
-#: ../camel/providers/local/camel-mbox-folder.c:347
-#: ../camel/providers/local/camel-mbox-folder.c:399
-#: ../camel/providers/local/camel-mh-folder.c:214
+#: ../camel/providers/local/camel-maildir-folder.c:278
+#: ../camel/providers/local/camel-maildir-folder.c:310
+#: ../camel/providers/local/camel-mbox-folder.c:363
+#: ../camel/providers/local/camel-mbox-folder.c:414
+#: ../camel/providers/local/camel-mh-folder.c:245
 msgid "No such message"
 msgstr "Ð?еÑ? Ñ?акого Ñ?ообÑ?ениÑ?"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:148
-#: ../camel/providers/imap4/camel-imap4-folder.c:821
+#: ../camel/providers/imap4/camel-imap4-folder.c:814
 #: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:251
-#: ../camel/providers/nntp/camel-nntp-folder.c:411
+#: ../camel/providers/nntp/camel-nntp-folder.c:250
+#: ../camel/providers/nntp/camel-nntp-folder.c:410
 #: ../camel/providers/pop3/camel-pop3-folder.c:268
 #: ../camel/providers/pop3/camel-pop3-folder.c:578
 #: ../camel/providers/pop3/camel-pop3-folder.c:639
@@ -2622,11 +2622,11 @@ msgid "User canceled"
 msgstr "Ð?Ñ?менено полÑ?зоваÑ?елем"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:155
-#: ../camel/providers/imap4/camel-imap4-folder.c:826
+#: ../camel/providers/imap4/camel-imap4-folder.c:819
 #: ../camel/providers/nntp/camel-nntp-folder.c:166
 #: ../camel/providers/nntp/camel-nntp-folder.c:168
 #: ../camel/providers/nntp/camel-nntp-folder.c:177
-#: ../camel/providers/nntp/camel-nntp-folder.c:253
+#: ../camel/providers/nntp/camel-nntp-folder.c:252
 #: ../camel/providers/pop3/camel-pop3-folder.c:388
 #: ../camel/providers/pop3/camel-pop3-folder.c:581
 #: ../camel/providers/pop3/camel-pop3-folder.c:642
@@ -2638,194 +2638,199 @@ msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ение %s: %s"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:172
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:180
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2304
-#: ../camel/providers/imap4/camel-imap4-folder.c:844
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2463
+#: ../camel/providers/imap4/camel-imap4-folder.c:837
 msgid "This message is not available in offline mode."
 msgstr "ЭÑ?о Ñ?ообÑ?ение недоÑ?Ñ?Ñ?пно в авÑ?ономном Ñ?ежиме."
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:192
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:199
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1819
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1870
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:194
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:201
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1966
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2017
 msgid "Could not get message"
 msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ение"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:892
-#: ../camel/providers/imap/camel-imap-folder.c:265
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:939
+#: ../camel/providers/imap/camel-imap-folder.c:296
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? загÑ?Ñ?зиÑ?Ñ? кÑ?аÑ?кÑ?Ñ? инÑ?оÑ?маÑ?иÑ? о %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1152
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1012
+#, c-format
+msgid "Checking for deleted messages %s"
+msgstr "Ð?Ñ?овеÑ?ка Ñ?даленнÑ?Ñ? Ñ?ообÑ?ений %s"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1287
 msgid "Trash Folder Full. Please Empty."
 msgstr "Ð?апка коÑ?зинÑ? пеÑ?еполнена. Ð?Ñ?иÑ?Ñ?иÑ?е, пожалÑ?йÑ?Ñ?а."
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1361
-#: ../camel/providers/groupwise/camel-groupwise-store.c:617
-#: ../camel/providers/groupwise/camel-groupwise-store.c:743
-#: ../camel/providers/imap/camel-imap-folder.c:3362
-#: ../camel/providers/imap/camel-imap-folder.c:3438
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1521
+#: ../camel/providers/groupwise/camel-groupwise-store.c:633
+#: ../camel/providers/groupwise/camel-groupwise-store.c:763
+#: ../camel/providers/imap/camel-imap-folder.c:3421
+#: ../camel/providers/imap/camel-imap-folder.c:3497
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "Ð?олÑ?Ñ?ение кÑ?аÑ?кой инÑ?оÑ?маÑ?ии по новÑ?м Ñ?ообÑ?ениÑ?м из %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2158
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2201
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2317
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2360
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? Ñ?ообÑ?ение к папке «%s»: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2189
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2348
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? Ñ?ообÑ?ение: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:285
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:281
 #, c-format
 msgid "Cannot get folder container %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? конÑ?ейнеÑ? папки %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:349
-#: ../camel/providers/imap4/camel-imap4-journal.c:319
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:343
+#: ../camel/providers/imap4/camel-imap4-journal.c:311
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr "Ð?евозможно добавиÑ?Ñ? Ñ?ообÑ?ение в авÑ?ономном Ñ?ежиме: кÑ?Ñ? недоÑ?Ñ?Ñ?пен"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:365
-#: ../camel/providers/imap4/camel-imap4-journal.c:335
+#: ../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-provider.c:55
-#: ../camel/providers/imap4/camel-imap4-provider.c:39
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:54
+#: ../camel/providers/imap4/camel-imap4-provider.c:38
 msgid "Checking for new mail"
 msgstr "Ð?Ñ?овеÑ?ка новой поÑ?Ñ?Ñ?"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
-#: ../camel/providers/hula/camel-hula-provider.c:51
+#: ../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:41
+#: ../camel/providers/imap4/camel-imap4-provider.c:40
 msgid "C_heck for new messages in all folders"
 msgstr "Ð?_Ñ?овеÑ?Ñ?Ñ?Ñ? новÑ?Ñ? поÑ?Ñ?Ñ? во вÑ?еÑ? папкаÑ?"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
 #: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:52
+#: ../camel/providers/imap4/camel-imap4-provider.c:51
 #: ../camel/providers/local/camel-local-provider.c:46
 #: ../camel/providers/local/camel-local-provider.c:86
 #: ../camel/providers/local/camel-local-provider.c:106
 msgid "Options"
 msgstr "Ð?аÑ?амеÑ?Ñ?Ñ?"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:62
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr ""
 "_Ð?Ñ?имениÑ?Ñ? Ñ?илÑ?Ñ?Ñ?Ñ? к новÑ?м Ñ?ообÑ?ениÑ?м в папке \"Ð?Ñ?одÑ?Ñ?ие\" на Ñ?Ñ?ом Ñ?еÑ?веÑ?е"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:64
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:63
 msgid "Check new messages for J_unk contents"
 msgstr "Ð?Ñ?овеÑ?Ñ?Ñ?Ñ?, Ñ?влÑ?Ñ?Ñ?Ñ?Ñ? ли новÑ?е Ñ?ообÑ?ениÑ? Ñ?памом"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:65
 #: ../camel/providers/imap/camel-imap-provider.c:74
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr ""
 "Ð?Ñ?овеÑ?Ñ?Ñ?Ñ?, Ñ?влÑ?Ñ?Ñ?Ñ?Ñ? ли новÑ?е Ñ?ообÑ?ениÑ? Ñ?памом, Ñ?олÑ?ко в папке \"Ð?Ñ?од_Ñ?Ñ?ие\""
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:68
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:67
 msgid "Automatically synchroni_ze account locally"
 msgstr "Ð?вÑ?омаÑ?иÑ?еÑ?ки Ñ?инÑ?Ñ?они_зиÑ?оваÑ?Ñ? Ñ?Ñ?еÑ?нÑ?Ñ? запиÑ?Ñ? локалÑ?но"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:73
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
 msgid "SOAP Settings"
 msgstr "Ð?аÑ?амеÑ?Ñ?Ñ? SOAP"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:76
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:75
 msgid "Post Office Agent SOAP _Port:"
 msgstr "_Ð?оÑ?Ñ? SOAP Ð?генÑ?а Post Office:"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:91
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
 msgid "For accessing Novell GroupWise servers"
 msgstr "Ð?лÑ? доÑ?Ñ?Ñ?па к Ñ?еÑ?веÑ?ам Novell Groupwise"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
-#: ../camel/providers/hula/camel-hula-provider.c:95
+#: ../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:84
+#: ../camel/providers/imap4/camel-imap4-provider.c:83
 #: ../camel/providers/imapp/camel-imapp-provider.c:67
 #: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:74
 msgid "Password"
 msgstr "Ð?аÑ?олÑ?"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:108
+#: ../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-store.c:104
+#: ../camel/providers/groupwise/camel-groupwise-store.c:102
 msgid "Host or user not available in url"
 msgstr "Узел или полÑ?зоваÑ?елÑ? недоÑ?Ñ?Ñ?пнÑ? в url"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:207
-#: ../camel/providers/imap/camel-imap-store.c:1357
+#: ../camel/providers/groupwise/camel-groupwise-store.c:204
+#: ../camel/providers/imap/camel-imap-store.c:1358
 msgid "You did not enter a password."
 msgstr "Ð?Ñ? не ввели паÑ?олÑ?."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:303
+#: ../camel/providers/groupwise/camel-groupwise-store.c:319
 msgid "Some features may not work correctly with your current server version"
 msgstr "Ð?екоÑ?оÑ?Ñ?е Ñ?Ñ?нкÑ?ии могÑ?Ñ? Ñ?абоÑ?аÑ?Ñ? некоÑ?Ñ?екÑ?но Ñ? ваÑ?ей веÑ?Ñ?ией Ñ?еÑ?веÑ?а"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:524
+#: ../camel/providers/groupwise/camel-groupwise-store.c:540
 #: ../camel/providers/imap/camel-imap-store.c:1849
 #: ../camel/providers/imap/camel-imap-store.c:2047
 #, c-format
 msgid "No such folder %s"
 msgstr "Ð?еÑ? Ñ?акой папки %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1241
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1266
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "Ð?евозможно Ñ?оздаÑ?Ñ? папки GroupWise в авÑ?ономном Ñ?ежиме."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1255
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1280
 #: ../camel/providers/imap/camel-imap-store.c:1924
 #: ../camel/providers/imap/camel-imap-store.c:2304
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "ЭÑ?а папка не можеÑ? Ñ?одеÑ?жаÑ?Ñ? подпапки"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1333
 #: ../camel/providers/groupwise/camel-groupwise-store.c:1359
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пеÑ?еименоваÑ?Ñ? папкÑ? Groupwise «%s» в «%s»"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1391
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:121
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1414
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
 #, c-format
 msgid "GroupWise server %s"
 msgstr "СеÑ?веÑ? GroupWise %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1393
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1416
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "СеÑ?виÑ? GroupWise длÑ? %s на %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:123
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:122
 #, c-format
 msgid "GroupWise mail delivery via %s"
 msgstr "Ð?оÑ?Ñ?авка поÑ?Ñ?Ñ? Groupwise Ñ? помоÑ?Ñ?Ñ? %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:167
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:164
 msgid "Sending Message"
 msgstr "Ð?Ñ?пÑ?авка Ñ?ообÑ?ениÑ?"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:221
+#: ../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 "
@@ -2835,95 +2840,95 @@ msgstr ""
 "поÑ?Ñ?авленÑ? в оÑ?еÑ?едÑ? в папке \"Ð?Ñ?Ñ?одÑ?Ñ?ие\". Ð?овÑ?оÑ?иÑ?е оÑ?пÑ?авкÑ?, нажав кнопкÑ? "
 "Ð?Ñ?пÑ?авиÑ?Ñ?/Ð?олÑ?Ñ?иÑ?Ñ?, поÑ?ле Ñ?далениÑ? некоÑ?оÑ?ого колиÑ?еÑ?Ñ?ва ваÑ?иÑ? Ñ?ообÑ?ений.\n"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:209
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:207
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?пÑ?авиÑ?Ñ? Ñ?ообÑ?ение: %s"
 
-#: ../camel/providers/hula/camel-hula-provider.c:49
+#: ../camel/providers/hula/camel-hula-provider.c:48
 #: ../camel/providers/imap/camel-imap-provider.c:44
 msgid "Checking for New Mail"
 msgstr "Ð?Ñ?овеÑ?ка новой поÑ?Ñ?Ñ?"
 
-#: ../camel/providers/hula/camel-hula-provider.c:54
+#: ../camel/providers/hula/camel-hula-provider.c:53
 #: ../camel/providers/imap/camel-imap-provider.c:52
 msgid "Connection to Server"
 msgstr "Ð?одклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ?"
 
-#: ../camel/providers/hula/camel-hula-provider.c:56
+#: ../camel/providers/hula/camel-hula-provider.c:55
 #: ../camel/providers/imap/camel-imap-provider.c:54
 msgid "_Use custom command to connect to server"
 msgstr "_Ð?Ñ?полÑ?зоваÑ?Ñ? Ñ?воÑ? Ñ?Ñ?Ñ?окÑ? длÑ? подклÑ?Ñ?ениÑ? к Ñ?еÑ?веÑ?Ñ?"
 
-#: ../camel/providers/hula/camel-hula-provider.c:58
+#: ../camel/providers/hula/camel-hula-provider.c:57
 #: ../camel/providers/imap/camel-imap-provider.c:56
 msgid "Command:"
 msgstr "Ð?оманда:"
 
-#: ../camel/providers/hula/camel-hula-provider.c:61
+#: ../camel/providers/hula/camel-hula-provider.c:60
 #: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:44
+#: ../camel/providers/imap4/camel-imap4-provider.c:43
 #: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid "Folders"
 msgstr "Ð?апки"
 
-#: ../camel/providers/hula/camel-hula-provider.c:63
+#: ../camel/providers/hula/camel-hula-provider.c:62
 #: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:46
+#: ../camel/providers/imap4/camel-imap4-provider.c:45
 msgid "_Show only subscribed folders"
 msgstr "_Ð?оказÑ?ваÑ?Ñ? Ñ?олÑ?ко подпиÑ?аннÑ?е папки"
 
-#: ../camel/providers/hula/camel-hula-provider.c:65
+#: ../camel/providers/hula/camel-hula-provider.c:64
 #: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:48
+#: ../camel/providers/imap4/camel-imap4-provider.c:47
 msgid "O_verride server-supplied folder namespace"
 msgstr "Ð?е_Ñ?еопÑ?еделÑ?Ñ?Ñ? пÑ?едлагаемое Ñ?еÑ?веÑ?ом пÑ?оÑ?Ñ?Ñ?анÑ?Ñ?во имÑ?н папок"
 
-#: ../camel/providers/hula/camel-hula-provider.c:67
+#: ../camel/providers/hula/camel-hula-provider.c:66
 msgid "Namespace"
 msgstr "Ð?Ñ?оÑ?Ñ?Ñ?анÑ?Ñ?во имен"
 
-#: ../camel/providers/hula/camel-hula-provider.c:78
+#: ../camel/providers/hula/camel-hula-provider.c:76
 msgid "Hula"
 msgstr "Hula"
 
-#: ../camel/providers/hula/camel-hula-provider.c:80
+#: ../camel/providers/hula/camel-hula-provider.c:78
 msgid "For accessing Hula servers"
 msgstr "Ð?лÑ? доÑ?Ñ?Ñ?па к Ñ?еÑ?веÑ?ам Hula"
 
-#: ../camel/providers/hula/camel-hula-provider.c:97
+#: ../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:183
-#: ../camel/providers/imap/camel-imap-command.c:267
+#: ../camel/providers/imap/camel-imap-command.c:181
+#: ../camel/providers/imap/camel-imap-command.c:265
 msgid "No output stream"
 msgstr "Ð?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?вÑ?еÑ? поÑ?ока вÑ?вода"
 
-#: ../camel/providers/imap/camel-imap-command.c:188
-#: ../camel/providers/imap/camel-imap-command.c:272
+#: ../camel/providers/imap/camel-imap-command.c:186
+#: ../camel/providers/imap/camel-imap-command.c:270
 msgid "No input stream"
 msgstr "Ð?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?вÑ?еÑ? поÑ?ок ввода"
 
-#: ../camel/providers/imap/camel-imap-command.c:231
-#: ../camel/providers/imap/camel-imap-command.c:280
-#: ../camel/providers/imap/camel-imap-command.c:494
-#: ../camel/providers/imap/camel-imap-store.c:3037
+#: ../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:3051
 msgid "Operation cancelled"
 msgstr "Ð?пеÑ?аÑ?иÑ? оÑ?менена"
 
-#: ../camel/providers/imap/camel-imap-command.c:333
-#: ../camel/providers/imap/camel-imap-store.c:3040
+#: ../camel/providers/imap/camel-imap-command.c:331
+#: ../camel/providers/imap/camel-imap-store.c:3056
 #, 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:354
+#: ../camel/providers/imap/camel-imap-command.c:352
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -2932,107 +2937,107 @@ msgstr ""
 "ТÑ?евожное Ñ?ообÑ?ение оÑ? Ñ?еÑ?веÑ?а IMAP %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:423
+#: ../camel/providers/imap/camel-imap-command.c:421
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Ð?еожиданнÑ?й оÑ?веÑ? оÑ? Ñ?еÑ?веÑ?а IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:433
+#: ../camel/providers/imap/camel-imap-command.c:431
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Сбой командÑ? IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:508
+#: ../camel/providers/imap/camel-imap-command.c:506
 msgid "Server response ended too soon."
 msgstr "Ð?е полнÑ?й оÑ?веÑ? Ñ?еÑ?веÑ?а."
 
-#: ../camel/providers/imap/camel-imap-command.c:715
+#: ../camel/providers/imap/camel-imap-command.c:712
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Ð?Ñ?веÑ? Ñ?еÑ?веÑ?а IMAP не Ñ?одеÑ?жиÑ? инÑ?оÑ?маÑ?ии о %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:751
+#: ../camel/providers/imap/camel-imap-command.c:748
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Ð?еожиданнÑ?й оÑ?веÑ? \"OK\" оÑ? Ñ?еÑ?веÑ?а IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:89
+#: ../camel/providers/imap/camel-imap-folder.c:91
 msgid "Always check for new mail in this folder"
 msgstr "Ð?Ñ?егда пÑ?овеÑ?Ñ?Ñ?Ñ? налиÑ?ие новой поÑ?Ñ?Ñ? в Ñ?Ñ?ой папке"
 
-#: ../camel/providers/imap/camel-imap-folder.c:246
+#: ../camel/providers/imap/camel-imap-folder.c:277
 #, 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:891
+#: ../camel/providers/imap/camel-imap-folder.c:919
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "Ð?оиÑ?к изменÑ?ннÑ?Ñ? Ñ?ообÑ?ений в %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1950
+#: ../camel/providers/imap/camel-imap-folder.c:1987
 #, c-format
 msgid "Unexpected response status '%s' after APPEND command"
 msgstr "Ð?еожиданнÑ?й Ñ?Ñ?аÑ?Ñ?Ñ? «%s» в оÑ?веÑ?е на командÑ? APPEND"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1965
+#: ../camel/providers/imap/camel-imap-folder.c:2002
 msgid "No response on continuation after APPEND command"
 msgstr "Ð?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?вÑ?еÑ? оÑ?веÑ? или пÑ?одолжение поÑ?ле командÑ? APPEND"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2010
+#: ../camel/providers/imap/camel-imap-folder.c:2047
 msgid "Unknown error occurred during APPEND command!"
 msgstr "Ð?о вÑ?емÑ? вÑ?полнениÑ? командÑ? APPEND возникла неизвеÑ?Ñ?наÑ? оÑ?ибка!"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2842
+#: ../camel/providers/imap/camel-imap-folder.c:2878
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ение: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2877
+#: ../camel/providers/imap/camel-imap-folder.c:2913
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ение Ñ? иденÑ?иÑ?икаÑ?оÑ?ом %s: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2878
+#: ../camel/providers/imap/camel-imap-folder.c:2914
 msgid "No such message available."
 msgstr "Ð?еÑ? Ñ?акого Ñ?ообÑ?ениÑ?."
 
-#: ../camel/providers/imap/camel-imap-folder.c:2932
-#: ../camel/providers/imap/camel-imap-folder.c:3753
-#: ../camel/providers/nntp/camel-nntp-folder.c:239
+#: ../camel/providers/imap/camel-imap-folder.c:2975
+#: ../camel/providers/imap/camel-imap-folder.c:3808
+#: ../camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "ЭÑ?о Ñ?ообÑ?ение в наÑ?Ñ?оÑ?Ñ?ий моменÑ? недоÑ?Ñ?Ñ?пно"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3567
+#: ../camel/providers/imap/camel-imap-folder.c:3624
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "Ð?еполнÑ?й оÑ?веÑ? Ñ?еÑ?веÑ?а: не пÑ?едоÑ?Ñ?авлена инÑ?оÑ?маÑ?иÑ? о Ñ?ообÑ?ении %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3575
+#: ../camel/providers/imap/camel-imap-folder.c:3632
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "Ð?еполнÑ?й оÑ?веÑ? Ñ?еÑ?веÑ?а: оÑ?Ñ?Ñ?Ñ?Ñ?Ñ?вÑ?еÑ? UID длÑ? Ñ?ообÑ?ениÑ? %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3791
+#: ../camel/providers/imap/camel-imap-folder.c:3846
 msgid "Could not find message body in FETCH response."
 msgstr "Ð?е Ñ?далоÑ?Ñ? найÑ?и Ñ?ело Ñ?ообÑ?ениÑ? в оÑ?веÑ?е на командÑ? FETCH."
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:182
-#: ../camel/providers/imap/camel-imap-message-cache.c:246
+#: ../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:333
-#: ../camel/providers/imap/camel-imap-message-cache.c:390
-#: ../camel/providers/imap/camel-imap-message-cache.c:421
-#: ../camel/providers/imap/camel-imap-message-cache.c:453
+#: ../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
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Сбой пÑ?и кÑ?Ñ?иÑ?овании Ñ?ообÑ?ениÑ? %s: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:533
+#: ../camel/providers/imap/camel-imap-message-cache.c:530
 #, c-format
 msgid "Failed to cache %s: %s"
 msgstr "Сбой пÑ?и кÑ?Ñ?иÑ?овании %s: %s"
@@ -3042,12 +3047,12 @@ 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:50
+#: ../camel/providers/imap4/camel-imap4-provider.c:49
 msgid "Namespace:"
 msgstr "Ð?Ñ?оÑ?Ñ?Ñ?анÑ?Ñ?во имÑ?н:"
 
 #: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:54
+#: ../camel/providers/imap4/camel-imap4-provider.c:53
 msgid "_Apply filters to new messages in INBOX on this server"
 msgstr ""
 "_Ð?Ñ?имениÑ?Ñ? Ñ?илÑ?Ñ?Ñ?Ñ? к новÑ?м Ñ?ообÑ?ениÑ?м в папке \"Ð?Ñ?одÑ?Ñ?ие\" на Ñ?Ñ?ом Ñ?еÑ?веÑ?е"
@@ -3057,7 +3062,7 @@ msgid "Check new messages for Jun_k contents"
 msgstr "Ð?Ñ?овеÑ?Ñ?Ñ?Ñ?, Ñ?влÑ?Ñ?Ñ?Ñ?Ñ? ли новÑ?е Ñ?ообÑ?ениÑ? _Ñ?памом"
 
 #: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:60
+#: ../camel/providers/imap4/camel-imap4-provider.c:59
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "Ð?вÑ?омаÑ?иÑ?еÑ?ки Ñ?инÑ?Ñ?они_зиÑ?оваÑ?Ñ? Ñ?даленнÑ?Ñ? поÑ?Ñ?Ñ? локалÑ?но"
 
@@ -3077,36 +3082,36 @@ msgstr ""
 "незаÑ?иÑ?Ñ?ованного паÑ?олÑ?."
 
 #: ../camel/providers/imap/camel-imap-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:214
+#: ../camel/providers/imap4/camel-imap4-store.c:210
 #, c-format
 msgid "IMAP server %s"
 msgstr "СеÑ?веÑ? IMAP %s"
 
 #: ../camel/providers/imap/camel-imap-store.c:439
-#: ../camel/providers/imap4/camel-imap4-store.c:216
+#: ../camel/providers/imap4/camel-imap4-store.c:212
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "СеÑ?виÑ? IMAP длÑ? %s на %s"
 
 #: ../camel/providers/imap/camel-imap-store.c:568
 #: ../camel/providers/imap/camel-imap-store.c:583
-#: ../camel/providers/imap4/camel-imap4-store.c:251
-#: ../camel/providers/imap4/camel-imap4-store.c:266
-#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/nntp/camel-nntp-store.c:198
-#: ../camel/providers/pop3/camel-pop3-store.c:172
-#: ../camel/providers/pop3/camel-pop3-store.c:186
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
-#: ../camel/providers/smtp/camel-smtp-transport.c:275
+#: ../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:170
+#: ../camel/providers/pop3/camel-pop3-store.c:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:259
+#: ../camel/providers/smtp/camel-smtp-transport.c:274
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? к %s: %s"
 
 #: ../camel/providers/imap/camel-imap-store.c:569
-#: ../camel/providers/imap4/camel-imap4-store.c:252
-#: ../camel/providers/nntp/camel-nntp-store.c:184
-#: ../camel/providers/pop3/camel-pop3-store.c:173
-#: ../camel/providers/smtp/camel-smtp-transport.c:261
+#: ../camel/providers/imap4/camel-imap4-store.c:248
+#: ../camel/providers/nntp/camel-nntp-store.c:183
+#: ../camel/providers/pop3/camel-pop3-store.c:171
+#: ../camel/providers/smtp/camel-smtp-transport.c:260
 msgid "SSL unavailable"
 msgstr "SSL недоÑ?Ñ?Ñ?пен"
 
@@ -3119,15 +3124,15 @@ msgstr "Соединение оÑ?менено"
 #: ../camel/providers/imap/camel-imap-store.c:710
 #: ../camel/providers/imap/camel-imap-store.c:716
 #: ../camel/providers/imap/camel-imap-store.c:742
-#: ../camel/providers/imap4/camel-imap4-store.c:314
-#: ../camel/providers/imap4/camel-imap4-store.c:329
-#: ../camel/providers/imap4/camel-imap4-store.c:338
+#: ../camel/providers/imap4/camel-imap4-store.c:310
+#: ../camel/providers/imap4/camel-imap4-store.c:325
+#: ../camel/providers/imap4/camel-imap4-store.c:334
 #, 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:692
-#: ../camel/providers/smtp/camel-smtp-transport.c:333
+#: ../camel/providers/smtp/camel-smtp-transport.c:332
 msgid "STARTTLS not supported"
 msgstr "STARTTLS не поддеÑ?живаеÑ?Ñ?Ñ?"
 
@@ -3136,8 +3141,8 @@ msgid "SSL negotiations failed"
 msgstr "Сбой Ñ?оглаÑ?ований SSL"
 
 #: ../camel/providers/imap/camel-imap-store.c:717
-#: ../camel/providers/imap4/camel-imap4-store.c:339
-#: ../camel/providers/smtp/camel-smtp-transport.c:372
+#: ../camel/providers/imap4/camel-imap4-store.c:335
+#: ../camel/providers/smtp/camel-smtp-transport.c:371
 msgid "SSL is not available in this build"
 msgstr "SSL не поддеÑ?живаеÑ?Ñ?Ñ? в Ñ?Ñ?ой Ñ?боÑ?ке"
 
@@ -3149,43 +3154,30 @@ 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:1053
 #: ../camel/providers/imap/camel-imap-store.c:2400
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:368
-#: ../camel/providers/imap4/camel-imap4-store.c:1408
-#: ../camel/providers/local/camel-maildir-folder.c:78
+#: ../camel/providers/imap4/camel-imap4-store-summary.c:356
+#: ../camel/providers/imap4/camel-imap4-store.c:1403
+#: ../camel/providers/local/camel-maildir-folder.c:80
 #: ../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:464
+#: ../camel/providers/local/camel-spool-store.c:463
 #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
 msgid "Inbox"
 msgstr "Ð?Ñ?одÑ?Ñ?ие"
 
-#: ../camel/providers/imap/camel-imap-store.c:1055
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
-msgid "Drafts"
-msgstr "ЧеÑ?новики"
-
-#: ../camel/providers/imap/camel-imap-store.c:1057
-msgid "Sent"
-msgstr "Ð?Ñ?пÑ?авленнÑ?е"
-
-#: ../camel/providers/imap/camel-imap-store.c:1059
-msgid "Templates"
-msgstr "ШаблонÑ?"
-
-#: ../camel/providers/imap/camel-imap-store.c:1304
+#: ../camel/providers/imap/camel-imap-store.c:1305
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "СеÑ?веÑ? IMAP %s не поддеÑ?живаеÑ? заÑ?Ñ?ебованнÑ?й Ñ?ип аÑ?Ñ?енÑ?иÑ?икаÑ?ии %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1314
-#: ../camel/providers/smtp/camel-smtp-transport.c:507
+#: ../camel/providers/imap/camel-imap-store.c:1315
+#: ../camel/providers/smtp/camel-smtp-transport.c:506
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ð?Ñ?Ñ?енÑ?иÑ?икаÑ?иÑ? %s не поддеÑ?живаеÑ?Ñ?Ñ?"
 
-#: ../camel/providers/imap/camel-imap-store.c:1388
+#: ../camel/providers/imap/camel-imap-store.c:1389
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3198,7 +3190,7 @@ msgstr ""
 
 #: ../camel/providers/imap/camel-imap-store.c:1861
 #: ../camel/providers/imap/camel-imap-store.c:2242
-#: ../camel/providers/imap4/camel-imap4-store.c:959
+#: ../camel/providers/imap4/camel-imap4-store.c:954
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -3217,50 +3209,54 @@ msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? папкÑ? «%s»: папка Ñ?Ñ?Ñ?
 msgid "Unknown parent folder: %s"
 msgstr "Ð?еизвеÑ?Ñ?наÑ? Ñ?одиÑ?елÑ?Ñ?каÑ? папка: %s"
 
-#: ../camel/providers/imap4/camel-imap4-command.c:576
-#: ../camel/providers/imap4/camel-imap4-command.c:583
+#: ../camel/providers/imap/camel-imap-store.c:3053
+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:686
+#: ../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:221
+#: ../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:450
+#: ../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:456
+#: ../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:1433
+#: ../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:1435
+#: ../camel/providers/imap4/camel-imap4-engine.c:1416
 msgid "service unavailable"
 msgstr "Ñ?лÑ?жба недоÑ?Ñ?Ñ?пна"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:1569
-#: ../camel/providers/imap4/camel-imap4-engine.c:1608
-#: ../camel/providers/imap4/camel-imap4-engine.c:1653
-#: ../camel/providers/imap4/camel-imap4-engine.c:1709
+#: ../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:89
+#: ../camel/providers/imap4/camel-imap4-folder.c:87
 msgid ""
 "Enable extended Mailing-List detection required for some filter and vFolder "
 "rules"
@@ -3268,122 +3264,122 @@ msgstr ""
 "Ð?клÑ?Ñ?иÑ?Ñ? опÑ?еделение Ñ?пиÑ?ков Ñ?аÑ?Ñ?Ñ?лки, Ñ?Ñ?ебÑ?Ñ?Ñ?ееÑ?Ñ? длÑ? некоÑ?оÑ?Ñ?Ñ? Ñ?илÑ?Ñ?Ñ?ов и "
 "пÑ?авил vFolder"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:90
+#: ../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:91
+#: ../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:432
+#: ../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:491
+#: ../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:497
+#: ../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:637
+#: ../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:642
+#: ../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:898
+#: ../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:903
+#: ../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:947
+#: ../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:1040
+#: ../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:1070
+#: ../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:1190
+#: ../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:1194
+#: ../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:1202
+#: ../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:1206
+#: ../camel/providers/imap4/camel-imap4-folder.c:1198
 #, c-format
 msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
 msgstr ""
 "Ð?е Ñ?далоÑ?Ñ? Ñ?копиÑ?оваÑ?Ñ? Ñ?ообÑ?ениÑ? из папки «%s» в папкÑ? «%s»: невеÑ?наÑ? команда"
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:56
+#: ../camel/providers/imap4/camel-imap4-provider.c:55
 msgid "Check new messages for _Junk contents"
 msgstr "Ð?Ñ?овеÑ?Ñ?Ñ?Ñ?, Ñ?влÑ?Ñ?Ñ?Ñ?Ñ? ли новÑ?е Ñ?ообÑ?ениÑ? Ñ?памом"
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:58
+#: ../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:67
+#: ../camel/providers/imap4/camel-imap4-provider.c:66
 msgid "IMAP4rev1"
 msgstr "IMAP4rev1"
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:69
+#: ../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:86
+#: ../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:263
+#: ../camel/providers/imap4/camel-imap4-store.c:259
 #: ../camel/providers/imapp/camel-imapp-store.c:249
-#: ../camel/providers/nntp/camel-nntp-store.c:195
-#: ../camel/providers/nntp/camel-nntp-store.c:214
-#: ../camel/providers/pop3/camel-pop3-store.c:183
-#: ../camel/providers/smtp/camel-smtp-transport.c:272
+#: ../camel/providers/nntp/camel-nntp-store.c:194
+#: ../camel/providers/nntp/camel-nntp-store.c:213
+#: ../camel/providers/pop3/camel-pop3-store.c:181
+#: ../camel/providers/smtp/camel-smtp-transport.c:271
 msgid "Connection canceled"
 msgstr "Соединение оÑ?менено"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:300
+#: ../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 "
@@ -3392,154 +3388,154 @@ msgstr ""
 "Ð?е Ñ?далоÑ?Ñ? подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? к Ñ?еÑ?веÑ?Ñ? IMAP %s в заÑ?иÑ?енном Ñ?ежиме: Ñ?еÑ?веÑ? не "
 "поддеÑ?живаеÑ? STARTTLS"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:330
-#: ../camel/providers/pop3/camel-pop3-store.c:251
+#: ../camel/providers/imap4/camel-imap4-store.c:326
+#: ../camel/providers/pop3/camel-pop3-store.c:249
 msgid "TLS negotiations failed"
 msgstr "Сбой Ñ?оглаÑ?ованиÑ? TLS"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:415
+#: ../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:538
+#: ../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:701
-#: ../camel/providers/imap4/camel-imap4-store.c:969
+#: ../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:740
+#: ../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:821
+#: ../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:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
+#: ../camel/providers/imap4/camel-imap4-store.c:818
+#: ../camel/providers/imap4/camel-imap4-store.c:1574
 msgid "Bad command"
 msgstr "Ð?евеÑ?наÑ? команда"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:902
+#: ../camel/providers/imap4/camel-imap4-store.c:897
 #, c-format
 msgid "Cannot create folder '%s': Invalid mailbox name"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? папкÑ? «%s»: невеÑ?ное имÑ? поÑ?Ñ?ового Ñ?Ñ?ика"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:907
+#: ../camel/providers/imap4/camel-imap4-store.c:902
 #, c-format
 msgid "Cannot create folder '%s': Bad command"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? папкÑ? «%s»: невеÑ?наÑ? команда"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1013
+#: ../camel/providers/imap4/camel-imap4-store.c:1008
 #, c-format
 msgid "Cannot delete folder '%s': Special folder"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?далиÑ?Ñ? папкÑ? «%s»: Ñ?пеÑ?иалÑ?наÑ? папка"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1020
+#: ../camel/providers/imap4/camel-imap4-store.c:1015
 msgid "Cannot delete IMAP folders in offline mode."
 msgstr "Ð?евозможно Ñ?далиÑ?Ñ? папки IMAP в авÑ?ономном Ñ?ежиме."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
+#: ../camel/providers/imap4/camel-imap4-store.c:1074
 #, c-format
 msgid "Cannot delete folder '%s': Invalid mailbox name"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?далиÑ?Ñ? папкÑ? «%s»: невеÑ?ное имÑ? поÑ?Ñ?ового Ñ?Ñ?ика"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1084
+#: ../camel/providers/imap4/camel-imap4-store.c:1079
 #, c-format
 msgid "Cannot delete folder '%s': Bad command"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?далиÑ?Ñ? папкÑ?: «%s»: невеÑ?наÑ? команда"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1104
+#: ../camel/providers/imap4/camel-imap4-store.c:1099
 #, c-format
 msgid "Cannot rename folder '%s' to '%s': Special folder"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пеÑ?еименоваÑ?Ñ? папкÑ? «%s» в «%s»: Ñ?пеÑ?иалÑ?наÑ? папка"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1111
+#: ../camel/providers/imap4/camel-imap4-store.c:1106
 msgid "Cannot rename IMAP folders in offline mode."
 msgstr "Ð?евозможно пеÑ?еименоваÑ?Ñ? папки IMAP в авÑ?ономном Ñ?ежиме."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
+#: ../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/imap4/camel-imap4-store.c:1147
+#: ../camel/providers/imap4/camel-imap4-store.c:1142
 #, c-format
 msgid "Cannot rename folder '%s' to '%s': Bad command"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пеÑ?еименоваÑ?Ñ? папкÑ? «%s» в «%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:1577
+#: ../camel/providers/imap4/camel-imap4-store.c:1572
 #, c-format
 msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?ведениÑ? %s длÑ? Ñ?аблона «%s» на Ñ?еÑ?веÑ?е IMAP %s: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1638
+#: ../camel/providers/imap4/camel-imap4-store.c:1633
 msgid "Cannot subscribe to IMAP folders in offline mode."
 msgstr "Ð?евозможно подпиÑ?аÑ?Ñ?Ñ?Ñ? на папки IMAP в авÑ?ономном Ñ?ежиме."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
+#: ../camel/providers/imap4/camel-imap4-store.c:1678
 #, c-format
 msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
 msgstr "Ð?е Ñ?далоÑ?Ñ? подпиÑ?аÑ?Ñ?Ñ?Ñ? на папкÑ? «%s»: невеÑ?ное имÑ? поÑ?Ñ?ового Ñ?Ñ?ика"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1688
+#: ../camel/providers/imap4/camel-imap4-store.c:1683
 #, c-format
 msgid "Cannot subscribe to folder '%s': Bad command"
 msgstr "Ð?е Ñ?далоÑ?Ñ? подпиÑ?аÑ?Ñ?Ñ?Ñ? на папкÑ? «%s»: невеÑ?наÑ? команда"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1710
+#: ../camel/providers/imap4/camel-imap4-store.c:1705
 msgid "Cannot unsubscribe from IMAP folders in offline mode."
 msgstr "Ð?евозможно оÑ?пиÑ?аÑ?Ñ?Ñ?Ñ? оÑ? папок IMAP в авÑ?ономном Ñ?ежиме."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
+#: ../camel/providers/imap4/camel-imap4-store.c:1750
 #, c-format
 msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?пиÑ?аÑ?Ñ?Ñ?Ñ? оÑ? папки «%s»: невеÑ?ное имÑ? поÑ?Ñ?ового Ñ?Ñ?ика"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1760
+#: ../camel/providers/imap4/camel-imap4-store.c:1755
 #, c-format
 msgid "Cannot unsubscribe from folder '%s': Bad command"
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?пиÑ?аÑ?Ñ?Ñ?Ñ? оÑ? папки «%s»: Ð?евеÑ?наÑ? команда"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1596
+#: ../camel/providers/imap4/camel-imap4-summary.c:1590
 msgid "Scanning for changed messages"
 msgstr "Ð?оиÑ?к изменÑ?ннÑ?Ñ? Ñ?ообÑ?ений"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1617
+#: ../camel/providers/imap4/camel-imap4-summary.c:1611
 #, c-format
 msgid "IMAP server %s is in an inconsistent state."
 msgstr "СеÑ?веÑ? IMAP %s наÑ?одиÑ?Ñ?Ñ? в неÑ?Ñ?Ñ?ойÑ?ивом Ñ?оÑ?Ñ?оÑ?нии."
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1644
+#: ../camel/providers/imap4/camel-imap4-summary.c:1638
 msgid "Fetching envelopes of new messages"
 msgstr "Ð?олÑ?Ñ?ение конвеÑ?Ñ?ов новÑ?Ñ? Ñ?ообÑ?ений"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:437
+#: ../camel/providers/imap4/camel-imap4-utils.c:429
 #, c-format
 msgid "Unexpected token in response from IMAP server %s: "
 msgstr "Ð?еожиданнÑ?й Ñ?окен в оÑ?веÑ?е Ñ?еÑ?веÑ?а IMAP %s: "
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:460
+#: ../camel/providers/imap4/camel-imap4-utils.c:452
 msgid "No data"
 msgstr "Ð?еÑ? даннÑ?Ñ?"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:623
+#: ../camel/providers/imap4/camel-imap4-utils.c:613
 #, c-format
 msgid "IMAP server %s unexpectedly disconnected: %s"
 msgstr "СеÑ?веÑ? IMAP %s неожиданно оÑ?клÑ?Ñ?илÑ?Ñ?: %s"
 
 #: ../camel/providers/imapp/camel-imapp-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:41
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
 msgid "Message storage"
 msgstr "Ð¥Ñ?анилиÑ?е Ñ?ообÑ?ений"
 
@@ -3565,30 +3561,30 @@ msgstr ""
 msgid "Could not connect to %s (port %s): %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? к %s (поÑ?Ñ? %s): %s"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:349
+#: ../camel/providers/imapp/camel-imapp-store.c:348
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? к Ñ?еÑ?веÑ?Ñ? POP %s"
 
-#: ../camel/providers/local/camel-local-folder.c:176
+#: ../camel/providers/local/camel-local-folder.c:178
 msgid "Index message body data"
 msgstr "Ð?ндекÑ?иÑ?оваÑ?Ñ? даннÑ?е Ñ?ела Ñ?ообÑ?ениÑ?"
 
 #. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:392
+#: ../camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:396
 #: ../camel/providers/local/camel-local-folder.c:399
+#: ../camel/providers/local/camel-local-folder.c:402
 #, c-format
-msgid "mailbox:%s (%s)"
+msgid "mailbox: %s (%s)"
 msgstr "поÑ?Ñ?овÑ?й Ñ?Ñ?ик: %s: (%s)"
 
 #. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:403
+#: ../camel/providers/local/camel-local-folder.c:406
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -3655,7 +3651,7 @@ msgstr "СÑ?андаÑ?Ñ?нÑ?й длÑ? Unix каÑ?алог оÑ?еÑ?едей Ñ?и
 #: ../camel/providers/local/camel-local-store.c:165
 #: ../camel/providers/local/camel-local-store.c:276
 #: ../camel/providers/local/camel-mbox-store.c:359
-#: ../camel/providers/local/camel-spool-store.c:129
+#: ../camel/providers/local/camel-spool-store.c:128
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Ð?Ñ?ноÑ?иÑ?елÑ?нÑ?й пÑ?Ñ?Ñ? к Ñ?Ñ?анилиÑ?Ñ? %s"
@@ -3707,27 +3703,27 @@ msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?далиÑ?Ñ? меÑ?а-Ñ?айл папки «%s»:
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? Ñ?ообÑ?ение к кÑ?аÑ?кой инÑ?оÑ?маÑ?ии: пÑ?иÑ?ина неизвеÑ?Ñ?на"
 
-#: ../camel/providers/local/camel-maildir-folder.c:222
+#: ../camel/providers/local/camel-maildir-folder.c:244
 msgid "Maildir append message canceled"
 msgstr "Ð?обавление Ñ?ообÑ?ениÑ? к папке поÑ?Ñ?ового каÑ?алога оÑ?менено"
 
-#: ../camel/providers/local/camel-maildir-folder.c:225
+#: ../camel/providers/local/camel-maildir-folder.c:247
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? Ñ?ообÑ?ение к папке поÑ?Ñ?ового каÑ?алога: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:247
-#: ../camel/providers/local/camel-maildir-folder.c:274
-#: ../camel/providers/local/camel-maildir-folder.c:288
-#: ../camel/providers/local/camel-maildir-folder.c:297
-#: ../camel/providers/local/camel-mbox-folder.c:346
-#: ../camel/providers/local/camel-mbox-folder.c:398
-#: ../camel/providers/local/camel-mbox-folder.c:419
-#: ../camel/providers/local/camel-mbox-folder.c:450
-#: ../camel/providers/local/camel-mbox-folder.c:458
-#: ../camel/providers/local/camel-mh-folder.c:213
-#: ../camel/providers/local/camel-mh-folder.c:224
-#: ../camel/providers/local/camel-mh-folder.c:233
+#: ../camel/providers/local/camel-maildir-folder.c:277
+#: ../camel/providers/local/camel-maildir-folder.c:309
+#: ../camel/providers/local/camel-maildir-folder.c:323
+#: ../camel/providers/local/camel-maildir-folder.c:331
+#: ../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:244
+#: ../camel/providers/local/camel-mh-folder.c:255
+#: ../camel/providers/local/camel-mh-folder.c:263
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3736,7 +3732,7 @@ msgstr ""
 "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ение: %s из папки %s\n"
 "  %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:298
+#: ../camel/providers/local/camel-maildir-folder.c:332
 msgid "Invalid message contents"
 msgstr "Ð?евеÑ?ное Ñ?одеÑ?жание Ñ?ообÑ?ениÑ?"
 
@@ -3779,60 +3775,60 @@ msgid "not a maildir directory"
 msgstr "не Ñ?влÑ?еÑ?Ñ?Ñ? поÑ?Ñ?овÑ?м каÑ?алогом"
 
 #: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:331
-#: ../camel/providers/local/camel-spool-store.c:345
+#: ../camel/providers/local/camel-spool-store.c:330
+#: ../camel/providers/local/camel-spool-store.c:344
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?оÑ?каниÑ?оваÑ?Ñ? папкÑ? «%s»: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:439
-#: ../camel/providers/local/camel-maildir-summary.c:558
+#: ../camel/providers/local/camel-maildir-summary.c:437
+#: ../camel/providers/local/camel-maildir-summary.c:556
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? пÑ?Ñ?Ñ? к папке поÑ?Ñ?ового каÑ?алога: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:551
+#: ../camel/providers/local/camel-maildir-summary.c:549
 msgid "Checking folder consistency"
 msgstr "Ð?Ñ?овеÑ?ка Ñ?одеÑ?жаниÑ? каÑ?алогов"
 
-#: ../camel/providers/local/camel-maildir-summary.c:656
+#: ../camel/providers/local/camel-maildir-summary.c:658
 msgid "Checking for new messages"
 msgstr "Ð?Ñ?овеÑ?ка новÑ?Ñ? Ñ?ообÑ?ений"
 
-#: ../camel/providers/local/camel-maildir-summary.c:742
-#: ../camel/providers/local/camel-mbox-summary.c:529
-#: ../camel/providers/local/camel-mbox-summary.c:711
-#: ../camel/providers/local/camel-mbox-summary.c:831
+#: ../camel/providers/local/camel-maildir-summary.c:748
+#: ../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
 msgid "Storing folder"
 msgstr "СоÑ?Ñ?анение папки"
 
-#: ../camel/providers/local/camel-mbox-folder.c:159
+#: ../camel/providers/local/camel-mbox-folder.c:167
 #: ../camel/providers/local/camel-spool-folder.c:150
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? заблокиÑ?оваÑ?Ñ? папкÑ? %s: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:220
+#: ../camel/providers/local/camel-mbox-folder.c:231
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? поÑ?Ñ?овÑ?й Ñ?Ñ?ик: %s: %s\n"
 
-#: ../camel/providers/local/camel-mbox-folder.c:281
+#: ../camel/providers/local/camel-mbox-folder.c:297
 msgid "Mail append canceled"
 msgstr "Ð?обавление поÑ?Ñ?Ñ? оÑ?менено"
 
-#: ../camel/providers/local/camel-mbox-folder.c:284
+#: ../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:451
+#: ../camel/providers/local/camel-mbox-folder.c:466
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Ð?идимо, папка невоÑ?Ñ?ановимо иÑ?поÑ?Ñ?ена."
 
-#: ../camel/providers/local/camel-mbox-folder.c:459
-#: ../camel/providers/local/camel-mh-folder.c:234
+#: ../camel/providers/local/camel-mbox-folder.c:474
+#: ../camel/providers/local/camel-mh-folder.c:264
 msgid "Message construction failed."
 msgstr "Сбой пÑ?и Ñ?оздании Ñ?ообÑ?ениÑ?."
 
@@ -3901,85 +3897,85 @@ msgstr "Ð?е Ñ?далоÑ?Ñ? пеÑ?еименоваÑ?Ñ? «%s»: «%s»: %s"
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пеÑ?еименоваÑ?Ñ? «%s» в %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:535
+#: ../camel/providers/local/camel-mbox-summary.c:532
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? папкÑ?: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:585
+#: ../camel/providers/local/camel-mbox-summary.c:582
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "ФаÑ?алÑ?наÑ? оÑ?ибка поÑ?Ñ?ового анализаÑ?оÑ?а возле позиÑ?ии %ld в папке %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:648
+#: ../camel/providers/local/camel-mbox-summary.c:659
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?овеÑ?иÑ?Ñ? папкÑ?: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:716
-#: ../camel/providers/local/camel-mbox-summary.c:836
+#: ../camel/providers/local/camel-mbox-summary.c:727
+#: ../camel/providers/local/camel-mbox-summary.c:847
 #: ../camel/providers/local/camel-spool-summary.c:155
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? Ñ?айл: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:728
+#: ../camel/providers/local/camel-mbox-summary.c:739
 #: ../camel/providers/local/camel-spool-summary.c:168
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? вÑ?еменнÑ?й поÑ?Ñ?овÑ?й Ñ?Ñ?ик: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:741
-#: ../camel/providers/local/camel-mbox-summary.c:945
+#: ../camel/providers/local/camel-mbox-summary.c:752
+#: ../camel/providers/local/camel-mbox-summary.c:956
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? закÑ?Ñ?Ñ?Ñ? иÑ?Ñ?однÑ?Ñ? папкÑ? %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:750
+#: ../camel/providers/local/camel-mbox-summary.c:761
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? закÑ?Ñ?Ñ?Ñ? вÑ?еменнÑ?Ñ? папкÑ?: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:765
+#: ../camel/providers/local/camel-mbox-summary.c:776
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пеÑ?еименоваÑ?Ñ? папкÑ?: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:847
-#: ../camel/providers/local/camel-mbox-summary.c:1075
+#: ../camel/providers/local/camel-mbox-summary.c:858
+#: ../camel/providers/local/camel-mbox-summary.c:1083
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оÑ?Ñ?аниÑ?Ñ? папкÑ?: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:886
-#: ../camel/providers/local/camel-mbox-summary.c:894
-#: ../camel/providers/local/camel-mbox-summary.c:1105
+#: ../camel/providers/local/camel-mbox-summary.c:897
+#: ../camel/providers/local/camel-mbox-summary.c:905
 #: ../camel/providers/local/camel-mbox-summary.c:1113
+#: ../camel/providers/local/camel-mbox-summary.c:1121
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Сводка и папка Ñ?аÑ?Ñ?одÑ?Ñ?Ñ?Ñ? даже поÑ?ле Ñ?инÑ?Ñ?онизаÑ?ии"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1038
-#: ../camel/providers/local/camel-spool-summary.c:336
+#: ../camel/providers/local/camel-mbox-summary.c:1046
+#: ../camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ð?еизвеÑ?Ñ?наÑ? оÑ?ибка: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1181
-#: ../camel/providers/local/camel-mbox-summary.c:1207
+#: ../camel/providers/local/camel-mbox-summary.c:1189
+#: ../camel/providers/local/camel-mbox-summary.c:1215
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "Сбой запиÑ?и во вÑ?еменнÑ?й поÑ?Ñ?овÑ?й Ñ?Ñ?ик: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1198
+#: ../camel/providers/local/camel-mbox-summary.c:1206
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "Сбой запиÑ?и во вÑ?еменнÑ?й поÑ?Ñ?овÑ?й Ñ?Ñ?ик: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:178
+#: ../camel/providers/local/camel-mh-folder.c:184
 msgid "MH append message canceled"
 msgstr "Ð?обавление Ñ?ообÑ?ениÑ? в папкÑ? оÑ?менено"
 
-#: ../camel/providers/local/camel-mh-folder.c:181
+#: ../camel/providers/local/camel-mh-folder.c:187
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? Ñ?ообÑ?ение к папке mh: %s: %s"
@@ -3994,27 +3990,27 @@ msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? папкÑ? «%s»: %s"
 msgid "Cannot get folder '%s': not a directory."
 msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? папкÑ? «%s»: не Ñ?влÑ?еÑ?Ñ?Ñ? каÑ?алогом."
 
-#: ../camel/providers/local/camel-mh-summary.c:264
+#: ../camel/providers/local/camel-mh-summary.c:240
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? MH каÑ?алог: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:135
+#: ../camel/providers/local/camel-spool-store.c:134
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? Ñ?айл накоплениÑ? «%s»: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:147
+#: ../camel/providers/local/camel-spool-store.c:146
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "Ð?акопиÑ?елÑ? «%s» не Ñ?влÑ?еÑ?Ñ?Ñ? обÑ?Ñ?нÑ?м Ñ?айлом или каÑ?алогом"
 
-#: ../camel/providers/local/camel-spool-store.c:166
+#: ../camel/providers/local/camel-spool-store.c:165
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "Ð?апка «%s/%s» не Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?."
 
-#: ../camel/providers/local/camel-spool-store.c:176
+#: ../camel/providers/local/camel-spool-store.c:175
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -4023,12 +4019,12 @@ msgstr ""
 "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? папкÑ? «%s»:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:180
+#: ../camel/providers/local/camel-spool-store.c:179
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "Ð?апка «%s» не Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?."
 
-#: ../camel/providers/local/camel-spool-store.c:185
+#: ../camel/providers/local/camel-spool-store.c:184
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -4037,48 +4033,48 @@ msgstr ""
 "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? папкÑ? «%s»:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:193
+#: ../camel/providers/local/camel-spool-store.c:192
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "«%s» не Ñ?влÑ?еÑ?Ñ?Ñ? Ñ?айлом поÑ?Ñ?ового Ñ?Ñ?ика."
 
-#: ../camel/providers/local/camel-spool-store.c:210
+#: ../camel/providers/local/camel-spool-store.c:209
 msgid "Store does not support an INBOX"
 msgstr "Ð¥Ñ?анилиÑ?е не поддеÑ?живаеÑ? INBOX"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:221
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Файл поÑ?Ñ?ового Ñ?пÑ?ла %s"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:221
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Ð?еÑ?ево папки Ñ?пÑ?ла %s"
 
-#: ../camel/providers/local/camel-spool-store.c:230
+#: ../camel/providers/local/camel-spool-store.c:229
 msgid "Spool folders cannot be renamed"
 msgstr "Ð?апки Ñ?пÑ?ла не могÑ?Ñ? бÑ?Ñ?Ñ? пеÑ?еименованÑ?"
 
-#: ../camel/providers/local/camel-spool-store.c:238
+#: ../camel/providers/local/camel-spool-store.c:237
 msgid "Spool folders cannot be deleted"
 msgstr "Ð?апки Ñ?пÑ?ла не могÑ?Ñ? бÑ?Ñ?Ñ? Ñ?даленÑ?"
 
-#: ../camel/providers/local/camel-spool-summary.c:181
-#: ../camel/providers/local/camel-spool-summary.c:191
-#: ../camel/providers/local/camel-spool-summary.c:201
+#: ../camel/providers/local/camel-spool-summary.c:180
+#: ../camel/providers/local/camel-spool-summary.c:190
+#: ../camel/providers/local/camel-spool-summary.c:200
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?инÑ?Ñ?онизиÑ?оваÑ?Ñ? вÑ?еменнÑ?Ñ? папкÑ? %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:217
+#: ../camel/providers/local/camel-spool-summary.c:216
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?инÑ?Ñ?онизиÑ?оваÑ?Ñ? папкÑ? Ñ?пÑ?ла: %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:248
-#: ../camel/providers/local/camel-spool-summary.c:265
-#: ../camel/providers/local/camel-spool-summary.c:276
+#: ../camel/providers/local/camel-spool-summary.c:246
+#: ../camel/providers/local/camel-spool-summary.c:263
+#: ../camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -4088,25 +4084,25 @@ msgstr ""
 "Ð?апка можеÑ? бÑ?Ñ?Ñ? иÑ?поÑ?Ñ?ена, копиÑ? Ñ?оÑ?Ñ?анена в «%s»"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:137
-#: ../camel/providers/nntp/camel-nntp-folder.c:195
-#: ../camel/providers/nntp/camel-nntp-folder.c:227
+#: ../camel/providers/nntp/camel-nntp-folder.c:194
+#: ../camel/providers/nntp/camel-nntp-folder.c:226
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "Ð?нÑ?Ñ?Ñ?еннÑ?Ñ? оÑ?ибка: UID в невеÑ?ном Ñ?оÑ?маÑ?е: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:368
-#: ../camel/providers/nntp/camel-nntp-folder.c:371
-#: ../camel/providers/nntp/camel-nntp-folder.c:413
-#: ../camel/providers/nntp/camel-nntp-folder.c:415
+#: ../camel/providers/nntp/camel-nntp-folder.c:367
+#: ../camel/providers/nntp/camel-nntp-folder.c:370
+#: ../camel/providers/nntp/camel-nntp-folder.c:412
+#: ../camel/providers/nntp/camel-nntp-folder.c:414
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Ð?Ñ?ибка оÑ?пÑ?авки Ñ?ообÑ?ениÑ?: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:433
+#: ../camel/providers/nntp/camel-nntp-folder.c:432
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Ð?Ñ? не можеÑ?е оÑ?пÑ?авлÑ?Ñ?Ñ? Ñ?ообÑ?ениÑ? NNTP во вÑ?емÑ? авÑ?ономной Ñ?абоÑ?Ñ?!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:444
+#: ../camel/providers/nntp/camel-nntp-folder.c:443
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Ð?Ñ? не можеÑ?е копиÑ?оваÑ?Ñ? Ñ?ообÑ?ениÑ? из папки NNTP!"
 
@@ -4138,22 +4134,22 @@ msgstr ""
 "Ð?одклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ? NNTP бÑ?деÑ? пÑ?оизводиÑ?Ñ?Ñ?Ñ? Ñ? иÑ?полÑ?зованием "
 "незаÑ?иÑ?Ñ?ованного паÑ?олÑ?."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:217
+#: ../camel/providers/nntp/camel-nntp-store.c:216
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?Ñ?иÑ?аÑ?Ñ? пÑ?ивеÑ?Ñ?Ñ?вие из %s: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:229
+#: ../camel/providers/nntp/camel-nntp-store.c:228
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "СеÑ?веÑ? NNTP %s веÑ?нÑ?л код оÑ?ибки %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:406
+#: ../camel/providers/nntp/camel-nntp-store.c:410
 #, c-format
 msgid "USENET News via %s"
 msgstr "Ð?овоÑ?Ñ?и USENET Ñ?еÑ?ез %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:815
+#: ../camel/providers/nntp/camel-nntp-store.c:819
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4164,7 +4160,7 @@ msgstr ""
 "\n"
 " %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:909
+#: ../camel/providers/nntp/camel-nntp-store.c:913
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -4175,7 +4171,7 @@ msgstr ""
 "Ð?еÑ? Ñ?акой гÑ?Ñ?ппÑ? новоÑ?Ñ?ей. Ð?Ñ?бÑ?аннÑ?й Ñ?леменÑ? Ñ?коÑ?ее вÑ?его Ñ?влÑ?еÑ?Ñ?Ñ? "
 "Ñ?одиÑ?елÑ?Ñ?кой папкой."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:941
+#: ../camel/providers/nntp/camel-nntp-store.c:945
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -4185,66 +4181,66 @@ msgstr ""
 "\n"
 "Ð?Ñ?Ñ?ппа новоÑ?Ñ?ей не Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:966
+#: ../camel/providers/nntp/camel-nntp-store.c:970
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "Ð?Ñ? не можеÑ?е Ñ?оздаÑ?Ñ? папкÑ? в гÑ?Ñ?ппаÑ? новоÑ?Ñ?ей: вмеÑ?Ñ?о Ñ?Ñ?ого Ñ?ледÑ?еÑ? "
 "подпиÑ?аÑ?Ñ?Ñ?Ñ?."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:974
+#: ../camel/providers/nntp/camel-nntp-store.c:978
 msgid "You cannot rename a folder in a News store."
 msgstr "Ð?Ñ? не можеÑ?е пеÑ?еименоваÑ?Ñ? папкÑ? в гÑ?Ñ?ппаÑ? новоÑ?Ñ?ей."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:982
+#: ../camel/providers/nntp/camel-nntp-store.c:986
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Ð?Ñ? не можеÑ?е Ñ?далиÑ?Ñ? папкÑ? в гÑ?Ñ?ппаÑ? новоÑ?Ñ?ей: вмеÑ?Ñ?о Ñ?Ñ?ого Ñ?ледÑ?еÑ? "
 "оÑ?пиÑ?аÑ?Ñ?Ñ?Ñ?."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1171
+#: ../camel/providers/nntp/camel-nntp-store.c:1180
 msgid "Authentication requested but no username provided"
 msgstr "ТÑ?ебÑ?еÑ?Ñ?Ñ? пÑ?овеÑ?ка подлинноÑ?Ñ?и, но имÑ? полÑ?зоваÑ?елÑ? не Ñ?казано"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1183
+#: ../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:1306
+#: ../camel/providers/nntp/camel-nntp-store.c:1315
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "Сбой командÑ? NNTP: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1360
+#: ../camel/providers/nntp/camel-nntp-store.c:1369
 msgid "Not connected."
 msgstr "Ð?е подклÑ?Ñ?ен."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1413
+#: ../camel/providers/nntp/camel-nntp-store.c:1422
 #, c-format
 msgid "No such folder: %s"
 msgstr "Ð?еÑ? Ñ?акой папки: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:271
-#: ../camel/providers/nntp/camel-nntp-summary.c:364
+#: ../camel/providers/nntp/camel-nntp-summary.c:272
+#: ../camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Ð?оиÑ?к новÑ?Ñ? Ñ?ообÑ?ений"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:278
+#: ../camel/providers/nntp/camel-nntp-summary.c:279
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "Ð?еожиданнÑ?й оÑ?веÑ? Ñ?еÑ?веÑ?а оÑ? xover: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:378
+#: ../camel/providers/nntp/camel-nntp-summary.c:384
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "Ð?еожиданнÑ?й оÑ?веÑ? Ñ?еÑ?веÑ?а оÑ? head: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:414
+#: ../camel/providers/nntp/camel-nntp-summary.c:420
 msgid "Use cancel"
 msgstr "Ð?Ñ?полÑ?зование оÑ?менено"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:416
+#: ../camel/providers/nntp/camel-nntp-summary.c:422
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Сбой опеÑ?аÑ?ии: %s"
@@ -4283,28 +4279,28 @@ msgstr "Ð?олÑ?Ñ?ение Ñ?ообÑ?ениÑ? %d по POP"
 msgid "Unknown reason"
 msgstr "Ð?еизвеÑ?Ñ?наÑ? пÑ?иÑ?ина"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
 msgid "_Leave messages on server"
 msgstr "_Ð?Ñ?Ñ?авлÑ?Ñ?Ñ? Ñ?ообÑ?ениÑ? на Ñ?еÑ?веÑ?е"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:47
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "_УдалÑ?Ñ?Ñ? Ñ?еÑ?ез %s дней"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:49
 msgid "Disable _support for all POP3 extensions"
 msgstr "Ð?апÑ?еÑ?иÑ?Ñ? _поддеÑ?жкÑ? вÑ?еÑ? Ñ?аÑ?Ñ?иÑ?ений POP3"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:57
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:59
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Ð?лÑ? подклÑ?Ñ?ениÑ? и пÑ?инÑ?Ñ?иÑ? поÑ?Ñ?Ñ? Ñ? Ñ?еÑ?веÑ?ов POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
+#: ../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."
@@ -4313,7 +4309,7 @@ msgstr ""
 "незаÑ?иÑ?Ñ?ованного паÑ?олÑ?. Ð?олÑ?Ñ?инÑ?Ñ?вом Ñ?еÑ?веÑ?ов POP поддеÑ?живаеÑ?Ñ?Ñ? Ñ?олÑ?ко "
 "Ñ?Ñ?оÑ? ваÑ?ианÑ?."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:84
+#: ../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 "
@@ -4323,34 +4319,34 @@ msgstr ""
 "паÑ?олÑ? по пÑ?оÑ?околÑ? APOP. ЭÑ?о можеÑ? Ñ?абоÑ?аÑ?Ñ? не длÑ? вÑ?еÑ? полÑ?зоваÑ?елей даже "
 "на Ñ?еÑ?веÑ?аÑ?, Ñ?кобÑ? поддеÑ?живаÑ?Ñ?иÑ? его."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:209
+#: ../camel/providers/pop3/camel-pop3-store.c:207
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? пÑ?иглаÑ?ение оÑ? POP-Ñ?еÑ?веÑ?а %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:226
-#: ../camel/providers/pop3/camel-pop3-store.c:240
-#: ../camel/providers/pop3/camel-pop3-store.c:250
-#: ../camel/providers/pop3/camel-pop3-store.c:256
+#: ../camel/providers/pop3/camel-pop3-store.c:224
+#: ../camel/providers/pop3/camel-pop3-store.c:238
+#: ../camel/providers/pop3/camel-pop3-store.c:248
+#: ../camel/providers/pop3/camel-pop3-store.c:254
 #, 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:227
+#: ../camel/providers/pop3/camel-pop3-store.c:225
 msgid "STLS not supported by server"
 msgstr "STLS не поддеÑ?живаеÑ?Ñ?Ñ? Ñ?еÑ?веÑ?ом"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:257
+#: ../camel/providers/pop3/camel-pop3-store.c:255
 msgid "TLS is not available in this build"
 msgstr "TLS не поддеÑ?живаеÑ?Ñ?Ñ? в Ñ?Ñ?ой Ñ?боÑ?ке"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:363
+#: ../camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? к Ñ?еÑ?веÑ?Ñ? POP %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:404
-#: ../camel/providers/pop3/camel-pop3-store.c:537
+#: ../camel/providers/pop3/camel-pop3-store.c:402
+#: ../camel/providers/pop3/camel-pop3-store.c:535
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -4359,22 +4355,22 @@ msgstr ""
 "Ð?е Ñ?далоÑ?Ñ? подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? к Ñ?еÑ?веÑ?Ñ? POP %s: Ð?е поддеÑ?живаеÑ?Ñ?Ñ? заÑ?Ñ?ебованнÑ?й "
 "меÑ?анизм иденÑ?иÑ?икаÑ?ии."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:420
+#: ../camel/providers/pop3/camel-pop3-store.c:418
 #, 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:432
+#: ../camel/providers/pop3/camel-pop3-store.c:430
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Ð?е Ñ?далоÑ?Ñ? заÑ?егиÑ?Ñ?Ñ?иÑ?оваÑ?Ñ?Ñ?Ñ? на Ñ?еÑ?веÑ?е POP %s: Ð?Ñ?ибка пÑ?оÑ?окола SASL"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:451
+#: ../camel/providers/pop3/camel-pop3-store.c:449
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Сбой иденÑ?иÑ?икаÑ?ии на Ñ?еÑ?веÑ?е POP %s: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:510
+#: ../camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4384,8 +4380,8 @@ msgstr ""
 "некоÑ?Ñ?екÑ?нÑ?й иденÑ?иÑ?икаÑ?оÑ? APOP. Ð?озникаеÑ? подозÑ?ение о пÑ?оведение аÑ?аки на "
 "пеÑ?Ñ?ониÑ?икаÑ?иÑ?. Ð?ожалÑ?йÑ?Ñ?а, Ñ?вÑ?жиÑ?еÑ?Ñ? Ñ? админиÑ?Ñ?Ñ?аÑ?оÑ?ом."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:551
-#: ../camel/providers/pop3/camel-pop3-store.c:564
+#: ../camel/providers/pop3/camel-pop3-store.c:549
+#: ../camel/providers/pop3/camel-pop3-store.c:562
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4394,7 +4390,7 @@ msgstr ""
 "Ð?е Ñ?далоÑ?Ñ? подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? к Ñ?еÑ?веÑ?Ñ? POP%s.\n"
 "Ð?Ñ?ибка оÑ?пÑ?авки паÑ?олÑ?: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:558
+#: ../camel/providers/pop3/camel-pop3-store.c:556
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4403,7 +4399,7 @@ msgstr ""
 "Ð?е Ñ?далоÑ?Ñ? подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? к Ñ?еÑ?веÑ?Ñ? POP %s.\n"
 "Ð?Ñ?ибка оÑ?пÑ?авки имени полÑ?зоваÑ?елÑ?: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:671
+#: ../camel/providers/pop3/camel-pop3-store.c:669
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Ð?еÑ? Ñ?акой папки «%s»."
@@ -4419,177 +4415,177 @@ msgid ""
 msgstr ""
 "Ð?лÑ? доÑ?Ñ?авки поÑ?Ñ?Ñ? пÑ?Ñ?ем запÑ?Ñ?ка пÑ?огÑ?аммÑ? \"sendmail\" на локалÑ?ной Ñ?иÑ?Ñ?еме."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:115
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
 msgstr "Ð?е Ñ?далоÑ?Ñ? обÑ?абоÑ?аÑ?Ñ? Ñ?пиÑ?ок полÑ?Ñ?аÑ?елей"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:146
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? канал к Sendmail: %s: поÑ?Ñ?а не оÑ?пÑ?авлена"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:167
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Ð?е Ñ?далоÑ?Ñ? запÑ?Ñ?Ñ?иÑ?Ñ? Sendmail: %s: поÑ?Ñ?а не оÑ?пÑ?авлена"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:237
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:235
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "Sendmail завеÑ?Ñ?ил Ñ?абоÑ?Ñ? Ñ? Ñ?игналом %s: поÑ?Ñ?а не оÑ?пÑ?авлена."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:244
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:242
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Ð?е Ñ?далоÑ?Ñ? вÑ?полниÑ?Ñ? %s: поÑ?Ñ?а не оÑ?пÑ?авлена."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:249
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:247
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "Sendmail завеÑ?Ñ?ила Ñ?абоÑ?Ñ? Ñ? Ñ?езÑ?лÑ?Ñ?аÑ?ом %d: поÑ?Ñ?а не оÑ?пÑ?авлена."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:261
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:265
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
 msgid "Mail delivery via the sendmail program"
 msgstr "Ð?оÑ?Ñ?авка поÑ?Ñ?Ñ? Ñ?еÑ?ез пÑ?огÑ?аммÑ? sendmail"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:39
+#: ../camel/providers/smtp/camel-smtp-provider.c:41
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 "Ð?лÑ? доÑ?Ñ?авки поÑ?Ñ?Ñ? пÑ?Ñ?ем подклÑ?Ñ?ениÑ? к Ñ?далÑ?нномÑ? поÑ?Ñ?овомÑ? конÑ?енÑ?Ñ?аÑ?оÑ?Ñ? по "
 "пÑ?оÑ?околÑ? SMTP."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:168
+#: ../camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Syntax error, command unrecognized"
 msgstr "СинÑ?акÑ?иÑ?еÑ?каÑ? оÑ?ибка, команда не Ñ?аÑ?познана"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error in parameters or arguments"
 msgstr "СинÑ?акÑ?иÑ?еÑ?каÑ? оÑ?ибка в паÑ?амеÑ?Ñ?аÑ? или аÑ?гÑ?менÑ?аÑ?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:172
+#: ../camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Command not implemented"
 msgstr "Ð?оманда не Ñ?еализована"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:174
+#: ../camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command parameter not implemented"
 msgstr "Ð?аÑ?амеÑ?Ñ? командÑ? не Ñ?еализован"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:176
+#: ../camel/providers/smtp/camel-smtp-transport.c:175
 msgid "System status, or system help reply"
 msgstr "СоÑ?Ñ?оÑ?ние Ñ?иÑ?Ñ?емÑ? или оÑ?веÑ? Ñ?иÑ?Ñ?емной Ñ?пÑ?авки"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:178
+#: ../camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Help message"
 msgstr "СпÑ?авоÑ?ное Ñ?ообÑ?ение"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:180
+#: ../camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Service ready"
 msgstr "СеÑ?виÑ? гоÑ?ов"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:182
+#: ../camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service closing transmission channel"
 msgstr "СеÑ?виÑ? закÑ?Ñ?ваеÑ? канал пеÑ?едаÑ?и"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service not available, closing transmission channel"
 msgstr "СеÑ?виÑ? не доÑ?Ñ?Ñ?пен, закÑ?Ñ?Ñ?ие канала пеÑ?едаÑ?и"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:186
+#: ../camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Requested mail action okay, completed"
 msgstr "Ð?апÑ?оÑ?енное поÑ?Ñ?овое дейÑ?Ñ?вие вÑ?полнено"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:188
+#: ../camel/providers/smtp/camel-smtp-transport.c:187
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 "Ð?е локалÑ?нÑ?й полÑ?зоваÑ?елÑ?; бÑ?деÑ? оÑ?пÑ?авлено в Ñ?ооÑ?веÑ?Ñ?Ñ?вии Ñ? <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:190
+#: ../camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Ð?апÑ?оÑ?енное дейÑ?Ñ?вие Ñ? поÑ?Ñ?ой не вÑ?полнено: поÑ?Ñ?овÑ?й Ñ?Ñ?ик недоÑ?Ñ?Ñ?пен"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
+#: ../camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Ð?апÑ?оÑ?енное дейÑ?Ñ?вие не вÑ?полнено: поÑ?Ñ?овÑ?й Ñ?Ñ?ик недоÑ?Ñ?Ñ?пен"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:194
+#: ../camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action aborted: error in processing"
 msgstr "Ð?апÑ?оÑ?енное дейÑ?Ñ?вие пÑ?еÑ?вано: оÑ?ибка пÑ?и обÑ?абоÑ?ке"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
+#: ../camel/providers/smtp/camel-smtp-transport.c:195
 msgid "User not local; please try <forward-path>"
 msgstr "Ð?олÑ?зоваÑ?елÑ? не локалÑ?нÑ?й; Ñ?Ñ?Ñ?ановиÑ?е <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:198
+#: ../camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 "Ð?апÑ?оÑ?енное дейÑ?Ñ?вие не вÑ?полнено: недоÑ?Ñ?аÑ?оÑ?но меÑ?Ñ?а в Ñ?иÑ?Ñ?емном Ñ?Ñ?анилиÑ?е"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Ð?апÑ?оÑ?енное дейÑ?Ñ?вие пÑ?еÑ?вано: иÑ?Ñ?еÑ?пано меÑ?Ñ?о в Ñ?Ñ?анилиÑ?е"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
+#: ../camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Ð?апÑ?оÑ?енное дейÑ?Ñ?вие пÑ?еÑ?вано: имÑ? поÑ?Ñ?ового Ñ?Ñ?ика недопÑ?Ñ?Ñ?имо"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:204
+#: ../camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Ð?аÑ?ало ввода поÑ?Ñ?Ñ?; оконÑ?ание поÑ?ле <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:206
+#: ../camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Transaction failed"
 msgstr "Сбой Ñ?Ñ?анзакÑ?ии"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:210
+#: ../camel/providers/smtp/camel-smtp-transport.c:209
 msgid "A password transition is needed"
 msgstr "Ð?еобÑ?одима пеÑ?едаÑ?а паÑ?олÑ?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:212
+#: ../camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Authentication mechanism is too weak"
 msgstr "СлиÑ?ком Ñ?лабÑ?й меÑ?анизм аÑ?Ñ?енÑ?иÑ?икаÑ?ии"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:214
+#: ../camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Ð?лÑ? запÑ?оÑ?енного меÑ?анизма аÑ?Ñ?енÑ?иÑ?икаÑ?ии Ñ?Ñ?ебÑ?еÑ?Ñ?Ñ? Ñ?иÑ?Ñ?ование"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:216
+#: ../camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Temporary authentication failure"
 msgstr "Ð?Ñ?еменнÑ?й Ñ?бой аÑ?Ñ?енÑ?иÑ?икаÑ?ии"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:297
+#: ../camel/providers/smtp/camel-smtp-transport.c:296
 msgid "Welcome response error"
 msgstr "Ð?Ñ?ибка пÑ?и оÑ?веÑ?е на пÑ?ивеÑ?Ñ?Ñ?вие"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
-#: ../camel/providers/smtp/camel-smtp-transport.c:365
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
+#: ../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:341
+#: ../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:356
+#: ../camel/providers/smtp/camel-smtp-transport.c:355
 msgid "STARTTLS command failed"
 msgstr "Сбой командÑ? STARTTLS"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:497
+#: ../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:568
+#: ../camel/providers/smtp/camel-smtp-transport.c:567
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4600,95 +4596,95 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:701
+#: ../camel/providers/smtp/camel-smtp-transport.c:700
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP Ñ?еÑ?веÑ? %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:703
+#: ../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:721
+#: ../camel/providers/smtp/camel-smtp-transport.c:720
 msgid "Cannot send message: service not connected."
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?пÑ?авиÑ?Ñ? Ñ?ообÑ?ение: Ñ?еÑ?виÑ? не подклÑ?Ñ?ен."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:726
 msgid "Cannot send message: sender address not valid."
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?пÑ?авиÑ?Ñ? Ñ?ообÑ?ение: невеÑ?нÑ?й адÑ?еÑ? оÑ?пÑ?авиÑ?елÑ?."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:731
+#: ../camel/providers/smtp/camel-smtp-transport.c:730
 msgid "Sending message"
 msgstr "Ð?Ñ?пÑ?авка Ñ?ообÑ?ениÑ?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:746
+#: ../camel/providers/smtp/camel-smtp-transport.c:745
 msgid "Cannot send message: no recipients defined."
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?пÑ?авиÑ?Ñ? Ñ?ообÑ?ение: не опÑ?еделенÑ? полÑ?Ñ?аÑ?ели."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:757
+#: ../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:986
+#: ../camel/providers/smtp/camel-smtp-transport.c:985
 msgid "SMTP Greeting"
 msgstr "Ð?Ñ?ивеÑ?Ñ?Ñ?вие SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1011
+#: ../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:1028
+#: ../camel/providers/smtp/camel-smtp-transport.c:1027
 msgid "HELO command failed"
 msgstr "Сбой командÑ? HELO"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1094
+#: ../camel/providers/smtp/camel-smtp-transport.c:1093
 msgid "SMTP Authentication"
 msgstr "Ð?Ñ?Ñ?енÑ?иÑ?икаÑ?иÑ? SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1100
+#: ../camel/providers/smtp/camel-smtp-transport.c:1099
 msgid "Error creating SASL authentication object."
 msgstr "Ð?Ñ?ибка пÑ?и Ñ?оздании обÑ?екÑ?а аÑ?Ñ?енÑ?иÑ?икаÑ?ии SASL."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1117
-#: ../camel/providers/smtp/camel-smtp-transport.c:1128
+#: ../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:1134
+#: ../camel/providers/smtp/camel-smtp-transport.c:1133
 msgid "AUTH command failed"
 msgstr "Сбой командÑ? AUTH"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1204
+#: ../camel/providers/smtp/camel-smtp-transport.c:1203
 msgid "Bad authentication response from server.\n"
 msgstr "Ð?евеÑ?нÑ?й оÑ?веÑ? оÑ? Ñ?еÑ?веÑ?а пÑ?и аÑ?Ñ?енÑ?иÑ?икаÑ?ии.\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1231
+#: ../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:1248
+#: ../camel/providers/smtp/camel-smtp-transport.c:1247
 msgid "MAIL FROM command failed"
 msgstr "Сбой командÑ? MAIL FROM"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1272
+#: ../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:1291
+#: ../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:1331
-#: ../camel/providers/smtp/camel-smtp-transport.c:1400
-#: ../camel/providers/smtp/camel-smtp-transport.c:1419
+#: ../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: поÑ?Ñ?а не оÑ?пÑ?авлена"
@@ -4696,108 +4692,108 @@ 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:1348
-#: ../camel/providers/smtp/camel-smtp-transport.c:1435
+#: ../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:1458
+#: ../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:1474
+#: ../camel/providers/smtp/camel-smtp-transport.c:1473
 msgid "RSET command failed"
 msgstr "Сбой командÑ? RSET"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1497
+#: ../camel/providers/smtp/camel-smtp-transport.c:1496
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "Сбой командÑ? QUIT: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1511
+#: ../camel/providers/smtp/camel-smtp-transport.c:1510
 msgid "QUIT command failed"
 msgstr "Сбой командÑ? QUIT"
 
-#: ../libedataserver/e-categories.c:45
+#: ../libedataserver/e-categories.c:47
 msgid "Business"
 msgstr "Ð?изнеÑ?"
 
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:48
 msgid "Competition"
 msgstr "Ð?онкÑ?Ñ?енÑ?иÑ?"
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:49
 msgid "Favorites"
 msgstr "Ð?Ñ?бимое"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:50
 msgid "Gifts"
 msgstr "Ð?одаÑ?ки"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:51
 msgid "Goals/Objectives"
 msgstr "Цели/задаÑ?и"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:52
 msgid "Holiday"
 msgstr "Ð?Ñ?аздник (вÑ?Ñ?одной)"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:53
 msgid "Holiday Cards"
 msgstr "Ð?оздÑ?авиÑ?елÑ?нÑ?е оÑ?кÑ?Ñ?Ñ?ки"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:55
 msgid "Hot Contacts"
 msgstr "Ð?оÑ?Ñ?Ñ?ие конÑ?акÑ?Ñ?"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:56
 msgid "Ideas"
 msgstr "Ð?деи"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:57
 msgid "International"
 msgstr "Ð?еждÑ?наÑ?однÑ?е"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:58
 msgid "Key Customer"
 msgstr "Ð?лÑ?Ñ?евой поÑ?Ñ?ебиÑ?елÑ?"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:59
 msgid "Miscellaneous"
 msgstr "Разное"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:60
 msgid "Personal"
 msgstr "Ð?иÑ?ное"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:61
 msgid "Phone Calls"
 msgstr "ТелеÑ?оннÑ?е звонки"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:63
 msgid "Status"
 msgstr "СÑ?аÑ?Ñ?Ñ?"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:64
 msgid "Strategies"
 msgstr "СÑ?Ñ?аÑ?егии"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:65
 msgid "Suppliers"
 msgstr "Ð?оÑ?Ñ?авÑ?ики"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:66
 msgid "Time & Expenses"
 msgstr "Ð?Ñ?емÑ? и Ñ?аÑ?Ñ?одÑ?"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:67
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:68
 msgid "Waiting"
 msgstr "Ð?жидание"
 
@@ -4805,7 +4801,7 @@ msgstr "Ð?жидание"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1644 ../libedataserver/e-time-utils.c:1911
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1900
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
@@ -4813,7 +4809,7 @@ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1649 ../libedataserver/e-time-utils.c:1902
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1891
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
@@ -4821,7 +4817,7 @@ msgstr "%a %d/%m/%Y %H:%M:%S"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1654 ../libedataserver/e-time-utils.c:1907
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1896
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
@@ -4829,78 +4825,78 @@ msgstr "%a %d/%m/%Y %I:%M %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1659 ../libedataserver/e-time-utils.c:1898
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1887
 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:1664
+#: ../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:1669
+#: ../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:1672 ../libedataserver/e-time-utils.c:1773
-#: ../libedataserver/e-time-utils.c:1893
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1763
+#: ../libedataserver/e-time-utils.c:1882
 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:1680
+#: ../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:1684
+#: ../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:1689
+#: ../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:1694
+#: ../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:1699
+#: ../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:1704
+#: ../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:1707 ../libedataserver/e-time-utils.c:1776
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1766
 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:1834 ../libedataserver/e-time-utils.c:1956
+#: ../libedataserver/e-time-utils.c:1824 ../libedataserver/e-time-utils.c:1944
 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:1838 ../libedataserver/e-time-utils.c:1948
+#: ../libedataserver/e-time-utils.c:1828 ../libedataserver/e-time-utils.c:1936
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4908,24 +4904,24 @@ msgstr "%H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1843 ../libedataserver/e-time-utils.c:1953
+#: ../libedataserver/e-time-utils.c:1833 ../libedataserver/e-time-utils.c:1941
 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:1847 ../libedataserver/e-time-utils.c:1945
+#: ../libedataserver/e-time-utils.c:1837 ../libedataserver/e-time-utils.c:1933
 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:1850
+#: ../libedataserver/e-time-utils.c:1840
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1854
+#: ../libedataserver/e-time-utils.c:1844
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -4937,18 +4933,18 @@ msgstr "Ð?нонимнÑ?й доÑ?Ñ?Ñ?п к Ñ?еÑ?веÑ?Ñ? LDAP"
 msgid "Failed to authenticate.\n"
 msgstr "Ð?Ñ?ибка авÑ?оÑ?изаÑ?ии.\n"
 
-#: ../libedataserverui/e-categories-dialog.c:362
+#: ../libedataserverui/e-categories-dialog.c:327
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "Ð?аÑ?егоÑ?иÑ? Ñ? именем «%s» Ñ?же еÑ?Ñ?Ñ?. Ð?Ñ?полÑ?зÑ?йÑ?е дÑ?Ñ?гое имÑ?"
 
-#: ../libedataserverui/e-categories-dialog.c:526
+#: ../libedataserverui/e-categories-dialog.c:618
 msgid "Icon"
 msgstr "Ð?наÑ?ок"
 
-#: ../libedataserverui/e-categories-dialog.c:531
+#: ../libedataserverui/e-categories-dialog.c:623
 msgid "Category"
 msgstr "Ð?аÑ?егоÑ?иÑ?"
 
@@ -4997,19 +4993,19 @@ msgstr "Ð?нÑ?оÑ?маÑ?иÑ? о Ñ?веÑ?е"
 msgid "The color to render"
 msgstr "ЦвеÑ? длÑ? оÑ?обÑ?ажениÑ?"
 
-#: ../libedataserverui/e-name-selector-dialog.c:278
+#: ../libedataserverui/e-name-selector-dialog.c:276
 msgid "Select Contacts from Address Book"
 msgstr "Ð?Ñ?боÑ? конÑ?акÑ?ов из адÑ?еÑ?ной книги"
 
-#: ../libedataserverui/e-name-selector-dialog.c:565
+#: ../libedataserverui/e-name-selector-dialog.c:563
 msgid "_Add"
 msgstr "_Ð?обавиÑ?Ñ?"
 
-#: ../libedataserverui/e-name-selector-dialog.c:590
+#: ../libedataserverui/e-name-selector-dialog.c:588
 msgid "_Remove"
 msgstr "_УдалиÑ?Ñ?"
 
-#: ../libedataserverui/e-name-selector-dialog.c:767
+#: ../libedataserverui/e-name-selector-dialog.c:765
 #: ../libedataserverui/e-name-selector-dialog.glade.h:6
 msgid "Any Category"
 msgstr "Ð?Ñ?баÑ? каÑ?егоÑ?иÑ?"
@@ -5052,30 +5048,30 @@ msgid "_Search:"
 msgstr "_Ð?Ñ?каÑ?Ñ?:"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2456
+#: ../libedataserverui/e-name-selector-entry.c:2494
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "_РазвеÑ?нÑ?Ñ?Ñ? %s"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2471
+#: ../libedataserverui/e-name-selector-entry.c:2509
 #, c-format
 msgid "Cop_y %s"
 msgstr "Ð?_опиÑ?оваÑ?Ñ? %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2481
+#: ../libedataserverui/e-name-selector-entry.c:2519
 #, c-format
 msgid "C_ut %s"
 msgstr "Ð?_Ñ?Ñ?езаÑ?Ñ? %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2498
+#: ../libedataserverui/e-name-selector-entry.c:2536
 #, c-format
 msgid "_Edit %s"
 msgstr "_Ð?Ñ?авка %s"
 
-#: ../libedataserverui/e-name-selector-list.c:472
+#: ../libedataserverui/e-name-selector-list.c:469
 #, c-format
 msgid "_Delete %s"
 msgstr "_УдалиÑ?Ñ? %s"
@@ -5085,23 +5081,23 @@ msgstr "_УдалиÑ?Ñ? %s"
 msgid "Keyring key is unusable: no user or host name"
 msgstr "Ð?лÑ?Ñ? из бÑ?елока некоÑ?Ñ?екÑ?ен: оÑ?Ñ?Ñ?Ñ?Ñ?Ñ?вÑ?еÑ? имÑ? полÑ?зоваÑ?елÑ? или Ñ?зла"
 
-#: ../libedataserverui/e-passwords.c:1094
+#: ../libedataserverui/e-passwords.c:1093
 msgid "You have the Caps Lock key on."
 msgstr "Ð?а клавиаÑ?Ñ?Ñ?е вклÑ?Ñ?Ñ?н Caps Lock."
 
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:1215
 msgid "_Remember this passphrase"
 msgstr "_Ð?апомниÑ?Ñ? Ñ?Ñ?Ñ? клÑ?Ñ?евÑ?Ñ? Ñ?Ñ?азÑ?"
 
-#: ../libedataserverui/e-passwords.c:1217
+#: ../libedataserverui/e-passwords.c:1216
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "_Ð?апомниÑ?Ñ? Ñ?Ñ?оÑ? паÑ?олÑ? до оконÑ?аниÑ? Ñ?Ñ?ого Ñ?еанÑ?а"
 
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:1221
 msgid "_Remember this password"
 msgstr "_Ð?апомниÑ?Ñ? Ñ?Ñ?оÑ? паÑ?олÑ?"
 
-#: ../libedataserverui/e-passwords.c:1223
+#: ../libedataserverui/e-passwords.c:1222
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Ð?апомниÑ?Ñ? Ñ?Ñ?оÑ? паÑ?олÑ? до конÑ?а Ñ?еÑ?Ñ?ии"
 
@@ -5114,137 +5110,137 @@ msgstr "Ð?Ñ?беÑ?иÑ?е назнаÑ?ение"
 msgid "_Destination"
 msgstr "_Ð?азнаÑ?ение"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1698
-#: ../servers/exchange/storage/exchange-account.c:959
+#: ../servers/exchange/lib/e2k-autoconfig.c:1694
+#: ../servers/exchange/storage/exchange-account.c:955
 #, c-format
 msgid "Enter password for %s"
 msgstr "Ð?ведиÑ?е паÑ?олÑ? длÑ? %s"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1699
-#: ../servers/exchange/storage/exchange-account.c:964
+#: ../servers/exchange/lib/e2k-autoconfig.c:1695
+#: ../servers/exchange/storage/exchange-account.c:960
 msgid "Enter password"
 msgstr "Ð?аÑ?олÑ?"
 
 #. i18n: These are Outlook's words for the default roles in
 #. the folder permissions dialog.
-#: ../servers/exchange/lib/e2k-security-descriptor.c:847
+#: ../servers/exchange/lib/e2k-security-descriptor.c:844
 msgid "Owner"
 msgstr "Ð?ладелеÑ?"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:857
+#: ../servers/exchange/lib/e2k-security-descriptor.c:854
 msgid "Publishing Editor"
 msgstr "РедакÑ?оÑ? пÑ?бликаÑ?ии"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:865
+#: ../servers/exchange/lib/e2k-security-descriptor.c:862
 msgid "Editor"
 msgstr "РедакÑ?оÑ?"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:872
+#: ../servers/exchange/lib/e2k-security-descriptor.c:869
 msgid "Publishing Author"
 msgstr "Ð?вÑ?оÑ? пÑ?бликаÑ?ии"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:878
+#: ../servers/exchange/lib/e2k-security-descriptor.c:875
 msgid "Author"
 msgstr "Ð?вÑ?оÑ?"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:883
+#: ../servers/exchange/lib/e2k-security-descriptor.c:880
 msgid "Non-editing Author"
 msgstr "Ð?онÑ?Ñ?лÑ?Ñ?иÑ?Ñ?Ñ?Ñ?ий авÑ?оÑ?"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:887
+#: ../servers/exchange/lib/e2k-security-descriptor.c:884
 msgid "Reviewer"
 msgstr "Ð?бозÑ?еваÑ?елÑ?"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:889
+#: ../servers/exchange/lib/e2k-security-descriptor.c:886
 msgid "Contributor"
 msgstr "УÑ?аÑ?Ñ?ник"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:891
+#: ../servers/exchange/lib/e2k-security-descriptor.c:888
 msgid "None"
 msgstr "Ð?еÑ?"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:906
+#: ../servers/exchange/lib/e2k-security-descriptor.c:903
 msgid "Custom"
 msgstr "Ð?ополниÑ?елÑ?но"
 
-#: ../servers/exchange/storage/e-storage.c:555
+#: ../servers/exchange/storage/e-storage.c:557
 msgid "Generic error"
 msgstr "Ð?еизвеÑ?Ñ?наÑ? оÑ?ибка"
 
-#: ../servers/exchange/storage/e-storage.c:557
+#: ../servers/exchange/storage/e-storage.c:559
 msgid "A folder with the same name already exists"
 msgstr "Ð?апка Ñ? Ñ?аким именем Ñ?же Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?"
 
-#: ../servers/exchange/storage/e-storage.c:559
+#: ../servers/exchange/storage/e-storage.c:561
 msgid "The specified folder type is not valid"
 msgstr "Ð?аданнаÑ? папка некоÑ?Ñ?екÑ?на"
 
-#: ../servers/exchange/storage/e-storage.c:561
+#: ../servers/exchange/storage/e-storage.c:563
 msgid "I/O error"
 msgstr "Ð?Ñ?ибка ввода/вÑ?вода"
 
-#: ../servers/exchange/storage/e-storage.c:563
+#: ../servers/exchange/storage/e-storage.c:565
 msgid "Not enough space to create the folder"
 msgstr "Ð?едоÑ?Ñ?аÑ?оÑ?но меÑ?Ñ?а длÑ? Ñ?озданиÑ? папки"
 
-#: ../servers/exchange/storage/e-storage.c:565
+#: ../servers/exchange/storage/e-storage.c:567
 msgid "The folder is not empty"
 msgstr "Ð?апка не пÑ?Ñ?Ñ?а"
 
-#: ../servers/exchange/storage/e-storage.c:567
+#: ../servers/exchange/storage/e-storage.c:569
 msgid "The specified folder was not found"
 msgstr "Ð?аданнаÑ? папка не найдена"
 
-#: ../servers/exchange/storage/e-storage.c:569
+#: ../servers/exchange/storage/e-storage.c:571
 msgid "Function not implemented in this storage"
 msgstr "Ð?аннаÑ? Ñ?Ñ?нкÑ?иÑ? не Ñ?еализована в Ñ?Ñ?ом Ñ?Ñ?анилиÑ?е"
 
-#: ../servers/exchange/storage/e-storage.c:573
+#: ../servers/exchange/storage/e-storage.c:575
 msgid "Operation not supported"
 msgstr "Ð?пеÑ?аÑ?иÑ? не поддеÑ?живаеÑ?Ñ?Ñ?"
 
-#: ../servers/exchange/storage/e-storage.c:575
+#: ../servers/exchange/storage/e-storage.c:577
 msgid "The specified type is not supported in this storage"
 msgstr "Ð?аданнÑ?й Ñ?ип не поддеÑ?живаеÑ?Ñ?Ñ? даннÑ?м Ñ?Ñ?анилиÑ?ем"
 
-#: ../servers/exchange/storage/e-storage.c:577
+#: ../servers/exchange/storage/e-storage.c:579
 msgid "The specified folder cannot be modified or removed"
 msgstr "Ð?аданнаÑ? папка не можеÑ? бÑ?Ñ?Ñ? Ñ?далена или изменена"
 
-#: ../servers/exchange/storage/e-storage.c:579
+#: ../servers/exchange/storage/e-storage.c:581
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пеÑ?емеÑ?Ñ?иÑ?Ñ? папкÑ? в один из поÑ?омков"
 
-#: ../servers/exchange/storage/e-storage.c:581
+#: ../servers/exchange/storage/e-storage.c:583
 msgid "Cannot create a folder with that name"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? папкÑ? Ñ? Ñ?аким именем."
 
-#: ../servers/exchange/storage/e-storage.c:583
+#: ../servers/exchange/storage/e-storage.c:585
 msgid "This operation cannot be performed in off-line mode"
 msgstr "ЭÑ?а опеÑ?аÑ?иÑ? недоÑ?Ñ?Ñ?пна в авÑ?ономном Ñ?ежиме."
 
 #. i18n: This is the title of an "other user's folders"
 #. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:642
+#: ../servers/exchange/storage/exchange-account.c:640
 #, c-format
 msgid "%s's Folders"
 msgstr "Ð?апки %s"
 
-#: ../servers/exchange/storage/exchange-account.c:1265
+#: ../servers/exchange/storage/exchange-account.c:1260
 msgid "Personal Folders"
 msgstr "Ð?иÑ?нÑ?е папки"
 
-#: ../servers/exchange/storage/exchange-account.c:1280
+#: ../servers/exchange/storage/exchange-account.c:1275
 msgid "Favorite Public Folders"
 msgstr "Ð?збÑ?аннÑ?е обÑ?ие папки"
 
 #. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1297
+#: ../servers/exchange/storage/exchange-account.c:1292
 msgid "All Public Folders"
 msgstr "Ð?Ñ?е обÑ?ие папки"
 
 #. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1311
+#: ../servers/exchange/storage/exchange-account.c:1306
 msgid "Global Address List"
 msgstr "Ð?бÑ?ий Ñ?пиÑ?ок адÑ?еÑ?ов"
 
@@ -5252,6 +5248,10 @@ msgstr "Ð?бÑ?ий Ñ?пиÑ?ок адÑ?еÑ?ов"
 msgid "Deleted Items"
 msgstr "УдаленнÑ?е Ñ?леменÑ?Ñ?"
 
+#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
+msgid "Drafts"
+msgstr "ЧеÑ?новики"
+
 #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
 msgid "Journal"
 msgstr "Ð?Ñ?Ñ?нал"
@@ -5304,12 +5304,25 @@ msgstr "СеÑ?виÑ? пÑ?овеÑ?ки инÑ?еÑ?Ñ?ейÑ?а Ñ?еÑ?веÑ?а дан
 msgid "Evolution Data Server logging service"
 msgstr "СеÑ?виÑ? пÑ?оÑ?околиÑ?ованиÑ? Ñ?еÑ?веÑ?а даннÑ?Ñ? Evolution"
 
-#. dialog display isn't working out
-#: ../src/server.c:109
-#, c-format
-msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
-msgstr ""
-"Ð?з-за многоÑ?иÑ?леннÑ?Ñ? Ñ?боев Ñ?егменÑ?аÑ?ии оÑ?обÑ?азиÑ?Ñ? диалог оÑ?ибки невозможно\n"
+#~ msgid "CRL not yet valid"
+#~ msgstr "CRL пока еÑ?е некоÑ?Ñ?екÑ?ен"
+
+#~ msgid "CRL has expired"
+#~ msgstr "Ð?Ñ?Ñ?ек Ñ?Ñ?ок дейÑ?Ñ?виÑ? CRL"
+
+#~ msgid "Error in CRL"
+#~ msgstr "Ð?Ñ?ибка в CRL"
+
+#~ msgid "Sent"
+#~ msgstr "Ð?Ñ?пÑ?авленнÑ?е"
+
+#~ msgid "Templates"
+#~ msgstr "ШаблонÑ?"
+
+#~ msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
+#~ msgstr ""
+#~ "Ð?з-за многоÑ?иÑ?леннÑ?Ñ? Ñ?боев Ñ?егменÑ?аÑ?ии оÑ?обÑ?азиÑ?Ñ? диалог оÑ?ибки "
+#~ "невозможно\n"
 
 #~ msgid "Fair"
 #~ msgstr "ЯÑ?но"



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