[evolution-data-server] Updated Hebrew translation.

From: Yaron Shahrabani <yaronsh src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-data-server] Updated Hebrew translation.
Date: Sun, 27 Jun 2010 21:10:29 +0000 (UTC)
commit 94416e66b515b49547b159a1f92539f91cef3331
Author: Yaron Shahrabani <sh yaron gmail com>
Date:   Mon Jun 28 00:09:13 2010 +0300

    Updated Hebrew translation.

 po/he.po | 4335 +++++++++++++++++++++++++++++---------------------------------
 1 files changed, 2050 insertions(+), 2285 deletions(-)
---
diff --git a/po/he.po b/po/he.po
index 359f5ae..87d45d0 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,181 +8,92 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD.he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-18 15:21+0200\n"
-"PO-Revision-Date: 2004-07-25 21:05+0300\n"
-"Last-Translator: Gil Osher <dolfin rpg org il>\n"
+"POT-Creation-Date: 2010-06-27 23:23+0300\n"
+"PO-Revision-Date: 2010-06-28 00:07+0200\n"
+"Last-Translator: Yaron Shahrabani <sh yaron gmail com>\n"
 "Language-Team: Hebrew <he li org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.3.1\n"
 
 #: ../addressbook/backends/file/e-book-backend-file.c:560
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2370
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
 msgid "Loading..."
 msgstr "×?×?×¢×?..."
 
 #: ../addressbook/backends/file/e-book-backend-file.c:563
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2301
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2323
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2368
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4288
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c: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:4553
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
 msgid "Searching..."
 msgstr "×?×?×¤×©..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2738
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4452
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4717
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "×?×?×¨×?×? ×?× ×©×? ×§×©×¨ (%d)..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2887
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3072
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3116
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2845
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3029
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3073
 #, c-format
 msgid "Updating contacts cache (%d)... "
 msgstr "×?×¢×?×?×? ×?×?×?×?×? ×?× ×©×? ×§×©×¨ (%d)..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:751
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:818
 msgid "Using Distinguished Name (DN)"
-msgstr ""
+msgstr "× ×¢×©×? ×©×?×?×?×© ×?×©×? ×?×?×?×?×?×? (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:754
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:821
 msgid "Using Email Address"
 msgstr "×?×©×ª×?×© ×?×?×ª×?×?×ª ×?×?×?\"×?"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1019
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1098
 msgid "Reconnecting to LDAP server..."
 msgstr "×?×ª×?×?×¨ ×?×?×?×© ×?×©×¨×ª LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1617
+#: ../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:1752
+#: ../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:2064
+#: ../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:4148
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4414
 msgid "Receiving LDAP search results..."
 msgstr "×?×§×?×? ×ª×?×¦×?×?×ª ×?×?×¤×?×© ×?-LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4310
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4575
 msgid "Error performing search"
 msgstr "×©×?×?×?×? ×?×?×?×¦×?×¢ ×?×?×?×¤×?×©"
 
-#. translators: the placeholders will be filled by
-#. * function names, e.g.
-#. * "e_book_add_contact" on book before
-#. * "e_book_open
-#: ../addressbook/libebook/e-book.c:260 ../addressbook/libebook/e-book.c:264
-#: ../addressbook/libebook/e-book.c:469 ../addressbook/libebook/e-book.c:473
-#: ../addressbook/libebook/e-book.c:612 ../addressbook/libebook/e-book.c:616
-#: ../addressbook/libebook/e-book.c:703 ../addressbook/libebook/e-book.c:707
-#: ../addressbook/libebook/e-book.c:1003 ../addressbook/libebook/e-book.c:1008
-#: ../addressbook/libebook/e-book.c:1187 ../addressbook/libebook/e-book.c:1191
-#: ../addressbook/libebook/e-book.c:1346 ../addressbook/libebook/e-book.c:1350
-#: ../addressbook/libebook/e-book.c:1552 ../addressbook/libebook/e-book.c:1556
-#: ../addressbook/libebook/e-book.c:1795 ../addressbook/libebook/e-book.c:1799
-#: ../addressbook/libebook/e-book.c:2033 ../addressbook/libebook/e-book.c:2037
-#: ../addressbook/libebook/e-book.c:2242 ../addressbook/libebook/e-book.c:2246
-#: ../addressbook/libebook/e-book.c:3405
-#, c-format
-msgid "\"%s\" on book before \"%s\""
-msgstr ""
-
-#: ../addressbook/libebook/e-book.c:273 ../addressbook/libebook/e-book.c:482
-#: ../addressbook/libebook/e-book.c:625 ../addressbook/libebook/e-book.c:716
-#: ../addressbook/libebook/e-book.c:1018 ../addressbook/libebook/e-book.c:1201
-#: ../addressbook/libebook/e-book.c:1360 ../addressbook/libebook/e-book.c:1565
-#: ../addressbook/libebook/e-book.c:1808 ../addressbook/libebook/e-book.c:2047
-#: ../addressbook/libebook/e-book.c:2255 ../addressbook/libebook/e-book.c:2634
-#: ../addressbook/libebook/e-book.c:2833
-#, c-format
-msgid "book busy"
-msgstr "×?×¡×¤×¨ ×¢×¡×?×§"
-
-#: ../addressbook/libebook/e-book.c:304 ../addressbook/libebook/e-book.c:308
-#: ../addressbook/libebook/e-book.c:513 ../addressbook/libebook/e-book.c:517
-#: ../addressbook/libebook/e-book.c:652 ../addressbook/libebook/e-book.c:656
-#: ../addressbook/libebook/e-book.c:743 ../addressbook/libebook/e-book.c:747
-#: ../addressbook/libebook/e-book.c:1045 ../addressbook/libebook/e-book.c:1048
-#: ../addressbook/libebook/e-book.c:1231 ../addressbook/libebook/e-book.c:1234
-#: ../addressbook/libebook/e-book.c:1387 ../addressbook/libebook/e-book.c:1391
-#: ../addressbook/libebook/e-book.c:1601 ../addressbook/libebook/e-book.c:1605
-#: ../addressbook/libebook/e-book.c:1855 ../addressbook/libebook/e-book.c:1859
-#: ../addressbook/libebook/e-book.c:2077 ../addressbook/libebook/e-book.c:2081
-#: ../addressbook/libebook/e-book.c:2281 ../addressbook/libebook/e-book.c:2285
-#: ../addressbook/libebook/e-book.c:2518 ../addressbook/libebook/e-book.c:2660
-#: ../addressbook/libebook/e-book.c:2664 ../addressbook/libebook/e-book.c:2859
-#: ../addressbook/libebook/e-book.c:2863 ../addressbook/libebook/e-book.c:3414
-#, c-format
-msgid "CORBA exception making \"%s\" call"
-msgstr "×©×?×?×?×ª CORBA ×?×§×¨×?×?×? ×?-\"%s\""
-
-#: ../addressbook/libebook/e-book.c:2507
-#, c-format
-msgid "%s: there is no current operation"
-msgstr "â??%s: ×?×?×? ×¤×¢×?×?×? × ×?×?×?×?×ª"
-
-#: ../addressbook/libebook/e-book.c:2532
-#, c-format
-msgid "%s: could not cancel"
-msgstr "â??%s: ×?×? × ×?×ª×? ×?×?×?×?"
-
-#: ../addressbook/libebook/e-book.c:2620 ../addressbook/libebook/e-book.c:2624
-#, c-format
-msgid "\"%s\" on book after \"%s\""
-msgstr ""
-
-#: ../addressbook/libebook/e-book.c:2688
-#, c-format
-msgid "%s: canceled"
-msgstr "â??%s: ×?×?×?×?"
-
-#: ../addressbook/libebook/e-book.c:3269
+#: ../addressbook/libebook/e-book.c:2152
 #, c-format
-msgid "%s: Invalid source."
-msgstr "â??%s: ×?×§×?×¨ ×?×? ×ª×§×?×?."
-
-#: ../addressbook/libebook/e-book.c:3277 ../addressbook/libebook/e-book.c:3343
-#, c-format
-msgid "%s: no factories available for URI `%s'"
-msgstr ""
-
-#: ../addressbook/libebook/e-book.c:3289
-#, c-format
-msgid "%s: Could not create EBookListener"
-msgstr "â??%s: ×?×? × ×?×ª×? ×?×?×¦×?×¨ EBookListener"
-
-#: ../addressbook/libebook/e-book.c:3556
-#, c-format
-msgid "%s: there was no self contact UID stored in gconf"
-msgstr ""
-
-#: ../addressbook/libebook/e-book.c:3689
-#, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
-msgstr ""
+msgid "%s: there was no source for UID '%s' stored in GConf."
+msgstr "%s: ×?×?×? ×?×§×?×¨ ×¢×?×?×¨ ×?×?×?×? ×?×?×©×ª×?×© '%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 "×?×ª×?×?×ª ×¡×¤×¨"
 
@@ -190,777 +101,859 @@ msgstr "×?×ª×?×?×ª ×¡×¤×¨"
 #. 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 "×?×ª×?×?×ª ×?×£ ×?×?×?×ª"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Weblog URL"
 msgstr "×?×ª×?×?×ª ×?×?×?×?"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:514
+#: ../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 "×?×ª×?×?×ª ×?×?×?×?"
 
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:182
 msgid "Free/Busy URL"
 msgstr "×?×ª×?×?×ª ×¤× ×?×?/×¢×¡×?×§"
 
-#: ../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 "×?×ª×?×?×ª ×?×¢×?×?×ª ×?×?×?×?×?"
 
 #. 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 ×¢×?×?×?×? - ×©×? ×?×¡×? 1"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Work Screen Name 3"
 msgstr "â??AIM ×¢×?×?×?×? - ×©×? ×?×¡×? 1"
 
-#: ../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
-msgid "Jabber Home Id 1"
-msgstr "â??Jabber ×?×?×ª - ×?×?×?×? 1"
-
-#: ../addressbook/libebook/e-contact.c:202
-msgid "Jabber Home Id 2"
-msgstr "â??Jabber ×?×?×ª - ×?×?×?×? 2"
-
 #: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 3"
-msgstr "â??Jabber ×?×?×ª - ×?×?×?×? 3"
+msgid "Jabber Home ID 1"
+msgstr "â??Jabber ×?×?×ª×? â?? ×?×?×?×? 1"
 
 #: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Work Id 1"
-msgstr "â??Jabber ×¢×?×?×?×? - ×?×?×?×? 1"
+msgid "Jabber Home ID 2"
+msgstr "â??Jabber ×?×?×ª×? â?? ×?×?×?×? 2"
 
 #: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Work Id 2"
-msgstr "â??Jabber ×¢×?×?×?×? - ×?×?×?×? 2"
+msgid "Jabber Home ID 3"
+msgstr "â??Jabber ×?×?×ª×? â?? ×?×?×?×? 2"
 
 #: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 3"
-msgstr "â??Jabber ×¢×?×?×?×? - ×?×?×?×? 3"
+msgid "Jabber Work ID 1"
+msgstr "â??Jabber ×?×¢×¡×§ â?? ×?×?×?×? 1"
 
 #: ../addressbook/libebook/e-contact.c:207
+msgid "Jabber Work ID 2"
+msgstr "â??Jabber ×?×¢×¡×§ â?? ×?×?×?×? 2"
+
+#: ../addressbook/libebook/e-contact.c:208
+msgid "Jabber Work ID 3"
+msgstr "â??Jabber ×?×¢×¡×§ â?? ×?×?×?×? 3"
+
+#: ../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
-msgid "ICQ Home Id 1"
-msgstr "â??ICQ ×?×?×ª - ×?×?×?×? 1"
-
-#: ../addressbook/libebook/e-contact.c:220
-msgid "ICQ Home Id 2"
-msgstr "â??ICQ ×?×?×ª - ×?×?×?×? 2"
-
 #: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 3"
-msgstr "â??ICQ ×?×?×ª - ×?×?×?×? 3"
+msgid "ICQ Home ID 1"
+msgstr "â??ICQ ×?×?×ª×? â?? ×?×¡×¤×¨ 1"
 
 #: ../addressbook/libebook/e-contact.c:222
-msgid "ICQ Work Id 1"
-msgstr "â??ICQ ×¢×?×?×?×? - ×©×? ×?×¡×? 1"
+msgid "ICQ Home ID 2"
+msgstr "â??ICQ ×?×?×ª×? â?? ×?×¡×¤×¨ 2"
 
 #: ../addressbook/libebook/e-contact.c:223
-msgid "ICQ Work Id 2"
-msgstr "â??ICQ ×¢×?×?×?×? - ×©×? ×?×¡×? 2"
+msgid "ICQ Home ID 3"
+msgstr "â??ICQ ×?×?×ª×? â?? ×?×¡×¤×¨ 3"
 
 #: ../addressbook/libebook/e-contact.c:224
-msgid "ICQ Work Id 3"
-msgstr "â??ICQ ×¢×?×?×?×? - ×©×? ×?×¡×? 3"
+msgid "ICQ Work ID 1"
+msgstr "â??ICQ ×?×¢×¡×§ â?? ×?×¡×¤×¨ 1"
+
+#: ../addressbook/libebook/e-contact.c:225
+msgid "ICQ Work ID 2"
+msgstr "â??ICQ ×?×¢×¡×§ â?? ×?×¡×¤×¨ 2"
+
+#: ../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
-msgid "GroupWise Id List"
-msgstr "â??GroupWise - ×¨×©×?×?×ª ×?×?×?×?×?"
+#: ../addressbook/libebook/e-contact.c:250
+msgid "GroupWise ID List"
+msgstr "â??GroupWise â?? ×¨×©×?×?×ª ×?×?×?×?×?"
 
-#: ../addressbook/libebook/e-contact.c:249
-msgid "Jabber Id List"
-msgstr "â??Jabber - ×¨×©×?×?×ª ×?×?×?×?×?"
+#: ../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
-msgid "ICQ Id List"
-msgstr "â??ICQ - ×¨×©×?×?×ª ×?×?×?×?×?"
-
 #: ../addressbook/libebook/e-contact.c:254
+msgid "ICQ ID List"
+msgstr "â??ICQ â?? ×¨×©×?×?×ª ×?×¡×¤×¨×?×?"
+
+#: ../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:461
-#: ../libedataserver/e-categories.c:43
+#: ../addressbook/libebook/e-contact.c:262
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:715
+#: ../libedataserver/e-categories.c:42
 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
-msgid "Gadu-Gadu Home Id 1"
-msgstr "â??Gadu-Gadu ×?×?×ª - ×?×?×?×? 1"
-
-#: ../addressbook/libebook/e-contact.c:266
-msgid "Gadu-Gadu Home Id 2"
-msgstr "â??Gadu-Gadu ×?×?×ª - ×?×?×?×? 2"
-
 #: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 3"
-msgstr "â??Gadu-Gadu ×?×?×ª - ×?×?×?×? 3"
+msgid "Gadu-Gadu Home ID 1"
+msgstr "â??Gadu-Gadu ×?×?×ª×? â?? ×?×¡×¤×¨ 1"
 
 #: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Work Id 1"
-msgstr "â??Gadu-Gadu ×¢×?×?×?×? - ×?×?×?×? 1"
+msgid "Gadu-Gadu Home ID 2"
+msgstr "â??Gadu-Gadu ×?×?×ª×? â?? ×?×¡×¤×¨ 2"
 
 #: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Work Id 2"
-msgstr "â??Gadu-Gadu ×¢×?×?×?×? - ×?×?×?×? 2"
+msgid "Gadu-Gadu Home ID 3"
+msgstr "â??Gadu-Gadu ×?×?×ª×? â?? ×?×¡×¤×¨ 3"
 
 #: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 3"
-msgstr "â??Gadu-Gadu ×¢×?×?×?×? - ×?×?×?×? 3"
+msgid "Gadu-Gadu Work ID 1"
+msgstr "â??Gadu-Gadu ×?×¢×¡×§ â?? ×?×¡×¤×¨ 1"
 
 #: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Id List"
-msgstr "â??Gadu-Gadu ×¨×©×?×?×ª ×?×?×?×?×?"
+msgid "Gadu-Gadu Work ID 2"
+msgstr "â??Gadu-Gadu ×?×¢×¡×§ â?? ×?×¡×¤×¨ 2"
+
+#: ../addressbook/libebook/e-contact.c:272
+msgid "Gadu-Gadu Work ID 3"
+msgstr "â??Gadu-Gadu ×?×¢×¡×§ â?? ×?×¡×¤×¨ 3"
+
+#: ../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:1499
-#: ../addressbook/libebook/e-destination.c:761
+#: ../addressbook/libebook/e-contact.c:280
+msgid "Skype Home Name 1"
+msgstr "×¡×§×?×?×¤ ×?×?×ª×? â?? ×©×? 1"
+
+#: ../addressbook/libebook/e-contact.c:281
+msgid "Skype Home Name 2"
+msgstr "×¡×§×?×?×¤ ×?×?×ª×? â?? ×©×? 2"
+
+#: ../addressbook/libebook/e-contact.c:282
+msgid "Skype Home Name 3"
+msgstr "×¡×§×?×?×¤ ×?×?×ª×? â?? ×©×? 3"
+
+#: ../addressbook/libebook/e-contact.c:283
+msgid "Skype Work Name 1"
+msgstr "×¡×§×?×?×¤ ×?×¢×¡×§ â?? ×©×? 1"
+
+#: ../addressbook/libebook/e-contact.c:284
+msgid "Skype Work Name 2"
+msgstr "×¡×§×?×?×¤ ×?×¢×¡×§ â?? ×©×? 2"
+
+#: ../addressbook/libebook/e-contact.c:285
+msgid "Skype Work Name 3"
+msgstr "×¡×§×?×?×¤ ×?×¢×¡×§ â?? ×©×? 3"
+
+#: ../addressbook/libebook/e-contact.c:286
+msgid "Skype Name List"
+msgstr "×¨×©×?×?×ª ×?×©×?×?×ª ×?×¡×§×?×?×¤"
+
+#: ../addressbook/libebook/e-contact.c:288
+msgid "SIP address"
+msgstr "×?×ª×?×?×ª SIP"
+
+#: ../addressbook/libebook/e-contact.c:1517
+#: ../addressbook/libebook/e-destination.c:739
 msgid "Unnamed List"
 msgstr "×¨×©×?×?×? ×?×?×? ×©×?"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:463
-#: ../libedataserver/e-categories.c:44
+#: ../addressbook/libedata-book/e-data-book-factory.c:302
+#, c-format
+msgid "Empty URI"
+msgstr "×?×ª×?×?×ª ×¨×?×§×?"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:317
+#: ../addressbook/libedata-book/e-data-book-factory.c:348
+#: ../calendar/libedata-cal/e-data-cal-factory.c:324
+#: ../calendar/libedata-cal/e-data-cal-factory.c:333
+#, c-format
+msgid "Invalid source"
+msgstr "×?×§×?×¨ ×?×? ×ª×§×?×?"
+
+#: ../addressbook/libedata-book/e-data-book.c:301
+msgid "Cannot open book"
+msgstr "×?×? × ×?×ª×? ×?×¤×ª×?×? ×?×ª ×?×¡×¤×¨"
+
+#: ../addressbook/libedata-book/e-data-book.c:319
+msgid "Cannot remove book"
+msgstr "×?×? × ×?×ª×? ×?×?×¡×?×¨ ×?×ª ×?×¡×¤×¨"
+
+#: ../addressbook/libedata-book/e-data-book.c:331
+#: ../addressbook/libedata-book/e-data-book.c:346
+msgid "Cannot get contact"
+msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×?×© ×§×©×¨"
+
+#: ../addressbook/libedata-book/e-data-book.c:358
+msgid "Empty query"
+msgstr "×©×?×?×?×ª×? ×¨×?×§×?"
+
+#: ../addressbook/libedata-book/e-data-book.c:402
+msgid "Cannot authenticate user"
+msgstr "×?×? × ×?×ª×? ×?×?×?×ª ×?×ª ×?×?×©×ª×?×©"
+
+#: ../addressbook/libedata-book/e-data-book.c:414
+#: ../addressbook/libedata-book/e-data-book.c:429
+msgid "Cannot add contact"
+msgstr "×?×? × ×?×ª×? ×?×?×?×¡×?×£ ×?×?×© ×§×©×¨"
+
+#: ../addressbook/libedata-book/e-data-book.c:444
+#: ../addressbook/libedata-book/e-data-book.c:459
+msgid "Cannot modify contact"
+msgstr "×?×? × ×?×ª×? ×?×©× ×?×ª ×?×?×© ×§×©×¨"
+
+#: ../addressbook/libedata-book/e-data-book.c:494
+msgid "Cannot remove contacts"
+msgstr "×?×? × ×?×ª×? ×?×?×¡×?×¨ ×?× ×©×? ×§×©×¨"
+
+#: ../addressbook/libedata-book/e-data-book.c:569
+#: ../calendar/libedata-cal/e-cal-backend-util.c:141
+msgid "Invalid query"
+msgstr "×©×?×?×?×ª×? ×©×?×?×?×?"
+
+#: ../addressbook/libedata-book/e-data-book.c:598
+msgid "Cannot get changes"
+msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×?×©×?× ×?×?×?×?"
+
+#: ../addressbook/libedata-book/e-data-book.c:699
+msgid "Cannot complete operation"
+msgstr "×?×? × ×?×ª×? ×?×?×©×?×?×? ×?×ª ×?×¤×¢×?×?×?"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
+#: ../libedataserver/e-categories.c:43
 msgid "Birthday"
 msgstr "×?×?×? ×?×?×?×?×ª"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:489
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:746
 #, c-format
 msgid "Birthday: %s"
 msgstr "×?×?×? ×?×?×?×?×ª: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:513
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:770
 #, c-format
 msgid "Anniversary: %s"
 msgstr "×?×?×? ×©× ×?: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:212
+#: ../calendar/backends/file/e-cal-backend-file.c:236
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "×?×? × ×?×ª×? ×?×©×?×?×¨ ×?×?×?×¢ ×?×?×?×?: ×?×ª×?×?×ª ×¤×?×?×?×?."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:219
-#: ../calendar/backends/file/e-cal-backend-file.c:225
+#: ../calendar/backends/file/e-cal-backend-file.c:243
+#: ../calendar/backends/file/e-cal-backend-file.c:249
 msgid "Cannot save calendar data"
 msgstr "×?×? × ×?×ª×? ×?×©×?×?×¨ ×?×?×?×¢ ×?×?×?×?."
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:335
-msgid "Could not create thread for getting deltas"
-msgstr ""
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:367
-#: ../calendar/backends/google/e-cal-backend-google.c:1191
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1053
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1352
-#: ../calendar/backends/http/e-cal-backend-http.c:582
-#: ../calendar/backends/weather/e-cal-backend-weather.c:461
-msgid "Could not create cache file"
-msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×§×?×?×¥ ×?×?×?×?×?"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:380
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065
-msgid "Could not create thread for populating cache"
-msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×ª×?×?×?×?×?×? ×?×?×?×¦×?×¨ ×?×?×?×?×?"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1056
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1850
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1118
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2246
 msgid "Reply Requested: by "
-msgstr ""
+msgstr "×?×¨×?×©×ª ×ª×?×?×?×?: ×?×?×ª"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1061
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1855
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1123
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2251
 msgid "Reply Requested: When convenient"
-msgstr ""
+msgstr "×?×¨×?×©×ª ×ª×?×?×?×?: ×?×©× ×?×?"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:277
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:292
 #, c-format
 msgid "Loading %s items"
 msgstr "×?×?×¢×? %s ×¤×¨×?×?×?×?"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:925
 msgid "Calendar"
 msgstr "×?×?×?×?"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:983
 msgid "Invalid server URI"
 msgstr "×?×ª×?×?×ª ×©×¨×ª ×?×? ×ª×§×?× ×?"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:966
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1071
-#: ../calendar/libecal/e-cal.c:5091
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1098
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1130
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1168
-#: ../camel/providers/groupwise/camel-groupwise-store.c:580
-#: ../camel/providers/groupwise/camel-groupwise-store.c:745
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:184
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1002
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1011
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1104
+#: ../calendar/libecal/e-cal.c:4025
+#: ../calendar/libedata-cal/e-cal-backend-util.c:119
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1423
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1461
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1476
+#: ../camel/providers/groupwise/camel-groupwise-store.c:603
+#: ../camel/providers/groupwise/camel-groupwise-store.c:789
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:84
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:115
 msgid "Authentication failed"
 msgstr "×?×?×?×?×?×?×ª × ×?×©×?×?"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:267
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1086
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1384
+#: ../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/groupwise/e-cal-backend-groupwise.c:1099
+msgid "Could not create thread for populating cache"
+msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×ª×?×?×?×?×?×? ×?×?×?×¦×?×¨ ×?×?×?×?×?"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:335
 msgid "Redirected to Invalid URI"
 msgstr "×?×¤× ×?×?×? ×?×?×ª×?×?×ª ×©×?×?×?×?"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:288
+#: ../calendar/backends/http/e-cal-backend-http.c:358
 msgid "Bad file format."
 msgstr "×?×?× ×? ×§×?×?×¥ ×©×?×?×?."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:294
+#: ../calendar/backends/http/e-cal-backend-http.c:365
 msgid "Not a calendar."
 msgstr "×?×? ×?×?×?×?."
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:149
+#: ../calendar/backends/weather/e-cal-backend-weather.c:152
 msgid "Could not retrieve weather data"
 msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×?×?×¢ ×¢×? ×?×?×? ×?×?×?×?×?×¨"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:246
+#: ../calendar/backends/weather/e-cal-backend-weather.c:251
 msgid "Weather: Fog"
 msgstr "×?×?×? ×?×?×?×¨: ×¢×¨×¤×?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
-msgid "Weather: Cloudy"
-msgstr "×?×?×? ×?×?×?×¨: ×?×¢×?× ×?"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
+#: ../calendar/backends/weather/e-cal-backend-weather.c:252
 msgid "Weather: Cloudy Night"
 msgstr "×?×?×? ×?×?×?×¨: ×?×?×?×? ×?×¢×?× ×?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
-#, fuzzy
+#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+msgid "Weather: Cloudy"
+msgstr "×?×?×? ×?×?×?×¨: ×?×¢×?× ×?"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:254
 msgid "Weather: Overcast"
-msgstr "×?×?×? ×?×?×?×¨: ×¡×?×¤×?×ª ×?×¨×§×?×?"
+msgstr "×?×?×? ×?×?×?×¨: ×?×¢×?× ×?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
+#: ../calendar/backends/weather/e-cal-backend-weather.c:255
 msgid "Weather: Showers"
 msgstr "×?×?×? ×?×?×?×¨: ×?×?×?×¨×?×?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:256
 msgid "Weather: Snow"
 msgstr "×?×?×? ×?×?×?×¨: ×©×?×?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:257
+msgid "Weather: Clear Night"
+msgstr "×?×?×? ×?×?×?×¨: ×?×?×?×? ×?×?×?×¨"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:258
 msgid "Weather: Sunny"
 msgstr "×?×?×? ×?×?×?×¨: ×©×?×©"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
-#, fuzzy
-msgid "Weather: Clear Night"
-msgstr "×?×?×? ×?×?×?×¨: ×?×©×?"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:259
 msgid "Weather: Thunderstorms"
 msgstr "×?×?×? ×?×?×?×¨: ×¡×?×¤×?×ª ×?×¨×§×?×?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:377
-#, fuzzy
+#: ../calendar/backends/weather/e-cal-backend-weather.c:405
 msgid "Forecast"
-msgstr "×?×?× ×?"
+msgstr "×ª×?×?×?×ª"
 
-#: ../calendar/libecal/e-cal-component.c:1322
+#: ../calendar/libecal/e-cal-component.c:1286
 msgid "Untitled appointment"
 msgstr "×¤×?×?×©×? ×?×?×? ×©×?"
 
-#: ../calendar/libecal/e-cal-recur.c:4041
+#: ../calendar/libecal/e-cal-recur.c:3951
 msgid "1st"
-msgstr ""
+msgstr "×?×¨×?×©×?×?"
 
-#: ../calendar/libecal/e-cal-recur.c:4042
+#: ../calendar/libecal/e-cal-recur.c:3952
 msgid "2nd"
-msgstr ""
+msgstr "×?×©× ×?"
 
-#: ../calendar/libecal/e-cal-recur.c:4043
+#: ../calendar/libecal/e-cal-recur.c:3953
 msgid "3rd"
-msgstr ""
+msgstr "×?×©×?×?×©×?"
 
-#: ../calendar/libecal/e-cal-recur.c:4044
+#: ../calendar/libecal/e-cal-recur.c:3954
 msgid "4th"
-msgstr ""
+msgstr "×?×¨×?×?×¢×?"
 
-#: ../calendar/libecal/e-cal-recur.c:4045
+#: ../calendar/libecal/e-cal-recur.c:3955
 msgid "5th"
-msgstr ""
+msgstr "×?×?×?×?×©×?"
 
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:3956
 msgid "6th"
-msgstr ""
+msgstr "×?×©×?×©×?"
 
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:3957
 msgid "7th"
-msgstr ""
+msgstr "×?×©×?×?×¢×?"
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:3958
 msgid "8th"
-msgstr ""
+msgstr "×?×©×?×?× ×?"
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:3959
 msgid "9th"
-msgstr ""
+msgstr "×?×ª×©×?×¢×?"
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:3960
 msgid "10th"
-msgstr ""
+msgstr "×?×¢×©×?×¨×?"
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:3961
 msgid "11th"
-msgstr ""
+msgstr "×?×?×?×? ×¢×©×¨"
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:3962
 msgid "12th"
-msgstr ""
+msgstr "×?×©× ×?×?×? ×¢×©×¨"
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:3963
 msgid "13th"
-msgstr ""
+msgstr "×?×©×?×?×©×? ×¢×©×¨"
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:3964
 msgid "14th"
-msgstr ""
+msgstr "×?×?×¨×?×¢×? ×¢×©×¨"
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:3965
 msgid "15th"
-msgstr ""
+msgstr "×?×?×?×?×©×? ×¢×©×¨"
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:3966
 msgid "16th"
-msgstr ""
+msgstr "×?×©×?×©×? ×¢×©×¨"
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:3967
 msgid "17th"
-msgstr ""
+msgstr "×?×©×?×¢×? ×¢×©×¨"
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:3968
 msgid "18th"
-msgstr ""
+msgstr "×?×©×?×?× ×? ×¢×©×¨"
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:3969
 msgid "19th"
-msgstr ""
+msgstr "×?×ª×©×¢×? ×¢×©×¨"
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:3970
 msgid "20th"
-msgstr ""
+msgstr "×?×¢×©×¨×?×?"
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:3971
 msgid "21st"
-msgstr ""
+msgstr "×?×¢×©×¨×?×? ×?×?×?×?"
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:3972
 msgid "22nd"
-msgstr ""
+msgstr "×?×¢×©×¨×?×? ×?×©× ×?×?×?"
 
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:3973
 msgid "23rd"
-msgstr ""
+msgstr "×?×¢×©×¨×?×? ×?×©×?×?×©×?"
 
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:3974
 msgid "24th"
-msgstr ""
+msgstr "×?×¢×©×¨×?×? ×?×?×¨×?×¢×?"
 
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:3975
 msgid "25th"
-msgstr ""
+msgstr "×?×¢×©×¨×?×? ×?×?×?×?×©×?"
 
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:3976
 msgid "26th"
-msgstr ""
+msgstr "×?×¢×©×¨×?×? ×?×©×?×©×?"
 
-#: ../calendar/libecal/e-cal-recur.c:4067
+#: ../calendar/libecal/e-cal-recur.c:3977
 msgid "27th"
-msgstr ""
+msgstr "×?×¢×©×¨×?×? ×?×©×?×¢×?"
 
-#: ../calendar/libecal/e-cal-recur.c:4068
+#: ../calendar/libecal/e-cal-recur.c:3978
 msgid "28th"
-msgstr ""
+msgstr "×?×¢×©×¨×?×? ×?×©×?×?× ×?"
 
-#: ../calendar/libecal/e-cal-recur.c:4069
+#: ../calendar/libecal/e-cal-recur.c:3979
 msgid "29th"
-msgstr ""
+msgstr "×?×¢×©×¨×?×? ×?×ª×©×¢×?"
 
-#: ../calendar/libecal/e-cal-recur.c:4070
+#: ../calendar/libecal/e-cal-recur.c:3980
 msgid "30th"
-msgstr ""
+msgstr "×?×©×?×?×©×?×?"
 
-#: ../calendar/libecal/e-cal-recur.c:4071
+#: ../calendar/libecal/e-cal-recur.c:3981
 msgid "31st"
-msgstr ""
+msgstr "×?×©×?×?×©×?×? ×?×?×?×?"
 
-#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:713
+#: ../calendar/libecal/e-cal-util.c:688 ../calendar/libecal/e-cal-util.c:715
 msgid "High"
 msgstr "×?×?×?×?"
 
-#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:715
+#: ../calendar/libecal/e-cal-util.c:690 ../calendar/libecal/e-cal-util.c:717
 msgid "Normal"
 msgstr "×¨×?×?×?"
 
-#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:717
+#: ../calendar/libecal/e-cal-util.c:692 ../calendar/libecal/e-cal-util.c:719
 msgid "Low"
 msgstr "× ×?×?×?"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:711
+#: ../calendar/libecal/e-cal-util.c:713
 msgid "Undefined"
 msgstr "×?×? ×?×?×?×?×¨"
 
-#: ../calendar/libecal/e-cal.c:1674 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1178 ../libedataserverui/e-book-auth-util.c:199
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "×?×?× ×¡ ×¡×?×¡×?×? ×?-%s (×?×©×ª×?×© %s)"
@@ -969,303 +962,422 @@ 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:1688
+#: ../calendar/libecal/e-cal.c:1192
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "×?×?× ×¡ ×¡×?×¡×?×? ×¢×?×?×¨ %s ×¢×? ×?× ×ª ×?×?×¤×©×¨ ×?×ª×?×?×? ×¢×?×?×¨ ×?×?×©×ª×?×© %s"
 
-#: ../calendar/libecal/e-cal.c:5063
+#: ../calendar/libecal/e-cal.c:3997
 msgid "Invalid argument"
 msgstr "×?×¨×?×?×?× ×? ×©×?×?×?"
 
-#: ../calendar/libecal/e-cal.c:5065
+#: ../calendar/libecal/e-cal.c:3999
 msgid "Backend is busy"
 msgstr "×?×?× ×?×¢ ×¢×¡×?×§"
 
-#: ../calendar/libecal/e-cal.c:5067
-#: ../calendar/libedata-cal/e-cal-backend-util.c:97
+#: ../calendar/libecal/e-cal.c:4001
+#: ../calendar/libedata-cal/e-cal-backend-util.c:107
 msgid "Repository is offline"
 msgstr "×?×?×?×?×¨ ×?×?× ×? ×?×§×?×?×?"
 
-#: ../calendar/libecal/e-cal.c:5069
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
+#: ../calendar/libecal/e-cal.c:4003
+#: ../calendar/libedata-cal/e-cal-backend-util.c:131
 msgid "No such calendar"
 msgstr "×?×? ×§×?×?×? ×?×?×?×?"
 
-#: ../calendar/libecal/e-cal.c:5071
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
-#: ../servers/groupwise/e-gw-connection.c:233
+#: ../calendar/libecal/e-cal.c:4005
+#: ../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:5073
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
-#: ../servers/groupwise/e-gw-connection.c:227
+#: ../calendar/libecal/e-cal.c:4007
+#: ../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:5075
+#: ../calendar/libecal/e-cal.c:4009
 msgid "URI not loaded"
 msgstr "×?×ª×?×?×ª ×?×? × ×?×¢× ×?"
 
-#: ../calendar/libecal/e-cal.c:5077
+#: ../calendar/libecal/e-cal.c:4011
 msgid "URI already loaded"
 msgstr "×?×ª×?×?×ª ×?×?×¨ ×?×¢×?× ×?"
 
-#: ../calendar/libecal/e-cal.c:5079
-#: ../calendar/libedata-cal/e-cal-backend-util.c:99
-#: ../servers/exchange/storage/e-storage.c:571
+#: ../calendar/libecal/e-cal.c:4013
+#: ../calendar/libedata-cal/e-cal-backend-util.c:109
 msgid "Permission denied"
 msgstr "×?×?×? ×?×¨×©×?×?×ª"
 
-#: ../calendar/libecal/e-cal.c:5081
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
-#: ../servers/groupwise/e-gw-connection.c:235
+#: ../calendar/libecal/e-cal.c:4015
+#: ../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:5083
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
+#: ../calendar/libecal/e-cal.c:4017
+#: ../calendar/libedata-cal/e-cal-backend-util.c:117
 msgid "Object ID already exists"
 msgstr "×?×?×?×? ×?×?×?×?×?×§×? ×?×?×¨ ×§×?×?×?"
 
-#: ../calendar/libecal/e-cal.c:5085
+#: ../calendar/libecal/e-cal.c:4019
 msgid "Protocol not supported"
 msgstr "×¤×¨×?×?×?×§×?×? ×?×? × ×ª×?×?"
 
-#: ../calendar/libecal/e-cal.c:5087
+#: ../calendar/libecal/e-cal.c:4021
 msgid "Operation has been canceled"
 msgstr "×?×¤×¢×?×?×? ×?×?×?×?×?"
 
-#: ../calendar/libecal/e-cal.c:5089
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
+#: ../calendar/libecal/e-cal.c:4023
+#: ../calendar/libedata-cal/e-cal-backend-util.c:145
 msgid "Could not cancel operation"
 msgstr "×?×? × ×?×ª×? ×?×?×?×? ×?×ª ×?×¤×¢×?×?×?"
 
-#: ../calendar/libecal/e-cal.c:5093
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
-#: ../camel/providers/smtp/camel-smtp-transport.c:218
+#: ../calendar/libecal/e-cal.c:4027
+#: ../calendar/libedata-cal/e-cal-backend-util.c:121
+#: ../camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Authentication required"
 msgstr "× ×?×¨×©×ª ×?×?×?×?×?×ª"
 
-#: ../calendar/libecal/e-cal.c:5095
+#: ../calendar/libecal/e-cal.c:4029
 msgid "A CORBA exception has occurred"
 msgstr "×©×?×?×?×ª CORBA ×?×ª×¨×?×©×?"
 
-#: ../calendar/libecal/e-cal.c:5097
-#: ../calendar/libedata-cal/e-cal-backend-util.c:138
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/imap/camel-imap-command.c:434
-#: ../camel/providers/imap/camel-imap-store.c:743
-#: ../camel/providers/imap4/camel-imap4-engine.c:1570
-#: ../camel/providers/imap4/camel-imap4-engine.c:1609
-#: ../camel/providers/imap4/camel-imap4-engine.c:1654
-#: ../camel/providers/imap4/camel-imap4-engine.c:1710
-#: ../camel/providers/imap4/camel-imap4-store.c:315
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
-#: ../camel/providers/pop3/camel-pop3-store.c:553
-#: ../camel/providers/pop3/camel-pop3-store.c:560
-#: ../camel/providers/pop3/camel-pop3-store.c:566
-#: ../servers/exchange/storage/e-storage.c:585
-#: ../servers/groupwise/e-gw-connection.c:241
+#: ../calendar/libecal/e-cal.c:4031
+#: ../calendar/libedata-cal/e-cal-backend-util.c:148
+#: ../camel/camel-net-utils.c:534
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:153
+#: ../camel/providers/imap/camel-imap-command.c:455
+#: ../camel/providers/imap/camel-imap-store.c:631
+#: ../camel/providers/pop3/camel-pop3-store.c:604
+#: ../servers/groupwise/e-gw-connection.c:243
 msgid "Unknown error"
 msgstr "×©×?×?×?×? ×?×? ×?×?×?×¢×?"
 
-#: ../calendar/libecal/e-cal.c:5099
-#: ../calendar/libedata-cal/e-cal-backend-util.c:95
-#: ../servers/exchange/storage/e-storage.c:553
+#: ../calendar/libecal/e-cal.c:4033
+#: ../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 "
 "\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
 "\"classification\""
 msgstr ""
+"\"%s\" ×?×¦×?×¤×?×?×? ×©×?×?×¨×?×?×?× ×? ×?×¨×?×©×?×? ×?×?×?×? \"any\", \"summary\", \"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 "
 "be a boolean false (#f)"
 msgstr ""
+"\"%s\" ×?×¦×?×¤×?×?×? ×©×?×? ×?×?×¨×?×?×?× ×?×?×? ×?×?×?×? ×?×?×¨×?×?×?×ª ×?×? ×©×?×¨×?×?×?× ×? ×?×?×?×? ×?×?×?×? ×©×§×¨ "
+"×?×?×?×?×?×?× ×? (#f)"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:101
+#: ../calendar/libedata-cal/e-cal-backend-util.c:111
 msgid "Invalid range"
 msgstr "×?×?×?×? ×©×?×?×?"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
+#: ../calendar/libedata-cal/e-cal-backend-util.c:123
 msgid "Unsupported field"
 msgstr "×©×?×? ×?×? × ×ª×?×?"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../calendar/libedata-cal/e-cal-backend-util.c:125
 msgid "Unsupported method"
 msgstr "×©×?×?×? ×?×? × ×ª×?×?×ª"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
+#: ../calendar/libedata-cal/e-cal-backend-util.c:127
 msgid "Unsupported authentication method"
 msgstr "×©×?×?×ª ×?×?×?×?×ª ×?×? × ×ª×?×?×ª"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
+#: ../calendar/libedata-cal/e-cal-backend-util.c:129
 msgid "TLS not available"
 msgstr "â??TLS ×?×? ×?×?×?×?"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
+#: ../calendar/libedata-cal/e-cal-backend-util.c:135
 msgid "Offline mode unavailable"
 msgstr "â??×?×¦×? ×?×?-×?×§×?×?×? ×?×? ×?×?×?×?"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
+#: ../calendar/libedata-cal/e-cal-backend-util.c:137
 msgid "Search size limit exceeded"
-msgstr ""
+msgstr "×?×?×?×? ×?×?×?×¤×?×© ×?×¨×? ×?×?×?×?×?×?"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
+#: ../calendar/libedata-cal/e-cal-backend-util.c:139
 msgid "Search time limit exceeded"
-msgstr ""
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
-msgid "Invalid query"
-msgstr "×©×?×?×?×ª×? ×©×?×?×?×?"
+msgstr "×?×?×? ×?×?×?×¤×?×© ×?×¨×? ×?×?×?×?×?×?"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
+#: ../calendar/libedata-cal/e-cal-backend-util.c:143
 msgid "Query refused"
 msgstr "×©×?×?×?×ª×? × ×?×?×ª×?"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:140
+#: ../calendar/libedata-cal/e-cal-backend-util.c:150
 msgid "Invalid server version"
 msgstr "×?×?×¨×¡×ª ×©×¨×ª ×©×?×?×?×?"
 
-#: ../camel/camel-cipher-context.c:102
+#: ../calendar/libedata-cal/e-data-cal.c:501
+#, c-format
+msgid "Cannot retrieve calendar address"
+msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×?×ª×?×?×ª ×?×?×?×?×?"
+
+#: ../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:537
+#, c-format
+msgid "Cannot retrieve calendar's ldap attribute"
+msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×?×?×¤×?×?×? ×?Ö¾ldap ×©×? ×?×?×? ×?×©× ×?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:555
+#, c-format
+msgid "Cannot retrieve calendar scheduling information"
+msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×ª × ×ª×?× ×? ×?×ª×?×?×?×? ×©×? ×?×?×? ×?×©× ×?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:572
+#, c-format
+msgid "Cannot open calendar"
+msgstr "×?×? × ×?×ª×? ×?×¤×ª×?×? ×?×ª ×?×?×? ×?×©× ×?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:591
+#, c-format
+msgid "Cannot refresh calendar"
+msgstr "×?×? × ×?×ª×? ×?×¨×¢× ×? ×?×ª ×?×?×? ×?×©× ×?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:608
+#, c-format
+msgid "Cannot remove calendar"
+msgstr "×?×? × ×?×ª×? ×?×?×¡×?×¨ ×?×ª ×?×?×? ×?×©× ×?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:627
+#, c-format
+msgid "Cannot create calendar object"
+msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×¤×¨×?×? ×?×?×?×? ×?×©× ×?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:649
+#, c-format
+msgid "Cannot modify calendar object"
+msgstr "×?×? × ×?×ª×? ×?×©× ×?×ª ×?×ª ×?×¤×¨×?×? ×?×?×?×? ×?×©× ×?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:673
+#, c-format
+msgid "Cannot remove calendar object"
+msgstr "×?×? × ×?×ª×? ×?×?×¡×?×¨ ×¤×¨×?×? ×?×?×?×? ×?×©× ×?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:692
+#, c-format
+msgid "Cannot receive calendar objects"
+msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×¤×¨×?×?×? ×?×?×? ×?×©× ×?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:709
+#, c-format
+msgid "Cannot discard calendar alarm"
+msgstr "×?×? × ×?×ª×? ×?×?×ª×¢×?×? ×?×?×?×ª×¨×¢×? ×?×?×?×? ×?×©× ×?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:728
+#, c-format
+msgid "Cannot send calendar objects"
+msgstr "×?×? × ×?×ª×? ×?×©×?×?×? ×¤×¨×?×?×?×? ×?×?×?×? ×?×©× ×?"
+
+#: ../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:781
+#, c-format
+msgid "Cannot retrieve calendar object path"
+msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×ª × ×ª×?×? ×¤×¨×?×? ×?×?×? ×?×©× ×?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:799
+#, c-format
+msgid "Cannot retrieve calendar object list"
+msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×¨×©×?×?×ª ×¤×¨×?×?×? ×?×?×? ×?×©× ×?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:837
+#, c-format
+msgid "Could not retrieve attachment list"
+msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×¨×©×?×?×ª ×?×§×?×¦×?×? ×?×?×¦×?×¨×¤×?×?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:859
+#, c-format
+msgid "Could not complete calendar query"
+msgstr "×?×? × ×?×ª×? ×?×?×©×?×?×? ×?×ª ×?×©×?×?×?×ª×? ×?×?×?×? ×?×©× ×?"
+
+#: ../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:895
+#, c-format
+msgid "Could not add calendar time zone"
+msgstr "×?×? × ×?×ª×? ×?×?×?×¡×?×£ ×?×?×?×¨ ×?×?×? ×?×?×?×? ×?×©× ×?"
+
+#: ../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:933
+#, c-format
+msgid "Cannot retrieve calendar changes"
+msgstr "×?×? × ×?×ª×? ×?×§×?×? ×©×?× ×?×?×?×? ×?×?×?×? ×?×©× ×?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:983
+#, c-format
+msgid "Cannot retrieve calendar free/busy list"
+msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×¨×©×?×?×ª ×?×¢×?×¡×?×§/×¤× ×?×? ×©×? ×?×?×? ×?×©× ×?"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:340
+#, c-format
+msgid "Invalid URI"
+msgstr "×?×ª×?×?×ª ×©×?×?×?×?"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:351
+#, c-format
+msgid "No backend factory for '%s' of '%s'"
+msgstr ""
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:391
+#, c-format
+msgid "Could not instantiate backend"
+msgstr "×?×? × ×?×ª×? ×?×?×¤×¢×?×? ×?×ª ×?×?× ×?× ×?×?"
+
+#: ../camel/camel-cipher-context.c:74
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: ../camel/camel-cipher-context.c:128
+#: ../camel/camel-cipher-context.c:109
 msgid "Signing message"
 msgstr "×?×?×ª×? ×¢×? ×?×?×?×¢×?"
 
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:129
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: ../camel/camel-cipher-context.c:171
+#: ../camel/camel-cipher-context.c:162
 msgid "Verifying message"
 msgstr "×?×?×?×?×? ×?×?×?×¢×?"
 
-#: ../camel/camel-cipher-context.c:189
+#: ../camel/camel-cipher-context.c:185
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: ../camel/camel-cipher-context.c:215
+#: ../camel/camel-cipher-context.c:220
 msgid "Encrypting message"
 msgstr "×?×¦×¤×?×? ×?×?×?×¢×?"
 
-#: ../camel/camel-cipher-context.c:232
+#: ../camel/camel-cipher-context.c:242
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: ../camel/camel-cipher-context.c:254
+#: ../camel/camel-cipher-context.c:272
 msgid "Decrypting message"
 msgstr "×?×¤×¢× ×? ×?×?×?×¢×?"
 
-#: ../camel/camel-cipher-context.c:271
+#: ../camel/camel-cipher-context.c:292
 msgid "You may not import keys with this cipher"
 msgstr ""
 
-#: ../camel/camel-cipher-context.c:301
+#: ../camel/camel-cipher-context.c:332
 msgid "You may not export keys with this cipher"
 msgstr ""
 
-#: ../camel/camel-data-cache.c:136
+#: ../camel/camel-data-cache.c:184
 msgid "Unable to create cache path"
 msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×?×ª × ×ª×?×? ×?×?×?×?×?×?"
 
-#: ../camel/camel-data-cache.c:381
+#: ../camel/camel-data-cache.c:494
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "×?×? × ×?×ª×? ×?×?×¡×?×¨ ×?× ×?×¡×ª ×?×?×?×?×?: %sâ??: %s"
 
-#: ../camel/camel-db.c:99
+#: ../camel/camel-db.c:458
 msgid "Insufficient memory"
 msgstr "×?×?×? ×?×¡×¤×?×§ ×?×?×¨×?×?"
 
-#: ../camel/camel-disco-diary.c:198
+#: ../camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1273,7 +1385,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: ../camel/camel-disco-diary.c:261
+#: ../camel/camel-disco-diary.c:259
 #: ../camel/providers/imap/camel-imap-journal.c:299
 #, c-format
 msgid ""
@@ -1282,125 +1394,123 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: ../camel/camel-disco-diary.c:297
+#: ../camel/camel-disco-diary.c:299
 msgid "Resynchronizing with server"
 msgstr "×?×¡×ª× ×?×¨×? ×?×?×?×© ×¢×? ×?×©×¨×ª"
 
-#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:52
-msgid "Copy folder content locally for offline operation"
-msgstr "×?×¢×ª×§ ×ª×?×?×? ×ª×?×§×?×?×? ×?×?×?×¤×? ×?×§×?×?×? ×¢×?×?×¨ ×¤×¢×?×?×? ×?×? ×?×§×?×?× ×ª"
-
-#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:111
+#: ../camel/camel-disco-folder.c:68 ../camel/camel-offline-folder.c:66
 msgid "Downloading new messages for offline mode"
 msgstr "×?×?×¨×?×? ×?×?×?×¢×?×ª ×?×?×©×?×ª ×¢×?×?×¨ ×?×¦×? ×?×? ×?×§×?×?×?"
 
-#: ../camel/camel-disco-folder.c:469
+#: ../camel/camel-disco-folder.c:346
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "×?×?×?×? ×?×ª ×?×ª×?×§×?×?×? '%s' ×?×?×¦×? ×?×? ×?×§×?×?×?"
 
-#: ../camel/camel-disco-store.c:403
-#: ../camel/providers/groupwise/camel-groupwise-store.c:226
-#: ../camel/providers/imap/camel-imap-store.c:1003
-#: ../camel/providers/imap/camel-imap-store.c:1813
-#: ../camel/providers/imap/camel-imap-store.c:2229
-#: ../camel/providers/imap/camel-imap-store.c:2997
+#: ../camel/camel-disco-folder.c:412 ../camel/camel-offline-folder.c:225
+msgid "Copy folder content locally for offline operation"
+msgstr "×?×¢×ª×§ ×ª×?×?×? ×ª×?×§×?×?×? ×?×?×?×¤×? ×?×§×?×?×? ×¢×?×?×¨ ×¤×¢×?×?×? ×?×? ×?×§×?×?× ×ª"
+
+#: ../camel/camel-disco-store.c:376
+#: ../camel/providers/groupwise/camel-groupwise-store.c:228
+#: ../camel/providers/imap/camel-imap-store.c:894
+#: ../camel/providers/imap/camel-imap-store.c:1798
+#: ../camel/providers/imap/camel-imap-store.c:2256
+#: ../camel/providers/imap/camel-imap-store.c:3100
+#: ../camel/providers/imapx/camel-imapx-store.c:172
+#: ../camel/providers/imapx/camel-imapx-store.c:651
+#: ../camel/providers/imapx/camel-imapx-store.c:713
+#: ../camel/providers/imapx/camel-imapx-store.c:764
 msgid "You must be working online to complete this operation"
 msgstr "×¢×?×?×? ×?×?×?×?×ª ×?×?×¦×? ×?×§×?×?×? ×¢×? ×?× ×ª ×?×?×©×?×?×? ×?×ª ×¤×¢×?×?×? ×?×?×ª"
 
-#: ../camel/camel-exception.c:262
+#: ../camel/camel-exception.c:281
 msgid "No description available"
 msgstr "×?×?×? ×ª×?×?×?×¨ ×?×?×?×?"
 
-#: ../camel/camel-filter-driver.c:785
+#: ../camel/camel-filter-driver.c:803 ../camel/camel-filter-search.c:583
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Failed to create child process '%s': %s"
 
-#: ../camel/camel-filter-driver.c:827
+#: ../camel/camel-filter-driver.c:846
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Invalid message stream received from %s: %s"
 
-#: ../camel/camel-filter-driver.c:1016 ../camel/camel-filter-driver.c:1025
+#: ../camel/camel-filter-driver.c:1035 ../camel/camel-filter-driver.c:1044
 msgid "Syncing folders"
 msgstr "×?×¡× ×?×¨×? ×ª×?×§×?×?×ª"
 
-#: ../camel/camel-filter-driver.c:1114 ../camel/camel-filter-driver.c:1520
+#: ../camel/camel-filter-driver.c:1132 ../camel/camel-filter-driver.c:1559
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error parsing filter: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1123 ../camel/camel-filter-driver.c:1529
+#: ../camel/camel-filter-driver.c:1142 ../camel/camel-filter-driver.c:1569
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error executing filter: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1211
+#: ../camel/camel-filter-driver.c:1234
 msgid "Unable to open spool folder"
 msgstr "Unable to open spool folder"
 
-#: ../camel/camel-filter-driver.c:1220
+#: ../camel/camel-filter-driver.c:1245
 msgid "Unable to process spool folder"
 msgstr "Unable to process spool folder"
 
-#: ../camel/camel-filter-driver.c:1236
+#: ../camel/camel-filter-driver.c:1262
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "×?×§×?×? ×?×?×?×¢×? %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1240
+#: ../camel/camel-filter-driver.c:1268
 msgid "Cannot open message"
 msgstr "×?×? ×?×?×?×? ×?×¤×ª×?×? ×?×ª ×?×?×?×?×¢×?"
 
-#: ../camel/camel-filter-driver.c:1241 ../camel/camel-filter-driver.c:1259
+#: ../camel/camel-filter-driver.c:1269 ../camel/camel-filter-driver.c:1290
 #, c-format
 msgid "Failed on message %d"
 msgstr "× ×?×©×? ×?×?×?×?×¢×? %d"
 
-#: ../camel/camel-filter-driver.c:1273 ../camel/camel-filter-driver.c:1364
+#: ../camel/camel-filter-driver.c:1304 ../camel/camel-filter-driver.c:1401
 msgid "Syncing folder"
 msgstr "×?×¡× ×?×¨×? ×ª×?×§×?×?×?"
 
-#: ../camel/camel-filter-driver.c:1277 ../camel/camel-filter-driver.c:1369
+#: ../camel/camel-filter-driver.c:1308 ../camel/camel-filter-driver.c:1406
 msgid "Complete"
-msgstr ""
+msgstr "×?×?×©×?×?"
 
-#: ../camel/camel-filter-driver.c:1334
+#: ../camel/camel-filter-driver.c:1368
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "×?×§×?×? ×?×?×?×¢×? %d ×?×ª×?×? %d"
 
-#: ../camel/camel-filter-driver.c:1349
+#: ../camel/camel-filter-driver.c:1386
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "× ×?×©×? ×?×?×?×?×¢×? %d ×?×ª×?×? %d"
 
-#: ../camel/camel-filter-search.c:138
+#: ../camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "× ×?×©×? ×?×§×?×?×ª ×?×?×?×¢×?"
 
-#: ../camel/camel-filter-search.c:401
+#: ../camel/camel-filter-search.c:402
 msgid "Invalid arguments to (system-flag)"
 msgstr ""
 
-#: ../camel/camel-filter-search.c:416
+#: ../camel/camel-filter-search.c:417
 msgid "Invalid arguments to (user-tag)"
 msgstr ""
 
-#: ../camel/camel-filter-search.c:581
-#, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "Failed to create create child process '%s': %s"
-
-#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:737 ../camel/camel-filter-search.c:745
+#: ../camel/camel-filter-search.c:742 ../camel/camel-filter-search.c:751
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error executing filter search: %s: %s"
 
-#: ../camel/camel-folder-search.c:335 ../camel/camel-folder-search.c:437
-#: ../camel/camel-folder-search.c:574
+#: ../camel/camel-folder-search.c:346 ../camel/camel-folder-search.c:458
+#: ../camel/camel-folder-search.c:628
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1409,8 +1519,8 @@ msgstr ""
 "×?×? × ×?×ª×? ×?×¤×¨×§ ×?×ª ×?×?×?×?×? ×?×?×?×¤×?×©: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:447
-#: ../camel/camel-folder-search.c:584
+#: ../camel/camel-folder-search.c:359 ../camel/camel-folder-search.c:471
+#: ../camel/camel-folder-search.c:641
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1419,77 +1529,62 @@ msgstr ""
 "×©×?×?×?×? ×?×?×¤×¢×?×ª ×?×?×?×?×? ×?×?×?×¤×?×©: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:776 ../camel/camel-folder-search.c:819
+#: ../camel/camel-folder-search.c:841 ../camel/camel-folder-search.c:883
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr ""
 
-#: ../camel/camel-folder-search.c:872
+#: ../camel/camel-folder-search.c:936
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr ""
 
-#: ../camel/camel-folder-search.c:878 ../camel/camel-folder-search.c:885
+#: ../camel/camel-folder-search.c:942 ../camel/camel-folder-search.c:949
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr ""
 
-#: ../camel/camel-folder-search.c:912
+#: ../camel/camel-folder-search.c:976
 #, c-format
 msgid "(%s) expects an array result"
 msgstr ""
 
-#: ../camel/camel-folder-search.c:921
+#: ../camel/camel-folder-search.c:985
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr ""
 
-#: ../camel/camel-folder-search.c:1016
+#: ../camel/camel-folder.c:126
 #, c-format
-msgid "Performing query on unknown header: %s"
-msgstr ""
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "× ×?×?×?×ª ×?×?×?×¢×ª ×¡×¤×?×? ×?×?×©×? ×ª×?×ª '%s'"
+msgstr[1] "× ×?×?×?×?×ª ×?×?×?×¢×?×ª ×¡×¤×?×? ×?×?×©×?×ª ×ª×?×ª '%s'"
 
-#: ../camel/camel-folder.c:675
+#: ../camel/camel-folder.c:149
 #, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr ""
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "× ×?×?×?×ª ×?×?×?×¢×ª ×¤×¨×¡×?×? ×?×?×©×? ×ª×?×ª '%s'"
+msgstr[1] "× ×?×?×?×?×ª ×?×?×?×¢×?×ª ×¤×¨×¡×?×? ×?×?×©×?×ª ×ª×?×ª '%s'"
 
-#: ../camel/camel-folder.c:1331
+#: ../camel/camel-folder.c:174
 #, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr ""
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "×?×¡×?× × ×ª ×?×?×?×¢×? ×?×?×©×? ×ª×?×ª '%s'"
+msgstr[1] "×?×¡×?× × ×?×ª ×?×?×?×¢×?×ª ×?×?×©×?×ª ×ª×?×ª '%s'"
 
-#: ../camel/camel-folder.c:1373
-#, c-format
-msgid "Unsupported operation: count by expression: for %s"
-msgstr ""
-
-#: ../camel/camel-folder.c:1413
-#, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr ""
-
-#: ../camel/camel-folder.c:1529
+#: ../camel/camel-folder.c:689
+#: ../camel/providers/local/camel-maildir-folder.c:375
 msgid "Moving messages"
 msgstr "×?×¢×?×?×¨ ×?×?×?×¢×?×ª"
 
-#: ../camel/camel-folder.c:1529
+#: ../camel/camel-folder.c:691
 msgid "Copying messages"
 msgstr "×?×¢×ª×?×§ ×?×?×?×¢×?×ª"
 
-#: ../camel/camel-folder.c:1875
-msgid "Learning junk"
-msgstr ""
-
-#: ../camel/camel-folder.c:1892
-msgid "Learning non-junk"
-msgstr ""
-
-#: ../camel/camel-folder.c:1911
-msgid "Filtering new message(s)"
-msgstr "×?×¡× ×? ×?×?×?×¢×?×ª ×?×?×©×?×ª"
-
-#: ../camel/camel-gpg-context.c:755
+#: ../camel/camel-gpg-context.c:758
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1500,210 +1595,203 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:770
+#: ../camel/camel-gpg-context.c:775
 msgid "Failed to parse gpg userid hint."
 msgstr "Failed to parse gpg userid hint."
 
-#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:808
+#: ../camel/camel-gpg-context.c:800 ../camel/camel-gpg-context.c:815
 msgid "Failed to parse gpg passphrase request."
 msgstr "Failed to parse gpg passphrase request."
 
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:835
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
 "SmartCard: \"%s\""
 msgstr ""
 
-#: ../camel/camel-gpg-context.c:832
+#: ../camel/camel-gpg-context.c:839
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: ../camel/camel-gpg-context.c:837
-#, fuzzy, c-format
+#: ../camel/camel-gpg-context.c:845
+#, c-format
 msgid "Unexpected request from GnuPG for '%s'"
-msgstr "Unexpected request from GnuPG for `%s'"
+msgstr "×?×§×©×? ×?×?×ª×? ×¦×¤×?×?×? ×?Ö¾GnuPG ×¢×?×?×¨ `%s'"
 
-#: ../camel/camel-gpg-context.c:862 ../camel/camel-gpg-context.c:1068
-#: ../camel/providers/nntp/camel-nntp-store.c:1287
+#: ../camel/camel-gpg-context.c:873 ../camel/camel-gpg-context.c:1156
 msgid "Canceled."
 msgstr "Canceled."
 
-#: ../camel/camel-gpg-context.c:876
+#: ../camel/camel-gpg-context.c:888
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Failed to unlock secret key: 3 bad passphrases given."
 
-#: ../camel/camel-gpg-context.c:884
+#: ../camel/camel-gpg-context.c:900
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Unexpected response from GnuPG: %s"
 
-#: ../camel/camel-gpg-context.c:937
+#: ../camel/camel-gpg-context.c:1031
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Failed to encrypt: No valid recipients specified."
 
-#. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1206 ../camel/camel-gpg-context.c:1334
-#: ../camel/camel-gpg-context.c:1829 ../camel/camel-gpg-context.c:1874
+#: ../camel/camel-gpg-context.c:1310 ../camel/camel-gpg-context.c:1449
+#: ../camel/camel-gpg-context.c:2071 ../camel/camel-gpg-context.c:2123
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Failed to execute gpg: %s"
 
-#: ../camel/camel-gpg-context.c:1302 ../camel/camel-smime-context.c:392
+#: ../camel/camel-gpg-context.c:1415 ../camel/camel-smime-context.c:820
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Could not generate signing data: %s"
 
-#: ../camel/camel-gpg-context.c:1349 ../camel/camel-gpg-context.c:1534
-#: ../camel/camel-gpg-context.c:1619 ../camel/camel-gpg-context.c:1634
-#: ../camel/camel-gpg-context.c:1750 ../camel/camel-gpg-context.c:1765
-#: ../camel/camel-gpg-context.c:1845 ../camel/camel-gpg-context.c:1890
+#: ../camel/camel-gpg-context.c:1468 ../camel/camel-gpg-context.c:1714
+#: ../camel/camel-gpg-context.c:1733 ../camel/camel-gpg-context.c:1826
+#: ../camel/camel-gpg-context.c:1845 ../camel/camel-gpg-context.c:1969
+#: ../camel/camel-gpg-context.c:1987 ../camel/camel-gpg-context.c:2090
+#: ../camel/camel-gpg-context.c:2142
 msgid "Failed to execute gpg."
 msgstr "Failed to execute gpg."
 
-#: ../camel/camel-gpg-context.c:1368
-msgid "This is a digitally signed message part"
-msgstr ""
-
-#: ../camel/camel-gpg-context.c:1453 ../camel/camel-gpg-context.c:1459
-#: ../camel/camel-gpg-context.c:1465 ../camel/camel-gpg-context.c:1480
-#: ../camel/camel-smime-context.c:695 ../camel/camel-smime-context.c:706
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-gpg-context.c:1608 ../camel/camel-gpg-context.c:1616
+#: ../camel/camel-gpg-context.c:1624 ../camel/camel-gpg-context.c:1641
+#: ../camel/camel-smime-context.c:942 ../camel/camel-smime-context.c:955
+#: ../camel/camel-smime-context.c:963
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Cannot verify message signature: Incorrect message format"
 
-#: ../camel/camel-gpg-context.c:1519
+#: ../camel/camel-gpg-context.c:1682
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Cannot verify message signature: could not create temp file: %s"
 
-#: ../camel/camel-gpg-context.c:1602
+#: ../camel/camel-gpg-context.c:1807
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Could not generate encrypting data: %s"
 
-#: ../camel/camel-gpg-context.c:1652
+#: ../camel/camel-gpg-context.c:1863
 msgid "This is a digitally encrypted message part"
 msgstr "×?×?×? ×?×?×§ ×©×? ×?×?×?×¢×? ×?×?×¦×¤× ×ª ×?×?×?×?×?×?×?×ª"
 
-#: ../camel/camel-gpg-context.c:1705 ../camel/camel-gpg-context.c:1713
-#: ../camel/camel-gpg-context.c:1732
+#: ../camel/camel-gpg-context.c:1919 ../camel/camel-gpg-context.c:1928
+#: ../camel/camel-gpg-context.c:1950
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Cannot decrypt message: Incorrect message format"
 
-#: ../camel/camel-gpg-context.c:1722
+#: ../camel/camel-gpg-context.c:1939
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Failed to decrypt MIME part: protocol error"
 
-#: ../camel/camel-gpg-context.c:1787 ../camel/camel-smime-context.c:969
+#: ../camel/camel-gpg-context.c:2023 ../camel/camel-smime-context.c:1235
 msgid "Encrypted content"
 msgstr "×ª×?×?×? ×?×?×¦×¤×?"
 
-#: ../camel/camel-gpg-context.c:1806
+#: ../camel/camel-gpg-context.c:2045
 msgid "Unable to parse message content"
 msgstr "Unable to parse message content"
 
-#: ../camel/camel-gpg-context.c:1830 ../camel/camel-gpg-context.c:1875
-#: ../camel/camel-tcp-stream-openssl.c:635
-#: ../camel/providers/imap4/camel-imap4-utils.c:624
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
-#: ../camel/providers/smtp/camel-smtp-transport.c:221
+#: ../camel/camel-gpg-context.c:2072 ../camel/camel-gpg-context.c:2124
+#: ../camel/providers/smtp/camel-smtp-transport.c:115
+#: ../camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Unknown"
 msgstr "×?×? ×?×?×?×¢"
 
-#: ../camel/camel-lock-client.c:104
+#: ../camel/camel-lock-client.c:105
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Cannot build locking helper pipe: %s"
 
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock-client.c:128
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Cannot fork locking helper: %s"
 
-#: ../camel/camel-lock-client.c:204 ../camel/camel-lock-client.c:227
+#: ../camel/camel-lock-client.c:208 ../camel/camel-lock-client.c:234
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "Could not lock '%s': protocol error with lock-helper"
 
-#: ../camel/camel-lock-client.c:217
+#: ../camel/camel-lock-client.c:223
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Could not lock '%s'"
 
-#: ../camel/camel-lock.c:103
+#: ../camel/camel-lock.c:104
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Could not create lock file for %s: %s"
 
-#: ../camel/camel-lock.c:144
+#: ../camel/camel-lock.c:147
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "Timed out trying to get lock file on %s. Try again later."
 
-#: ../camel/camel-lock.c:199
+#: ../camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Failed to get lock using fcntl(2): %s"
 
-#: ../camel/camel-lock.c:262
+#: ../camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Failed to get lock using flock(2): %s"
 
-#: ../camel/camel-movemail.c:106
+#: ../camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Could not check mail file %s: %s"
 
-#: ../camel/camel-movemail.c:119
+#: ../camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Could not open mail file %s: %s"
 
-#: ../camel/camel-movemail.c:127
+#: ../camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Could not open temporary mail file %s: %s"
 
-#: ../camel/camel-movemail.c:156
+#: ../camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Failed to store mail in temp file %s: %s"
 
-#: ../camel/camel-movemail.c:186
+#: ../camel/camel-movemail.c:192
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Could not create pipe: %s"
 
-#: ../camel/camel-movemail.c:198
+#: ../camel/camel-movemail.c:205
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Could not fork: %s"
 
-#: ../camel/camel-movemail.c:236
+#: ../camel/camel-movemail.c:243
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail program failed: %s"
 
-#: ../camel/camel-movemail.c:237
+#: ../camel/camel-movemail.c:244
 msgid "(Unknown error)"
 msgstr "(Unknown error)"
 
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:270
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Error reading mail file: %s"
 
-#: ../camel/camel-movemail.c:271
+#: ../camel/camel-movemail.c:282
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Error writing mail temp file: %s"
 
-#: ../camel/camel-movemail.c:464 ../camel/camel-movemail.c:531
+#: ../camel/camel-movemail.c:478 ../camel/camel-movemail.c:546
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Error copying mail temp file: %s"
@@ -1712,168 +1800,168 @@ msgstr "Error copying mail temp file: %s"
 msgid "parse error"
 msgstr "parse error"
 
-#: ../camel/camel-net-utils.c:505 ../camel/camel-net-utils.c:667
-#: ../camel/camel-net-utils.c:799
-#: ../camel/providers/pop3/camel-pop3-store.c:447
-#: ../camel/providers/pop3/camel-pop3-store.c:547
+#: ../camel/camel-net-utils.c:511 ../camel/camel-net-utils.c:694
+#: ../camel/camel-net-utils.c:842
+#: ../camel/providers/pop3/camel-pop3-store.c:488
+#: ../camel/providers/pop3/camel-pop3-store.c:597
 msgid "Canceled"
 msgstr "Canceled"
 
-#: ../camel/camel-net-utils.c:524
+#: ../camel/camel-net-utils.c:533
 msgid "cannot create thread"
 msgstr "cannot create thread"
 
-#: ../camel/camel-net-utils.c:671
+#: ../camel/camel-net-utils.c:698
 #, c-format
 msgid "Resolving: %s"
 msgstr "×?×¤×¢× ×?: %s"
 
-#: ../camel/camel-net-utils.c:693
+#: ../camel/camel-net-utils.c:720
 msgid "Host lookup failed"
 msgstr "× ×?×©×? ×?×?×¦×?×?×ª ×?×?×?×¨×?"
 
-#: ../camel/camel-net-utils.c:695
+#: ../camel/camel-net-utils.c:724
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "Host lookup failed: %s: %s"
 
-#: ../camel/camel-net-utils.c:803
+#: ../camel/camel-net-utils.c:846
 msgid "Resolving address"
 msgstr "×?×¤×¢× ×? ×?×ª×?×?×ª"
 
-#: ../camel/camel-net-utils.c:823
+#: ../camel/camel-net-utils.c:866
 msgid "Name lookup failed"
 msgstr "×?×?×¤×?×© ×©×? × ×?×©×?"
 
-#: ../camel/camel-net-utils.c:826
+#: ../camel/camel-net-utils.c:871
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "Name lookup failed: %s"
 
-#: ../camel/camel-offline-folder.c:254
-#, fuzzy, c-format
+#: ../camel/camel-offline-folder.c:170
+#, c-format
 msgid "Syncing messages in folder '%s' to disk"
-msgstr "×?×¢×ª×?×§ ×?×?×?×¢×?×ª ×?×? ×?×ª×?×§×?×?×? %s"
+msgstr "×?×ª×?×¦×¢ ×¡× ×?×¨×?×? ×©×? ×?×?×?×?×¢×?×ª ×?×ª×?×§×?×?×? '%s' ×¢×? ×?×?×?× ×?"
 
-#: ../camel/camel-offline-journal.c:164 ../camel/camel-offline-journal.c:187
-#, fuzzy, c-format
+#: ../camel/camel-offline-journal.c:143 ../camel/camel-offline-journal.c:168
+#, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
-msgstr "Cannot write offline journal for folder `%s': %s"
+msgstr "×?×? × ×?×ª×? ×?×?×ª×?×? ×?×?×?×? ×?×?×ª×? ×?×§×?×?×? ×¢×?×?×¨ ×?×ª×?×§×?×?×? '%s':â?? %s"
 
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:59
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:61
 msgid "For reading mail as a query of another set of folders"
 msgstr "×¢×? × ×?×ª ×?×§×¨×?×? ×?×?×?×¨ ×?×©×?×?×?×ª×? ×?×§×?×?×¦×ª ×ª×?×§×?×?×ª ×?×?×¨×ª"
 
-#: ../camel/camel-provider.c:184
+#: ../camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Could not load %s: Module loading not supported on this system."
 
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:198
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Could not load %s: %s"
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:207
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Could not load %s: No initialization code in module."
 
-#: ../camel/camel-provider.c:373 ../camel/camel-session.c:177
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:206
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "No provider available for protocol '%s'"
 
-#: ../camel/camel-sasl-anonymous.c:37
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "×?× ×?× ×?×?×?"
 
-#: ../camel/camel-sasl-anonymous.c:39
+#: ../camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
 msgstr ""
 
-#: ../camel/camel-sasl-anonymous.c:124 ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:68
 msgid "Authentication failed."
 msgstr "×?×?×?×?×?×ª × ×?×©×?."
 
-#: ../camel/camel-sasl-anonymous.c:133
+#: ../camel/camel-sasl-anonymous.c:78
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
 "%s"
 msgstr ""
 
-#: ../camel/camel-sasl-anonymous.c:145
+#: ../camel/camel-sasl-anonymous.c:91
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
 "%s"
 msgstr ""
 
-#: ../camel/camel-sasl-anonymous.c:157
+#: ../camel/camel-sasl-anonymous.c:104
 #, c-format
 msgid ""
 "Invalid trace information:\n"
 "%s"
 msgstr ""
 
-#: ../camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:45
 msgid "CRAM-MD5"
 msgstr "â??CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:40
+#: ../camel/camel-sasl-cram-md5.c:47
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
 
-#: ../camel/camel-sasl-digest-md5.c:48
+#: ../camel/camel-sasl-digest-md5.c:56
 msgid "DIGEST-MD5"
 msgstr "â??DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:50
+#: ../camel/camel-sasl-digest-md5.c:58
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
 
-#: ../camel/camel-sasl-digest-md5.c:845
+#: ../camel/camel-sasl-digest-md5.c:817
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Server challenge too long (>2048 octets)"
 
-#: ../camel/camel-sasl-digest-md5.c:854
+#: ../camel/camel-sasl-digest-md5.c:827
 msgid "Server challenge invalid\n"
 msgstr "Server challenge invalid\n"
 
-#: ../camel/camel-sasl-digest-md5.c:860
+#: ../camel/camel-sasl-digest-md5.c:834
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "Server challenge contained invalid \"Quality of Protection\" token"
 
-#: ../camel/camel-sasl-digest-md5.c:890
+#: ../camel/camel-sasl-digest-md5.c:865
 msgid "Server response did not contain authorization data"
 msgstr "Server response did not contain authorization data"
 
-#: ../camel/camel-sasl-digest-md5.c:908
+#: ../camel/camel-sasl-digest-md5.c:885
 msgid "Server response contained incomplete authorization data"
 msgstr "Server response contained incomplete authorization data"
 
-#: ../camel/camel-sasl-digest-md5.c:918
+#: ../camel/camel-sasl-digest-md5.c:897
 msgid "Server response does not match"
 msgstr "Server response does not match"
 
-#: ../camel/camel-sasl-gssapi.c:64
+#: ../camel/camel-sasl-gssapi.c:82
 msgid "GSSAPI"
 msgstr "â??GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:66
+#: ../camel/camel-sasl-gssapi.c:84
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr ""
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:121
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -1881,11 +1969,11 @@ msgstr ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
 
-#: ../camel/camel-sasl-gssapi.c:169
+#: ../camel/camel-sasl-gssapi.c:126
 msgid "The provided target_name parameter was ill-formed."
 msgstr "The provided target_name parameter was ill-formed."
 
-#: ../camel/camel-sasl-gssapi.c:172
+#: ../camel/camel-sasl-gssapi.c:129
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
@@ -1893,7 +1981,7 @@ msgstr ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../camel/camel-sasl-gssapi.c:133
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -1901,7 +1989,7 @@ msgstr ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
 
-#: ../camel/camel-sasl-gssapi.c:181
+#: ../camel/camel-sasl-gssapi.c:138
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
@@ -1909,7 +1997,7 @@ msgstr ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../camel/camel-sasl-gssapi.c:142
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -1917,115 +2005,99 @@ msgstr ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
 
-#: ../camel/camel-sasl-gssapi.c:190
+#: ../camel/camel-sasl-gssapi.c:147
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "The supplied context handle did not refer to a valid context."
 
-#: ../camel/camel-sasl-gssapi.c:193
+#: ../camel/camel-sasl-gssapi.c:150
 msgid "The consistency checks performed on the input_token failed."
 msgstr "The consistency checks performed on the input_token failed."
 
-#: ../camel/camel-sasl-gssapi.c:196
+#: ../camel/camel-sasl-gssapi.c:153
 msgid "The consistency checks performed on the credential failed."
 msgstr "The consistency checks performed on the credential failed."
 
-#: ../camel/camel-sasl-gssapi.c:199
+#: ../camel/camel-sasl-gssapi.c:156
 msgid "The referenced credentials have expired."
 msgstr "The referenced credentials have expired."
 
-#: ../camel/camel-sasl-gssapi.c:205 ../camel/camel-sasl-gssapi.c:253
-#: ../camel/camel-sasl-gssapi.c:289 ../camel/camel-sasl-gssapi.c:304
-#: ../camel/camel-sasl-kerberos4.c:231
-#: ../camel/providers/imap/camel-imap-store.c:1273
+#: ../camel/camel-sasl-gssapi.c:162 ../camel/camel-sasl-gssapi.c:296
+#: ../camel/camel-sasl-gssapi.c:339 ../camel/camel-sasl-gssapi.c:355
+#: ../camel/providers/imap/camel-imap-store.c:1169
 msgid "Bad authentication response from server."
 msgstr "Bad authentication response from server."
 
-#: ../camel/camel-sasl-gssapi.c:314
+#: ../camel/camel-sasl-gssapi.c:366
 msgid "Unsupported security layer."
 msgstr "Unsupported security layer."
 
-#: ../camel/camel-sasl-kerberos4.c:47
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: ../camel/camel-sasl-kerberos4.c:49
-msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr ""
-
-#: ../camel/camel-sasl-kerberos4.c:174
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:39
 msgid "Login"
-msgstr ""
+msgstr "×?× ×?×¡×?"
 
-#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:38
+#: ../camel/camel-sasl-login.c:41 ../camel/camel-sasl-plain.c:45
 msgid "This option will connect to the server using a simple password."
 msgstr "×?×¤×©×¨×?×ª ×?×?×ª ×ª×ª×?×?×¨ ×?×©×¨×ª ×?×¢×?×¨×ª ×¡×?×¡×?×? ×¤×©×?×?×?."
 
-#: ../camel/camel-sasl-login.c:135
+#: ../camel/camel-sasl-login.c:94
 msgid "Unknown authentication state."
 msgstr "×?×¦×? ×?×?×?×?×ª ×?×? ×?×?×?×¢"
 
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:41
 msgid "NTLM / SPA"
 msgstr "â??NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:36
+#: ../camel/camel-sasl-ntlm.c:43
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
 msgstr ""
 
-#: ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-plain.c:43
 msgid "PLAIN"
 msgstr "×?×§×¡×? ×¤×©×?×?"
 
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:46
 msgid "POP before SMTP"
 msgstr "â??POP ×?×¤× ×? SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:41
+#: ../camel/camel-sasl-popb4smtp.c:48
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr ""
 
-#: ../camel/camel-sasl-popb4smtp.c:106
+#: ../camel/camel-sasl-popb4smtp.c:82
 msgid "POP Source URI"
 msgstr "×?×ª×?×?×ª ×?×§×?×¨ POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:109
+#: ../camel/camel-sasl-popb4smtp.c:88
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr ""
 
-#: ../camel/camel-sasl-popb4smtp.c:114
+#: ../camel/camel-sasl-popb4smtp.c:95
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr ""
 
-#: ../camel/camel-search-private.c:149
+#: ../camel/camel-search-private.c:113
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Regular expression compilation failed: %s: %s"
 
-#: ../camel/camel-service.c:270
+#: ../camel/camel-service.c:97
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' needs a username component"
 
-#: ../camel/camel-service.c:274
+#: ../camel/camel-service.c:101
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' needs a host component"
 
-#: ../camel/camel-service.c:278
+#: ../camel/camel-service.c:105
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' needs a path component"
 
-#: ../camel/camel-session.c:303
+#: ../camel/camel-session.c:261
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2034,373 +2106,233 @@ msgstr ""
 "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×?×ª ×?×¡×¤×¨×?×?×? %s:\n"
 "â??%s"
 
-#: ../camel/camel-session.c:478
-#, fuzzy, c-format
+#: ../camel/camel-session.c:746
+#, c-format
 msgid "Please enter the %s password for %s on host %s."
-msgstr "×?×?× ×¡ ×¡×?×¡×?×? ×¢×?×?×¨ %s"
+msgstr "× ×? ×?×?×?×?×? ×?×ª ×¡×¡×?×ª ×?Ö¾%s ×¢×?×?×¨ %s ×?×?×?×¨×? %s."
 
-#: ../camel/camel-smime-context.c:234 ../camel/camel-smime-context.c:778
+#: ../camel/camel-smime-context.c:346 ../camel/camel-smime-context.c:1037
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "×?×? × ×?×¦×?×? ×ª×¢×?×?×? ×¢×?×?×¨ '%s'"
 
-#: ../camel/camel-smime-context.c:240
+#: ../camel/camel-smime-context.c:374
 msgid "Cannot create CMS message"
 msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×?×?×?×¢×ª CMS"
 
-#: ../camel/camel-smime-context.c:245
+#: ../camel/camel-smime-context.c:379
 msgid "Cannot create CMS signed data"
 msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×?×?×?×¢ CMS ×?×ª×?×?"
 
-#: ../camel/camel-smime-context.c:251
+#: ../camel/camel-smime-context.c:385
 msgid "Cannot attach CMS signed data"
 msgstr "×?×? × ×?×ª×? ×?×¦×¨×£ ×?×?×?×¢ CMS ×?×ª×?×?"
 
-#: ../camel/camel-smime-context.c:258
+#: ../camel/camel-smime-context.c:392
 msgid "Cannot attach CMS data"
 msgstr "×?×? × ×?×ª×? ×?×¦×¨×£ ×?×?×?×¢ CMS"
 
-#: ../camel/camel-smime-context.c:264
+#: ../camel/camel-smime-context.c:398
 msgid "Cannot create CMS Signer information"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:270
+#: ../camel/camel-smime-context.c:404
 msgid "Cannot find certificate chain"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:276
+#: ../camel/camel-smime-context.c:410
 msgid "Cannot add CMS Signing time"
 msgstr "×?×? × ×?×ª×? ×?×?×?×¡×?×£ ×?×?×? ×?×ª×?×?×ª CMS"
 
-#: ../camel/camel-smime-context.c:298 ../camel/camel-smime-context.c:310
+#: ../camel/camel-smime-context.c:434 ../camel/camel-smime-context.c:449
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "×?×? ×§×?×?×?×ª ×ª×¢×?×?×ª  ×?×¦×¤× ×? ×¢×?×?×¨ '%s'"
 
-#: ../camel/camel-smime-context.c:317
+#: ../camel/camel-smime-context.c:456
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:322
+#: ../camel/camel-smime-context.c:461
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:327
+#: ../camel/camel-smime-context.c:466
 msgid "Cannot add encryption certificate"
 msgstr "×?×? × ×?×ª×? ×?×?×?×¡×?×£ ×ª×¢×?×?×ª ×?×¦×¤× ×?"
 
-#: ../camel/camel-smime-context.c:333
+#: ../camel/camel-smime-context.c:472
 msgid "Cannot add CMS Signer information"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:403 ../camel/camel-smime-context.c:851
-msgid "Cannot create encoder context"
-msgstr ""
-
-#: ../camel/camel-smime-context.c:409
-msgid "Failed to add data to CMS encoder"
-msgstr "× ×?×©×? ×?×?×?×¡×¤×ª ×?×?×?×¢ ×?×?×§×?×?×? CMS"
-
-#: ../camel/camel-smime-context.c:414 ../camel/camel-smime-context.c:868
-msgid "Failed to encode data"
-msgstr "× ×?×©×? ×?×?×¦×¤× ×ª ×?×?×?×¢"
-
-#: ../camel/camel-smime-context.c:487
+#: ../camel/camel-smime-context.c:504
 msgid "Unverified"
-msgstr ""
+msgstr "×?×?×ª×? ×?×?×?×?×ª"
 
-#: ../camel/camel-smime-context.c:489
+#: ../camel/camel-smime-context.c:506
 msgid "Good signature"
 msgstr "×?×ª×?×?×? ×?×?×?×?"
 
-#: ../camel/camel-smime-context.c:491
+#: ../camel/camel-smime-context.c:508
 msgid "Bad signature"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:493
+#: ../camel/camel-smime-context.c:510
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:495
+#: ../camel/camel-smime-context.c:512
 msgid "Signing certificate not found"
 msgstr "×ª×¢×?×?×ª ×?×?×ª×?×?×? ×?×? × ×?×¦×?×?"
 
-#: ../camel/camel-smime-context.c:497
+#: ../camel/camel-smime-context.c:514
 msgid "Signing certificate not trusted"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:499
+#: ../camel/camel-smime-context.c:516
 msgid "Signature algorithm unknown"
 msgstr "×?×?×?×?×¨×?×ª×? ×?×?×ª×?×?×? ×?×? ×?×?×?×¢"
 
-#: ../camel/camel-smime-context.c:501
+#: ../camel/camel-smime-context.c:518
 msgid "Signature algorithm unsupported"
 msgstr "×?×?×?×?×¨×?×ª×? ×?×?×ª×?×?×? ×?×? × ×ª×?×?"
 
-#: ../camel/camel-smime-context.c:503
+#: ../camel/camel-smime-context.c:520
 msgid "Malformed signature"
 msgstr "×?×ª×?×?×? ×©×?×?×?×?"
 
-#: ../camel/camel-smime-context.c:505
+#: ../camel/camel-smime-context.c:522
 msgid "Processing error"
 msgstr "×©×?×?×?×ª ×¢×?×?×?×?"
 
-#: ../camel/camel-smime-context.c:542
+#: ../camel/camel-smime-context.c:564
 msgid "No signed data in signature"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:549
+#: ../camel/camel-smime-context.c:569
 msgid "Digests missing from enveloped data"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:562 ../camel/camel-smime-context.c:572
+#: ../camel/camel-smime-context.c:582 ../camel/camel-smime-context.c:593
 msgid "Cannot calculate digests"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:577
+#: ../camel/camel-smime-context.c:600 ../camel/camel-smime-context.c:604
 msgid "Cannot set message digests"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:587 ../camel/camel-smime-context.c:592
+#: ../camel/camel-smime-context.c:614 ../camel/camel-smime-context.c:619
 msgid "Certificate import failed"
 msgstr "×?×?×?×? ×ª×¢×?×?×? × ×?×©×?"
 
-#: ../camel/camel-smime-context.c:602
+#: ../camel/camel-smime-context.c:629
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:605
+#: ../camel/camel-smime-context.c:632
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:609
+#: ../camel/camel-smime-context.c:636
 msgid "Cannot find signature digests"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:625
+#: ../camel/camel-smime-context.c:652
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "×?×?×ª×? %s â??<%s>: â??%sâ??\n"
 
-#: ../camel/camel-smime-context.c:726
+#: ../camel/camel-smime-context.c:831 ../camel/camel-smime-context.c:1109
+msgid "Cannot create encoder context"
+msgstr ""
+
+#: ../camel/camel-smime-context.c:837
+msgid "Failed to add data to CMS encoder"
+msgstr "× ×?×©×? ×?×?×?×¡×¤×ª ×?×?×?×¢ ×?×?×§×?×?×? CMS"
+
+#: ../camel/camel-smime-context.c:842 ../camel/camel-smime-context.c:1126
+msgid "Failed to encode data"
+msgstr "× ×?×©×? ×?×?×¦×¤× ×ª ×?×?×?×¢"
+
+#: ../camel/camel-smime-context.c:977 ../camel/camel-smime-context.c:1214
 msgid "Decoder failed"
 msgstr "×?×¤×¢× ×? × ×?×©×?"
 
-#: ../camel/camel-smime-context.c:785
+#: ../camel/camel-smime-context.c:1044
 msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 
-#. PORT_GetError(); ??
-#: ../camel/camel-smime-context.c:794
+#: ../camel/camel-smime-context.c:1052
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:805
+#: ../camel/camel-smime-context.c:1063
 msgid "Cannot create CMS Message"
 msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×?×?×?×¢×ª CMS"
 
-#: ../camel/camel-smime-context.c:811
+#: ../camel/camel-smime-context.c:1069
 msgid "Cannot create CMS Enveloped data"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:1075
 msgid "Cannot attach CMS Enveloped data"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:823
+#: ../camel/camel-smime-context.c:1081
 msgid "Cannot attach CMS data object"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:832
+#: ../camel/camel-smime-context.c:1090
 msgid "Cannot create CMS Recipient information"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:837
+#: ../camel/camel-smime-context.c:1095
 msgid "Cannot add CMS Recipient information"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:862
+#: ../camel/camel-smime-context.c:1120
 msgid "Failed to add data to encoder"
 msgstr "× ×?×©×? ×?×?×?×¡×¤×¥ ×?×?×?×¢ ×?×?×§×?×?×?"
 
-#: ../camel/camel-smime-context.c:949
-#, c-format
-msgid "Decoder failed, error %d"
-msgstr "×?×¤×¢× ×? × ×?×©×?, ×©×?×?×?×? %d"
-
-#: ../camel/camel-smime-context.c:956
+#: ../camel/camel-smime-context.c:1221
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:983
-msgid "import keys: unimplemented"
-msgstr "×?×?×?×? ×?×¤×ª×?×?×ª: ×?×? ×?×?×?×?×©"
-
-#: ../camel/camel-smime-context.c:991
-msgid "export keys: unimplemented"
-msgstr "×?×¦×?×? ×?×¤×ª×?×?×ª: ×?×? ×?×?×?×?×©"
-
-#: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:174
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr ""
-
-#: ../camel/camel-store.c:316
-#, fuzzy, c-format
+#: ../camel/camel-store.c:426
+#, c-format
 msgid "Cannot create folder '%s': folder exists"
-msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
-
-#: ../camel/camel-store.c:380
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr ""
+msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×?×ª ×?×ª×?×§×?×?×? '%s': ×?×ª×?×§×?×?×? ×?×?×¨ ×§×?×?×?×ª"
 
-#: ../camel/camel-store.c:408
+#: ../camel/camel-store.c:520
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×ª×?×§×?×?×?: %s: ×ª×?×§×?×?×? ×§×?×?×?×ª"
 
-#: ../camel/camel-store.c:472 ../camel/camel-vee-store.c:384
-#: ../camel/providers/local/camel-maildir-store.c:219
+#: ../camel/camel-store.c:591 ../camel/camel-vee-store.c:261
+#: ../camel/providers/local/camel-maildir-store.c:218
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "×?×? × ×?×ª×? ×?×?×?×?×§ ×ª×?×§×?×?×?: %s: ×¤×¢×?×?×? ×¤×¡×?×?×?"
 
-#: ../camel/camel-store.c:529 ../camel/camel-vee-store.c:421
-#: ../camel/providers/local/camel-maildir-store.c:291
+#: ../camel/camel-store.c:655 ../camel/camel-vee-store.c:213
+#: ../camel/providers/local/camel-maildir-store.c:305
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "×?×? × ×?×ª×? ×?×©× ×?×ª ×©×? ×ª×?×§×?×?×?: %s: ×¤×¢×?×?×? ×¤×¡×?×?×?"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:884 ../camel/camel-vtrash-folder.c:54
-#: ../camel/providers/imap/camel-imap-store.c:1061
+#: ../camel/camel-store.c:1086 ../camel/camel-vtrash-folder.c:49
 msgid "Trash"
 msgstr "×?×©×¤×?"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:887 ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-store.c:1089 ../camel/camel-vtrash-folder.c:51
 msgid "Junk"
 msgstr "×?×?×?×¨ ×?×?×?"
 
-#: ../camel/camel-tcp-stream-openssl.c:572
-msgid "Unable to get issuer's certificate"
-msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×ª×¢×?×?×ª ×?×?× ×¤×?×§"
-
-#: ../camel/camel-tcp-stream-openssl.c:574
-msgid "Unable to get Certificate Revocation List"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-openssl.c:576
-msgid "Unable to decrypt certificate signature"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-openssl.c:578
-msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-openssl.c:580
-msgid "Unable to decode issuer's public key"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-openssl.c:582
-msgid "Certificate signature failure"
-msgstr "×©×?×?×?×ª ×?×ª×?×?×ª ×?×?×?×¢×?"
-
-#: ../camel/camel-tcp-stream-openssl.c:584
-msgid "Certificate Revocation List signature failure"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-openssl.c:586
-msgid "Certificate not yet valid"
-msgstr "×?×ª×¢×?×?×? ×¢×?×?×?×? ×?×? ×?×ª×?×§×£"
-
-#: ../camel/camel-tcp-stream-openssl.c:588
-msgid "Certificate has expired"
-msgstr "×¤×? ×ª×?×§×£ ×?×ª×¢×?×?×?"
-
-#: ../camel/camel-tcp-stream-openssl.c:590
-msgid "CRL not yet valid"
-msgstr "×?-CRL ×¢×?×?×?×? ×?×? ×?×ª×?×§×£"
-
-#: ../camel/camel-tcp-stream-openssl.c:592
-msgid "CRL has expired"
-msgstr "×¤×? ×ª×?×§×£ ×?-CRL"
-
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Error in CRL"
-msgstr "×©×?×?×?×? ×?-CRL"
-
-#: ../camel/camel-tcp-stream-openssl.c:599
-msgid "Out of memory"
-msgstr "×?×?×? ×?×?×¨×?×?"
-
-#: ../camel/camel-tcp-stream-openssl.c:601
-msgid "Zero-depth self-signed certificate"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-openssl.c:603
-msgid "Self-signed certificate in chain"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-openssl.c:605
-msgid "Unable to get issuer's certificate locally"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-openssl.c:607
-msgid "Unable to verify leaf signature"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-openssl.c:609
-msgid "Certificate chain too long"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-openssl.c:611
-msgid "Certificate Revoked"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-openssl.c:613
-msgid "Invalid Certificate Authority (CA)"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-openssl.c:615
-msgid "Path length exceeded"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-openssl.c:617
-msgid "Invalid purpose"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-openssl.c:619
-msgid "Certificate untrusted"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-openssl.c:621
-msgid "Certificate rejected"
-msgstr "×?×ª×¢×?×?×? × ×?×?×ª×?"
-
-#: ../camel/camel-tcp-stream-openssl.c:624
-msgid "Subject/Issuer mismatch"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-openssl.c:626
-msgid "AKID/SKID mismatch"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-openssl.c:628
-msgid "AKID/Issuer serial mismatch"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-openssl.c:630
-msgid "Key usage does not support certificate signing"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-openssl.c:633
-msgid "Error in application verification"
-msgstr "×©×?×?×?×? ×?×?×?×?×?×?×? ×?×?×?×©×?×?"
-
-#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-ssl.c:762
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2413,28 +2345,16 @@ msgstr ""
 "×?×?×?×¢×ª ×?×¦×?×¢:       %s\n"
 "×?×ª×?×?×?:            %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-ssl.c:768
 msgid "GOOD"
 msgstr "×?×?×?"
 
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-ssl.c:768
 msgid "BAD"
 msgstr "×?×? ×?×?×?"
 
-#: ../camel/camel-tcp-stream-openssl.c:708
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
-msgstr ""
-
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:890
+#: ../camel/camel-tcp-stream-ssl.c:772
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2449,7 +2369,7 @@ msgstr ""
 "\n"
 "×?×§×?×??"
 
-#: ../camel/camel-tcp-stream-ssl.c:934
+#: ../camel/camel-tcp-stream-ssl.c:816
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2458,14 +2378,14 @@ msgstr ""
 "×?×¢×?×?×? ×?×ª×¢×?×?×?: %s\n"
 "×?× ×¤×?×§: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:986
+#: ../camel/camel-tcp-stream-ssl.c:868
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-ssl.c:1004
+#: ../camel/camel-tcp-stream-ssl.c:886
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2474,637 +2394,611 @@ msgstr ""
 "×¤×? ×ª×?×§×£ ×?×ª×¢×?×?×?: %s\n"
 "×?× ×¤×?×§: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1021
+#: ../camel/camel-tcp-stream-ssl.c:903
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:315
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "×?×? × ×?×ª×? ×?×¤×¨×§ ×?×ª ×?×?×ª×?×?×ª '%s'"
 
-#: ../camel/camel-vee-folder.c:587
-#, fuzzy, c-format
+#: ../camel/camel-vee-folder.c:1068
+#, c-format
 msgid "Error storing '%s': %s"
-msgstr "Error parsing filter: %s: %s"
+msgstr "×©×?×?×?×? ×?×?×?×¡×?×? '%s':â?? %s"
 
-#: ../camel/camel-vee-folder.c:640
+#: ../camel/camel-vee-folder.c:1141
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: ../camel/camel-vee-folder.c:800 ../camel/camel-vee-folder.c:806
+#: ../camel/camel-vee-folder.c:1157 ../camel/camel-vee-folder.c:1172
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
-#: ../camel/camel-vee-store.c:114 ../camel/camel-vee-store.c:115
-#: ../camel/camel-vee-store.c:360
+#: ../camel/camel-vee-store.c:142 ../camel/camel-vee-store.c:144
+#: ../camel/camel-vee-store.c:414
 msgid "Unmatched"
 msgstr "×?×?×? ×?×ª×?×?×?"
 
-#: ../camel/camel-vee-store.c:407
-#, c-format
-msgid "Cannot delete folder: %s: No such folder"
-msgstr "×?×? × ×?×ª×? ×?×?×?×?×§ ×ª×?×§×?×?×?: %s: ×?×?×? ×?×?×?×ª ×ª×?×§×?×?×?"
-
-#: ../camel/camel-vee-store.c:429
+#: ../camel/camel-vee-store.c:222
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "×?×? × ×?×ª×? ×?×©× ×?×ª ×©×? ×ª×?×§×?×?×?: %s: ×?×?×? ×?×?×?×ª ×ª×?×§×?×?×?"
 
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-vee-store.c:286
+#, c-format
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "×?×? × ×?×ª×? ×?×?×?×?×§ ×ª×?×§×?×?×?: %s: ×?×?×? ×?×?×?×ª ×ª×?×§×?×?×?"
+
+#: ../camel/camel-vtrash-folder.c:50
 msgid "Cannot copy messages to the Trash folder"
 msgstr "×?×? × ×?×ª×? ×?×?×¢×ª×?×§ ×?×?×?×¢×?×ª ×?×ª×?×§×?×?×ª ×?×?×©×¤×?"
 
-#: ../camel/camel-vtrash-folder.c:57
+#: ../camel/camel-vtrash-folder.c:52
 msgid "Cannot copy messages to the Junk folder"
 msgstr "×?×? × ×?×ª×? ×?×?×¢×ª×?×§ ×?×?×?×¢×?×ª ×?×ª×?×§×?×?×ª ×?×?×?×?"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:119
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:138
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:119
-#: ../camel/providers/local/camel-maildir-folder.c:251
-#: ../camel/providers/local/camel-mbox-folder.c:348
-#: ../camel/providers/local/camel-mh-folder.c:204
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:138
+#: ../camel/providers/local/camel-maildir-folder.c:233
+#: ../camel/providers/local/camel-maildir-folder.c:268
+#: ../camel/providers/local/camel-maildir-folder.c:389
+#: ../camel/providers/local/camel-mbox-folder.c:334
+#: ../camel/providers/local/camel-mbox-folder.c:385
+#: ../camel/providers/local/camel-mh-folder.c:221
 msgid "No such message"
 msgstr "×?×?×? ×?×?×?×¢×? ×?×?×?×ª"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:131
-#: ../camel/providers/imap4/camel-imap4-folder.c:812
-#: ../camel/providers/nntp/camel-nntp-folder.c:156
-#: ../camel/providers/nntp/camel-nntp-folder.c:232
-#: ../camel/providers/nntp/camel-nntp-folder.c:392
-#: ../camel/providers/pop3/camel-pop3-folder.c:266
-#: ../camel/providers/pop3/camel-pop3-folder.c:559
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:152
+#: ../camel/providers/pop3/camel-pop3-folder.c:268
 #: ../camel/providers/pop3/camel-pop3-folder.c:620
-#: ../camel/providers/pop3/camel-pop3-folder.c:638
+#: ../camel/providers/pop3/camel-pop3-folder.c:683
+#: ../camel/providers/pop3/camel-pop3-folder.c:705
 msgid "User canceled"
 msgstr "×?×?×©×ª×?×© ×?×?×?×?"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:138
-#: ../camel/providers/imap4/camel-imap4-folder.c:817
-#: ../camel/providers/nntp/camel-nntp-folder.c:147
-#: ../camel/providers/nntp/camel-nntp-folder.c:149
-#: ../camel/providers/nntp/camel-nntp-folder.c:158
-#: ../camel/providers/nntp/camel-nntp-folder.c:234
-#: ../camel/providers/pop3/camel-pop3-folder.c:386
-#: ../camel/providers/pop3/camel-pop3-folder.c:562
-#: ../camel/providers/pop3/camel-pop3-folder.c:623
-#: ../camel/providers/pop3/camel-pop3-folder.c:630
-#: ../camel/providers/pop3/camel-pop3-folder.c:641
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:161
+#: ../camel/providers/nntp/camel-nntp-folder.c:232
+#: ../camel/providers/nntp/camel-nntp-folder.c:236
+#: ../camel/providers/nntp/camel-nntp-folder.c:249
+#: ../camel/providers/nntp/camel-nntp-folder.c:349
+#: ../camel/providers/pop3/camel-pop3-folder.c:400
+#: ../camel/providers/pop3/camel-pop3-folder.c:624
+#: ../camel/providers/pop3/camel-pop3-folder.c:687
+#: ../camel/providers/pop3/camel-pop3-folder.c:695
+#: ../camel/providers/pop3/camel-pop3-folder.c:709
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×?×?×¢×? %s:â?? %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:163
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2228
-#: ../camel/providers/imap4/camel-imap4-folder.c:835
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:179
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:188
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2663
 msgid "This message is not available in offline mode."
 msgstr "×?×?×?×¢×? ×?×? ×?×?× ×? ×?×?×?× ×? ×?×?×¦×? ×?×? ×?×§×?×?×?."
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:175
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:182
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1751
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1802
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:204
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:213
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2132
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2185
 msgid "Could not get message"
 msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×?×?×¢×?"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:841
-#: ../camel/providers/imap/camel-imap-folder.c:251
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1044
+#: ../camel/providers/imap/camel-imap-folder.c:375
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "×?×? × ×?×ª×? ×?×?×¢×?×? ×¡×?×?×?×? ×¢×?×?×¨ %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1094
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1119
+#, c-format
+msgid "Checking for deleted messages %s"
+msgstr "×?×ª×?×¦×¢×ª ×?×?×?×§×? ×?×?×¨ ×?×?×?×¢×?×ª ×©× ×?×?×§×? %s"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1419
 msgid "Trash Folder Full. Please Empty."
 msgstr "×ª×?×§×?×?×ª ×?×?×©×¤×? ×?×?×?×?. × ×? ×?×¨×?×§×? ×?×?×ª×?."
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1287
-#: ../camel/providers/groupwise/camel-groupwise-store.c:609
-#: ../camel/providers/groupwise/camel-groupwise-store.c:735
-#: ../camel/providers/imap/camel-imap-folder.c:3258
-#: ../camel/providers/imap/camel-imap-folder.c:3334
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1661
+#: ../camel/providers/groupwise/camel-groupwise-store.c:639
+#: ../camel/providers/groupwise/camel-groupwise-store.c:776
+#: ../camel/providers/imap/camel-imap-folder.c:3807
+#: ../camel/providers/imap/camel-imap-folder.c:3885
+#: ../camel/providers/imapx/camel-imapx-server.c:3203
+#: ../camel/providers/imapx/camel-imapx-server.c:3299
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2086
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2128
-#, fuzzy, c-format
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2496
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2545
+#, c-format
 msgid "Cannot append message to folder '%s': %s"
-msgstr "×?×¢×ª×?×§ ×?×?×?×¢×?×ª ×?×? ×?×ª×?×§×?×?×? %s"
+msgstr "×?×? × ×?×ª×? ×?×?×?×¡×?×£ ×?×?×?×¢×? ×?×ª×?×§×?×?×? '%s':â?? %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2116
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2531
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×?×?×?×¢×?: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:285
-#, fuzzy, c-format
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:241
+#, c-format
 msgid "Cannot get folder container %s"
-msgstr "×?×? × ×?×ª×? ×?×?×?×?×? ×?×?×© ×§×©×¨."
+msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×?×?×?×? ×?×ª×?×§×?×?×? %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:349
-#: ../camel/providers/imap4/camel-imap4-journal.c:319
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:304
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:365
-#: ../camel/providers/imap4/camel-imap4-journal.c:335
-#, fuzzy, c-format
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:321
+#, c-format
 msgid "Cannot append message in offline mode: %s"
-msgstr "×?×¢×ª×?×§ ×?×?×?×¢×?×ª ×?×? ×?×ª×?×§×?×?×? %s"
+msgstr "×?×? × ×?×ª×? ×?×?×?×¡×?×£ ×?×?×?×¢×? ×?×?×¦×? ×?×?×ª×? ×?×§×?×?×?: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
-#: ../camel/providers/imap4/camel-imap4-provider.c:39
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
 msgid "Checking for new mail"
 msgstr "×?×?×?×§×ª ×?×?×?×¨ ×?×?×©"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
-#: ../camel/providers/hula/camel-hula-provider.c:51
-#: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:41
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:45
 msgid "C_heck for new messages in all folders"
 msgstr "_×?×?×?×§ ×¢×?×?×¨ ×?×?×?×¢×?×ª ×?×?×©×?×ª ×?×?×? ×?×ª×?×§×?×?×ª"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:52
-#: ../camel/providers/local/camel-local-provider.c:46
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:106
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imapx/camel-imapx-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:42
+#: ../camel/providers/local/camel-local-provider.c:82
+#: ../camel/providers/local/camel-local-provider.c:102
 msgid "Options"
 msgstr "×?×¤×©×¨×?×?×?×ª"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:62
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:64
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
 msgid "Check new messages for J_unk contents"
 msgstr "_×?×?×?×§ ×?×?×?×¢×?×ª ×?×?×©×?×ª ×¢×?×?×¨ ×ª×?× ×? ×?×?×?"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
-#: ../camel/providers/imap/camel-imap-provider.c:74
-#, fuzzy
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
+#: ../camel/providers/imap/camel-imap-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:79
 msgid "Only check for Junk messages in the IN_BOX folder"
-msgstr "×?×¢×ª×?×§ ×?×?×?×¢×?×ª ×?×? ×?×ª×?×§×?×?×? %s"
+msgstr "×?×© ×?×?×?×?×§ ×?×?×¨ ×?×?×?×¢×?×ª ×?×?×? ×¨×§ ×?×ª×?×?×ª ×?_×?×?×?×¨ ×?× ×?× ×¡"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:68
-#, fuzzy
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
 msgid "Automatically synchroni_ze account locally"
-msgstr "×?×?×?×§ ×?×? ×§×?×?×? _×?×?×?×¨ ×?×?×© ×?×?"
+msgstr "×¡× ×?×¨×?×? ×?×?×©×?×?×? ×?×?×?×¤×? ×?_×§×?×?×? ×?×?×?×?×?×?×?×ª"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:73
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
 msgid "SOAP Settings"
 msgstr "×?×?×?×¨×?×ª SOAP"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:76
-msgid "Post Office Agent SOAP Port:"
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
+msgid "Post Office Agent SOAP _Port:"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
 msgid "Novell GroupWise"
 msgstr "â??Novell GroupWise"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:91
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "For accessing Novell GroupWise servers"
 msgstr "×¢×?×?×¨ ×?×?×©×? ×?×©×¨×ª×? Novell GroupWise"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
-#: ../camel/providers/hula/camel-hula-provider.c:95
-#: ../camel/providers/imap/camel-imap-provider.c:100
-#: ../camel/providers/imap4/camel-imap4-provider.c:84
-#: ../camel/providers/imapp/camel-imapp-provider.c:67
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:72
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:98
+#: ../camel/providers/imap/camel-imap-provider.c:97
+#: ../camel/providers/imapx/camel-imapx-provider.c:105
+#: ../camel/providers/nntp/camel-nntp-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:70
 msgid "Password"
 msgstr "×¡×?×¡×?×?"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:108
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:100
 msgid ""
 "This option will connect to the GroupWise server using a plaintext password."
 msgstr "×?×¤×©×¨×?×ª ×?×?×ª ×ª×ª×?×?×¨ ×?×©×¨×ª ×?-GroupWise ×?×¢×?×¨×ª ×¡×?×¡×?×ª ×?×§×¡×? ×¤×©×?×?."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:104
+#: ../camel/providers/groupwise/camel-groupwise-store.c:106
 msgid "Host or user not available in url"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:207
-#: ../camel/providers/imap/camel-imap-store.c:1357
+#: ../camel/providers/groupwise/camel-groupwise-store.c:205
+#: ../camel/providers/imap/camel-imap-store.c:1257
+#: ../camel/providers/imapx/camel-imapx-server.c:2510
 msgid "You did not enter a password."
 msgstr "×?×? ×?×?× ×¡×ª ×¡×?×¡×?×?."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:303
+#: ../camel/providers/groupwise/camel-groupwise-store.c:322
 msgid "Some features may not work correctly with your current server version"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:518
-#: ../camel/providers/imap/camel-imap-store.c:1849
-#: ../camel/providers/imap/camel-imap-store.c:2047
+#: ../camel/providers/groupwise/camel-groupwise-store.c:543
+#: ../camel/providers/imap/camel-imap-store.c:1835
+#: ../camel/providers/imap/camel-imap-store.c:2031
+#: ../camel/providers/imapx/camel-imapx-store.c:354
 #, c-format
 msgid "No such folder %s"
 msgstr "×?×ª×?×§×?×?×? %s ×?×? ×§×?×?×?×ª"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1233
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1228
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×ª×?×§×?×?×ª GroupWise ×?×?×¦×? ×?×? ×?×§×?×?×?."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1247
-#: ../camel/providers/imap/camel-imap-store.c:1924
-#: ../camel/providers/imap/camel-imap-store.c:2304
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1246
+#: ../camel/providers/imap/camel-imap-store.c:1912
+#: ../camel/providers/imap/camel-imap-store.c:2331
+#: ../camel/providers/imapx/camel-imapx-store.c:801
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1323
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1344
-#, fuzzy, c-format
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1329
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1354
+#, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
-msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
+msgstr "×?×? × ×?×ª×? ×?×©× ×?×ª ×?×ª ×ª×?×§×?×?×ª ×?Ö¾GroupWise ×?Ö¾'%s' ×?Ö¾'%s'"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1376
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:121
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1388
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:54
 #, c-format
 msgid "GroupWise server %s"
 msgstr "×©×¨×ª GroupWise â??%s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1378
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1390
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:123
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:58
 #, c-format
 msgid "GroupWise mail delivery via %s"
 msgstr "×§×?×?×ª ×?×?×?×¨ GrupWise ×?×¨×? %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:167
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:94
 msgid "Sending Message"
 msgstr "×©×?×?×? ×?×?×?×¢×?"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:221
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:103
+msgid "Cannot get folder: Invalid operation on this store"
+msgstr ""
+
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:148
 msgid ""
 "You have exceeded this account's storage limit. Your messages are queued in "
 "your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
 "of your mail.\n"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:209
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:152
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not send message: %s"
 msgstr "×?×? × ×?×ª×? ×?×©×?×?×? ×?×?×?×¢×?: %s"
 
-#: ../camel/providers/hula/camel-hula-provider.c:49
-#: ../camel/providers/imap/camel-imap-provider.c:44
-msgid "Checking for New Mail"
-msgstr "×?×?×?×§ ×¢×?×?×¨ ×?×?×?×¨ ×?×?×©"
-
-#: ../camel/providers/hula/camel-hula-provider.c:54
-#: ../camel/providers/imap/camel-imap-provider.c:52
-msgid "Connection to Server"
-msgstr "×?×?×?×?×¨ ×?×©×¨×ª"
-
-#: ../camel/providers/hula/camel-hula-provider.c:56
-#: ../camel/providers/imap/camel-imap-provider.c:54
-msgid "_Use custom command to connect to server"
-msgstr "×?×©×ª×?×© ×?_×¤×§×?×?×? ×?×?×ª×?×?×ª ×?×?×©×?×ª ×?×?×ª×?×?×¨×?×ª ×?×©×¨×ª"
-
-#: ../camel/providers/hula/camel-hula-provider.c:58
-#: ../camel/providers/imap/camel-imap-provider.c:56
-msgid "Command:"
-msgstr "×¤×§×?×?×?:"
-
-#: ../camel/providers/hula/camel-hula-provider.c:61
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:44
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid "Folders"
-msgstr "×ª×?×§×?×?×ª"
-
-#: ../camel/providers/hula/camel-hula-provider.c:63
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:46
-msgid "_Show only subscribed folders"
-msgstr ""
-
-#: ../camel/providers/hula/camel-hula-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:48
-msgid "O_verride server-supplied folder namespace"
-msgstr ""
-
-#: ../camel/providers/hula/camel-hula-provider.c:67
-msgid "Namespace"
-msgstr ""
-
-#: ../camel/providers/hula/camel-hula-provider.c:78
-msgid "Hula"
-msgstr "â??Hula"
-
-#: ../camel/providers/hula/camel-hula-provider.c:80
-msgid "For accessing Hula servers"
-msgstr "×¢×?×?×¨ ×?×?×©×? ×?×©×¨×ª×? Hula"
-
-#: ../camel/providers/hula/camel-hula-provider.c:97
-msgid "This option will connect to the Hula server using a plaintext password."
-msgstr "×?×¤×©×¨×?×ª ×?×?×ª ×ª×ª×?×?×¨ ×?×©×¨×ª ×?-Hula ×?×¢×?×¨×ª ×¡×?×¡×?×ª ×?×§×¡×? ×¤×©×?×?."
-
-#: ../camel/providers/imap/camel-imap-command.c:183
-#: ../camel/providers/imap/camel-imap-command.c:267
+#: ../camel/providers/imap/camel-imap-command.c:189
+#: ../camel/providers/imap/camel-imap-command.c:282
 msgid "No output stream"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-command.c:188
-#: ../camel/providers/imap/camel-imap-command.c:272
+#: ../camel/providers/imap/camel-imap-command.c:196
+#: ../camel/providers/imap/camel-imap-command.c:289
 msgid "No input stream"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-command.c:231
-#: ../camel/providers/imap/camel-imap-command.c:280
-#: ../camel/providers/imap/camel-imap-command.c:494
-#: ../camel/providers/imap/camel-imap-store.c:3037
+#: ../camel/providers/imap/camel-imap-command.c:241
+#: ../camel/providers/imap/camel-imap-command.c:298
+#: ../camel/providers/imap/camel-imap-command.c:520
+#: ../camel/providers/imap/camel-imap-store.c:3139
 msgid "Operation cancelled"
 msgstr "×¤×¢×?×?×? ×?×?×?×?×?"
 
-#: ../camel/providers/imap/camel-imap-command.c:333
-#: ../camel/providers/imap/camel-imap-store.c:3040
+#: ../camel/providers/imap/camel-imap-command.c:353
+#: ../camel/providers/imap/camel-imap-store.c:3147
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "×?×©×¨×ª ×?×ª× ×ª×§ ×?×¤×ª×?×?×?×?×?×ª: %s"
 
 #. for imap ALERT codes, account user host
 #. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:354
+#: ../camel/providers/imap/camel-imap-command.c:373
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
 "%s"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-command.c:423
+#: ../camel/providers/imap/camel-imap-command.c:443
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "×ª×?×?×?×? ×?×?×ª×? ×¦×¤×?×?×? ×?×©×¨×ª IMAP: â??%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:433
+#: ../camel/providers/imap/camel-imap-command.c:454
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "×¤×§×?×?×ª IMAP × ×?×©×?×?: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:508
+#: ../camel/providers/imap/camel-imap-command.c:536
 msgid "Server response ended too soon."
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-command.c:715
+#: ../camel/providers/imap/camel-imap-command.c:743
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-command.c:751
+#: ../camel/providers/imap/camel-imap-command.c:780
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "×ª×?×?×?×ª OK ×?×?×ª×? ×¦×¤×?×?×? ×?×©×¨×ª IMAP: â??%s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:89
+#: ../camel/providers/imap/camel-imap-folder.c:281
 msgid "Always check for new mail in this folder"
 msgstr "×?×?×?×§ ×ª×?×?×? ×¢×?×?×¨ ×?×?×?×¨ ×?×?×© ×?×ª×?×§×?×?×? ×?×?×ª"
 
-#: ../camel/providers/imap/camel-imap-folder.c:232
+#: ../camel/providers/imap/camel-imap-folder.c:352
 #, 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:867
+#: ../camel/providers/imap/camel-imap-folder.c:953
+#: ../camel/providers/imapx/camel-imapx-server.c:3237
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "×¡×?×¨×§ ×¢×?×?×¨ ×?×?×?×¢×?×ª ×©×?×©×ª× ×? ×?-%s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1898
+#: ../camel/providers/imap/camel-imap-folder.c:2246
 #, c-format
 msgid "Unexpected response status '%s' after APPEND command"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-folder.c:1913
+#: ../camel/providers/imap/camel-imap-folder.c:2264
 msgid "No response on continuation after APPEND command"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-folder.c:1955
+#: ../camel/providers/imap/camel-imap-folder.c:2317
 msgid "Unknown error occurred during APPEND command!"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-folder.c:2785
+#: ../camel/providers/imap/camel-imap-folder.c:3234
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×?×?×¢×?: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2826
-#, fuzzy, c-format
+#: ../camel/providers/imap/camel-imap-folder.c:3269
+#: ../camel/providers/imapx/camel-imapx-server.c:4250
+#, c-format
 msgid "Cannot get message with message ID %s: %s"
-msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×?×?×¢×? %s:â?? %s"
+msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×?×?×¢×? ×¢×? ×?×?×?×? ×?×?×?×¢×? %s:â?? %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2827
+#: ../camel/providers/imap/camel-imap-folder.c:3270
+#: ../camel/providers/imapx/camel-imapx-server.c:4251
 msgid "No such message available."
 msgstr "×?×?×?×¢×? ×?×?×?×ª ×?×?× ×? ×?×?×?× ×?."
 
-#: ../camel/providers/imap/camel-imap-folder.c:2866
-#: ../camel/providers/imap/camel-imap-folder.c:3636
-#: ../camel/providers/nntp/camel-nntp-folder.c:220
+#: ../camel/providers/imap/camel-imap-folder.c:3338
+#: ../camel/providers/imap/camel-imap-folder.c:4218
+#: ../camel/providers/nntp/camel-nntp-folder.c:331
 msgid "This message is not currently available"
 msgstr "×?×?×?×¢×? ×?×?×ª ×?×?× ×? ×?×?×?× ×? ×?×¨×?×¢ ×?×?"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3463
+#: ../camel/providers/imap/camel-imap-folder.c:4014
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-folder.c:3471
+#: ../camel/providers/imap/camel-imap-folder.c:4024
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-folder.c:3674
+#: ../camel/providers/imap/camel-imap-folder.c:4258
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:161
-#: ../camel/providers/imap/camel-imap-message-cache.c:225
+#: ../camel/providers/imap/camel-imap-message-cache.c:196
+#: ../camel/providers/imap/camel-imap-message-cache.c:261
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "×?×? × ×?×ª×? ×?×¤×ª×?×? ×¡×¤×¨×?×?×ª ×?×?×?×?×?: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:312
-#: ../camel/providers/imap/camel-imap-message-cache.c:369
-#: ../camel/providers/imap/camel-imap-message-cache.c:400
-#: ../camel/providers/imap/camel-imap-message-cache.c:432
+#: ../camel/providers/imap/camel-imap-message-cache.c:335
+#: ../camel/providers/imap/camel-imap-message-cache.c:399
+#: ../camel/providers/imap/camel-imap-message-cache.c:433
+#: ../camel/providers/imap/camel-imap-message-cache.c:468
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:483
+#: ../camel/providers/imap/camel-imap-message-cache.c:549
 #, c-format
 msgid "Failed to cache %s: %s"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
-#, fuzzy
+#: ../camel/providers/imap/camel-imap-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:41
+msgid "Checking for New Mail"
+msgstr "×?×?×?×§ ×¢×?×?×¨ ×?×?×?×¨ ×?×?×©"
+
+#: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:47
 msgid "Ch_eck for new messages in subscribed folders"
-msgstr "_×?×?×?×§ ×¢×?×?×¨ ×?×?×?×¢×?×ª ×?×?×©×?×ª ×?×?×? ×?×ª×?×§×?×?×ª"
+msgstr "×?×© ×?_×?×?×?×§ ×?×?×¨ ×?×?×?×¢×?×ª ×?×?×©×?×ª ×?×ª×?×§×?×?×ª ×?×?×?× ×?×?×?×?"
 
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:50
-#, fuzzy
-msgid "Namespace:"
-msgstr "×©×?:"
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:51
+msgid "Connection to Server"
+msgstr "×?×?×?×?×¨ ×?×©×¨×ª"
 
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:54
+#: ../camel/providers/imap/camel-imap-provider.c:50
+#: ../camel/providers/imapx/camel-imapx-provider.c:53
+msgid "_Use custom command to connect to server"
+msgstr "×?×©×ª×?×© ×?_×¤×§×?×?×? ×?×?×ª×?×?×ª ×?×?×©×?×ª ×?×?×ª×?×?×¨×?×ª ×?×©×¨×ª"
+
+#: ../camel/providers/imap/camel-imap-provider.c:52
+msgid "Co_mmand:"
+msgstr "×¤_×§×?×?×?:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:63
+#: ../camel/providers/nntp/camel-nntp-provider.c:42
+msgid "Folders"
+msgstr "×ª×?×§×?×?×ª"
+
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:65
+msgid "_Show only subscribed folders"
+msgstr ""
+
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:68
+msgid "O_verride server-supplied folder namespace"
+msgstr ""
+
+#: ../camel/providers/imap/camel-imap-provider.c:62
+msgid "Names_pace:"
+msgstr "×?_×¨×?×? ×©×?:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
 msgid "_Apply filters to new messages in INBOX on this server"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imap/camel-imap-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:77
 msgid "Check new messages for Jun_k contents"
 msgstr "×?×?×?×§ ×?×?×?×¢×?×ª ×?×?×©×?×ª ×¢×?×?×¨ ×ª×?× ×? _×?×?×?"
 
-#: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:60
-#, fuzzy
+#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:81
 msgid "Automatically synchroni_ze remote mail locally"
-msgstr "×?×?×?×§ ×?×? ×§×?×?×? _×?×?×?×¨ ×?×?×© ×?×?"
+msgstr "_×¡× ×?×¨×?×? ×?×?×?×?×?×?×? ×©×? ×?×?×?×¨ ×?×¨×?×?×§ ×?×?×?×¤×? ×?×§×?×?×?"
 
-#: ../camel/providers/imap/camel-imap-provider.c:83
+#: ../camel/providers/imap/camel-imap-provider.c:79
 msgid "IMAP"
 msgstr "â??IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:91
 msgid "For reading and storing mail on IMAP servers."
 msgstr "×¢×?×?×¨ ×§×¨×?×?×? ×?×©×?×?×¨×ª ×?×?×?×¨ ×¢×? ×©×¨×ª×? IMAP."
 
-#: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapp/camel-imapp-provider.c:69
+#: ../camel/providers/imap/camel-imap-provider.c:99
+#: ../camel/providers/imapx/camel-imapx-provider.c:107
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "×?×¤×©×¨×?×ª ×?×?×ª ×ª×ª×?×?×¨ ×?×©×¨×ª ×?-IMAP ×?×¢×?×¨×ª ×¡×?×¡×?×ª ×?×§×¡×? ×¤×©×?×?."
 
-#: ../camel/providers/imap/camel-imap-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:214
+#: ../camel/providers/imap/camel-imap-store.c:310
+#: ../camel/providers/imapx/camel-imapx-store.c:206
 #, c-format
 msgid "IMAP server %s"
 msgstr "×©×¨×ª IMAP %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:439
-#: ../camel/providers/imap4/camel-imap4-store.c:216
+#: ../camel/providers/imap/camel-imap-store.c:312
+#: ../camel/providers/imapx/camel-imapx-store.c:208
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "×©×¨×ª IMAP ×¢×?×?×¨ %s ×?-%s"
 
-#: ../camel/providers/imap/camel-imap-store.c:568
-#: ../camel/providers/imap/camel-imap-store.c:583
-#: ../camel/providers/imap4/camel-imap4-store.c:251
-#: ../camel/providers/imap4/camel-imap4-store.c:266
-#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/nntp/camel-nntp-store.c:198
-#: ../camel/providers/pop3/camel-pop3-store.c:171
-#: ../camel/providers/pop3/camel-pop3-store.c:185
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
-#: ../camel/providers/smtp/camel-smtp-transport.c:275
+#: ../camel/providers/imap/camel-imap-store.c:445
+#: ../camel/providers/imap/camel-imap-store.c:470
+#: ../camel/providers/nntp/camel-nntp-store.c:233
+#: ../camel/providers/nntp/camel-nntp-store.c:257
+#: ../camel/providers/pop3/camel-pop3-store.c:173
+#: ../camel/providers/pop3/camel-pop3-store.c:197
+#: ../camel/providers/smtp/camel-smtp-transport.c:215
+#: ../camel/providers/smtp/camel-smtp-transport.c:238
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "×?×? × ×?×ª×? ×?×?×ª×?×?×¨ ×?-%s: â??%s"
 
-#: ../camel/providers/imap/camel-imap-store.c:569
-#: ../camel/providers/imap4/camel-imap4-store.c:252
-#: ../camel/providers/nntp/camel-nntp-store.c:184
-#: ../camel/providers/pop3/camel-pop3-store.c:172
-#: ../camel/providers/smtp/camel-smtp-transport.c:261
+#: ../camel/providers/imap/camel-imap-store.c:446
+#: ../camel/providers/nntp/camel-nntp-store.c:234
+#: ../camel/providers/pop3/camel-pop3-store.c:174
+#: ../camel/providers/smtp/camel-smtp-transport.c:216
 msgid "SSL unavailable"
 msgstr "â??SSL ×?×? ×?×?×?×?"
 
-#: ../camel/providers/imap/camel-imap-store.c:580
-#: ../camel/providers/imap/camel-imap-store.c:862
+#: ../camel/providers/imap/camel-imap-store.c:466
+#: ../camel/providers/imap/camel-imap-store.c:751
+#: ../camel/providers/imapx/camel-imapx-server.c:2215
+#: ../camel/providers/imapx/camel-imapx-server.c:2347
 msgid "Connection cancelled"
 msgstr "×?×?×?×?×?×¨ ×?×?×?×?"
 
-#: ../camel/providers/imap/camel-imap-store.c:691
-#: ../camel/providers/imap/camel-imap-store.c:710
-#: ../camel/providers/imap/camel-imap-store.c:716
-#: ../camel/providers/imap/camel-imap-store.c:742
-#: ../camel/providers/imap4/camel-imap4-store.c:314
-#: ../camel/providers/imap4/camel-imap4-store.c:329
-#: ../camel/providers/imap4/camel-imap4-store.c:338
+#: ../camel/providers/imap/camel-imap-store.c:576
+#: ../camel/providers/imap/camel-imap-store.c:596
+#: ../camel/providers/imap/camel-imap-store.c:603
+#: ../camel/providers/imap/camel-imap-store.c:630
+#: ../camel/providers/imapx/camel-imapx-server.c:2392
+#: ../camel/providers/imapx/camel-imapx-server.c:2413
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-store.c:692
-#: ../camel/providers/smtp/camel-smtp-transport.c:333
+#: ../camel/providers/imap/camel-imap-store.c:577
+#: ../camel/providers/imapx/camel-imapx-server.c:2393
+#: ../camel/providers/smtp/camel-smtp-transport.c:297
 msgid "STARTTLS not supported"
 msgstr "â??STARTTLS ×?×? × ×ª×?×?"
 
-#: ../camel/providers/imap/camel-imap-store.c:711
+#: ../camel/providers/imap/camel-imap-store.c:597
+#: ../camel/providers/imapx/camel-imapx-server.c:2414
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-store.c:717
-#: ../camel/providers/imap4/camel-imap4-store.c:339
-#: ../camel/providers/smtp/camel-smtp-transport.c:372
+#: ../camel/providers/imap/camel-imap-store.c:604
+#: ../camel/providers/smtp/camel-smtp-transport.c:338
 msgid "SSL is not available in this build"
 msgstr "â??SSL ×?×?× ×? ×?×?×?×? ×?×?× ×?×?×? ×?×?×ª"
 
-#: ../camel/providers/imap/camel-imap-store.c:865
+#: ../camel/providers/imap/camel-imap-store.c:755
+#: ../camel/providers/imapx/camel-imapx-server.c:2218
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "×?×? × ×?×ª×? ×?×?×ª×?×?×¨ ×¢×? ×?×¤×§×?×?×? \"%s\": â??%s"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1053
-#: ../camel/providers/imap/camel-imap-store.c:2400
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:368
-#: ../camel/providers/imap4/camel-imap4-store.c:1408
-#: ../camel/providers/local/camel-maildir-folder.c:77
+#: ../camel/providers/imap/camel-imap-store.c:944
+#: ../camel/providers/imap/camel-imap-store.c:2424
+#: ../camel/providers/imapx/camel-imapx-store.c:406
+#: ../camel/providers/imapx/camel-imapx-store.c:968
+#: ../camel/providers/local/camel-maildir-folder.c:90
 #: ../camel/providers/local/camel-maildir-store.c:219
-#: ../camel/providers/local/camel-maildir-store.c:291
-#: ../camel/providers/local/camel-maildir-store.c:517
-#: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:464
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
+#: ../camel/providers/local/camel-maildir-store.c:306
+#: ../camel/providers/local/camel-maildir-store.c:552
+#: ../camel/providers/local/camel-maildir-store.c:565
+#: ../camel/providers/local/camel-spool-store.c:500
 msgid "Inbox"
 msgstr "×?×?×?×¨ × ×?× ×¡"
 
-#: ../camel/providers/imap/camel-imap-store.c:1055
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
-msgid "Drafts"
-msgstr "×?×?×?×?×?×ª"
-
-#: ../camel/providers/imap/camel-imap-store.c:1057
-msgid "Sent"
-msgstr "× ×©×?×?"
-
-#: ../camel/providers/imap/camel-imap-store.c:1059
-msgid "Templates"
-msgstr "×ª×?× ×?×?×ª"
-
-#: ../camel/providers/imap/camel-imap-store.c:1304
+#: ../camel/providers/imap/camel-imap-store.c:1202
+#: ../camel/providers/imapx/camel-imapx-server.c:2469
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-store.c:1314
-#: ../camel/providers/smtp/camel-smtp-transport.c:507
+#: ../camel/providers/imap/camel-imap-store.c:1213
+#: ../camel/providers/imapx/camel-imapx-server.c:2480
+#: ../camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "×?×?×? ×ª×?×?×?×? ×?×¡×?×? ×?×?×?×?×?×ª %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1388
+#: ../camel/providers/imap/camel-imap-store.c:1288
+#: ../camel/providers/imapx/camel-imapx-server.c:2536
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3112,814 +3006,500 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-store.c:1861
-#: ../camel/providers/imap/camel-imap-store.c:2242
-#: ../camel/providers/imap4/camel-imap4-store.c:959
+#: ../camel/providers/imap/camel-imap-store.c:1848
+#: ../camel/providers/imap/camel-imap-store.c:2270
+#: ../camel/providers/imapx/camel-imapx-store.c:786
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "×©×? ×?×ª×?×§×?×?×? \"%s\" ×©×?×?×? ×?×?×?×?×?×? ×©×?×?×? ×?×?×?×? ×?×ª ×?×ª×? \"%c\""
 
-#: ../camel/providers/imap/camel-imap-store.c:1978
-#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:204
-#: ../camel/providers/local/camel-mh-store.c:249
+#: ../camel/providers/imap/camel-imap-store.c:1967
+#: ../camel/providers/local/camel-maildir-store.c:184
+#: ../camel/providers/local/camel-mbox-store.c:189
+#: ../camel/providers/local/camel-mh-store.c:250
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×?×ª ×?×ª×?×§×?×?×? '%s': â??×?×ª×?×§×?×?×? ×§×?×?×?×ª."
 
-#: ../camel/providers/imap/camel-imap-store.c:2253
+#: ../camel/providers/imap/camel-imap-store.c:2281
+#: ../camel/providers/imapx/camel-imapx-store.c:794
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "×ª×?×§×?×?×ª ×?×?×¨×? ×?×? ×?×?×?×¢×?: %s"
 
-#: ../camel/providers/imap4/camel-imap4-command.c:576
-#: ../camel/providers/imap4/camel-imap4-command.c:583
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-command.c:686
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:221
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:450
-#, fuzzy, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:456
-#, fuzzy, c-format
-msgid "Cannot select folder '%s': Bad command"
-msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1433
-#, fuzzy, c-format
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr "Failed to store mail in temp file %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1435
-msgid "service unavailable"
-msgstr "â??×©×?×¨×?×ª ×?×? ×?×?×?×?"
+#: ../camel/providers/imap/camel-imap-store.c:3143
+msgid "Server unexpectedly disconnected"
+msgstr "×?×©×¨×ª ×?×ª× ×ª×§ ×?×?×?×¤×? ×¤×ª×?×?×?×?"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:1569
-#: ../camel/providers/imap4/camel-imap4-engine.c:1608
-#: ../camel/providers/imap4/camel-imap4-engine.c:1653
-#: ../camel/providers/imap4/camel-imap4-engine.c:1709
+#: ../camel/providers/imapx/camel-imapx-folder.c:74
 #, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "×©×¨×ª IMAP4 â??%s ×?×ª× ×ª×§ ×?×?×?×¤×? ×¤×ª×?×?×?×?: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
-msgid ""
-"Enable extended Mailing-List detection required for some filter and vFolder "
-"rules"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:90
-#, fuzzy
-msgid "Expire cached messages that haven't been read in X seconds"
-msgstr "×¡×?×? ×?×ª ×?×?×?×?×¢×?×ª ×©× ×?×?×¨×? ×?×?×?×?×? × ×§×¨×?×?"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:91
-msgid "Expire cached messages older than X seconds"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:423
-#, fuzzy, c-format
-msgid "Cannot access folder '%s': %s"
-msgstr "×?×?×¦×¨ ×?×ª ×?×ª×?×§×?×?×? `%s'"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:482
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr "×?×¢×ª×?×§ ×?×?×?×¢×?×ª ×?×? ×?×ª×?×§×?×?×? %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:488
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr "×?×¢×ª×?×§ ×?×?×?×¢×?×ª ×?×? ×?×ª×?×§×?×?×? %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:628
-#, fuzzy, c-format
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:633
-#, fuzzy, c-format
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
+msgid "Could not create folder summary for %s"
+msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×ª×§×¦×?×¨ ×ª×?×§×?×?×? ×¢×?×?×¨ %s"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:889
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr "×?×¢×ª×?×§ ×?×?×?×¢×?×ª ×?×? ×?×ª×?×§×?×?×? %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:894
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr "×?×¢×ª×?×§ ×?×?×?×¢×?×ª ×?×? ×?×ª×?×§×?×?×? %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:938
-#, fuzzy, c-format
-msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr "×?×¢×ª×?×§ ×?×?×?×¢×?×ª ×?×? ×?×ª×?×§×?×?×? %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1031
-#, fuzzy, c-format
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "×?×¢×ª×?×§ ×?×?×?×¢×?×ª ×?×? ×?×ª×?×§×?×?×? %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1061
-#, fuzzy, c-format
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr "×?×¢×ª×?×§ ×?×?×?×¢×?×ª ×?×? ×?×ª×?×§×?×?×? %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1181
-#, fuzzy, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-msgstr "×?×¢×ª×?×§ ×?×?×?×¢×?×ª ×?×? ×?×ª×?×§×?×?×? %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1185
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-msgstr "×?×¢×ª×?×§ ×?×?×?×¢×?×ª ×?×? ×?×ª×?×§×?×?×? %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1193
-#, fuzzy, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr "×?×¢×ª×?×§ ×?×?×?×¢×?×ª ×?×? ×?×ª×?×§×?×?×? %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1197
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-msgstr "×?×¢×ª×?×§ ×?×?×?×¢×?×ª ×?×? ×?×ª×?×§×?×?×? %s"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:56
-msgid "Check new messages for _Junk contents"
-msgstr "×?×?×?×§ ×?×?×?×¢×?×ª ×?×?×©×?×ª ×¢×?×?×¨ ×ª×?× ×? _×?×?×?"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:58
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "×?×?×?×§ ×¢×?×?×¨ ×?×?×?×¢×?×ª _×?×?×? ×?×ª×?×§×?×?×ª ×?×?×?×?×¨ ×?× ×?× ×¡"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:67
-msgid "IMAP4rev1"
-msgstr "â??IMAP4rev1"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:69
-msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr "×?×§×¨×?×?×? ×?×?×ª×?×?×? ×©×? ×?×?×?×¨ ×?×©×¨×ª×? IMAPv4rev1."
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:86
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "×?×¤×©×¨×?×ª ×?×?×ª ×ª×ª×?×?×¨ ×?×©×¨×ª ×?-IMAPv4rev1 ×?×¢×?×¨×ª ×¡×?×¡×?×ª ×?×§×¡×? ×¤×©×?×?."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:263
-#: ../camel/providers/imapp/camel-imapp-store.c:249
-#: ../camel/providers/nntp/camel-nntp-store.c:195
-#: ../camel/providers/nntp/camel-nntp-store.c:214
-#: ../camel/providers/pop3/camel-pop3-store.c:182
-#: ../camel/providers/smtp/camel-smtp-transport.c:272
-msgid "Connection canceled"
-msgstr "×?×?×?×?×?×¨ ×?×?×?×?"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:300
+#: ../camel/providers/imapx/camel-imapx-folder.c:82
 #, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "×?×ª×?×?×¨×?×ª ×?×©×¨×ª IMAP â??%s ×?×?×¦×? ×?×?×?×?×?×? × ×?×©×?×?: ×?×©×¨×ª ×?×? ×ª×?×?×? ×?-STARTTLS"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:330
-#: ../camel/providers/pop3/camel-pop3-store.c:250
-#, fuzzy
-msgid "TLS negotiations failed"
-msgstr "×?×?×?×?×?×?×ª × ×?×©×?×?"
+msgid "Could not create cache for %s"
+msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×?×?×?×?×? ×¢×?×?×¨ %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:415
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+#: ../camel/providers/imapx/camel-imapx-provider.c:43
+msgid "Use I_dle if the server supports it"
 msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:538
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-store.c:701
-#: ../camel/providers/imap4/camel-imap4-store.c:969
-msgid "Cannot create IMAP folders in offline mode."
-msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×ª×?×§×?×?×ª IMAP ×?×?×¦×? ×?×? ×?×§×?×?×?."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:740
-#, fuzzy, c-format
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:821
-#, c-format
-msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
-msgid "Bad command"
-msgstr "×¤×§×?×?×? ×©×?×?×?×?"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:902
-#, fuzzy, c-format
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:907
-#, fuzzy, c-format
-msgid "Cannot create folder '%s': Bad command"
-msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1013
-#, fuzzy, c-format
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "×?×? × ×?×ª×? ×?×?×?×?×§ ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1020
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
-#, fuzzy, c-format
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "×?×? × ×?×ª×? ×?×?×?×?×§ ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1084
-#, fuzzy, c-format
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1104
-#, fuzzy, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1111
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "×?×? × ×?×ª×? ×?×©× ×?×ª ×©×? ×ª×?×§×?×?×ª IMAP ×?×?×¦×? ×?×? ×?×§×?×?×?."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1147
-#, fuzzy, c-format
-msgid "Cannot rename folder '%s' to '%s': Bad command"
-msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
-
-#. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
-#. * The fourth one is an error message.
-#: ../camel/providers/imap4/camel-imap4-store.c:1577
-#, c-format
-msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1638
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, c-format
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1688
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1710
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1760
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1596
-msgid "Scanning for changed messages"
-msgstr "×¡×?×¨×§ ×¢×?×?×¨ ×?×?×?×¢×?×ª ×©×?×©×ª× ×?"
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1617
-#, c-format
-msgid "IMAP server %s is in an inconsistent state."
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1644
-#, fuzzy
-msgid "Fetching envelopes of new messages"
-msgstr "×?×?× ×¡ ×?×ª ×?× ×?×¢× ×?×? ×©×? ×?×?×?×?×¢×?"
+#: ../camel/providers/imapx/camel-imapx-provider.c:55
+msgid "Command:"
+msgstr "×¤×§×?×?×?:"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:437
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
+msgid "Numbe_r of cached connections to use"
 msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:460
-msgid "No data"
-msgstr "×?×?×? ×?×?×?×¢"
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:623
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "×©×¨×ª IMAP â??%s ×?×ª× ×ª×§ ×?×?×?×¤×? ×¤×ª×?×?×?×?: %s"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:41
-msgid "Message storage"
-msgstr "×©×?×?×¨×ª ×?×?×?×¢×?×ª"
+#: ../camel/providers/imapx/camel-imapx-provider.c:70
+msgid "Namespace:"
+msgstr "×?×¨×?×? ×©×?:"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:89
 msgid "IMAP+"
 msgstr "â??IMAP+"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:51
-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 ""
-
-#: ../camel/providers/imapp/camel-imapp-store.c:252
+#: ../camel/providers/imapx/camel-imapx-server.c:2350
 #, c-format
 msgid "Could not connect to %s (port %s): %s"
 msgstr ""
 
-#: ../camel/providers/imapp/camel-imapp-store.c:349
+#: ../camel/providers/local/camel-local-folder.c:199
 #, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "×?×? × ×?×ª×? ×?×?×ª×?×?×¨ ×?×©×¨×ª POP ×?-%s"
-
-#: ../camel/providers/local/camel-local-folder.c:176
-msgid "Index message body data"
-msgstr ""
+msgid "~%s (%s)"
+msgstr "â??~%s â??(%s)"
 
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:392
+#: ../camel/providers/local/camel-local-folder.c:209
+#: ../camel/providers/local/camel-local-folder.c:218
 #, c-format
-msgid "~%s (%s)"
-msgstr ""
-"â??~%s â??(%s)"
+msgid "mailbox: %s (%s)"
+msgstr "×ª×?×?×ª ×?×?×?×¨: %s â??(%s)"
 
-#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:396
-#: ../camel/providers/local/camel-local-folder.c:399
+#: ../camel/providers/local/camel-local-folder.c:227
 #, c-format
-msgid "mailbox:%s (%s)"
+msgid "%s (%s)"
+msgstr "â??%s â??(%s)"
+
+#: ../camel/providers/local/camel-local-folder.c:272
+msgid "Index message body data"
 msgstr ""
-"×ª×?×?×ª ×?×?×?×¨:%s â??(%s)"
 
-#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:403
+#. Translators: The first %s is replaced with a message ID,
+#. the second %s is replaced with the folder path,
+#. the third %s is replaced with a detailed error string
+#: ../camel/providers/local/camel-local-folder.c:682
 #, c-format
-msgid "%s (%s)"
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
 msgstr ""
-"â??%s â??(%s)"
+"×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×?×?×?×?×¢×? %s ×?×?×ª×?×§×?×?×? %s\n"
+"%s"
 
-#: ../camel/providers/local/camel-local-provider.c:48
+#: ../camel/providers/local/camel-local-provider.c:44
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr ""
 
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "MH-format mail directories"
 msgstr ""
 
-#: ../camel/providers/local/camel-local-provider.c:56
+#: ../camel/providers/local/camel-local-provider.c:52
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
-#: ../camel/providers/local/camel-local-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:69
 msgid "Local delivery"
-msgstr ""
+msgstr "×?×¢×?×¨×? ×?×§×?×?×?×ª"
 
-#: ../camel/providers/local/camel-local-provider.c:74
+#: ../camel/providers/local/camel-local-provider.c:70
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
 msgstr ""
 
-#: ../camel/providers/local/camel-local-provider.c:88
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:103
 msgid "_Apply filters to new messages in INBOX"
 msgstr "×?_×?×? ×?×¡× × ×?×? ×?×?×?×?×¢×?×ª ×?×?×©×?×ª ×?×ª×?×§×?×?×ª ×?×?×?×?×¨ ×?× ×?× ×¡"
 
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:91
 msgid "Maildir-format mail directories"
 msgstr ""
 
-#: ../camel/providers/local/camel-local-provider.c:96
+#: ../camel/providers/local/camel-local-provider.c:92
 msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:104
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr ""
 
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:111
 msgid "Standard Unix mbox spool file"
 msgstr ""
 
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:112
+#: ../camel/providers/local/camel-local-provider.c:123
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:122
 msgid "Standard Unix mbox spool directory"
 msgstr ""
 
-#: ../camel/providers/local/camel-local-store.c:165
-#: ../camel/providers/local/camel-local-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:359
-#: ../camel/providers/local/camel-spool-store.c:129
+#: ../camel/providers/local/camel-local-store.c:148
+#: ../camel/providers/local/camel-local-store.c:278
+#: ../camel/providers/local/camel-mbox-store.c:361
+#: ../camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: ../camel/providers/local/camel-local-store.c:172
+#: ../camel/providers/local/camel-local-store.c:156
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: ../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:166
+#: ../camel/providers/local/camel-local-store.c:175
+#: ../camel/providers/local/camel-local-store.c:290
 #, 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:188
 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:350
 #, 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:422
 #, 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
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-local-store.c:452
+#: ../camel/providers/local/camel-mbox-store.c:293
+#, c-format
 msgid "Could not delete folder index file '%s': %s"
-msgstr "×?×? × ×?×ª×? ×?×?×?×?×§ ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
+msgstr "×?×? × ×?×ª×? ×?×?×?×?×§ ×?×ª ×§×?×?×¥ ×?×?×?× ×?×§×¡ ×©×? ×?×ª×?×§×?×?×? '%s':â?? %s"
 
-#: ../camel/providers/local/camel-local-store.c:458
+#: ../camel/providers/local/camel-local-store.c:482
 #: ../camel/providers/local/camel-mbox-store.c:324
-#, fuzzy, c-format
+#, c-format
 msgid "Could not delete folder meta file '%s': %s"
-msgstr "×?×? × ×?×ª×? ×?×?×?×?×§ ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
+msgstr "×?×? × ×?×ª×? ×?×?×?×?×§ ×?×ª ×§×?×?×¥ ×?×¢×? ×©×? ×?×ª×?×§×?×?×? '%s':â?? %s"
 
-#: ../camel/providers/local/camel-local-summary.c:507
+#: ../camel/providers/local/camel-local-summary.c:537
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: ../camel/providers/local/camel-maildir-folder.c:220
+#: ../camel/providers/local/camel-maildir-folder.c:191
 msgid "Maildir append message canceled"
 msgstr ""
 
-#: ../camel/providers/local/camel-maildir-folder.c:223
+#: ../camel/providers/local/camel-maildir-folder.c:195
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-maildir-folder.c:250
-#: ../camel/providers/local/camel-maildir-folder.c:264
-#: ../camel/providers/local/camel-maildir-folder.c:273
-#: ../camel/providers/local/camel-mbox-folder.c:347
-#: ../camel/providers/local/camel-mbox-folder.c:368
-#: ../camel/providers/local/camel-mbox-folder.c:399
-#: ../camel/providers/local/camel-mbox-folder.c:407
-#: ../camel/providers/local/camel-mh-folder.c:203
-#: ../camel/providers/local/camel-mh-folder.c:214
-#: ../camel/providers/local/camel-mh-folder.c:223
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-
-#: ../camel/providers/local/camel-maildir-folder.c:274
+#: ../camel/providers/local/camel-maildir-folder.c:291
 msgid "Invalid message contents"
 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-maildir-folder.c:407
+msgid "Cannot transfer message to destination folder"
+msgstr "×?×? × ×?×ª×? ×?×?×¢×?×?×¨ ×?×ª ×?×?×?×?×¢×? ×?×ª×?×§×?×?×ª ×?×?×¢×?"
+
+#: ../camel/providers/local/camel-maildir-store.c:134
+#: ../camel/providers/local/camel-maildir-store.c:162
+#: ../camel/providers/local/camel-mbox-store.c:158
+#: ../camel/providers/local/camel-mbox-store.c:171
 #, c-format
 msgid "Cannot create folder '%s': %s"
-msgstr ""
-"×?×? × ×?×ª×? ×?×?×¦×?×¨ ×?×ª ×?×ª×?×§×?×?×? '%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-mh-store.c:217
+#: ../camel/providers/local/camel-maildir-store.c:148
+#: ../camel/providers/local/camel-mbox-store.c:126
+#: ../camel/providers/local/camel-mh-store.c:213
 #, c-format
 msgid "Cannot get folder '%s': %s"
-msgstr ""
-"×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×?×ª×?×§×?×?×? '%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-mh-store.c:224
+#: ../camel/providers/local/camel-maildir-store.c:153
+#: ../camel/providers/local/camel-mbox-store.c:135
+#: ../camel/providers/local/camel-mh-store.c:221
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
-msgstr ""
-"×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×?×ª×?×§×?×?×? '%s': â??×?×ª×?×§×?×?×? ×?×? ×§×?×?×?×ª."
+msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×?×ª×?×§×?×?×? '%s': â??×?×ª×?×§×?×?×? ×?×? ×§×?×?×?×ª."
 
-#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-maildir-store.c:179
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
-msgstr ""
-"×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×?×ª×?×§×?×?×? '%s': â??×?×? ×¡×¤×¨×?×?×ª maildir."
+msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×?×ª×?×§×?×?×? '%s': â??×?×? ×¡×¤×¨×?×?×ª maildir."
 
-#: ../camel/providers/local/camel-maildir-store.c:234
-#: ../camel/providers/local/camel-maildir-store.c:272
-#: ../camel/providers/local/camel-mh-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:235
+#: ../camel/providers/local/camel-maildir-store.c:274
+#: ../camel/providers/local/camel-mh-store.c:281
 #, c-format
 msgid "Could not delete folder '%s': %s"
-msgstr ""
-"×?×? × ×?×ª×? ×?×?×?×?×§ ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
+msgstr "×?×? × ×?×ª×? ×?×?×?×?×§ ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
 
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:237
 msgid "not a maildir directory"
 msgstr "×?×? ×¡×¤×¨×?×?×ª maildir"
 
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:331
-#: ../camel/providers/local/camel-spool-store.c:345
+#: ../camel/providers/local/camel-maildir-store.c:472
+#: ../camel/providers/local/camel-spool-store.c:357
+#: ../camel/providers/local/camel-spool-store.c:372
 #, c-format
 msgid "Could not scan folder '%s': %s"
-msgstr ""
-"×?×? × ×?×ª×? ×?×¡×¨×?×§ ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
+msgstr "×?×? × ×?×ª×? ×?×¡×¨×?×§ ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:439
-#: ../camel/providers/local/camel-maildir-summary.c:558
+#: ../camel/providers/local/camel-maildir-summary.c:433
+#: ../camel/providers/local/camel-maildir-summary.c:555
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-maildir-summary.c:551
+#: ../camel/providers/local/camel-maildir-summary.c:547
 msgid "Checking folder consistency"
 msgstr "×?×?×?×§ ×©×?×?×?×ª ×ª×?×§×?×?×?"
 
-#: ../camel/providers/local/camel-maildir-summary.c:656
+#: ../camel/providers/local/camel-maildir-summary.c:638
 msgid "Checking for new messages"
 msgstr "×?×?×?×§ ×¢×?×?×¨ ×?×?×?×¢×?×ª ×?×?×©×?×ª"
 
-#: ../camel/providers/local/camel-maildir-summary.c:742
-#: ../camel/providers/local/camel-mbox-summary.c:551
-#: ../camel/providers/local/camel-mbox-summary.c:733
-#: ../camel/providers/local/camel-mbox-summary.c:853
-#: ../camel/providers/local/camel-spool-summary.c:171
+#: ../camel/providers/local/camel-maildir-summary.c:729
+#: ../camel/providers/local/camel-mbox-summary.c:465
+#: ../camel/providers/local/camel-mbox-summary.c:667
+#: ../camel/providers/local/camel-mbox-summary.c:792
+#: ../camel/providers/local/camel-spool-summary.c:129
 msgid "Storing folder"
-msgstr ""
+msgstr "×ª×?×§×?×?×ª ×?×?×¡×?×?"
 
-#: ../camel/providers/local/camel-mbox-folder.c:156
-#: ../camel/providers/local/camel-spool-folder.c:150
+#: ../camel/providers/local/camel-mbox-folder.c:123
+#: ../camel/providers/local/camel-spool-folder.c:123
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-folder.c:217
+#: ../camel/providers/local/camel-mbox-folder.c:194
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "×?×? × ×?×ª×? ×?×?×ª×?×? ×ª×?×?×ª ×?×?×?×¨: %s: â??%s\n"
 
-#: ../camel/providers/local/camel-mbox-folder.c:278
+#: ../camel/providers/local/camel-mbox-folder.c:261
 msgid "Mail append canceled"
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-folder.c:281
+#: ../camel/providers/local/camel-mbox-folder.c:265
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-folder.c:400
+#: ../camel/providers/local/camel-mbox-folder.c:438
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-folder.c:408
-#: ../camel/providers/local/camel-mh-folder.c:224
+#: ../camel/providers/local/camel-mbox-folder.c:448
+#: ../camel/providers/local/camel-mh-folder.c:241
 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:147
+#: ../camel/providers/local/camel-mbox-store.c:369
 msgid "Cannot create a folder by this name."
 msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×ª×?×§×?×?×? ×?×©×? ×?×?."
 
-#: ../camel/providers/local/camel-mbox-store.c:198
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-mbox-store.c:182
+#, c-format
 msgid "Cannot get folder '%s': not a regular file."
-msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
+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
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-mbox-store.c:214
+#: ../camel/providers/local/camel-mbox-store.c:226
+#: ../camel/providers/local/camel-mbox-store.c:252
+#, c-format
 msgid ""
 "Could not delete folder '%s':\n"
 "%s"
-msgstr "×?×? × ×?×ª×? ×?×?×?×?×§ ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
+msgstr ""
+"×?×? × ×?×ª×? ×?×?×?×?×§ ×?×ª ×?×ª×?×§×?×?×? '%s':\n"
+"%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:247
+#: ../camel/providers/local/camel-mbox-store.c:235
 #, c-format
 msgid "'%s' is not a regular file."
-msgstr ""
-"â??'%s' ×?×?× ×? ×§×?×?×¥ ×¨×?×?×?."
+msgstr "â??'%s' ×?×?× ×? ×§×?×?×¥ ×¨×?×?×?."
 
-#: ../camel/providers/local/camel-mbox-store.c:254
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-mbox-store.c:243
+#, c-format
 msgid "Folder '%s' is not empty. Not deleted."
-msgstr "×?×ª×?×§×?×?×? '%s' ×?×? ×§×?×?×?×ª."
+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:267
+#: ../camel/providers/local/camel-mbox-store.c:280
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
-msgstr ""
-"×?×? × ×?×ª×? ×?×?×?×?×§ ×?×ª ×§×?×?×¥ ×¡×?×?×?×? ×?×ª×?×§×?×?×? '%s': â??%s"
+msgstr "×?×? × ×?×ª×? ×?×?×?×?×§ ×?×ª ×§×?×?×¥ ×¡×?×?×?×? ×?×ª×?×§×?×?×? '%s': â??%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:378
+#: ../camel/providers/local/camel-mbox-store.c:384
 #, c-format
 msgid "Cannot create directory '%s': %s."
-msgstr ""
-"×?×? × ×?×ª×? ×?×?×¦×?×¨ ×?×ª ×?×¡×¤×¨×?×?×?: '%s': â??%s"
+msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×?×ª ×?×¡×¤×¨×?×?×?: '%s': â??%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:399
 #, 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:401
 msgid "Folder already exists"
 msgstr "×?×ª×?×§×?×?×? ×?×?×¨ ×§×?×?×?×ª"
 
-#: ../camel/providers/local/camel-mbox-store.c:485
+#: ../camel/providers/local/camel-mbox-store.c:495
 msgid "The new folder name is illegal."
 msgstr "×©×? ×?×ª×?×§×?×?×? ×?×?×?×© ×?×?× ×? ×?×?×§×?."
 
-#: ../camel/providers/local/camel-mbox-store.c:498
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-mbox-store.c:509
+#, c-format
 msgid "Could not rename '%s': '%s': %s"
-msgstr "×?×? × ×?×ª×? ×?×©× ×?×ª ×?×ª '%s': â??%s"
+msgstr "×?×? × ×?×ª×? ×?×©× ×?×ª ×?×ª ×©×? ×?×ª×?×§×?×?×? '%s':â?? '%s':â?? %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:579
+#: ../camel/providers/local/camel-mbox-store.c:591
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
-msgstr ""
-"×?×? × ×?×ª×? ×?×©× ×?×ª ×?×ª '%s' ×?-'%s': â??%s"
+msgstr "×?×? × ×?×ª×? ×?×©× ×?×ª ×?×ª '%s' ×?-'%s': â??%s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:557
+#: ../camel/providers/local/camel-mbox-summary.c:472
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "×?×? × ×?×ª×? ×?×¤×ª×?×? ×ª×?×§×?×?×?: %s: â??%s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:607
+#: ../camel/providers/local/camel-mbox-summary.c:523
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-summary.c:670
+#: ../camel/providers/local/camel-mbox-summary.c:603
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "×?×? × ×?×ª×? ×?×?×?×?×§ ×ª×?×§×?×?×?: %s: â??%s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:738
-#: ../camel/providers/local/camel-mbox-summary.c:858
-#: ../camel/providers/local/camel-spool-summary.c:176
+#: ../camel/providers/local/camel-mbox-summary.c:673
+#: ../camel/providers/local/camel-mbox-summary.c:798
+#: ../camel/providers/local/camel-spool-summary.c:135
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "×?×? × ×?×ª×? ×?×¤×ª×?×? ×§×?×?×¥: %s: â??%s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:750
-#: ../camel/providers/local/camel-spool-summary.c:189
+#: ../camel/providers/local/camel-mbox-summary.c:686
+#: ../camel/providers/local/camel-spool-summary.c:149
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-summary.c:763
-#: ../camel/providers/local/camel-mbox-summary.c:967
+#: ../camel/providers/local/camel-mbox-summary.c:700
+#: ../camel/providers/local/camel-mbox-summary.c:913
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "×?×? × ×?×ª×? ×?×¡×?×?×¨ ×?×ª ×ª×?×§×?×?×ª ×?×?×§×?×¨ %s: â??%s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:772
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-mbox-summary.c:710
+#, c-format
 msgid "Could not close temporary folder: %s"
-msgstr "×?×? × ×?×ª×? ×?×?×?×?"
+msgstr "×?×? × ×?×ª×? ×?×¡×?×?×¨ ×?×ª ×?×ª×?×§×?×?×? ×?×?×?× ×?×ª: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:787
+#: ../camel/providers/local/camel-mbox-summary.c:726
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "×?×? × ×?×ª×? ×?×©× ×?×ª ×©×? ×ª×?×§×?×?×?: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:869
-#: ../camel/providers/local/camel-mbox-summary.c:1097
+#: ../camel/providers/local/camel-mbox-summary.c:810
+#: ../camel/providers/local/camel-mbox-summary.c:1051
 #, c-format
 msgid "Could not store folder: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-summary.c:908
-#: ../camel/providers/local/camel-mbox-summary.c:916
-#: ../camel/providers/local/camel-mbox-summary.c:1127
-#: ../camel/providers/local/camel-mbox-summary.c:1135
+#: ../camel/providers/local/camel-mbox-summary.c:851
+#: ../camel/providers/local/camel-mbox-summary.c:860
+#: ../camel/providers/local/camel-mbox-summary.c:1084
+#: ../camel/providers/local/camel-mbox-summary.c:1093
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-summary.c:1060
-#: ../camel/providers/local/camel-spool-summary.c:357
+#: ../camel/providers/local/camel-mbox-summary.c:1011
+#: ../camel/providers/local/camel-spool-summary.c:326
 #, c-format
 msgid "Unknown error: %s"
 msgstr "×©×?×?×?×? ×?×? ×?×?×?×¢×?: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1203
-#: ../camel/providers/local/camel-mbox-summary.c:1229
+#: ../camel/providers/local/camel-mbox-summary.c:1162
+#: ../camel/providers/local/camel-mbox-summary.c:1190
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-summary.c:1220
+#: ../camel/providers/local/camel-mbox-summary.c:1180
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-mh-folder.c:176
+#: ../camel/providers/local/camel-mh-folder.c:166
 msgid "MH append message canceled"
 msgstr ""
 
-#: ../camel/providers/local/camel-mh-folder.c:179
+#: ../camel/providers/local/camel-mh-folder.c:170
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-mh-store.c:232
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-mh-store.c:230
+#, c-format
 msgid "Could not create folder '%s': %s"
-msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×?×ª ×?×ª×?×§×?×?×? '%s': %s"
+msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×?×ª ×?×ª×?×§×?×?×? '%s':â?? %s"
 
-#: ../camel/providers/local/camel-mh-store.c:244
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-mh-store.c:243
+#, c-format
 msgid "Cannot get folder '%s': not a directory."
-msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
+msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×?×ª×?×§×?×?×? '%s': ×?×? ×?×?× ×? ×ª×?×§×?×?×?."
 
-#: ../camel/providers/local/camel-mh-summary.c:264
+#: ../camel/providers/local/camel-mh-summary.c:227
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-spool-store.c:135
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-spool-store.c:119
+#, c-format
 msgid "Spool '%s' cannot be opened: %s"
-msgstr "×?×? × ×?×ª×? ×?×¤×ª×?×? ×?×ª ×?×ª×?×§×?×?×? %s: â??%s"
+msgstr "×?×? × ×?×ª×? ×?×¤×ª×?×? ×?×ª ×?×?×?×¦×¥ '%s':â?? %s"
 
-#: ../camel/providers/local/camel-spool-store.c:147
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-spool-store.c:132
+#, c-format
 msgid "Spool '%s' is not a regular file or directory"
-msgstr "â??'%s' ×?×?× ×? ×§×?×?×¥ ×¨×?×?×?."
+msgstr "×?×?×?×¦×¥ '%s' ×?×?× ×? ×§×?×?×¥ ×?×? ×ª×?×§×?×?×? ×¨×?×?×?×?×?"
 
-#: ../camel/providers/local/camel-spool-store.c:166
+#: ../camel/providers/local/camel-spool-store.c:157
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "×?×ª×?×§×?×?×? '%s/%s' ×?×? ×§×?×?×?×ª."
 
-#: ../camel/providers/local/camel-spool-store.c:176
+#: ../camel/providers/local/camel-spool-store.c:168
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3928,12 +3508,12 @@ msgstr ""
 "×?×? × ×?×ª×? ×?×¤×ª×?×? ×?×ª ×?×ª×?×§×?×?×? '%s':\n"
 "â??%s"
 
-#: ../camel/providers/local/camel-spool-store.c:180
+#: ../camel/providers/local/camel-spool-store.c:173
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "×?×ª×?×§×?×?×? '%s' ×?×? ×§×?×?×?×ª."
 
-#: ../camel/providers/local/camel-spool-store.c:185
+#: ../camel/providers/local/camel-spool-store.c:179
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -3942,116 +3522,131 @@ msgstr ""
 "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×?×ª ×?×ª×?×§×?×?×? '%s':\n"
 "â??%s"
 
-#: ../camel/providers/local/camel-spool-store.c:193
+#: ../camel/providers/local/camel-spool-store.c:188
 #, c-format
 msgid "'%s' is not a mailbox file."
-msgstr ""
-"â??'%s' ×?×?× ×? ×§×?×?×¥ mailbox."
+msgstr "â??'%s' ×?×?× ×? ×§×?×?×¥ mailbox."
 
-#: ../camel/providers/local/camel-spool-store.c:210
+#: ../camel/providers/local/camel-spool-store.c:207
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:220
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:220
 #, c-format
 msgid "Spool folder tree %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-spool-store.c:230
+#: ../camel/providers/local/camel-spool-store.c:232
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: ../camel/providers/local/camel-spool-store.c:238
+#: ../camel/providers/local/camel-spool-store.c:245
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#: ../camel/providers/local/camel-spool-summary.c:202
-#: ../camel/providers/local/camel-spool-summary.c:212
-#: ../camel/providers/local/camel-spool-summary.c:222
+#: ../camel/providers/local/camel-spool-summary.c:162
+#: ../camel/providers/local/camel-spool-summary.c:173
+#: ../camel/providers/local/camel-spool-summary.c:184
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-spool-summary.c:238
+#: ../camel/providers/local/camel-spool-summary.c:201
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-spool-summary.c:269
-#: ../camel/providers/local/camel-spool-summary.c:286
-#: ../camel/providers/local/camel-spool-summary.c:297
+#: ../camel/providers/local/camel-spool-summary.c:232
+#: ../camel/providers/local/camel-spool-summary.c:250
+#: ../camel/providers/local/camel-spool-summary.c:262
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in '%s'"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:176
-#: ../camel/providers/nntp/camel-nntp-folder.c:208
+#: ../camel/providers/nntp/camel-nntp-folder.c:196
+#: ../camel/providers/nntp/camel-nntp-folder.c:277
+#: ../camel/providers/nntp/camel-nntp-folder.c:318
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:349
-#: ../camel/providers/nntp/camel-nntp-folder.c:352
-#: ../camel/providers/nntp/camel-nntp-folder.c:394
-#: ../camel/providers/nntp/camel-nntp-folder.c:396
+#: ../camel/providers/nntp/camel-nntp-folder.c:245
+#: ../camel/providers/nntp/camel-nntp-folder.c:345
+#: ../camel/providers/nntp/camel-nntp-folder.c:527
+#: ../camel/providers/nntp/camel-nntp-store.c:1437
+#: ../camel/providers/nntp/camel-nntp-summary.c:395
+msgid "User cancelled the operation"
+msgstr "×?×?×©×ª×?×© ×?×?×?×? ×?×ª ×?×¤×¢×?×?×?"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:477
+#: ../camel/providers/nntp/camel-nntp-folder.c:482
+#: ../camel/providers/nntp/camel-nntp-folder.c:531
+#: ../camel/providers/nntp/camel-nntp-folder.c:536
 #, c-format
 msgid "Posting failed: %s"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:414
+#: ../camel/providers/nntp/camel-nntp-folder.c:558
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:425
+#: ../camel/providers/nntp/camel-nntp-folder.c:576
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid ""
 "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:48
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "In the subscription _dialog, show relative folder names"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:53
 msgid "USENET news"
 msgstr "×?×?×©×?×ª USENET"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:76
+#: ../camel/providers/nntp/camel-nntp-provider.c:74
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-store.c:217
+#: ../camel/providers/nntp/camel-nntp-store.c:253
+#: ../camel/providers/nntp/camel-nntp-store.c:271
+#: ../camel/providers/pop3/camel-pop3-store.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:235
+msgid "Connection canceled"
+msgstr "×?×?×?×?×?×¨ ×?×?×?×?"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:274
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-store.c:229
+#: ../camel/providers/nntp/camel-nntp-store.c:286
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "×©×¨×ª ×?-NNTP %s ×?×?×?×?×¨ ×?×ª ×?×¡×¤×¨ ×?×©×?×?×?×? %d: â??%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:406
+#: ../camel/providers/nntp/camel-nntp-store.c:474
 #, c-format
 msgid "USENET News via %s"
 msgstr "×?×?×©×?×ª USENET ×?×¨×? %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:798
+#: ../camel/providers/nntp/camel-nntp-store.c:974
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4059,76 +3654,72 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-store.c:892
+#: ../camel/providers/nntp/camel-nntp-store.c:1070
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-store.c:924
+#: ../camel/providers/nntp/camel-nntp-store.c:1109
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-store.c:949
+#: ../camel/providers/nntp/camel-nntp-store.c:1138
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-store.c:957
+#: ../camel/providers/nntp/camel-nntp-store.c:1149
 msgid "You cannot rename a folder in a News store."
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-store.c:965
+#: ../camel/providers/nntp/camel-nntp-store.c:1161
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1154
+#: ../camel/providers/nntp/camel-nntp-store.c:1298
 msgid "Authentication requested but no username provided"
 msgstr "×?×?×?×?×?×ª × ×?×¨×© ×?×?×? ×?×? ×¡×?×¤×§ ×©×? ×?×©×ª×?×©"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1166
+#: ../camel/providers/nntp/camel-nntp-store.c:1310
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1289
+#: ../camel/providers/nntp/camel-nntp-store.c:1441
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "×¤×§×?×?×ª NNTP × ×?×©×?×?: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1343
+#: ../camel/providers/nntp/camel-nntp-store.c:1497
 msgid "Not connected."
 msgstr "×?×? ×?×?×?×?×¨."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1396
+#: ../camel/providers/nntp/camel-nntp-store.c:1554
 #, c-format
 msgid "No such folder: %s"
 msgstr "×ª×?×§×?×?×? ×?×? ×§×?×?×?×ª: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:271
-#: ../camel/providers/nntp/camel-nntp-summary.c:364
+#: ../camel/providers/nntp/camel-nntp-summary.c:238
+#: ../camel/providers/nntp/camel-nntp-summary.c:340
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "â??%s: ×¡×?×¨×§ ×¢×?×?×¨ ×?×?×?×¢×?×ª ×?×?×©×?×ª"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:278
+#: ../camel/providers/nntp/camel-nntp-summary.c:249
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:378
+#: ../camel/providers/nntp/camel-nntp-summary.c:356
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:414
-msgid "Use cancel"
-msgstr ""
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:416
+#: ../camel/providers/nntp/camel-nntp-summary.c:399
 #, c-format
 msgid "Operation failed: %s"
 msgstr "×?×¤×¢×?×?×? × ×?×©×?×?: %s"
@@ -4137,525 +3728,557 @@ msgstr "×?×¤×¢×?×?×? × ×?×©×?×?: %s"
 msgid "Retrieving POP summary"
 msgstr "×?×§×?×? ×¡×?×?×?×? POP"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:269
+#: ../camel/providers/pop3/camel-pop3-folder.c:272
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "×?×? × ×?×ª×? ×?×§×?×? ×¡×?×?×?×? POP: â??%s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:312
+#: ../camel/providers/pop3/camel-pop3-folder.c:322
 msgid "Expunging old messages"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:320
+#: ../camel/providers/pop3/camel-pop3-folder.c:330
 msgid "Expunging deleted messages"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:533
-#, fuzzy, c-format
+#: ../camel/providers/pop3/camel-pop3-folder.c:563
+#: ../camel/providers/pop3/camel-pop3-folder.c:592
+#, c-format
 msgid "No message with UID %s"
-msgstr "×?×¢×?×?×¨ ×?×ª ×?×?×?×?×¢×?×ª ×?%s"
+msgstr "×?×?×? ×?×?×?×¢×? ×?×¢×?×ª ×?×?×?×? %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:540
+#: ../camel/providers/pop3/camel-pop3-folder.c:599
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "×?×§×?×? ×?×?×?×¢×ª POP %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:630
+#: ../camel/providers/pop3/camel-pop3-folder.c:696
 msgid "Unknown reason"
 msgstr "×¡×?×?×? ×?×? ×?×?×?×¢×?"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
+msgid "Message storage"
+msgstr "×©×?×?×¨×ª ×?×?×?×¢×?×ª"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
 msgstr "×?×©×?×¨ ×?×?×?×¢×?×ª ×¢×? ×?_×©×¨×ª"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "_×?×?×§ ×?×?×?×¨ %s ×?×?×?×?"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
 msgid "Disable _support for all POP3 extensions"
 msgstr "×?×? ×ª×?×¤×©×¨ ×ª×?×?×?×? ×?×?×? ×?_×ª×?×¡×¤×?×ª ×©×? POP3"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:53
 msgid "POP"
 msgstr "â??POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "×¢×?×?×¨ ×?×ª×?×?×¨×?×ª ×?×?×?×¨×?×ª ×?×?×?×¨ ×?×©×¨×ª×? POP."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
+#: ../camel/providers/pop3/camel-pop3-provider.c:72
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:84
+#: ../camel/providers/pop3/camel-pop3-provider.c:82
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:208
+#. Translators: This is the separator between an error and an explanation
+#: ../camel/providers/pop3/camel-pop3-store.c:140
+msgid ": "
+msgstr ": "
+
+#: ../camel/providers/pop3/camel-pop3-store.c:220
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
-msgstr ""
+msgstr "×?×¨×¢ ×?×©×? ×?×§×¨×?×?×ª ×?×¨×?×? ×?×©×¨×ª ×?Ö¾POPâ?? %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:225
-#: ../camel/providers/pop3/camel-pop3-store.c:239
-#: ../camel/providers/pop3/camel-pop3-store.c:249
-#: ../camel/providers/pop3/camel-pop3-store.c:255
+#: ../camel/providers/pop3/camel-pop3-store.c:238
+#: ../camel/providers/pop3/camel-pop3-store.c:269
+#: ../camel/providers/pop3/camel-pop3-store.c:275
 #, 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:226
+#: ../camel/providers/pop3/camel-pop3-store.c:239
 msgid "STLS not supported by server"
 msgstr "â??STLS ×?×? × ×ª×?×? ×¢×? ×?×?×? ×?×©×¨×ª"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:256
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:257
+#, 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:270
+msgid "TLS negotiations failed"
+msgstr "×?×?×©×? ×?×?×ª×? ×?Ö¾TLS × ×?×©×?"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:276
 msgid "TLS is not available in this build"
 msgstr "â??TLS ×?×? ×?×?×?×? ×?×?× ×?×? ×?×?×ª"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:362
+#: ../camel/providers/pop3/camel-pop3-store.c:389
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "×?×? × ×?×ª×? ×?×?×ª×?×?×¨ ×?×©×¨×ª ×?-POPâ?? %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:403
-#: ../camel/providers/pop3/camel-pop3-store.c:536
+#: ../camel/providers/pop3/camel-pop3-store.c:433
+#: ../camel/providers/pop3/camel-pop3-store.c:585
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
-msgstr ""
+msgstr "×?×? × ×?×ª×? ×?×?×ª×?×?×¨ ×?×©×¨×ª ×?Ö¾POPâ?? %s: ×?×?×? ×ª×?×?×?×? ×?×?× ×?× ×?×? ×?×?×?×?×?×ª ×?×?×?×?×§×©."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:419
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:455
 #, c-format
-msgid "SASL '%s' Login failed for POP server %s: %s"
+msgid "SASL '%s' Login failed for POP server %s%s"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:431
+#: ../camel/providers/pop3/camel-pop3-store.c:471
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:450
+#: ../camel/providers/pop3/camel-pop3-store.c:492
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:509
+#: ../camel/providers/pop3/camel-pop3-store.c:555
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
 "attack suspected. Please contact your admin."
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:550
-#: ../camel/providers/pop3/camel-pop3-store.c:563
+#: ../camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:557
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:612
+#, 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:624
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending username: %s"
+"Error sending password%s"
 msgstr ""
+"×?×? × ×?×ª×? ×?×?×ª×?×?×¨ ×?×©×¨×ª ×?Ö¾POPâ?? %s.\n"
+"×©×?×?×?×? ×?×©×?×?×?×ª ×?×¡×¡×?×?%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:668
+#: ../camel/providers/pop3/camel-pop3-store.c:740
 #, c-format
 msgid "No such folder '%s'."
 msgstr "×?×ª×?×§×?×?×? '%s' ×?×? ×§×?×?×?×ª."
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "Sendmail"
 msgstr "â??Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:40
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:115
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:98
 msgid "Could not parse recipient list"
 msgstr ""
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:146
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:130
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:167
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:151
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:237
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:244
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "×?×? × ×?×ª×? ×?×?×¨×?×¥ ×?×ª %s: ×?×?×?×?×¨ ×?×? × ×©×?×?."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:249
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:248
 msgid "sendmail"
 msgstr "â??sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:265
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:250
 msgid "Mail delivery via the sendmail program"
 msgstr "×©×?×?×?×ª ×?×?×?×¨ ×?×¢×?×¨×ª ×?×ª×?×?× ×?×ª sendmail"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:39
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
 msgid "SMTP"
 msgstr "â??SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:45
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "×?×©×?×?×?×ª ×?×?×?×¨ ×?×?×?×¦×¢×?×ª ×©×¨×ª SMTP."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:168
+#: ../camel/providers/smtp/camel-smtp-transport.c:117
 msgid "Syntax error, command unrecognized"
-msgstr ""
+msgstr "×©×?×?×?×ª ×ª×?×?×?×¨, ×?×¤×§×?×?×? ×?×?× ×? ×?×?×?×¨×ª"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:119
 msgid "Syntax error in parameters or arguments"
-msgstr ""
+msgstr "×©×?×?×?×ª ×ª×?×?×?×¨ ×?×¤×¨×?×?×?×? ×?×? ×?×?×¨×?×?×?× ×?×?×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:172
+#: ../camel/providers/smtp/camel-smtp-transport.c:121
 msgid "Command not implemented"
 msgstr "×?×¤×§×?×?×? ×?×? ×?×?×?×?×©×ª"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:174
+#: ../camel/providers/smtp/camel-smtp-transport.c:123
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:176
+#: ../camel/providers/smtp/camel-smtp-transport.c:125
 msgid "System status, or system help reply"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:178
+#: ../camel/providers/smtp/camel-smtp-transport.c:127
 msgid "Help message"
 msgstr "×?×?×?×¢×ª ×¢×?×¨×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:180
+#: ../camel/providers/smtp/camel-smtp-transport.c:129
 msgid "Service ready"
 msgstr "×?×©×?×¨×?×ª ×?×?×?×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:182
+#: ../camel/providers/smtp/camel-smtp-transport.c:131
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:133
 msgid "Service not available, closing transmission channel"
-msgstr ""
+msgstr "×?×©×?×¨×?×ª ×?×?× ×? ×?×?×?×?, ×¢×¨×?×¥ ×?×ª×¢×?×?×¨×? × ×¡×?×¨"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:186
+#: ../camel/providers/smtp/camel-smtp-transport.c:135
 msgid "Requested mail action okay, completed"
-msgstr ""
+msgstr "×¤×¢×?×?×ª ×?×?×?×?×¨ ×?×?×?×?×§×©×ª × ×§×?×?×? ×?×?×?×©×?×?×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:188
+#: ../camel/providers/smtp/camel-smtp-transport.c:137
 msgid "User not local; will forward to <forward-path>"
-msgstr ""
+msgstr "×?×?×©×ª×?×© ×?×?× ×? ×?×§×?×?×?; ×ª×?×?×¦×¢ ×?×¢×?×¨×? ×?Ö¾<forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:190
+#: ../camel/providers/smtp/camel-smtp-transport.c:139
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr ""
+msgstr "×¤×¢×?×?×ª ×?×?×?×?×¨ ×?×?×?×?×§×©×ª ×?×? ×?×?×¦×¢×?: ×ª×?×?×ª ×?×?×?×?×¨ ×?×?× ×? ×?×?×?× ×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
+#: ../camel/providers/smtp/camel-smtp-transport.c:141
 msgid "Requested action not taken: mailbox unavailable"
-msgstr ""
+msgstr "×?×¤×¢×?×?×? ×?×?×?×?×§×©×ª ×?×? ×?×?×¦×¢×?: ×ª×?×?×ª ×?×?×?×?×¨ ×?×?× ×? ×?×?×?× ×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:194
+#: ../camel/providers/smtp/camel-smtp-transport.c:143
 msgid "Requested action aborted: error in processing"
-msgstr ""
+msgstr "×?×¤×¢×?×?×? ×?×?×?×?×§×©×ª ×?×?×?×?×?: ×©×?×?×?×? ×?×¢×ª ×?×¢×?×?×?×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
+#: ../camel/providers/smtp/camel-smtp-transport.c:145
 msgid "User not local; please try <forward-path>"
-msgstr ""
+msgstr "×?×?×©×ª×?×© ×?×?× ×? ×?×§×?×?×?; × ×? ×?× ×¡×?×ª <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:198
+#: ../camel/providers/smtp/camel-smtp-transport.c:147
 msgid "Requested action not taken: insufficient system storage"
-msgstr ""
+msgstr "×?×¤×¢×?×?×? ×?×?×?×?×§×©×ª ×?×? × × ×§×?×?: ×?×?×¡×?×? ×?×?×¢×¨×?×ª ×?×?× ×? ×?×¡×¤×?×§"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:149
 msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr ""
+msgstr "×¤×¢×?×?×ª ×?×?×?×?×¨ ×?×?×?×?×§×©×ª ×?×?×?×?×?: ×?×¨×?×?×? ×?×?×§×¦×?×ª ×©×?×? ×?×?×?×¡×?×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
+#: ../camel/providers/smtp/camel-smtp-transport.c:151
 msgid "Requested action not taken: mailbox name not allowed"
-msgstr ""
+msgstr "×?×¤×¢×?×?×? ×?×?×?×?×§×©×ª ×?×? × × ×§×?×?: ×©×? ×ª×?×?×ª ×?×?×?×?×¨ ×?×?× ×? ×?×?×¨×©×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:204
+#: ../camel/providers/smtp/camel-smtp-transport.c:153
 msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr ""
+msgstr "×?×ª×?×?×ª ×§×?×? ×?×?×?×?\"×?; ×?×© ×?×¡×?×?×? ×¢×? <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:206
+#: ../camel/providers/smtp/camel-smtp-transport.c:155
 msgid "Transaction failed"
-msgstr ""
+msgstr "×?×?×¢×?×¨×? ×?×©×?×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:210
+#: ../camel/providers/smtp/camel-smtp-transport.c:159
 msgid "A password transition is needed"
-msgstr ""
+msgstr "× ×?×¨×©×ª ×?×¢×?×¨×ª ×¡×¡×?×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:212
+#: ../camel/providers/smtp/camel-smtp-transport.c:161
 msgid "Authentication mechanism is too weak"
 msgstr "×©×?×?×ª ×?×?×?×?×?×ª ×?×?×©×? ×?×?×?×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:214
+#: ../camel/providers/smtp/camel-smtp-transport.c:163
 msgid "Encryption required for requested authentication mechanism"
-msgstr ""
+msgstr "×?×?×¦×¤× ×? ×?× ×?×¨×©×ª ×¢×?×?×¨ ×?× ×?× ×?×? ×?×?×?×?×?×ª ×?×?×?×?×§×©"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:216
+#: ../camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Temporary authentication failure"
-msgstr ""
+msgstr "×?×©×? ×?×?× ×? ×?×?×?×?×?×ª"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:297
+#: ../camel/providers/smtp/camel-smtp-transport.c:260
 msgid "Welcome response error"
-msgstr ""
+msgstr "×©×?×?×?×? ×?×ª×?×?×?×ª ×§×?×?×ª ×?×¤× ×?×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
-#: ../camel/providers/smtp/camel-smtp-transport.c:365
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
+#: ../camel/providers/smtp/camel-smtp-transport.c:296
+#: ../camel/providers/smtp/camel-smtp-transport.c:330
+#: ../camel/providers/smtp/camel-smtp-transport.c:337
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "× ×?×©×? ×?×?×ª×?×?×¨×?×ª ×?×©×¨×ª ×?-SMTP â??%s ×?×?×¦×? ×?×?×?×?: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:341
+#: ../camel/providers/smtp/camel-smtp-transport.c:306
 #, c-format
 msgid "STARTTLS command failed: %s"
 msgstr "×¤×§×?×?×ª STARTTLS × ×?×©×?×?: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:356
+#: ../camel/providers/smtp/camel-smtp-transport.c:320
 msgid "STARTTLS command failed"
 msgstr "×¤×§×?×?×ª STARTTLS × ×?×©×?×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:497
+#: ../camel/providers/smtp/camel-smtp-transport.c:465
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
-msgstr ""
+msgstr "×©×¨×ª ×?Ö¾SMTPâ?? %s ×?×?× ×? ×ª×?×?×? ×?×¡×?×? ×?×?×¦×¤× ×? ×?×?×?×?×§×© %s."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:568
+#: ../camel/providers/smtp/camel-smtp-transport.c:537
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
 "%s\n"
 "\n"
 msgstr ""
+"×?×? × ×?×ª×? ×?×?×ª×?×?×ª ×?×?×? ×©×¨×ª ×?Ö¾SMTP.\n"
+"%s\n"
+"\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:701
+#: ../camel/providers/smtp/camel-smtp-transport.c:675
 #, c-format
 msgid "SMTP server %s"
 msgstr "×©×¨×ª SMTP %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:703
+#: ../camel/providers/smtp/camel-smtp-transport.c:677
 #, c-format
 msgid "SMTP mail delivery via %s"
-msgstr ""
+msgstr "×©×?×?×?×ª ×?×?×?\"×? SMTP ×?×¨×? %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:721
+#: ../camel/providers/smtp/camel-smtp-transport.c:696
 msgid "Cannot send message: service not connected."
-msgstr ""
+msgstr "×?×? × ×?×ª×? ×?×©×?×?×? ×?×?×?×¢×?: ×?×©×?×¨×?×ª ×?×?× ×? ×?×?×?×?×¨."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:703
 msgid "Cannot send message: sender address not valid."
-msgstr ""
+msgstr "×?×? × ×?×ª×? ×?×©×?×?×? ×?×ª ×?×?×?×?×¢×?: ×?×ª×?×?×ª ×?×©×?×?×? ×?×?× ×? ×ª×§× ×?×ª."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:731
+#: ../camel/providers/smtp/camel-smtp-transport.c:707
 msgid "Sending message"
 msgstr "×©×?×?×? ×?×?×?×¢×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:746
+#: ../camel/providers/smtp/camel-smtp-transport.c:723
 msgid "Cannot send message: no recipients defined."
-msgstr ""
+msgstr "×?×? × ×?×ª×? ×?×©×?×?×? ×?×ª ×?×?×?×?×¢×?: ×?×? ×?×?×?×?×¨×? × ×?×¢× ×?×?."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:757
+#: ../camel/providers/smtp/camel-smtp-transport.c:735
 msgid "Cannot send message: one or more invalid recipients"
-msgstr ""
+msgstr "×?×? × ×?×ª×? ×?×©×?×?×? ×?×?×?×¢×?: × ×?×¢×? ×?×?×? ×?×? ×?×?×ª×¨ ×©×?×?×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:986
+#: ../camel/providers/smtp/camel-smtp-transport.c:972
 msgid "SMTP Greeting"
 msgstr "SMTP Greeting"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1011
+#: ../camel/providers/smtp/camel-smtp-transport.c:997
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "×¤×§×?×?×ª HELO × ×?×©×?×?: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1028
+#: ../camel/providers/smtp/camel-smtp-transport.c:1014
 msgid "HELO command failed"
 msgstr "×¤×§×?×?×ª HELO × ×?×©×?×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1094
+#: ../camel/providers/smtp/camel-smtp-transport.c:1081
 msgid "SMTP Authentication"
 msgstr "SMTP Authentication"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1100
+#: ../camel/providers/smtp/camel-smtp-transport.c:1088
 msgid "Error creating SASL authentication object."
 msgstr "Error creating SASL authentication object."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1117
-#: ../camel/providers/smtp/camel-smtp-transport.c:1128
+#: ../camel/providers/smtp/camel-smtp-transport.c:1105
+#: ../camel/providers/smtp/camel-smtp-transport.c:1116
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "AUTH command failed: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1134
+#: ../camel/providers/smtp/camel-smtp-transport.c:1124
 msgid "AUTH command failed"
 msgstr "AUTH command failed"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1204
+#: ../camel/providers/smtp/camel-smtp-transport.c:1195
 msgid "Bad authentication response from server.\n"
 msgstr "Bad authentication response from server.\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1231
+#: ../camel/providers/smtp/camel-smtp-transport.c:1222
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "MAIL FROM command failed: %s: mail not sent"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1248
+#: ../camel/providers/smtp/camel-smtp-transport.c:1237
 msgid "MAIL FROM command failed"
 msgstr "MAIL FROM command failed"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1272
+#: ../camel/providers/smtp/camel-smtp-transport.c:1261
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "RCPT TO command failed: %s: mail not sent"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1291
+#: ../camel/providers/smtp/camel-smtp-transport.c:1280
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> failed"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1331
-#: ../camel/providers/smtp/camel-smtp-transport.c:1400
-#: ../camel/providers/smtp/camel-smtp-transport.c:1419
+#: ../camel/providers/smtp/camel-smtp-transport.c:1320
+#: ../camel/providers/smtp/camel-smtp-transport.c:1395
+#: ../camel/providers/smtp/camel-smtp-transport.c:1413
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "DATA command failed: %s: mail not sent"
 
-#. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1348
-#: ../camel/providers/smtp/camel-smtp-transport.c:1435
+#: ../camel/providers/smtp/camel-smtp-transport.c:1337
+#: ../camel/providers/smtp/camel-smtp-transport.c:1426
 msgid "DATA command failed"
 msgstr "DATA command failed"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1458
+#: ../camel/providers/smtp/camel-smtp-transport.c:1449
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "RSET command failed: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1474
+#: ../camel/providers/smtp/camel-smtp-transport.c:1464
 msgid "RSET command failed"
 msgstr "RSET command failed"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1497
+#: ../camel/providers/smtp/camel-smtp-transport.c:1487
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "QUIT command failed: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1511
+#: ../camel/providers/smtp/camel-smtp-transport.c:1503
 msgid "QUIT command failed"
 msgstr "QUIT command failed"
 
-#: ../libedataserver/e-categories.c:45
+#: ../libedataserver/e-categories.c:44
 msgid "Business"
 msgstr "×¢×¡×§×?×?"
 
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:45
 msgid "Competition"
 msgstr "×ª×?×¨×?×ª"
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:46
 msgid "Favorites"
 msgstr "×?×?×¢×?×¤×?×?"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:47
 msgid "Gifts"
 msgstr "×?×ª× ×?×ª"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:48
 msgid "Goals/Objectives"
 msgstr "×?×?×¨×?×ª/×?×¢×?×?×?"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:49
 msgid "Holiday"
 msgstr "×?×?"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:50
 msgid "Holiday Cards"
 msgstr "×?×¨×?×?×¡×? ×?×¨×?×?"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:52
 msgid "Hot Contacts"
 msgstr "×?× ×©×? ×§×©×¨ ×?×©×?×?×?×?"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:53
 msgid "Ideas"
 msgstr "×¨×¢×?×?× ×?×ª"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:54
 msgid "International"
 msgstr "×?×?×?-×?×?×?×?×?"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:55
 msgid "Key Customer"
 msgstr "×?×§×?×? ×?×©×?×?"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:56
 msgid "Miscellaneous"
 msgstr "×?×?×?×?"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:57
 msgid "Personal"
 msgstr "×?×?×©×?"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:58
 msgid "Phone Calls"
 msgstr "×©×?×?×?×ª ×?×?×¤×?×?"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:60
 msgid "Status"
 msgstr "×?×¦×?"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:61
 msgid "Strategies"
 msgstr "×?×¡×?×¨×?×?×?×?×ª"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:62
 msgid "Suppliers"
 msgstr "×¡×¤×§×?×?"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:63
 msgid "Time & Expenses"
 msgstr "×?×?×? ×?×?×?×¦×?×?×ª"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:64
 msgid "VIP"
 msgstr "×?×?\"×?×?×?"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:65
 msgid "Waiting"
 msgstr "×?×?×ª×?×?"
 
@@ -4663,7 +4286,7 @@ msgstr "×?×?×ª×?×?"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1644 ../libedataserver/e-time-utils.c:1911
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1902
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
@@ -4671,7 +4294,7 @@ msgstr "%a %d/%m/%Y %I:%M:%S %p"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1649 ../libedataserver/e-time-utils.c:1902
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1893
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
@@ -4679,7 +4302,7 @@ msgstr "%a %d/%m/%Y %H:%M:%S"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1654 ../libedataserver/e-time-utils.c:1907
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1898
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
@@ -4687,78 +4310,78 @@ msgstr "%a %m/%d/%Y %I:%M %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1659 ../libedataserver/e-time-utils.c:1898
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1889
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1664
+#: ../libedataserver/e-time-utils.c:1655
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %m/%d/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1669
+#: ../libedataserver/e-time-utils.c:1660
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %m/%d/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1672 ../libedataserver/e-time-utils.c:1773
-#: ../libedataserver/e-time-utils.c:1893
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c: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:1680
+#: ../libedataserver/e-time-utils.c:1670
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%m/%d/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1684
+#: ../libedataserver/e-time-utils.c:1674
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%m/%d/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1689
+#: ../libedataserver/e-time-utils.c:1679
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%m/%d/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1694
+#: ../libedataserver/e-time-utils.c:1684
 msgid "%m/%d/%Y %H:%M"
 msgstr "%m/%d/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1699
+#: ../libedataserver/e-time-utils.c:1689
 msgid "%m/%d/%Y %I %p"
 msgstr "%m/%d/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1704
+#: ../libedataserver/e-time-utils.c:1694
 msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1707 ../libedataserver/e-time-utils.c:1776
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1768
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1834 ../libedataserver/e-time-utils.c:1956
+#: ../libedataserver/e-time-utils.c: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:1838 ../libedataserver/e-time-utils.c:1948
+#: ../libedataserver/e-time-utils.c:1830 ../libedataserver/e-time-utils.c:1938
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4766,405 +4389,573 @@ msgstr "%H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1843 ../libedataserver/e-time-utils.c:1953
+#: ../libedataserver/e-time-utils.c: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:1847 ../libedataserver/e-time-utils.c:1945
+#: ../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:1850
+#: ../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:1854
+#: ../libedataserver/e-time-utils.c:1846
 msgid "%I %p"
 msgstr "%I %p"
 
 #: ../libedataserverui/e-book-auth-util.c:90
 msgid "Accessing LDAP Server anonymously"
-msgstr ""
+msgstr "×?×ª×?×¦×¢×ª ×?×?×©×? ×?× ×?× ×?×?×?×ª ×?×©×¨×ª LDAP"
 
 #: ../libedataserverui/e-book-auth-util.c:192
 msgid "Failed to authenticate.\n"
 msgstr "× ×?×¡×?×?×? ×?×?×?×?×?×?×ª × ×?×©×?.\n"
 
-#: ../libedataserverui/e-categories-dialog.c:362
+#: ../libedataserverui/e-categories-dialog.c:145
+msgid "Category Icon"
+msgstr "×?×?×§×?×? ×§×?×?×?×¨×?×?"
+
+#: ../libedataserverui/e-categories-dialog.c:151
+msgid "_No Image"
+msgstr "_×?×?×? ×ª×?×?× ×?"
+
+#: ../libedataserverui/e-categories-dialog.c:372
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
-msgstr ""
+msgstr "×?×?×¨ ×?×© ×§×?×?×?×¨×?×? ×?×©×? '%s' ×?×ª×¦×?×¨×?. × ×? ×?×?×©×ª×?×© ×?×©×? ×?×?×¨"
 
-#: ../libedataserverui/e-categories-dialog.c:523
+#: ../libedataserverui/e-categories-dialog.c:680
 msgid "Icon"
 msgstr "×?×?×§×?×?"
 
-#: ../libedataserverui/e-categories-dialog.c:528
+#: ../libedataserverui/e-categories-dialog.c:685
 msgid "Category"
 msgstr "×§×?×?×?×¨×?×?"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:1
-msgid "Category Icon"
-msgstr "×?×?×§×?×? ×§×?×?×?×¨×?×?"
-
-#: ../libedataserverui/e-categories-dialog.glade.h:2
+#: ../libedataserverui/e-categories-dialog.ui.h:1
 msgid "Category Properties"
 msgstr "×?×?×¤×?×?× ×? ×§×?×?×?×¨×?×?"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:3
+#: ../libedataserverui/e-categories-dialog.ui.h:2
 msgid "Category _Icon"
 msgstr "_×?×?×§×?×? ×§×?×?×?×¨×?×?"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:4
+#: ../libedataserverui/e-categories-dialog.ui.h:3
 msgid "Category _Name"
 msgstr "_×©×? ×§×?×?×?×¨×?×?"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:5
-msgid "Item(s) belong to these _categories:"
-msgstr "×¤×¨×?×?×?×? ×©×©×?×?×?×?×? ×?_×§×?×?×?×¨×?×?×ª ×?×?×?::"
+#: ../libedataserverui/e-categories-dialog.ui.h:4
+msgid "Currently _used categories:"
+msgstr "×§×?×?×?×¨×?×?×ª ×?_×©×?×?×?×© ×?×¨×?×¢:"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:6
+#: ../libedataserverui/e-categories-dialog.ui.h:5
 msgid "_Available Categories:"
 msgstr "×§×?×?×?×¨×?×?×ª _×?×?×?× ×?×ª:"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:7
+#: ../libedataserverui/e-categories-dialog.ui.h:6
 msgid "_Edit"
 msgstr "_×¢×¨×?×?×?"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:8
+#: ../libedataserverui/e-categories-dialog.ui.h:7
 msgid "categories"
 msgstr "×§×?×?×?×¨×?×?×ª"
 
-#: ../libedataserverui/e-name-selector-dialog.c:272
+#: ../libedataserverui/e-category-completion.c:292
+#, c-format
+msgid "Create category \"%s\""
+msgstr "×?×¦×?×¨×ª ×?×§×?×?×?×¨×?×? \"%s\""
+
+#: ../libedataserverui/e-name-selector-dialog.c:319
 msgid "Select Contacts from Address Book"
 msgstr "×?×?×¨ ×?× ×©×? ×§×©×¨ ×?×¡×¤×¨ ×?×ª×?×?×?×ª"
 
-#: ../libedataserverui/e-name-selector-dialog.c:559
+#: ../libedataserverui/e-name-selector-dialog.c:658
 msgid "_Add"
 msgstr "_×?×?×¡×£"
 
-#: ../libedataserverui/e-name-selector-dialog.c:584
+#: ../libedataserverui/e-name-selector-dialog.c:662
 msgid "_Remove"
 msgstr "×?_×¡×¨"
 
-#: ../libedataserverui/e-name-selector-dialog.c:761
-#: ../libedataserverui/e-name-selector-dialog.glade.h:6
+#: ../libedataserverui/e-name-selector-dialog.c:853
+#: ../libedataserverui/e-name-selector-dialog.ui.h:6
 msgid "Any Category"
 msgstr "×?×? ×§×?×?×?×¨×?×?"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:1
+#: ../libedataserverui/e-name-selector-dialog.ui.h:1
 msgid "*"
 msgstr "*"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:2
+#: ../libedataserverui/e-name-selector-dialog.ui.h:2
 msgid "<b>Co_ntacts</b>"
 msgstr "â??<b>_×?× ×©×? ×§×©×¨</b>"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:3
+#: ../libedataserverui/e-name-selector-dialog.ui.h:3
 msgid "<b>Show Contacts</b>"
 msgstr "<b>×?×¦×? ×?× ×©×? ×§×©×¨</b>"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:4
+#: ../libedataserverui/e-name-selector-dialog.ui.h:4
 msgid "Address B_ook:"
 msgstr "×¡×¤×¨ _×?×ª×?×?×?×ª:"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:5
+#: ../libedataserverui/e-name-selector-dialog.ui.h:5
 msgid "Address Book"
 msgstr "×¡×¤×¨ ×?×ª×?×?×?×ª"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:7
+#: ../libedataserverui/e-name-selector-dialog.ui.h:7
 msgid "Cate_gory:"
 msgstr "_×§×?×?×?×¨×?×?:"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:8
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:261
+#: ../libedataserverui/e-name-selector-dialog.ui.h:8
 msgid "Contacts"
 msgstr "×?× ×©×? ×§×©×¨"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:9
+#: ../libedataserverui/e-name-selector-dialog.ui.h:9
 msgid "Search"
 msgstr "×?×?×¤×?×©"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:10
+#: ../libedataserverui/e-name-selector-dialog.ui.h:10
 msgid "_Search:"
 msgstr "_×?×?×¤×?×©:"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2456
+#: ../libedataserverui/e-name-selector-entry.c:2559
 #, c-format
 msgid "E_xpand %s Inline"
-msgstr ""
+msgstr "×?×¨_×?×?×ª %s ×?×?×?"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2471
+#: ../libedataserverui/e-name-selector-entry.c:2574
 #, c-format
 msgid "Cop_y %s"
 msgstr "×?_×¢×ª×§ %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2481
+#: ../libedataserverui/e-name-selector-entry.c:2584
 #, c-format
 msgid "C_ut %s"
 msgstr "_×?×?×?×¨ %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2498
+#: ../libedataserverui/e-name-selector-entry.c:2601
 #, c-format
 msgid "_Edit %s"
 msgstr "_×¢×¨×?×? %s"
 
-#: ../libedataserverui/e-name-selector-list.c:467
+#: ../libedataserverui/e-name-selector-list.c:517
 #, c-format
 msgid "_Delete %s"
 msgstr "_×?×?×§ %s"
 
-#: ../libedataserverui/e-passwords.c:234
+#: ../libedataserverui/e-passwords.c:257
 #, c-format
 msgid "Keyring key is unusable: no user or host name"
-msgstr ""
+msgstr "×?×?×¤×ª×? ×?×§×?×?×¦×ª ×?×?×¤×ª×?×?×ª ×?×?× ×? ×©×?×?×©: ×?×?×? ×?×©×ª×?×© ×?×? ×©×? ×?×?×¨×?"
 
-#: ../libedataserverui/e-passwords.c:1094
+#: ../libedataserverui/e-passwords.c:1116
 msgid "You have the Caps Lock key on."
 msgstr "×?×§×© ×?-Caps Lock ×?×?×?×§."
 
-#: ../libedataserverui/e-passwords.c:1214
-#, fuzzy
+#: ../libedataserverui/e-passwords.c:1238
 msgid "_Remember this passphrase"
-msgstr "_×?×?×?×¨ ×?×ª ×?×¡×?×¡×?×?"
+msgstr "_×©×?×?×¨×ª ×?×?×?×ª ×¦×?×¤×? ×?×?"
 
-#: ../libedataserverui/e-passwords.c:1215
-#, fuzzy
+#: ../libedataserverui/e-passwords.c:1239
 msgid "_Remember this passphrase for the remainder of this session"
-msgstr "×?_×?×?×¨ ×?×ª ×?×¡×?×¡×?×? ×¢×? ×¡×?×£ ×?×¤×¢×?×? ×?×?"
+msgstr "×©_×©×?×?×¨×ª ×?×?×?×ª ×¦×?×¤×? ×?×? ×?×?×©×? ×?×?×¤×¢×?×? ×?× ×?×?×?×?×ª"
 
-#: ../libedataserverui/e-passwords.c:1220
+#: ../libedataserverui/e-passwords.c:1244
 msgid "_Remember this password"
 msgstr "_×?×?×?×¨ ×?×ª ×?×¡×?×¡×?×?"
 
-#: ../libedataserverui/e-passwords.c:1221
+#: ../libedataserverui/e-passwords.c:1245
 msgid "_Remember this password for the remainder of this session"
 msgstr "×?_×?×?×¨ ×?×ª ×?×¡×?×¡×?×? ×¢×? ×¡×?×£ ×?×¤×¢×?×? ×?×?"
 
 #. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:95
+#: ../libedataserverui/e-source-selector-dialog.c:100
 msgid "Select destination"
 msgstr "×?×?×¨ ×?×¢×?"
 
-#: ../libedataserverui/e-source-selector-dialog.c:148
+#: ../libedataserverui/e-source-selector-dialog.c:172
 msgid "_Destination"
 msgstr "×?×¢_×?"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1698
-#: ../servers/exchange/storage/exchange-account.c:959
-#, c-format
-msgid "Enter password for %s"
-msgstr "×?×?× ×¡ ×¡×?×¡×?×? ×¢×?×?×¨ %s"
+#: ../servers/groupwise/e-gw-connection.c:227
+msgid "Invalid connection"
+msgstr "×?×?×?×?×¨ ×?×? ×ª×§×?×?"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1699
-#: ../servers/exchange/storage/exchange-account.c:964
-msgid "Enter password"
-msgstr "×?×?× ×¡ ×¡×?×¡×?×?"
+#: ../servers/groupwise/e-gw-connection.c:231
+msgid "Invalid response from server"
+msgstr "×ª×?×?×?×? ×?×?×ª×? ×¦×¤×?×?×?×? ×?×?×©×¨×ª"
 
-#. i18n: These are Outlook's words for the default roles in
-#. the folder permissions dialog.
-#: ../servers/exchange/lib/e2k-security-descriptor.c:847
-msgid "Owner"
-msgstr "×?×¢×?×?×?"
+#: ../servers/groupwise/e-gw-connection.c:233
+msgid "No response from the server"
+msgstr "×?×?×? ×ª×?×?×?×? ×?×?×©×¨×ª"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:857
-msgid "Publishing Editor"
-msgstr ""
+#: ../servers/groupwise/e-gw-connection.c:239
+msgid "Bad parameter"
+msgstr "×¤×¨×?×?×¨ ×©×?×?×?"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:865
-msgid "Editor"
-msgstr "×¢×?×¨×?"
+#~ msgid "book busy"
+#~ msgstr "×?×¡×¤×¨ ×¢×¡×?×§"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:872
-msgid "Publishing Author"
-msgstr ""
+#~ msgid "CORBA exception making \"%s\" call"
+#~ msgstr "×©×?×?×?×ª CORBA ×?×§×¨×?×?×? ×?-\"%s\""
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:878
-msgid "Author"
-msgstr "×?×?×?×¨"
+#~ msgid "%s: there is no current operation"
+#~ msgstr "â??%s: ×?×?×? ×¤×¢×?×?×? × ×?×?×?×?×ª"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:883
-msgid "Non-editing Author"
-msgstr ""
+#~ msgid "%s: could not cancel"
+#~ msgstr "â??%s: ×?×? × ×?×ª×? ×?×?×?×?"
+
+#~ msgid "%s: canceled"
+#~ msgstr "â??%s: ×?×?×?×?"
+
+#~ msgid "%s: Could not create EBookListener"
+#~ msgstr "â??%s: ×?×? × ×?×ª×? ×?×?×¦×?×¨ EBookListener"
+
+#~ msgid "Failed to create create child process '%s': %s"
+#~ msgstr "Failed to create create child process '%s': %s"
+
+#~ msgid "Kerberos 4"
+#~ msgstr "Kerberos 4"
+
+#~ msgid "Decoder failed, error %d"
+#~ msgstr "×?×¤×¢× ×? × ×?×©×?, ×©×?×?×?×? %d"
+
+#~ msgid "import keys: unimplemented"
+#~ msgstr "×?×?×?×? ×?×¤×ª×?×?×ª: ×?×? ×?×?×?×?×©"
+
+#~ msgid "export keys: unimplemented"
+#~ msgstr "×?×¦×?×? ×?×¤×ª×?×?×ª: ×?×? ×?×?×?×?×©"
+
+#~ msgid "Unable to get issuer's certificate"
+#~ msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×ª×¢×?×?×ª ×?×?× ×¤×?×§"
+
+#~ msgid "Certificate signature failure"
+#~ msgstr "×©×?×?×?×ª ×?×ª×?×?×ª ×?×?×?×¢×?"
+
+#~ msgid "Certificate not yet valid"
+#~ msgstr "×?×ª×¢×?×?×? ×¢×?×?×?×? ×?×? ×?×ª×?×§×£"
+
+#~ msgid "Certificate has expired"
+#~ msgstr "×¤×? ×ª×?×§×£ ×?×ª×¢×?×?×?"
+
+#~ msgid "CRL not yet valid"
+#~ msgstr "×?-CRL ×¢×?×?×?×? ×?×? ×?×ª×?×§×£"
+
+#~ msgid "CRL has expired"
+#~ msgstr "×¤×? ×ª×?×§×£ ×?-CRL"
+
+#~ msgid "Error in CRL"
+#~ msgstr "×©×?×?×?×? ×?-CRL"
+
+#~ msgid "Out of memory"
+#~ msgstr "×?×?×? ×?×?×¨×?×?"
+
+#~ msgid "Certificate rejected"
+#~ msgstr "×?×ª×¢×?×?×? × ×?×?×ª×?"
+
+#~ msgid "Error in application verification"
+#~ msgstr "×©×?×?×?×? ×?×?×?×?×?×?×? ×?×?×?×©×?×?"
+
+#~ msgid "Hula"
+#~ msgstr "â??Hula"
+
+#~ msgid "For accessing Hula servers"
+#~ msgstr "×¢×?×?×¨ ×?×?×©×? ×?×©×¨×ª×? Hula"
+
+#~ msgid ""
+#~ "This option will connect to the Hula server using a plaintext password."
+#~ msgstr "×?×¤×©×¨×?×ª ×?×?×ª ×ª×ª×?×?×¨ ×?×©×¨×ª ×?-Hula ×?×¢×?×¨×ª ×¡×?×¡×?×ª ×?×§×¡×? ×¤×©×?×?."
+
+#~ msgid "Drafts"
+#~ msgstr "×?×?×?×?×?×ª"
+
+#~ msgid "Sent"
+#~ msgstr "× ×©×?×?"
+
+#~ msgid "Templates"
+#~ msgstr "×ª×?× ×?×?×ª"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:887
 #, fuzzy
-msgid "Reviewer"
-msgstr "×ª_×¦×?×?×? ×?×§×?×?×?×?:"
+#~ msgid "Cannot select folder '%s': Invalid mailbox name"
+#~ msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:889
-msgid "Contributor"
-msgstr "×ª×?×¨×?"
+#, fuzzy
+#~ msgid "Cannot select folder '%s': Bad command"
+#~ msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:891
-msgid "None"
-msgstr "×?×?×?"
+#, fuzzy
+#~ msgid "Failed to send command to IMAP server %s: %s"
+#~ msgstr "Failed to store mail in temp file %s: %s"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:906
-msgid "Custom"
-msgstr "×?×?×ª×?×? ×?×?×©×?×ª"
+#~ msgid "service unavailable"
+#~ msgstr "â??×©×?×¨×?×ª ×?×? ×?×?×?×?"
 
-#: ../servers/exchange/storage/e-storage.c:555
-msgid "Generic error"
-msgstr "×©×?×?×?×? ×?×?×?×?×ª"
+#~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
+#~ msgstr "×©×¨×ª IMAP4 â??%s ×?×ª× ×ª×§ ×?×?×?×¤×? ×¤×ª×?×?×?×?: %s"
 
-#: ../servers/exchange/storage/e-storage.c:557
-msgid "A folder with the same name already exists"
-msgstr "×ª×?×§×?×?×? ×?×©×? ×?×? ×?×?×¨ ×§×?×?×?×ª"
+#, fuzzy
+#~ msgid "Expire cached messages that haven't been read in X seconds"
+#~ msgstr "×¡×?×? ×?×ª ×?×?×?×?×¢×?×ª ×©× ×?×?×¨×? ×?×?×?×?×? × ×§×¨×?×?"
 
-#: ../servers/exchange/storage/e-storage.c:559
-msgid "The specified folder type is not valid"
-msgstr "×¡×?×? ×?×ª×?×§×?×?×? ×©×¦×?×?×?× ×? ×?×?× ×? ×ª×§×?×?"
+#, fuzzy
+#~ msgid "Cannot access folder '%s': %s"
+#~ msgstr "×?×?×¦×¨ ×?×ª ×?×ª×?×§×?×?×? `%s'"
 
-#: ../servers/exchange/storage/e-storage.c:561
-msgid "I/O error"
-msgstr "×©×?×?×?×ª ×§×?×?/×¤×?×?"
+#, fuzzy
+#~ msgid "Cannot sync flags to folder '%s': Unknown error"
+#~ msgstr "×?×¢×ª×?×§ ×?×?×?×¢×?×ª ×?×? ×?×ª×?×§×?×?×? %s"
 
-#: ../servers/exchange/storage/e-storage.c:563
-msgid "Not enough space to create the folder"
-msgstr "×?×?×? ×?×¡×¤×?×§ ×?×§×?×? ×?×?×¦×?×¨ ×?×ª ×?×ª×?×§×?×?×?:"
+#, fuzzy
+#~ msgid "Cannot sync flags to folder '%s': Bad command"
+#~ msgstr "×?×¢×ª×?×§ ×?×?×?×¢×?×ª ×?×? ×?×ª×?×§×?×?×? %s"
 
-#: ../servers/exchange/storage/e-storage.c:565
-msgid "The folder is not empty"
-msgstr "×?×ª×?×§×?×?×? ×?×?× ×? ×¨×?×§×?"
+#, fuzzy
+#~ msgid "Cannot expunge folder '%s': Unknown error"
+#~ msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
 
-#: ../servers/exchange/storage/e-storage.c:567
-msgid "The specified folder was not found"
-msgstr "×?×ª×?×§×?×?×? ×©×¦×?×?×?× ×? ×?×? × ×?×¦×?×?"
+#, fuzzy
+#~ msgid "Cannot expunge folder '%s': Bad command"
+#~ msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
 
-#: ../servers/exchange/storage/e-storage.c:569
-msgid "Function not implemented in this storage"
-msgstr ""
+#, fuzzy
+#~ msgid "Cannot get message %s from folder '%s': No such message"
+#~ msgstr "×?×¢×ª×?×§ ×?×?×?×¢×?×ª ×?×? ×?×ª×?×§×?×?×? %s"
 
-#: ../servers/exchange/storage/e-storage.c:573
-msgid "Operation not supported"
-msgstr "×¤×¢×?×?×? ×?×? × ×ª×?×?×ª"
+#, fuzzy
+#~ msgid "Cannot append message to folder '%s': Folder is read-only"
+#~ msgstr "×?×¢×ª×?×§ ×?×?×?×¢×?×ª ×?×? ×?×ª×?×§×?×?×? %s"
 
-#: ../servers/exchange/storage/e-storage.c:575
-msgid "The specified type is not supported in this storage"
-msgstr ""
+#, fuzzy
+#~ msgid "Cannot append message to folder '%s': Unknown error"
+#~ msgstr "×?×¢×ª×?×§ ×?×?×?×¢×?×ª ×?×? ×?×ª×?×§×?×?×? %s"
 
-#: ../servers/exchange/storage/e-storage.c:577
-msgid "The specified folder cannot be modified or removed"
-msgstr "×?×? × ×?×ª×? ×?×©× ×?×ª ×?×? ×?×?×¡×?×¨ ×?×ª ×?×ª×?×§×?×?×? ×©×¦×?×?×?× ×?"
+#, fuzzy
+#~ msgid "Cannot append message to folder '%s': Bad command"
+#~ msgstr "×?×¢×ª×?×§ ×?×?×?×¢×?×ª ×?×? ×?×ª×?×§×?×?×? %s"
 
-#: ../servers/exchange/storage/e-storage.c:579
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "×?×? × ×?×ª×? ×?×?×¤×?×? ×ª×?×§×?×?×? ×?×¦×?×¦×?×?×ª ×©×? ×?×?×ª ×?×?×?×¨×©×?×ª ×©×?×?"
+#, fuzzy
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr "×?×¢×ª×?×§ ×?×?×?×¢×?×ª ×?×? ×?×ª×?×§×?×?×? %s"
 
-#: ../servers/exchange/storage/e-storage.c:581
-msgid "Cannot create a folder with that name"
-msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×ª×?×§×?×?×? ×?×©×? ×?×?"
+#, fuzzy
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr "×?×¢×ª×?×§ ×?×?×?×¢×?×ª ×?×? ×?×ª×?×§×?×?×? %s"
 
-#: ../servers/exchange/storage/e-storage.c:583
-msgid "This operation cannot be performed in off-line mode"
-msgstr "×?×? × ×?×ª×? ×?×?×¦×¢ ×?×ª ×¤×¢×?×?×? ×?×?×ª ×?×?×¦×? ×?×? ×?×§×?×?×?"
+#, fuzzy
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr "×?×¢×ª×?×§ ×?×?×?×¢×?×ª ×?×? ×?×ª×?×§×?×?×? %s"
 
-#. i18n: This is the title of an "other user's folders"
-#. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:642
-#, c-format
-msgid "%s's Folders"
-msgstr "×?×ª×?×§×?×?×ª ×©×? %s"
+#, fuzzy
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr "×?×¢×ª×?×§ ×?×?×?×¢×?×ª ×?×? ×?×ª×?×§×?×?×? %s"
 
-#: ../servers/exchange/storage/exchange-account.c:1265
-msgid "Personal Folders"
-msgstr "×ª×?×§×?×?×ª ×?×?×©×?×?×ª"
+#~ msgid "Check new messages for _Junk contents"
+#~ msgstr "×?×?×?×§ ×?×?×?×¢×?×ª ×?×?×©×?×ª ×¢×?×?×¨ ×ª×?× ×? _×?×?×?"
 
-#: ../servers/exchange/storage/exchange-account.c:1280
-msgid "Favorite Public Folders"
-msgstr "×?×ª×?×§×?×?×ª ×?×¦×?×?×?×¨×?×?×ª ×?×?×?×¢×?×¤×?×ª"
+#~ msgid "Only check for Junk messa_ges in the INBOX folder"
+#~ msgstr "×?×?×?×§ ×¢×?×?×¨ ×?×?×?×¢×?×ª _×?×?×? ×?×ª×?×§×?×?×ª ×?×?×?×?×¨ ×?× ×?× ×¡"
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1297
-msgid "All Public Folders"
-msgstr "×?×? ×?×ª×?×§×?×?×ª ×?×¦×?×?×?×¨×?×?×ª"
+#~ msgid "IMAP4rev1"
+#~ msgstr "â??IMAP4rev1"
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1311
-msgid "Global Address List"
-msgstr "×¨×©×?×?×ª ×?×ª×?×?×?×ª ×?×?×?×?×?×?×ª"
+#~ msgid "For reading and storing mail on IMAPv4rev1 servers."
+#~ msgstr "×?×§×¨×?×?×? ×?×?×ª×?×?×? ×©×? ×?×?×?×¨ ×?×©×¨×ª×? IMAPv4rev1."
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
-msgid "Deleted Items"
-msgstr "×¤×¨×?×?×?×? ×©× ×?×?×§×?"
+#~ msgid ""
+#~ "This option will connect to the IMAPv4rev1 server using a plaintext "
+#~ "password."
+#~ msgstr "×?×¤×©×¨×?×ª ×?×?×ª ×ª×ª×?×?×¨ ×?×©×¨×ª ×?-IMAPv4rev1 ×?×¢×?×¨×ª ×¡×?×¡×?×ª ×?×§×¡×? ×¤×©×?×?."
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
-msgid "Journal"
-msgstr "×?×?×?×?×?"
+#~ msgid ""
+#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
+#~ "support STARTTLS"
+#~ msgstr "×?×ª×?×?×¨×?×ª ×?×©×¨×ª IMAP â??%s ×?×?×¦×? ×?×?×?×?×?×? × ×?×©×?×?: ×?×©×¨×ª ×?×? ×ª×?×?×? ×?-STARTTLS"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "×?×¢×¨×?×ª"
+#~ msgid "Cannot create IMAP folders in offline mode."
+#~ msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×ª×?×§×?×?×ª IMAP ×?×?×¦×? ×?×? ×?×§×?×?×?."
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "×?×?×?×¨ ×?×?×¦×?"
+#, fuzzy
+#~ msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
+#~ msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "×¤×¨×?×?×?×? ×©× ×©×?×?×?"
+#~ msgid "Bad command"
+#~ msgstr "×¤×§×?×?×? ×©×?×?×?×?"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "×?×©×?×?×?×ª"
+#, fuzzy
+#~ msgid "Cannot create folder '%s': Invalid mailbox name"
+#~ msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
 
-#: ../servers/groupwise/e-gw-connection.c:225
-msgid "Invalid connection"
-msgstr "×?×?×?×?×¨ ×?×? ×ª×§×?×?"
+#, fuzzy
+#~ msgid "Cannot create folder '%s': Bad command"
+#~ msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
 
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid response from server"
-msgstr "×ª×?×?×?×? ×?×?×ª×? ×¦×¤×?×?×?×? ×?×?×©×¨×ª"
+#, fuzzy
+#~ msgid "Cannot delete folder '%s': Special folder"
+#~ msgstr "×?×? × ×?×ª×? ×?×?×?×?×§ ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
 
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "No response from the server"
-msgstr "×?×?×? ×ª×?×?×?×? ×?×?×©×¨×ª"
+#, fuzzy
+#~ msgid "Cannot delete folder '%s': Invalid mailbox name"
+#~ msgstr "×?×? × ×?×ª×? ×?×?×?×?×§ ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
 
-#: ../servers/groupwise/e-gw-connection.c:237
-msgid "Bad parameter"
-msgstr "×¤×¨×?×?×¨ ×©×?×?×?"
+#, fuzzy
+#~ msgid "Cannot delete folder '%s': Bad command"
+#~ msgstr "×?×? × ×?×ª×? ×?×§×?×? ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
-msgid "Evolution Addressbook file backend"
-msgstr "×?× ×?×¢ ×§×?×?×¥ ×¡×¤×¨ ×?×?×ª×?×?×?×ª ×©×? Evolution"
+#, fuzzy
+#~ msgid "Cannot rename folder '%s' to '%s': Special folder"
+#~ msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
-msgid "Evolution Calendar file and webcal backend"
-msgstr "×?× ×?×¢ ×§×?×¦×? Calednar ×?-webcal ×©×? Evolution"
+#~ msgid "Cannot rename IMAP folders in offline mode."
+#~ msgstr "×?×? × ×?×ª×? ×?×©× ×?×ª ×©×? ×ª×?×§×?×?×ª IMAP ×?×?×¦×? ×?×? ×?×§×?×?×?."
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:3
-msgid "Evolution Data Server interface check service"
-msgstr ""
+#, fuzzy
+#~ msgid "Cannot rename folder '%s' to '%s': Bad command"
+#~ msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
-msgid "Evolution Data Server logging service"
-msgstr ""
+#, fuzzy
+#~ msgid "Cannot subscribe to folder '%s': Bad command"
+#~ msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×?×ª ×?×ª×?×§×?×?×? '%s': â??%s"
 
-#. dialog display isn't working out
-#: ../src/server.c:109
-#, c-format
-msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
-msgstr ""
+#~ msgid "Scanning for changed messages"
+#~ msgstr "×¡×?×¨×§ ×¢×?×?×¨ ×?×?×?×¢×?×ª ×©×?×©×ª× ×?"
+
+#, fuzzy
+#~ msgid "Fetching envelopes of new messages"
+#~ msgstr "×?×?× ×¡ ×?×ª ×?× ×?×¢× ×?×? ×©×? ×?×?×?×?×¢×?"
+
+#~ msgid "No data"
+#~ msgstr "×?×?×? ×?×?×?×¢"
+
+#~ msgid "IMAP server %s unexpectedly disconnected: %s"
+#~ msgstr "×©×¨×ª IMAP â??%s ×?×ª× ×ª×§ ×?×?×?×¤×? ×¤×ª×?×?×?×?: %s"
+
+#~ msgid "Could not connect to POP server on %s"
+#~ msgstr "×?×? × ×?×ª×? ×?×?×ª×?×?×¨ ×?×©×¨×ª POP ×?-%s"
+
+#~ msgid "Item(s) belong to these _categories:"
+#~ msgstr "×¤×¨×?×?×?×? ×©×©×?×?×?×?×? ×?_×§×?×?×?×¨×?×?×ª ×?×?×?::"
+
+#~ msgid "Enter password for %s"
+#~ msgstr "×?×?× ×¡ ×¡×?×¡×?×? ×¢×?×?×¨ %s"
+
+#~ msgid "Enter password"
+#~ msgstr "×?×?× ×¡ ×¡×?×¡×?×?"
+
+#~ msgid "Owner"
+#~ msgstr "×?×¢×?×?×?"
+
+#~ msgid "Editor"
+#~ msgstr "×¢×?×¨×?"
+
+#~ msgid "Author"
+#~ msgstr "×?×?×?×¨"
+
+#, fuzzy
+#~ msgid "Reviewer"
+#~ msgstr "×ª_×¦×?×?×? ×?×§×?×?×?×?:"
+
+#~ msgid "Contributor"
+#~ msgstr "×ª×?×¨×?"
+
+#~ msgid "None"
+#~ msgstr "×?×?×?"
+
+#~ msgid "Custom"
+#~ msgstr "×?×?×ª×?×? ×?×?×©×?×ª"
+
+#~ msgid "Generic error"
+#~ msgstr "×©×?×?×?×? ×?×?×?×?×ª"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "×ª×?×§×?×?×? ×?×©×? ×?×? ×?×?×¨ ×§×?×?×?×ª"
 
-#: ../libedataserverui/e-cell-renderer-color.c:210
-msgid "Color Info"
-msgstr "×?×?×?×¢ ×¦×?×¢"
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "×¡×?×? ×?×ª×?×§×?×?×? ×©×¦×?×?×?× ×? ×?×?× ×? ×ª×§×?×?"
 
-#: ../libedataserverui/e-cell-renderer-color.c:211
-msgid "The color to render"
-msgstr "×?×¦×?×¢ ×?×¦×?×?×¨"
+#~ msgid "I/O error"
+#~ msgstr "×©×?×?×?×ª ×§×?×?/×¤×?×?"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "×?×?×? ×?×¡×¤×?×§ ×?×§×?×? ×?×?×¦×?×¨ ×?×ª ×?×ª×?×§×?×?×?:"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "×?×ª×?×§×?×?×? ×?×?× ×? ×¨×?×§×?"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "×?×ª×?×§×?×?×? ×©×¦×?×?×?× ×? ×?×? × ×?×¦×?×?"
+
+#~ msgid "Operation not supported"
+#~ msgstr "×¤×¢×?×?×? ×?×? × ×ª×?×?×ª"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "×?×? × ×?×ª×? ×?×©× ×?×ª ×?×? ×?×?×¡×?×¨ ×?×ª ×?×ª×?×§×?×?×? ×©×¦×?×?×?× ×?"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "×?×? × ×?×ª×? ×?×?×¤×?×? ×ª×?×§×?×?×? ×?×¦×?×¦×?×?×ª ×©×? ×?×?×ª ×?×?×?×¨×©×?×ª ×©×?×?"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "×?×? × ×?×ª×? ×?×?×¦×?×¨ ×ª×?×§×?×?×? ×?×©×? ×?×?"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "×?×? × ×?×ª×? ×?×?×¦×¢ ×?×ª ×¤×¢×?×?×? ×?×?×ª ×?×?×¦×? ×?×? ×?×§×?×?×?"
+
+#~ msgid "%s's Folders"
+#~ msgstr "×?×ª×?×§×?×?×ª ×©×? %s"
+
+#~ msgid "Personal Folders"
+#~ msgstr "×ª×?×§×?×?×ª ×?×?×©×?×?×ª"
+
+#~ msgid "Favorite Public Folders"
+#~ msgstr "×?×ª×?×§×?×?×ª ×?×¦×?×?×?×¨×?×?×ª ×?×?×?×¢×?×¤×?×ª"
+
+#~ msgid "All Public Folders"
+#~ msgstr "×?×? ×?×ª×?×§×?×?×ª ×?×¦×?×?×?×¨×?×?×ª"
+
+#~ msgid "Global Address List"
+#~ msgstr "×¨×©×?×?×ª ×?×ª×?×?×?×ª ×?×?×?×?×?×?×ª"
+
+#~ msgid "Deleted Items"
+#~ msgstr "×¤×¨×?×?×?×? ×©× ×?×?×§×?"
+
+#~ msgid "Journal"
+#~ msgstr "×?×?×?×?×?"
+
+#~ msgid "Notes"
+#~ msgstr "×?×¢×¨×?×ª"
+
+#~ msgid "Outbox"
+#~ msgstr "×?×?×?×¨ ×?×?×¦×?"
+
+#~ msgid "Sent Items"
+#~ msgstr "×¤×¨×?×?×?×? ×©× ×©×?×?×?"
+
+#~ msgid "Tasks"
+#~ msgstr "×?×©×?×?×?×ª"
+
+#~ msgid "Evolution Addressbook file backend"
+#~ msgstr "×?× ×?×¢ ×§×?×?×¥ ×¡×¤×¨ ×?×?×ª×?×?×?×ª ×©×? Evolution"
+
+#~ msgid "Evolution Calendar file and webcal backend"
+#~ msgstr "×?× ×?×¢ ×§×?×¦×? Calednar ×?-webcal ×©×? Evolution"
+
+#~ msgid "Color Info"
+#~ msgstr "×?×?×?×¢ ×¦×?×¢"
+
+#~ msgid "The color to render"
+#~ msgstr "×?×¦×?×¢ ×?×¦×?×?×¨"
 
 #~ msgid "Snow"
 #~ msgstr "×©×?×?"
@@ -5331,9 +5122,6 @@ msgstr "×?×¦×?×¢ ×?×¦×?×?×¨"
 #~ msgid "_Contact"
 #~ msgstr "×?×?×© _×§×©×¨"
 
-#~ msgid "Create a new contact"
-#~ msgstr "×¦×?×¨ ×?×?×© ×§×©×¨ ×?×?×©"
-
 #~ msgid "New Contact List"
 #~ msgstr "×¨×©×?×?×ª ×ª×¤×?×¦×? ×?×?×©×?"
 
@@ -5424,9 +5212,6 @@ msgstr "×?×¦×?×¢ ×?×¦×?×?×¨"
 #~ msgid "Details"
 #~ msgstr "×¤×¨×?×?×?"
 
-#~ msgid "Email address"
-#~ msgstr "×?×ª×?×?×ª ×?×?×?\"×?"
-
 #~ msgid ""
 #~ "Evolution will use this email address to authenticate you with the server."
 #~ msgstr "×?×?×?×?×?×¦×?×? ×ª×©×ª×?×© ×?×?×ª×?×?×ª ×?×?×?\"×? ×?×? ×?×?×?×?×?×?×ª ×¢×? ×?×©×¨×ª."
@@ -5491,9 +5276,6 @@ msgstr "×?×¦×?×¢ ×?×¦×?×?×¨"
 #~ msgid "Add to Contacts"
 #~ msgstr "×?×?×¡×£ ×?×?× ×©×? ×?×§×©×¨"
 
-#~ msgid "Unnamed Contact"
-#~ msgstr "×?×?×© ×§×©×¨ ×?×?×?-×©×?"
-
 #~ msgid "Source"
 #~ msgstr "×?×§×?×¨"
 
@@ -6181,9 +5963,6 @@ msgstr "×?×¦×?×¢ ×?×¦×?×?×¨"
 #~ msgid "Please select an image for this contact"
 #~ msgstr "×?× ×? ×?×?×¨ ×ª×?×?× ×? ×?×¢×?×?×¨ ×?×?×© ×§×©×¨ ×?×?"
 
-#~ msgid "No image"
-#~ msgstr "×?×?×? ×ª×?×?× ×?"
-
 #~ msgid "_Full Name:"
 #~ msgstr "_×©×? ×?×?×?:"
 
@@ -6477,17 +6256,9 @@ msgstr "×?×¦×?×¢ ×?×¦×?×?×¨"
 #~ msgid "Select an Action"
 #~ msgstr "×?×?×¨ ×¤×¢×?×?×?"
 
-#~ msgid "Create a new contact \"%s\""
-#~ msgstr "×¦×?×¨ ×?×?×© ×§×©×¨ ×?×?×© \"%s\""
-
 #~ msgid "Add address to existing contact \"%s\""
 #~ msgstr "×?×?×¡×£ ×?×ª×?×?×ª ×?×?×?×© ×§×©×¨ ×§×?×?×? \"%s\""
 
-#~ msgid "and one other contact."
-#~ msgid_plural "and %d other contacts."
-#~ msgstr[0] "×?×?×?×© ×§×©×¨ × ×?×¡×£ ×?×?×?."
-#~ msgstr[1] "×?×¢×?×? %d ×?× ×©×? ×§×©×¨ ×?×?×¨×?×?."
-
 #~ msgid "Save in addressbook"
 #~ msgstr "×©×?×?×¨ ×?×¡×¤×¨ ×?×?×ª×?×?×?×ª"
 
@@ -6590,9 +6361,6 @@ msgstr "×?×¦×?×¢ ×?×¦×?×?×¨"
 #~ msgid "_Font..."
 #~ msgstr "_×?×?×¤×?..."
 
-#~ msgid "Can not open file"
-#~ msgstr "×?×? × ×?×ª×? ×?×¤×ª×?×? ×§×?×?×¥"
-
 #~ msgid "[vcard|csv]"
 #~ msgstr "[vcard|csv]"
 
@@ -7852,9 +7620,6 @@ msgstr "×?×¦×?×¢ ×?×¦×?×?×¨"
 #~ msgid "Enter Password"
 #~ msgstr "×?×?× ×¡ ×¡×?×¡×?×?"
 
-#~ msgid "User canceled operation."
-#~ msgstr "×?×?×©×ª×?×© ×?×?×?×? ×?×ª ×?×¤×¢×?×?×?."
-
 #~ msgid "Edit signature"
 #~ msgstr "×¢×¨×?×? ×?×ª ×?×?×ª×?×?×?"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]