[evolution-data-server] Updated Hebrew translation.



commit 1f1c7d3afc8a7a965c2f8c4bd50500fdeba263bd
Author: Yaron Shahrabani <sh yaron gmail com>
Date:   Sat Jul 24 13:53:29 2010 +0300

    Updated Hebrew translation.

 po/he.po | 2508 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 1393 insertions(+), 1115 deletions(-)
---
diff --git a/po/he.po b/po/he.po
index 87d45d0..0b729f1 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD.he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-27 23:23+0300\n"
-"PO-Revision-Date: 2010-06-28 00:07+0200\n"
+"POT-Creation-Date: 2010-07-24 13:43+0300\n"
+"PO-Revision-Date: 2010-07-24 13:53+0200\n"
 "Last-Translator: Yaron Shahrabani <sh yaron gmail com>\n"
 "Language-Team: Hebrew <he li org>\n"
 "MIME-Version: 1.0\n"
@@ -18,67 +18,81 @@ msgstr ""
 "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/file/e-book-backend-file.c:570
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
 msgid "Loading..."
 msgstr "×?×?×¢×?..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:563
+#: ../addressbook/backends/file/e-book-backend-file.c:573
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4553
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4491
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
 msgid "Searching..."
 msgstr "×?×?פש..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4717
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2698
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4650
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "×?×?ר×?×? ×?נש×? קשר (%d)..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2845
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2846
 #: ../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:818
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172
+msgid "Not connected"
+msgstr "×?×? ×?×?×?×?ר"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:753
 msgid "Using Distinguished Name (DN)"
 msgstr "נעש×? ש×?×?×?ש ×?ש×? ×?×?×?×?×?×? (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:821
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:756
 msgid "Using Email Address"
 msgstr "×?שת×?ש ×?×?ת×?×?ת ×?×?×?\"×?"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1098
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1031
 msgid "Reconnecting to LDAP server..."
 msgstr "×?ת×?×?ר ×?×?×?ש ×?שרת LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1740
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1156
+#, fuzzy
+msgid "Invalid DN syntax"
+msgstr "×?ר×?×?×?× ×? ש×?×?×?"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1672
 msgid "Adding contact to LDAP server..."
 msgstr "×?×?ס×?×£ ×?×?ש קשר ×?שרת LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1874
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1804
 msgid "Removing contact from LDAP server..."
 msgstr "×?ס×?ר ×?×?ש קשר ×?שרת LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2311
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2238
 msgid "Modifying contact from LDAP server..."
 msgstr "×?שנ×? ×?×?ש קשר ×?שרת LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4414
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4341
 msgid "Receiving LDAP search results..."
 msgstr "×?ק×?×? ת×?צ×?×?ת ×?×?פ×?ש ×?-LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4575
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4513
 msgid "Error performing search"
 msgstr "ש×?×?×?×? ×?×?×?צ×?×¢ ×?×?×?פ×?ש"
 
-#: ../addressbook/libebook/e-book.c:2152
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:329
+#, c-format
+msgid "Create resource '%s' failed with http status: %d"
+msgstr "×?צ×?רת ×?×?ש×?×? '%s' × ×?ש×?×? ×¢×? ×?צ×? ×?Ö¾http:â?? %d"
+
+#: ../addressbook/libebook/e-book.c:3001
 #, c-format
 msgid "%s: there was no source for UID '%s' stored in GConf."
 msgstr "%s: ×?×?×? ×?ק×?ר ×¢×?×?ר ×?×?×?×? ×?×?שת×?ש '%s' ש×?×?×?×?ס×? ×?Ö¾GConf."
@@ -534,8 +548,8 @@ msgid "Birth Date"
 msgstr "ת×?ר×?×? ×?×?×?×?"
 
 #: ../addressbook/libebook/e-contact.c:262
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:715
-#: ../libedataserver/e-categories.c:42
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
+#: ../libedataserver/e-categories.c:43
 msgid "Anniversary"
 msgstr "×?×?×? שנ×?"
 
@@ -618,193 +632,341 @@ msgstr "×?ת×?×?ת SIP"
 msgid "Unnamed List"
 msgstr "רש×?×?×? ×?×?×? ש×?"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:302
+#: ../addressbook/libedata-book/e-data-book-factory.c:322
 #, 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
+#: ../addressbook/libedata-book/e-data-book-factory.c:340
+#: ../addressbook/libedata-book/e-data-book-factory.c:377
 #: ../calendar/libedata-cal/e-data-cal-factory.c:333
+#: ../calendar/libedata-cal/e-data-cal-factory.c:345
 #, 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:185
+#: ../calendar/libedata-cal/e-data-cal.c:114
+msgid "Success"
+msgstr "×?צ×?×?×?"
+
+#: ../addressbook/libedata-book/e-data-book.c:186
+#: ../calendar/libedata-cal/e-data-cal.c:115
+msgid "Repository offline"
+msgstr "×?×?×?×?ר ×?×?× ×? ×?ק×?×?×?"
+
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libecal/e-cal.c:4027 ../calendar/libedata-cal/e-data-cal.c:116
+msgid "Permission denied"
+msgstr "×?×?×? ×?רש×?×?ת"
+
+#: ../addressbook/libedata-book/e-data-book.c:188
+msgid "Contact not found"
+msgstr "×?×?ש ×?קשר ×?×? × ×?צ×?"
+
+#: ../addressbook/libedata-book/e-data-book.c:189
+msgid "Contact ID already exists"
+msgstr "×?×?×?×? ×?×?ש ×?קשר ×?×?ר ק×?×?×?"
+
+#: ../addressbook/libedata-book/e-data-book.c:190
+#: ../calendar/libedata-cal/e-data-cal.c:121
+msgid "Authentication Failed"
+msgstr "×?×?×?×?×?ת × ×?ש×?"
 
-#: ../addressbook/libedata-book/e-data-book.c:319
-msgid "Cannot remove book"
-msgstr "×?×? × ×?ת×? ×?×?ס×?ר ×?ת ×?ספר"
+#: ../addressbook/libedata-book/e-data-book.c:191
+#: ../calendar/libedata-cal/e-data-cal.c:122
+msgid "Authentication Required"
+msgstr "×?×?×?×?×?ת × ×?רשת"
 
-#: ../addressbook/libedata-book/e-data-book.c:331
-#: ../addressbook/libedata-book/e-data-book.c:346
-msgid "Cannot get contact"
-msgstr "×?×? × ×?ת×? ×?ק×?×? ×?×?ש קשר"
+#: ../addressbook/libedata-book/e-data-book.c:192
+#: ../calendar/libedata-cal/e-data-cal.c:123
+msgid "Unsupported field"
+msgstr "ש×?×? ×?×? נת×?×?"
+
+#: ../addressbook/libedata-book/e-data-book.c:193
+#: ../calendar/libedata-cal/e-data-cal.c:125
+msgid "Unsupported authentication method"
+msgstr "ש×?×?ת ×?×?×?×?ת ×?×? נת×?×?ת"
+
+#: ../addressbook/libedata-book/e-data-book.c:194
+#: ../calendar/libedata-cal/e-data-cal.c:126
+msgid "TLS not available"
+msgstr "â??TLS ×?×? ×?×?×?×?"
 
-#: ../addressbook/libedata-book/e-data-book.c:358
-msgid "Empty query"
-msgstr "ש×?×?×?ת×? ר×?ק×?"
+#: ../addressbook/libedata-book/e-data-book.c:195
+msgid "Address Book does not exist"
+msgstr "ספר ×?×?ת×?×?×?ת ×?×? ק×?×?×?"
 
-#: ../addressbook/libedata-book/e-data-book.c:402
-msgid "Cannot authenticate user"
-msgstr "×?×? × ×?ת×? ×?×?×?ת ×?ת ×?×?שת×?ש"
+#: ../addressbook/libedata-book/e-data-book.c:196
+msgid "Book removed"
+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:197
+#: ../calendar/libedata-cal/e-data-cal.c:129
+msgid "Not available in offline mode"
+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:198
+#: ../calendar/libedata-cal/e-data-cal.c:130
+msgid "Search size limit exceeded"
+msgstr "×?×?×?×? ×?×?×?פ×?ש ×?ר×? ×?×?×?×?×?×?"
 
-#: ../addressbook/libedata-book/e-data-book.c:494
-msgid "Cannot remove contacts"
-msgstr "×?×? × ×?ת×? ×?×?ס×?ר ×?נש×? קשר"
+#: ../addressbook/libedata-book/e-data-book.c:199
+#: ../calendar/libedata-cal/e-data-cal.c:131
+msgid "Search time limit exceeded"
+msgstr "×?×?×? ×?×?×?פ×?ש ×?ר×? ×?×?×?×?×?×?"
 
-#: ../addressbook/libedata-book/e-data-book.c:569
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
+#: ../addressbook/libedata-book/e-data-book.c:200
+#: ../calendar/libedata-cal/e-data-cal.c:132
 msgid "Invalid query"
 msgstr "ש×?×?×?ת×? ש×?×?×?×?"
 
-#: ../addressbook/libedata-book/e-data-book.c:598
-msgid "Cannot get changes"
-msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת ×?ש×?× ×?×?×?×?"
+#: ../addressbook/libedata-book/e-data-book.c:201
+#: ../calendar/libedata-cal/e-data-cal.c:133
+msgid "Query refused"
+msgstr "ש×?×?×?ת×? × ×?×?ת×?"
 
-#: ../addressbook/libedata-book/e-data-book.c:699
-msgid "Cannot complete operation"
-msgstr "×?×? × ×?ת×? ×?×?ש×?×?×? ×?ת ×?פע×?×?×?"
+#: ../addressbook/libedata-book/e-data-book.c:202
+#: ../calendar/libedata-cal/e-data-cal.c:134
+msgid "Could not cancel"
+msgstr "×?×? × ×?ת×? ×?×?×?×?"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
-#: ../libedataserver/e-categories.c:43
+#. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
+#. { OtherError,			N_("Other error") },
+#: ../addressbook/libedata-book/e-data-book.c:204
+#: ../calendar/libedata-cal/e-data-cal.c:136
+msgid "Invalid server version"
+msgstr "×?×?רסת שרת ש×?×?×?×?"
+
+#: ../addressbook/libedata-book/e-data-book.c:205
+msgid "No space"
+msgstr "×?×?×? ר×?×?×?"
+
+#: ../addressbook/libedata-book/e-data-book.c:206
+#: ../calendar/libecal/e-cal.c:4011 ../calendar/libedata-cal/e-data-cal.c:137
+msgid "Invalid argument"
+msgstr "×?ר×?×?×?× ×? ש×?×?×?"
+
+#: ../addressbook/libedata-book/e-data-book.c:207
+#: ../calendar/libecal/e-cal.c:4049 ../calendar/libedata-cal/e-data-cal.c:138
+msgid "Not supported"
+msgstr "×?×? נת×?×?"
+
+#: ../addressbook/libedata-book/e-data-book.c:216
+#: ../calendar/libedata-cal/e-data-cal.c:146
+msgid "Other error"
+msgstr "ש×?×?×?×? ×?×?רת"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:374
+#, c-format
+msgid "Cannot open book: %s"
+msgstr "×?×? × ×?ת×? ×?פת×?×? ×?ת ×?ספר: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:394
+#, c-format
+msgid "Cannot remove book: %s"
+msgstr "×?×? × ×?ת×? ×?×?ס×?ר ×?ת ×?ספר: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:411
+#: ../addressbook/libedata-book/e-data-book.c:428
+#, c-format
+msgid "Cannot get contact: %s"
+msgstr "×?×? × ×?ת×? ×?ק×?×? ×?×?ש קשר: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:443
+#, c-format
+msgid "Empty query: %s"
+msgstr "ש×?×?×?ת×? ר×?ק×?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:457
+#, c-format
+msgid "Cannot get contact list: %s"
+msgstr "×?×? × ×?ת×? ×?ק×?×? ×?×?ש קשר: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:492
+#, c-format
+msgid "Cannot authenticate user: %s"
+msgstr "×?×? × ×?ת×? ×?×?×?ת ×?ת ×?×?שת×?ש: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:507
+#: ../addressbook/libedata-book/e-data-book.c:524
+#, c-format
+msgid "Cannot add contact: %s"
+msgstr "×?×? × ×?ת×? ×?×?×?ס×?×£ ×?×?ש קשר: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:542
+#: ../addressbook/libedata-book/e-data-book.c:559
+#, c-format
+msgid "Cannot modify contact: %s"
+msgstr "×?×? × ×?ת×? ×?שנ×?ת ×?×?ש קשר: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:596
+#, c-format
+msgid "Cannot remove contacts: %s"
+msgstr "×?×? × ×?ת×? ×?×?ס×?ר ×?נש×? קשר: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:626
+#, c-format
+msgid "Cannot get supported fields: %s"
+msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת ×?ש×?×?ת ×?נת×?×?×?×?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:639
+#, c-format
+msgid "Cannot get required fields: %s"
+msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת ×?ש×?×?ת ×?× ×?רש×?×?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:652
+#, c-format
+msgid "Cannot get supported auth methods: %s"
+msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת ש×?×?×?ת ×?×?×?×?×?ת ×?נת×?×?×?ת: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:677
+#, c-format
+msgid "Invalid query: %s"
+msgstr "ש×?×?×?ת×? ש×?×?×?×?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:708
+#, c-format
+msgid "Cannot get changes: %s"
+msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת ×?ש×?× ×?×?×?×?: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:498
+#, fuzzy, c-format
+msgid "Unexpected HTTP status code %d returned"
+msgstr ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4094
+msgid "Calendar doesn't support Free/Busy"
+msgstr "×?×?×? ×?שנ×? ×?×?× ×? ת×?×?×? ×?×?צ×? ×¢×?ס×?ק"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:719
+#: ../libedataserver/e-categories.c:44
 msgid "Birthday"
 msgstr "×?×?×? ×?×?×?×?ת"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:746
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:748
 #, c-format
 msgid "Birthday: %s"
 msgstr "×?×?×? ×?×?×?×?ת: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:770
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:772
 #, c-format
 msgid "Anniversary: %s"
 msgstr "×?×?×? שנ×?: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:236
+#: ../calendar/backends/file/e-cal-backend-file.c:239
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "×?×? × ×?ת×? ×?ש×?×?ר ×?×?×?×¢ ×?×?×?×?: ×?ת×?×?ת פ×?×?×?×?."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:243
-#: ../calendar/backends/file/e-cal-backend-file.c:249
+#: ../calendar/backends/file/e-cal-backend-file.c:246
+#: ../calendar/backends/file/e-cal-backend-file.c:252
 msgid "Cannot save calendar data"
 msgstr "×?×? × ×?ת×? ×?ש×?×?ר ×?×?×?×¢ ×?×?×?×?."
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1118
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2246
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1121
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2224
 msgid "Reply Requested: by "
 msgstr "×?ר×?שת ת×?×?×?×?: ×?×?ת"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1123
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2251
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1126
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2229
 msgid "Reply Requested: When convenient"
 msgstr "×?ר×?שת ת×?×?×?×?: ×?שנ×?×?"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:292
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:295
 #, c-format
 msgid "Loading %s items"
 msgstr "×?×?×¢×? %s פר×?×?×?×?"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:925
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:926
 msgid "Calendar"
 msgstr "×?×?×?×?"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:983
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:989
 msgid "Invalid server URI"
 msgstr "×?ת×?×?ת שרת ×?×? תק×?× ×?"
 
-#: ../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/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
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1082
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1343
+#: ../calendar/backends/http/e-cal-backend-http.c:659
+#: ../calendar/backends/weather/e-cal-backend-weather.c:487
 msgid "Could not create cache file"
 msgstr "×?×? × ×?ת×? ×?×?צ×?ר ק×?×?×¥ ×?×?×?×?×?"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1099
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1095
 msgid "Could not create thread for populating cache"
 msgstr "×?×? × ×?ת×? ×?×?צ×?ר ת×?×?×?×?×?×? ×?×?×?צ×?ר ×?×?×?×?×?"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:335
+#: ../calendar/backends/http/e-cal-backend-http.c:327
 msgid "Redirected to Invalid URI"
 msgstr "×?פנ×?×?×? ×?×?ת×?×?ת ש×?×?×?×?"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:358
+#: ../calendar/backends/http/e-cal-backend-http.c:350
 msgid "Bad file format."
 msgstr "×?×?× ×? ק×?×?×¥ ש×?×?×?."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:365
+#: ../calendar/backends/http/e-cal-backend-http.c:357
 msgid "Not a calendar."
 msgstr "×?×? ×?×?×?×?."
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:152
+#: ../calendar/backends/weather/e-cal-backend-weather.c:154
 msgid "Could not retrieve weather data"
 msgstr "×?×? × ×?ת×? ×?ק×?×? ×?×?×?×¢ ×¢×? ×?×?×? ×?×?×?×?×?ר"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:253
 msgid "Weather: Fog"
 msgstr "×?×?×? ×?×?×?ר: ערפ×?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:254
 msgid "Weather: Cloudy Night"
 msgstr "×?×?×? ×?×?×?ר: ×?×?×?×? ×?×¢×?× ×?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:255
 msgid "Weather: Cloudy"
 msgstr "×?×?×? ×?×?×?ר: ×?×¢×?× ×?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:256
 msgid "Weather: Overcast"
 msgstr "×?×?×? ×?×?×?ר: ×?×¢×?× ×?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:257
 msgid "Weather: Showers"
 msgstr "×?×?×? ×?×?×?ר: ×?×?×?ר×?×?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:256
+#: ../calendar/backends/weather/e-cal-backend-weather.c:258
 msgid "Weather: Snow"
 msgstr "×?×?×? ×?×?×?ר: ש×?×?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:257
+#: ../calendar/backends/weather/e-cal-backend-weather.c:259
 msgid "Weather: Clear Night"
 msgstr "×?×?×? ×?×?×?ר: ×?×?×?×? ×?×?×?ר"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:258
+#: ../calendar/backends/weather/e-cal-backend-weather.c:260
 msgid "Weather: Sunny"
 msgstr "×?×?×? ×?×?×?ר: ש×?ש"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:259
+#: ../calendar/backends/weather/e-cal-backend-weather.c:261
 msgid "Weather: Thunderstorms"
 msgstr "×?×?×? ×?×?×?ר: ס×?פ×?ת ×?רק×?×?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:405
+#: ../calendar/backends/weather/e-cal-backend-weather.c:407
 msgid "Forecast"
 msgstr "ת×?×?×?ת"
 
@@ -953,7 +1115,7 @@ msgstr "× ×?×?×?"
 msgid "Undefined"
 msgstr "×?×? ×?×?×?×?ר"
 
-#: ../calendar/libecal/e-cal.c:1178 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1142 ../libedataserverui/e-book-auth-util.c:206
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "×?×?נס ס×?ס×?×? ×?-%s (×?שת×?ש %s)"
@@ -962,101 +1124,91 @@ msgstr "×?×?נס ס×?ס×?×? ×?-%s (×?שת×?ש %s)"
 #. This password prompt will be prompted rarely. Since the key that is passed to
 #. the auth_func corresponds to the parent user.
 #.
-#: ../calendar/libecal/e-cal.c:1192
+#: ../calendar/libecal/e-cal.c:1156
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "×?×?נס ס×?ס×?×? ×¢×?×?ר %s ×¢×? ×?נת ×?×?פשר ×?ת×?×?×? ×¢×?×?ר ×?×?שת×?ש %s"
 
-#: ../calendar/libecal/e-cal.c:3997
-msgid "Invalid argument"
-msgstr "×?ר×?×?×?× ×? ש×?×?×?"
-
-#: ../calendar/libecal/e-cal.c:3999
+#: ../calendar/libecal/e-cal.c:4013
 msgid "Backend is busy"
 msgstr "×?×?× ×?×¢ עס×?ק"
 
-#: ../calendar/libecal/e-cal.c:4001
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
+#: ../calendar/libecal/e-cal.c:4015
 msgid "Repository is offline"
 msgstr "×?×?×?×?ר ×?×?× ×? ×?ק×?×?×?"
 
-#: ../calendar/libecal/e-cal.c:4003
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
+#: ../calendar/libecal/e-cal.c:4017
 msgid "No such calendar"
 msgstr "×?×? ק×?×?×? ×?×?×?×?"
 
-#: ../calendar/libecal/e-cal.c:4005
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
+#: ../calendar/libecal/e-cal.c:4019 ../calendar/libedata-cal/e-data-cal.c:118
 #: ../servers/groupwise/e-gw-connection.c:235
 msgid "Object not found"
 msgstr "×?×?×?×?×?ק×? ×?×? × ×?צ×?"
 
-#: ../calendar/libecal/e-cal.c:4007
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../calendar/libecal/e-cal.c:4021 ../calendar/libedata-cal/e-data-cal.c:119
 #: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "×?×?×?×?×?ק×? ×?×? תק×?×?"
 
-#: ../calendar/libecal/e-cal.c:4009
+#: ../calendar/libecal/e-cal.c:4023
 msgid "URI not loaded"
 msgstr "×?ת×?×?ת ×?×? × ×?×¢× ×?"
 
-#: ../calendar/libecal/e-cal.c:4011
+#: ../calendar/libecal/e-cal.c:4025
 msgid "URI already loaded"
 msgstr "×?ת×?×?ת ×?×?ר ×?×¢×?× ×?"
 
-#: ../calendar/libecal/e-cal.c:4013
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
-msgid "Permission denied"
-msgstr "×?×?×? ×?רש×?×?ת"
-
-#: ../calendar/libecal/e-cal.c:4015
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-#: ../servers/groupwise/e-gw-connection.c:237
+#: ../calendar/libecal/e-cal.c:4029 ../servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "×?שת×?ש ×?×? ×?×?×?×¢"
 
-#: ../calendar/libecal/e-cal.c:4017
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
+#: ../calendar/libecal/e-cal.c:4031 ../calendar/libedata-cal/e-data-cal.c:120
 msgid "Object ID already exists"
 msgstr "×?×?×?×? ×?×?×?×?×?ק×? ×?×?ר ק×?×?×?"
 
-#: ../calendar/libecal/e-cal.c:4019
+#: ../calendar/libecal/e-cal.c:4033
 msgid "Protocol not supported"
 msgstr "פר×?×?×?ק×?×? ×?×? נת×?×?"
 
-#: ../calendar/libecal/e-cal.c:4021
+#: ../calendar/libecal/e-cal.c:4035
 msgid "Operation has been canceled"
 msgstr "×?פע×?×?×? ×?×?×?×?×?"
 
-#: ../calendar/libecal/e-cal.c:4023
-#: ../calendar/libedata-cal/e-cal-backend-util.c:145
+#: ../calendar/libecal/e-cal.c:4037
 msgid "Could not cancel operation"
 msgstr "×?×? × ×?ת×? ×?×?×?×? ×?ת ×?פע×?×?×?"
 
-#: ../calendar/libecal/e-cal.c:4027
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
-#: ../camel/providers/smtp/camel-smtp-transport.c:167
+#: ../calendar/libecal/e-cal.c:4039
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1434
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1452
+#: ../camel/providers/groupwise/camel-groupwise-store.c:618
+#: ../camel/providers/groupwise/camel-groupwise-store.c:793
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:85
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:118
+#, c-format
+msgid "Authentication failed"
+msgstr "×?×?×?×?×?×?ת × ×?ש×?×?"
+
+#: ../calendar/libecal/e-cal.c:4041
+#: ../camel/providers/smtp/camel-smtp-transport.c:166
 msgid "Authentication required"
 msgstr "× ×?רשת ×?×?×?×?×?ת"
 
-#: ../calendar/libecal/e-cal.c:4029
-msgid "A CORBA exception has occurred"
-msgstr "ש×?×?×?ת CORBA ×?תר×?ש×?"
-
-#: ../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
+#: ../calendar/libecal/e-cal.c:4043
+msgid "A DBUS exception has occurred"
+msgstr "×?תר×?ש×? ×?ר×?×?ת DBUS"
+
+#: ../calendar/libecal/e-cal.c:4045
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:158
+#: ../camel/providers/imap/camel-imap-command.c:457
+#: ../camel/providers/imap/camel-imap-store.c:626
+#: ../camel/providers/pop3/camel-pop3-store.c:495
 #: ../servers/groupwise/e-gw-connection.c:243
 msgid "Unknown error"
 msgstr "ש×?×?×?×? ×?×? ×?×?×?×¢×?"
 
-#: ../calendar/libecal/e-cal.c:4033
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:4047
 msgid "No error"
 msgstr "×?×?×? ש×?×?×?×?"
 
@@ -1154,217 +1306,223 @@ msgstr ""
 "\"%s\" ×?צ×?פ×?×?×? ש×?×? ×?×?ר×?×?×?× ×?×?×? ×?×?×?×? ×?×?ר×?×?×?ת ×?×? ש×?ר×?×?×?× ×? ×?×?×?×? ×?×?×?×? שקר "
 "×?×?×?×?×?×?× ×? (#f)"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
+#: ../calendar/libedata-cal/e-data-cal.c:117
 msgid "Invalid range"
 msgstr "×?×?×?×? ש×?×?×?"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
-msgid "Unsupported field"
-msgstr "ש×?×? ×?×? נת×?×?"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
+#: ../calendar/libedata-cal/e-data-cal.c:124
 msgid "Unsupported method"
 msgstr "ש×?×?×? ×?×? נת×?×?ת"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-msgid "Unsupported authentication method"
-msgstr "ש×?×?ת ×?×?×?×?ת ×?×? נת×?×?ת"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
-msgid "TLS not available"
-msgstr "â??TLS ×?×? ×?×?×?×?"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-msgid "Offline mode unavailable"
-msgstr "â??×?צ×? ×?×?-×?ק×?×?×? ×?×? ×?×?×?×?"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-msgid "Search size limit exceeded"
-msgstr "×?×?×?×? ×?×?×?פ×?ש ×?ר×? ×?×?×?×?×?×?"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Search time limit exceeded"
-msgstr "×?×?×? ×?×?×?פ×?ש ×?ר×? ×?×?×?×?×?×?"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
-msgid "Query refused"
-msgstr "ש×?×?×?ת×? × ×?×?ת×?"
+#: ../calendar/libedata-cal/e-data-cal.c:127
+msgid "Calendar does not exist"
+msgstr "×?×?×? ×?שנ×? ×?×? ק×?×?×?"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:150
-msgid "Invalid server version"
-msgstr "×?×?רסת שרת ש×?×?×?×?"
+#: ../calendar/libedata-cal/e-data-cal.c:128
+msgid "UnknownUser"
+msgstr "×?שת×?ש ×?×? ×?×?×?×¢"
 
-#: ../calendar/libedata-cal/e-data-cal.c:501
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:606
 #, c-format
-msgid "Cannot retrieve calendar address"
-msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת ×?ת×?×?ת ×?×?×?×?×?"
+msgid "Cannot retrieve calendar address: %s"
+msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת ×?ת×?×?ת ×?×?×?×?×?: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:519
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:626
 #, c-format
-msgid "Cannot retrieve calendar alarm e-mail address"
-msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת ×?ת×?×?ת ×?×?×?×?\"×? ×?×?תר×?×?"
+msgid "Cannot retrieve calendar alarm e-mail address: %s"
+msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת ×?ת×?×?ת ×?×?×?×?×´×? ×?×?תר×?×?ת ×?×?×?×? ×?שנ×?: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:537
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:646
 #, c-format
-msgid "Cannot retrieve calendar's ldap attribute"
-msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת ×?×?פ×?×?×? ×?Ö¾ldap ש×? ×?×?×? ×?שנ×?"
+msgid "Cannot retrieve calendar's ldap attribute: %s"
+msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת ×?×?פ×?×?×? ×?Ö¾ldap ש×? ×?×?×? ×?שנ×?: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:555
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:666
 #, c-format
-msgid "Cannot retrieve calendar scheduling information"
-msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת נת×?× ×? ×?ת×?×?×?×? ש×? ×?×?×? ×?שנ×?"
+msgid "Cannot retrieve calendar scheduling information: %s"
+msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת נת×?× ×? ×?ת×?×?×?×? ש×? ×?×?×? ×?שנ×?: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:572
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:685
 #, c-format
-msgid "Cannot open calendar"
-msgstr "×?×? × ×?ת×? ×?פת×?×? ×?ת ×?×?×? ×?שנ×?"
+msgid "Cannot open calendar: %s"
+msgstr "×?×? × ×?ת×? ×?פת×?×? ×?ת ×?×?×? ×?שנ×?: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:591
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:706
 #, c-format
-msgid "Cannot refresh calendar"
-msgstr "×?×? × ×?ת×? ×?רענ×? ×?ת ×?×?×? ×?שנ×?"
+msgid "Cannot refresh calendar: %s"
+msgstr "×?×? × ×?ת×? ×?רענ×? ×?ת ×?×?×? ×?שנ×?: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:608
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:725
 #, c-format
-msgid "Cannot remove calendar"
-msgstr "×?×? × ×?ת×? ×?×?ס×?ר ×?ת ×?×?×? ×?שנ×?"
+msgid "Cannot remove calendar: %s"
+msgstr "×?×? × ×?ת×? ×?×?ס×?ר ×?ת ×?×?×? ×?שנ×?: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:627
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:746
 #, c-format
-msgid "Cannot create calendar object"
-msgstr "×?×? × ×?ת×? ×?×?צ×?ר פר×?×? ×?×?×?×? ×?שנ×?"
+msgid "Cannot create calendar object: %s"
+msgstr "×?×? × ×?ת×? ×?×?צ×?ר פר×?×? ×?×?×?×? ×?שנ×?: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:649
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:770
 #, c-format
-msgid "Cannot modify calendar object"
-msgstr "×?×? × ×?ת×? ×?שנ×?ת ×?ת ×?פר×?×? ×?×?×?×? ×?שנ×?"
+msgid "Cannot modify calendar object: %s"
+msgstr "×?×? × ×?ת×? ×?שנ×?ת ×?ת ×?פר×?×? ×?×?×?×? ×?שנ×?: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:673
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:796
 #, c-format
-msgid "Cannot remove calendar object"
-msgstr "×?×? × ×?ת×? ×?×?ס×?ר פר×?×? ×?×?×?×? ×?שנ×?"
+msgid "Cannot remove calendar object: %s"
+msgstr "×?×? × ×?ת×? ×?×?ס×?ר פר×?×? ×?×?×?×? ×?שנ×?: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:692
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:817
 #, c-format
-msgid "Cannot receive calendar objects"
-msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת פר×?×?×? ×?×?×? ×?שנ×?"
+msgid "Cannot receive calendar objects: %s"
+msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת פר×?×?×? ×?×?×? ×?שנ×?: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:709
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:836
 #, c-format
-msgid "Cannot discard calendar alarm"
-msgstr "×?×? × ×?ת×? ×?×?תע×?×? ×?×?×?תרע×? ×?×?×?×? ×?שנ×?"
+msgid "Cannot discard calendar alarm: %s"
+msgstr "×?×? × ×?ת×? ×?×?תע×?×? ×?×?×?תרע×? ×?×?×?×? ×?שנ×?: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:728
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:857
 #, c-format
-msgid "Cannot send calendar objects"
-msgstr "×?×? × ×?ת×? ×?ש×?×?×? פר×?×?×?×? ×?×?×?×? ×?שנ×?"
+msgid "Cannot send calendar objects: %s"
+msgstr "×?×? × ×?ת×? ×?ש×?×?×? פר×?×?×?×? ×?×?×?×? ×?שנ×?: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:763
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:894
 #, c-format
-msgid "Cannot retrieve default calendar object path"
-msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת נת×?×? ×?פר×?×? ×?×?ר×?רת ×?×?×?×?×? ש×? ×?×?×? ×?שנ×?"
+msgid "Cannot retrieve default calendar object path: %s"
+msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת נת×?×? ×?פר×?×? ×?×?ר×?רת ×?×?×?×?×? ש×? ×?×?×? ×?שנ×?: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:781
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:914
 #, c-format
-msgid "Cannot retrieve calendar object path"
-msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת נת×?×? פר×?×? ×?×?×? ×?שנ×?"
+msgid "Cannot retrieve calendar object path: %s"
+msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת נת×?×? פר×?×? ×?×?×? ×?שנ×?: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:799
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:934
 #, c-format
-msgid "Cannot retrieve calendar object list"
-msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת רש×?×?ת פר×?×?×? ×?×?×? ×?שנ×?"
+msgid "Cannot retrieve calendar object list: %s"
+msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת רש×?×?ת פר×?×?×? ×?×?×? ×?שנ×?: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:837
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:974
 #, c-format
-msgid "Could not retrieve attachment list"
-msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת רש×?×?ת ×?ק×?צ×?×? ×?×?צ×?רפ×?×?"
+msgid "Could not retrieve attachment list: %s"
+msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת רש×?×?ת ×?ק×?צ×?×? ×?×?צ×?רפ×?×?: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:859
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:998
 #, c-format
-msgid "Could not complete calendar query"
-msgstr "×?×? × ×?ת×? ×?×?ש×?×?×? ×?ת ×?ש×?×?×?ת×? ×?×?×?×? ×?שנ×?"
+msgid "Could not complete calendar query: %s"
+msgstr "×?×? × ×?ת×? ×?×?ש×?×?×? ×?ת ×?ש×?×?×?ת×? ×?×?×?×? ×?שנ×?: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:877
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1018
 #, c-format
-msgid "Could not retrieve calendar time zone"
-msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת ×?×?×?ר ×?×?×?×? ש×? ×?×?×? ×?שנ×?"
+msgid "Could not retrieve calendar time zone: %s"
+msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת ×?×?×?ר ×?×?×?×? ש×? ×?×?×? ×?שנ×?: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:895
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1038
 #, c-format
-msgid "Could not add calendar time zone"
-msgstr "×?×? × ×?ת×? ×?×?×?ס×?×£ ×?×?×?ר ×?×?×? ×?×?×?×? ×?שנ×?"
+msgid "Could not add calendar time zone: %s"
+msgstr "×?×? × ×?ת×? ×?×?×?ס×?×£ ×?×?×?ר ×?×?×? ×?×?×?×? ×?שנ×?: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:912
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1057
 #, c-format
-msgid "Could not set default calendar time zone"
-msgstr "×?×? × ×?ת×? ×?×?×?×?×?ר ×?ת ×?×?×?ר ×?×?×?×? ×?×?ר×?רת ×?×?×?×?×? ש×? ×?×?×? ×?שנ×?"
+msgid "Could not set default calendar time zone: %s"
+msgstr "×?×? × ×?ת×? ×?×?×?×?×?ר ×?ת ×?×?×?ר ×?×?×?×? ×?×?ר×?רת ×?×?×?×?×? ש×? ×?×?×? ×?שנ×?: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:933
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1080
 #, c-format
-msgid "Cannot retrieve calendar changes"
-msgstr "×?×? × ×?ת×? ×?ק×?×? ש×?× ×?×?×?×? ×?×?×?×? ×?שנ×?"
+msgid "Cannot retrieve calendar changes: %s"
+msgstr "×?×? × ×?ת×? ×?ק×?×? ש×?× ×?×?×?×? ×?×?×?×? ×?שנ×?: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:983
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1132
 #, c-format
-msgid "Cannot retrieve calendar free/busy list"
-msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת רש×?×?ת ×?×¢×?ס×?ק/פנ×?×? ש×? ×?×?×? ×?שנ×?"
+msgid "Cannot retrieve calendar free/busy list: %s"
+msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת רש×?×?ת ×?×¢×?ס×?ק/פנ×?×? ש×? ×?×?×? ×?שנ×?: %s"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:340
+#: ../calendar/libedata-cal/e-data-cal-factory.c:355
 #, c-format
 msgid "Invalid URI"
 msgstr "×?ת×?×?ת ש×?×?×?×?"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:351
+#: ../calendar/libedata-cal/e-data-cal-factory.c:370
 #, c-format
 msgid "No backend factory for '%s' of '%s'"
-msgstr ""
+msgstr "×?×?×? ×?פע×? ×?× ×?× ×?×? ×¢×?×?ר '%s' ×?ת×?×? '%s'"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:391
+#: ../calendar/libedata-cal/e-data-cal-factory.c:420
 #, c-format
 msgid "Could not instantiate backend"
 msgstr "×?×? × ×?ת×? ×?×?פע×?×? ×?ת ×?×?× ×?× ×?×?"
 
-#: ../camel/camel-cipher-context.c:74
+#: ../camel/camel-cipher-context.c:75
+#, c-format
 msgid "Signing is not supported by this cipher"
-msgstr ""
+msgstr "×?ת×?×?×? ×?×?× ×? נת×?×?ת ×¢×? ×?×?×? צ×?פ×? ×?×?"
 
-#: ../camel/camel-cipher-context.c:109
+#: ../camel/camel-cipher-context.c:110
 msgid "Signing message"
 msgstr "×?×?ת×? ×¢×? ×?×?×?×¢×?"
 
-#: ../camel/camel-cipher-context.c:129
+#: ../camel/camel-cipher-context.c:131
+#, c-format
 msgid "Verifying is not supported by this cipher"
-msgstr ""
+msgstr "×?×?×?×?×? ×?×?× ×? נת×?×? ×¢×? ×?×?×? צ×?פ×? ×?×?"
 
-#: ../camel/camel-cipher-context.c:162
+#: ../camel/camel-cipher-context.c:164
 msgid "Verifying message"
 msgstr "×?×?×?×?×? ×?×?×?×¢×?"
 
-#: ../camel/camel-cipher-context.c:185
+#: ../camel/camel-cipher-context.c:188
+#, c-format
 msgid "Encryption is not supported by this cipher"
-msgstr ""
+msgstr "×?צפנ×? ×?×?× ×? נת×?×?ת ×¢×? ×?×?×? צ×?פ×? ×?×?"
 
-#: ../camel/camel-cipher-context.c:220
+#: ../camel/camel-cipher-context.c:223
 msgid "Encrypting message"
 msgstr "×?צפ×?×? ×?×?×?×¢×?"
 
-#: ../camel/camel-cipher-context.c:242
+#: ../camel/camel-cipher-context.c:246
+#, c-format
 msgid "Decryption is not supported by this cipher"
-msgstr ""
+msgstr "פענ×?×? ×?×?× ×? נת×?×? ×¢×? ×?×?×? צ×?פ×? ×?×?"
 
-#: ../camel/camel-cipher-context.c:272
+#: ../camel/camel-cipher-context.c:276
 msgid "Decrypting message"
 msgstr "×?פענ×? ×?×?×?×¢×?"
 
-#: ../camel/camel-cipher-context.c:292
+#: ../camel/camel-cipher-context.c:297
+#, c-format
 msgid "You may not import keys with this cipher"
-msgstr ""
+msgstr "×?×? × ×?ת×? ×?×?×?×?×? ×?פת×?×?ת ×?×¢×?×? צ×?פ×? ×?×?"
 
-#: ../camel/camel-cipher-context.c:332
+#: ../camel/camel-cipher-context.c:341
+#, c-format
 msgid "You may not export keys with this cipher"
-msgstr ""
+msgstr "×?×? × ×?ת×? ×?×?×?צ×? ×?פת×?×?ת ×?×¢×?×? צ×?פ×? ×?×?"
 
-#: ../camel/camel-data-cache.c:184
+#: ../camel/camel-data-cache.c:181
+#, c-format
 msgid "Unable to create cache path"
 msgstr "×?×? × ×?ת×? ×?×?צ×?ר ×?ת נת×?×? ×?×?×?×?×?×?"
 
@@ -1373,7 +1531,13 @@ msgstr "×?×? × ×?ת×? ×?×?צ×?ר ×?ת נת×?×? ×?×?×?×?×?×?"
 msgid "Could not remove cache entry: %s: %s"
 msgstr "×?×? × ×?ת×? ×?×?ס×?ר ×?× ×?סת ×?×?×?×?×?: %sâ??: %s"
 
-#: ../camel/camel-db.c:458
+#: ../camel/camel-data-wrapper.c:89
+#, fuzzy, c-format
+msgid "No stream available"
+msgstr "×?×?×?×¢×? ×?×?×?ת ×?×?× ×? ×?×?×?× ×?."
+
+#: ../camel/camel-db.c:464
+#, c-format
 msgid "Insufficient memory"
 msgstr "×?×?×? ×?ספ×?ק ×?×?ר×?×?"
 
@@ -1385,8 +1549,8 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: ../camel/camel-disco-diary.c:259
-#: ../camel/providers/imap/camel-imap-journal.c:299
+#: ../camel/camel-disco-diary.c:258
+#: ../camel/providers/imap/camel-imap-journal.c:298
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1402,115 +1566,133 @@ msgstr "×?סתנ×?ר×? ×?×?×?ש ×¢×? ×?שרת"
 msgid "Downloading new messages for offline mode"
 msgstr "×?×?ר×?×? ×?×?×?×¢×?ת ×?×?ש×?ת ×¢×?×?ר ×?צ×? ×?×? ×?ק×?×?×?"
 
-#: ../camel/camel-disco-folder.c:346
+#: ../camel/camel-disco-folder.c:379
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "×?×?×?×? ×?ת ×?ת×?ק×?×?×? '%s' ×?×?צ×? ×?×? ×?ק×?×?×?"
 
-#: ../camel/camel-disco-folder.c:412 ../camel/camel-offline-folder.c:225
+#: ../camel/camel-disco-folder.c:445 ../camel/camel-offline-folder.c:224
 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
+#: ../camel/camel-disco-store.c:395
+#: ../camel/providers/groupwise/camel-groupwise-store.c:230
+#: ../camel/providers/imap/camel-imap-store.c:895
+#: ../camel/providers/imap/camel-imap-store.c:1739
+#: ../camel/providers/imap/camel-imap-store.c:2197
+#: ../camel/providers/imap/camel-imap-store.c:3041
+#: ../camel/providers/imapx/camel-imapx-store.c:185
+#: ../camel/providers/imapx/camel-imapx-store.c:709
+#: ../camel/providers/imapx/camel-imapx-store.c:772
+#: ../camel/providers/imapx/camel-imapx-store.c:831
+#, c-format
 msgid "You must be working online to complete this operation"
 msgstr "×¢×?×?×? ×?×?×?×?ת ×?×?צ×? ×?ק×?×?×? ×¢×? ×?נת ×?×?ש×?×?×? ×?ת פע×?×?×? ×?×?ת"
 
-#: ../camel/camel-exception.c:281
-msgid "No description available"
-msgstr "×?×?×? ת×?×?×?ר ×?×?×?×?"
+#: ../camel/camel-file-utils.c:430 ../camel/camel-file-utils.c:489
+#: ../camel/camel-file-utils.c:529 ../camel/camel-file-utils.c:599
+#: ../camel/camel-file-utils.c:691 ../camel/camel-gpg-context.c:887
+#: ../camel/camel-gpg-context.c:1175 ../camel/camel-net-utils.c:512
+#: ../camel/camel-net-utils.c:689 ../camel/camel-net-utils.c:838
+#: ../camel/providers/imapx/camel-imapx-server.c:4678
+#: ../camel/providers/imapx/camel-imapx-server.c:4695
+#: ../camel/providers/nntp/camel-nntp-summary.c:396
+#: ../camel/providers/pop3/camel-pop3-folder.c:269
+#: ../camel/providers/pop3/camel-pop3-folder.c:625
+#: ../camel/providers/pop3/camel-pop3-folder.c:690
+#: ../camel/providers/pop3/camel-pop3-store.c:487
+#: ../libedataserverui/e-book-auth-util.c:229
+#, fuzzy, c-format
+msgid "Cancelled"
+msgstr "Canceled"
+
+#: ../camel/camel-file-utils.c:643 ../camel/camel-file-utils.c:734
+#: ../camel/camel-file-utils.c:791
+#, c-format
+msgid "Canceled"
+msgstr "Canceled"
 
-#: ../camel/camel-filter-driver.c:803 ../camel/camel-filter-search.c:583
+#: ../camel/camel-filter-driver.c:808 ../camel/camel-filter-search.c:582
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Failed to create child process '%s': %s"
 
-#: ../camel/camel-filter-driver.c:846
+#: ../camel/camel-filter-driver.c:853
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Invalid message stream received from %s: %s"
 
-#: ../camel/camel-filter-driver.c:1035 ../camel/camel-filter-driver.c:1044
+#: ../camel/camel-filter-driver.c:1037 ../camel/camel-filter-driver.c:1046
 msgid "Syncing folders"
 msgstr "×?סנ×?ר×? ת×?ק×?×?ת"
 
-#: ../camel/camel-filter-driver.c:1132 ../camel/camel-filter-driver.c:1559
+#: ../camel/camel-filter-driver.c:1134 ../camel/camel-filter-driver.c:1569
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error parsing filter: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1142 ../camel/camel-filter-driver.c:1569
+#: ../camel/camel-filter-driver.c:1145 ../camel/camel-filter-driver.c:1580
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error executing filter: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1234
+#: ../camel/camel-filter-driver.c:1240
+#, c-format
 msgid "Unable to open spool folder"
 msgstr "Unable to open spool folder"
 
-#: ../camel/camel-filter-driver.c:1245
+#: ../camel/camel-filter-driver.c:1251
+#, c-format
 msgid "Unable to process spool folder"
 msgstr "Unable to process spool folder"
 
-#: ../camel/camel-filter-driver.c:1262
+#: ../camel/camel-filter-driver.c:1269
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "×?ק×?×? ×?×?×?×¢×? %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1268
-msgid "Cannot open message"
-msgstr "×?×? ×?×?×?×? ×?פת×?×? ×?ת ×?×?×?×?×¢×?"
-
-#: ../camel/camel-filter-driver.c:1269 ../camel/camel-filter-driver.c:1290
+#: ../camel/camel-filter-driver.c:1275 ../camel/camel-filter-driver.c:1297
 #, c-format
 msgid "Failed on message %d"
 msgstr "× ×?ש×? ×?×?×?×?×¢×? %d"
 
-#: ../camel/camel-filter-driver.c:1304 ../camel/camel-filter-driver.c:1401
+#: ../camel/camel-filter-driver.c:1312 ../camel/camel-filter-driver.c:1411
 msgid "Syncing folder"
 msgstr "×?סנ×?ר×? ת×?ק×?×?×?"
 
-#: ../camel/camel-filter-driver.c:1308 ../camel/camel-filter-driver.c:1406
+#: ../camel/camel-filter-driver.c:1316 ../camel/camel-filter-driver.c:1416
 msgid "Complete"
 msgstr "×?×?ש×?×?"
 
-#: ../camel/camel-filter-driver.c:1368
+#: ../camel/camel-filter-driver.c:1377
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "×?ק×?×? ×?×?×?×¢×? %d ×?ת×?×? %d"
 
-#: ../camel/camel-filter-driver.c:1386
+#: ../camel/camel-filter-driver.c:1395
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "× ×?ש×? ×?×?×?×?×¢×? %d ×?ת×?×? %d"
 
-#: ../camel/camel-filter-search.c:136
+#: ../camel/camel-filter-search.c:135
 msgid "Failed to retrieve message"
 msgstr "× ×?ש×? ×?ק×?×?ת ×?×?×?×¢×?"
 
-#: ../camel/camel-filter-search.c:402
+#: ../camel/camel-filter-search.c:401
 msgid "Invalid arguments to (system-flag)"
 msgstr ""
 
-#: ../camel/camel-filter-search.c:417
+#: ../camel/camel-filter-search.c:416
 msgid "Invalid arguments to (user-tag)"
 msgstr ""
 
-#: ../camel/camel-filter-search.c:742 ../camel/camel-filter-search.c:751
+#: ../camel/camel-filter-search.c:744 ../camel/camel-filter-search.c:753
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error executing filter search: %s: %s"
 
-#: ../camel/camel-folder-search.c:346 ../camel/camel-folder-search.c:458
-#: ../camel/camel-folder-search.c:628
+#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
+#: ../camel/camel-folder-search.c:627
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1519,8 +1701,8 @@ msgstr ""
 "×?×? × ×?ת×? ×?פרק ×?ת ×?×?×?×?×? ×?×?×?פ×?ש: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:359 ../camel/camel-folder-search.c:471
-#: ../camel/camel-folder-search.c:641
+#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:468
+#: ../camel/camel-folder-search.c:639
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1529,62 +1711,74 @@ msgstr ""
 "ש×?×?×?×? ×?×?פע×?ת ×?×?×?×?×? ×?×?×?פ×?ש: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:841 ../camel/camel-folder-search.c:883
+#: ../camel/camel-folder-search.c:843 ../camel/camel-folder-search.c:885
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr ""
 
-#: ../camel/camel-folder-search.c:936
+#: ../camel/camel-folder-search.c:938
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr ""
 
-#: ../camel/camel-folder-search.c:942 ../camel/camel-folder-search.c:949
+#: ../camel/camel-folder-search.c:944 ../camel/camel-folder-search.c:951
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr ""
 
-#: ../camel/camel-folder-search.c:976
+#: ../camel/camel-folder-search.c:978
 #, c-format
 msgid "(%s) expects an array result"
 msgstr ""
 
-#: ../camel/camel-folder-search.c:985
+#: ../camel/camel-folder-search.c:987
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr ""
 
-#: ../camel/camel-folder.c:126
+#: ../camel/camel-folder.c:125
 #, c-format
 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:149
+#: ../camel/camel-folder.c:147
 #, c-format
 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:174
+#: ../camel/camel-folder.c:171
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
 msgstr[0] "×?ס×?ננת ×?×?×?×¢×? ×?×?ש×? ת×?ת '%s'"
 msgstr[1] "×?ס×?× × ×?ת ×?×?×?×¢×?ת ×?×?ש×?ת ת×?ת '%s'"
 
-#: ../camel/camel-folder.c:689
-#: ../camel/providers/local/camel-maildir-folder.c:375
+#: ../camel/camel-folder.c:688
+#: ../camel/providers/local/camel-maildir-folder.c:366
 msgid "Moving messages"
 msgstr "×?×¢×?×?ר ×?×?×?×¢×?ת"
 
-#: ../camel/camel-folder.c:691
+#: ../camel/camel-folder.c:690
 msgid "Copying messages"
 msgstr "×?עת×?ק ×?×?×?×¢×?ת"
 
-#: ../camel/camel-gpg-context.c:758
+#: ../camel/camel-gpg-context.c:701 ../camel/camel-gpg-context.c:706
+#: ../camel/camel-gpg-context.c:1330
+#, c-format
+msgid "Failed to execute gpg: %s"
+msgstr "Failed to execute gpg: %s"
+
+#: ../camel/camel-gpg-context.c:706
+#: ../camel/providers/smtp/camel-smtp-transport.c:114
+#: ../camel/providers/smtp/camel-smtp-transport.c:169
+msgid "Unknown"
+msgstr "×?×? ×?×?×?×¢"
+
+#: ../camel/camel-gpg-context.c:770
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1595,144 +1789,129 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:775
+#: ../camel/camel-gpg-context.c:787
+#, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "Failed to parse gpg userid hint."
 
-#: ../camel/camel-gpg-context.c:800 ../camel/camel-gpg-context.c:815
+#: ../camel/camel-gpg-context.c:812 ../camel/camel-gpg-context.c:827
+#, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "Failed to parse gpg passphrase request."
 
-#: ../camel/camel-gpg-context.c:835
+#: ../camel/camel-gpg-context.c:848
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
 "SmartCard: \"%s\""
 msgstr ""
 
-#: ../camel/camel-gpg-context.c:839
+#: ../camel/camel-gpg-context.c:852
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: ../camel/camel-gpg-context.c:845
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "×?קש×? ×?×?ת×? צפ×?×?×? ×?Ö¾GnuPG ×¢×?×?ר `%s'"
 
-#: ../camel/camel-gpg-context.c:873 ../camel/camel-gpg-context.c:1156
-msgid "Canceled."
-msgstr "Canceled."
-
-#: ../camel/camel-gpg-context.c:888
+#: ../camel/camel-gpg-context.c:905
+#, c-format
 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:900
+#: ../camel/camel-gpg-context.c:917
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Unexpected response from GnuPG: %s"
 
-#: ../camel/camel-gpg-context.c:1031
+#: ../camel/camel-gpg-context.c:1048
+#, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Failed to encrypt: No valid recipients specified."
 
-#: ../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:1415 ../camel/camel-smime-context.c:820
-#, c-format
-msgid "Could not generate signing data: %s"
+#: ../camel/camel-gpg-context.c:1434 ../camel/camel-smime-context.c:821
+#, fuzzy
+msgid "Could not generate signing data: "
 msgstr "Could not generate signing data: %s"
 
-#: ../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
+#: ../camel/camel-gpg-context.c:1481 ../camel/camel-gpg-context.c:1740
+#: ../camel/camel-gpg-context.c:1848 ../camel/camel-gpg-context.c:1987
+#: ../camel/camel-gpg-context.c:2081 ../camel/camel-gpg-context.c:2128
 msgid "Failed to execute gpg."
 msgstr "Failed to execute gpg."
 
-#: ../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
+#: ../camel/camel-gpg-context.c:1622 ../camel/camel-gpg-context.c:1630
+#: ../camel/camel-gpg-context.c:1638 ../camel/camel-gpg-context.c:1655
+#: ../camel/camel-smime-context.c:943 ../camel/camel-smime-context.c:957
+#: ../camel/camel-smime-context.c:966
+#, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Cannot verify message signature: Incorrect message format"
 
-#: ../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:1695
+#, fuzzy
+msgid "Cannot verify message signature: "
+msgstr "Cannot verify message signature: Incorrect message format"
 
-#: ../camel/camel-gpg-context.c:1807
-#, c-format
-msgid "Could not generate encrypting data: %s"
+#: ../camel/camel-gpg-context.c:1814
+#, fuzzy
+msgid "Could not generate encrypting data: "
 msgstr "Could not generate encrypting data: %s"
 
-#: ../camel/camel-gpg-context.c:1863
+#: ../camel/camel-gpg-context.c:1866
 msgid "This is a digitally encrypted message part"
 msgstr "×?×?×? ×?×?ק ש×? ×?×?×?×¢×? ×?×?צפנת ×?×?×?×?×?×?×?ת"
 
-#: ../camel/camel-gpg-context.c:1919 ../camel/camel-gpg-context.c:1928
-#: ../camel/camel-gpg-context.c:1950
+#: ../camel/camel-gpg-context.c:1922 ../camel/camel-gpg-context.c:1931
+#: ../camel/camel-gpg-context.c:1954
+#, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Cannot decrypt message: Incorrect message format"
 
-#: ../camel/camel-gpg-context.c:1939
+#: ../camel/camel-gpg-context.c:1942
+#, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Failed to decrypt MIME part: protocol error"
 
-#: ../camel/camel-gpg-context.c:2023 ../camel/camel-smime-context.c:1235
+#: ../camel/camel-gpg-context.c:2023 ../camel/camel-smime-context.c:1241
 msgid "Encrypted content"
 msgstr "ת×?×?×? ×?×?צפ×?"
 
-#: ../camel/camel-gpg-context.c:2045
-msgid "Unable to parse message content"
-msgstr "Unable to parse message content"
-
-#: ../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:105
+#: ../camel/camel-lock-client.c:106
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Cannot build locking helper pipe: %s"
 
-#: ../camel/camel-lock-client.c:128
+#: ../camel/camel-lock-client.c:130
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Cannot fork locking helper: %s"
 
-#: ../camel/camel-lock-client.c:208 ../camel/camel-lock-client.c:234
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "Could not lock '%s': protocol error with lock-helper"
 
-#: ../camel/camel-lock-client.c:223
+#: ../camel/camel-lock-client.c:227
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Could not lock '%s'"
 
-#: ../camel/camel-lock.c:104
+#: ../camel/camel-lock.c:102
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Could not create lock file for %s: %s"
 
-#: ../camel/camel-lock.c:147
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+#: ../camel/camel-lock.c:145
+#, fuzzy, 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:206
+#: ../camel/camel-lock.c:205
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Failed to get lock using fcntl(2): %s"
@@ -1742,17 +1921,17 @@ msgstr "Failed to get lock using fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Failed to get lock using flock(2): %s"
 
-#: ../camel/camel-movemail.c:108
+#: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Could not check mail file %s: %s"
 
-#: ../camel/camel-movemail.c:121
+#: ../camel/camel-movemail.c:119
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Could not open mail file %s: %s"
 
-#: ../camel/camel-movemail.c:130
+#: ../camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Could not open temporary mail file %s: %s"
@@ -1762,116 +1941,116 @@ msgstr "Could not open temporary mail file %s: %s"
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Failed to store mail in temp file %s: %s"
 
-#: ../camel/camel-movemail.c:192
+#: ../camel/camel-movemail.c:193
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Could not create pipe: %s"
 
-#: ../camel/camel-movemail.c:205
+#: ../camel/camel-movemail.c:207
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Could not fork: %s"
 
-#: ../camel/camel-movemail.c:243
+#: ../camel/camel-movemail.c:245
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail program failed: %s"
 
-#: ../camel/camel-movemail.c:244
+#: ../camel/camel-movemail.c:246
 msgid "(Unknown error)"
 msgstr "(Unknown error)"
 
-#: ../camel/camel-movemail.c:270
+#: ../camel/camel-movemail.c:273
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Error reading mail file: %s"
 
-#: ../camel/camel-movemail.c:282
+#: ../camel/camel-movemail.c:286
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Error writing mail temp file: %s"
 
-#: ../camel/camel-movemail.c:478 ../camel/camel-movemail.c:546
+#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Error copying mail temp file: %s"
 
-#: ../camel/camel-multipart-signed.c:593
-msgid "parse error"
-msgstr "parse error"
+#: ../camel/camel-multipart-signed.c:285
+#, c-format
+msgid "No content available"
+msgstr "×?×?×? ת×?×?×? ×?×?×?×?"
 
-#: ../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-multipart-signed.c:293
+#, c-format
+msgid "No signature available"
+msgstr "×?×?×? ×?ת×?×?×? ×?×?×?× ×?"
 
-#: ../camel/camel-net-utils.c:533
-msgid "cannot create thread"
-msgstr "cannot create thread"
+#: ../camel/camel-multipart-signed.c:612
+#, c-format
+msgid "parse error"
+msgstr "parse error"
 
-#: ../camel/camel-net-utils.c:698
+#: ../camel/camel-net-utils.c:693
 #, c-format
 msgid "Resolving: %s"
 msgstr "×?פענ×?: %s"
 
-#: ../camel/camel-net-utils.c:720
+#: ../camel/camel-net-utils.c:715
 msgid "Host lookup failed"
 msgstr "× ×?ש×? ×?×?צ×?×?ת ×?×?×?ר×?"
 
-#: ../camel/camel-net-utils.c:724
+#: ../camel/camel-net-utils.c:719
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "Host lookup failed: %s: %s"
 
-#: ../camel/camel-net-utils.c:846
+#: ../camel/camel-net-utils.c:842
 msgid "Resolving address"
 msgstr "×?פענ×? ×?ת×?×?ת"
 
-#: ../camel/camel-net-utils.c:866
+#: ../camel/camel-net-utils.c:862
 msgid "Name lookup failed"
 msgstr "×?×?פ×?ש ש×? × ×?ש×?"
 
-#: ../camel/camel-net-utils.c:871
+#: ../camel/camel-net-utils.c:867
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "Name lookup failed: %s"
 
-#: ../camel/camel-offline-folder.c:170
+#: ../camel/camel-offline-folder.c:169
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "×?ת×?צע סנ×?ר×?×? ש×? ×?×?×?×?×¢×?ת ×?ת×?ק×?×?×? '%s' ×¢×? ×?×?×?× ×?"
 
-#: ../camel/camel-offline-journal.c:143 ../camel/camel-offline-journal.c:168
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:170
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "×?×? × ×?ת×? ×?×?ת×?×? ×?×?×?×? ×?×?ת×? ×?ק×?×?×? ×¢×?×?ר ×?ת×?ק×?×?×? '%s':â?? %s"
 
-#: ../camel/camel-provider.c:59
+#: ../camel/camel-provider.c:58
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: ../camel/camel-provider.c:61
+#: ../camel/camel-provider.c:60
 msgid "For reading mail as a query of another set of folders"
 msgstr "×¢×? × ×?ת ×?קר×?×? ×?×?×?ר ×?ש×?×?×?ת×? ×?ק×?×?צת ת×?ק×?×?ת ×?×?רת"
 
-#: ../camel/camel-provider.c:189
+#: ../camel/camel-provider.c:188
 #, 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:198
+#: ../camel/camel-provider.c:197
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Could not load %s: %s"
 
-#: ../camel/camel-provider.c:207
+#: ../camel/camel-provider.c:206
 #, 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:388 ../camel/camel-session.c:206
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:207
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "No provider available for protocol '%s'"
@@ -1884,25 +2063,26 @@ msgstr "×?× ×?× ×?×?×?"
 msgid "This option will connect to the server using an anonymous login."
 msgstr ""
 
-#: ../camel/camel-sasl-anonymous.c:68
+#: ../camel/camel-sasl-anonymous.c:69
+#, c-format
 msgid "Authentication failed."
 msgstr "×?×?×?×?×?ת × ×?ש×?."
 
-#: ../camel/camel-sasl-anonymous.c:78
+#: ../camel/camel-sasl-anonymous.c:80
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
 "%s"
 msgstr ""
 
-#: ../camel/camel-sasl-anonymous.c:91
+#: ../camel/camel-sasl-anonymous.c:94
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
 "%s"
 msgstr ""
 
-#: ../camel/camel-sasl-anonymous.c:104
+#: ../camel/camel-sasl-anonymous.c:108
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1929,27 +2109,33 @@ msgid ""
 "if the server supports it."
 msgstr ""
 
-#: ../camel/camel-sasl-digest-md5.c:817
+#: ../camel/camel-sasl-digest-md5.c:818
+#, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Server challenge too long (>2048 octets)"
 
-#: ../camel/camel-sasl-digest-md5.c:827
+#: ../camel/camel-sasl-digest-md5.c:829
+#, c-format
 msgid "Server challenge invalid\n"
 msgstr "Server challenge invalid\n"
 
-#: ../camel/camel-sasl-digest-md5.c:834
+#: ../camel/camel-sasl-digest-md5.c:837
+#, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "Server challenge contained invalid \"Quality of Protection\" token"
 
-#: ../camel/camel-sasl-digest-md5.c:865
+#: ../camel/camel-sasl-digest-md5.c:869
+#, c-format
 msgid "Server response did not contain authorization data"
 msgstr "Server response did not contain authorization data"
 
-#: ../camel/camel-sasl-digest-md5.c:885
+#: ../camel/camel-sasl-digest-md5.c:890
+#, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "Server response contained incomplete authorization data"
 
-#: ../camel/camel-sasl-digest-md5.c:897
+#: ../camel/camel-sasl-digest-md5.c:903
+#, c-format
 msgid "Server response does not match"
 msgstr "Server response does not match"
 
@@ -2021,13 +2207,15 @@ msgstr "The consistency checks performed on the credential failed."
 msgid "The referenced credentials have expired."
 msgstr "The referenced credentials have expired."
 
-#: ../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
+#: ../camel/camel-sasl-gssapi.c:162 ../camel/camel-sasl-gssapi.c:300
+#: ../camel/camel-sasl-gssapi.c:344 ../camel/camel-sasl-gssapi.c:361
+#: ../camel/providers/smtp/camel-smtp-transport.c:1192
+#, c-format
 msgid "Bad authentication response from server."
 msgstr "Bad authentication response from server."
 
-#: ../camel/camel-sasl-gssapi.c:366
+#: ../camel/camel-sasl-gssapi.c:373
+#, c-format
 msgid "Unsupported security layer."
 msgstr "Unsupported security layer."
 
@@ -2040,6 +2228,7 @@ msgid "This option will connect to the server using a simple password."
 msgstr "×?פשר×?ת ×?×?ת תת×?×?ר ×?שרת ×?×¢×?רת ס×?ס×?×? פש×?×?×?."
 
 #: ../camel/camel-sasl-login.c:94
+#, c-format
 msgid "Unknown authentication state."
 msgstr "×?צ×? ×?×?×?×?ת ×?×? ×?×?×?×¢"
 
@@ -2069,35 +2258,37 @@ msgstr ""
 msgid "POP Source URI"
 msgstr "×?ת×?×?ת ×?ק×?ר POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:88
+#: ../camel/camel-sasl-popb4smtp.c:89
+#, c-format
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr ""
 
-#: ../camel/camel-sasl-popb4smtp.c:95
+#: ../camel/camel-sasl-popb4smtp.c:97
+#, c-format
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr ""
 
-#: ../camel/camel-search-private.c:113
+#: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Regular expression compilation failed: %s: %s"
 
-#: ../camel/camel-service.c:97
+#: ../camel/camel-service.c:88
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' needs a username component"
 
-#: ../camel/camel-service.c:101
+#: ../camel/camel-service.c:92
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' needs a host component"
 
-#: ../camel/camel-service.c:105
+#: ../camel/camel-service.c:96
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' needs a path component"
 
-#: ../camel/camel-session.c:261
+#: ../camel/camel-session.c:263
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2106,233 +2297,233 @@ msgstr ""
 "×?×? × ×?ת×? ×?×?צ×?ר ×?ת ×?ספר×?×?×? %s:\n"
 "â??%s"
 
-#: ../camel/camel-session.c:746
+#: ../camel/camel-session.c:760
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "× ×? ×?×?×?×?×? ×?ת סס×?ת ×?Ö¾%s ×¢×?×?ר %s ×?×?×?ר×? %s."
 
-#: ../camel/camel-smime-context.c:346 ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1041
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "×?×? × ×?צ×?×? תע×?×?×? ×¢×?×?ר '%s'"
 
-#: ../camel/camel-smime-context.c:374
+#: ../camel/camel-smime-context.c:376
 msgid "Cannot create CMS message"
 msgstr "×?×? × ×?ת×? ×?×?צ×?ר ×?×?×?עת CMS"
 
-#: ../camel/camel-smime-context.c:379
+#: ../camel/camel-smime-context.c:381
 msgid "Cannot create CMS signed data"
 msgstr "×?×? × ×?ת×? ×?×?צ×?ר ×?×?×?×¢ CMS ×?ת×?×?"
 
-#: ../camel/camel-smime-context.c:385
+#: ../camel/camel-smime-context.c:387
 msgid "Cannot attach CMS signed data"
 msgstr "×?×? × ×?ת×? ×?צרף ×?×?×?×¢ CMS ×?ת×?×?"
 
-#: ../camel/camel-smime-context.c:392
+#: ../camel/camel-smime-context.c:394
 msgid "Cannot attach CMS data"
 msgstr "×?×? × ×?ת×? ×?צרף ×?×?×?×¢ CMS"
 
-#: ../camel/camel-smime-context.c:398
+#: ../camel/camel-smime-context.c:400
 msgid "Cannot create CMS Signer information"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:404
+#: ../camel/camel-smime-context.c:406
 msgid "Cannot find certificate chain"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:410
+#: ../camel/camel-smime-context.c:412
 msgid "Cannot add CMS Signing time"
 msgstr "×?×? × ×?ת×? ×?×?×?ס×?×£ ×?×?×? ×?ת×?×?ת CMS"
 
-#: ../camel/camel-smime-context.c:434 ../camel/camel-smime-context.c:449
+#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "×?×? ק×?×?×?ת תע×?×?ת  ×?צפנ×? ×¢×?×?ר '%s'"
 
-#: ../camel/camel-smime-context.c:456
+#: ../camel/camel-smime-context.c:458
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:463
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:466
+#: ../camel/camel-smime-context.c:468
 msgid "Cannot add encryption certificate"
 msgstr "×?×? × ×?ת×? ×?×?×?ס×?×£ תע×?×?ת ×?צפנ×?"
 
-#: ../camel/camel-smime-context.c:472
+#: ../camel/camel-smime-context.c:474
 msgid "Cannot add CMS Signer information"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:504
+#: ../camel/camel-smime-context.c:506
 msgid "Unverified"
 msgstr "×?×?ת×? ×?×?×?×?ת"
 
-#: ../camel/camel-smime-context.c:506
+#: ../camel/camel-smime-context.c:508
 msgid "Good signature"
 msgstr "×?ת×?×?×? ×?×?×?×?"
 
-#: ../camel/camel-smime-context.c:508
+#: ../camel/camel-smime-context.c:510
 msgid "Bad signature"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:510
+#: ../camel/camel-smime-context.c:512
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:512
+#: ../camel/camel-smime-context.c:514
 msgid "Signing certificate not found"
 msgstr "תע×?×?ת ×?×?ת×?×?×? ×?×? × ×?צ×?×?"
 
-#: ../camel/camel-smime-context.c:514
+#: ../camel/camel-smime-context.c:516
 msgid "Signing certificate not trusted"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:516
+#: ../camel/camel-smime-context.c:518
 msgid "Signature algorithm unknown"
 msgstr "×?×?×?×?ר×?ת×? ×?×?ת×?×?×? ×?×? ×?×?×?×¢"
 
-#: ../camel/camel-smime-context.c:518
+#: ../camel/camel-smime-context.c:520
 msgid "Signature algorithm unsupported"
 msgstr "×?×?×?×?ר×?ת×? ×?×?ת×?×?×? ×?×? נת×?×?"
 
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:522
 msgid "Malformed signature"
 msgstr "×?ת×?×?×? ש×?×?×?×?"
 
-#: ../camel/camel-smime-context.c:522
+#: ../camel/camel-smime-context.c:524
 msgid "Processing error"
 msgstr "ש×?×?×?ת ×¢×?×?×?×?"
 
-#: ../camel/camel-smime-context.c:564
+#: ../camel/camel-smime-context.c:566
 msgid "No signed data in signature"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:569
+#: ../camel/camel-smime-context.c:571
 msgid "Digests missing from enveloped data"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:582 ../camel/camel-smime-context.c:593
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:600 ../camel/camel-smime-context.c:604
+#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:614 ../camel/camel-smime-context.c:619
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
 msgstr "×?×?×?×? תע×?×?×? × ×?ש×?"
 
-#: ../camel/camel-smime-context.c:629
+#: ../camel/camel-smime-context.c:631
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:632
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:636
+#: ../camel/camel-smime-context.c:638
 msgid "Cannot find signature digests"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:652
+#: ../camel/camel-smime-context.c:654
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "×?×?ת×? %s â??<%s>: â??%sâ??\n"
 
-#: ../camel/camel-smime-context.c:831 ../camel/camel-smime-context.c:1109
+#: ../camel/camel-smime-context.c:832 ../camel/camel-smime-context.c:1114
 msgid "Cannot create encoder context"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:837
+#: ../camel/camel-smime-context.c:838
 msgid "Failed to add data to CMS encoder"
 msgstr "× ×?ש×? ×?×?×?ספת ×?×?×?×¢ ×?×?ק×?×?×? CMS"
 
-#: ../camel/camel-smime-context.c:842 ../camel/camel-smime-context.c:1126
+#: ../camel/camel-smime-context.c:843 ../camel/camel-smime-context.c:1131
 msgid "Failed to encode data"
 msgstr "× ×?ש×? ×?×?צפנת ×?×?×?×¢"
 
-#: ../camel/camel-smime-context.c:977 ../camel/camel-smime-context.c:1214
+#: ../camel/camel-smime-context.c:981 ../camel/camel-smime-context.c:1220
 msgid "Decoder failed"
 msgstr "×?פענ×? × ×?ש×?"
 
-#: ../camel/camel-smime-context.c:1044
+#: ../camel/camel-smime-context.c:1049
 msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:1052
+#: ../camel/camel-smime-context.c:1057
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:1063
+#: ../camel/camel-smime-context.c:1068
 msgid "Cannot create CMS Message"
 msgstr "×?×? × ×?ת×? ×?×?צ×?ר ×?×?×?עת CMS"
 
-#: ../camel/camel-smime-context.c:1069
+#: ../camel/camel-smime-context.c:1074
 msgid "Cannot create CMS Enveloped data"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:1075
+#: ../camel/camel-smime-context.c:1080
 msgid "Cannot attach CMS Enveloped data"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:1081
+#: ../camel/camel-smime-context.c:1086
 msgid "Cannot attach CMS data object"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:1090
+#: ../camel/camel-smime-context.c:1095
 msgid "Cannot create CMS Recipient information"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:1095
+#: ../camel/camel-smime-context.c:1100
 msgid "Cannot add CMS Recipient information"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:1120
+#: ../camel/camel-smime-context.c:1125
 msgid "Failed to add data to encoder"
 msgstr "× ×?ש×? ×?×?×?ספץ ×?×?×?×¢ ×?×?ק×?×?×?"
 
-#: ../camel/camel-smime-context.c:1221
+#: ../camel/camel-smime-context.c:1227
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: ../camel/camel-store.c:426
+#: ../camel/camel-store.c:444
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "×?×? × ×?ת×? ×?×?צ×?ר ×?ת ×?ת×?ק×?×?×? '%s': ×?ת×?ק×?×?×? ×?×?ר ק×?×?×?ת"
 
-#: ../camel/camel-store.c:520
+#: ../camel/camel-store.c:543
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "×?×? × ×?ת×? ×?×?צ×?ר ת×?ק×?×?×?: %s: ת×?ק×?×?×? ק×?×?×?ת"
 
-#: ../camel/camel-store.c:591 ../camel/camel-vee-store.c:261
-#: ../camel/providers/local/camel-maildir-store.c:218
+#: ../camel/camel-store.c:616 ../camel/camel-vee-store.c:263
+#: ../camel/providers/local/camel-maildir-store.c:224
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "×?×? × ×?ת×? ×?×?×?×?ק ת×?ק×?×?×?: %s: פע×?×?×? פס×?×?×?"
 
-#: ../camel/camel-store.c:655 ../camel/camel-vee-store.c:213
-#: ../camel/providers/local/camel-maildir-store.c:305
+#: ../camel/camel-store.c:680 ../camel/camel-vee-store.c:213
+#: ../camel/providers/local/camel-maildir-store.c:314
 #, 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:1086 ../camel/camel-vtrash-folder.c:49
+#: ../camel/camel-store.c:1128 ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "×?שפ×?"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:1089 ../camel/camel-vtrash-folder.c:51
+#: ../camel/camel-store.c:1131 ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "×?×?×?ר ×?×?×?"
 
-#: ../camel/camel-tcp-stream-ssl.c:762
+#: ../camel/camel-tcp-stream-ssl.c:786
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2345,16 +2536,16 @@ msgstr ""
 "×?×?×?עת ×?צ×?×¢:       %s\n"
 "×?ת×?×?×?:            %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:768
+#: ../camel/camel-tcp-stream-ssl.c:792
 msgid "GOOD"
 msgstr "×?×?×?"
 
-#: ../camel/camel-tcp-stream-ssl.c:768
+#: ../camel/camel-tcp-stream-ssl.c:792
 msgid "BAD"
 msgstr "×?×? ×?×?×?"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:772
+#: ../camel/camel-tcp-stream-ssl.c:796
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2369,7 +2560,7 @@ msgstr ""
 "\n"
 "×?ק×?×??"
 
-#: ../camel/camel-tcp-stream-ssl.c:816
+#: ../camel/camel-tcp-stream-ssl.c:840
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2378,14 +2569,14 @@ msgstr ""
 "×?×¢×?×?×? ×?תע×?×?×?: %s\n"
 "×?נפ×?ק: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:868
+#: ../camel/camel-tcp-stream-ssl.c:892
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-ssl.c:910
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2394,157 +2585,142 @@ msgstr ""
 "פ×? ת×?קף ×?תע×?×?×?: %s\n"
 "×?נפ×?ק: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:903
+#: ../camel/camel-tcp-stream-ssl.c:927
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: ../camel/camel-url.c:315
+#: ../camel/camel-url.c:314
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "×?×? × ×?ת×? ×?פרק ×?ת ×?×?ת×?×?ת '%s'"
 
-#: ../camel/camel-vee-folder.c:1068
+#: ../camel/camel-vee-folder.c:1044
 #, c-format
-msgid "Error storing '%s': %s"
-msgstr "ש×?×?×?×? ×?×?×?ס×?×? '%s':â?? %s"
+msgid "Error storing '%s': "
+msgstr "ש×?×?×?×? ×?×?×?ס×?×? '%s':"
 
-#: ../camel/camel-vee-folder.c:1141
+#: ../camel/camel-vee-folder.c:1117
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: ../camel/camel-vee-folder.c:1157 ../camel/camel-vee-folder.c:1172
+#: ../camel/camel-vee-folder.c:1133 ../camel/camel-vee-folder.c:1148
+#, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
-#: ../camel/camel-vee-store.c:142 ../camel/camel-vee-store.c:144
-#: ../camel/camel-vee-store.c:414
+#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
+#: ../camel/camel-vee-store.c:417
 msgid "Unmatched"
 msgstr "×?×?×? ×?ת×?×?×?"
 
-#: ../camel/camel-vee-store.c:222
+#: ../camel/camel-vee-store.c:223
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "×?×? × ×?ת×? ×?שנ×?ת ש×? ת×?ק×?×?×?: %s: ×?×?×? ×?×?×?ת ת×?ק×?×?×?"
 
-#: ../camel/camel-vee-store.c:286
+#: ../camel/camel-vee-store.c:289
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "×?×? × ×?ת×? ×?×?×?×?ק ת×?ק×?×?×?: %s: ×?×?×? ×?×?×?ת ת×?ק×?×?×?"
 
-#: ../camel/camel-vtrash-folder.c:50
+#: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "×?×? × ×?ת×? ×?×?עת×?ק ×?×?×?×¢×?ת ×?ת×?ק×?×?ת ×?×?שפ×?"
 
-#: ../camel/camel-vtrash-folder.c:52
+#: ../camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
 msgstr "×?×? × ×?ת×? ×?×?עת×?ק ×?×?×?×¢×?ת ×?ת×?ק×?×?ת ×?×?×?×?"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:138
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:138
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
 #: ../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
+#: ../camel/providers/local/camel-maildir-folder.c:380
+#: ../camel/providers/local/camel-mbox-folder.c:329
+#: ../camel/providers/local/camel-mbox-folder.c:380
+#: ../camel/providers/local/camel-mh-folder.c:215
 msgid "No such message"
 msgstr "×?×?×? ×?×?×?×¢×? ×?×?×?ת"
 
-#: ../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:683
-#: ../camel/providers/pop3/camel-pop3-folder.c:705
-msgid "User canceled"
-msgstr "×?×?שת×?ש ×?×?×?×?"
-
-#: ../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
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:158
+#: ../camel/providers/nntp/camel-nntp-folder.c:244
+#: ../camel/providers/nntp/camel-nntp-folder.c:337
+#: ../camel/providers/pop3/camel-pop3-folder.c:714
 #, c-format
-msgid "Cannot get message %s: %s"
-msgstr "×?×? × ×?ת×? ×?ק×?×? ×?×?×?×¢×? %s:â?? %s"
+msgid "Cannot get message %s: "
+msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת ×?×?×?×?×¢×? %s:"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:179
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:188
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2663
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:176
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:186
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2644
+#, c-format
 msgid "This message is not available in offline mode."
 msgstr "×?×?×?×¢×? ×?×? ×?×?× ×? ×?×?×?× ×? ×?×?צ×? ×?×? ×?ק×?×?×?."
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:204
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:203
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:213
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2132
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2185
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2109
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2163
+#, c-format
 msgid "Could not get message"
 msgstr "×?×? × ×?ת×? ×?ק×?×? ×?×?×?×¢×?"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1044
-#: ../camel/providers/imap/camel-imap-folder.c:375
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1038
+#: ../camel/providers/imap/camel-imap-folder.c:376
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "×?×? × ×?ת×? ×?×?×¢×?×? ס×?×?×?×? ×¢×?×?ר %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1119
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1112
 #, 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: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
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1637
+#: ../camel/providers/groupwise/camel-groupwise-store.c:654
+#: ../camel/providers/groupwise/camel-groupwise-store.c:779
+#: ../camel/providers/imap/camel-imap-folder.c:3806
+#: ../camel/providers/imap/camel-imap-folder.c:3884
+#: ../camel/providers/imapx/camel-imapx-server.c:3721
+#: ../camel/providers/imapx/camel-imapx-server.c:3845
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2496
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2545
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2474
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2524
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
 msgstr "×?×? × ×?ת×? ×?×?×?ס×?×£ ×?×?×?×¢×? ×?ת×?ק×?×?×? '%s':â?? %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2531
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2510
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "×?×? × ×?ת×? ×?×?צ×?ר ×?×?×?×¢×?: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:241
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:240
 #, c-format
 msgid "Cannot get folder container %s"
 msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת ×?×?×?×? ×?ת×?ק×?×?×? %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:304
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:303
+#, c-format
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:321
-#, c-format
-msgid "Cannot append message in offline mode: %s"
-msgstr "×?×? × ×?ת×? ×?×?×?ס×?×£ ×?×?×?×¢×? ×?×?צ×? ×?×?ת×? ×?ק×?×?×?: %s"
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:320
+msgid "Cannot append message in offline mode: "
+msgstr "×?×? × ×?ת×? ×?×?×?ס×?×£ ×?×?×?×¢×? ×?×?צ×? ×?×?ת×? ×?ק×?×?×?:"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:48
 msgid "Checking for new mail"
@@ -2552,7 +2728,7 @@ msgstr "×?×?×?קת ×?×?×?ר ×?×?ש"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:50
 #: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:45
+#: ../camel/providers/imapx/camel-imapx-provider.c:47
 msgid "C_heck for new messages in all folders"
 msgstr "_×?×?×?ק ×¢×?×?ר ×?×?×?×¢×?ת ×?×?ש×?ת ×?×?×? ×?ת×?ק×?×?ת"
 
@@ -2612,52 +2788,61 @@ msgid ""
 "This option will connect to the GroupWise server using a plaintext password."
 msgstr "×?פשר×?ת ×?×?ת תת×?×?ר ×?שרת ×?-GroupWise ×?×¢×?רת ס×?ס×?ת ×?קס×? פש×?×?."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:106
+#: ../camel/providers/groupwise/camel-groupwise-store.c:107
+#, c-format
 msgid "Host or user not available in url"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:205
-#: ../camel/providers/imap/camel-imap-store.c:1257
-#: ../camel/providers/imapx/camel-imapx-server.c:2510
+#: ../camel/providers/groupwise/camel-groupwise-store.c:207
+#: ../camel/providers/imap/camel-imap-store.c:1207
+#: ../camel/providers/imapx/camel-imapx-server.c:2975
+#, c-format
 msgid "You did not enter a password."
 msgstr "×?×? ×?×?נסת ס×?ס×?×?."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:322
+#: ../camel/providers/groupwise/camel-groupwise-store.c:328
 msgid "Some features may not work correctly with your current server version"
 msgstr ""
 
-#: ../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
+#: ../camel/providers/groupwise/camel-groupwise-store.c:550
+#: ../camel/providers/imap/camel-imap-store.c:1776
+#: ../camel/providers/imap/camel-imap-store.c:1971
+#: ../camel/providers/imapx/camel-imapx-store.c:410
 #, c-format
 msgid "No such folder %s"
 msgstr "×?ת×?ק×?×?×? %s ×?×? ק×?×?×?ת"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1228
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1187
+#, c-format
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "×?×? × ×?ת×? ×?×?צ×?ר ת×?ק×?×?ת GroupWise ×?×?צ×? ×?×? ×?ק×?×?×?."
 
-#: ../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
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1196
+#, c-format
+msgid "Cannot create a special system folder"
+msgstr "×?×? × ×?ת×? ×?×?צ×?ר ת×?ק×?×?ת ×?ער×?ת ×?×?×?×?×?ת"
+
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1206
+#: ../camel/providers/imap/camel-imap-store.c:1854
+#: ../camel/providers/imap/camel-imap-store.c:2276
+#: ../camel/providers/imapx/camel-imapx-store.c:873
+#, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1329
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1354
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1289
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1314
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
 msgstr "×?×? × ×?ת×? ×?שנ×?ת ×?ת ת×?ק×?×?ת ×?Ö¾GroupWise ×?Ö¾'%s' ×?Ö¾'%s'"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1388
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1348
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:54
 #, c-format
 msgid "GroupWise server %s"
 msgstr "שרת GroupWise â??%s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1390
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1350
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr ""
@@ -2667,46 +2852,46 @@ msgstr ""
 msgid "GroupWise mail delivery via %s"
 msgstr "ק×?×?ת ×?×?×?ר GrupWise ×?ר×? %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:94
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:95
 msgid "Sending Message"
 msgstr "ש×?×?×? ×?×?×?×¢×?"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:103
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:105
+#, c-format
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:148
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:152
+#, c-format
 msgid ""
 "You have exceeded this account's storage limit. Your messages are queued in "
 "your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
 "of your mail.\n"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:152
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:193
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
 #, c-format
 msgid "Could not send message: %s"
 msgstr "×?×? × ×?ת×? ×?ש×?×?×? ×?×?×?×¢×?: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:189
-#: ../camel/providers/imap/camel-imap-command.c:282
+#: ../camel/providers/imap/camel-imap-command.c:190
+#: ../camel/providers/imap/camel-imap-command.c:288
+#, c-format
 msgid "No output stream"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-command.c:196
-#: ../camel/providers/imap/camel-imap-command.c:289
+#: ../camel/providers/imap/camel-imap-command.c:198
+#: ../camel/providers/imap/camel-imap-command.c:296
+#, c-format
 msgid "No input stream"
 msgstr ""
 
-#: ../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
+#: ../camel/providers/imap/camel-imap-command.c:245
+#, c-format
 msgid "Operation cancelled"
 msgstr "פע×?×?×? ×?×?×?×?×?"
 
 #: ../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"
@@ -2720,26 +2905,27 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-command.c:443
+#: ../camel/providers/imap/camel-imap-command.c:444
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "ת×?×?×?×? ×?×?ת×? צפ×?×?×? ×?שרת IMAP: â??%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:454
+#: ../camel/providers/imap/camel-imap-command.c:456
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "פק×?×?ת IMAP × ×?ש×?×?: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:536
+#: ../camel/providers/imap/camel-imap-command.c:532
+#, c-format
 msgid "Server response ended too soon."
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-command.c:743
+#: ../camel/providers/imap/camel-imap-command.c:740
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-command.c:780
+#: ../camel/providers/imap/camel-imap-command.c:778
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "ת×?×?×?ת OK ×?×?ת×? צפ×?×?×? ×?שרת IMAP: â??%s"
@@ -2748,84 +2934,75 @@ msgstr "ת×?×?×?ת OK ×?×?ת×? צפ×?×?×? ×?שרת IMAP: â??%s"
 msgid "Always check for new mail in this folder"
 msgstr "×?×?×?ק ת×?×?×? ×¢×?×?ר ×?×?×?ר ×?×?ש ×?ת×?ק×?×?×? ×?×?ת"
 
-#: ../camel/providers/imap/camel-imap-folder.c:352
+#: ../camel/providers/imap/camel-imap-folder.c:353
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "×?×? × ×?ת×? ×?×?צ×?ר ×?ת ×?ספר×?×?×? %s: â??%s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:953
-#: ../camel/providers/imapx/camel-imapx-server.c:3237
+#: ../camel/providers/imap/camel-imap-folder.c:960
+#: ../camel/providers/imapx/camel-imapx-server.c:3760
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "ס×?רק ×¢×?×?ר ×?×?×?×¢×?ת ש×?שתנ×? ×?-%s"
 
-#: ../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:2264
-msgid "No response on continuation after APPEND command"
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-folder.c:2317
-msgid "Unknown error occurred during APPEND command!"
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-folder.c:3234
-#, c-format
-msgid "Unable to retrieve message: %s"
+#: ../camel/providers/imap/camel-imap-folder.c:3231
+#, fuzzy
+msgid "Unable to retrieve message: "
 msgstr "×?×? × ×?ת×? ×?ק×?×? ×?×?×?×¢×?: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3269
-#: ../camel/providers/imapx/camel-imapx-server.c:4250
+#: ../camel/providers/imap/camel-imap-folder.c:3266
+#: ../camel/providers/imapx/camel-imapx-server.c:4957
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "×?×? × ×?ת×? ×?ק×?×? ×?×?×?×¢×? ×¢×? ×?×?×?×? ×?×?×?×¢×? %s:â?? %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3270
-#: ../camel/providers/imapx/camel-imapx-server.c:4251
+#: ../camel/providers/imap/camel-imap-folder.c:3267
+#: ../camel/providers/imapx/camel-imapx-server.c:4958
 msgid "No such message available."
 msgstr "×?×?×?×¢×? ×?×?×?ת ×?×?× ×? ×?×?×?× ×?."
 
-#: ../camel/providers/imap/camel-imap-folder.c:3338
-#: ../camel/providers/imap/camel-imap-folder.c:4218
-#: ../camel/providers/nntp/camel-nntp-folder.c:331
+#: ../camel/providers/imap/camel-imap-folder.c:3337
+#: ../camel/providers/imap/camel-imap-folder.c:4203
+#: ../camel/providers/nntp/camel-nntp-folder.c:326
+#, c-format
 msgid "This message is not currently available"
 msgstr "×?×?×?×¢×? ×?×?ת ×?×?× ×? ×?×?×?× ×? ×?ר×?×¢ ×?×?"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4014
+#: ../camel/providers/imap/camel-imap-folder.c:4013
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-folder.c:4024
+#: ../camel/providers/imap/camel-imap-folder.c:4023
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-folder.c:4258
+#: ../camel/providers/imap/camel-imap-folder.c:4243
+#, c-format
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: ../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"
+#: ../camel/providers/imap/camel-imap-message-cache.c:193
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
+#, fuzzy
+msgid "Could not open cache directory: "
 msgstr "×?×? × ×?ת×? ×?פת×?×? ספר×?×?ת ×?×?×?×?×?: %s"
 
-#: ../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
+#: ../camel/providers/imap/camel-imap-message-cache.c:326
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:549
-#, c-format
-msgid "Failed to cache %s: %s"
-msgstr ""
+#: ../camel/providers/imap/camel-imap-message-cache.c:388
+#, fuzzy, c-format
+msgid "Failed to cache message %s: "
+msgstr "× ×?ש×? ×?×?×?×?×¢×? %d"
+
+#: ../camel/providers/imap/camel-imap-message-cache.c:525
+#, fuzzy, c-format
+msgid "Failed to cache %s: "
+msgstr "Failed to create child process '%s': %s"
 
 #: ../camel/providers/imap/camel-imap-provider.c:40
 #: ../camel/providers/imapx/camel-imapx-provider.c:41
@@ -2833,17 +3010,17 @@ msgid "Checking for New Mail"
 msgstr "×?×?×?ק ×¢×?×?ר ×?×?×?ר ×?×?ש"
 
 #: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:47
+#: ../camel/providers/imapx/camel-imapx-provider.c:49
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "×?ש ×?_×?×?×?ק ×?×?ר ×?×?×?×¢×?ת ×?×?ש×?ת ×?ת×?ק×?×?ת ×?×?×?× ×?×?×?×?"
 
 #: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:51
+#: ../camel/providers/imapx/camel-imapx-provider.c:53
 msgid "Connection to Server"
 msgstr "×?×?×?×?ר ×?שרת"
 
 #: ../camel/providers/imap/camel-imap-provider.c:50
-#: ../camel/providers/imapx/camel-imapx-provider.c:53
+#: ../camel/providers/imapx/camel-imapx-provider.c:55
 msgid "_Use custom command to connect to server"
 msgstr "×?שת×?ש ×?_פק×?×?×? ×?×?ת×?×?ת ×?×?ש×?ת ×?×?ת×?×?ר×?ת ×?שרת"
 
@@ -2879,7 +3056,7 @@ msgstr ""
 #: ../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 "×?×?×?ק ×?×?×?×¢×?ת ×?×?ש×?ת ×¢×?×?ר ת×?× ×? _×?×?×?"
+msgstr "×?×?×?קת ×?×?×?×¢×?ת ×?×?ש×?ת ×¢×?×?ר ת×?× ×? _×?×?×?"
 
 #: ../camel/providers/imap/camel-imap-provider.c:72
 #: ../camel/providers/imapx/camel-imapx-provider.c:81
@@ -2893,7 +3070,7 @@ msgstr "â??IMAP"
 #: ../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."
+msgstr "×?קר×?×?×? ×?ש×?×?רת ×?×?×?ר ×¢×? שרת×? IMAP."
 
 #: ../camel/providers/imap/camel-imap-provider.c:99
 #: ../camel/providers/imapx/camel-imapx-provider.c:107
@@ -2901,104 +3078,105 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "×?פשר×?ת ×?×?ת תת×?×?ר ×?שרת ×?-IMAP ×?×¢×?רת ס×?ס×?ת ×?קס×? פש×?×?."
 
 #: ../camel/providers/imap/camel-imap-store.c:310
-#: ../camel/providers/imapx/camel-imapx-store.c:206
+#: ../camel/providers/imapx/camel-imapx-store.c:220
 #, c-format
 msgid "IMAP server %s"
 msgstr "שרת IMAP %s"
 
 #: ../camel/providers/imap/camel-imap-store.c:312
-#: ../camel/providers/imapx/camel-imapx-store.c:208
+#: ../camel/providers/imapx/camel-imapx-store.c:222
 #, c-format
 msgid "IMAP service for %s on %s"
-msgstr "שרת IMAP ×¢×?×?ר %s ×?-%s"
+msgstr "שרת IMAP ×¢×?×?ר %s ×?Ö¾%s"
 
-#: ../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/imap/camel-imap-store.c:446
+#: ../camel/providers/nntp/camel-nntp-store.c:234
+#: ../camel/providers/pop3/camel-pop3-store.c:132
 #: ../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"
+msgstr "×?×? × ×?ת×? ×?×?ת×?×?ר ×?Ö¾%s: â??%s"
 
-#: ../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/imap/camel-imap-store.c:447
+#: ../camel/providers/nntp/camel-nntp-store.c:235
+#: ../camel/providers/pop3/camel-pop3-store.c:133
 #: ../camel/providers/smtp/camel-smtp-transport.c:216
 msgid "SSL unavailable"
 msgstr "â??SSL ×?×? ×?×?×?×?"
 
-#: ../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:465
+#: ../camel/providers/nntp/camel-nntp-store.c:252
+#, fuzzy, c-format
+msgid "Could not connect to %s: "
+msgstr "×?×? × ×?ת×? ×?×?ת×?×?ר ×?-%s: â??%s"
 
-#: ../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
+#: ../camel/providers/imap/camel-imap-store.c:571
+#: ../camel/providers/imap/camel-imap-store.c:591
+#: ../camel/providers/imap/camel-imap-store.c:598
+#: ../camel/providers/imap/camel-imap-store.c:625
+#: ../camel/providers/imapx/camel-imapx-server.c:2828
+#: ../camel/providers/imapx/camel-imapx-server.c:2864
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-store.c:577
-#: ../camel/providers/imapx/camel-imapx-server.c:2393
-#: ../camel/providers/smtp/camel-smtp-transport.c:297
+#: ../camel/providers/imap/camel-imap-store.c:572
+#: ../camel/providers/imapx/camel-imapx-server.c:2829
+#: ../camel/providers/smtp/camel-smtp-transport.c:295
 msgid "STARTTLS not supported"
 msgstr "â??STARTTLS ×?×? נת×?×?"
 
-#: ../camel/providers/imap/camel-imap-store.c:597
-#: ../camel/providers/imapx/camel-imapx-server.c:2414
+#: ../camel/providers/imap/camel-imap-store.c:592
+#: ../camel/providers/imapx/camel-imapx-server.c:2865
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-store.c:604
-#: ../camel/providers/smtp/camel-smtp-transport.c:338
+#: ../camel/providers/imap/camel-imap-store.c:599
+#: ../camel/providers/smtp/camel-smtp-transport.c:339
 msgid "SSL is not available in this build"
 msgstr "â??SSL ×?×?× ×? ×?×?×?×? ×?×?× ×?×?×? ×?×?ת"
 
-#: ../camel/providers/imap/camel-imap-store.c:755
-#: ../camel/providers/imapx/camel-imapx-server.c:2218
+#: ../camel/providers/imap/camel-imap-store.c:747
+#: ../camel/providers/imapx/camel-imapx-server.c:2648
+#, c-format
+msgid "Connection cancelled"
+msgstr "×?×?×?×?×?ר ×?×?×?×?"
+
+#: ../camel/providers/imap/camel-imap-store.c:752
+#: ../camel/providers/imapx/camel-imapx-server.c:2653
 #, 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: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/imap/camel-imap-store.c:945
+#: ../camel/providers/imap/camel-imap-store.c:2369
+#: ../camel/providers/imapx/camel-imapx-store.c:457
+#: ../camel/providers/imapx/camel-imapx-store.c:1054
 #: ../camel/providers/local/camel-maildir-folder.c:90
-#: ../camel/providers/local/camel-maildir-store.c:219
-#: ../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
+#: ../camel/providers/local/camel-maildir-store.c:225
+#: ../camel/providers/local/camel-maildir-store.c:315
+#: ../camel/providers/local/camel-maildir-store.c:562
+#: ../camel/providers/local/camel-maildir-store.c:575
+#: ../camel/providers/local/camel-spool-store.c:508
 msgid "Inbox"
 msgstr "×?×?×?ר × ×?נס"
 
-#: ../camel/providers/imap/camel-imap-store.c:1202
-#: ../camel/providers/imapx/camel-imapx-server.c:2469
+#: ../camel/providers/imap/camel-imap-store.c:1148
+#: ../camel/providers/imapx/camel-imapx-server.c:2931
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-store.c:1213
-#: ../camel/providers/imapx/camel-imapx-server.c:2480
-#: ../camel/providers/smtp/camel-smtp-transport.c:476
+#: ../camel/providers/imap/camel-imap-store.c:1160
+#: ../camel/providers/imapx/camel-imapx-server.c:2943
+#: ../camel/providers/smtp/camel-smtp-transport.c:483
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "×?×?×? ת×?×?×?×? ×?ס×?×? ×?×?×?×?×?ת %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1288
-#: ../camel/providers/imapx/camel-imapx-server.c:2536
+#: ../camel/providers/imap/camel-imap-store.c:1239
+#: ../camel/providers/imapx/camel-imapx-server.c:3013
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3006,51 +3184,61 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-store.c:1848
-#: ../camel/providers/imap/camel-imap-store.c:2270
-#: ../camel/providers/imapx/camel-imapx-store.c:786
+#: ../camel/providers/imap/camel-imap-store.c:1790
+#: ../camel/providers/imap/camel-imap-store.c:2212
+#: ../camel/providers/imapx/camel-imapx-store.c:852
 #, 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: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
+#: ../camel/providers/imap/camel-imap-store.c:1906
+#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-mbox-store.c:193
+#: ../camel/providers/local/camel-mh-store.c:255
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "×?×? × ×?ת×? ×?×?צ×?ר ×?ת ×?ת×?ק×?×?×? '%s': â??×?ת×?ק×?×?×? ק×?×?×?ת."
 
-#: ../camel/providers/imap/camel-imap-store.c:2281
-#: ../camel/providers/imapx/camel-imapx-store.c:794
+#: ../camel/providers/imap/camel-imap-store.c:2225
+#: ../camel/providers/imapx/camel-imapx-store.c:863
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "ת×?ק×?×?ת ×?×?ר×? ×?×? ×?×?×?×¢×?: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3143
+#: ../camel/providers/imap/camel-imap-store.c:3081
+#, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "×?שרת ×?תנתק ×?×?×?פ×? פת×?×?×?×?"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:74
+#: ../camel/providers/imap/camel-imap-store.c:3084
+#, fuzzy
+msgid "Server unexpectedly disconnected: "
+msgstr "×?שרת ×?תנתק ×?פת×?×?×?×?×?ת: %s"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:75
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr "×?×? × ×?ת×? ×?×?צ×?ר תקצ×?ר ת×?ק×?×?×? ×¢×?×?ר %s"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:82
-#, c-format
-msgid "Could not create cache for %s"
+#: ../camel/providers/imapx/camel-imapx-folder.c:83
+#, fuzzy, c-format
+msgid "Could not create cache for %s: "
 msgstr "×?×? × ×?ת×? ×?×?צ×?ר ×?×?×?×?×? ×¢×?×?ר %s"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:43
+msgid "Use _Quick Resync if the server supports it"
+msgstr ""
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:45
 msgid "Use I_dle if the server supports it"
 msgstr ""
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:55
+#: ../camel/providers/imapx/camel-imapx-provider.c:57
 msgid "Command:"
 msgstr "פק×?×?×?:"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:59
 msgid "Numbe_r of cached connections to use"
 msgstr ""
 
@@ -3060,13 +3248,53 @@ msgstr "×?ר×?×? ש×?:"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:89
 msgid "IMAP+"
-msgstr "â??IMAP+"
+msgstr "â??IMAP+â??"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:1365
+#, fuzzy
+msgid "Error writing to cache stream: "
+msgstr "Error writing mail temp file: %s"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:2008
+#, c-format
+msgid "Not authenticated"
+msgstr "×?×? ×?×?×?×?ת"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:2756
+#, fuzzy, c-format
+msgid "Could not connect to %s (port %s): "
+msgstr "×?×? × ×?ת×? ×?×?ת×?×?ר ×?-%s: â??%s"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3185
+msgid "Closing tmp stream failed: "
+msgstr ""
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5081
+#, fuzzy, c-format
+msgid "Cannot create spool file: %s"
+msgstr "×?×? × ×?ת×? ×?×?צ×?ר ×?×?×?×¢×?: %s"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5096
+#, fuzzy
+msgid "Cannot create spool file: "
+msgstr "×?×? × ×?ת×? ×?×?צ×?ר ×?×?×?×¢×?: %s"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:426
+#: ../camel/providers/nntp/camel-nntp-store.c:1529
+#, c-format
+msgid "No such folder: %s"
+msgstr "ת×?ק×?×?×? ×?×? ק×?×?×?ת: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2350
+#: ../camel/providers/imapx/camel-imapx-stream.c:71
 #, c-format
-msgid "Could not connect to %s (port %s): %s"
+msgid "Source stream returned no data"
 msgstr ""
 
+#: ../camel/providers/imapx/camel-imapx-stream.c:80
+#, fuzzy, c-format
+msgid "Source stream unavailable"
+msgstr "â??ש×?ר×?ת ×?×? ×?×?×?×?"
+
 #: ../camel/providers/local/camel-local-folder.c:199
 #, c-format
 msgid "~%s (%s)"
@@ -3087,10 +3315,7 @@ msgstr "â??%s â??(%s)"
 msgid "Index message body data"
 msgstr ""
 
-#. 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
+#: ../camel/providers/local/camel-local-folder.c:683
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3153,187 +3378,185 @@ msgstr ""
 msgid "Standard Unix mbox spool directory"
 msgstr ""
 
-#: ../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
+#: ../camel/providers/local/camel-local-store.c:149
+#: ../camel/providers/local/camel-local-store.c:284
+#: ../camel/providers/local/camel-mbox-store.c:371
+#: ../camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: ../camel/providers/local/camel-local-store.c:156
+#: ../camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: ../camel/providers/local/camel-local-store.c:166
-#: ../camel/providers/local/camel-local-store.c:175
-#: ../camel/providers/local/camel-local-store.c:290
+#: ../camel/providers/local/camel-local-store.c:169
+#: ../camel/providers/local/camel-local-store.c:179
+#: ../camel/providers/local/camel-local-store.c:297
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "×?×? × ×?ת×? ×?ק×?×? ת×?ק×?×?×?: %s: â??%s"
 
-#: ../camel/providers/local/camel-local-store.c:188
+#: ../camel/providers/local/camel-local-store.c:193
+#, c-format
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: ../camel/providers/local/camel-local-store.c:245
+#: ../camel/providers/local/camel-local-store.c:250
 #, c-format
 msgid "Local mail file %s"
 msgstr "ק×?×?×¥ ×?×?×?ר ×?ק×?×?×? %s"
 
-#: ../camel/providers/local/camel-local-store.c:350
+#: ../camel/providers/local/camel-local-store.c:358
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "×?×? × ×?ת×? ×?שנ×?ת ×?ת ש×? ×?ת×?ק×?×?×? %s ×?-%s: â??%s"
 
-#: ../camel/providers/local/camel-local-store.c:422
+#: ../camel/providers/local/camel-local-store.c:431
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "×?×? × ×?ת×? ×?שנ×?ת ×?ת '%s': â??%s"
 
-#: ../camel/providers/local/camel-local-store.c:452
-#: ../camel/providers/local/camel-mbox-store.c:293
+#: ../camel/providers/local/camel-local-store.c:461
+#: ../camel/providers/local/camel-mbox-store.c:304
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "×?×? × ×?ת×? ×?×?×?×?ק ×?ת ק×?×?×¥ ×?×?×?× ×?קס ש×? ×?ת×?ק×?×?×? '%s':â?? %s"
 
-#: ../camel/providers/local/camel-local-store.c:482
-#: ../camel/providers/local/camel-mbox-store.c:324
+#: ../camel/providers/local/camel-local-store.c:489
+#: ../camel/providers/local/camel-mbox-store.c:333
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "×?×? × ×?ת×? ×?×?×?×?ק ×?ת ק×?×?×¥ ×?×¢×? ש×? ×?ת×?ק×?×?×? '%s':â?? %s"
 
 #: ../camel/providers/local/camel-local-summary.c:537
+#, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: ../camel/providers/local/camel-maildir-folder.c:191
-msgid "Maildir append message canceled"
-msgstr ""
-
 #: ../camel/providers/local/camel-maildir-folder.c:195
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot append message to maildir folder: %s: "
+msgstr "×?×? × ×?ת×? ×?×?×?ס×?×£ ×?×?×?×¢×? ×?ת×?ק×?×?×? '%s':â?? %s"
 
+#: ../camel/providers/local/camel-maildir-folder.c:283
 #: ../camel/providers/local/camel-maildir-folder.c:291
-msgid "Invalid message contents"
-msgstr "ת×?×?×? ×?×?×?×¢×? ×?×? תק×?×?"
+#: ../camel/providers/local/camel-mbox-folder.c:440
+#: ../camel/providers/local/camel-mh-folder.c:227
+#: ../camel/providers/local/camel-mh-folder.c:235
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder %s: "
+msgstr ""
+"×?×? × ×?ת×? ×?ק×?×? ×?ת ×?×?×?×?×¢×? %s ×?×?ת×?ק×?×?×? %s\n"
+"%s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:407
-msgid "Cannot transfer message to destination folder"
+#: ../camel/providers/local/camel-maildir-folder.c:399
+#, fuzzy, c-format
+msgid "Cannot transfer message to destination folder: %s"
 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
+#: ../camel/providers/local/camel-maildir-store.c:136
+#: ../camel/providers/local/camel-maildir-store.c:167
+#: ../camel/providers/local/camel-mbox-store.c:161
+#: ../camel/providers/local/camel-mbox-store.c:175
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "×?×? × ×?ת×? ×?×?צ×?ר ×?ת ×?ת×?ק×?×?×? '%s': â??%s"
 
-#: ../camel/providers/local/camel-maildir-store.c:148
-#: ../camel/providers/local/camel-mbox-store.c:126
-#: ../camel/providers/local/camel-mh-store.c:213
+#: ../camel/providers/local/camel-maildir-store.c:151
+#: ../camel/providers/local/camel-mbox-store.c:127
+#: ../camel/providers/local/camel-mh-store.c:215
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת ×?ת×?ק×?×?×? '%s': â??%s"
 
-#: ../camel/providers/local/camel-maildir-store.c:153
-#: ../camel/providers/local/camel-mbox-store.c:135
-#: ../camel/providers/local/camel-mh-store.c:221
+#: ../camel/providers/local/camel-maildir-store.c:157
+#: ../camel/providers/local/camel-mbox-store.c:137
+#: ../camel/providers/local/camel-mh-store.c:224
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת ×?ת×?ק×?×?×? '%s': â??×?ת×?ק×?×?×? ×?×? ק×?×?×?ת."
 
-#: ../camel/providers/local/camel-maildir-store.c:179
+#: ../camel/providers/local/camel-maildir-store.c:184
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת ×?ת×?ק×?×?×? '%s': â??×?×? ספר×?×?ת maildir."
 
-#: ../camel/providers/local/camel-maildir-store.c:235
-#: ../camel/providers/local/camel-maildir-store.c:274
-#: ../camel/providers/local/camel-mh-store.c:281
+#: ../camel/providers/local/camel-maildir-store.c:242
+#: ../camel/providers/local/camel-maildir-store.c:282
+#: ../camel/providers/local/camel-mh-store.c:287
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "×?×? × ×?ת×? ×?×?×?×?ק ×?ת ×?ת×?ק×?×?×? '%s': â??%s"
 
-#: ../camel/providers/local/camel-maildir-store.c:237
+#: ../camel/providers/local/camel-maildir-store.c:244
 msgid "not a maildir directory"
 msgstr "×?×? ספר×?×?ת maildir"
 
-#: ../camel/providers/local/camel-maildir-store.c:472
-#: ../camel/providers/local/camel-spool-store.c:357
-#: ../camel/providers/local/camel-spool-store.c:372
+#: ../camel/providers/local/camel-maildir-store.c:482
+#: ../camel/providers/local/camel-spool-store.c:364
+#: ../camel/providers/local/camel-spool-store.c:380
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "×?×? × ×?ת×? ×?סר×?ק ×?ת ×?ת×?ק×?×?×? '%s': â??%s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:433
-#: ../camel/providers/local/camel-maildir-summary.c:555
+#: ../camel/providers/local/camel-maildir-summary.c:435
+#: ../camel/providers/local/camel-maildir-summary.c:558
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-maildir-summary.c:547
+#: ../camel/providers/local/camel-maildir-summary.c:549
 msgid "Checking folder consistency"
 msgstr "×?×?×?ק ש×?×?×?ת ת×?ק×?×?×?"
 
-#: ../camel/providers/local/camel-maildir-summary.c:638
+#: ../camel/providers/local/camel-maildir-summary.c:641
 msgid "Checking for new messages"
 msgstr "×?×?×?ק ×¢×?×?ר ×?×?×?×¢×?ת ×?×?ש×?ת"
 
-#: ../camel/providers/local/camel-maildir-summary.c:729
+#: ../camel/providers/local/camel-maildir-summary.c:732
 #: ../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
+#: ../camel/providers/local/camel-mbox-summary.c:669
+#: ../camel/providers/local/camel-mbox-summary.c:799
+#: ../camel/providers/local/camel-spool-summary.c:130
 msgid "Storing folder"
 msgstr "ת×?ק×?×?ת ×?×?ס×?×?"
 
-#: ../camel/providers/local/camel-mbox-folder.c:123
-#: ../camel/providers/local/camel-spool-folder.c:123
+#: ../camel/providers/local/camel-mbox-folder.c:124
+#: ../camel/providers/local/camel-spool-folder.c:125
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
 #: ../camel/providers/local/camel-mbox-folder.c:194
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
+#, fuzzy, c-format
+msgid "Cannot open mailbox: %s: "
 msgstr "×?×? × ×?ת×? ×?×?ת×?×? ת×?×?ת ×?×?×?ר: %s: â??%s\n"
 
-#: ../camel/providers/local/camel-mbox-folder.c:261
-msgid "Mail append canceled"
-msgstr ""
-
-#: ../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:260
+#, fuzzy, c-format
+msgid "Cannot append message to mbox file: %s: "
+msgstr "×?×? × ×?ת×? ×?×?×?ס×?×£ ×?×?×?×¢×? ×?ת×?ק×?×?×? '%s':â?? %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:438
+#: ../camel/providers/local/camel-mbox-folder.c:433
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: ../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:147
-#: ../camel/providers/local/camel-mbox-store.c:369
+#: ../camel/providers/local/camel-mbox-store.c:149
+#: ../camel/providers/local/camel-mbox-store.c:379
+#, c-format
 msgid "Cannot create a folder by this name."
 msgstr "×?×? × ×?ת×? ×?×?צ×?ר ת×?ק×?×?×? ×?ש×? ×?×?."
 
-#: ../camel/providers/local/camel-mbox-store.c:182
+#: ../camel/providers/local/camel-mbox-store.c:186
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת ×?ת×?ק×?×?×? '%s': ק×?×?×¥ ×?×?ת×? ר×?×?×?."
 
-#: ../camel/providers/local/camel-mbox-store.c:214
-#: ../camel/providers/local/camel-mbox-store.c:226
-#: ../camel/providers/local/camel-mbox-store.c:252
+#: ../camel/providers/local/camel-mbox-store.c:218
+#: ../camel/providers/local/camel-mbox-store.c:231
+#: ../camel/providers/local/camel-mbox-store.c:260
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3342,149 +3565,146 @@ msgstr ""
 "×?×? × ×?ת×? ×?×?×?×?ק ×?ת ×?ת×?ק×?×?×? '%s':\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:235
+#: ../camel/providers/local/camel-mbox-store.c:241
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "â??'%s' ×?×?× ×? ק×?×?×¥ ר×?×?×?."
 
-#: ../camel/providers/local/camel-mbox-store.c:243
+#: ../camel/providers/local/camel-mbox-store.c:250
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "×?ת×?ק×?×?×? '%s' ×?×?× ×? ר×?ק×?. ×?×? × ×?×?ק×?."
 
-#: ../camel/providers/local/camel-mbox-store.c:267
-#: ../camel/providers/local/camel-mbox-store.c:280
+#: ../camel/providers/local/camel-mbox-store.c:276
+#: ../camel/providers/local/camel-mbox-store.c:290
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "×?×? × ×?ת×? ×?×?×?×?ק ×?ת ק×?×?×¥ ס×?×?×?×? ×?ת×?ק×?×?×? '%s': â??%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:384
+#: ../camel/providers/local/camel-mbox-store.c:395
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "×?×? × ×?ת×? ×?×?צ×?ר ×?ת ×?ספר×?×?×?: '%s': â??%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:399
+#: ../camel/providers/local/camel-mbox-store.c:411
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "×?×? × ×?ת×? ×?×?צ×?ר ת×?ק×?×?×?: %s: â??%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:401
+#: ../camel/providers/local/camel-mbox-store.c:413
 msgid "Folder already exists"
 msgstr "×?ת×?ק×?×?×? ×?×?ר ק×?×?×?ת"
 
-#: ../camel/providers/local/camel-mbox-store.c:495
+#: ../camel/providers/local/camel-mbox-store.c:507
+#, c-format
 msgid "The new folder name is illegal."
 msgstr "ש×? ×?ת×?ק×?×?×? ×?×?×?ש ×?×?× ×? ×?×?ק×?."
 
-#: ../camel/providers/local/camel-mbox-store.c:509
+#: ../camel/providers/local/camel-mbox-store.c:522
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "×?×? × ×?ת×? ×?שנ×?ת ×?ת ש×? ×?ת×?ק×?×?×? '%s':â?? '%s':â?? %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:591
+#: ../camel/providers/local/camel-mbox-store.c:605
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "×?×? × ×?ת×? ×?שנ×?ת ×?ת '%s' ×?-'%s': â??%s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:472
+#: ../camel/providers/local/camel-mbox-summary.c:473
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "×?×? × ×?ת×? ×?פת×?×? ת×?ק×?×?×?: %s: â??%s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:523
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
+#: ../camel/providers/local/camel-mbox-summary.c:524
+msgid "Fatal mail parser error near position %"
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-summary.c:603
+#: ../camel/providers/local/camel-mbox-summary.c:605
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "×?×? × ×?ת×? ×?×?×?×?ק ת×?ק×?×?×?: %s: â??%s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:673
-#: ../camel/providers/local/camel-mbox-summary.c:798
-#: ../camel/providers/local/camel-spool-summary.c:135
+#: ../camel/providers/local/camel-mbox-summary.c:676
+#: ../camel/providers/local/camel-mbox-summary.c:806
+#: ../camel/providers/local/camel-spool-summary.c:137
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "×?×? × ×?ת×? ×?פת×?×? ק×?×?×¥: %s: â??%s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:686
-#: ../camel/providers/local/camel-spool-summary.c:149
+#: ../camel/providers/local/camel-mbox-summary.c:690
+#: ../camel/providers/local/camel-spool-summary.c:152
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-summary.c:700
-#: ../camel/providers/local/camel-mbox-summary.c:913
+#: ../camel/providers/local/camel-mbox-summary.c:705
+#: ../camel/providers/local/camel-mbox-summary.c:923
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "×?×? × ×?ת×? ×?ס×?×?ר ×?ת ת×?ק×?×?ת ×?×?ק×?ר %s: â??%s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:710
+#: ../camel/providers/local/camel-mbox-summary.c:716
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "×?×? × ×?ת×? ×?ס×?×?ר ×?ת ×?ת×?ק×?×?×? ×?×?×?× ×?ת: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:726
+#: ../camel/providers/local/camel-mbox-summary.c:733
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "×?×? × ×?ת×? ×?שנ×?ת ש×? ת×?ק×?×?×?: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:810
-#: ../camel/providers/local/camel-mbox-summary.c:1051
+#: ../camel/providers/local/camel-mbox-summary.c:819
+#: ../camel/providers/local/camel-mbox-summary.c:1061
 #, c-format
 msgid "Could not store folder: %s"
 msgstr ""
 
-#: ../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
+#: ../camel/providers/local/camel-mbox-summary.c:869
+#: ../camel/providers/local/camel-mbox-summary.c:1094
+#: ../camel/providers/local/camel-mbox-summary.c:1103
+#, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-summary.c:1011
-#: ../camel/providers/local/camel-spool-summary.c:326
+#: ../camel/providers/local/camel-mbox-summary.c:1020
+#: ../camel/providers/local/camel-spool-summary.c:337
 #, c-format
 msgid "Unknown error: %s"
 msgstr "ש×?×?×?×? ×?×? ×?×?×?×¢×?: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1162
-#: ../camel/providers/local/camel-mbox-summary.c:1190
+#: ../camel/providers/local/camel-mbox-summary.c:1173
+#: ../camel/providers/local/camel-mbox-summary.c:1203
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-summary.c:1180
+#: ../camel/providers/local/camel-mbox-summary.c:1192
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-mh-folder.c:166
-msgid "MH append message canceled"
-msgstr ""
-
-#: ../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-folder.c:165
+#, fuzzy, c-format
+msgid "Cannot append message to mh folder: %s: "
+msgstr "×?×? × ×?ת×? ×?×?×?ס×?×£ ×?×?×?×¢×? ×?ת×?ק×?×?×? '%s':â?? %s"
 
-#: ../camel/providers/local/camel-mh-store.c:230
+#: ../camel/providers/local/camel-mh-store.c:234
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "×?×? × ×?ת×? ×?×?צ×?ר ×?ת ×?ת×?ק×?×?×? '%s':â?? %s"
 
-#: ../camel/providers/local/camel-mh-store.c:243
+#: ../camel/providers/local/camel-mh-store.c:248
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "×?×? × ×?ת×? ×?ק×?×? ×?ת ×?ת×?ק×?×?×? '%s': ×?×? ×?×?× ×? ת×?ק×?×?×?."
 
-#: ../camel/providers/local/camel-mh-summary.c:227
+#: ../camel/providers/local/camel-mh-summary.c:228
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-spool-store.c:119
+#: ../camel/providers/local/camel-spool-store.c:118
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "×?×? × ×?ת×? ×?פת×?×? ×?ת ×?×?×?צץ '%s':â?? %s"
@@ -3494,12 +3714,12 @@ msgstr "×?×? × ×?ת×? ×?פת×?×? ×?ת ×?×?×?צץ '%s':â?? %s"
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "×?×?×?צץ '%s' ×?×?× ×? ק×?×?×¥ ×?×? ת×?ק×?×?×? ר×?×?×?×?×?"
 
-#: ../camel/providers/local/camel-spool-store.c:157
+#: ../camel/providers/local/camel-spool-store.c:158
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "×?ת×?ק×?×?×? '%s/%s' ×?×? ק×?×?×?ת."
 
-#: ../camel/providers/local/camel-spool-store.c:168
+#: ../camel/providers/local/camel-spool-store.c:170
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3508,12 +3728,12 @@ msgstr ""
 "×?×? × ×?ת×? ×?פת×?×? ×?ת ×?ת×?ק×?×?×? '%s':\n"
 "â??%s"
 
-#: ../camel/providers/local/camel-spool-store.c:173
+#: ../camel/providers/local/camel-spool-store.c:176
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "×?ת×?ק×?×?×? '%s' ×?×? ק×?×?×?ת."
 
-#: ../camel/providers/local/camel-spool-store.c:179
+#: ../camel/providers/local/camel-spool-store.c:183
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -3522,82 +3742,92 @@ msgstr ""
 "×?×? × ×?ת×? ×?×?צ×?ר ×?ת ×?ת×?ק×?×?×? '%s':\n"
 "â??%s"
 
-#: ../camel/providers/local/camel-spool-store.c:188
+#: ../camel/providers/local/camel-spool-store.c:193
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "â??'%s' ×?×?× ×? ק×?×?×¥ mailbox."
 
-#: ../camel/providers/local/camel-spool-store.c:207
+#: ../camel/providers/local/camel-spool-store.c:213
+#, c-format
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: ../camel/providers/local/camel-spool-store.c:220
+#: ../camel/providers/local/camel-spool-store.c:226
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-spool-store.c:220
+#: ../camel/providers/local/camel-spool-store.c:226
 #, c-format
 msgid "Spool folder tree %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-spool-store.c:232
+#: ../camel/providers/local/camel-spool-store.c:238
+#, c-format
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: ../camel/providers/local/camel-spool-store.c:245
+#: ../camel/providers/local/camel-spool-store.c:251
+#, c-format
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#: ../camel/providers/local/camel-spool-summary.c:162
-#: ../camel/providers/local/camel-spool-summary.c:173
-#: ../camel/providers/local/camel-spool-summary.c:184
+#: ../camel/providers/local/camel-spool-summary.c:166
+#: ../camel/providers/local/camel-spool-summary.c:178
+#: ../camel/providers/local/camel-spool-summary.c:190
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-spool-summary.c:201
+#: ../camel/providers/local/camel-spool-summary.c:208
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-spool-summary.c:232
-#: ../camel/providers/local/camel-spool-summary.c:250
-#: ../camel/providers/local/camel-spool-summary.c:262
+#: ../camel/providers/local/camel-spool-summary.c:240
+#: ../camel/providers/local/camel-spool-summary.c:259
+#: ../camel/providers/local/camel-spool-summary.c:272
 #, 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:196
-#: ../camel/providers/nntp/camel-nntp-folder.c:277
-#: ../camel/providers/nntp/camel-nntp-folder.c:318
+#: ../camel/providers/nntp/camel-nntp-folder.c:197
+#: ../camel/providers/nntp/camel-nntp-folder.c:271
+#: ../camel/providers/nntp/camel-nntp-folder.c:312
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr ""
 
-#: ../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:234
+#: ../camel/providers/nntp/camel-nntp-folder.c:238
+#: ../camel/providers/pop3/camel-pop3-folder.c:402
+#: ../camel/providers/pop3/camel-pop3-folder.c:630
+#: ../camel/providers/pop3/camel-pop3-folder.c:695
+#: ../camel/providers/pop3/camel-pop3-folder.c:706
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "×?×? × ×?ת×? ×?ק×?×? ×?×?×?×¢×? %s:â?? %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:477
-#: ../camel/providers/nntp/camel-nntp-folder.c:482
-#: ../camel/providers/nntp/camel-nntp-folder.c:531
-#: ../camel/providers/nntp/camel-nntp-folder.c:536
+#: ../camel/providers/nntp/camel-nntp-folder.c:465
+#: ../camel/providers/nntp/camel-nntp-folder.c:471
+#: ../camel/providers/nntp/camel-nntp-folder.c:518
 #, c-format
 msgid "Posting failed: %s"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:558
+#: ../camel/providers/nntp/camel-nntp-folder.c:513
+msgid "Posting failed: "
+msgstr "×?פרס×?×? × ×?ש×?: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:541
+#, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:576
+#: ../camel/providers/nntp/camel-nntp-folder.c:560
+#, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr ""
 
@@ -3624,29 +3854,22 @@ msgid ""
 "password."
 msgstr ""
 
-#: ../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:265
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: "
+msgstr "×?×? × ×?ת×? ×?×?צ×?ר ×?ת ×?ספר×?×?×? %s: â??%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:286
+#: ../camel/providers/nntp/camel-nntp-store.c:278
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "שרת ×?-NNTP %s ×?×?×?×?ר ×?ת ×?ספר ×?ש×?×?×?×? %d: â??%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:474
+#: ../camel/providers/nntp/camel-nntp-store.c:453
 #, c-format
 msgid "USENET News via %s"
 msgstr "×?×?ש×?ת USENET ×?ר×? %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:974
+#: ../camel/providers/nntp/camel-nntp-store.c:946
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -3654,55 +3877,56 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1070
+#: ../camel/providers/nntp/camel-nntp-store.c:1043
+#, c-format
 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:1109
+#: ../camel/providers/nntp/camel-nntp-store.c:1083
+#, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1138
+#: ../camel/providers/nntp/camel-nntp-store.c:1113
+#, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1149
+#: ../camel/providers/nntp/camel-nntp-store.c:1125
+#, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1161
+#: ../camel/providers/nntp/camel-nntp-store.c:1138
+#, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1298
+#: ../camel/providers/nntp/camel-nntp-store.c:1276
+#, c-format
 msgid "Authentication requested but no username provided"
 msgstr "×?×?×?×?×?ת × ×?רש ×?×?×? ×?×? ס×?פק ש×? ×?שת×?ש"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1310
+#: ../camel/providers/nntp/camel-nntp-store.c:1288
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr ""
 
-#: ../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:1414
+msgid "NNTP Command failed: "
+msgstr "פק×?×?ת ×?Ö¾NNTP × ×?ש×?×?:"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1497
+#: ../camel/providers/nntp/camel-nntp-store.c:1472
+#, c-format
 msgid "Not connected."
 msgstr "×?×? ×?×?×?×?ר."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1554
-#, c-format
-msgid "No such folder: %s"
-msgstr "ת×?ק×?×?×? ×?×? ק×?×?×?ת: %s"
-
 #: ../camel/providers/nntp/camel-nntp-summary.c:238
 #: ../camel/providers/nntp/camel-nntp-summary.c:340
 #, c-format
@@ -3719,7 +3943,7 @@ msgstr ""
 msgid "Unexpected server response from head: %s"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:399
+#: ../camel/providers/nntp/camel-nntp-summary.c:401
 #, c-format
 msgid "Operation failed: %s"
 msgstr "×?פע×?×?×? × ×?ש×?×?: %s"
@@ -3728,33 +3952,33 @@ msgstr "×?פע×?×?×? × ×?ש×?×?: %s"
 msgid "Retrieving POP summary"
 msgstr "×?ק×?×? ס×?×?×?×? POP"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:272
+#: ../camel/providers/pop3/camel-pop3-folder.c:274
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "×?×? × ×?ת×? ×?ק×?×? ס×?×?×?×? POP: â??%s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
+#: ../camel/providers/pop3/camel-pop3-folder.c:324
 msgid "Expunging old messages"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:330
+#: ../camel/providers/pop3/camel-pop3-folder.c:332
 msgid "Expunging deleted messages"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:563
-#: ../camel/providers/pop3/camel-pop3-folder.c:592
+#: ../camel/providers/pop3/camel-pop3-folder.c:566
+#: ../camel/providers/pop3/camel-pop3-folder.c:596
 #, c-format
 msgid "No message with UID %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:599
+#: ../camel/providers/pop3/camel-pop3-folder.c:603
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "×?ק×?×? ×?×?×?עת POP %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:696
+#: ../camel/providers/pop3/camel-pop3-folder.c:707
 msgid "Unknown reason"
 msgstr "ס×?×?×? ×?×? ×?×?×?×¢×?"
 
@@ -3797,47 +4021,42 @@ msgid ""
 msgstr ""
 
 #. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:140
+#: ../camel/providers/pop3/camel-pop3-store.c:98
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:220
+#: ../camel/providers/pop3/camel-pop3-store.c:168
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "×?רע ×?ש×? ×?קר×?×?ת ×?ר×?×? ×?שרת ×?Ö¾POPâ?? %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:238
-#: ../camel/providers/pop3/camel-pop3-store.c:269
-#: ../camel/providers/pop3/camel-pop3-store.c:275
+#: ../camel/providers/pop3/camel-pop3-store.c:186
+#: ../camel/providers/pop3/camel-pop3-store.c:217
+#: ../camel/providers/pop3/camel-pop3-store.c:224
 #, 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:239
+#: ../camel/providers/pop3/camel-pop3-store.c:187
 msgid "STLS not supported by server"
 msgstr "â??STLS ×?×? נת×?×? ×¢×? ×?×?×? ×?שרת"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:257
+#: ../camel/providers/pop3/camel-pop3-store.c:205
 #, 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
+#: ../camel/providers/pop3/camel-pop3-store.c:218
 msgid "TLS negotiations failed"
 msgstr "×?×?ש×? ×?×?ת×? ×?Ö¾TLS × ×?ש×?"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:276
+#: ../camel/providers/pop3/camel-pop3-store.c:225
 msgid "TLS is not available in this build"
 msgstr "â??TLS ×?×? ×?×?×?×? ×?×?× ×?×? ×?×?ת"
 
-#: ../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:433
-#: ../camel/providers/pop3/camel-pop3-store.c:585
+#: ../camel/providers/pop3/camel-pop3-store.c:321
+#: ../camel/providers/pop3/camel-pop3-store.c:473
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -3845,29 +4064,32 @@ msgid ""
 msgstr "×?×? × ×?ת×? ×?×?ת×?×?ר ×?שרת ×?Ö¾POPâ?? %s: ×?×?×? ת×?×?×?×? ×?×?× ×?× ×?×? ×?×?×?×?×?ת ×?×?×?×?קש."
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:455
+#: ../camel/providers/pop3/camel-pop3-store.c:344
 #, c-format
 msgid "SASL '%s' Login failed for POP server %s%s"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:471
+#: ../camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:492
-#, c-format
-msgid "Failed to authenticate on POP server %s: %s"
+#: ../camel/providers/pop3/camel-pop3-store.c:378
+#, fuzzy, c-format
+msgid "Failed to authenticate on POP server %s: "
 msgstr ""
+"×?×? × ×?ת×? ×?×?ת×?×?ת ×?×?×? שרת ×?Ö¾SMTP.\n"
+"%s\n"
+"\n"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:555
+#: ../camel/providers/pop3/camel-pop3-store.c:442
 #, 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:601
+#: ../camel/providers/pop3/camel-pop3-store.c:492
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -3875,7 +4097,7 @@ msgid ""
 msgstr ""
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:612
+#: ../camel/providers/pop3/camel-pop3-store.c:505
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -3885,7 +4107,7 @@ msgstr ""
 "ש×?×?×?×? ×?ש×?×?×?ת ש×? ×?×?שת×?ש%s"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:624
+#: ../camel/providers/pop3/camel-pop3-store.c:518
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -3894,11 +4116,31 @@ msgstr ""
 "×?×? × ×?ת×? ×?×?ת×?×?ר ×?שרת ×?Ö¾POPâ?? %s.\n"
 "ש×?×?×?×? ×?ש×?×?×?ת ×?סס×?×?%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:740
+#: ../camel/providers/pop3/camel-pop3-store.c:674
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr "×?×? × ×?ת×? ×?×?ת×?×?ר ×?שרת ×?-POPâ?? %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:687
+#, c-format
+msgid "POP3 server %s"
+msgstr "שרת POP3â?? %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:691
+#, fuzzy, c-format
+msgid "POP3 server for %s on %s"
+msgstr "שרת IMAP ×¢×?×?ר %s ×?-%s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:706
 #, c-format
 msgid "No such folder '%s'."
 msgstr "×?ת×?ק×?×?×? '%s' ×?×? ק×?×?×?ת."
 
+#: ../camel/providers/pop3/camel-pop3-store.c:730
+#, c-format
+msgid "POP3 stores have no folder hierarchy"
+msgstr ""
+
 #: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "Sendmail"
 msgstr "â??Sendmail"
@@ -3910,19 +4152,25 @@ msgid ""
 msgstr ""
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:98
+#, c-format
 msgid "Could not parse recipient list"
 msgstr ""
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:130
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:131
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:151
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:153
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:194
+#, fuzzy
+msgid "Could not send message: "
+msgstr "×?×? × ×?ת×? ×?ש×?×?×? ×?×?×?×¢×?: %s"
+
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
@@ -3954,128 +4202,127 @@ msgstr "â??SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "×?ש×?×?×?ת ×?×?×?ר ×?×?×?צע×?ת שרת SMTP."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:117
+#: ../camel/providers/smtp/camel-smtp-transport.c:116
 msgid "Syntax error, command unrecognized"
 msgstr "ש×?×?×?ת ת×?×?×?ר, ×?פק×?×?×? ×?×?× ×? ×?×?×?רת"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:119
+#: ../camel/providers/smtp/camel-smtp-transport.c:118
 msgid "Syntax error in parameters or arguments"
 msgstr "ש×?×?×?ת ת×?×?×?ר ×?פר×?×?×?×? ×?×? ×?×?ר×?×?×?× ×?×?×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:121
+#: ../camel/providers/smtp/camel-smtp-transport.c:120
 msgid "Command not implemented"
 msgstr "×?פק×?×?×? ×?×? ×?×?×?×?שת"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:123
+#: ../camel/providers/smtp/camel-smtp-transport.c:122
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:125
+#: ../camel/providers/smtp/camel-smtp-transport.c:124
 msgid "System status, or system help reply"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:127
+#: ../camel/providers/smtp/camel-smtp-transport.c:126
 msgid "Help message"
 msgstr "×?×?×?עת ×¢×?ר×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:129
+#: ../camel/providers/smtp/camel-smtp-transport.c:128
 msgid "Service ready"
 msgstr "×?ש×?ר×?ת ×?×?×?×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:131
+#: ../camel/providers/smtp/camel-smtp-transport.c:130
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:133
+#: ../camel/providers/smtp/camel-smtp-transport.c:132
 msgid "Service not available, closing transmission channel"
 msgstr "×?ש×?ר×?ת ×?×?× ×? ×?×?×?×?, ער×?×¥ ×?תע×?×?ר×? נס×?ר"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:135
+#: ../camel/providers/smtp/camel-smtp-transport.c:134
 msgid "Requested mail action okay, completed"
 msgstr "פע×?×?ת ×?×?×?×?ר ×?×?×?×?קשת נק×?×?×? ×?×?×?ש×?×?×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:137
+#: ../camel/providers/smtp/camel-smtp-transport.c:136
 msgid "User not local; will forward to <forward-path>"
 msgstr "×?×?שת×?ש ×?×?× ×? ×?ק×?×?×?; ת×?×?צע ×?×¢×?ר×? ×?Ö¾<forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:139
+#: ../camel/providers/smtp/camel-smtp-transport.c:138
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "פע×?×?ת ×?×?×?×?ר ×?×?×?×?קשת ×?×? ×?×?צע×?: ת×?×?ת ×?×?×?×?ר ×?×?× ×? ×?×?×?× ×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:141
+#: ../camel/providers/smtp/camel-smtp-transport.c:140
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "×?פע×?×?×? ×?×?×?×?קשת ×?×? ×?×?צע×?: ת×?×?ת ×?×?×?×?ר ×?×?× ×? ×?×?×?× ×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:143
+#: ../camel/providers/smtp/camel-smtp-transport.c:142
 msgid "Requested action aborted: error in processing"
 msgstr "×?פע×?×?×? ×?×?×?×?קשת ×?×?×?×?×?: ש×?×?×?×? ×?עת ×?×¢×?×?×?×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:145
+#: ../camel/providers/smtp/camel-smtp-transport.c:144
 msgid "User not local; please try <forward-path>"
 msgstr "×?×?שת×?ש ×?×?× ×? ×?ק×?×?×?; × ×? ×?נס×?ת <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:147
+#: ../camel/providers/smtp/camel-smtp-transport.c:146
 msgid "Requested action not taken: insufficient system storage"
 msgstr "×?פע×?×?×? ×?×?×?×?קשת ×?×? ננק×?×?: ×?×?ס×?×? ×?×?ער×?ת ×?×?× ×? ×?ספ×?ק"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:149
+#: ../camel/providers/smtp/camel-smtp-transport.c:148
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "פע×?×?ת ×?×?×?×?ר ×?×?×?×?קשת ×?×?×?×?×?: ×?ר×?×?×? ×?×?קצ×?ת ש×?×? ×?×?×?ס×?×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:151
+#: ../camel/providers/smtp/camel-smtp-transport.c:150
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "×?פע×?×?×? ×?×?×?×?קשת ×?×? ננק×?×?: ש×? ת×?×?ת ×?×?×?×?ר ×?×?× ×? ×?×?רש×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:153
+#: ../camel/providers/smtp/camel-smtp-transport.c:152
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "×?ת×?×?ת ק×?×? ×?×?×?×?\"×?; ×?ש ×?ס×?×?×? ×¢×? <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:155
+#: ../camel/providers/smtp/camel-smtp-transport.c:154
 msgid "Transaction failed"
 msgstr "×?×?×¢×?ר×? ×?ש×?×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:159
+#: ../camel/providers/smtp/camel-smtp-transport.c:158
 msgid "A password transition is needed"
 msgstr "× ×?רשת ×?×¢×?רת סס×?×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:161
+#: ../camel/providers/smtp/camel-smtp-transport.c:160
 msgid "Authentication mechanism is too weak"
 msgstr "ש×?×?ת ×?×?×?×?×?ת ×?×?ש×? ×?×?×?×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:163
+#: ../camel/providers/smtp/camel-smtp-transport.c:162
 msgid "Encryption required for requested authentication mechanism"
 msgstr "×?×?צפנ×? ×?× ×?רשת ×¢×?×?ר ×?× ×?× ×?×? ×?×?×?×?×?ת ×?×?×?×?קש"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:165
+#: ../camel/providers/smtp/camel-smtp-transport.c:164
 msgid "Temporary authentication failure"
 msgstr "×?ש×? ×?×?× ×? ×?×?×?×?×?ת"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
-msgid "Welcome response error"
-msgstr "ש×?×?×?×? ×?ת×?×?×?ת ק×?×?ת ×?פנ×?×?"
+#: ../camel/providers/smtp/camel-smtp-transport.c:252
+#: ../camel/providers/smtp/camel-smtp-transport.c:258
+msgid "Welcome response error: "
+msgstr "ש×?×?×?×? ×?ת×?×?×?ת ק×?×?ת ×?פנ×?×?:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:296
-#: ../camel/providers/smtp/camel-smtp-transport.c:330
-#: ../camel/providers/smtp/camel-smtp-transport.c:337
+#: ../camel/providers/smtp/camel-smtp-transport.c:294
+#: ../camel/providers/smtp/camel-smtp-transport.c:331
+#: ../camel/providers/smtp/camel-smtp-transport.c:338
 #, 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:306
-#, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "פק×?×?ת STARTTLS × ×?ש×?×?: %s"
-
+#: ../camel/providers/smtp/camel-smtp-transport.c:302
+#: ../camel/providers/smtp/camel-smtp-transport.c:314
 #: ../camel/providers/smtp/camel-smtp-transport.c:320
-msgid "STARTTLS command failed"
-msgstr "פק×?×?ת STARTTLS × ×?ש×?×?"
+#, fuzzy
+msgid "STARTTLS command failed: "
+msgstr "פק×?×?ת STARTTLS × ×?ש×?×?: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:465
+#: ../camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "שרת ×?Ö¾SMTPâ?? %s ×?×?× ×? ת×?×?×? ×?ס×?×? ×?×?צפנ×? ×?×?×?×?קש %s."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:537
+#: ../camel/providers/smtp/camel-smtp-transport.c:547
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4086,199 +4333,189 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:675
+#: ../camel/providers/smtp/camel-smtp-transport.c:685
 #, c-format
 msgid "SMTP server %s"
 msgstr "שרת SMTP %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:677
+#: ../camel/providers/smtp/camel-smtp-transport.c:687
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "ש×?×?×?ת ×?×?×?\"×? SMTP ×?ר×? %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:696
+#: ../camel/providers/smtp/camel-smtp-transport.c:707
+#, c-format
 msgid "Cannot send message: service not connected."
 msgstr "×?×? × ×?ת×? ×?ש×?×?×? ×?×?×?×¢×?: ×?ש×?ר×?ת ×?×?× ×? ×?×?×?×?ר."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:703
+#: ../camel/providers/smtp/camel-smtp-transport.c:714
+#, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "×?×? × ×?ת×? ×?ש×?×?×? ×?ת ×?×?×?×?×¢×?: ×?ת×?×?ת ×?ש×?×?×? ×?×?× ×? תקנ×?ת."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:707
+#: ../camel/providers/smtp/camel-smtp-transport.c:718
 msgid "Sending message"
 msgstr "ש×?×?×? ×?×?×?×¢×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:723
+#: ../camel/providers/smtp/camel-smtp-transport.c:734
+#, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "×?×? × ×?ת×? ×?ש×?×?×? ×?ת ×?×?×?×?×¢×?: ×?×? ×?×?×?×?ר×? × ×?×¢× ×?×?."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:735
+#: ../camel/providers/smtp/camel-smtp-transport.c:746
+#, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "×?×? × ×?ת×? ×?ש×?×?×? ×?×?×?×¢×?: × ×?×¢×? ×?×?×? ×?×? ×?×?תר ש×?×?×?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:972
+#: ../camel/providers/smtp/camel-smtp-transport.c:982
 msgid "SMTP Greeting"
 msgstr "SMTP Greeting"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:997
-#, c-format
-msgid "HELO command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1006
+#: ../camel/providers/smtp/camel-smtp-transport.c:1021
+#: ../camel/providers/smtp/camel-smtp-transport.c:1028
+#, fuzzy
+msgid "HELO command failed: "
 msgstr "פק×?×?ת HELO × ×?ש×?×?: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1014
-msgid "HELO command failed"
-msgstr "פק×?×?ת HELO × ×?ש×?×?"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1081
+#: ../camel/providers/smtp/camel-smtp-transport.c:1095
 msgid "SMTP Authentication"
 msgstr "SMTP Authentication"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1088
+#: ../camel/providers/smtp/camel-smtp-transport.c:1102
+#, c-format
 msgid "Error creating SASL authentication object."
 msgstr "Error creating SASL authentication object."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1105
-#: ../camel/providers/smtp/camel-smtp-transport.c:1116
-#, c-format
-msgid "AUTH command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1118
+#: ../camel/providers/smtp/camel-smtp-transport.c:1128
+#: ../camel/providers/smtp/camel-smtp-transport.c:1136
+#, fuzzy
+msgid "AUTH command failed: "
 msgstr "AUTH command failed: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1124
-msgid "AUTH command failed"
-msgstr "AUTH command failed"
-
-#: ../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: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:1237
-msgid "MAIL FROM command failed"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1233
+#: ../camel/providers/smtp/camel-smtp-transport.c:1245
+#: ../camel/providers/smtp/camel-smtp-transport.c:1252
+#, fuzzy
+msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM command failed"
 
-#: ../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:1275
+#, fuzzy
+msgid "RCPT TO command failed: "
+msgstr "RSET command failed: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1280
-#, c-format
-msgid "RCPT TO <%s> failed"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1289
+#: ../camel/providers/smtp/camel-smtp-transport.c:1297
+#, fuzzy, c-format
+msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> failed"
 
-#: ../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"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1337
-#: ../camel/providers/smtp/camel-smtp-transport.c:1426
-msgid "DATA command failed"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1335
+#: ../camel/providers/smtp/camel-smtp-transport.c:1344
+#: ../camel/providers/smtp/camel-smtp-transport.c:1354
+#: ../camel/providers/smtp/camel-smtp-transport.c:1411
+#: ../camel/providers/smtp/camel-smtp-transport.c:1427
+#: ../camel/providers/smtp/camel-smtp-transport.c:1438
+#: ../camel/providers/smtp/camel-smtp-transport.c:1445
+#, fuzzy
+msgid "DATA command failed: "
 msgstr "DATA command failed"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1449
-#, c-format
-msgid "RSET command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1467
+#: ../camel/providers/smtp/camel-smtp-transport.c:1479
+#: ../camel/providers/smtp/camel-smtp-transport.c:1486
+#, fuzzy
+msgid "RSET command failed: "
 msgstr "RSET command failed: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1464
-msgid "RSET command failed"
-msgstr "RSET command failed"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1487
-#, c-format
-msgid "QUIT command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1508
+#: ../camel/providers/smtp/camel-smtp-transport.c:1521
+#: ../camel/providers/smtp/camel-smtp-transport.c:1527
+#, fuzzy
+msgid "QUIT command failed: "
 msgstr "QUIT command failed: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1503
-msgid "QUIT command failed"
-msgstr "QUIT command failed"
-
-#: ../libedataserver/e-categories.c:44
+#: ../libedataserver/e-categories.c:45
 msgid "Business"
 msgstr "עסק×?×?"
 
-#: ../libedataserver/e-categories.c:45
+#: ../libedataserver/e-categories.c:46
 msgid "Competition"
 msgstr "ת×?ר×?ת"
 
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:47
 msgid "Favorites"
 msgstr "×?×?×¢×?פ×?×?"
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:48
 msgid "Gifts"
 msgstr "×?תנ×?ת"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:49
 msgid "Goals/Objectives"
 msgstr "×?×?ר×?ת/×?×¢×?×?×?"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:50
 msgid "Holiday"
 msgstr "×?×?"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:51
 msgid "Holiday Cards"
 msgstr "×?ר×?×?ס×? ×?ר×?×?"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:53
 msgid "Hot Contacts"
 msgstr "×?נש×? קשר ×?ש×?×?×?×?"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:54
 msgid "Ideas"
 msgstr "רע×?×?× ×?ת"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:55
 msgid "International"
 msgstr "×?×?×?-×?×?×?×?×?"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:56
 msgid "Key Customer"
 msgstr "×?ק×?×? ×?ש×?×?"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:57
 msgid "Miscellaneous"
 msgstr "×?×?×?×?"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:58
 msgid "Personal"
 msgstr "×?×?ש×?"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:59
 msgid "Phone Calls"
 msgstr "ש×?×?×?ת ×?×?פ×?×?"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:61
 msgid "Status"
 msgstr "×?צ×?"
 
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:62
 msgid "Strategies"
 msgstr "×?ס×?ר×?×?×?×?ת"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:63
 msgid "Suppliers"
 msgstr "ספק×?×?"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:64
 msgid "Time & Expenses"
 msgstr "×?×?×? ×?×?×?צ×?×?ת"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:65
 msgid "VIP"
 msgstr "×?×?\"×?×?×?"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:66
 msgid "Waiting"
 msgstr "×?×?ת×?×?"
 
@@ -4410,11 +4647,11 @@ msgstr "%H%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-book-auth-util.c:90
+#: ../libedataserverui/e-book-auth-util.c:93
 msgid "Accessing LDAP Server anonymously"
 msgstr "×?ת×?צעת ×?×?ש×? ×?× ×?× ×?×?×?ת ×?שרת LDAP"
 
-#: ../libedataserverui/e-book-auth-util.c:192
+#: ../libedataserverui/e-book-auth-util.c:199
 msgid "Failed to authenticate.\n"
 msgstr "× ×?ס×?×?×? ×?×?×?×?×?×?ת × ×?ש×?.\n"
 
@@ -4486,7 +4723,7 @@ msgstr "_×?×?סף"
 msgid "_Remove"
 msgstr "×?_סר"
 
-#: ../libedataserverui/e-name-selector-dialog.c:853
+#: ../libedataserverui/e-name-selector-dialog.c:858
 #: ../libedataserverui/e-name-selector-dialog.ui.h:6
 msgid "Any Category"
 msgstr "×?×? ק×?×?×?ר×?×?"
@@ -4606,6 +4843,72 @@ msgstr "×?×?×? ת×?×?×?×? ×?×?שרת"
 msgid "Bad parameter"
 msgstr "פר×?×?ר ש×?×?×?"
 
+#~ msgid "Cannot complete operation"
+#~ msgstr "×?×? × ×?ת×? ×?×?ש×?×?×? ×?ת ×?פע×?×?×?"
+
+#~ msgid "Offline mode unavailable"
+#~ msgstr "â??×?צ×? ×?×?-×?ק×?×?×? ×?×? ×?×?×?×?"
+
+#~ msgid "Cannot open message"
+#~ msgstr "×?×? ×?×?×?×? ×?פת×?×? ×?ת ×?×?×?×?×¢×?"
+
+#~ msgid "Canceled."
+#~ msgstr "Canceled."
+
+#~ msgid "Cannot verify message signature: could not create temp file: %s"
+#~ msgstr "Cannot verify message signature: could not create temp file: %s"
+
+#~ msgid "Unable to parse message content"
+#~ msgstr "Unable to parse message content"
+
+#~ msgid "cannot create thread"
+#~ msgstr "cannot create thread"
+
+#~ msgid "User canceled"
+#~ msgstr "×?×?שת×?ש ×?×?×?×?"
+
+#~ msgid "Trash Folder Full. Please Empty."
+#~ msgstr "ת×?ק×?×?ת ×?×?שפ×? ×?×?×?×?. × ×? ×?ר×?ק×? ×?×?ת×?."
+
+#~ msgid "Invalid message contents"
+#~ msgstr "ת×?×?×? ×?×?×?×¢×? ×?×? תק×?×?"
+
+#~ msgid "Message construction failed."
+#~ msgstr "×?× ×?×?ת ×?×?×?×¢×? × ×?ש×?×?."
+
+#~ msgid "User cancelled the operation"
+#~ msgstr "×?×?שת×?ש ×?×?×?×? ×?ת ×?פע×?×?×?"
+
+#~ msgid "Connection canceled"
+#~ msgstr "×?×?×?×?×?ר ×?×?×?×?"
+
+#~ msgid "STARTTLS command failed"
+#~ msgstr "פק×?×?ת STARTTLS × ×?ש×?×?"
+
+#~ msgid "HELO command failed"
+#~ msgstr "פק×?×?ת HELO × ×?ש×?×?"
+
+#~ msgid "AUTH command failed"
+#~ msgstr "AUTH command failed"
+
+#~ msgid "Bad authentication response from server.\n"
+#~ msgstr "Bad authentication response from server.\n"
+
+#~ msgid "MAIL FROM command failed: %s: mail not sent"
+#~ msgstr "MAIL FROM command failed: %s: mail not sent"
+
+#~ msgid "RCPT TO command failed: %s: mail not sent"
+#~ msgstr "RCPT TO command failed: %s: mail not sent"
+
+#~ msgid "DATA command failed: %s: mail not sent"
+#~ msgstr "DATA command failed: %s: mail not sent"
+
+#~ msgid "RSET command failed"
+#~ msgstr "RSET command failed"
+
+#~ msgid "QUIT command failed"
+#~ msgstr "QUIT command failed"
+
 #~ msgid "book busy"
 #~ msgstr "×?ספר עס×?ק"
 
@@ -4615,9 +4918,6 @@ msgstr "פר×?×?ר ש×?×?×?"
 #~ msgid "%s: there is no current operation"
 #~ msgstr "â??%s: ×?×?×? פע×?×?×? × ×?×?×?×?ת"
 
-#~ msgid "%s: could not cancel"
-#~ msgstr "â??%s: ×?×? × ×?ת×? ×?×?×?×?"
-
 #~ msgid "%s: canceled"
 #~ msgstr "â??%s: ×?×?×?×?"
 
@@ -4700,9 +5000,6 @@ msgstr "פר×?×?ר ש×?×?×?"
 #~ msgid "Failed to send command to IMAP server %s: %s"
 #~ msgstr "Failed to store mail in temp file %s: %s"
 
-#~ msgid "service unavailable"
-#~ msgstr "â??ש×?ר×?ת ×?×? ×?×?×?×?"
-
 #~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
 #~ msgstr "שרת IMAP4 â??%s ×?תנתק ×?×?×?פ×? פת×?×?×?×?: %s"
 
@@ -4803,10 +5100,6 @@ msgstr "פר×?×?ר ש×?×?×?"
 #~ msgstr "×?×? × ×?ת×? ×?×?צ×?ר ×?ת ×?ת×?ק×?×?×? '%s': â??%s"
 
 #, fuzzy
-#~ msgid "Cannot delete folder '%s': Special folder"
-#~ msgstr "×?×? × ×?ת×? ×?×?×?×?ק ×?ת ×?ת×?ק×?×?×? '%s': â??%s"
-
-#, fuzzy
 #~ msgid "Cannot delete folder '%s': Invalid mailbox name"
 #~ msgstr "×?×? × ×?ת×? ×?×?×?×?ק ×?ת ×?ת×?ק×?×?×? '%s': â??%s"
 
@@ -4885,9 +5178,6 @@ msgstr "פר×?×?ר ש×?×?×?"
 #~ msgid "The specified folder type is not valid"
 #~ msgstr "ס×?×? ×?ת×?ק×?×?×? שצ×?×?×?× ×? ×?×?× ×? תק×?×?"
 
-#~ msgid "I/O error"
-#~ msgstr "ש×?×?×?ת ק×?×?/פ×?×?"
-
 #~ msgid "Not enough space to create the folder"
 #~ msgstr "×?×?×? ×?ספ×?ק ×?ק×?×? ×?×?צ×?ר ×?ת ×?ת×?ק×?×?×?:"
 
@@ -6211,18 +6501,9 @@ msgstr "פר×?×?ר ש×?×?×?"
 #~ msgid "Job Title"
 #~ msgstr "×?×?תרת תפק×?×?"
 
-#~ msgid "Success"
-#~ msgstr "×?צ×?×?×?"
-
-#~ msgid "Address Book does not exist"
-#~ msgstr "ספר ×?×?ת×?×?×?ת ×?×? ק×?×?×?"
-
 #~ msgid "No Self Contact defined"
 #~ msgstr "×?×? ×?×?×?×?ר ×?×?ש קשר עצ×?×?"
 
-#~ msgid "Authentication Required"
-#~ msgstr "×?×?×?×?×?ת × ×?רשת"
-
 #~ msgid "No such source"
 #~ msgstr "×?×?×? ×?ק×?ר ×?×?×?"
 
@@ -7710,9 +7991,6 @@ msgstr "פר×?×?ר ש×?×?×?"
 #~ msgid "(Untitled)"
 #~ msgstr "(×?×?×? ×?×?תרת)"
 
-#~ msgid "File %s does not exist"
-#~ msgstr "×?ק×?×?×¥ %s ×?×? ק×?×?×?"
-
 #~ msgid "Importing"
 #~ msgstr "×?×?×?×?×?"
 



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