[evolution-data-server/gnome-2-30] Updated Ukrainian translation



commit a854243295a506a6997816ef0f055ca73032fc3f
Author: Maxim V. Dziumanenko <dziumanenko gmail com>
Date:   Sat Mar 27 13:47:49 2010 +0200

    Updated Ukrainian translation

 po/uk.po | 1201 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 619 insertions(+), 582 deletions(-)
---
diff --git a/po/uk.po b/po/uk.po
index 8ac11ff..a987460 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,10 +10,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-06 17:41+0200\n"
-"PO-Revision-Date: 2010-01-06 15:07+0300\n"
+"POT-Creation-Date: 2010-03-27 13:47+0200\n"
+"PO-Revision-Date: 2010-03-27 15:07+0300\n"
 "Last-Translator: Maxim DzÑ?umanenko <dziumanenko gmail com>\n"
-"Language-Team: ukrainian <Ukrainian <uk li org>\n"
+"Language-Team: Ukrainian <trans-uk lists fedoraproject org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,13 +28,13 @@ msgstr "Ð?аванÑ?аженнÑ?..."
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4524
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4553
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
 msgid "Searching..."
 msgstr "Ð?оÑ?Ñ?к..."
 
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4688
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4717
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "Ð?аванÑ?аженнÑ? конÑ?акÑ?Ñ?в (%d)... "
@@ -46,54 +46,54 @@ msgstr "Ð?аванÑ?аженнÑ? конÑ?акÑ?Ñ?в (%d)... "
 msgid "Updating contacts cache (%d)... "
 msgstr "Ð?новленнÑ? кеÑ?Ñ? конÑ?акÑ?Ñ?в (%d)... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:786
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:818
 msgid "Using Distinguished Name (DN)"
 msgstr "Ð?икоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?и вÑ?докÑ?емлене Ñ?м'Ñ? (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:789
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:821
 msgid "Using Email Address"
 msgstr "Ð?лекÑ?Ñ?онна адÑ?еÑ?а"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1067
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1098
 msgid "Reconnecting to LDAP server..."
 msgstr "Ð?овÑ?оÑ?не з'Ñ?днаннÑ? Ñ?з Ñ?еÑ?веÑ?ом LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1711
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1740
 msgid "Adding contact to LDAP server..."
 msgstr "Ð?одаваннÑ? конÑ?акÑ?Ñ? до Ñ?еÑ?веÑ?а LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1845
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1874
 msgid "Removing contact from LDAP server..."
 msgstr "Ð?идаленнÑ? конÑ?акÑ?Ñ? Ñ?з Ñ?еÑ?веÑ?а LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2282
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2311
 msgid "Modifying contact from LDAP server..."
 msgstr "Ð?мÑ?на конÑ?акÑ?Ñ? на Ñ?еÑ?веÑ?Ñ? LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4385
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4414
 msgid "Receiving LDAP search results..."
 msgstr "Ð?Ñ?Ñ?иманнÑ? Ñ?езÑ?лÑ?Ñ?аÑ?Ñ?в поÑ?Ñ?кÑ? з Ñ?еÑ?веÑ?а LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4546
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4575
 msgid "Error performing search"
 msgstr "Ð?омилка виконаннÑ? поÑ?Ñ?кÑ?"
 
-#: ../addressbook/libebook/e-book.c:2121
+#: ../addressbook/libebook/e-book.c:2152
 #, c-format
 msgid "%s: there was no source for uid `%s' stored in gconf."
 msgstr "%s: джеÑ?ело длÑ? uid `%s' не бÑ?ло збеÑ?ежено Ñ? gconf."
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:113
+#: ../addressbook/libebook/e-contact.c:115
 msgid "Unique ID"
 msgstr "УнÑ?калÑ?ний Ñ?денÑ?иÑ?Ñ?каÑ?оÑ?"
 
-#: ../addressbook/libebook/e-contact.c:114
+#: ../addressbook/libebook/e-contact.c:116
 msgid "File Under"
 msgstr "Ð?беÑ?егÑ?и Ñ?"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:116
+#: ../addressbook/libebook/e-contact.c:118
 msgid "Book URI"
 msgstr "URI книги"
 
@@ -101,520 +101,520 @@ msgstr "URI книги"
 #. FN isn't really a structured field - we use a getter/setter
 #. so we can set the N property (since evo 1.4 works fine with
 #. vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:122
+#: ../addressbook/libebook/e-contact.c:124
 msgid "Full Name"
 msgstr "Ð?овне Ñ?м'Ñ?"
 
-#: ../addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook/e-contact.c:125
 msgid "Given Name"
 msgstr "Ð?азва полÑ?"
 
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:126
 msgid "Family Name"
 msgstr "Ð?Ñ?Ñ?звиÑ?е"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:127
 msgid "Nickname"
 msgstr "Ð?Ñ?Ñ?звиÑ?Ñ?ко"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Email 1"
 msgstr "Ð?л.поÑ?Ñ?а 1"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Email 2"
 msgstr "Ð?л.поÑ?Ñ?а 2"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:132
 msgid "Email 3"
 msgstr "Ð?л.поÑ?Ñ?а 3"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 4"
 msgstr "Ð?л.поÑ?Ñ?а 4"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Mailer"
 msgstr "Ð?оÑ?Ñ?ова пÑ?огÑ?ама"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Home Address Label"
 msgstr "ЯÑ?лик домаÑ?нÑ?оÑ? адÑ?еÑ?и"
 
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:139
 msgid "Work Address Label"
 msgstr "ЯÑ?лик Ñ?обоÑ?оÑ? адÑ?еÑ?и"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Other Address Label"
 msgstr "ЯÑ?лик Ñ?нÑ?оÑ? адÑ?еÑ?и"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Assistant Phone"
 msgstr "ТелеÑ?он помÑ?Ñ?ника"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:144
 msgid "Business Phone"
 msgstr "РобоÑ?ий Ñ?елеÑ?он"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Business Phone 2"
 msgstr "РобоÑ?ий Ñ?елеÑ?он 2"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Business Fax"
 msgstr "РобоÑ?ий Ñ?акÑ?"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Callback Phone"
 msgstr "ТелеÑ?он длÑ? звоÑ?оÑ?ного дзвÑ?нка"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Car Phone"
 msgstr "Ð?вÑ?омобÑ?лÑ?ний Ñ?елеÑ?он"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Company Phone"
 msgstr "ТелеÑ?он компанÑ?Ñ?"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Home Phone"
 msgstr "Ð?омаÑ?нÑ?й Ñ?елеÑ?он"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Home Phone 2"
 msgstr "Ð?омаÑ?нÑ?й Ñ?елеÑ?он 2"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Home Fax"
 msgstr "Ð?омаÑ?нÑ?й Ñ?акÑ?"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:153
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Mobile Phone"
 msgstr "Ð?обÑ?лÑ?ний Ñ?елеÑ?он"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Other Phone"
 msgstr "Ð?нÑ?ий Ñ?елеÑ?он"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Other Fax"
 msgstr "Ð?нÑ?ий Ñ?акÑ?"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Pager"
 msgstr "Ð?ейджеÑ?"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Primary Phone"
 msgstr "Ð?Ñ?новний Ñ?елеÑ?он"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Radio"
 msgstr "РадÑ?о"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Telex"
 msgstr "ТелекÑ?"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:162
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Organization"
 msgstr "Ð?Ñ?ганÑ?заÑ?Ñ?Ñ?"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Organizational Unit"
 msgstr "Ð?Ñ?ддÑ?л оÑ?ганÑ?заÑ?Ñ?Ñ?"
 
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Office"
 msgstr "Ð?Ñ?Ñ?Ñ?"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Title"
 msgstr "ТиÑ?Ñ?л"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Role"
 msgstr "РолÑ?"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Manager"
 msgstr "Ð?еÑ?Ñ?вник"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Assistant"
 msgstr "Ð?омÑ?Ñ?ник"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Homepage URL"
 msgstr "URL домаÑ?нÑ?оÑ? Ñ?Ñ?оÑ?Ñ?нки"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Weblog URL"
 msgstr "URL веблогÑ?"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:669
+#: ../addressbook/libebook/e-contact.c:178
+#: ../libedataserverui/e-categories-dialog.c:671
 msgid "Categories"
 msgstr "Ð?аÑ?егоÑ?Ñ?Ñ?"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Calendar URI"
 msgstr "URI календаÑ?Ñ?"
 
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:182
 msgid "Free/Busy URL"
 msgstr "Ð?оÑ?иланнÑ? (URL) \"вÑ?лÑ?ний/зайнÑ?Ñ?ий\""
 
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:183
 msgid "ICS Calendar"
 msgstr "Ð?алендаÑ? Ñ?оÑ?маÑ?Ñ? ICS"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Video Conferencing URL"
 msgstr "URL вÑ?деоконÑ?еÑ?енÑ?Ñ?й"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:187
 msgid "Spouse's Name"
 msgstr "Ð?м'Ñ? Ñ?оловÑ?ка/дÑ?Ñ?жини"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:188
 msgid "Note"
 msgstr "Ð?Ñ?имÑ?Ñ?ка"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:189
+#: ../addressbook/libebook/e-contact.c:191
 msgid "AIM Home Screen Name 1"
 msgstr "Ð?омаÑ?нÑ? екÑ?анна назва AIM 1"
 
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:192
 msgid "AIM Home Screen Name 2"
 msgstr "Ð?омаÑ?нÑ? екÑ?анна назва AIM 2"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:193
 msgid "AIM Home Screen Name 3"
 msgstr "Ð?омаÑ?нÑ? екÑ?анна назва AIM 3"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:194
 msgid "AIM Work Screen Name 1"
 msgstr "РобоÑ?а екÑ?анна назва AIM 1"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Work Screen Name 2"
 msgstr "РобоÑ?а екÑ?анна назва AIM 2"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Work Screen Name 3"
 msgstr "РобоÑ?а екÑ?анна назва AIM 3"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:197
 msgid "GroupWise Home Screen Name 1"
 msgstr "GroupWise домаÑ?нÑ? екÑ?анна назва 1"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:198
 msgid "GroupWise Home Screen Name 2"
 msgstr "GroupWise домаÑ?нÑ? екÑ?анна назва 2"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:199
 msgid "GroupWise Home Screen Name 3"
 msgstr "GroupWise домаÑ?нÑ? екÑ?анна назва 3"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:200
 msgid "GroupWise Work Screen Name 1"
 msgstr "GroupWise Ñ?обоÑ?а екÑ?анна назва 1"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Work Screen Name 2"
 msgstr "GroupWise Ñ?обоÑ?а екÑ?анна назва 2"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Work Screen Name 3"
 msgstr "GroupWise Ñ?обоÑ?а екÑ?анна назва 3"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:203
 msgid "Jabber Home Id 1"
 msgstr "Ð?омаÑ?нÑ?й Ñ?денÑ?иÑ?Ñ?каÑ?оÑ? Jabber 1"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:204
 msgid "Jabber Home Id 2"
 msgstr "Ð?омаÑ?нÑ?й Ñ?денÑ?иÑ?Ñ?каÑ?оÑ? Jabber 2"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:205
 msgid "Jabber Home Id 3"
 msgstr "Ð?омаÑ?нÑ?й Ñ?денÑ?иÑ?Ñ?каÑ?оÑ? Jabber 3"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:206
 msgid "Jabber Work Id 1"
 msgstr "РобоÑ?ий Ñ?денÑ?иÑ?Ñ?каÑ?оÑ? Jabber 1"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:207
 msgid "Jabber Work Id 2"
 msgstr "РобоÑ?ий Ñ?денÑ?иÑ?Ñ?каÑ?оÑ? Jabber 1"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:208
 msgid "Jabber Work Id 3"
 msgstr "РобоÑ?ий Ñ?денÑ?иÑ?Ñ?каÑ?оÑ? Jabber 1"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:209
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo! Ð?омаÑ?нÑ? екÑ?анна назва 1"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo! Ð?омаÑ?нÑ? екÑ?анна назва 2"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo! Ð?омаÑ?нÑ? екÑ?анна назва 3"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo! РобоÑ?а екÑ?анна назва 1"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo! РобоÑ?а екÑ?анна назва 2"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo! РобоÑ?а екÑ?анна назва 3"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:215
 msgid "MSN Home Screen Name 1"
 msgstr "Ð?омаÑ?нÑ? екÑ?анна назва MSN 1"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:216
 msgid "MSN Home Screen Name 2"
 msgstr "Ð?омаÑ?нÑ? екÑ?анна назва MSN 2"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:217
 msgid "MSN Home Screen Name 3"
 msgstr "Ð?омаÑ?нÑ? екÑ?анна назва MSN 3"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:218
 msgid "MSN Work Screen Name 1"
 msgstr "РобоÑ?а екÑ?анна назва MSN 1"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Work Screen Name 2"
 msgstr "РобоÑ?а екÑ?анна назва MSN 2"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Work Screen Name 3"
 msgstr "РобоÑ?а екÑ?анна назва MSN 3"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:221
 msgid "ICQ Home Id 1"
 msgstr "Ð?денÑ?иÑ?Ñ?каÑ?оÑ? домаÑ?нÑ?ого ICQ 1"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:222
 msgid "ICQ Home Id 2"
 msgstr "Ð?денÑ?иÑ?Ñ?каÑ?оÑ? домаÑ?нÑ?ого ICQ 2"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:223
 msgid "ICQ Home Id 3"
 msgstr "Ð?денÑ?иÑ?Ñ?каÑ?оÑ? домаÑ?нÑ?ого ICQ 3"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:224
 msgid "ICQ Work Id 1"
 msgstr "Ð?денÑ?иÑ?Ñ?каÑ?оÑ? Ñ?обоÑ?ого ICQ 1"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:225
 msgid "ICQ Work Id 2"
 msgstr "Ð?денÑ?иÑ?Ñ?каÑ?оÑ? Ñ?обоÑ?ого ICQ 2"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:226
 msgid "ICQ Work Id 3"
 msgstr "Ð?денÑ?иÑ?Ñ?каÑ?оÑ? Ñ?обоÑ?ого ICQ 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:229
 msgid "Last Revision"
 msgstr "Ð?Ñ?Ñ?аннÑ? веÑ?Ñ?Ñ?Ñ?"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:230
 msgid "Name or Org"
 msgstr "Ð?азва або оÑ?ганÑ?заÑ?Ñ?Ñ?"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Address List"
 msgstr "СпиÑ?ок Ð?дÑ?еÑ?а"
 
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:234
 msgid "Home Address"
 msgstr "Ð?омаÑ?нÑ? адÑ?еÑ?а"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:235
 msgid "Work Address"
 msgstr "РобоÑ?а адÑ?еÑ?а"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:236
 msgid "Other Address"
 msgstr "Ð?нÑ?а адÑ?еÑ?а"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Category List"
 msgstr "СпиÑ?ок каÑ?егоÑ?Ñ?й"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Photo"
 msgstr "ФоÑ?огÑ?аÑ?Ñ?Ñ?"
 
-#: ../addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Logo"
 msgstr "Ð?мблема"
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:245
 msgid "Name"
 msgstr "Ð?м'Ñ?"
 
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Email List"
 msgstr "СпиÑ?ок адÑ?еÑ? ел.поÑ?Ñ?и"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook/e-contact.c:249
 msgid "AIM Screen Name List"
 msgstr "СпиÑ?ок екÑ?анниÑ? назв AIM"
 
-#: ../addressbook/libebook/e-contact.c:248
+#: ../addressbook/libebook/e-contact.c:250
 msgid "GroupWise Id List"
 msgstr "СпиÑ?ок Ñ?денÑ?иÑ?Ñ?каÑ?оÑ?Ñ?в GroupWise"
 
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:251
 msgid "Jabber Id List"
 msgstr "СпиÑ?ок Ñ?денÑ?иÑ?Ñ?каÑ?оÑ?Ñ?в Jabber"
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:252
 msgid "Yahoo! Screen Name List"
 msgstr "СпиÑ?ок екÑ?анниÑ? назв Yahoo!"
 
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:253
 msgid "MSN Screen Name List"
 msgstr "СпиÑ?ок екÑ?анниÑ? назв MSN"
 
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:254
 msgid "ICQ Id List"
 msgstr "СпиÑ?ок Ñ?денÑ?иÑ?Ñ?каÑ?оÑ?Ñ?в ICQ"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Wants HTML Mail"
 msgstr "СпÑ?иймаÑ? поÑ?Ñ?Ñ? Ñ? HTML"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:258
 msgid "List"
 msgstr "СпиÑ?ок"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:259
 msgid "List Show Addresses"
 msgstr "Ð?дÑ?еÑ?а показÑ? Ñ?пиÑ?кÑ?"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:261
 msgid "Birth Date"
 msgstr "Ð?аÑ?а наÑ?одженнÑ?"
 
-#: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:713
+#: ../addressbook/libebook/e-contact.c:262
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:715
 #: ../libedataserver/e-categories.c:45
 msgid "Anniversary"
 msgstr "РÑ?Ñ?ниÑ?Ñ?"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:263
+#: ../addressbook/libebook/e-contact.c:265
 msgid "X.509 Certificate"
 msgstr "X.509 Ñ?еÑ?Ñ?иÑ?Ñ?каÑ?"
 
-#: ../addressbook/libebook/e-contact.c:265
+#: ../addressbook/libebook/e-contact.c:267
 msgid "Gadu-Gadu Home Id 1"
 msgstr "Ð?омаÑ?нÑ?й Ñ?денÑ?иÑ?Ñ?каÑ?оÑ? Gadu-Gadu 1"
 
-#: ../addressbook/libebook/e-contact.c:266
+#: ../addressbook/libebook/e-contact.c:268
 msgid "Gadu-Gadu Home Id 2"
 msgstr "Ð?омаÑ?нÑ?й Ñ?денÑ?иÑ?Ñ?каÑ?оÑ? Gadu-Gadu 2"
 
-#: ../addressbook/libebook/e-contact.c:267
+#: ../addressbook/libebook/e-contact.c:269
 msgid "Gadu-Gadu Home Id 3"
 msgstr "Ð?омаÑ?нÑ?й Ñ?денÑ?иÑ?Ñ?каÑ?оÑ? Gadu-Gadu 3"
 
-#: ../addressbook/libebook/e-contact.c:268
+#: ../addressbook/libebook/e-contact.c:270
 msgid "Gadu-Gadu Work Id 1"
 msgstr "РобоÑ?ий Ñ?денÑ?иÑ?Ñ?каÑ?оÑ? Gadu-Gadu 1"
 
-#: ../addressbook/libebook/e-contact.c:269
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Gadu-Gadu Work Id 2"
 msgstr "РобоÑ?ий Ñ?денÑ?иÑ?Ñ?каÑ?оÑ? Gadu-Gadu 2"
 
-#: ../addressbook/libebook/e-contact.c:270
+#: ../addressbook/libebook/e-contact.c:272
 msgid "Gadu-Gadu Work Id 3"
 msgstr "РобоÑ?ий Ñ?денÑ?иÑ?Ñ?каÑ?оÑ? Gadu-Gadu 3"
 
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook/e-contact.c:273
 msgid "Gadu-Gadu Id List"
 msgstr "СпиÑ?ок Ñ?денÑ?иÑ?Ñ?каÑ?оÑ?Ñ?в Gadu-Gadu"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Geographic Information"
 msgstr "Ð?еогÑ?аÑ?Ñ?Ñ?на Ñ?нÑ?оÑ?маÑ?Ñ?Ñ?"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:278
 msgid "Telephone"
 msgstr "ТелеÑ?он"
 
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:280
 msgid "Skype Home Name 1"
 msgstr "Ð?омаÑ?нÑ?й Ñ?денÑ?иÑ?Ñ?каÑ?оÑ? Skype 1"
 
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Skype Home Name 2"
 msgstr "Ð?омаÑ?нÑ?й Ñ?денÑ?иÑ?Ñ?каÑ?оÑ? Skype 2"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:282
 msgid "Skype Home Name 3"
 msgstr "Ð?омаÑ?нÑ?й Ñ?денÑ?иÑ?Ñ?каÑ?оÑ? Skype 3"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Work Name 1"
 msgstr "РобоÑ?ий Ñ?денÑ?иÑ?Ñ?каÑ?оÑ? Skype 1"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Work Name 2"
 msgstr "РобоÑ?ий Ñ?денÑ?иÑ?Ñ?каÑ?оÑ? Skype 2"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Work Name 3"
 msgstr "РобоÑ?ий Ñ?денÑ?иÑ?Ñ?каÑ?оÑ? Skype 3"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Name List"
 msgstr "СпиÑ?ок Ñ?денÑ?иÑ?Ñ?каÑ?оÑ?Ñ?в Skype"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:288
 msgid "SIP address"
 msgstr "Ð?дÑ?еÑ?а SIP"
 
-#: ../addressbook/libebook/e-contact.c:1535
-#: ../addressbook/libebook/e-destination.c:761
+#: ../addressbook/libebook/e-contact.c:1515
+#: ../addressbook/libebook/e-destination.c:739
 msgid "Unnamed List"
 msgstr "Ð?еназваний Ñ?пиÑ?ок"
 
@@ -667,7 +667,7 @@ msgid "Cannot remove contacts"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? видалиÑ?и конÑ?акÑ?"
 
 #: ../addressbook/libedata-book/e-data-book.c:569
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
+#: ../calendar/libedata-cal/e-cal-backend-util.c:141
 msgid "Invalid query"
 msgstr "Ð?екоÑ?екÑ?ний запиÑ?"
 
@@ -679,27 +679,27 @@ msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? оÑ?Ñ?имаÑ?и змÑ?ни"
 msgid "Cannot complete operation"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? завеÑ?Ñ?иÑ?и опеÑ?аÑ?Ñ?Ñ?"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:715
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
 #: ../libedataserver/e-categories.c:46
 msgid "Birthday"
 msgstr "Ð?енÑ? наÑ?одженнÑ?"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:744
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:746
 #, c-format
 msgid "Birthday: %s"
 msgstr "Ð?енÑ? наÑ?одженнÑ?: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:768
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:770
 #, c-format
 msgid "Anniversary: %s"
 msgstr "РÑ?Ñ?ниÑ?Ñ?: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:234
+#: ../calendar/backends/file/e-cal-backend-file.c:236
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? збеÑ?егÑ?и данÑ? календаÑ?Ñ?: непÑ?авилÑ?ний URI."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:241
-#: ../calendar/backends/file/e-cal-backend-file.c:247
+#: ../calendar/backends/file/e-cal-backend-file.c:243
+#: ../calendar/backends/file/e-cal-backend-file.c:249
 msgid "Cannot save calendar data"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? збеÑ?егÑ?и данÑ? календаÑ?Ñ?"
 
@@ -708,114 +708,114 @@ msgid "Could not create thread for getting deltas"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и поÑ?Ñ?к длÑ? оÑ?Ñ?иманнÑ? Ñ?Ñ?зниÑ?Ñ?"
 
 #: ../calendar/backends/google/e-cal-backend-google-utils.c:374
-#: ../calendar/backends/google/e-cal-backend-google.c:1142
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1079
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1380
-#: ../calendar/backends/http/e-cal-backend-http.c:676
-#: ../calendar/backends/weather/e-cal-backend-weather.c:490
+#: ../calendar/backends/google/e-cal-backend-google.c:1144
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1105
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1403
+#: ../calendar/backends/http/e-cal-backend-http.c:678
+#: ../calendar/backends/weather/e-cal-backend-weather.c:492
 msgid "Could not create cache file"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и Ñ?айл кеÑ?Ñ?"
 
 #: ../calendar/backends/google/e-cal-backend-google-utils.c:387
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1092
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1118
 msgid "Could not create thread for populating cache"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и поÑ?Ñ?к длÑ? заповненнÑ? кеÑ?Ñ?"
 
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2122
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2121
 msgid "Reply Requested: by "
 msgstr "Ð?апиÑ?ано вÑ?дповÑ?дÑ?:"
 
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2127
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2126
 msgid "Reply Requested: When convenient"
 msgstr "Ð?апиÑ?ано вÑ?дповÑ?дÑ?: Ð?оли зÑ?Ñ?Ñ?но"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:281
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:280
 #, c-format
 msgid "Loading %s items"
 msgstr "Ð?аванÑ?аженнÑ? %s елеменÑ?Ñ?в"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:917
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:944
 msgid "Calendar"
 msgstr "Ð?алендаÑ?"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1002
 msgid "Invalid server URI"
 msgstr "Ð?епÑ?авилÑ?ний URI Ñ?еÑ?веÑ?а"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:994
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1003
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1097
-#: ../calendar/libecal/e-cal.c:3953
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1335
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1371
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1386
-#: ../camel/providers/groupwise/camel-groupwise-store.c:598
-#: ../camel/providers/groupwise/camel-groupwise-store.c:773
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1021
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1030
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1123
+#: ../calendar/libecal/e-cal.c:4024
+#: ../calendar/libedata-cal/e-cal-backend-util.c:119
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1334
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1370
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1385
+#: ../camel/providers/groupwise/camel-groupwise-store.c:591
+#: ../camel/providers/groupwise/camel-groupwise-store.c:766
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:154
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:181
 msgid "Authentication failed"
 msgstr "Ð?бÑ?й пеÑ?евÑ?Ñ?ки авÑ?енÑ?иÑ?ноÑ?Ñ?Ñ?"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:333
+#: ../calendar/backends/http/e-cal-backend-http.c:335
 msgid "Redirected to Invalid URI"
 msgstr "Ð?еÑ?еадÑ?еÑ?ований на непÑ?авилÑ?ний URI"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:356
+#: ../calendar/backends/http/e-cal-backend-http.c:358
 msgid "Bad file format."
 msgstr "Ð?епÑ?авилÑ?ний Ñ?оÑ?маÑ? Ñ?айлÑ?."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:363
+#: ../calendar/backends/http/e-cal-backend-http.c:365
 msgid "Not a calendar."
 msgstr "Ð?е Ñ? календаÑ?ем."
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:150
+#: ../calendar/backends/weather/e-cal-backend-weather.c:152
 msgid "Could not retrieve weather data"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? оÑ?Ñ?имаÑ?и данÑ? пÑ?о погодÑ?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
+#: ../calendar/backends/weather/e-cal-backend-weather.c:251
 msgid "Weather: Fog"
 msgstr "Ð?огода: ТÑ?ман"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
+#: ../calendar/backends/weather/e-cal-backend-weather.c:252
 msgid "Weather: Cloudy Night"
 msgstr "Ð?огода: ХмаÑ?на нÑ?Ñ?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:253
 msgid "Weather: Cloudy"
 msgstr "Ð?огода: ХмаÑ?но"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:254
 msgid "Weather: Overcast"
 msgstr "Ð?огода: Ñ?Ñ?Ñ?Ñ?Ñ?ва Ñ?маÑ?нÑ?Ñ?Ñ?Ñ?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:255
 msgid "Weather: Showers"
 msgstr "Ð?огода: Ð?ливи"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:256
 msgid "Weather: Snow"
 msgstr "Ð?огода: СнÑ?г"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:257
 msgid "Weather: Clear Night"
 msgstr "Ð?огода: Ð?огожа нÑ?Ñ?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:256
+#: ../calendar/backends/weather/e-cal-backend-weather.c:258
 msgid "Weather: Sunny"
 msgstr "Ð?огода: СонÑ?Ñ?но"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:257
+#: ../calendar/backends/weather/e-cal-backend-weather.c:259
 msgid "Weather: Thunderstorms"
 msgstr "Ð?огода: Ð?Ñ?ози"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:403
+#: ../calendar/backends/weather/e-cal-backend-weather.c:405
 msgid "Forecast"
 msgstr "Ð?Ñ?огноз погоди"
 
-#: ../calendar/libecal/e-cal-component.c:1316
+#: ../calendar/libecal/e-cal-component.c:1286
 msgid "Untitled appointment"
 msgstr "Ð?еназвана зÑ?Ñ?Ñ?Ñ?Ñ?Ñ?"
 
@@ -960,7 +960,7 @@ msgstr "Ð?изÑ?кий"
 msgid "Undefined"
 msgstr "Ð?евизнаÑ?ено"
 
-#: ../calendar/libecal/e-cal.c:1138 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1173 ../libedataserverui/e-book-auth-util.c:199
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Ð?ведÑ?Ñ?Ñ? паÑ?олÑ? длÑ? %s (коÑ?иÑ?Ñ?Ñ?ваÑ? %s)"
@@ -969,90 +969,91 @@ 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:1152
+#: ../calendar/libecal/e-cal.c:1187
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "Ð?ведÑ?Ñ?Ñ? паÑ?олÑ? длÑ? %s Ñ?об Ñ?вÑ?мкнÑ?Ñ?и пÑ?окÑ?Ñ? длÑ? коÑ?иÑ?Ñ?Ñ?ваÑ?а %s"
 
-#: ../calendar/libecal/e-cal.c:3925
+#: ../calendar/libecal/e-cal.c:3996
 msgid "Invalid argument"
 msgstr "Ð?епÑ?авилÑ?ний аÑ?гÑ?менÑ?"
 
-#: ../calendar/libecal/e-cal.c:3927
+#: ../calendar/libecal/e-cal.c:3998
 msgid "Backend is busy"
 msgstr "Ð?аза даниÑ? зайнÑ?Ñ?а"
 
-#: ../calendar/libecal/e-cal.c:3929
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:4000
+#: ../calendar/libedata-cal/e-cal-backend-util.c:107
 msgid "Repository is offline"
 msgstr "РепозиÑ?оÑ?Ñ?й вÑ?дклÑ?Ñ?ений вÑ?д меÑ?ежÑ?"
 
-#: ../calendar/libecal/e-cal.c:3931
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
+#: ../calendar/libecal/e-cal.c:4002
+#: ../calendar/libedata-cal/e-cal-backend-util.c:131
 msgid "No such calendar"
 msgstr "Ð?емаÑ? Ñ?акого календаÑ?Ñ?"
 
-#: ../calendar/libecal/e-cal.c:3933
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
-#: ../servers/groupwise/e-gw-connection.c:233
+#: ../calendar/libecal/e-cal.c:4004
+#: ../calendar/libedata-cal/e-cal-backend-util.c:113
+#: ../servers/groupwise/e-gw-connection.c:235
 msgid "Object not found"
 msgstr "Ð?б'Ñ?кÑ? не Ñ?Ñ?нÑ?Ñ?"
 
-#: ../calendar/libecal/e-cal.c:3935
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
-#: ../servers/groupwise/e-gw-connection.c:227
+#: ../calendar/libecal/e-cal.c:4006
+#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "Ð?епÑ?авилÑ?ний об'Ñ?кÑ?"
 
-#: ../calendar/libecal/e-cal.c:3937
+#: ../calendar/libecal/e-cal.c:4008
 msgid "URI not loaded"
 msgstr "URI не заванÑ?ажений"
 
-#: ../calendar/libecal/e-cal.c:3939
+#: ../calendar/libecal/e-cal.c:4010
 msgid "URI already loaded"
 msgstr "URI вже заванÑ?ажений"
 
-#: ../calendar/libecal/e-cal.c:3941
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
+#: ../calendar/libecal/e-cal.c:4012
+#: ../calendar/libedata-cal/e-cal-backend-util.c:109
 msgid "Permission denied"
 msgstr "Ð?оÑ?Ñ?Ñ?п забоÑ?онено"
 
-#: ../calendar/libecal/e-cal.c:3943
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
-#: ../servers/groupwise/e-gw-connection.c:235
+#: ../calendar/libecal/e-cal.c:4014
+#: ../calendar/libedata-cal/e-cal-backend-util.c:133
+#: ../servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "Ð?евÑ?домий коÑ?иÑ?Ñ?Ñ?ваÑ?"
 
-#: ../calendar/libecal/e-cal.c:3945
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../calendar/libecal/e-cal.c:4016
+#: ../calendar/libedata-cal/e-cal-backend-util.c:117
 msgid "Object ID already exists"
 msgstr "Ð?денÑ?иÑ?Ñ?каÑ?оÑ? об'Ñ?кÑ?Ñ? вже Ñ?Ñ?нÑ?Ñ?"
 
-#: ../calendar/libecal/e-cal.c:3947
+#: ../calendar/libecal/e-cal.c:4018
 msgid "Protocol not supported"
 msgstr "Ð?Ñ?оÑ?окол не пÑ?дÑ?Ñ?имÑ?Ñ?Ñ?Ñ?Ñ?Ñ?"
 
-#: ../calendar/libecal/e-cal.c:3949
+#: ../calendar/libecal/e-cal.c:4020
 msgid "Operation has been canceled"
 msgstr "Ð?пеÑ?аÑ?Ñ?Ñ? бÑ?ло Ñ?каÑ?овано"
 
-#: ../calendar/libecal/e-cal.c:3951
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
+#: ../calendar/libecal/e-cal.c:4022
+#: ../calendar/libedata-cal/e-cal-backend-util.c:145
 msgid "Could not cancel operation"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?каÑ?Ñ?ваÑ?и опеÑ?аÑ?Ñ?Ñ?"
 
-#: ../calendar/libecal/e-cal.c:3955
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
+#: ../calendar/libecal/e-cal.c:4026
+#: ../calendar/libedata-cal/e-cal-backend-util.c:121
 #: ../camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication required"
 msgstr "Ð?имагаÑ?Ñ?Ñ?Ñ?Ñ? авÑ?енÑ?иÑ?Ñ?каÑ?Ñ?Ñ?"
 
-#: ../calendar/libecal/e-cal.c:3957
+#: ../calendar/libecal/e-cal.c:4028
 msgid "A CORBA exception has occurred"
 msgstr "Ð?иникла виклÑ?Ñ?на Ñ?иÑ?Ñ?аÑ?Ñ?Ñ? Ñ?иÑ?Ñ?еми CORBA"
 
-#: ../calendar/libecal/e-cal.c:3959
-#: ../calendar/libedata-cal/e-cal-backend-util.c:146
+#: ../calendar/libecal/e-cal.c:4030
+#: ../calendar/libedata-cal/e-cal-backend-util.c:148
+#: ../camel/camel-net-utils.c:523
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:214
 #: ../camel/providers/imap/camel-imap-command.c:432
 #: ../camel/providers/imap/camel-imap-store.c:741
@@ -1063,89 +1064,87 @@ msgstr "Ð?иникла виклÑ?Ñ?на Ñ?иÑ?Ñ?аÑ?Ñ?Ñ? Ñ?иÑ?Ñ?еми CORBA"
 #: ../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/groupwise/e-gw-connection.c:241
+#: ../camel/providers/pop3/camel-pop3-store.c:584
+#: ../servers/groupwise/e-gw-connection.c:243
 msgid "Unknown error"
 msgstr "Ð?евÑ?дома помилка"
 
-#: ../calendar/libecal/e-cal.c:3961
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
+#: ../calendar/libecal/e-cal.c:4032
+#: ../calendar/libedata-cal/e-cal-backend-util.c:105
 msgid "No error"
 msgstr "Ð?ез помилок"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:67
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:693
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:802
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1023
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1050
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:695
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:804
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1025
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1052
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "\"%s\" повинен викликаÑ?иÑ?Ñ? без аÑ?гÑ?менÑ?Ñ?в"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:100
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:210
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:252
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:288
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:102
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:212
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:290
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1090
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\" оÑ?Ñ?кÑ?Ñ? один аÑ?гÑ?менÑ?"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:106
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:294
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:735
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:296
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:737
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "\"%s\" оÑ?Ñ?кÑ?Ñ?, Ñ?о пеÑ?Ñ?ий аÑ?гÑ?менÑ? бÑ?де Ñ?имволÑ?ного Ñ?ипÑ?"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr "пеÑ?Ñ?ий аÑ?гÑ?менÑ? \"%s\" повинен бÑ?Ñ?и даÑ?оÑ? Ñ? Ñ?оÑ?маÑ?Ñ? ISO 8601"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:361
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:162
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:363
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:415
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:731
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:864
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "\"%s\" оÑ?Ñ?кÑ?Ñ? два аÑ?гÑ?менÑ?и"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:216
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:258
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:367
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:419
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1094
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:168
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:218
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:260
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:369
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:421
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:870
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1096
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "\"%s\" оÑ?Ñ?кÑ?Ñ?, Ñ?о пеÑ?Ñ?ий аÑ?гÑ?менÑ? бÑ?де Ñ?ипÑ? time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "\"%s\" оÑ?Ñ?кÑ?Ñ?, Ñ?о дÑ?Ñ?гий аÑ?гÑ?менÑ? бÑ?де Ñ?Ñ?лим Ñ?иÑ?лом"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:375
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:377
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:430
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "\"%s\" оÑ?Ñ?кÑ?Ñ?, Ñ?о дÑ?Ñ?гий аÑ?гÑ?менÑ? бÑ?де Ñ?ипÑ? time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:743
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:745
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "\"%s\" оÑ?Ñ?кÑ?Ñ?, Ñ?о дÑ?Ñ?гий аÑ?гÑ?менÑ? бÑ?де Ñ?имволÑ?ного Ñ?ипÑ?"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:773
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1156,12 +1155,12 @@ msgstr ""
 "\"description\", \"location\", \"attendee\", \"organizer\" або "
 "\"classification\""
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:925
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "\"%s\" оÑ?Ñ?кÑ?Ñ? пÑ?инаймнÑ? один аÑ?гÑ?менÑ?"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:939
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:941
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1170,157 +1169,157 @@ msgstr ""
 "\"%s\" оÑ?Ñ?кÑ?Ñ?, Ñ?о Ñ?Ñ?Ñ? аÑ?гÑ?менÑ?и бÑ?дÑ?Ñ?Ñ? Ñ?имволÑ?ного Ñ?ипÑ?, або Ñ?диний аÑ?гÑ?менÑ? "
 "логÑ?Ñ?ного Ñ?ипÑ? - Ñ?ибнÑ?Ñ?Ñ?Ñ? (#f)"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+#: ../calendar/libedata-cal/e-cal-backend-util.c:111
 msgid "Invalid range"
 msgstr "Ð?епÑ?авилÑ?ний дÑ?апазон"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
+#: ../calendar/libedata-cal/e-cal-backend-util.c:123
 msgid "Unsupported field"
 msgstr "Ð?епÑ?дÑ?Ñ?имÑ?ване полÑ?"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-cal-backend-util.c:125
 msgid "Unsupported method"
 msgstr "Ð?епÑ?дÑ?Ñ?имÑ?ваний меÑ?од"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
+#: ../calendar/libedata-cal/e-cal-backend-util.c:127
 msgid "Unsupported authentication method"
 msgstr "Ð?епÑ?дÑ?Ñ?имÑ?ваний меÑ?од авÑ?енÑ?иÑ?Ñ?каÑ?Ñ?Ñ?"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
+#: ../calendar/libedata-cal/e-cal-backend-util.c:129
 msgid "TLS not available"
 msgstr "TLS недоÑ?Ñ?Ñ?пний"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
+#: ../calendar/libedata-cal/e-cal-backend-util.c:135
 msgid "Offline mode unavailable"
 msgstr "Ð?вÑ?ономний Ñ?ежим недоÑ?Ñ?Ñ?пний"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
+#: ../calendar/libedata-cal/e-cal-backend-util.c:137
 msgid "Search size limit exceeded"
 msgstr "Ð?еÑ?евиÑ?ено обмеженнÑ? на Ñ?озмÑ?Ñ? Ñ?езÑ?лÑ?Ñ?аÑ?Ñ?в поÑ?Ñ?кÑ?"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
+#: ../calendar/libedata-cal/e-cal-backend-util.c:139
 msgid "Search time limit exceeded"
 msgstr "Ð?еÑ?евиÑ?ено обмеженнÑ? на Ñ?аÑ? поÑ?Ñ?кÑ?"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
+#: ../calendar/libedata-cal/e-cal-backend-util.c:143
 msgid "Query refused"
 msgstr "Ð?апиÑ? вÑ?дÑ?илено"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
+#: ../calendar/libedata-cal/e-cal-backend-util.c:150
 msgid "Invalid server version"
 msgstr "Ð?епÑ?авилÑ?на веÑ?Ñ?Ñ?Ñ? Ñ?еÑ?веÑ?а"
 
-#: ../calendar/libedata-cal/e-data-cal.c:491
+#: ../calendar/libedata-cal/e-data-cal.c:501
 #, c-format
 msgid "Cannot retrieve calendar address"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? оÑ?Ñ?имаÑ?и адÑ?еÑ?Ñ? календаÑ?Ñ?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:509
+#: ../calendar/libedata-cal/e-data-cal.c:519
 #, c-format
 msgid "Cannot retrieve calendar alarm e-mail address"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? оÑ?Ñ?имаÑ?и адÑ?еÑ?Ñ? попеÑ?едженнÑ? з календаÑ?Ñ?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:527
+#: ../calendar/libedata-cal/e-data-cal.c:537
 #, c-format
 msgid "Cannot retrieve calendar's ldap attribute"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? оÑ?Ñ?имаÑ?и ldap-аÑ?Ñ?ибÑ?Ñ?и календаÑ?Ñ?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:545
+#: ../calendar/libedata-cal/e-data-cal.c:555
 #, c-format
 msgid "Cannot retrieve calendar scheduling information"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? оÑ?Ñ?имаÑ?и Ñ?нÑ?оÑ?маÑ?Ñ?Ñ? пÑ?о Ñ?озклад з календаÑ?Ñ?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:562
+#: ../calendar/libedata-cal/e-data-cal.c:572
 #, c-format
 msgid "Cannot open calendar"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? вÑ?дкÑ?иÑ?и календаÑ?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:579
+#: ../calendar/libedata-cal/e-data-cal.c:591
 #, c-format
 msgid "Cannot refresh calendar"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? оновиÑ?и календаÑ?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:596
+#: ../calendar/libedata-cal/e-data-cal.c:608
 #, c-format
 msgid "Cannot remove calendar"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? видалиÑ?и календаÑ?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:615
+#: ../calendar/libedata-cal/e-data-cal.c:627
 #, c-format
 msgid "Cannot create calendar object"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и об'Ñ?кÑ? календаÑ?Ñ?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:637
+#: ../calendar/libedata-cal/e-data-cal.c:649
 #, c-format
-msgid "Cannot modify calender object"
+msgid "Cannot modify calendar object"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? змÑ?ниÑ?и об'Ñ?кÑ? календаÑ?Ñ?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:661
+#: ../calendar/libedata-cal/e-data-cal.c:673
 #, c-format
 msgid "Cannot remove calendar object"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? пеÑ?емÑ?Ñ?Ñ?иÑ?и об'Ñ?кÑ? календаÑ?Ñ?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:680
+#: ../calendar/libedata-cal/e-data-cal.c:692
 #, c-format
 msgid "Cannot receive calendar objects"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? оÑ?Ñ?имаÑ?и об'Ñ?кÑ?и календаÑ?Ñ?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:697
+#: ../calendar/libedata-cal/e-data-cal.c:709
 #, c-format
 msgid "Cannot discard calendar alarm"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? вÑ?дкинÑ?Ñ?и попеÑ?едженнÑ? календаÑ?Ñ?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:716
+#: ../calendar/libedata-cal/e-data-cal.c:728
 #, c-format
 msgid "Cannot send calendar objects"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? надÑ?Ñ?лаÑ?и об'Ñ?кÑ? календаÑ?Ñ?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:751
+#: ../calendar/libedata-cal/e-data-cal.c:763
 #, c-format
 msgid "Cannot retrieve default calendar object path"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? оÑ?Ñ?имаÑ?и Ñ?иповий об'Ñ?кÑ? календаÑ?Ñ?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:769
+#: ../calendar/libedata-cal/e-data-cal.c:781
 #, c-format
 msgid "Cannot retrieve calendar object path"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? оÑ?Ñ?имаÑ?и Ñ?лÑ?Ñ? до об'Ñ?кÑ?Ñ? календаÑ?Ñ?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:787
+#: ../calendar/libedata-cal/e-data-cal.c:799
 #, c-format
 msgid "Cannot retrieve calendar object list"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? оÑ?Ñ?имаÑ?и Ñ?пиÑ?ок об'Ñ?кÑ?Ñ?в календаÑ?Ñ?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:825
+#: ../calendar/libedata-cal/e-data-cal.c:837
 #, c-format
 msgid "Could not retrieve attachment list"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? оÑ?Ñ?имаÑ?и Ñ?пиÑ?ок вкладенÑ?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:847
+#: ../calendar/libedata-cal/e-data-cal.c:859
 #, c-format
 msgid "Could not complete calendar query"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? завеÑ?Ñ?иÑ?и запиÑ? до календаÑ?Ñ?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:865
+#: ../calendar/libedata-cal/e-data-cal.c:877
 #, c-format
 msgid "Could not retrieve calendar time zone"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? оÑ?Ñ?имаÑ?и Ñ?аÑ?овий поÑ?Ñ? календаÑ?Ñ?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:883
+#: ../calendar/libedata-cal/e-data-cal.c:895
 #, c-format
 msgid "Could not add calendar time zone"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? додаÑ?и Ñ?аÑ?овий поÑ?Ñ? календаÑ?Ñ?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:900
+#: ../calendar/libedata-cal/e-data-cal.c:912
 #, c-format
 msgid "Could not set default calendar time zone"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? вÑ?Ñ?ановиÑ?и Ñ?аÑ?овий поÑ?Ñ? календаÑ?Ñ?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:921
+#: ../calendar/libedata-cal/e-data-cal.c:933
 #, c-format
 msgid "Cannot retrieve calendar changes"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? оÑ?Ñ?имаÑ?и змÑ?ни календаÑ?Ñ?"
 
-#: ../calendar/libedata-cal/e-data-cal.c:971
+#: ../calendar/libedata-cal/e-data-cal.c:983
 #, c-format
 msgid "Cannot retrieve calendar free/busy list"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? оÑ?Ñ?имаÑ?и Ñ?пиÑ?ок зайнÑ?Ñ?оÑ?Ñ?Ñ? з календаÑ?Ñ?"
@@ -1380,16 +1379,16 @@ msgstr "Ð?и не можеÑ?е Ñ?мпоÑ?Ñ?Ñ?ваÑ?и клÑ?Ñ?Ñ? Ñ?им Ñ?иÑ?Ñ?
 msgid "You may not export keys with this cipher"
 msgstr "Ð?и не можеÑ?е екÑ?поÑ?Ñ?Ñ?ваÑ?и клÑ?Ñ?Ñ? Ñ?им Ñ?иÑ?Ñ?ом"
 
-#: ../camel/camel-data-cache.c:136
+#: ../camel/camel-data-cache.c:135
 msgid "Unable to create cache path"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и Ñ?лÑ?Ñ? до кеÑ?а"
 
-#: ../camel/camel-data-cache.c:402
+#: ../camel/camel-data-cache.c:403
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? видалиÑ?и кеÑ?ований елеменÑ?: %s: %s"
 
-#: ../camel/camel-db.c:411
+#: ../camel/camel-db.c:416
 msgid "Insufficient memory"
 msgstr "Ð?едоÑ?Ñ?аÑ?нÑ?о пам'Ñ?Ñ?Ñ?"
 
@@ -1434,11 +1433,14 @@ msgid "Preparing folder '%s' for offline"
 msgstr "Ð?Ñ?дгоÑ?овка Ñ?еки '%s' длÑ? авÑ?ономноÑ? Ñ?обоÑ?и"
 
 #: ../camel/camel-disco-store.c:400
-#: ../camel/providers/groupwise/camel-groupwise-store.c:223
+#: ../camel/providers/groupwise/camel-groupwise-store.c:216
 #: ../camel/providers/imap/camel-imap-store.c:1001
 #: ../camel/providers/imap/camel-imap-store.c:1843
 #: ../camel/providers/imap/camel-imap-store.c:2259
-#: ../camel/providers/imap/camel-imap-store.c:3051
+#: ../camel/providers/imap/camel-imap-store.c:3068
+#: ../camel/providers/imapx/camel-imapx-store.c:167
+#: ../camel/providers/imapx/camel-imapx-store.c:620
+#: ../camel/providers/imapx/camel-imapx-store.c:650
 msgid "You must be working online to complete this operation"
 msgstr "Ð?лÑ? завеÑ?Ñ?еннÑ? Ñ?Ñ?Ñ?Ñ? опеÑ?аÑ?Ñ?Ñ? необÑ?Ñ?дне пÑ?дклÑ?Ñ?еннÑ? до меÑ?ежÑ?"
 
@@ -1528,8 +1530,8 @@ msgstr "Ð?епÑ?авилÑ?нÑ? аÑ?гÑ?менÑ?и до (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Ð?омилка виконаннÑ? Ñ?Ñ?лÑ?Ñ?Ñ?ованого поÑ?Ñ?кÑ?: %s: %s"
 
-#: ../camel/camel-folder-search.c:351 ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:608
+#: ../camel/camel-folder-search.c:351 ../camel/camel-folder-search.c:455
+#: ../camel/camel-folder-search.c:610
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1538,8 +1540,8 @@ msgstr ""
 "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? пÑ?оаналÑ?зÑ?ваÑ?и поÑ?Ñ?ковий виÑ?аз: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:463
-#: ../camel/camel-folder-search.c:618
+#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:465
+#: ../camel/camel-folder-search.c:620
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1548,69 +1550,69 @@ msgstr ""
 "Ð?омилка виконаннÑ? поÑ?Ñ?кового виÑ?азÑ?: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:852
+#: ../camel/camel-folder-search.c:812 ../camel/camel-folder-search.c:854
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) поÑ?Ñ?ебÑ?Ñ? Ñ?диного логÑ?Ñ?ного Ñ?езÑ?лÑ?Ñ?аÑ?Ñ?"
 
-#: ../camel/camel-folder-search.c:905
+#: ../camel/camel-folder-search.c:907
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) не дозволÑ?Ñ?Ñ?Ñ?Ñ?Ñ? Ñ? Ñ?еÑ?единÑ? %s"
 
-#: ../camel/camel-folder-search.c:911 ../camel/camel-folder-search.c:918
+#: ../camel/camel-folder-search.c:913 ../camel/camel-folder-search.c:920
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) вимагаÑ? Ñ?Ñ?док вÑ?дповÑ?дноÑ?Ñ?Ñ?"
 
-#: ../camel/camel-folder-search.c:945
+#: ../camel/camel-folder-search.c:947
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) оÑ?Ñ?кÑ?Ñ? Ñ?езÑ?лÑ?Ñ?аÑ? Ñ? виглÑ?дÑ? маÑ?ивÑ?"
 
-#: ../camel/camel-folder-search.c:954
+#: ../camel/camel-folder-search.c:956
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) поÑ?Ñ?ебÑ?Ñ? вÑ?Ñ?ановленнÑ? Ñ?еки"
 
-#: ../camel/camel-folder.c:669
+#: ../camel/camel-folder.c:690
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Ð?пеÑ?аÑ?Ñ?Ñ? не пÑ?дÑ?Ñ?имÑ?Ñ?Ñ?Ñ?Ñ?Ñ?: додаваннÑ? повÑ?домленнÑ?: длÑ? %s"
 
-#: ../camel/camel-folder.c:1374
+#: ../camel/camel-folder.c:1401
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Ð?пеÑ?аÑ?Ñ?Ñ? не пÑ?дÑ?Ñ?имÑ?Ñ?Ñ?Ñ?Ñ?Ñ?: поÑ?Ñ?к за виÑ?азом: длÑ? %s"
 
-#: ../camel/camel-folder.c:1415
+#: ../camel/camel-folder.c:1442
 #, c-format
 msgid "Unsupported operation: count by expression: for %s"
 msgstr "Ð?пеÑ?аÑ?Ñ?Ñ? не пÑ?дÑ?Ñ?имÑ?Ñ?Ñ?Ñ?Ñ?Ñ?: пÑ?дÑ?аÑ?Ñ?нок за виÑ?азом: длÑ? %s"
 
-#: ../camel/camel-folder.c:1454
+#: ../camel/camel-folder.c:1483
 #, c-format
 msgid "Unsupported operation: search by UIDs: for %s"
 msgstr "Ð?пеÑ?аÑ?Ñ?Ñ? не пÑ?дÑ?Ñ?имÑ?Ñ?Ñ?Ñ?Ñ?Ñ?: поÑ?Ñ?к за UID: длÑ? %s"
 
-#: ../camel/camel-folder.c:1567
+#: ../camel/camel-folder.c:1596
 #: ../camel/providers/local/camel-maildir-folder.c:387
 msgid "Moving messages"
 msgstr "Ð?еÑ?емÑ?Ñ?еннÑ? повÑ?домленÑ?"
 
-#: ../camel/camel-folder.c:1567
+#: ../camel/camel-folder.c:1596
 msgid "Copying messages"
 msgstr "Ð?опÑ?Ñ?ваннÑ? повÑ?домленÑ?"
 
-#: ../camel/camel-folder.c:1908
+#: ../camel/camel-folder.c:1945
 msgid "Learning junk"
 msgstr "ТÑ?иваÑ? вивÑ?еннÑ? бÑ?Ñ?Ñ?Ñ?Ñ?"
 
-#: ../camel/camel-folder.c:1925
+#: ../camel/camel-folder.c:1963
 msgid "Learning non-junk"
 msgstr "ТÑ?иваÑ? вивÑ?еннÑ? не-бÑ?Ñ?Ñ?Ñ?Ñ?"
 
-#: ../camel/camel-folder.c:1944
+#: ../camel/camel-folder.c:1983
 msgid "Filtering new message(s)"
 msgstr "ФÑ?лÑ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? нова поÑ?Ñ?а"
 
@@ -1841,40 +1843,40 @@ msgstr "Ð?омилка копÑ?Ñ?ваннÑ? Ñ?имÑ?аÑ?ового поÑ?Ñ?ов
 msgid "parse error"
 msgstr "помилка обÑ?обки"
 
-#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:674
-#: ../camel/camel-net-utils.c:805
-#: ../camel/providers/pop3/camel-pop3-store.c:446
-#: ../camel/providers/pop3/camel-pop3-store.c:546
+#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:678
+#: ../camel/camel-net-utils.c:817
+#: ../camel/providers/pop3/camel-pop3-store.c:478
+#: ../camel/providers/pop3/camel-pop3-store.c:578
 msgid "Canceled"
 msgstr "СкаÑ?овано"
 
-#: ../camel/camel-net-utils.c:521
+#: ../camel/camel-net-utils.c:523
 msgid "cannot create thread"
 msgstr "не вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и поÑ?Ñ?к"
 
-#: ../camel/camel-net-utils.c:678
+#: ../camel/camel-net-utils.c:682
 #, c-format
 msgid "Resolving: %s"
 msgstr "Ð?оÑ?Ñ?к вÑ?зла: %s"
 
-#: ../camel/camel-net-utils.c:700
+#: ../camel/camel-net-utils.c:704
 msgid "Host lookup failed"
 msgstr "Ð?омилка поÑ?Ñ?кÑ? вÑ?зла"
 
-#: ../camel/camel-net-utils.c:702
+#: ../camel/camel-net-utils.c:706
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "Ð?омилка поÑ?Ñ?кÑ? вÑ?зла: %s: %s"
 
-#: ../camel/camel-net-utils.c:809
+#: ../camel/camel-net-utils.c:821
 msgid "Resolving address"
 msgstr "Ð?оÑ?Ñ?к адÑ?еÑ?и"
 
-#: ../camel/camel-net-utils.c:829
+#: ../camel/camel-net-utils.c:841
 msgid "Name lookup failed"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? визнаÑ?иÑ?и поÑ?Ñ?"
 
-#: ../camel/camel-net-utils.c:832
+#: ../camel/camel-net-utils.c:844
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? визнаÑ?иÑ?и вÑ?зол: %s"
@@ -1912,7 +1914,7 @@ msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? заванÑ?ажиÑ?и %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? заванÑ?ажиÑ?и %s: в модÑ?лÑ? немаÑ? кодÑ? Ñ?нÑ?Ñ?Ñ?алÑ?заÑ?Ñ?Ñ?."
 
-#: ../camel/camel-provider.c:379 ../camel/camel-session.c:182
+#: ../camel/camel-provider.c:379 ../camel/camel-session.c:180
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "Ð?оÑ?Ñ?аÑ?алÑ?ник пÑ?оÑ?околÑ? \"%s\" недоÑ?Ñ?Ñ?пний"
@@ -2004,15 +2006,15 @@ msgstr "Ð?Ñ?дповÑ?дÑ? Ñ?еÑ?веÑ?а мÑ?Ñ?Ñ?иÑ?Ñ? неповнÑ? Ñ?нÑ?о
 msgid "Server response does not match"
 msgstr "Ð?епÑ?авилÑ?на вÑ?дповÑ?дÑ? Ñ?еÑ?веÑ?а"
 
-#: ../camel/camel-sasl-gssapi.c:63
+#: ../camel/camel-sasl-gssapi.c:72
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:65
+#: ../camel/camel-sasl-gssapi.c:74
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "Ð?'Ñ?днÑ?ваÑ?иÑ?Ñ? з Ñ?еÑ?веÑ?ом викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?и Kerberos 5."
 
-#: ../camel/camel-sasl-gssapi.c:159
+#: ../camel/camel-sasl-gssapi.c:168
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -2020,11 +2022,11 @@ msgstr ""
 "Ð?казаний меÑ?анÑ?зм не пÑ?дÑ?Ñ?имÑ?Ñ?Ñ?Ñ?Ñ?Ñ? вÑ?Ñ?ановленими мандаÑ?ом або маÑ? невÑ?домÑ? "
 "Ñ?еалÑ?заÑ?Ñ?Ñ?."
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:173
 msgid "The provided target_name parameter was ill-formed."
 msgstr "Ð?казаний паÑ?амеÑ?Ñ? target_name Ñ?Ñ?оÑ?мовано непÑ?авилÑ?но."
 
-#: ../camel/camel-sasl-gssapi.c:167
+#: ../camel/camel-sasl-gssapi.c:176
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
@@ -2032,7 +2034,7 @@ msgstr ""
 "Ð?азнаÑ?ений паÑ?амеÑ?Ñ? target_name мÑ?Ñ?Ñ?ив непÑ?авилÑ?ний або непÑ?дÑ?Ñ?имÑ?ваний Ñ?ип "
 "Ñ?менÑ?."
 
-#: ../camel/camel-sasl-gssapi.c:171
+#: ../camel/camel-sasl-gssapi.c:180
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -2040,7 +2042,7 @@ msgstr ""
 "Ð?Ñ?ив'Ñ?зка до каналÑ? маÑ?кеÑ?а input_token вÑ?дÑ?Ñ?знÑ?Ñ?Ñ?Ñ?Ñ?Ñ? вÑ?д вказаного Ñ? "
 "input_chan_bindings знаÑ?еннÑ?."
 
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../camel/camel-sasl-gssapi.c:185
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
@@ -2048,7 +2050,7 @@ msgstr ""
 "Ð?Ñ?Ñ?дний маÑ?кеÑ? input_token мÑ?Ñ?Ñ?иÑ?Ñ? непÑ?авилÑ?ний пÑ?дпиÑ? або пÑ?дпиÑ? Ñ?кий не "
 "може бÑ?Ñ?и пеÑ?евÑ?Ñ?ено."
 
-#: ../camel/camel-sasl-gssapi.c:180
+#: ../camel/camel-sasl-gssapi.c:189
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -2056,29 +2058,29 @@ msgstr ""
 "Ð?аданÑ? мандаÑ?и не Ñ? пÑ?авилÑ?ними длÑ? конÑ?екÑ?Ñ?Ñ? Ñ?нÑ?Ñ?Ñ?алÑ?заÑ?Ñ?Ñ?, або деÑ?кÑ?ипÑ?оÑ? "
 "мандаÑ?Ñ? не поÑ?илаÑ?Ñ?Ñ?Ñ?Ñ? на мандаÑ?и."
 
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../camel/camel-sasl-gssapi.c:194
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "Ð?аданий деÑ?кÑ?ипÑ?оÑ? конÑ?екÑ?Ñ?Ñ? не поÑ?илаÑ?Ñ?Ñ?Ñ?Ñ? на коÑ?екÑ?ний конÑ?екÑ?Ñ?."
 
-#: ../camel/camel-sasl-gssapi.c:188
+#: ../camel/camel-sasl-gssapi.c:197
 msgid "The consistency checks performed on the input_token failed."
 msgstr "Ð?омилка пÑ?и пеÑ?евÑ?Ñ?Ñ?Ñ? Ñ?Ñ?лÑ?Ñ?ноÑ?Ñ?Ñ? длÑ? input_token."
 
-#: ../camel/camel-sasl-gssapi.c:191
+#: ../camel/camel-sasl-gssapi.c:200
 msgid "The consistency checks performed on the credential failed."
 msgstr "Ð?омилка пÑ?и пеÑ?евÑ?Ñ?Ñ?Ñ? мандаÑ?Ñ? на вÑ?дповÑ?днÑ?Ñ?Ñ?Ñ?."
 
-#: ../camel/camel-sasl-gssapi.c:194
+#: ../camel/camel-sasl-gssapi.c:203
 msgid "The referenced credentials have expired."
 msgstr "ТеÑ?мÑ?н дÑ?Ñ? вказаниÑ? мандаÑ?Ñ?в закÑ?нÑ?ивÑ?Ñ?."
 
-#: ../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-gssapi.c:209 ../camel/camel-sasl-gssapi.c:316
+#: ../camel/camel-sasl-gssapi.c:358 ../camel/camel-sasl-gssapi.c:373
 #: ../camel/providers/imap/camel-imap-store.c:1272
 msgid "Bad authentication response from server."
 msgstr "Ð?епÑ?авилÑ?на авÑ?енÑ?иÑ?Ñ?каÑ?Ñ?Ñ? вÑ?д Ñ?еÑ?веÑ?а."
 
-#: ../camel/camel-sasl-gssapi.c:309
+#: ../camel/camel-sasl-gssapi.c:383
 msgid "Unsupported security layer."
 msgstr "Ð?е пÑ?дÑ?Ñ?имÑ?ваний Ñ?ип заÑ?иÑ?Ñ?Ñ?."
 
@@ -2130,7 +2132,7 @@ msgstr "POP до SMTP авÑ?оÑ?изаÑ?Ñ?Ñ? викоÑ?иÑ?Ñ?овÑ?Ñ? невÑ?д
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP до SMTP авÑ?оÑ?изаÑ?Ñ?Ñ? викоÑ?иÑ?Ñ?овÑ?Ñ? не POP джеÑ?ело"
 
-#: ../camel/camel-search-private.c:149
+#: ../camel/camel-search-private.c:147
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Ð?омилка пÑ?и компÑ?лÑ?Ñ?Ñ?Ñ? Ñ?егÑ?лÑ?Ñ?ного виÑ?азÑ?: %s: %s"
@@ -2150,7 +2152,7 @@ msgstr "URL '%s' поÑ?Ñ?ебÑ?Ñ? компоненÑ?Ñ? назви вÑ?зла"
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' поÑ?Ñ?ебÑ?Ñ? компоненÑ?Ñ? Ñ?лÑ?Ñ?Ñ?"
 
-#: ../camel/camel-session.c:307
+#: ../camel/camel-session.c:305
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2159,12 +2161,12 @@ msgstr ""
 "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и каÑ?алог %s:\n"
 "%s"
 
-#: ../camel/camel-session.c:479
+#: ../camel/camel-session.c:484
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "Ð?ведÑ?Ñ?Ñ? паÑ?олÑ? %s длÑ? %s на вÑ?злÑ? %s."
 
-#: ../camel/camel-session.c:817
+#: ../camel/camel-session.c:832
 msgid "Camel session doesn't support forwarding of a message."
 msgstr "СеÑ?Ñ?Ñ? Camel не пÑ?дÑ?Ñ?имÑ?Ñ? пеÑ?еадÑ?еÑ?Ñ?ваннÑ? повÑ?домленнÑ?."
 
@@ -2543,9 +2545,9 @@ msgstr "Ð?емаÑ? Ñ?акого повÑ?домленнÑ?"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:149
 #: ../camel/providers/imap4/camel-imap4-folder.c:814
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:250
-#: ../camel/providers/nntp/camel-nntp-folder.c:410
+#: ../camel/providers/nntp/camel-nntp-folder.c:173
+#: ../camel/providers/nntp/camel-nntp-folder.c:248
+#: ../camel/providers/nntp/camel-nntp-folder.c:408
 #: ../camel/providers/pop3/camel-pop3-folder.c:268
 #: ../camel/providers/pop3/camel-pop3-folder.c:578
 #: ../camel/providers/pop3/camel-pop3-folder.c:639
@@ -2555,10 +2557,10 @@ msgstr "СкаÑ?овано коÑ?иÑ?Ñ?Ñ?ваÑ?ем"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:156
 #: ../camel/providers/imap4/camel-imap4-folder.c:819
+#: ../camel/providers/nntp/camel-nntp-folder.c:164
 #: ../camel/providers/nntp/camel-nntp-folder.c:166
-#: ../camel/providers/nntp/camel-nntp-folder.c:168
-#: ../camel/providers/nntp/camel-nntp-folder.c:177
-#: ../camel/providers/nntp/camel-nntp-folder.c:252
+#: ../camel/providers/nntp/camel-nntp-folder.c:175
+#: ../camel/providers/nntp/camel-nntp-folder.c:250
 #: ../camel/providers/pop3/camel-pop3-folder.c:388
 #: ../camel/providers/pop3/camel-pop3-folder.c:581
 #: ../camel/providers/pop3/camel-pop3-folder.c:642
@@ -2570,49 +2572,51 @@ msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? оÑ?Ñ?имаÑ?и повÑ?домленнÑ? %s: %s"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:173
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:181
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2507
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2506
 #: ../camel/providers/imap4/camel-imap4-folder.c:837
 msgid "This message is not available in offline mode."
 msgstr "Це повÑ?домленнÑ? недоÑ?Ñ?Ñ?пне Ñ? авÑ?ономномÑ? Ñ?ежимÑ?."
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:195
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2010
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2061
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2009
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2060
 msgid "Could not get message"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? оÑ?Ñ?имаÑ?и повÑ?домленнÑ?."
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:983
-#: ../camel/providers/imap/camel-imap-folder.c:296
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:982
+#: ../camel/providers/imap/camel-imap-folder.c:295
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? заванÑ?ажиÑ?и зведеннÑ? пÑ?о %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1056
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1055
 #, c-format
 msgid "Checking for deleted messages %s"
 msgstr "Ð?еÑ?евÑ?Ñ?ка видалениÑ? повÑ?домленÑ? %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1331
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1330
 msgid "Trash Folder Full. Please Empty."
 msgstr "Тека Ñ?мÑ?Ñ?ника пеÑ?еповнена. Ð?Ñ?иÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?."
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1565
-#: ../camel/providers/groupwise/camel-groupwise-store.c:633
-#: ../camel/providers/groupwise/camel-groupwise-store.c:763
-#: ../camel/providers/imap/camel-imap-folder.c:3430
-#: ../camel/providers/imap/camel-imap-folder.c:3506
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1564
+#: ../camel/providers/groupwise/camel-groupwise-store.c:626
+#: ../camel/providers/groupwise/camel-groupwise-store.c:756
+#: ../camel/providers/imap/camel-imap-folder.c:3429
+#: ../camel/providers/imap/camel-imap-folder.c:3505
+#: ../camel/providers/imapx/camel-imapx-server.c:2968
+#: ../camel/providers/imapx/camel-imapx-server.c:3054
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "Ð?Ñ?Ñ?иманнÑ? вÑ?домоÑ?Ñ?ей пÑ?о новÑ? повÑ?домленнÑ? на %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2361
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2404
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2360
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2403
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? додаÑ?и повÑ?домленнÑ? до Ñ?еки: «%s»: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2392
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2391
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и повÑ?домленнÑ?: %s"
@@ -2642,12 +2646,14 @@ msgstr "Ð?еÑ?евÑ?Ñ?Ñ?Ñ?и новÑ? поÑ?Ñ?Ñ?"
 #: ../camel/providers/hula/camel-hula-provider.c:50
 #: ../camel/providers/imap/camel-imap-provider.c:46
 #: ../camel/providers/imap4/camel-imap4-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
 msgid "C_heck for new messages in all folders"
 msgstr "Ð?_еÑ?евÑ?Ñ?Ñ?Ñ?и новÑ? поÑ?Ñ?Ñ? в Ñ?Ñ?Ñ?Ñ? Ñ?екаÑ?"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:59
 #: ../camel/providers/imap/camel-imap-provider.c:68
 #: ../camel/providers/imap4/camel-imap4-provider.c:51
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
 #: ../camel/providers/local/camel-local-provider.c:46
 #: ../camel/providers/local/camel-local-provider.c:86
 #: ../camel/providers/local/camel-local-provider.c:106
@@ -2665,6 +2671,7 @@ msgstr "Ð?еÑ?евÑ?Ñ?Ñ?Ñ?и, Ñ?и Ñ? новÑ? повÑ?домленнÑ? Ñ?_па
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:65
 #: ../camel/providers/imap/camel-imap-provider.c:74
+#: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "Ð?еÑ?евÑ?Ñ?Ñ?Ñ?и, Ñ?и Ñ? новÑ? повÑ?домленнÑ? Ñ?памом, _лиÑ?е Ñ? Ñ?еÑ?Ñ? \"Ð?Ñ?Ñ?днÑ?\""
 
@@ -2692,7 +2699,7 @@ msgstr "Ð?лÑ? доÑ?Ñ?Ñ?пÑ? до Ñ?еÑ?веÑ?Ñ?в Novell Groupwise"
 #: ../camel/providers/hula/camel-hula-provider.c:93
 #: ../camel/providers/imap/camel-imap-provider.c:100
 #: ../camel/providers/imap4/camel-imap4-provider.c:83
-#: ../camel/providers/imapx/camel-imapx-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:106
 #: ../camel/providers/nntp/camel-nntp-provider.c:74
 #: ../camel/providers/pop3/camel-pop3-provider.c:74
 msgid "Password"
@@ -2707,46 +2714,48 @@ msgstr "Ð?'Ñ?днÑ?ваÑ?иÑ?Ñ? з Ñ?еÑ?веÑ?ом IMAP викоÑ?иÑ?Ñ?овÑ?
 msgid "Host or user not available in url"
 msgstr "Ð?Ñ?зол або коÑ?иÑ?Ñ?Ñ?ваÑ? недоÑ?Ñ?Ñ?пнÑ? в url"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:204
+#: ../camel/providers/groupwise/camel-groupwise-store.c:197
 #: ../camel/providers/imap/camel-imap-store.c:1356
+#: ../camel/providers/imapx/camel-imapx-server.c:2302
 msgid "You did not enter a password."
 msgstr "Ð?и не ввели паÑ?олÑ?."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:319
+#: ../camel/providers/groupwise/camel-groupwise-store.c:312
 msgid "Some features may not work correctly with your current server version"
 msgstr "Ð?еÑ?кÑ? Ñ?Ñ?нкÑ?Ñ?Ñ? можÑ?Ñ?Ñ? пÑ?аÑ?Ñ?ваÑ?и некоÑ?екÑ?но з ваÑ?оÑ? веÑ?Ñ?Ñ?Ñ?Ñ? Ñ?еÑ?веÑ?а"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:540
+#: ../camel/providers/groupwise/camel-groupwise-store.c:533
 #: ../camel/providers/imap/camel-imap-store.c:1879
 #: ../camel/providers/imap/camel-imap-store.c:2077
-#: ../camel/providers/imapx/camel-imapx-store.c:245
+#: ../camel/providers/imapx/camel-imapx-store.c:331
 #, c-format
 msgid "No such folder %s"
 msgstr "Ð?емаÑ? Ñ?акоÑ? Ñ?еки \"%s\""
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1266
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1201
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "Ð?е можна Ñ?Ñ?воÑ?Ñ?ваÑ?и Ñ?екÑ? GroupWise Ñ? авÑ?ономномÑ? Ñ?ежимÑ?."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1280
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1215
 #: ../camel/providers/imap/camel-imap-store.c:1954
 #: ../camel/providers/imap/camel-imap-store.c:2334
+#: ../camel/providers/imapx/camel-imapx-store.c:687
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ð?аÑ?Ñ?кÑ?вÑ?Ñ?ка Ñ?ека не дозволÑ?Ñ? Ñ?озмÑ?Ñ?Ñ?ваÑ?и пÑ?дÑ?еки"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1294
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1317
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? пеÑ?ейменÑ?ваÑ?и Ñ?екÑ? GroupWise `%s' на `%s'"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1414
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1349
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:120
 #, c-format
 msgid "GroupWise server %s"
 msgstr "СеÑ?веÑ? GroupWise %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1416
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1351
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "СлÑ?жба GroupWise длÑ? %s на %s"
@@ -2779,27 +2788,32 @@ msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? вÑ?дÑ?Ñ?лаÑ?и повÑ?домленнÑ?: %s"
 
 #: ../camel/providers/hula/camel-hula-provider.c:48
 #: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
 msgid "Checking for New Mail"
 msgstr "Ð?еÑ?евÑ?Ñ?ка новоÑ? поÑ?Ñ?и"
 
 #: ../camel/providers/hula/camel-hula-provider.c:53
 #: ../camel/providers/imap/camel-imap-provider.c:52
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
 msgid "Connection to Server"
 msgstr "Ð?'Ñ?днаннÑ? з Ñ?еÑ?веÑ?ом"
 
 #: ../camel/providers/hula/camel-hula-provider.c:55
 #: ../camel/providers/imap/camel-imap-provider.c:54
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
 msgid "_Use custom command to connect to server"
 msgstr "_Ð?икоÑ?иÑ?Ñ?овÑ?ваÑ?и влаÑ?ний Ñ?Ñ?док длÑ? з'Ñ?днаннÑ? Ñ? Ñ?еÑ?веÑ?ом"
 
 #: ../camel/providers/hula/camel-hula-provider.c:57
 #: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
 msgid "Command:"
 msgstr "Ð?оманда:"
 
 #: ../camel/providers/hula/camel-hula-provider.c:60
 #: ../camel/providers/imap/camel-imap-provider.c:60
 #: ../camel/providers/imap4/camel-imap4-provider.c:43
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
 #: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid "Folders"
 msgstr "Теки"
@@ -2807,12 +2821,14 @@ msgstr "Теки"
 #: ../camel/providers/hula/camel-hula-provider.c:62
 #: ../camel/providers/imap/camel-imap-provider.c:62
 #: ../camel/providers/imap4/camel-imap4-provider.c:45
+#: ../camel/providers/imapx/camel-imapx-provider.c:66
 msgid "_Show only subscribed folders"
 msgstr "_Ð?оказÑ?ваÑ?и лиÑ?е пÑ?дпиÑ?анÑ? Ñ?еки"
 
 #: ../camel/providers/hula/camel-hula-provider.c:64
 #: ../camel/providers/imap/camel-imap-provider.c:64
 #: ../camel/providers/imap4/camel-imap4-provider.c:47
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "O_verride server-supplied folder namespace"
 msgstr "Ð?а_мÑ?ниÑ?и запÑ?опонований Ñ?еÑ?веÑ?ом пÑ?оÑ?Ñ?Ñ?Ñ? назв Ñ?ек"
 
@@ -2845,12 +2861,12 @@ msgstr "Ð?Ñ?дÑ?Ñ?Ñ?нÑ?й поÑ?Ñ?к вводÑ?"
 #: ../camel/providers/imap/camel-imap-command.c:229
 #: ../camel/providers/imap/camel-imap-command.c:278
 #: ../camel/providers/imap/camel-imap-command.c:492
-#: ../camel/providers/imap/camel-imap-store.c:3088
+#: ../camel/providers/imap/camel-imap-store.c:3105
 msgid "Operation cancelled"
 msgstr "Ð?пеÑ?аÑ?Ñ?Ñ? Ñ?каÑ?овано"
 
 #: ../camel/providers/imap/camel-imap-command.c:331
-#: ../camel/providers/imap/camel-imap-store.c:3093
+#: ../camel/providers/imap/camel-imap-store.c:3110
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "СеÑ?веÑ? неÑ?подÑ?вано Ñ?озÑ?Ñ?вав з'Ñ?днаннÑ?: %s"
@@ -2890,65 +2906,68 @@ msgstr "Ð?Ñ?дповÑ?дÑ? Ñ?еÑ?веÑ?а IMAP не мÑ?Ñ?Ñ?иÑ?Ñ? Ñ?нÑ?оÑ?м
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Ð?еоÑ?Ñ?кÑ?вана вÑ?дповÑ?дÑ? \"OK\" вÑ?д Ñ?еÑ?веÑ?а IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:91
+#: ../camel/providers/imap/camel-imap-folder.c:90
 msgid "Always check for new mail in this folder"
 msgstr "Ð?авжди пеÑ?евÑ?Ñ?Ñ?Ñ?и новÑ? поÑ?Ñ?Ñ? в Ñ?Ñ?й Ñ?еÑ?Ñ?"
 
-#: ../camel/providers/imap/camel-imap-folder.c:277
+#: ../camel/providers/imap/camel-imap-folder.c:276
 #, 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:919
+#: ../camel/providers/imap/camel-imap-folder.c:918
+#: ../camel/providers/imapx/camel-imapx-server.c:2997
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "Ð?оÑ?Ñ?к змÑ?нениÑ? повÑ?домленÑ? на %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1987
+#: ../camel/providers/imap/camel-imap-folder.c:1986
 #, c-format
 msgid "Unexpected response status '%s' after APPEND command"
 msgstr "Ð?еоÑ?Ñ?кÑ?ваний Ñ?Ñ?аÑ?Ñ?Ñ? «%s» Ñ? вÑ?дповÑ?дÑ? на командÑ? APPEND"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2002
+#: ../camel/providers/imap/camel-imap-folder.c:2001
 msgid "No response on continuation after APPEND command"
 msgstr "Ð?Ñ?дÑ?Ñ?Ñ?нÑ? вÑ?дповÑ?дÑ? або пÑ?одовженнÑ? пÑ?Ñ?лÑ? команди APPEND"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2047
+#: ../camel/providers/imap/camel-imap-folder.c:2046
 msgid "Unknown error occurred during APPEND command!"
 msgstr "Ð?Ñ?д Ñ?аÑ? виконаннÑ? команди APPEND виникла невÑ?дома помилка!"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2878
+#: ../camel/providers/imap/camel-imap-folder.c:2877
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? знайÑ?и повÑ?домленнÑ?: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2913
+#: ../camel/providers/imap/camel-imap-folder.c:2912
+#: ../camel/providers/imapx/camel-imapx-server.c:3943
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? оÑ?Ñ?имаÑ?и повÑ?домленнÑ? з Ñ?денÑ?иÑ?Ñ?каÑ?оÑ?ом %s: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2914
+#: ../camel/providers/imap/camel-imap-folder.c:2913
+#: ../camel/providers/imapx/camel-imapx-server.c:3944
 msgid "No such message available."
 msgstr "Ð?емаÑ? Ñ?акого повÑ?домленнÑ?."
 
-#: ../camel/providers/imap/camel-imap-folder.c:2975
-#: ../camel/providers/imap/camel-imap-folder.c:3817
-#: ../camel/providers/nntp/camel-nntp-folder.c:238
+#: ../camel/providers/imap/camel-imap-folder.c:2974
+#: ../camel/providers/imap/camel-imap-folder.c:3819
+#: ../camel/providers/nntp/camel-nntp-folder.c:236
 msgid "This message is not currently available"
 msgstr "ЦÑ?ого повÑ?домленнÑ? наÑ?азÑ? недоÑ?Ñ?Ñ?пне"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3633
+#: ../camel/providers/imap/camel-imap-folder.c:3632
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "Ð?Ñ?дповÑ?дÑ? Ñ?еÑ?веÑ?а неповна: не надана Ñ?нÑ?оÑ?маÑ?Ñ?Ñ? пÑ?о повÑ?домленнÑ? %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3641
+#: ../camel/providers/imap/camel-imap-folder.c:3640
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "Ð?Ñ?дповÑ?дÑ? Ñ?еÑ?веÑ?а неповна: не надано UID длÑ? повÑ?домленнÑ? %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3855
+#: ../camel/providers/imap/camel-imap-folder.c:3857
 msgid "Could not find message body in FETCH response."
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? знайÑ?и Ñ?Ñ?ла повÑ?домленнÑ? Ñ? вÑ?дповÑ?дÑ? на FETCH."
 
@@ -2972,26 +2991,31 @@ msgid "Failed to cache %s: %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? збеÑ?егÑ?и %s: %s"
 
 #: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:50
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "Ð?_еÑ?евÑ?Ñ?Ñ?Ñ?и новÑ? поÑ?Ñ?Ñ? Ñ? випиÑ?аниÑ? Ñ?екаÑ?"
 
 #: ../camel/providers/imap/camel-imap-provider.c:66
 #: ../camel/providers/imap4/camel-imap4-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:71
 msgid "Namespace:"
 msgstr "Ð?Ñ?оÑ?Ñ?Ñ?Ñ? назв:"
 
 #: ../camel/providers/imap/camel-imap-provider.c:70
 #: ../camel/providers/imap4/camel-imap4-provider.c:53
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "_Apply filters to new messages in INBOX on this server"
 msgstr ""
 "Ð?аÑ?Ñ?_оÑ?Ñ?ваÑ?и Ñ?Ñ?лÑ?Ñ?Ñ?и до новиÑ? повÑ?домленÑ? Ñ? Ñ?еÑ?Ñ? \"Ð?Ñ?Ñ?днÑ?\" на Ñ?Ñ?омÑ? Ñ?еÑ?веÑ?Ñ?"
 
 #: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:78
 msgid "Check new messages for Jun_k contents"
 msgstr "Ð?еÑ?евÑ?Ñ?Ñ?Ñ?и, Ñ?и Ñ? новÑ? повÑ?домленнÑ? Ñ?_памом"
 
 #: ../camel/providers/imap/camel-imap-provider.c:76
 #: ../camel/providers/imap4/camel-imap4-provider.c:59
+#: ../camel/providers/imapx/camel-imapx-provider.c:82
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "Ð?вÑ?омаÑ?иÑ?но Ñ?ин_Ñ?Ñ?онÑ?зÑ?ваÑ?и вÑ?ддаленÑ? поÑ?Ñ?Ñ? локалÑ?но"
 
@@ -3000,22 +3024,25 @@ msgid "IMAP"
 msgstr "IMAP"
 
 #: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imapx/camel-imapx-provider.c:92
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Ð?Ñ?иÑ?Ñ?ваннÑ? Ñ?а збеÑ?еженнÑ? поÑ?Ñ?и на Ñ?еÑ?веÑ?аÑ? IMAP."
 
 #: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapx/camel-imapx-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:108
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Ð?'Ñ?днÑ?ваÑ?иÑ?Ñ? з IMAP Ñ?еÑ?веÑ?ом викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?и неÑ?иÑ?Ñ?ований паÑ?олÑ?."
 
 #: ../camel/providers/imap/camel-imap-store.c:435
 #: ../camel/providers/imap4/camel-imap4-store.c:210
+#: ../camel/providers/imapx/camel-imapx-store.c:201
 #, c-format
 msgid "IMAP server %s"
 msgstr "СеÑ?веÑ? IMAP %s"
 
 #: ../camel/providers/imap/camel-imap-store.c:437
 #: ../camel/providers/imap4/camel-imap4-store.c:212
+#: ../camel/providers/imapx/camel-imapx-store.c:203
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "СлÑ?жба IMAP длÑ? %s на %s"
@@ -3026,8 +3053,8 @@ msgstr "СлÑ?жба IMAP длÑ? %s на %s"
 #: ../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/pop3/camel-pop3-store.c:192
+#: ../camel/providers/pop3/camel-pop3-store.c:206
 #: ../camel/providers/smtp/camel-smtp-transport.c:259
 #: ../camel/providers/smtp/camel-smtp-transport.c:274
 #, c-format
@@ -3037,14 +3064,14 @@ msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? з'Ñ?днаÑ?иÑ?Ñ? з  %s: %s"
 #: ../camel/providers/imap/camel-imap-store.c:567
 #: ../camel/providers/imap4/camel-imap4-store.c:248
 #: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/pop3/camel-pop3-store.c:171
+#: ../camel/providers/pop3/camel-pop3-store.c:193
 #: ../camel/providers/smtp/camel-smtp-transport.c:260
 msgid "SSL unavailable"
 msgstr "SSL недоÑ?Ñ?Ñ?пний"
 
 #: ../camel/providers/imap/camel-imap-store.c:578
 #: ../camel/providers/imap/camel-imap-store.c:860
-#: ../camel/providers/imapx/camel-imapx-server.c:1684
+#: ../camel/providers/imapx/camel-imapx-server.c:2164
 msgid "Connection cancelled"
 msgstr "Ð?'Ñ?днаннÑ? Ñ?каÑ?овано"
 
@@ -3055,20 +3082,20 @@ msgstr "Ð?'Ñ?днаннÑ? Ñ?каÑ?овано"
 #: ../camel/providers/imap4/camel-imap4-store.c:310
 #: ../camel/providers/imap4/camel-imap4-store.c:325
 #: ../camel/providers/imap4/camel-imap4-store.c:334
-#: ../camel/providers/imapx/camel-imapx-server.c:1724
-#: ../camel/providers/imapx/camel-imapx-server.c:1738
+#: ../camel/providers/imapx/camel-imapx-server.c:2209
+#: ../camel/providers/imapx/camel-imapx-server.c:2231
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? пÑ?д'Ñ?днаÑ?иÑ?Ñ? до IMAP Ñ?еÑ?веÑ?Ñ? %s в безпеÑ?номÑ? Ñ?ежимÑ?: %s"
 
 #: ../camel/providers/imap/camel-imap-store.c:690
-#: ../camel/providers/imapx/camel-imapx-server.c:1725
+#: ../camel/providers/imapx/camel-imapx-server.c:2210
 #: ../camel/providers/smtp/camel-smtp-transport.c:332
 msgid "STARTTLS not supported"
 msgstr "STARTTLS не пÑ?дÑ?Ñ?имÑ?Ñ?Ñ?Ñ?Ñ?Ñ?"
 
 #: ../camel/providers/imap/camel-imap-store.c:709
-#: ../camel/providers/imapx/camel-imapx-server.c:1739
+#: ../camel/providers/imapx/camel-imapx-server.c:2232
 msgid "SSL negotiations failed"
 msgstr "Ð?бÑ?й пÑ?и вÑ?Ñ?ановленнÑ? Ñ?еанÑ?Ñ? SSL"
 
@@ -3088,14 +3115,14 @@ msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? з'Ñ?днаÑ?иÑ?Ñ? командоÑ? \"%s\": %s"
 #: ../camel/providers/imap/camel-imap-store.c:2430
 #: ../camel/providers/imap4/camel-imap4-store-summary.c:356
 #: ../camel/providers/imap4/camel-imap4-store.c:1403
-#: ../camel/providers/imapx/camel-imapx-store.c:409
-#: ../camel/providers/imapx/camel-imapx-store.c:640
+#: ../camel/providers/imapx/camel-imapx-store.c:383
+#: ../camel/providers/imapx/camel-imapx-store.c:856
 #: ../camel/providers/local/camel-maildir-folder.c:81
 #: ../camel/providers/local/camel-maildir-store.c:219
 #: ../camel/providers/local/camel-maildir-store.c:291
 #: ../camel/providers/local/camel-maildir-store.c:517
 #: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:463
+#: ../camel/providers/local/camel-spool-store.c:461
 msgid "Inbox"
 msgstr "Ð?Ñ?Ñ?днÑ?"
 
@@ -3111,6 +3138,7 @@ msgid "No support for authentication type %s"
 msgstr "Ð?вÑ?енÑ?иÑ?Ñ?каÑ?Ñ?Ñ? Ñ?ипÑ? %s не пÑ?дÑ?Ñ?имÑ?Ñ?Ñ?Ñ?Ñ?Ñ?"
 
 #: ../camel/providers/imap/camel-imap-store.c:1387
+#: ../camel/providers/imapx/camel-imapx-server.c:2328
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3124,6 +3152,7 @@ msgstr ""
 #: ../camel/providers/imap/camel-imap-store.c:1891
 #: ../camel/providers/imap/camel-imap-store.c:2272
 #: ../camel/providers/imap4/camel-imap4-store.c:954
+#: ../camel/providers/imapx/camel-imapx-store.c:672
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -3131,18 +3160,19 @@ msgstr "Ð?азва Ñ?еки \"%s\" некоÑ?екÑ?на, Ñ?омÑ? Ñ?о мÑ?Ñ?Ñ?
 
 #: ../camel/providers/imap/camel-imap-store.c:2008
 #: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:204
+#: ../camel/providers/local/camel-mbox-store.c:202
 #: ../camel/providers/local/camel-mh-store.c:249
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и Ñ?екÑ? «%s»: Ñ?ека вже Ñ?Ñ?нÑ?Ñ?."
 
 #: ../camel/providers/imap/camel-imap-store.c:2283
+#: ../camel/providers/imapx/camel-imapx-store.c:680
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ð?евÑ?дома баÑ?Ñ?кÑ?вÑ?Ñ?ка Ñ?ека: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3090
+#: ../camel/providers/imap/camel-imap-store.c:3107
 msgid "Server unexpectedly disconnected"
 msgstr "СеÑ?веÑ? неÑ?подÑ?вано Ñ?озÑ?Ñ?вав з'Ñ?днаннÑ?"
 
@@ -3308,7 +3338,7 @@ msgstr ""
 #: ../camel/providers/imap4/camel-imap4-store.c:259
 #: ../camel/providers/nntp/camel-nntp-store.c:194
 #: ../camel/providers/nntp/camel-nntp-store.c:213
-#: ../camel/providers/pop3/camel-pop3-store.c:181
+#: ../camel/providers/pop3/camel-pop3-store.c:203
 #: ../camel/providers/smtp/camel-smtp-transport.c:271
 msgid "Connection canceled"
 msgstr "Ð?'Ñ?днаннÑ? Ñ?каÑ?овано"
@@ -3323,7 +3353,7 @@ msgstr ""
 "пÑ?дÑ?Ñ?имÑ?Ñ? STARTTLS"
 
 #: ../camel/providers/imap4/camel-imap4-store.c:326
-#: ../camel/providers/pop3/camel-pop3-store.c:249
+#: ../camel/providers/pop3/camel-pop3-store.c:276
 msgid "TLS negotiations failed"
 msgstr "Ð?омилка пÑ?и вÑ?Ñ?ановленнÑ? Ñ?еанÑ?Ñ? TLS"
 
@@ -3475,44 +3505,33 @@ msgstr "Ð?емаÑ? даниÑ?"
 msgid "IMAP server %s unexpectedly disconnected: %s"
 msgstr "IMAP Ñ?еÑ?веÑ? %s неÑ?подÑ?вано Ñ?озÑ?Ñ?вав з'Ñ?днаннÑ?: %s"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:40
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
-msgid "Message storage"
-msgstr "СÑ?овиÑ?е повÑ?домленÑ?"
+#: ../camel/providers/imapx/camel-imapx-folder.c:86
+#, c-format
+msgid "Could not create folder summary for %s"
+msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и Ñ?екÑ? зведеннÑ? длÑ? %s"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-folder.c:94
+#, c-format
+msgid "Could not create cache for %s"
+msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и кеÑ? длÑ? %s"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
+msgid "Use I_dle if the server supports it"
+msgstr "Ð?икоÑ?иÑ?Ñ?овÑ?йÑ?е Ð?Ñ?оÑ?Ñ?и_й, Ñ?еÑ?веÑ? пÑ?дÑ?Ñ?имÑ?Ñ? Ñ?Ñ? можливÑ?Ñ?Ñ?Ñ?"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:60
+msgid "Numbe_r of cached connections to use"
+msgstr "_Ð?Ñ?лÑ?кÑ?Ñ?Ñ?Ñ? викоÑ?иÑ?Ñ?аниÑ? кеÑ?ованиÑ? з'Ñ?днанÑ?"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:90
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:50
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-"Ð?кÑ?пеÑ?именÑ?алÑ?ний клÑ?Ñ?нÑ? IMAP 4(.1)\n"
-"Це - непеÑ?евÑ?Ñ?ений Ñ?а непÑ?дÑ?Ñ?имÑ?ваний код. Ð?аÑ?омÑ?Ñ?Ñ?Ñ? Ñ?Ñ?еба викоÑ?иÑ?Ñ?овÑ?ваÑ?и "
-"звиÑ?айний IMAP.\n"
-"\n"
-" !!! Ð?Ð?Ð?Ð?РÐ?СТÐ?Ð?УÐ?ТÐ? Ð?Ð?ШÐ? Ð?Ð?Я ТÐ?СТУÐ?Ð?Ð?Ð?Я  !!!\n"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:1687
+#: ../camel/providers/imapx/camel-imapx-server.c:2167
 #, c-format
 msgid "Could not connect to %s (port %s): %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? з'Ñ?днаÑ?иÑ?Ñ? з %s (поÑ?Ñ? %s): %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1767
-#: ../camel/providers/imapx/camel-imapx-store.c:147
-#, c-format
-msgid "%sPlease enter the IMAP password for %s %s"
-msgstr "%sÐ?ведÑ?Ñ?Ñ? паÑ?олÑ? IMAP длÑ? %s %s"
-
-#: ../camel/providers/imapx/camel-imapx-store.c:130
-#, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? з'Ñ?днаÑ?иÑ?Ñ? з Ñ?еÑ?веÑ?ом POP %s."
-
 #: ../camel/providers/local/camel-local-folder.c:178
 msgid "Index message body data"
 msgstr "Ð?ндекÑ?Ñ?ваÑ?и данÑ? вмÑ?Ñ?Ñ?Ñ? повÑ?домленнÑ?"
@@ -3595,53 +3614,53 @@ msgstr ""
 msgid "Standard Unix mbox spool directory"
 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:128
+#: ../camel/providers/local/camel-local-store.c:163
+#: ../camel/providers/local/camel-local-store.c:274
+#: ../camel/providers/local/camel-mbox-store.c:357
+#: ../camel/providers/local/camel-spool-store.c:126
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Ð?оÑ?Ñ?нÑ? Ñ?Ñ?овиÑ?а %s не Ñ? абÑ?олÑ?Ñ?ним Ñ?лÑ?Ñ?ом"
 
-#: ../camel/providers/local/camel-local-store.c:172
+#: ../camel/providers/local/camel-local-store.c:170
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "СÑ?овиÑ?е %s не Ñ? каÑ?алогом"
 
-#: ../camel/providers/local/camel-local-store.c:181
-#: ../camel/providers/local/camel-local-store.c:189
-#: ../camel/providers/local/camel-local-store.c:287
+#: ../camel/providers/local/camel-local-store.c:179
+#: ../camel/providers/local/camel-local-store.c:187
+#: ../camel/providers/local/camel-local-store.c:285
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? оÑ?Ñ?имаÑ?и Ñ?екÑ?: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:201
+#: ../camel/providers/local/camel-local-store.c:199
 msgid "Local stores do not have an inbox"
 msgstr "Ð?окалÑ?не Ñ?Ñ?овиÑ?е не мÑ?Ñ?Ñ?иÑ?Ñ? Ñ?екÑ? \"Ð?Ñ?Ñ?днÑ?\""
 
-#: ../camel/providers/local/camel-local-store.c:247
+#: ../camel/providers/local/camel-local-store.c:245
 #, c-format
 msgid "Local mail file %s"
 msgstr "Файл локалÑ?ноÑ? поÑ?Ñ?и %s"
 
-#: ../camel/providers/local/camel-local-store.c:342
+#: ../camel/providers/local/camel-local-store.c:340
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? пеÑ?ейменÑ?ваÑ?и Ñ?екÑ? \"%s\" на \"%s\": %s"
 
-#: ../camel/providers/local/camel-local-store.c:410
+#: ../camel/providers/local/camel-local-store.c:408
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? пеÑ?ейменÑ?ваÑ?и Ñ?екÑ? \"%s\": %s"
 
-#: ../camel/providers/local/camel-local-store.c:435
-#: ../camel/providers/local/camel-mbox-store.c:300
+#: ../camel/providers/local/camel-local-store.c:433
+#: ../camel/providers/local/camel-mbox-store.c:298
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? видалиÑ?и Ñ?ндекÑ?ний Ñ?айл Ñ?еки «%s»: %s"
 
-#: ../camel/providers/local/camel-local-store.c:458
-#: ../camel/providers/local/camel-mbox-store.c:324
+#: ../camel/providers/local/camel-local-store.c:456
+#: ../camel/providers/local/camel-mbox-store.c:322
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? видалиÑ?и меÑ?аÑ?айл Ñ?еки «%s»: %s"
@@ -3684,27 +3703,27 @@ msgstr ""
 msgid "Invalid message contents"
 msgstr "Ð?епÑ?авилÑ?ний вмÑ?Ñ?Ñ? повÑ?домленнÑ?"
 
-#: ../camel/providers/local/camel-maildir-folder.c:419
+#: ../camel/providers/local/camel-maildir-folder.c:418
 msgid "Cannot transfer message to destination folder"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? пеÑ?емÑ?Ñ?Ñ?иÑ?и повÑ?домленнÑ? Ñ? Ñ?Ñ?лÑ?овÑ? Ñ?екÑ?"
 
 #: ../camel/providers/local/camel-maildir-store.c:148
 #: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:176
-#: ../camel/providers/local/camel-mbox-store.c:188
+#: ../camel/providers/local/camel-mbox-store.c:174
+#: ../camel/providers/local/camel-mbox-store.c:186
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и Ñ?екÑ? «%s»: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:147
+#: ../camel/providers/local/camel-mbox-store.c:145
 #: ../camel/providers/local/camel-mh-store.c:217
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? оÑ?Ñ?имаÑ?и Ñ?екÑ? «%s»: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:155
+#: ../camel/providers/local/camel-mbox-store.c:153
 #: ../camel/providers/local/camel-mh-store.c:224
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
@@ -3727,8 +3746,8 @@ msgid "not a maildir directory"
 msgstr "не Ñ? каÑ?алогом Maildir"
 
 #: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:330
-#: ../camel/providers/local/camel-spool-store.c:344
+#: ../camel/providers/local/camel-spool-store.c:328
+#: ../camel/providers/local/camel-spool-store.c:342
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? пÑ?оÑ?канÑ?ваÑ?и Ñ?екÑ? «%s»: %s"
@@ -3784,19 +3803,19 @@ msgstr "СÑ?оже Ñ?ека невипÑ?авно зÑ?пÑ?ована."
 msgid "Message construction failed."
 msgstr "Ð?омилка пÑ?и Ñ?Ñ?воÑ?еннÑ? повÑ?домленнÑ?."
 
-#: ../camel/providers/local/camel-mbox-store.c:166
-#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mbox-store.c:164
+#: ../camel/providers/local/camel-mbox-store.c:363
 msgid "Cannot create a folder by this name."
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и Ñ?екÑ? з Ñ?Ñ?Ñ?Ñ? назвоÑ?."
 
-#: ../camel/providers/local/camel-mbox-store.c:198
+#: ../camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? оÑ?Ñ?имаÑ?и Ñ?екÑ? «%s»: не Ñ? звиÑ?айним Ñ?айлом"
 
-#: ../camel/providers/local/camel-mbox-store.c:228
-#: ../camel/providers/local/camel-mbox-store.c:239
-#: ../camel/providers/local/camel-mbox-store.c:262
+#: ../camel/providers/local/camel-mbox-store.c:226
+#: ../camel/providers/local/camel-mbox-store.c:237
+#: ../camel/providers/local/camel-mbox-store.c:260
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3805,46 +3824,46 @@ msgstr ""
 "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? видалиÑ?и Ñ?екÑ? «%s»:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:247
+#: ../camel/providers/local/camel-mbox-store.c:245
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "«%s» не Ñ? звиÑ?айним Ñ?айлом."
 
-#: ../camel/providers/local/camel-mbox-store.c:254
+#: ../camel/providers/local/camel-mbox-store.c:252
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "Тека «%s» не поÑ?ожнÑ?. Ð?е видалено."
 
-#: ../camel/providers/local/camel-mbox-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:288
+#: ../camel/providers/local/camel-mbox-store.c:274
+#: ../camel/providers/local/camel-mbox-store.c:286
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? видалиÑ?и Ñ?айл зведеннÑ? Ñ?еки «%s»: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:378
+#: ../camel/providers/local/camel-mbox-store.c:376
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и каÑ?алог «%s»: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:390
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и Ñ?екÑ?: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:394
+#: ../camel/providers/local/camel-mbox-store.c:392
 msgid "Folder already exists"
 msgstr "Тека вже Ñ?Ñ?нÑ?Ñ?"
 
-#: ../camel/providers/local/camel-mbox-store.c:485
+#: ../camel/providers/local/camel-mbox-store.c:483
 msgid "The new folder name is illegal."
 msgstr "Ð?ова назва Ñ?еки Ñ? некоÑ?екÑ?ноÑ?."
 
-#: ../camel/providers/local/camel-mbox-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:496
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? пеÑ?ейменÑ?ваÑ?и «%s»: «%s»: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:579
+#: ../camel/providers/local/camel-mbox-store.c:577
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? пеÑ?ейменÑ?ваÑ?и «%s»: Ñ? %s: %s"
@@ -3878,7 +3897,7 @@ msgid "Cannot open temporary mailbox: %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? вÑ?дкÑ?иÑ?и Ñ?имÑ?аÑ?овÑ? поÑ?Ñ?овÑ? Ñ?кÑ?инÑ?кÑ?: %s"
 
 #: ../camel/providers/local/camel-mbox-summary.c:752
-#: ../camel/providers/local/camel-mbox-summary.c:956
+#: ../camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? закÑ?иÑ?и виÑ?Ñ?днÑ? Ñ?екÑ? %s: %s"
@@ -3894,31 +3913,31 @@ msgid "Could not rename folder: %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? пеÑ?ейменÑ?ваÑ?и Ñ?екÑ?: %s"
 
 #: ../camel/providers/local/camel-mbox-summary.c:858
-#: ../camel/providers/local/camel-mbox-summary.c:1083
+#: ../camel/providers/local/camel-mbox-summary.c:1084
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? збеÑ?егÑ?и Ñ?екÑ?: %s"
 
 #: ../camel/providers/local/camel-mbox-summary.c:897
 #: ../camel/providers/local/camel-mbox-summary.c:905
-#: ../camel/providers/local/camel-mbox-summary.c:1113
-#: ../camel/providers/local/camel-mbox-summary.c:1121
+#: ../camel/providers/local/camel-mbox-summary.c:1114
+#: ../camel/providers/local/camel-mbox-summary.c:1122
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Ð?веденнÑ? Ñ?а Ñ?ека вÑ?дÑ?Ñ?знÑ?Ñ?Ñ?Ñ?Ñ?Ñ? навÑ?Ñ?Ñ? пÑ?Ñ?лÑ? Ñ?инÑ?Ñ?онÑ?заÑ?Ñ?Ñ?"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1046
+#: ../camel/providers/local/camel-mbox-summary.c:1047
 #: ../camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ð?евÑ?дома помилка: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1189
-#: ../camel/providers/local/camel-mbox-summary.c:1215
+#: ../camel/providers/local/camel-mbox-summary.c:1190
+#: ../camel/providers/local/camel-mbox-summary.c:1216
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "Ð?омилка запиÑ?Ñ? в Ñ?имÑ?аÑ?овÑ? поÑ?Ñ?овÑ? Ñ?кÑ?инÑ?кÑ?: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1206
+#: ../camel/providers/local/camel-mbox-summary.c:1207
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "Ð?омилка запиÑ?Ñ? в Ñ?имÑ?аÑ?овÑ? поÑ?Ñ?овÑ? Ñ?кÑ?инÑ?кÑ?: %s: %s"
@@ -3947,22 +3966,22 @@ msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? оÑ?Ñ?имаÑ?и Ñ?екÑ? «%s»: не Ñ? каÑ?а
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? вÑ?дкÑ?иÑ?и каÑ?алог MH: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:134
+#: ../camel/providers/local/camel-spool-store.c:132
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? вÑ?дкÑ?иÑ?и Ñ?Ñ?овиÑ?е «%s»: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:146
+#: ../camel/providers/local/camel-spool-store.c:144
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "СÑ?овиÑ?е «%s» не Ñ? звиÑ?айним Ñ?айлом або каÑ?алогом"
 
-#: ../camel/providers/local/camel-spool-store.c:165
+#: ../camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "Теки «%s/%s» не Ñ?Ñ?нÑ?Ñ?."
 
-#: ../camel/providers/local/camel-spool-store.c:175
+#: ../camel/providers/local/camel-spool-store.c:173
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3971,12 +3990,12 @@ msgstr ""
 "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? вÑ?дкÑ?иÑ?и Ñ?екÑ? «%s»:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:179
+#: ../camel/providers/local/camel-spool-store.c:177
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "Тека «%s» не Ñ?Ñ?нÑ?Ñ?."
 
-#: ../camel/providers/local/camel-spool-store.c:184
+#: ../camel/providers/local/camel-spool-store.c:182
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -3985,30 +4004,30 @@ msgstr ""
 "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?воÑ?иÑ?и Ñ?екÑ? «%s»:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:192
+#: ../camel/providers/local/camel-spool-store.c:190
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "«%s» не Ñ? Ñ?айлом поÑ?Ñ?овоÑ? Ñ?кÑ?инÑ?ки."
 
-#: ../camel/providers/local/camel-spool-store.c:209
+#: ../camel/providers/local/camel-spool-store.c:207
 msgid "Store does not support an INBOX"
 msgstr "СÑ?овиÑ?е не пÑ?дÑ?Ñ?имÑ?Ñ? INBOX"
 
-#: ../camel/providers/local/camel-spool-store.c:221
+#: ../camel/providers/local/camel-spool-store.c:219
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Ð?акопиÑ?Ñ?валÑ?ний Ñ?айл поÑ?Ñ?и %s"
 
-#: ../camel/providers/local/camel-spool-store.c:221
+#: ../camel/providers/local/camel-spool-store.c:219
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Ð?еÑ?ево Ñ?ек накопиÑ?Ñ?ваÑ?а %s"
 
-#: ../camel/providers/local/camel-spool-store.c:229
+#: ../camel/providers/local/camel-spool-store.c:227
 msgid "Spool folders cannot be renamed"
 msgstr "Ð?акопиÑ?Ñ?валÑ?нÑ? Ñ?еки не можна пеÑ?ейменовÑ?ваÑ?и"
 
-#: ../camel/providers/local/camel-spool-store.c:237
+#: ../camel/providers/local/camel-spool-store.c:235
 msgid "Spool folders cannot be deleted"
 msgstr "Ð?акопиÑ?Ñ?валÑ?нÑ? Ñ?еки не можна видалÑ?Ñ?и"
 
@@ -4035,26 +4054,26 @@ msgstr ""
 "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? Ñ?инÑ?Ñ?онÑ?зÑ?ваÑ?и бÑ?Ñ?еÑ?нÑ? Ñ?екÑ? %s: %s\n"
 "Ð?ожливо Ñ?ека поÑ?коджена, копÑ?Ñ? збеÑ?ежено Ñ? «%s»"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:137
-#: ../camel/providers/nntp/camel-nntp-folder.c:194
-#: ../camel/providers/nntp/camel-nntp-folder.c:226
+#: ../camel/providers/nntp/camel-nntp-folder.c:135
+#: ../camel/providers/nntp/camel-nntp-folder.c:192
+#: ../camel/providers/nntp/camel-nntp-folder.c:224
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "Ð?нÑ?Ñ?Ñ?Ñ?Ñ?нÑ? помилка: UID Ñ? непÑ?авилÑ?номÑ? Ñ?оÑ?маÑ?Ñ?: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:367
-#: ../camel/providers/nntp/camel-nntp-folder.c:370
+#: ../camel/providers/nntp/camel-nntp-folder.c:365
+#: ../camel/providers/nntp/camel-nntp-folder.c:368
+#: ../camel/providers/nntp/camel-nntp-folder.c:410
 #: ../camel/providers/nntp/camel-nntp-folder.c:412
-#: ../camel/providers/nntp/camel-nntp-folder.c:414
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Ð?омилка пÑ?и надÑ?иланнÑ?: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:432
+#: ../camel/providers/nntp/camel-nntp-folder.c:430
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Ð?и не можеÑ?е надÑ?илаÑ?и повÑ?домленнÑ? пÑ?и авÑ?ономнÑ?й Ñ?обоÑ?Ñ?!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:443
+#: ../camel/providers/nntp/camel-nntp-folder.c:441
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Ð?и не можеÑ?е надÑ?илаÑ?и повÑ?домленнÑ? з Ñ?еки NNTP!"
 
@@ -4225,6 +4244,10 @@ msgstr "Ð?Ñ?Ñ?иманнÑ? повÑ?домленнÑ? POP %d"
 msgid "Unknown reason"
 msgstr "Ð?евÑ?дома пÑ?иÑ?ина"
 
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
+msgid "Message storage"
+msgstr "СÑ?овиÑ?е повÑ?домленÑ?"
+
 #: ../camel/providers/pop3/camel-pop3-provider.c:45
 msgid "_Leave messages on server"
 msgstr "Ð?а_лиÑ?аÑ?и повÑ?домленнÑ? на Ñ?еÑ?веÑ?Ñ?"
@@ -4264,34 +4287,39 @@ msgstr ""
 "заÑ?иÑ?Ñ?ованого згÑ?дно пÑ?оÑ?околÑ? APOP. Це може Ñ?пÑ?аÑ?Ñ?овÑ?ваÑ?и не длÑ? вÑ?Ñ?Ñ? "
 "коÑ?иÑ?Ñ?Ñ?ваÑ?Ñ?в, навÑ?Ñ?Ñ? Ñ?кÑ?о Ñ?еÑ?веÑ? нÑ?биÑ?о його пÑ?дÑ?Ñ?имÑ?Ñ?."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:207
+#: ../camel/providers/pop3/camel-pop3-store.c:229
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? оÑ?Ñ?имаÑ?и пÑ?ивÑ?Ñ?аннÑ? вÑ?д POP Ñ?еÑ?веÑ?а %s"
 
-#: ../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
+#: ../camel/providers/pop3/camel-pop3-store.c:246
+#: ../camel/providers/pop3/camel-pop3-store.c:275
+#: ../camel/providers/pop3/camel-pop3-store.c:281
 #, 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:225
+#: ../camel/providers/pop3/camel-pop3-store.c:247
 msgid "STLS not supported by server"
 msgstr "STLS не пÑ?дÑ?Ñ?имÑ?Ñ?Ñ?Ñ?Ñ?Ñ? Ñ?еÑ?веÑ?ом"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:255
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:263
+#, 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:282
 msgid "TLS is not available in this build"
 msgstr "TLS не пÑ?дÑ?Ñ?имÑ?Ñ?Ñ?Ñ?Ñ?Ñ? Ñ? Ñ?Ñ?й збÑ?Ñ?Ñ?Ñ?"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:361
+#: ../camel/providers/pop3/camel-pop3-store.c:388
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? з'Ñ?днаÑ?иÑ?Ñ? з POP Ñ?еÑ?веÑ?ом %s."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:402
-#: ../camel/providers/pop3/camel-pop3-store.c:535
+#: ../camel/providers/pop3/camel-pop3-store.c:429
+#: ../camel/providers/pop3/camel-pop3-store.c:567
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -4300,22 +4328,23 @@ msgstr ""
 "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? пÑ?д'Ñ?днаÑ?иÑ?Ñ? до POP Ñ?еÑ?веÑ?Ñ? %s: Ð?Ñ?дÑ?Ñ?Ñ?нÑ? пÑ?дÑ?Ñ?имка поÑ?Ñ?Ñ?бного "
 "меÑ?анÑ?змÑ? авÑ?енÑ?иÑ?Ñ?каÑ?Ñ?Ñ?."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:418
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:448
 #, c-format
-msgid "SASL '%s' Login failed for POP server %s: %s"
-msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? пÑ?д'Ñ?днаÑ?иÑ?Ñ? Ñ?еÑ?ез SASL «%s» до POP Ñ?еÑ?веÑ?Ñ? %s: %s"
+msgid "SASL '%s' Login failed for POP server %s%s"
+msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? пÑ?д'Ñ?днаÑ?иÑ?Ñ? Ñ?еÑ?ез SASL «%s» до POP Ñ?еÑ?веÑ?Ñ? %s%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:430
+#: ../camel/providers/pop3/camel-pop3-store.c:462
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? пÑ?д'Ñ?днаÑ?иÑ?Ñ? до POP Ñ?еÑ?веÑ?Ñ? %s: помилка пÑ?оÑ?околÑ? SASL"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:449
+#: ../camel/providers/pop3/camel-pop3-store.c:481
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? пÑ?ойÑ?и Ñ?еÑ?Ñ?Ñ?Ñ?аÑ?Ñ?Ñ? на POP Ñ?еÑ?веÑ?Ñ? %s: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:508
+#: ../camel/providers/pop3/camel-pop3-store.c:540
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4324,8 +4353,7 @@ msgstr ""
 "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? з'Ñ?днаÑ?иÑ?Ñ? з Ñ?еÑ?веÑ?ом POP %s:\tÐ?Ñ?имано непÑ?авилÑ?ний APOP ID. "
 "СÑ?оже на аÑ?акÑ? з виданнÑ?м Ñ?ебе за Ñ?нÑ?ого. Ð?в'Ñ?жÑ?Ñ?Ñ?Ñ?Ñ? з ваÑ?им адмÑ?нÑ?Ñ?Ñ?Ñ?аÑ?оÑ?ом."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:549
-#: ../camel/providers/pop3/camel-pop3-store.c:562
+#: ../camel/providers/pop3/camel-pop3-store.c:581
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4334,16 +4362,27 @@ msgstr ""
 "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? з'Ñ?днаÑ?иÑ?Ñ? з Ñ?еÑ?веÑ?ом POP %s.\n"
 "Ð?омилка вÑ?дÑ?иланнÑ? паÑ?олÑ?: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:556
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:591
+#, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username%s"
+msgstr ""
+"Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? з'Ñ?днаÑ?иÑ?Ñ? з Ñ?еÑ?веÑ?ом POP %s.\n"
+"Ð?омилка вÑ?дÑ?иланнÑ? назви Ñ?аÑ?Ñ?нкÑ?%s"
+
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending username: %s"
+"Error sending password%s"
 msgstr ""
 "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? з'Ñ?днаÑ?иÑ?Ñ? з Ñ?еÑ?веÑ?ом POP %s.\n"
-"Ð?омилка вÑ?дÑ?иланнÑ? назви Ñ?аÑ?Ñ?нкÑ?: %s"
+"Ð?омилка вÑ?дÑ?иланнÑ? паÑ?олÑ?%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:669
+#: ../camel/providers/pop3/camel-pop3-store.c:707
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Тека «%s» не Ñ?Ñ?нÑ?Ñ?."
@@ -4739,7 +4778,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:1633 ../libedataserver/e-time-utils.c:1898
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1902
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
@@ -4747,7 +4786,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:1638 ../libedataserver/e-time-utils.c:1889
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1893
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
@@ -4755,7 +4794,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:1643 ../libedataserver/e-time-utils.c:1894
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1898
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
@@ -4763,78 +4802,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:1648 ../libedataserver/e-time-utils.c:1885
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1889
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1653
+#: ../libedataserver/e-time-utils.c:1655
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1658
+#: ../libedataserver/e-time-utils.c:1660
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d/%m/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1661 ../libedataserver/e-time-utils.c:1761
-#: ../libedataserver/e-time-utils.c:1880
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1765
+#: ../libedataserver/e-time-utils.c:1884
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1668
+#: ../libedataserver/e-time-utils.c:1670
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1672
+#: ../libedataserver/e-time-utils.c:1674
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1677
+#: ../libedataserver/e-time-utils.c:1679
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d/%m/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1682
+#: ../libedataserver/e-time-utils.c:1684
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d/%m/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1687
+#: ../libedataserver/e-time-utils.c:1689
 msgid "%m/%d/%Y %I %p"
 msgstr "%d/%m/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1692
+#: ../libedataserver/e-time-utils.c:1694
 msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1695 ../libedataserver/e-time-utils.c:1764
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1768
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1822 ../libedataserver/e-time-utils.c:1942
+#: ../libedataserver/e-time-utils.c:1826 ../libedataserver/e-time-utils.c:1946
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1826 ../libedataserver/e-time-utils.c:1934
+#: ../libedataserver/e-time-utils.c:1830 ../libedataserver/e-time-utils.c:1938
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4842,24 +4881,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:1831 ../libedataserver/e-time-utils.c:1939
+#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1943
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1931
+#: ../libedataserver/e-time-utils.c:1839 ../libedataserver/e-time-utils.c:1935
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1838
+#: ../libedataserver/e-time-utils.c:1842
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1842
+#: ../libedataserver/e-time-utils.c:1846
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -4871,26 +4910,26 @@ msgstr "Ð?нонÑ?мний доÑ?Ñ?Ñ?п до Ñ?еÑ?веÑ?а LDAP"
 msgid "Failed to authenticate.\n"
 msgstr "Ð?е вдаÑ?Ñ?Ñ?Ñ?Ñ? пÑ?ойÑ?и авÑ?енÑ?иÑ?Ñ?каÑ?Ñ?Ñ?.\n"
 
-#: ../libedataserverui/e-categories-dialog.c:143
+#: ../libedataserverui/e-categories-dialog.c:145
 msgid "Category Icon"
 msgstr "Ð?наÑ?ок каÑ?егоÑ?Ñ?Ñ?"
 
-#: ../libedataserverui/e-categories-dialog.c:149
+#: ../libedataserverui/e-categories-dialog.c:151
 msgid "_No Image"
 msgstr "_Ð?ез зобÑ?аженнÑ?"
 
-#: ../libedataserverui/e-categories-dialog.c:370
+#: ../libedataserverui/e-categories-dialog.c:372
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "Ð?аÑ?егоÑ?Ñ?Ñ? з назвоÑ? '%s' вже Ñ?Ñ?нÑ?Ñ?. Ð?икоÑ?иÑ?Ñ?овÑ?йÑ?е Ñ?нÑ?Ñ? назвÑ?"
 
-#: ../libedataserverui/e-categories-dialog.c:678
+#: ../libedataserverui/e-categories-dialog.c:680
 msgid "Icon"
 msgstr "Ð?наÑ?ок"
 
-#: ../libedataserverui/e-categories-dialog.c:683
+#: ../libedataserverui/e-categories-dialog.c:685
 msgid "Category"
 msgstr "Ð?аÑ?егоÑ?Ñ?Ñ?"
 
@@ -4922,7 +4961,7 @@ msgstr "_Ð?Ñ?авка"
 msgid "categories"
 msgstr "каÑ?егоÑ?Ñ?Ñ?"
 
-#: ../libedataserverui/e-category-completion.c:290
+#: ../libedataserverui/e-category-completion.c:292
 #, c-format
 msgid "Create category \"%s\""
 msgstr "СÑ?воÑ?иÑ?и каÑ?егоÑ?Ñ?Ñ? \"%s\""
@@ -4939,15 +4978,15 @@ msgstr "Ð?олÑ?Ñ? длÑ? виводÑ?"
 msgid "Select Contacts from Address Book"
 msgstr "Ð?ибÑ?Ñ? конÑ?акÑ?Ñ?в з адÑ?еÑ?ноÑ? книги"
 
-#: ../libedataserverui/e-name-selector-dialog.c:579
+#: ../libedataserverui/e-name-selector-dialog.c:587
 msgid "_Add"
 msgstr "_Ð?одаÑ?и"
 
-#: ../libedataserverui/e-name-selector-dialog.c:604
+#: ../libedataserverui/e-name-selector-dialog.c:612
 msgid "_Remove"
 msgstr "Ð?_идалиÑ?и"
 
-#: ../libedataserverui/e-name-selector-dialog.c:781
+#: ../libedataserverui/e-name-selector-dialog.c:789
 #: ../libedataserverui/e-name-selector-dialog.ui.h:6
 msgid "Any Category"
 msgstr "Ð?Ñ?дÑ?-Ñ?ка каÑ?егоÑ?Ñ?Ñ?"
@@ -4989,56 +5028,56 @@ 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:2508
+#: ../libedataserverui/e-name-selector-entry.c:2511
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "_РозгоÑ?нÑ?Ñ?и %s"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2523
+#: ../libedataserverui/e-name-selector-entry.c:2526
 #, c-format
 msgid "Cop_y %s"
 msgstr "_Ð?опÑ?Ñ?ваÑ?и %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2533
+#: ../libedataserverui/e-name-selector-entry.c:2536
 #, c-format
 msgid "C_ut %s"
 msgstr "_Ð?иÑ?Ñ?заÑ?и %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2550
+#: ../libedataserverui/e-name-selector-entry.c:2553
 #, c-format
 msgid "_Edit %s"
 msgstr "_Ð?Ñ?авка %s"
 
-#: ../libedataserverui/e-name-selector-list.c:469
+#: ../libedataserverui/e-name-selector-list.c:479
 #, c-format
 msgid "_Delete %s"
 msgstr "Ð?_идалиÑ?и %s"
 
-#: ../libedataserverui/e-passwords.c:234
+#: ../libedataserverui/e-passwords.c:240
 #, c-format
 msgid "Keyring key is unusable: no user or host name"
 msgstr "Ð?лÑ?Ñ? з в'Ñ?зки клÑ?Ñ?Ñ?в некоÑ?екÑ?ний: вÑ?дÑ?Ñ?Ñ?нÑ? Ñ?м'Ñ? коÑ?иÑ?Ñ?Ñ?ваÑ?а або вÑ?зла"
 
-#: ../libedataserverui/e-passwords.c:1093
+#: ../libedataserverui/e-passwords.c:1099
 msgid "You have the Caps Lock key on."
 msgstr "Ð?а клавÑ?аÑ?Ñ?Ñ?Ñ? Ñ?вÑ?мкнено Caps Lock."
 
-#: ../libedataserverui/e-passwords.c:1215
+#: ../libedataserverui/e-passwords.c:1221
 msgid "_Remember this passphrase"
 msgstr "_Ð?апам'Ñ?Ñ?аÑ?и Ñ?ей паÑ?олÑ?"
 
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:1222
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "_Ð?ам'Ñ?Ñ?аÑ?и Ñ?ей паÑ?олÑ? до закÑ?нÑ?еннÑ? поÑ?оÑ?ного Ñ?еанÑ?Ñ?"
 
-#: ../libedataserverui/e-passwords.c:1221
+#: ../libedataserverui/e-passwords.c:1227
 msgid "_Remember this password"
 msgstr "_Ð?апам'Ñ?Ñ?аÑ?и Ñ?ей паÑ?олÑ?"
 
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:1228
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Ð?ам'Ñ?Ñ?аÑ?и Ñ?ей паÑ?олÑ? до закÑ?нÑ?еннÑ? поÑ?оÑ?ного Ñ?еанÑ?Ñ?"
 
@@ -5047,24 +5086,22 @@ msgstr "_Ð?ам'Ñ?Ñ?аÑ?и Ñ?ей паÑ?олÑ? до закÑ?нÑ?еннÑ? поÑ?
 msgid "Select destination"
 msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? пÑ?изнаÑ?еннÑ?"
 
-#: ../libedataserverui/e-source-selector-dialog.c:156
+#: ../libedataserverui/e-source-selector-dialog.c:172
 msgid "_Destination"
 msgstr "_Ð?Ñ?изнаÑ?еннÑ?"
 
-#: ../servers/groupwise/e-gw-connection.c:225
+#: ../servers/groupwise/e-gw-connection.c:227
 msgid "Invalid connection"
 msgstr "Ð?епÑ?авилÑ?не з'Ñ?днаннÑ?"
 
-#: ../servers/groupwise/e-gw-connection.c:229
+#: ../servers/groupwise/e-gw-connection.c:231
 msgid "Invalid response from server"
 msgstr "Ð?епÑ?авилÑ?на вÑ?дповÑ?дÑ? вÑ?д Ñ?еÑ?веÑ?а."
 
-#: ../servers/groupwise/e-gw-connection.c:231
+#: ../servers/groupwise/e-gw-connection.c:233
 msgid "No response from the server"
 msgstr "Ð?емаÑ? вÑ?дповÑ?дÑ? вÑ?д Ñ?еÑ?веÑ?а"
 
-#: ../servers/groupwise/e-gw-connection.c:237
+#: ../servers/groupwise/e-gw-connection.c:239
 msgid "Bad parameter"
 msgstr "Ð?епÑ?авилÑ?ний паÑ?амеÑ?Ñ?"
-
-



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