[evolution-data-server] Updated Shavian transliteration



commit cbfa52b40627a9b2afb09904ca85f15c77e8fed7
Author: Thomas Thurman <tthurman gnome org>
Date:   Wed May 12 18:41:41 2010 -0400

    Updated Shavian transliteration

 po/en shaw po | 3672 +++++++++++++++++++++++++++++++++------------------------
 1 files changed, 2139 insertions(+), 1533 deletions(-)
---
diff --git a/po/en shaw po b/po/en shaw po
index 19405ae..ee7c8fd 100644
--- a/po/en shaw po
+++ b/po/en shaw po
@@ -4,13 +4,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server\n"
-"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2009-11-06 19:17+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-data-server&component=general\n";
+"POT-Creation-Date: 2010-05-12 21:22+0000\n"
+"PO-Revision-Date: 2010-05-12 18:35 -0400\n"
 "Last-Translator: Thomas Thurman <tthurman gnome org>\n"
-"Language-Team: Shavian <ubuntu-l10n-en-shaw lists launchpad net>\n"
+"Language-Team: Shavian <ubuntu-l10n-en-shaw launchpad net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n!=1;\n"
 
 #: ../addressbook/backends/file/e-book-backend-file.c:560
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
@@ -22,63 +24,73 @@ msgstr "ð??¤ð??´ð???ð??¦ð???..."
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4508
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4553
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
 msgid "Searching..."
 msgstr "ð???ð??»ð???ð??¦ð???..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4672
 #, c-format
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4717
 msgid "Downloading contacts (%d)... "
 msgstr "ð???ð??¬ð??¯ð??¤ð??´ð???ð??¦ð??? ð???ð??ªð??¯ð???ð??¨ð???ð???ð??? (%d)... "
 
+#, c-format
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2845
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3029
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3073
-#, c-format
 msgid "Updating contacts cache (%d)... "
 msgstr "ð??³ð???ð???ð??±ð???ð??¦ð??? ð???ð??ªð??¯ð???ð??¨ð???ð???ð??? ð???ð??¨ð??? (%d)... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:789
+#, fuzzy
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:818
+msgid "Using Distinguished Name (DN)"
+msgstr "ð??¿ð???ð??¦ð??? ð???ð??¦ð???ð???ð??¦ð???ð???ð??¢ð??¦ð???ð??? ð??¯ð??±ð??¥ (DN)"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:821
 msgid "Using Email Address"
 msgstr "ð??¿ð???ð??¦ð??? ð??°ð??¥ð??±ð??¤ ð??©ð???ð??®ð??§ð???"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1065
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1098
 msgid "Reconnecting to LDAP server..."
 msgstr "ð??®ð??°ð???ð??©ð??¯ð??§ð???ð???ð??¦ð??? ð??? LDAP ð???ð??»ð???ð??¼..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1709
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1740
 msgid "Adding contact to LDAP server..."
 msgstr "ð??¨ð???ð??¦ð??? ð???ð??ªð??¯ð???ð??¨ð???ð??? ð??? LDAP ð???ð??»ð???ð??¼..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1843
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1874
 msgid "Removing contact from LDAP server..."
 msgstr "ð??®ð??¦ð??¥ð??µð???ð??¦ð??? ð???ð??ªð??¯ð???ð??¨ð???ð??? ð???ð??®ð??ªð??¥ LDAP ð???ð??»ð???ð??¼..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2280
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2311
 msgid "Modifying contact from LDAP server..."
 msgstr "ð??¥ð??ªð???ð??¦ð???ð??²ð??¦ð??? ð???ð??ªð??¯ð???ð??¨ð???ð??? ð???ð??®ð??ªð??¥ LDAP ð???ð??»ð???ð??¼..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4369
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4414
 msgid "Receiving LDAP search results..."
 msgstr "ð??®ð??¦ð???ð??°ð???ð??¦ð??? LDAP ð???ð??»ð??? ð??®ð??¦ð???ð??³ð??¤ð???ð???..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4530
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4575
 msgid "Error performing search"
 msgstr "ð??»ð??¼ ð???ð??¼ð???ð??¹ð??¥ð??¦ð??? ð???ð??»ð???"
 
+#, fuzzy, c-format
+#: ../addressbook/libebook/e-book.c:2152
+msgid "%s: there was no source for UID '%s' stored in GConf."
+msgstr "%s: ð???ð??º ð??¢ð??ªð??? ð??¯ð??´ ð???ð??¹ð??? ð???ð??¹ UID '%s' ð???ð???ð??¹ð??? ð??¦ð??¯ GConf."
+
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:113
+#: ../addressbook/libebook/e-contact.c:115
 msgid "Unique ID"
 msgstr "ð??¿ð??¯ð??°ð??? ID"
 
-#: ../addressbook/libebook/e-contact.c:114
+#: ../addressbook/libebook/e-contact.c:116
 msgid "File Under"
 msgstr "ð???ð??²ð??¤ ð??³ð??¯ð???ð??¼"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:116
+#: ../addressbook/libebook/e-contact.c:118
 msgid "Book URI"
 msgstr "ð???ð??«ð??? URI"
 
@@ -86,367 +98,581 @@ msgstr "ð???ð??«ð??? URI"
 #. FN isn't really a structured field - we use a getter/setter
 #. so we can set the N property (since evo 1.4 works fine with
 #. vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:122
+#: ../addressbook/libebook/e-contact.c:124
 msgid "Full Name"
 msgstr "ð???ð??«ð??¤ ð??¯ð??±ð??¥"
 
-#: ../addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook/e-contact.c:125
 msgid "Given Name"
 msgstr "ð???ð??¦ð???ð??©ð??¯ ð??¯ð??±ð??¥"
 
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:126
 msgid "Family Name"
 msgstr "ð???ð??¨ð??¥ð??¦ð??¤ð??¦ ð??¯ð??±ð??¥"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:127
 msgid "Nickname"
 msgstr "ð??¯ð??¦ð???ð??¯ð??±ð??¥"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Email 1"
 msgstr "ð??°ð??¥ð??±ð??¤ 1"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Email 2"
 msgstr "ð??°ð??¥ð??±ð??¤ 2"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:132
 msgid "Email 3"
 msgstr "ð??°ð??¥ð??±ð??¤ 3"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 4"
 msgstr "ð??°ð??¥ð??±ð??¤ 4"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Mailer"
 msgstr "ð??¥ð??±ð??¤ð??¼"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Home Address Label"
 msgstr "ð??£ð??´ð??¥ ð??©ð???ð??®ð??§ð??? ð??¤ð??±ð???ð??©ð??¤"
 
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:139
 msgid "Work Address Label"
 msgstr "ð??¢ð??»ð??? ð??©ð???ð??®ð??§ð??? ð??¤ð??±ð???ð??©ð??¤"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Other Address Label"
 msgstr "ð??³ð???ð??¼ ð??©ð???ð??®ð??§ð??? ð??¤ð??±ð???ð??©ð??¤"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Assistant Phone"
 msgstr "ð??©ð???ð??¦ð???ð???ð??©ð??¯ð??? ð???ð??´ð??¯"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:144
 msgid "Business Phone"
 msgstr "ð???ð??¦ð???ð??¯ð??©ð??? ð???ð??´ð??¯"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Business Phone 2"
 msgstr "ð???ð??¦ð???ð??¯ð??©ð??? ð???ð??´ð??¯ 2"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Business Fax"
 msgstr "ð???ð??¦ð???ð??¯ð??©ð??? ð???ð??¨ð???ð???"
 
-#: ../addressbook/libebook/e-contact.c:146
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:147
+msgid "Callback Phone"
+msgstr "Callback ð???ð??´ð??¯"
+
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Car Phone"
 msgstr "ð???ð??¸ ð???ð??´ð??¯"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Company Phone"
 msgstr "ð???ð??³ð??¥ð???ð??©ð??¯ð??¦ ð???ð??´ð??¯"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Home Phone"
 msgstr "ð??£ð??´ð??¥ ð???ð??´ð??¯"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Home Phone 2"
 msgstr "ð??£ð??´ð??¥ ð???ð??´ð??¯ 2"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Home Fax"
 msgstr "ð??£ð??´ð??¥ ð???ð??¨ð???ð???"
 
-#: ../addressbook/libebook/e-contact.c:152
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:153
+msgid "ISDN"
+msgstr "ISDN"
+
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Mobile Phone"
 msgstr "ð??¥ð??´ð???ð??²ð??¤ ð???ð??´ð??¯"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Other Phone"
 msgstr "ð??³ð???ð??¼ ð???ð??´ð??¯"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Other Fax"
 msgstr "ð??³ð???ð??¼ ð???ð??¨ð???ð???"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Pager"
 msgstr "ð???ð??±ð??¡ð??»"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Primary Phone"
 msgstr "ð???ð??®ð??²ð??¥ð??¼ð??¦ ð???ð??´ð??¯"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Radio"
 msgstr "ð??®ð??±ð???ð??¦ð??´"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Telex"
 msgstr "ð???ð??§ð??¤ð??§ð???ð???"
 
+#. To translators: TTY is Teletypewriter
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:162
+msgid "TTY"
+msgstr "TTY"
+
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Organization"
 msgstr "ð??¹ð???ð??©ð??¯ð??¦ð???ð??±ð???ð??©ð??¯"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Organizational Unit"
 msgstr "ð??ªð??®ð???ð??©ð??¯ð??©ð???ð??±ð???ð??©ð??¯ð??©ð??¤ ð??¿ð??¯ð??¦ð???"
 
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Office"
 msgstr "ð??ªð???ð??¦ð???"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Title"
 msgstr "ð???ð??²ð???ð??©ð??¤"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Role"
 msgstr "ð??®ð??´ð??¤"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Manager"
 msgstr "ð??¥ð??¨ð??¯ð??©ð??¡ð??¼"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Assistant"
 msgstr "ð??©ð???ð??¦ð???ð???ð??©ð??¯ð???"
 
+#. Web fields
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:174
+msgid "Homepage URL"
+msgstr "Homepage ·ð??¿Â·ð??®Â·ð??¤"
+
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:175
+msgid "Weblog URL"
+msgstr "Weblog ·ð??¿Â·ð??®Â·ð??¤"
+
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:632
+#: ../addressbook/libebook/e-contact.c:178
+#: ../libedataserverui/e-categories-dialog.c:671
 msgid "Categories"
 msgstr "ð???ð??¨ð???ð??©ð???ð??ªð??®ð??°ð???"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Calendar URI"
 msgstr "ð???ð??¨ð??¤ð??©ð??¯ð???ð??¼ ð???ð??»ð??°"
 
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:182
 msgid "Free/Busy URL"
 msgstr "ð???ð??®ð??°/ð???ð??¦ð???ð??° URL"
 
-#: ../addressbook/libebook/e-contact.c:182
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:183
+msgid "ICS Calendar"
+msgstr "ICS ð???ð??¨ð??¤ð??©ð??¯ð???ð??¼"
+
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Video Conferencing URL"
 msgstr "ð???ð??¦ð???ð??¦ð??´ ð???ð??­ð??¯ð???ð??®ð??©ð??¯ð???ð??¦ð??? URL"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:187
 msgid "Spouse's Name"
 msgstr "ð???ð???ð??¶ð???ð??§ð??? ð??¯ð??±ð??¥"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:188
 msgid "Note"
 msgstr "ð??¯ð??´ð???"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:189
+#: ../addressbook/libebook/e-contact.c:191
 msgid "AIM Home Screen Name 1"
 msgstr "·ð??±ð??¥ ð??£ð??´ð??¥ ð???ð???ð??®ð??°ð??¯ ð??¯ð??±ð??¥ 1"
 
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:192
 msgid "AIM Home Screen Name 2"
 msgstr "·ð??±ð??¥ ð??£ð??´ð??¥ ð???ð???ð??®ð??°ð??¯ ð??¯ð??±ð??¥ 2"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:193
 msgid "AIM Home Screen Name 3"
 msgstr "·ð??±ð??¥ ð??£ð??´ð??¥ ð???ð???ð??®ð??°ð??¯ ð??¯ð??±ð??¥ 3"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:194
 msgid "AIM Work Screen Name 1"
 msgstr "·ð??±ð??¥ ð??¢ð??»ð??? ð???ð???ð??®ð??°ð??¯ ð??¯ð??±ð??¥ 1"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Work Screen Name 2"
 msgstr "·ð??±ð??¥ ð??¢ð??»ð??? ð???ð???ð??®ð??°ð??¯ ð??¯ð??±ð??¥ 2"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Work Screen Name 3"
 msgstr "·ð??±ð??¥ ð??¢ð??»ð??? ð???ð???ð??®ð??°ð??¯ ð??¯ð??±ð??¥ 3"
 
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:197
+msgid "GroupWise Home Screen Name 1"
+msgstr "GroupWise ð??£ð??´ð??¥ ð???ð???ð??®ð??°ð??¯ ð??¯ð??±ð??¥ 1"
+
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:198
+msgid "GroupWise Home Screen Name 2"
+msgstr "GroupWise ð??£ð??´ð??¥ ð???ð???ð??®ð??°ð??¯ ð??¯ð??±ð??¥ 2"
+
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:199
+msgid "GroupWise Home Screen Name 3"
+msgstr "GroupWise ð??£ð??´ð??¥ ð???ð???ð??®ð??°ð??¯ ð??¯ð??±ð??¥ 3"
+
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:200
+msgid "GroupWise Work Screen Name 1"
+msgstr "GroupWise ð??¢ð??»ð??? ð???ð???ð??®ð??°ð??¯ ð??¯ð??±ð??¥ 1"
+
+#, fuzzy
 #: ../addressbook/libebook/e-contact.c:201
-msgid "Jabber Home Id 1"
-msgstr "·ð??¡ð??¨ð???ð??¼ ð??£ð??´ð??¥ ID 1"
+msgid "GroupWise Work Screen Name 2"
+msgstr "GroupWise ð??¢ð??»ð??? ð???ð???ð??®ð??°ð??¯ ð??¯ð??±ð??¥ 2"
 
+#, fuzzy
 #: ../addressbook/libebook/e-contact.c:202
-msgid "Jabber Home Id 2"
-msgstr "·ð??¡ð??¨ð???ð??¼ ð??£ð??´ð??¥ ID 2"
+msgid "GroupWise Work Screen Name 3"
+msgstr "GroupWise ð??¢ð??»ð??? ð???ð???ð??®ð??°ð??¯ ð??¯ð??±ð??¥ 3"
 
+#, fuzzy
 #: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 3"
-msgstr "·ð??¡ð??¨ð???ð??¼ ð??£ð??´ð??¥ ID 3"
+msgid "Jabber Home ID 1"
+msgstr "·ð??¡ð??¨ð???ð??¼ ð??£ð??´ð??¥ ð??¦ð??? 1"
 
+#, fuzzy
 #: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Work Id 1"
-msgstr "·ð??¡ð??¨ð???ð??¼ ð??¢ð??»ð??? ID 1"
+msgid "Jabber Home ID 2"
+msgstr "·ð??¡ð??¨ð???ð??¼ ð??£ð??´ð??¥ ð??¦ð??? 2"
 
+#, fuzzy
 #: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Work Id 2"
-msgstr "·ð??¡ð??¨ð???ð??¼ ð??¢ð??»ð??? ID 2"
+msgid "Jabber Home ID 3"
+msgstr "·ð??¡ð??¨ð???ð??¼ ð??£ð??´ð??¥ ð??¦ð??? 3"
 
+#, fuzzy
 #: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 3"
-msgstr "·ð??¡ð??¨ð???ð??¼ ð??¢ð??»ð??? ID 3"
+msgid "Jabber Work ID 1"
+msgstr "·ð??¡ð??¨ð???ð??¼ ð??¢ð??»ð??? ð??¦ð??? 1"
 
+#, fuzzy
 #: ../addressbook/libebook/e-contact.c:207
+msgid "Jabber Work ID 2"
+msgstr "·ð??¡ð??¨ð???ð??¼ ð??¢ð??»ð??? ð??¦ð??? 2"
+
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:208
+msgid "Jabber Work ID 3"
+msgstr "·ð??¡ð??¨ð???ð??¼ ð??¢ð??»ð??? ð??¦ð??? 3"
+
+#: ../addressbook/libebook/e-contact.c:209
 msgid "Yahoo! Home Screen Name 1"
 msgstr "·ð???ð??­ð??£ð??µ! ð??£ð??´ð??¥ ð???ð???ð??®ð??°ð??¯ ð??¯ð??±ð??¥ 1"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Yahoo! Home Screen Name 2"
 msgstr "·ð???ð??­ð??£ð??µ! ð??£ð??´ð??¥ ð???ð???ð??®ð??°ð??¯ ð??¯ð??±ð??¥ 2"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Yahoo! Home Screen Name 3"
 msgstr "·ð???ð??­ð??£ð??µ! ð??£ð??´ð??¥ ð???ð???ð??®ð??°ð??¯ ð??¯ð??±ð??¥ 3"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Work Screen Name 1"
 msgstr "·ð???ð??­ð??£ð??µ! ð??¢ð??»ð??? ð???ð???ð??®ð??°ð??¯ ð??¯ð??±ð??¥ 1"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Work Screen Name 2"
 msgstr "·ð???ð??­ð??£ð??µ! ð??¢ð??»ð??? ð???ð???ð??®ð??°ð??¯ ð??¯ð??±ð??¥ 2"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Work Screen Name 3"
 msgstr "·ð???ð??­ð??£ð??µ! ð??¢ð??»ð??? ð???ð???ð??®ð??°ð??¯ ð??¯ð??±ð??¥ 3"
 
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:215
+msgid "MSN Home Screen Name 1"
+msgstr "MSN ð??£ð??´ð??¥ ð???ð???ð??®ð??°ð??¯ ð??¯ð??±ð??¥ 1"
+
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:216
+msgid "MSN Home Screen Name 2"
+msgstr "MSN ð??£ð??´ð??¥ ð???ð???ð??®ð??°ð??¯ ð??¯ð??±ð??¥ 2"
+
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:217
+msgid "MSN Home Screen Name 3"
+msgstr "MSN ð??£ð??´ð??¥ ð???ð???ð??®ð??°ð??¯ ð??¯ð??±ð??¥ 3"
+
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:218
+msgid "MSN Work Screen Name 1"
+msgstr "MSN ð??¢ð??»ð??? ð???ð???ð??®ð??°ð??¯ ð??¯ð??±ð??¥ 1"
+
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:219
+msgid "MSN Work Screen Name 2"
+msgstr "MSN ð??¢ð??»ð??? ð???ð???ð??®ð??°ð??¯ ð??¯ð??±ð??¥ 2"
+
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:220
+msgid "MSN Work Screen Name 3"
+msgstr "MSN ð??¢ð??»ð??? ð???ð???ð??®ð??°ð??¯ ð??¯ð??±ð??¥ 3"
+
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:221
+msgid "ICQ Home ID 1"
+msgstr "ICQ ð??£ð??´ð??¥ ð??¦ð??? 1"
+
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:222
+msgid "ICQ Home ID 2"
+msgstr "ICQ ð??£ð??´ð??¥ ð??¦ð??? 2"
+
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:223
+msgid "ICQ Home ID 3"
+msgstr "ICQ ð??£ð??´ð??¥ ð??¦ð??? 3"
+
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:224
+msgid "ICQ Work ID 1"
+msgstr "ICQ ð??¢ð??»ð??? ð??¦ð??? 1"
+
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:225
+msgid "ICQ Work ID 2"
+msgstr "ICQ ð??¢ð??»ð??? ð??¦ð??? 2"
+
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:226
+msgid "ICQ Work ID 3"
+msgstr "ICQ ð??¢ð??»ð??? ð??¦ð??? 3"
+
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:229
 msgid "Last Revision"
 msgstr "ð??¤ð??­ð???ð??? ð??®ð??°ð???ð??¦ð?? ð??©ð??¯"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:230
 msgid "Name or Org"
 msgstr "ð??¯ð??±ð??¥ ð??¹ ð??¹ð???"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Address List"
 msgstr "ð??©ð???ð??®ð??§ð??? ð??¤ð??¦ð???ð???"
 
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:234
 msgid "Home Address"
 msgstr "ð??£ð??´ð??¥ ð??©ð???ð??®ð??§ð???"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:235
 msgid "Work Address"
 msgstr "ð??¢ð??»ð??? ð??©ð???ð??®ð??§ð???"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:236
 msgid "Other Address"
 msgstr "ð??³ð???ð??¼ ð??©ð???ð??®ð??§ð???"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Category List"
 msgstr "ð???ð??¨ð???ð??§ð???ð??¹ð??° ð??¤ð??¦ð???ð???"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Photo"
 msgstr "ð???ð??´ð???ð??´"
 
-#: ../addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Logo"
 msgstr "ð??¤ð??´ð???ð??´"
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:245
 msgid "Name"
 msgstr "ð??¯ð??±ð??¥"
 
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Email List"
 msgstr "ð??°ð??¥ð??±ð??¤ ð??¤ð??¦ð???ð???"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook/e-contact.c:249
 msgid "AIM Screen Name List"
 msgstr "·ð??±ð??¥ ð???ð???ð??®ð??°ð??¯ ð??¯ð??±ð??¥ ð??¤ð??¦ð???ð???"
 
-#: ../addressbook/libebook/e-contact.c:249
-msgid "Jabber Id List"
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:250
+msgid "GroupWise ID List"
+msgstr "GroupWise ð??¦ð??? ð??¤ð??¦ð???ð???"
+
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:251
+msgid "Jabber ID List"
 msgstr "·ð??¡ð??¨ð???ð??¼ ð??¦ð??? ð??¤ð??¦ð???ð???"
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:252
 msgid "Yahoo! Screen Name List"
 msgstr "·ð???ð??­ð??£ð??µ! ð???ð???ð??®ð??°ð??¯ ð??¯ð??±ð??¥ ð??¤ð??¦ð???ð???"
 
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:253
+msgid "MSN Screen Name List"
+msgstr "MSN ð???ð???ð??®ð??°ð??¯ ð??¯ð??±ð??¥ ð??¤ð??¦ð???ð???"
+
+#, fuzzy
 #: ../addressbook/libebook/e-contact.c:254
+msgid "ICQ ID List"
+msgstr "ICQ ð??¦ð??? ð??¤ð??¦ð???ð???"
+
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Wants HTML Mail"
 msgstr "ð??¢ð??ªð??¯ð???ð??? HTML ð??¥ð??±ð??¤"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:258
 msgid "List"
 msgstr "ð??¤ð??¦ð???ð???"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:259
 msgid "List Show Addresses"
 msgstr "ð??¤ð??¦ð???ð??? ð???ð??´ ð??©ð???ð??®ð??§ð???ð??©ð???"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:261
 msgid "Birth Date"
 msgstr "ð???ð??»ð??? ð???ð??±ð???"
 
-#: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:713
+#: ../addressbook/libebook/e-contact.c:262
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:715
 #: ../libedataserver/e-categories.c:45
 msgid "Anniversary"
 msgstr "ð??¨ð??¯ð??©ð???ð??»ð???ð??»ð??°"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:263
+#: ../addressbook/libebook/e-contact.c:265
 msgid "X.509 Certificate"
 msgstr "X.509 ð???ð??©ð???ð??¦ð???ð??¦ð???ð??©ð???"
 
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:267
+msgid "Gadu-Gadu Home ID 1"
+msgstr "Gadu-Gadu ð??£ð??´ð??¥ ð??¦ð??? 1"
+
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:268
+msgid "Gadu-Gadu Home ID 2"
+msgstr "Gadu-Gadu ð??£ð??´ð??¥ ð??¦ð??? 2"
+
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:269
+msgid "Gadu-Gadu Home ID 3"
+msgstr "Gadu-Gadu ð??£ð??´ð??¥ ð??¦ð??? 3"
+
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:270
+msgid "Gadu-Gadu Work ID 1"
+msgstr "Gadu-Gadu ð??¢ð??»ð??? ð??¦ð??? 1"
+
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:271
+msgid "Gadu-Gadu Work ID 2"
+msgstr "Gadu-Gadu ð??¢ð??»ð??? ð??¦ð??? 2"
+
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:272
+msgid "Gadu-Gadu Work ID 3"
+msgstr "Gadu-Gadu ð??¢ð??»ð??? ð??¦ð??? 3"
+
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:273
+msgid "Gadu-Gadu ID List"
+msgstr "Gadu-Gadu ð??¦ð??? ð??¤ð??¦ð???ð???"
+
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Geographic Information"
 msgstr "ð??¡ð??°ð??©ð???ð??®ð??¨ð???ð??¦ð??? ð??¦ð??¯ð???ð??¼ð??¥ð??±ð???ð??©ð??¯"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:278
 msgid "Telephone"
 msgstr "ð???ð??§ð??¤ð??©ð???ð??´ð??¯"
 
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:280
+msgid "Skype Home Name 1"
+msgstr "Skype ð??£ð??´ð??¥ ð??¯ð??±ð??¥ 1"
+
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:281
+msgid "Skype Home Name 2"
+msgstr "Skype ð??£ð??´ð??¥ ð??¯ð??±ð??¥ 2"
+
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:282
+msgid "Skype Home Name 3"
+msgstr "Skype ð??£ð??´ð??¥ ð??¯ð??±ð??¥ 3"
+
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:283
+msgid "Skype Work Name 1"
+msgstr "Skype ð??¢ð??»ð??? ð??¯ð??±ð??¥ 1"
+
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:284
+msgid "Skype Work Name 2"
+msgstr "Skype ð??¢ð??»ð??? ð??¯ð??±ð??¥ 2"
+
+#, fuzzy
+#: ../addressbook/libebook/e-contact.c:285
+msgid "Skype Work Name 3"
+msgstr "Skype ð??¢ð??»ð??? ð??¯ð??±ð??¥ 3"
+
+#, fuzzy
 #: ../addressbook/libebook/e-contact.c:286
+msgid "Skype Name List"
+msgstr "Skype ð??¯ð??±ð??¥ ð??¤ð??¦ð???ð???"
+
+#: ../addressbook/libebook/e-contact.c:288
 msgid "SIP address"
 msgstr "·ð???ð??¦ð??? ð??©ð???ð??®ð??§ð???"
 
-#: ../addressbook/libebook/e-contact.c:1535
-#: ../addressbook/libebook/e-destination.c:761
+#: ../addressbook/libebook/e-contact.c:1517
+#: ../addressbook/libebook/e-destination.c:739
 msgid "Unnamed List"
 msgstr "ð??©ð??¯ð??¯ð??±ð??¥ð??? ð??¤ð??¦ð???ð???"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:292
 #, c-format
+#: ../addressbook/libedata-book/e-data-book-factory.c:290
 msgid "Empty URI"
 msgstr "ð??§ð??¥ð???ð???ð??¦ URI"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:307
+#, c-format
+#: ../addressbook/libedata-book/e-data-book-factory.c:305
 #: ../addressbook/libedata-book/e-data-book-factory.c:332
 #: ../calendar/libedata-cal/e-data-cal-factory.c:323
 #: ../calendar/libedata-cal/e-data-cal-factory.c:332
-#, c-format
 msgid "Invalid source"
 msgstr "ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð???ð??¹ð???"
 
@@ -486,7 +712,7 @@ msgid "Cannot remove contacts"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð??®ð??¦ð??¥ð??µð??? ð???ð??ªð??¯ð???ð??¨ð???ð???ð???"
 
 #: ../addressbook/libedata-book/e-data-book.c:569
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
+#: ../calendar/libedata-cal/e-cal-backend-util.c:141
 msgid "Invalid query"
 msgstr "ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð???ð??¢ð??½ð??¦"
 
@@ -498,142 +724,147 @@ msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??? ð???ð??±ð??¯ð??¡ð??©ð???"
 msgid "Cannot complete operation"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??©ð??¥ð???ð??¤ð??°ð??? ð??ªð???ð??¼ð??±ð???ð??©ð??¯"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:715
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
 #: ../libedataserver/e-categories.c:46
 msgid "Birthday"
 msgstr "ð???ð??»ð???ð???ð??±"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:744
 #, c-format
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:746
 msgid "Birthday: %s"
 msgstr "ð???ð??»ð???ð???ð??±: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:768
 #, c-format
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:770
 msgid "Anniversary: %s"
 msgstr "ð??¨ð??¯ð??©ð???ð??»ð???ð??»ð??°: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:234
+#: ../calendar/backends/file/e-cal-backend-file.c:236
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??±ð??? ð???ð??¨ð??¤ð??©ð??¯ð???ð??¼ ð???ð??±ð???ð??©: ð??¥ð??¨ð??¤ð???ð??¹ð??¥ð??? ð???ð??»ð??°."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:241
-#: ../calendar/backends/file/e-cal-backend-file.c:247
+#: ../calendar/backends/file/e-cal-backend-file.c:243
+#: ../calendar/backends/file/e-cal-backend-file.c:249
 msgid "Cannot save calendar data"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??±ð??? ð???ð??¨ð??¤ð??©ð??¯ð???ð??¼ ð???ð??±ð???ð??©"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:342
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:321
 msgid "Could not create thread for getting deltas"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð???ð??®ð??§ð??? ð???ð??¹ ð???ð??§ð???ð??¦ð??? ð???ð??§ð??¤ð???ð??©ð???"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:374
-#: ../calendar/backends/google/e-cal-backend-google.c:1189
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1080
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1381
-#: ../calendar/backends/http/e-cal-backend-http.c:673
-#: ../calendar/backends/weather/e-cal-backend-weather.c:486
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:353
+#: ../calendar/backends/google/e-cal-backend-google.c:1120
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1086
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1384
+#: ../calendar/backends/http/e-cal-backend-http.c:678
+#: ../calendar/backends/weather/e-cal-backend-weather.c:492
 msgid "Could not create cache file"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð???ð??¨ð??? ð???ð??²ð??¤"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:387
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1093
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:366
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1099
 msgid "Could not create thread for populating cache"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð???ð??®ð??§ð??? ð???ð??¹ ð???ð??ªð???ð??¿ð??¤ð??±ð???ð??¦ð??? ð???ð??¨ð???"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2078
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1118
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2251
 msgid "Reply Requested: by "
 msgstr "ð??®ð??¦ð???ð??¤ð??² ð??®ð??¦ð???ð??¢ð??§ð???ð???ð??©ð???: ð???ð??² "
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2083
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1123
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2256
 msgid "Reply Requested: When convenient"
 msgstr "ð??®ð??¦ð???ð??¤ð??² ð??®ð??¦ð???ð??¢ð??§ð???ð???ð??©ð???: ð??¢ð??§ð??¯ ð???ð??©ð??¯ð???ð??°ð??¯ð??¦ð??©ð??¯ð???"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:281
 #, c-format
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:292
 msgid "Loading %s items"
 msgstr "ð??¤ð??´ð???ð??¦ð??? %s ð??²ð???ð??©ð??¥ð???"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:918
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:925
 msgid "Calendar"
 msgstr "ð???ð??¨ð??¤ð??©ð??¯ð???ð??¼"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:976
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:983
 msgid "Invalid server URI"
 msgstr "ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð???ð??»ð???ð??¼ URI"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:995
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1004
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1098
-#: ../calendar/libecal/e-cal.c:3750
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1291
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1327
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1342
-#: ../camel/providers/groupwise/camel-groupwise-store.c:598
-#: ../camel/providers/groupwise/camel-groupwise-store.c:773
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:181
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1002
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1011
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1104
+#: ../calendar/libecal/e-cal.c:4025
+#: ../calendar/libedata-cal/e-cal-backend-util.c:119
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1423
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1461
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1476
+#: ../camel/providers/groupwise/camel-groupwise-store.c:603
+#: ../camel/providers/groupwise/camel-groupwise-store.c:789
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:84
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:115
 msgid "Authentication failed"
 msgstr "ð??·ð???ð??§ð??¯ð???ð??¦ð???ð??±ð???ð??©ð??¯ ð???ð??±ð??¤ð???"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:330
+#: ../calendar/backends/http/e-cal-backend-http.c:335
 msgid "Redirected to Invalid URI"
 msgstr "ð??®ð??°ð???ð??»ð??§ð???ð???ð??¦ð??? ð??? ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? URI"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:353
+#: ../calendar/backends/http/e-cal-backend-http.c:358
 msgid "Bad file format."
 msgstr "ð???ð??¨ð??? ð???ð??²ð??¤ ð???ð??¹ð??¥ð??¨ð???."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:360
+#: ../calendar/backends/http/e-cal-backend-http.c:365
 msgid "Not a calendar."
 msgstr "ð??¯ð??ªð??? ð??© ð???ð??¨ð??¤ð??©ð??¯ð???ð??¼."
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:150
+#: ../calendar/backends/weather/e-cal-backend-weather.c:152
 msgid "Could not retrieve weather data"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??®ð??¦ð???ð??®ð??°ð??? ð??¢ð??§ð???ð??¼ ð???ð??±ð???ð??©"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
+#: ../calendar/backends/weather/e-cal-backend-weather.c:251
 msgid "Weather: Fog"
 msgstr "ð??¢ð??§ð???ð??¼: ð???ð??ªð???"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
-msgid "Weather: Cloudy"
-msgstr "ð??¢ð??§ð???ð??¼: ð???ð??¤ð??¶ð???ð??°"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
+#: ../calendar/backends/weather/e-cal-backend-weather.c:252
 msgid "Weather: Cloudy Night"
 msgstr "ð??¢ð??§ð???ð??¼: ð???ð??¤ð??¶ð???ð??° ð??¯ð??²ð???"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
+#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+msgid "Weather: Cloudy"
+msgstr "ð??¢ð??§ð???ð??¼: ð???ð??¤ð??¶ð???ð??°"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:254
 msgid "Weather: Overcast"
 msgstr "ð??¢ð??§ð???ð??¼: ð??´ð???ð??»ð???ð??¨ð???ð???"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:255
 msgid "Weather: Showers"
 msgstr "ð??¢ð??§ð???ð??¼: ð???ð??¬ð??¼ð???"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:256
 msgid "Weather: Snow"
 msgstr "ð??¢ð??§ð???ð??¼: ð???ð??¯ð??´"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
-msgid "Weather: Sunny"
-msgstr "ð??¢ð??§ð???ð??¼: ð???ð??³ð??¯ð??¦"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:257
 msgid "Weather: Clear Night"
 msgstr "ð??¢ð??§ð???ð??¼: ð???ð??¤ð??½ ð??¯ð??²ð???"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:258
+msgid "Weather: Sunny"
+msgstr "ð??¢ð??§ð???ð??¼: ð???ð??³ð??¯ð??¦"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:259
 msgid "Weather: Thunderstorms"
 msgstr "ð??¢ð??§ð???ð??¼: ð???ð??©ð??¯ð???ð??»ð???ð???ð??ªð??®ð??¥ð???"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:400
+#: ../calendar/backends/weather/e-cal-backend-weather.c:405
 msgid "Forecast"
 msgstr "ð???ð??¹ð???ð??­ð???ð???"
 
+#, fuzzy
+#: ../calendar/libecal/e-cal-component.c:1286
+msgid "Untitled appointment"
+msgstr "Untitled ð??©ð???ð??¶ð??¯ð???ð??¥ð??©ð??¯ð???"
+
 #: ../calendar/libecal/e-cal-recur.c:3951
 msgid "1st"
 msgstr "1st"
@@ -758,25 +989,25 @@ msgstr "30th"
 msgid "31st"
 msgstr "31st"
 
-#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:712
+#: ../calendar/libecal/e-cal-util.c:688 ../calendar/libecal/e-cal-util.c:715
 msgid "High"
 msgstr "ð??£ð??²"
 
-#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:714
+#: ../calendar/libecal/e-cal-util.c:690 ../calendar/libecal/e-cal-util.c:717
 msgid "Normal"
 msgstr "ð??¯ð??¹ð??¥ð??©ð??¤"
 
-#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:716
+#: ../calendar/libecal/e-cal-util.c:692 ../calendar/libecal/e-cal-util.c:719
 msgid "Low"
 msgstr "ð??¤ð??´"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:710
+#: ../calendar/libecal/e-cal-util.c:713
 msgid "Undefined"
 msgstr "ð??©ð??¯ð???ð??¦ð???ð??²ð??¯ð???"
 
-#: ../calendar/libecal/e-cal.c:1065 ../libedataserverui/e-book-auth-util.c:199
 #, c-format
+#: ../calendar/libecal/e-cal.c:1178 ../libedataserverui/e-book-auth-util.c:199
 msgid "Enter password for %s (user %s)"
 msgstr "ð??§ð??¯ð???ð??¼ ð???ð??­ð???ð??¢ð??¼ð??? ð???ð??¹ %s (ð??¿ð???ð??¼ %s)"
 
@@ -784,180 +1015,177 @@ 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:1079
 #, c-format
+#: ../calendar/libecal/e-cal.c:1192
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "ð??§ð??¯ð???ð??¼ ð???ð??­ð???ð??¢ð??¼ð??? ð???ð??¹ %s ð??? ð??¦ð??¯ð??±ð???ð??©ð??¤ ð???ð??®ð??ªð???ð???ð??¦ ð???ð??¹ ð??¿ð???ð??¼ %s"
 
-#: ../calendar/libecal/e-cal.c:3722
+#: ../calendar/libecal/e-cal.c:3997
 msgid "Invalid argument"
 msgstr "ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð??¸ð???ð??¿ð??¥ð??©ð??¯ð???"
 
-#: ../calendar/libecal/e-cal.c:3724
+#: ../calendar/libecal/e-cal.c:3999
 msgid "Backend is busy"
 msgstr "ð???ð??¨ð???ð??§ð??¯ð??? ð??¦ð??? ð???ð??¦ð???ð??°"
 
-#: ../calendar/libecal/e-cal.c:3726
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:4001
+#: ../calendar/libedata-cal/e-cal-backend-util.c:107
 msgid "Repository is offline"
 msgstr "ð??®ð??°ð???ð??­ð???ð??©ð???ð??ªð??®ð??° ð??¦ð??? ð??ªð???ð??¤ð??²ð??¯"
 
-#: ../calendar/libecal/e-cal.c:3728
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
+#: ../calendar/libecal/e-cal.c:4003
+#: ../calendar/libedata-cal/e-cal-backend-util.c:131
 msgid "No such calendar"
 msgstr "ð??¯ð??´ ð???ð??³ð??? ð???ð??¨ð??¤ð??©ð??¯ð???ð??¼"
 
-#: ../calendar/libecal/e-cal.c:3730
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
-#: ../servers/groupwise/e-gw-connection.c:233
+#: ../calendar/libecal/e-cal.c:4005
+#: ../calendar/libedata-cal/e-cal-backend-util.c:113
+#: ../servers/groupwise/e-gw-connection.c:235
 msgid "Object not found"
 msgstr "ð??©ð???ð??¡ð??§ð???ð??? ð??¯ð??ªð??? ð???ð??¬ð??¯ð???"
 
-#: ../calendar/libecal/e-cal.c:3732
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
-#: ../servers/groupwise/e-gw-connection.c:227
+#: ../calendar/libecal/e-cal.c:4007
+#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð??©ð???ð??¡ð??§ð???ð???"
 
-#: ../calendar/libecal/e-cal.c:3734
+#: ../calendar/libecal/e-cal.c:4009
 msgid "URI not loaded"
 msgstr "URI ð??¯ð??ªð??? ð??¤ð??´ð???ð??©ð???"
 
-#: ../calendar/libecal/e-cal.c:3736
+#: ../calendar/libecal/e-cal.c:4011
 msgid "URI already loaded"
 msgstr "URI ð??·ð??¤ð??®ð??§ð???ð??¦ ð??¤ð??´ð???ð??©ð???"
 
-#: ../calendar/libecal/e-cal.c:3738
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
+#: ../calendar/libecal/e-cal.c:4013
+#: ../calendar/libedata-cal/e-cal-backend-util.c:109
 msgid "Permission denied"
 msgstr "ð???ð??»ð??¥ð??¦ð???ð??ªð??¯ ð???ð??¦ð??¯ð??²ð???"
 
-#: ../calendar/libecal/e-cal.c:3740
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
-#: ../servers/groupwise/e-gw-connection.c:235
+#: ../calendar/libecal/e-cal.c:4015
+#: ../calendar/libedata-cal/e-cal-backend-util.c:133
+#: ../servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "ð??³ð??¯ð??´ð??¯ ð??¿ð???ð??¼"
 
-#: ../calendar/libecal/e-cal.c:3742
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../calendar/libecal/e-cal.c:4017
+#: ../calendar/libedata-cal/e-cal-backend-util.c:117
 msgid "Object ID already exists"
 msgstr "ð??©ð???ð??¡ð??§ð???ð??? ID ð??·ð??¤ð??®ð??§ð???ð??¦ ð??§ð???ð???ð??¦ð???ð???ð???"
 
-#: ../calendar/libecal/e-cal.c:3744
+#: ../calendar/libecal/e-cal.c:4019
 msgid "Protocol not supported"
 msgstr "ð???ð??®ð??´ð???ð??©ð???ð??ªð??¤ ð??¯ð??ªð??? ð???ð??©ð???ð??¹ð???ð??©ð???"
 
-#: ../calendar/libecal/e-cal.c:3746
+#: ../calendar/libecal/e-cal.c:4021
 msgid "Operation has been canceled"
 msgstr "ð??ªð???ð??¼ð??±ð???ð??©ð??¯ ð??£ð??¨ð??? ð???ð??°ð??¯ ð???ð??¨ð??¯ð???ð??©ð??¤ð???"
 
-#: ../calendar/libecal/e-cal.c:3748
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
+#: ../calendar/libecal/e-cal.c:4023
+#: ../calendar/libedata-cal/e-cal-backend-util.c:145
 msgid "Could not cancel operation"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??¨ð??¯ð???ð??©ð??¤ ð??ªð???ð??¼ð??±ð???ð??©ð??¯"
 
-#: ../calendar/libecal/e-cal.c:3752
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:217
+#: ../calendar/libecal/e-cal.c:4027
+#: ../calendar/libedata-cal/e-cal-backend-util.c:121
+#: ../camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Authentication required"
 msgstr "ð??·ð???ð??§ð??¯ð???ð??¦ð???ð??±ð???ð??©ð??¯ ð??®ð??¦ð???ð??¢ð??²ð??¼ð???"
 
-#: ../calendar/libecal/e-cal.c:3756
-#: ../calendar/libedata-cal/e-cal-backend-util.c:146
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
-#: ../camel/providers/imap/camel-imap-command.c:432
-#: ../camel/providers/imap/camel-imap-store.c:741
-#: ../camel/providers/imap4/camel-imap4-engine.c:1547
-#: ../camel/providers/imap4/camel-imap4-engine.c:1585
-#: ../camel/providers/imap4/camel-imap4-engine.c:1629
-#: ../camel/providers/imap4/camel-imap4-engine.c:1684
-#: ../camel/providers/imap4/camel-imap4-store.c:311
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-#: ../camel/providers/pop3/camel-pop3-store.c:552
-#: ../camel/providers/pop3/camel-pop3-store.c:559
-#: ../camel/providers/pop3/camel-pop3-store.c:565
-#: ../servers/groupwise/e-gw-connection.c:241
+#, fuzzy
+#: ../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:597
+#: ../camel/providers/pop3/camel-pop3-store.c:593
+#: ../servers/groupwise/e-gw-connection.c:243
 msgid "Unknown error"
 msgstr "ð??³ð??¯ð??´ð??¯ ð??»ð??¼"
 
-#: ../calendar/libecal/e-cal.c:3758
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
+#: ../calendar/libecal/e-cal.c:4033
+#: ../calendar/libedata-cal/e-cal-backend-util.c:105
 msgid "No error"
 msgstr "ð??¯ð??´ ð??»ð??¼"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:67
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:693
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:802
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1023
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1050
 #, c-format
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:695
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:804
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1025
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1052
 msgid "\"%s\" expects no arguments"
 msgstr "\"%s\" ð??¦ð???ð???ð???ð??§ð???ð???ð??? ð??¯ð??´ ð??¸ð???ð??¿ð??¥ð??©ð??¯ð???ð???"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:100
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:210
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:252
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:288
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088
 #, c-format
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:102
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:212
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:290
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1090
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\" ð??¦ð???ð???ð???ð??§ð???ð???ð??? ð??¢ð??³ð??¯ ð??¸ð???ð??¿ð??¥ð??©ð??¯ð???"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:106
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:294
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:735
 #, c-format
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:296
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:737
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "\"%s\" ð??¦ð???ð???ð???ð??§ð???ð???ð??? ð??? ð???ð??»ð???ð??? ð??¸ð???ð??¿ð??¥ð??©ð??¯ð??? ð??? ð???ð??° ð??© ð???ð???ð??®ð??¦ð???"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
 #, c-format
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr "\"%s\" ð??¦ð???ð???ð???ð??§ð???ð???ð??? ð??? ð???ð??»ð???ð??? ð??¸ð???ð??¿ð??¥ð??©ð??¯ð??? ð??? ð???ð??° ð??©ð??¯ ISO 8601 ð???ð??±ð???/ð???ð??²ð??¥ ð???ð???ð??®ð??¦ð???"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:361
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
 #, c-format
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:162
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:363
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:415
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:731
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:864
 msgid "\"%s\" expects two arguments"
 msgstr "\"%s\" ð??¦ð???ð???ð???ð??§ð???ð???ð??? ð???ð??µ ð??¸ð???ð??¿ð??¥ð??©ð??¯ð???ð???"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:216
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:258
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:367
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:419
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1094
 #, c-format
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:168
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:218
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:260
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:369
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:421
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:870
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1096
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "\"%s\" ð??¦ð???ð???ð???ð??§ð???ð???ð??? ð??? ð???ð??»ð???ð??? ð??¸ð???ð??¿ð??¥ð??©ð??¯ð??? ð??? ð???ð??° ð??© time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
 #, c-format
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "\"%s\" ð??¦ð???ð???ð???ð??§ð???ð???ð??? ð??? ð???ð??§ð???ð??©ð??¯ð??? ð??¸ð???ð??¿ð??¥ð??©ð??¯ð??? ð??? ð???ð??° ð??©ð??¯ ð??¦ð??¯ð???ð??©ð??¡ð??¼"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:375
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
 #, c-format
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:377
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:430
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "\"%s\" ð??¦ð???ð???ð???ð??§ð???ð???ð??? ð??? ð???ð??§ð???ð??©ð??¯ð??? ð??¸ð???ð??¿ð??¥ð??©ð??¯ð??? ð??? ð???ð??° ð??© time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:743
 #, c-format
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:745
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "\"%s\" ð??¦ð???ð???ð???ð??§ð???ð???ð??? ð??? ð???ð??§ð???ð??©ð??¯ð??? ð??¸ð???ð??¿ð??¥ð??©ð??¯ð??? ð??? ð???ð??° ð??© ð???ð???ð??®ð??¦ð???"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:773
 #, c-format
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
 "\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
@@ -967,743 +1195,822 @@ msgstr ""
 "\"description\", ð??¹ \"location\", ð??¹ \"attendee\", ð??¹ \"organizer\", ð??¹ "
 "\"classification\""
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:925
 #, c-format
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
 msgid "\"%s\" expects at least one argument"
 msgstr "\"%s\" ð??¦ð???ð???ð???ð??§ð???ð???ð??? ð??¨ð??? ð??¤ð??°ð???ð??? ð??¢ð??³ð??¯ ð??¸ð???ð??¿ð??¥ð??©ð??¯ð???"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:939
 #, c-format
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:941
 msgid ""
-"\"%s\" expects all arguments to be strings or one and only one argument to "
-"be a boolean false (#f)"
+"\"%s\" expects all arguments to be strings or one and only one argument to be "
+"a boolean false (#f)"
 msgstr ""
 "\"%s\" ð??¦ð???ð???ð???ð??§ð???ð???ð??? ð??·ð??¤ ð??¸ð???ð??¿ð??¥ð??©ð??¯ð???ð??? ð??? ð???ð??° ð???ð???ð??®ð??¦ð???ð??? ð??¹ ð??¢ð??³ð??¯ ð??¯ ð??´ð??¯ð??¤ð??¦ ð??¢ð??³ð??¯ ð??¸ð???ð??¿ð??¥ð??©ð??¯ð??? ð??? ð???ð??° ð??© "
 "ð???ð??µð??¤ð??°ð??©ð??¯ ð???ð??·ð??¤ð??? (#f)"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+#: ../calendar/libedata-cal/e-cal-backend-util.c:111
 msgid "Invalid range"
 msgstr "ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð??®ð??±ð??¯ð??¡"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
+#: ../calendar/libedata-cal/e-cal-backend-util.c:123
 msgid "Unsupported field"
 msgstr "ð??³ð??¯ð???ð??©ð???ð??¹ð???ð??©ð??? ð???ð??°ð??¤ð???"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-cal-backend-util.c:125
 msgid "Unsupported method"
 msgstr "ð??³ð??¯ð???ð??©ð???ð??¹ð???ð??©ð??? ð??¥ð??§ð???ð??©ð???"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
+#: ../calendar/libedata-cal/e-cal-backend-util.c:127
 msgid "Unsupported authentication method"
 msgstr "ð??³ð??¯ð???ð??©ð???ð??¹ð???ð??©ð??? ð??·ð???ð??§ð??¯ð???ð??¦ð???ð??±ð???ð??©ð??¯ ð??¥ð??§ð???ð??©ð???"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
+#, fuzzy
+#: ../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:135
+#: ../calendar/libedata-cal/e-cal-backend-util.c:137
 msgid "Search size limit exceeded"
 msgstr "ð???ð??»ð??? ð???ð??²ð??? ð??¤ð??¦ð??¥ð??¦ð??? ð??©ð???ð???ð??°ð???ð??©ð???"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
+#: ../calendar/libedata-cal/e-cal-backend-util.c:139
 msgid "Search time limit exceeded"
 msgstr "ð???ð??»ð??? ð???ð??²ð??¥ ð??¤ð??¦ð??¥ð??¦ð??? ð??©ð???ð???ð??°ð???ð??©ð???"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
+#: ../calendar/libedata-cal/e-cal-backend-util.c:143
 msgid "Query refused"
 msgstr "ð???ð??¢ð??½ð??¦ ð??®ð??¦ð???ð??¿ð???ð???"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
+#: ../calendar/libedata-cal/e-cal-backend-util.c:150
 msgid "Invalid server version"
 msgstr "ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð???ð??»ð???ð??¼ ð???ð??»ð?? ð??©ð??¯"
 
-#: ../calendar/libedata-cal/e-data-cal.c:483
 #, c-format
+#: ../calendar/libedata-cal/e-data-cal.c:501
 msgid "Cannot retrieve calendar address"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð??®ð??¦ð???ð??®ð??°ð??? ð???ð??¨ð??¤ð??©ð??¯ð???ð??¼ ð??©ð???ð??®ð??§ð???"
 
-#: ../calendar/libedata-cal/e-data-cal.c:501
 #, c-format
+#: ../calendar/libedata-cal/e-data-cal.c:519
 msgid "Cannot retrieve calendar alarm e-mail address"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð??®ð??¦ð???ð??®ð??°ð??? ð???ð??¨ð??¤ð??©ð??¯ð???ð??¼ ð??©ð??¤ð??¸ð??¥ ð??§-ð??¥ð??±ð??¤ ð??©ð???ð??®ð??§ð???"
 
-#: ../calendar/libedata-cal/e-data-cal.c:519
 #, c-format
+#: ../calendar/libedata-cal/e-data-cal.c:537
 msgid "Cannot retrieve calendar's ldap attribute"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð??®ð??¦ð???ð??®ð??°ð??? ð???ð??¨ð??¤ð??©ð??¯ð???ð??¼'ð??? LDAP ð??©ð???ð??®ð??¦ð???ð??¿ð???"
 
-#: ../calendar/libedata-cal/e-data-cal.c:537
 #, c-format
+#: ../calendar/libedata-cal/e-data-cal.c:555
 msgid "Cannot retrieve calendar scheduling information"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð??®ð??¦ð???ð??®ð??°ð??? ð???ð??¨ð??¤ð??©ð??¯ð???ð??¼ ð???ð??§ð???ð??¿ð??¤ð??¦ð??? ð??¦ð??¯ð???ð??¼ð??¥ð??±ð???ð??©ð??¯"
 
-#: ../calendar/libedata-cal/e-data-cal.c:554
 #, c-format
+#: ../calendar/libedata-cal/e-data-cal.c:572
 msgid "Cannot open calendar"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð??´ð???ð??©ð??¯ ð???ð??¨ð??¤ð??©ð??¯ð???ð??¼"
 
-#: ../calendar/libedata-cal/e-data-cal.c:571
+#, fuzzy, c-format
+#: ../calendar/libedata-cal/e-data-cal.c:591
+msgid "Cannot refresh calendar"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð??®ð??¦ð??¥ð??µð??? ð???ð??¨ð??¤ð??©ð??¯ð???ð??¼"
+
 #, c-format
+#: ../calendar/libedata-cal/e-data-cal.c:608
 msgid "Cannot remove calendar"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð??®ð??¦ð??¥ð??µð??? ð???ð??¨ð??¤ð??©ð??¯ð???ð??¼"
 
-#: ../calendar/libedata-cal/e-data-cal.c:590
 #, c-format
+#: ../calendar/libedata-cal/e-data-cal.c:627
 msgid "Cannot create calendar object"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð???ð??¨ð??¤ð??©ð??¯ð???ð??¼ ð??©ð???ð??¡ð??§ð???ð???"
 
-#: ../calendar/libedata-cal/e-data-cal.c:636
+#, fuzzy, c-format
+#: ../calendar/libedata-cal/e-data-cal.c:649
+msgid "Cannot modify calendar object"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð??®ð??¦ð??¥ð??µð??? ð???ð??¨ð??¤ð??©ð??¯ð???ð??¼ ð??©ð???ð??¡ð??§ð???ð???"
+
 #, c-format
+#: ../calendar/libedata-cal/e-data-cal.c:673
 msgid "Cannot remove calendar object"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð??®ð??¦ð??¥ð??µð??? ð???ð??¨ð??¤ð??©ð??¯ð???ð??¼ ð??©ð???ð??¡ð??§ð???ð???"
 
-#: ../calendar/libedata-cal/e-data-cal.c:655
 #, c-format
+#: ../calendar/libedata-cal/e-data-cal.c:692
 msgid "Cannot receive calendar objects"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð??®ð??¦ð???ð??°ð??? ð???ð??¨ð??¤ð??©ð??¯ð???ð??¼ ð??ªð???ð??¡ð??§ð???ð???ð???"
 
-#: ../calendar/libedata-cal/e-data-cal.c:672
 #, c-format
+#: ../calendar/libedata-cal/e-data-cal.c:709
 msgid "Cannot discard calendar alarm"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??¦ð???ð???ð??­ð??®ð??? ð???ð??¨ð??¤ð??©ð??¯ð???ð??¼ ð??©ð??¤ð??¸ð??¥"
 
-#: ../calendar/libedata-cal/e-data-cal.c:691
 #, c-format
+#: ../calendar/libedata-cal/e-data-cal.c:728
 msgid "Cannot send calendar objects"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??¯ð??? ð???ð??¨ð??¤ð??©ð??¯ð???ð??¼ ð??ªð???ð??¡ð??§ð???ð???ð???"
 
-#: ../calendar/libedata-cal/e-data-cal.c:726
 #, c-format
+#: ../calendar/libedata-cal/e-data-cal.c:763
 msgid "Cannot retrieve default calendar object path"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð??®ð??¦ð???ð??®ð??°ð??? ð???ð??¦ð???ð??·ð??¤ð??? ð???ð??¨ð??¤ð??©ð??¯ð???ð??¼ ð??©ð???ð??¡ð??§ð???ð??? ð???ð??­ð???"
 
-#: ../calendar/libedata-cal/e-data-cal.c:744
 #, c-format
+#: ../calendar/libedata-cal/e-data-cal.c:781
 msgid "Cannot retrieve calendar object path"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð??®ð??¦ð???ð??®ð??°ð??? ð???ð??¨ð??¤ð??©ð??¯ð???ð??¼ ð??©ð???ð??¡ð??§ð???ð??? ð???ð??­ð???"
 
-#: ../calendar/libedata-cal/e-data-cal.c:762
 #, c-format
+#: ../calendar/libedata-cal/e-data-cal.c:799
 msgid "Cannot retrieve calendar object list"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð??®ð??¦ð???ð??®ð??°ð??? ð???ð??¨ð??¤ð??©ð??¯ð???ð??¼ ð??©ð???ð??¡ð??§ð???ð??? ð??¤ð??¦ð???ð???"
 
-#: ../calendar/libedata-cal/e-data-cal.c:800
 #, c-format
+#: ../calendar/libedata-cal/e-data-cal.c:837
 msgid "Could not retrieve attachment list"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??®ð??¦ð???ð??®ð??°ð??? ð??©ð???ð??¨ð???ð??¥ð??©ð??¯ð??? ð??¤ð??¦ð???ð???"
 
-#: ../calendar/libedata-cal/e-data-cal.c:822
 #, c-format
+#: ../calendar/libedata-cal/e-data-cal.c:859
 msgid "Could not complete calendar query"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??©ð??¥ð???ð??¤ð??°ð??? ð???ð??¨ð??¤ð??©ð??¯ð???ð??¼ ð???ð??¢ð??½ð??¦"
 
-#: ../calendar/libedata-cal/e-data-cal.c:840
 #, c-format
+#: ../calendar/libedata-cal/e-data-cal.c:877
 msgid "Could not retrieve calendar time zone"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??®ð??¦ð???ð??®ð??°ð??? ð???ð??¨ð??¤ð??©ð??¯ð???ð??¼ ð???ð??²ð??¥ ð???ð??´ð??¯"
 
-#: ../calendar/libedata-cal/e-data-cal.c:858
 #, c-format
+#: ../calendar/libedata-cal/e-data-cal.c:895
 msgid "Could not add calendar time zone"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??¨ð??? ð???ð??¨ð??¤ð??©ð??¯ð???ð??¼ ð???ð??²ð??¥ ð???ð??´ð??¯"
 
-#: ../calendar/libedata-cal/e-data-cal.c:875
 #, c-format
+#: ../calendar/libedata-cal/e-data-cal.c:912
 msgid "Could not set default calendar time zone"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??§ð??? ð???ð??¦ð???ð??·ð??¤ð??? ð???ð??¨ð??¤ð??©ð??¯ð???ð??¼ ð???ð??²ð??¥ ð???ð??´ð??¯"
 
-#: ../calendar/libedata-cal/e-data-cal.c:896
 #, c-format
+#: ../calendar/libedata-cal/e-data-cal.c:933
 msgid "Cannot retrieve calendar changes"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð??®ð??¦ð???ð??®ð??°ð??? ð???ð??¨ð??¤ð??©ð??¯ð???ð??¼ ð???ð??±ð??¯ð??¡ð??©ð???"
 
-#: ../calendar/libedata-cal/e-data-cal.c:946
 #, c-format
+#: ../calendar/libedata-cal/e-data-cal.c:983
 msgid "Cannot retrieve calendar free/busy list"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð??®ð??¦ð???ð??®ð??°ð??? ð???ð??¨ð??¤ð??©ð??¯ð???ð??¼ ð???ð??®ð??°/ð???ð??¦ð???ð??° ð??¤ð??¦ð???ð???"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:339
 #, c-format
+#: ../calendar/libedata-cal/e-data-cal-factory.c:339
 msgid "Invalid URI"
 msgstr "ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? URI"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:350
 #, c-format
+#: ../calendar/libedata-cal/e-data-cal-factory.c:350
 msgid "No backend factory for '%s' of '%s'"
 msgstr "ð??¯ð??´ ð???ð??¨ð???ð??§ð??¯ð??? ð???ð??¨ð???ð???ð??¼ð??¦ ð???ð??¹ '%s' ð??? '%s'"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:390
 #, c-format
+#: ../calendar/libedata-cal/e-data-cal-factory.c:390
 msgid "Could not instantiate backend"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??¦ð??¯ð???ð???ð??¨ð??¯ð???ð??°ð??±ð??? ð???ð??¨ð???ð??§ð??¯ð???"
 
-#: ../camel/camel-cipher-context.c:102
+#: ../camel/camel-cipher-context.c:74
 msgid "Signing is not supported by this cipher"
 msgstr "ð???ð??²ð??¯ð??¦ð??? ð??¦ð??? ð??¯ð??ªð??? ð???ð??©ð???ð??¹ð???ð??©ð??? ð???ð??² ð???ð??¦ð??? ð???ð??²ð???ð??¼"
 
-#: ../camel/camel-cipher-context.c:128
+#: ../camel/camel-cipher-context.c:109
 msgid "Signing message"
 msgstr "ð???ð??²ð??¯ð??¦ð??? ð??¥ð??§ð???ð??¦ð??¡"
 
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:129
 msgid "Verifying is not supported by this cipher"
 msgstr "ð???ð??§ð??®ð??¦ð???ð??²ð??¦ð??? ð??¦ð??? ð??¯ð??ªð??? ð???ð??©ð???ð??¹ð???ð??©ð??? ð???ð??² ð???ð??¦ð??? ð???ð??²ð???ð??¼"
 
-#: ../camel/camel-cipher-context.c:171
+#: ../camel/camel-cipher-context.c:162
 msgid "Verifying message"
 msgstr "ð???ð??§ð??®ð??¦ð???ð??²ð??¦ð??? ð??¥ð??§ð???ð??¦ð??¡"
 
-#: ../camel/camel-cipher-context.c:189
+#: ../camel/camel-cipher-context.c:185
 msgid "Encryption is not supported by this cipher"
 msgstr "ð??¦ð??¯ð???ð??®ð??¦ð???ð???ð??©ð??¯ ð??¦ð??? ð??¯ð??ªð??? ð???ð??©ð???ð??¹ð???ð??©ð??? ð???ð??² ð???ð??¦ð??? ð???ð??²ð???ð??¼"
 
-#: ../camel/camel-cipher-context.c:215
+#: ../camel/camel-cipher-context.c:220
 msgid "Encrypting message"
 msgstr "ð??¦ð??¯ð???ð??®ð??¦ð???ð???ð??¦ð??? ð??¥ð??§ð???ð??¦ð??¡"
 
-#: ../camel/camel-cipher-context.c:254
+#, fuzzy
+#: ../camel/camel-cipher-context.c:242
+msgid "Decryption is not supported by this cipher"
+msgstr "Decryption ð??¦ð??? ð??¯ð??ªð??? ð???ð??©ð???ð??¹ð???ð??©ð??? ð???ð??² ð???ð??¦ð??? ð???ð??²ð???ð??¼"
+
+#: ../camel/camel-cipher-context.c:272
 msgid "Decrypting message"
 msgstr "ð???ð??¦ð???ð??®ð??¦ð???ð???ð??¦ð??? ð??¥ð??§ð???ð??¦ð??¡"
 
-#: ../camel/camel-cipher-context.c:271
+#: ../camel/camel-cipher-context.c:292
 msgid "You may not import keys with this cipher"
 msgstr "ð??¿ ð??¥ð??± ð??¯ð??ªð??? ð??¦ð??¥ð???ð??¹ð??? ð???ð??°ð??? ð??¢ð??¦ð??? ð???ð??¦ð??? ð???ð??²ð???ð??¼"
 
-#: ../camel/camel-cipher-context.c:301
+#: ../camel/camel-cipher-context.c:332
 msgid "You may not export keys with this cipher"
 msgstr "ð??¿ ð??¥ð??± ð??¯ð??ªð??? ð??§ð???ð???ð???ð??¹ð??? ð???ð??°ð??? ð??¢ð??¦ð??? ð???ð??¦ð??? ð???ð??²ð???ð??¼"
 
-#: ../camel/camel-data-cache.c:136
+#: ../camel/camel-data-cache.c:184
 msgid "Unable to create cache path"
 msgstr "ð??³ð??¯ð??±ð???ð??©ð??¤ ð??? ð???ð??®ð??¦ð??±ð??? ð???ð??¨ð??? ð???ð??­ð???"
 
-#: ../camel/camel-data-cache.c:402
 #, c-format
+#: ../camel/camel-data-cache.c:494
 msgid "Could not remove cache entry: %s: %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??®ð??¦ð??¥ð??µð??? ð???ð??¨ð??? ð??§ð??¯ð???ð??®ð??¦: %s: %s"
 
-#: ../camel/camel-db.c:411
+#: ../camel/camel-db.c:458
 msgid "Insufficient memory"
 msgstr "ð??¦ð??¯ð???ð??©ð???ð??¦ð???ð??©ð??¯ð??? ð??¥ð??§ð??¥ð??¼ð??¦"
 
-#: ../camel/camel-disco-diary.c:197
 #, c-format
+#: ../camel/camel-disco-diary.c:195
 msgid ""
-"Could not write log entry: %s\n"
-"Further operations on this server will not be replayed when you\n"
-"reconnect to the network."
+"Could not write log entry: %s\nFurther operations on this server will not be "
+"replayed when you\nreconnect to the network."
 msgstr ""
-"ð???ð??«ð??? ð??¯ð??ªð??? ð??®ð??²ð??? ð??¤ð??ªð??? ð??§ð??¯ð???ð??®ð??¦: %s\n"
-"ð???ð??»ð???ð??¼ ð??ªð???ð??¼ð??±ð???ð??©ð??¯ð??? ð??ªð??¯ ð???ð??¦ð??? ð???ð??»ð???ð??¼ ð??¢ð??¦ð??¤ ð??¯ð??ªð??? ð???ð??° ð??®ð??°ð???ð??¤ð??±ð??? ð??¢ð??§ð??¯ ð??¿\n"
-"ð??®ð??°ð???ð??©ð??¯ð??§ð???ð??? ð??? ð??? ð??¯ð??§ð???ð??¢ð??»ð???."
+"ð???ð??«ð??? ð??¯ð??ªð??? ð??®ð??²ð??? ð??¤ð??ªð??? ð??§ð??¯ð???ð??®ð??¦: %s\nð???ð??»ð???ð??¼ ð??ªð???ð??¼ð??±ð???ð??©ð??¯ð??? ð??ªð??¯ ð???ð??¦ð??? ð???ð??»ð???ð??¼ ð??¢ð??¦ð??¤ ð??¯ð??ªð??? ð???ð??° ð??®ð??°ð???ð??¤ð??±ð??? ð??¢ð??§ð??¯ "
+"ð??¿\nð??®ð??°ð???ð??©ð??¯ð??§ð???ð??? ð??? ð??? ð??¯ð??§ð???ð??¢ð??»ð???."
 
-#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:51
-msgid "Copy folder content locally for offline operation"
-msgstr "ð???ð??ªð???ð??¦ ð???ð??´ð??¤ð???ð??¼ ð???ð??ªð??¯ð???ð??§ð??¯ð??? ð??¤ð??´ð???ð??©ð??¤ð??¦ ð???ð??¹ ð??ªð???ð??¤ð??²ð??¯ ð??ªð???ð??¼ð??±ð???ð??©ð??¯"
+#, fuzzy, c-format
+#: ../camel/camel-disco-diary.c:259
+#: ../camel/providers/imap/camel-imap-journal.c:299
+msgid ""
+"Could not open '%s':\n%s\nChanges made to this folder will not be "
+"resynchronized."
+msgstr ""
+"ð???ð??«ð??? ð??¯ð??ªð??? ð??´ð???ð??©ð??¯ '%s':\n%s\nð???ð??±ð??¯ð??¡ð??©ð??? ð??¥ð??±ð??? ð??? ð???ð??¦ð??? ð???ð??´ð??¤ð???ð??¼ ð??¢ð??¦ð??¤ ð??¯ð??ªð??? ð???ð??° resynchronized."
 
-#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:107
+#, fuzzy
+#: ../camel/camel-disco-diary.c:299
+msgid "Resynchronizing with server"
+msgstr "Resynchronizing ð??¢ð??¦ð??? ð???ð??»ð???ð??¼"
+
+#: ../camel/camel-disco-folder.c:68 ../camel/camel-offline-folder.c:66
 msgid "Downloading new messages for offline mode"
 msgstr "ð???ð??¬ð??¯ð??¤ð??´ð???ð??¦ð??? ð??¯ð??¿ ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? ð???ð??¹ ð??ªð???ð??¤ð??²ð??¯ ð??¥ð??´ð???"
 
-#: ../camel/camel-disco-folder.c:466
 #, c-format
+#: ../camel/camel-disco-folder.c:346
 msgid "Preparing folder '%s' for offline"
 msgstr "ð???ð??®ð??°ð???ð??ºð??¦ð??? ð???ð??´ð??¤ð???ð??¼ '%s' ð???ð??¹ ð??ªð???ð??¤ð??²ð??¯"
 
-#: ../camel/camel-disco-store.c:400
-#: ../camel/providers/groupwise/camel-groupwise-store.c:223
-#: ../camel/providers/imap/camel-imap-store.c:1001
-#: ../camel/providers/imap/camel-imap-store.c:1843
-#: ../camel/providers/imap/camel-imap-store.c:2259
-#: ../camel/providers/imap/camel-imap-store.c:3051
+#: ../camel/camel-disco-folder.c:412 ../camel/camel-offline-folder.c:225
+msgid "Copy folder content locally for offline operation"
+msgstr "ð???ð??ªð???ð??¦ ð???ð??´ð??¤ð???ð??¼ ð???ð??ªð??¯ð???ð??§ð??¯ð??? ð??¤ð??´ð???ð??©ð??¤ð??¦ ð???ð??¹ ð??ªð???ð??¤ð??²ð??¯ ð??ªð???ð??¼ð??±ð???ð??©ð??¯"
+
+#: ../camel/camel-disco-store.c:376
+#: ../camel/providers/groupwise/camel-groupwise-store.c:228
+#: ../camel/providers/imap/camel-imap-store.c:860
+#: ../camel/providers/imap/camel-imap-store.c:1720
+#: ../camel/providers/imap/camel-imap-store.c:2178
+#: ../camel/providers/imap/camel-imap-store.c:3010
+#: ../camel/providers/imapx/camel-imapx-store.c:172
+#: ../camel/providers/imapx/camel-imapx-store.c:651
+#: ../camel/providers/imapx/camel-imapx-store.c:713
+#: ../camel/providers/imapx/camel-imapx-store.c:764
 msgid "You must be working online to complete this operation"
 msgstr "ð??¿ ð??¥ð??³ð???ð??? ð???ð??° ð??¢ð??»ð???ð??¦ð??? ð??ªð??¯ð??¤ð??²ð??¯ ð??? ð???ð??©ð??¥ð???ð??¤ð??°ð??? ð???ð??¦ð??? ð??ªð???ð??¼ð??±ð???ð??©ð??¯"
 
-#: ../camel/camel-exception.c:260
+#: ../camel/camel-exception.c:281
 msgid "No description available"
 msgstr "ð??¯ð??´ ð???ð??¦ð???ð???ð??®ð??¦ð???ð???ð??©ð??¯ ð??©ð???ð??±ð??¤ð??©ð???ð??©ð??¤"
 
-#: ../camel/camel-filter-driver.c:794 ../camel/camel-filter-search.c:579
 #, c-format
+#: ../camel/camel-filter-driver.c:803 ../camel/camel-filter-search.c:583
 msgid "Failed to create child process '%s': %s"
 msgstr "ð???ð??±ð??¤ð??? ð??? ð???ð??®ð??¦ð??±ð??? ð???ð??²ð??¤ð??? ð???ð??®ð??´ð???ð??§ð??? '%s': %s"
 
-#: ../camel/camel-filter-driver.c:836
 #, c-format
+#: ../camel/camel-filter-driver.c:846
 msgid "Invalid message stream received from %s: %s"
 msgstr "ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð??¥ð??§ð???ð??¦ð??¡ ð???ð???ð??®ð??°ð??¥ ð??®ð??¦ð???ð??°ð???ð??? ð???ð??®ð??ªð??¥ %s: %s"
 
-#: ../camel/camel-filter-driver.c:1121 ../camel/camel-filter-driver.c:1522
+#, fuzzy
+#: ../camel/camel-filter-driver.c:1035 ../camel/camel-filter-driver.c:1044
+msgid "Syncing folders"
+msgstr "Syncing ð???ð??´ð??¤ð???ð??¼ð???"
+
 #, c-format
+#: ../camel/camel-filter-driver.c:1132 ../camel/camel-filter-driver.c:1559
 msgid "Error parsing filter: %s: %s"
 msgstr "ð??»ð??¼ ð???ð??¸ð???ð??¦ð??? ð???ð??¦ð??¤ð???ð??¼: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1130 ../camel/camel-filter-driver.c:1531
 #, c-format
+#: ../camel/camel-filter-driver.c:1142 ../camel/camel-filter-driver.c:1569
 msgid "Error executing filter: %s: %s"
 msgstr "ð??»ð??¼ ð??§ð???ð???ð??©ð???ð??¿ð???ð??¦ð??? ð???ð??¦ð??¤ð???ð??¼: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1216
+#: ../camel/camel-filter-driver.c:1234
 msgid "Unable to open spool folder"
 msgstr "ð??³ð??¯ð??±ð???ð??©ð??¤ ð??? ð??´ð???ð??©ð??¯ ð???ð???ð??µð??¤ ð???ð??´ð??¤ð???ð??¼"
 
-#: ../camel/camel-filter-driver.c:1225
+#: ../camel/camel-filter-driver.c:1245
 msgid "Unable to process spool folder"
 msgstr "ð??³ð??¯ð??±ð???ð??©ð??¤ ð??? ð???ð??®ð??´ð???ð??§ð??? ð???ð???ð??µð??¤ ð???ð??´ð??¤ð???ð??¼"
 
-#: ../camel/camel-filter-driver.c:1241
 #, c-format
+#: ../camel/camel-filter-driver.c:1262
 msgid "Getting message %d (%d%%)"
 msgstr "ð???ð??§ð???ð??¦ð??? ð??¥ð??§ð???ð??¦ð??¡ %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1245
+#: ../camel/camel-filter-driver.c:1268
 msgid "Cannot open message"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð??´ð???ð??©ð??¯ ð??¥ð??§ð???ð??¦ð??¡"
 
-#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1264
 #, c-format
+#: ../camel/camel-filter-driver.c:1269 ../camel/camel-filter-driver.c:1290
 msgid "Failed on message %d"
 msgstr "ð???ð??±ð??¤ð??? ð??ªð??¯ ð??¥ð??§ð???ð??¦ð??¡ %d"
 
-#: ../camel/camel-filter-driver.c:1282 ../camel/camel-filter-driver.c:1373
+#, fuzzy
+#: ../camel/camel-filter-driver.c:1304 ../camel/camel-filter-driver.c:1401
+msgid "Syncing folder"
+msgstr "Syncing ð???ð??´ð??¤ð???ð??¼"
+
+#: ../camel/camel-filter-driver.c:1308 ../camel/camel-filter-driver.c:1406
 msgid "Complete"
 msgstr "ð???ð??©ð??¥ð???ð??¤ð??°ð???"
 
-#: ../camel/camel-filter-driver.c:1338
 #, c-format
+#: ../camel/camel-filter-driver.c:1368
 msgid "Getting message %d of %d"
 msgstr "ð???ð??§ð???ð??¦ð??? ð??¥ð??§ð???ð??¦ð??¡ %d ð??? %d"
 
-#: ../camel/camel-filter-driver.c:1353
 #, c-format
+#: ../camel/camel-filter-driver.c:1386
 msgid "Failed at message %d of %d"
 msgstr "ð???ð??±ð??¤ð??? ð??¨ð??? ð??¥ð??§ð???ð??¦ð??¡ %d ð??? %d"
 
-#: ../camel/camel-filter-search.c:137
+#: ../camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "ð???ð??±ð??¤ð??? ð??? ð??®ð??¦ð???ð??®ð??°ð??? ð??¥ð??§ð???ð??¦ð??¡"
 
-#: ../camel/camel-filter-search.c:399
+#: ../camel/camel-filter-search.c:402
 msgid "Invalid arguments to (system-flag)"
 msgstr "ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð??¸ð???ð??¿ð??¥ð??©ð??¯ð???ð??? ð??? (ð???ð??¦ð???ð???ð??©ð??¥-ð???ð??¤ð??¨ð???)"
 
-#: ../camel/camel-filter-search.c:414
+#: ../camel/camel-filter-search.c:417
 msgid "Invalid arguments to (user-tag)"
 msgstr "ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð??¸ð???ð??¿ð??¥ð??©ð??¯ð???ð??? ð??? (ð??¿ð???ð??¼-ð???ð??¨ð???)"
 
-#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:735 ../camel/camel-filter-search.c:743
 #, c-format
+#: ../camel/camel-filter-search.c:742 ../camel/camel-filter-search.c:751
 msgid "Error executing filter search: %s: %s"
 msgstr "ð??»ð??¼ ð??§ð???ð???ð??©ð???ð??¿ð???ð??¦ð??? ð???ð??¦ð??¤ð???ð??¼ ð???ð??»ð???: %s: %s"
 
-#: ../camel/camel-folder-search.c:351 ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:608
 #, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"ð???ð??¨ð??¯ð??ªð??? ð???ð??¸ð??? ð???ð??»ð??? ð??¦ð???ð???ð???ð??®ð??§ð???ð??©ð??¯: %s:\n"
-"%s"
+#: ../camel/camel-folder-search.c:346 ../camel/camel-folder-search.c:458
+#: ../camel/camel-folder-search.c:628
+msgid "Cannot parse search expression: %s:\n%s"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??¸ð??? ð???ð??»ð??? ð??¦ð???ð???ð???ð??®ð??§ð???ð??©ð??¯: %s:\n%s"
 
-#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:463
-#: ../camel/camel-folder-search.c:618
 #, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"ð??»ð??¼ ð??§ð???ð???ð??©ð???ð??¿ð???ð??¦ð??? ð???ð??»ð??? ð??¦ð???ð???ð???ð??®ð??§ð???ð??©ð??¯: %s:\n"
-"%s"
+#: ../camel/camel-folder-search.c:359 ../camel/camel-folder-search.c:471
+#: ../camel/camel-folder-search.c:641
+msgid "Error executing search expression: %s:\n%s"
+msgstr "ð??»ð??¼ ð??§ð???ð???ð??©ð???ð??¿ð???ð??¦ð??? ð???ð??»ð??? ð??¦ð???ð???ð???ð??®ð??§ð???ð??©ð??¯: %s:\n%s"
+
+#, fuzzy, c-format
+#: ../camel/camel-folder-search.c:841 ../camel/camel-folder-search.c:883
+msgid "(%s) requires a single bool result"
+msgstr "(%s) ð??®ð??¦ð???ð??¢ð??²ð??¼ð??? ð??? ð???ð??´ð??¤ð???ð??¼ ð???ð??§ð???"
 
-#: ../camel/camel-folder-search.c:905
 #, c-format
+#: ../camel/camel-folder-search.c:936
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) ð??¯ð??ªð??? ð??©ð??¤ð??¬ð??? ð??¦ð??¯ð???ð??²ð??? %s"
 
-#: ../camel/camel-folder-search.c:911 ../camel/camel-folder-search.c:918
 #, c-format
+#: ../camel/camel-folder-search.c:942 ../camel/camel-folder-search.c:949
 msgid "(%s) requires a match type string"
 msgstr "(%s) ð??®ð??¦ð???ð??¢ð??²ð??¼ð??? ð??© ð??¥ð??¨ð??? ð???ð??²ð??? ð???ð???ð??®ð??¦ð???"
 
-#: ../camel/camel-folder-search.c:945
 #, c-format
+#: ../camel/camel-folder-search.c:976
 msgid "(%s) expects an array result"
 msgstr "(%s) ð??¦ð???ð???ð???ð??§ð???ð???ð??? ð??©ð??¯ ð??¼ð??± ð??®ð??¦ð???ð??³ð??¤ð???"
 
-#: ../camel/camel-folder-search.c:954
 #, c-format
+#: ../camel/camel-folder-search.c:985
 msgid "(%s) requires the folder set"
 msgstr "(%s) ð??®ð??¦ð???ð??¢ð??²ð??¼ð??? ð??? ð???ð??´ð??¤ð???ð??¼ ð???ð??§ð???"
 
-#: ../camel/camel-folder.c:669
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "ð??³ð??¯ð???ð??©ð???ð??¹ð???ð??©ð??? ð??ªð???ð??¼ð??±ð???ð??©ð??¯: ð??©ð???ð??§ð??¯ð??? ð??¥ð??§ð???ð??¦ð??¡: ð???ð??¹ %s"
-
-#: ../camel/camel-folder.c:1374
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "ð??³ð??¯ð???ð??©ð???ð??¹ð???ð??©ð??? ð??ªð???ð??¼ð??±ð???ð??©ð??¯: ð???ð??»ð??? ð???ð??² ð??¦ð???ð???ð???ð??®ð??§ð???ð??©ð??¯: ð???ð??¹ %s"
-
-#: ../camel/camel-folder.c:1415
-#, c-format
-msgid "Unsupported operation: count by expression: for %s"
-msgstr "ð??³ð??¯ð???ð??©ð???ð??¹ð???ð??©ð??? ð??ªð???ð??¼ð??±ð???ð??©ð??¯: ð???ð??¬ð??¯ð??? ð???ð??² ð??¦ð???ð???ð???ð??®ð??§ð???ð??©ð??¯: ð???ð??¹ %s"
-
-#: ../camel/camel-folder.c:1567
-#: ../camel/providers/local/camel-maildir-folder.c:387
+#, fuzzy, c-format
+#: ../camel/camel-folder.c:126
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "ð???ð???ð??¨ð??¯ð??¦ð??? ð???ð??¹ ð???ð??±ð??¯ð??¡ð??? ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? ð??¦ð??¯ %s"
+msgstr[1] "ð???ð???ð??¨ð??¯ð??¦ð??? ð???ð??¹ ð???ð??±ð??¯ð??¡ð??? ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? ð??¦ð??¯ %s"
+
+#, fuzzy, c-format
+#: ../camel/camel-folder.c:149
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "ð???ð???ð??¨ð??¯ð??¦ð??? ð???ð??¹ ð???ð??±ð??¯ð??¡ð??? ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? ð??¦ð??¯ %s"
+msgstr[1] "ð???ð???ð??¨ð??¯ð??¦ð??? ð???ð??¹ ð???ð??±ð??¯ð??¡ð??? ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? ð??¦ð??¯ %s"
+
+#, fuzzy, c-format
+#: ../camel/camel-folder.c:174
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "ð???ð??¦ð??¤ð???ð??¼ð??¦ð??? ð??¯ð??¿ ð??¥ð??§ð???ð??¦ð??¡(ð??§ð???)"
+msgstr[1] "ð???ð??¦ð??¤ð???ð??¼ð??¦ð??? ð??¯ð??¿ ð??¥ð??§ð???ð??¦ð??¡(ð??§ð???)"
+
+#: ../camel/camel-folder.c:689
+#: ../camel/providers/local/camel-maildir-folder.c:375
 msgid "Moving messages"
 msgstr "ð??¥ð??µð???ð??¦ð??? ð??¥ð??§ð???ð??¦ð??¡ð??©ð???"
 
-#: ../camel/camel-folder.c:1567
+#: ../camel/camel-folder.c:691
 msgid "Copying messages"
 msgstr "ð???ð??ªð???ð??¦ð??¦ð??? ð??¥ð??§ð???ð??¦ð??¡ð??©ð???"
 
-#: ../camel/camel-folder.c:1908
-msgid "Learning junk"
-msgstr "ð??¤ð??»ð??¯ð??¦ð??? ð??¡ð??©ð???ð???"
+#, c-format
+#: ../camel/camel-gpg-context.c:740
+msgid "Unexpected GnuPG status message encountered:\n\n%s"
+msgstr "ð??³ð??¯ð??¦ð???ð???ð???ð??§ð???ð???ð??©ð??? GnuPG ð???ð???ð??±ð???ð??«ð??? ð??¥ð??§ð???ð??¦ð??¡ ð??¦ð??¯ð???ð??¶ð??¯ð???ð??»ð???:\n\n%s"
 
-#: ../camel/camel-folder.c:1925
-msgid "Learning non-junk"
-msgstr "ð??¤ð??»ð??¯ð??¦ð??? ð??¯ð??ªð??¯-ð??¡ð??©ð???ð???"
+#, fuzzy
+#: ../camel/camel-gpg-context.c:757
+msgid "Failed to parse gpg userid hint."
+msgstr "ð???ð??±ð??¤ð??? ð??? ð???ð??¸ð??? gpg userid ð??£ð??¦ð??¯ð???."
 
-#: ../camel/camel-folder.c:1944
-msgid "Filtering new message(s)"
-msgstr "ð???ð??¦ð??¤ð???ð??¼ð??¦ð??? ð??¯ð??¿ ð??¥ð??§ð???ð??¦ð??¡(ð??§ð???)"
+#, fuzzy
+#: ../camel/camel-gpg-context.c:782 ../camel/camel-gpg-context.c:797
+msgid "Failed to parse gpg passphrase request."
+msgstr "ð???ð??±ð??¤ð??? ð??? ð???ð??¸ð??? gpg passphrase ð??®ð??¦ð???ð??¢ð??§ð???ð???."
 
-#: ../camel/camel-gpg-context.c:752
 #, c-format
-msgid ""
-"Unexpected GnuPG status message encountered:\n"
-"\n"
-"%s"
-msgstr ""
-"ð??³ð??¯ð??¦ð???ð???ð???ð??§ð???ð???ð??©ð??? GnuPG ð???ð???ð??±ð???ð??«ð??? ð??¥ð??§ð???ð??¦ð??¡ ð??¦ð??¯ð???ð??¶ð??¯ð???ð??»ð???:\n"
-"\n"
-"%s"
+#: ../camel/camel-gpg-context.c:817
+msgid "You need a PIN to unlock the key for your\nSmartCard: \"%s\""
+msgstr "ð??¿ ð??¯ð??°ð??? ð??© PIN ð??? ð??©ð??¯ð??¤ð??­ð??? ð??? ð???ð??° ð???ð??¹ ð??¿ð??¼\nð???ð??¥ð??­ð??®ð???ð???ð??­ð??®ð???: \"%s\""
 
-#: ../camel/camel-gpg-context.c:825
-#, c-format
-msgid ""
-"You need a PIN to unlock the key for your\n"
-"SmartCard: \"%s\""
-msgstr ""
-"ð??¿ ð??¯ð??°ð??? ð??© PIN ð??? ð??©ð??¯ð??¤ð??­ð??? ð??? ð???ð??° ð???ð??¹ ð??¿ð??¼\n"
-"ð???ð??¥ð??­ð??®ð???ð???ð??­ð??®ð???: \"%s\""
+#, fuzzy, c-format
+#: ../camel/camel-gpg-context.c:821
+msgid "You need a passphrase to unlock the key for\nuser: \"%s\""
+msgstr "ð??¿ ð??¯ð??°ð??? ð??© PIN ð??? ð??©ð??¯ð??¤ð??­ð??? ð??? ð???ð??° ð???ð??¹ ð??¿ð??¼\nð???ð??¥ð??­ð??®ð???ð???ð??­ð??®ð???: \"%s\""
 
-#: ../camel/camel-gpg-context.c:834
 #, c-format
+#: ../camel/camel-gpg-context.c:827
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "ð??³ð??¯ð??¦ð???ð???ð???ð??§ð???ð???ð??©ð??? ð??®ð??¦ð???ð??¢ð??§ð???ð??? ð???ð??®ð??ªð??¥ GnuPG ð???ð??¹ '%s'"
 
-#: ../camel/camel-gpg-context.c:859 ../camel/camel-gpg-context.c:1068
-#: ../camel/providers/nntp/camel-nntp-store.c:1313
+#: ../camel/camel-gpg-context.c:855 ../camel/camel-gpg-context.c:1107
 msgid "Canceled."
 msgstr "ð???ð??¨ð??¯ð???ð??©ð??¤ð???."
 
-#: ../camel/camel-gpg-context.c:881
+#, fuzzy
+#: ../camel/camel-gpg-context.c:870
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr "ð???ð??±ð??¤ð??? ð??? ð??©ð??¯ð??¤ð??­ð??? ð???ð??°ð???ð??®ð??©ð??? ð???ð??°: 3 ð???ð??¨ð??? passphrases ð???ð??¦ð???ð??©ð??¯."
+
 #, c-format
+#: ../camel/camel-gpg-context.c:882
 msgid "Unexpected response from GnuPG: %s"
 msgstr "ð??³ð??¯ð??¦ð???ð???ð???ð??§ð???ð???ð??©ð??? ð??®ð??¦ð???ð???ð??ªð??¯ð??? ð???ð??®ð??ªð??¥ GnuPG: %s"
 
-#: ../camel/camel-gpg-context.c:944
+#: ../camel/camel-gpg-context.c:982
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "ð???ð??±ð??¤ð??? ð??? ð??¦ð??¯ð???ð??®ð??¦ð???ð???: ð??¯ð??´ ð???ð??¨ð??¤ð??¦ð??? ð??®ð??¦ð???ð??¦ð???ð??°ð??©ð??¯ð???ð??? ð???ð???ð??§ð???ð??¦ð???ð??²ð???."
 
-#: ../camel/camel-gpg-context.c:1307 ../camel/camel-smime-context.c:605
+#, fuzzy, c-format
+#: ../camel/camel-gpg-context.c:1261 ../camel/camel-gpg-context.c:1400
+#: ../camel/camel-gpg-context.c:2022 ../camel/camel-gpg-context.c:2074
+msgid "Failed to execute gpg: %s"
+msgstr "ð???ð??±ð??¤ð??? ð??? ð???ð??¨ð??? %s: %s"
+
 #, c-format
+#: ../camel/camel-gpg-context.c:1366 ../camel/camel-smime-context.c:752
 msgid "Could not generate signing data: %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??¡ð??§ð??¯ð??¼ð??±ð??? ð???ð??²ð??¯ð??¦ð??? ð???ð??±ð???ð??©: %s"
 
-#: ../camel/camel-gpg-context.c:1373
-msgid "This is a digitally signed message part"
-msgstr "ð???ð??¦ð??? ð??¦ð??? ð??© ð???ð??¦ð??¡ð??©ð???ð??©ð??¤ð??° ð???ð??²ð??¯ð??? ð??¥ð??§ð???ð??¦ð??¡ ð???ð??¸ð???"
-
-#: ../camel/camel-gpg-context.c:1459 ../camel/camel-gpg-context.c:1465
-#: ../camel/camel-gpg-context.c:1471 ../camel/camel-gpg-context.c:1486
-#: ../camel/camel-smime-context.c:929 ../camel/camel-smime-context.c:940
-#: ../camel/camel-smime-context.c:947
+#, fuzzy
+#: ../camel/camel-gpg-context.c:1419 ../camel/camel-gpg-context.c:1665
+#: ../camel/camel-gpg-context.c:1684 ../camel/camel-gpg-context.c:1777
+#: ../camel/camel-gpg-context.c:1796 ../camel/camel-gpg-context.c:1920
+#: ../camel/camel-gpg-context.c:1938 ../camel/camel-gpg-context.c:2041
+#: ../camel/camel-gpg-context.c:2093
+msgid "Failed to execute gpg."
+msgstr "ð???ð??±ð??¤ð??? ð??? ð??§ð???ð???ð??©ð???ð??¿ð??? gpg."
+
+#: ../camel/camel-gpg-context.c:1559 ../camel/camel-gpg-context.c:1567
+#: ../camel/camel-gpg-context.c:1575 ../camel/camel-gpg-context.c:1592
+#: ../camel/camel-smime-context.c:874 ../camel/camel-smime-context.c:887
+#: ../camel/camel-smime-context.c:895
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??®ð??¦ð???ð??² ð??¥ð??§ð???ð??¦ð??¡ ð???ð??¦ð???ð??¯ð??©ð???ð??¼: ð??¦ð??¯ð???ð??¼ð??§ð???ð??? ð??¥ð??§ð???ð??¦ð??¡ ð???ð??¹ð??¥ð??¨ð???"
 
-#: ../camel/camel-gpg-context.c:1525
 #, c-format
+#: ../camel/camel-gpg-context.c:1633
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??®ð??¦ð???ð??² ð??¥ð??§ð???ð??¦ð??¡ ð???ð??¦ð???ð??¯ð??©ð???ð??¼: ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð???ð??§ð??¥ð??? ð???ð??²ð??¤: %s"
 
-#: ../camel/camel-gpg-context.c:1634
 #, c-format
+#: ../camel/camel-gpg-context.c:1758
 msgid "Could not generate encrypting data: %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??¡ð??§ð??¯ð??¼ð??±ð??? ð??¦ð??¯ð???ð??®ð??¦ð???ð???ð??¦ð??? ð???ð??±ð???ð??©: %s"
 
-#: ../camel/camel-gpg-context.c:1684
+#: ../camel/camel-gpg-context.c:1814
 msgid "This is a digitally encrypted message part"
 msgstr "ð???ð??¦ð??? ð??¦ð??? ð??© ð???ð??¦ð??¡ð??©ð???ð??©ð??¤ð??° ð??¦ð??¯ð???ð??®ð??¦ð???ð???ð??©ð??? ð??¥ð??§ð???ð??¦ð??¡ ð???ð??¸ð???"
 
-#: ../camel/camel-gpg-context.c:1737 ../camel/camel-gpg-context.c:1745
-#: ../camel/camel-gpg-context.c:1764
+#: ../camel/camel-gpg-context.c:1870 ../camel/camel-gpg-context.c:1879
+#: ../camel/camel-gpg-context.c:1901
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??¦ð???ð??®ð??¦ð???ð??? ð??¥ð??§ð???ð??¦ð??¡: ð??¦ð??¯ð???ð??¼ð??§ð???ð??? ð??¥ð??§ð???ð??¦ð??¡ ð???ð??¹ð??¥ð??¨ð???"
 
-#: ../camel/camel-gpg-context.c:1754
+#: ../camel/camel-gpg-context.c:1890
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "ð???ð??±ð??¤ð??? ð??? ð???ð??¦ð???ð??®ð??¦ð???ð??? MIME ð???ð??¸ð???: ð???ð??®ð??´ð???ð??©ð???ð??ªð??¤ ð??»ð??¼"
 
-#: ../camel/camel-gpg-context.c:1832 ../camel/camel-smime-context.c:1205
+#: ../camel/camel-gpg-context.c:1974 ../camel/camel-smime-context.c:1167
 msgid "Encrypted content"
 msgstr "ð??¦ð??¯ð???ð??®ð??¦ð???ð???ð??©ð??? ð???ð??ªð??¯ð???ð??§ð??¯ð???"
 
-#: ../camel/camel-gpg-context.c:1851
+#: ../camel/camel-gpg-context.c:1996
 msgid "Unable to parse message content"
 msgstr "ð??³ð??¯ð??±ð???ð??©ð??¤ ð??? ð???ð??¸ð??? ð??¥ð??§ð???ð??¦ð??¡ ð???ð??ªð??¯ð???ð??§ð??¯ð???"
 
-#: ../camel/camel-gpg-context.c:1875 ../camel/camel-gpg-context.c:1920
-#: ../camel/providers/imap4/camel-imap4-utils.c:614
-#: ../camel/providers/smtp/camel-smtp-transport.c:165
-#: ../camel/providers/smtp/camel-smtp-transport.c:220
+#: ../camel/camel-gpg-context.c:2023 ../camel/camel-gpg-context.c:2075
+#: ../camel/providers/smtp/camel-smtp-transport.c:115
+#: ../camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Unknown"
 msgstr "ð??³ð??¯ð??´ð??¯"
 
-#: ../camel/camel-lock-client.c:104
 #, c-format
+#: ../camel/camel-lock-client.c:105
 msgid "Cannot build locking helper pipe: %s"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??¦ð??¤ð??? ð??¤ð??ªð???ð??¦ð??? ð??£ð??§ð??¤ð???ð??¼ ð???ð??²ð???: %s"
 
-#: ../camel/camel-lock-client.c:126
 #, c-format
+#: ../camel/camel-lock-client.c:128
 msgid "Cannot fork locking helper: %s"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??¹ð??? ð??¤ð??ªð???ð??¦ð??? ð??£ð??§ð??¤ð???ð??¼: %s"
 
-#: ../camel/camel-lock-client.c:203 ../camel/camel-lock-client.c:226
 #, c-format
+#: ../camel/camel-lock-client.c:208 ../camel/camel-lock-client.c:234
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??¤ð??ªð??? '%s': ð???ð??®ð??´ð???ð??©ð???ð??ªð??¤ ð??»ð??¼ ð??¢ð??¦ð??? ð??¤ð??ªð???-ð??£ð??§ð??¤ð???ð??¼"
 
-#: ../camel/camel-lock-client.c:216
 #, c-format
+#: ../camel/camel-lock-client.c:223
 msgid "Could not lock '%s'"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??¤ð??ªð??? '%s'"
 
-#: ../camel/camel-lock.c:103
 #, c-format
+#: ../camel/camel-lock.c:104
 msgid "Could not create lock file for %s: %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð??¤ð??ªð??? ð???ð??²ð??¤ ð???ð??¹ %s: %s"
 
-#: ../camel/camel-lock.c:144
 #, c-format
+#: ../camel/camel-lock.c:147
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "ð???ð??²ð??¥ð??? ð??¬ð??? ð???ð??®ð??²ð??¦ð??? ð??? ð???ð??§ð??? ð??¤ð??ªð??? ð???ð??²ð??¤ ð??ªð??¯ %s. ð???ð??®ð??² ð??©ð???ð??±ð??¯ ð??¤ð??±ð???ð??¼."
 
-#: ../camel/camel-lock.c:262
+#, fuzzy, c-format
+#: ../camel/camel-lock.c:206
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "ð???ð??±ð??¤ð??? ð??? ð???ð??§ð??? ð??¤ð??ªð??? ð??¿ð???ð??¦ð??? flock(2): %s"
+
 #, c-format
+#: ../camel/camel-lock.c:272
 msgid "Failed to get lock using flock(2): %s"
 msgstr "ð???ð??±ð??¤ð??? ð??? ð???ð??§ð??? ð??¤ð??ªð??? ð??¿ð???ð??¦ð??? flock(2): %s"
 
-#: ../camel/camel-movemail.c:106
 #, c-format
+#: ../camel/camel-movemail.c:108
 msgid "Could not check mail file %s: %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??§ð??? ð??¥ð??±ð??¤ ð???ð??²ð??¤ %s: %s"
 
-#: ../camel/camel-movemail.c:119
 #, c-format
+#: ../camel/camel-movemail.c:121
 msgid "Could not open mail file %s: %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??´ð???ð??©ð??¯ ð??¥ð??±ð??¤ ð???ð??²ð??¤ %s: %s"
 
-#: ../camel/camel-movemail.c:127
 #, c-format
+#: ../camel/camel-movemail.c:130
 msgid "Could not open temporary mail file %s: %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??´ð???ð??©ð??¯ ð???ð??§ð??¥ð???ð??¼ð??¼ð??¦ ð??¥ð??±ð??¤ ð???ð??²ð??¤ %s: %s"
 
-#: ../camel/camel-movemail.c:156
 #, c-format
+#: ../camel/camel-movemail.c:159
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "ð???ð??±ð??¤ð??? ð??? ð???ð???ð??¹ ð??¥ð??±ð??¤ ð??¦ð??¯ ð???ð??§ð??¥ð??? ð???ð??²ð??¤ %s: %s"
 
-#: ../camel/camel-movemail.c:186
 #, c-format
+#: ../camel/camel-movemail.c:192
 msgid "Could not create pipe: %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð???ð??²ð???: %s"
 
-#: ../camel/camel-movemail.c:198
 #, c-format
+#: ../camel/camel-movemail.c:205
 msgid "Could not fork: %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??¹ð???: %s"
 
-#: ../camel/camel-movemail.c:237
+#, fuzzy, c-format
+#: ../camel/camel-movemail.c:243
+msgid "Movemail program failed: %s"
+msgstr "ð??ªð???ð??¼ð??±ð???ð??©ð??¯ ð???ð??±ð??¤ð???: %s"
+
+#: ../camel/camel-movemail.c:244
 msgid "(Unknown error)"
 msgstr "(ð??³ð??¯ð??´ð??¯ ð??»ð??¼)"
 
-#: ../camel/camel-movemail.c:260
 #, c-format
+#: ../camel/camel-movemail.c:270
 msgid "Error reading mail file: %s"
 msgstr "ð??»ð??¼ ð??®ð??°ð???ð??¦ð??? ð??¥ð??±ð??¤ ð???ð??²ð??¤: %s"
 
-#: ../camel/camel-movemail.c:271
 #, c-format
+#: ../camel/camel-movemail.c:282
 msgid "Error writing mail temp file: %s"
 msgstr "ð??»ð??¼ ð??®ð??²ð???ð??¦ð??? ð??¥ð??±ð??¤ ð???ð??§ð??¥ð??? ð???ð??²ð??¤: %s"
 
-#: ../camel/camel-movemail.c:464 ../camel/camel-movemail.c:531
 #, c-format
+#: ../camel/camel-movemail.c:478 ../camel/camel-movemail.c:546
 msgid "Error copying mail temp file: %s"
 msgstr "ð??»ð??¼ ð???ð??ªð???ð??¦ð??¦ð??? ð??¥ð??±ð??¤ ð???ð??§ð??¥ð??? ð???ð??²ð??¤: %s"
 
-#: ../camel/camel-multipart-signed.c:592
+#: ../camel/camel-multipart-signed.c:593
 msgid "parse error"
 msgstr "ð???ð??¸ð??? ð??»ð??¼"
 
-#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:674
-#: ../camel/camel-net-utils.c:806
-#: ../camel/providers/pop3/camel-pop3-store.c:446
-#: ../camel/providers/pop3/camel-pop3-store.c:546
+#: ../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:477
+#: ../camel/providers/pop3/camel-pop3-store.c:586
 msgid "Canceled"
 msgstr "ð???ð??¨ð??¯ð???ð??©ð??¤ð???"
 
-#: ../camel/camel-net-utils.c:522
+#: ../camel/camel-net-utils.c:533
 msgid "cannot create thread"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð???ð??®ð??§ð???"
 
-#: ../camel/camel-net-utils.c:678
 #, c-format
+#: ../camel/camel-net-utils.c:698
 msgid "Resolving: %s"
 msgstr "ð??®ð??¦ð???ð??ªð??¤ð???ð??¦ð???: %s"
 
-#: ../camel/camel-net-utils.c:700
+#: ../camel/camel-net-utils.c:720
 msgid "Host lookup failed"
 msgstr "ð??£ð??´ð???ð??? ð??¤ð??«ð???ð??©ð??? ð???ð??±ð??¤ð???"
 
-#: ../camel/camel-net-utils.c:702
 #, c-format
+#: ../camel/camel-net-utils.c:724
 msgid "Host lookup failed: %s: %s"
 msgstr "ð??£ð??´ð???ð??? ð??¤ð??«ð???ð??©ð??? ð???ð??±ð??¤ð???: %s: %s"
 
-#: ../camel/camel-net-utils.c:810
+#: ../camel/camel-net-utils.c:846
 msgid "Resolving address"
 msgstr "ð??®ð??¦ð???ð??ªð??¤ð???ð??¦ð??? ð??©ð???ð??®ð??§ð???"
 
-#: ../camel/camel-net-utils.c:830
+#: ../camel/camel-net-utils.c:866
 msgid "Name lookup failed"
 msgstr "ð??¯ð??±ð??¥ ð??¤ð??«ð???ð??©ð??? ð???ð??±ð??¤ð???"
 
-#: ../camel/camel-net-utils.c:833
 #, c-format
+#: ../camel/camel-net-utils.c:871
 msgid "Name lookup failed: %s"
 msgstr "ð??¯ð??±ð??¥ ð??¤ð??«ð???ð??©ð??? ð???ð??±ð??¤ð???: %s"
 
-#: ../camel/camel-offline-journal.c:159 ../camel/camel-offline-journal.c:182
+#, fuzzy, c-format
+#: ../camel/camel-offline-folder.c:170
+msgid "Syncing messages in folder '%s' to disk"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??? ð??¥ð??§ð???ð??¦ð??¡: %s ð???ð??®ð??ªð??¥ ð???ð??´ð??¤ð???ð??¼ %s\n  %s"
+
 #, c-format
+#: ../camel/camel-offline-journal.c:143 ../camel/camel-offline-journal.c:168
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð??®ð??²ð??? ð??ªð???ð??¤ð??²ð??¯ ð??¡ð??»ð??¯ð??©ð??¤ ð???ð??¹ ð???ð??´ð??¤ð???ð??¼ '%s': %s"
 
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:59
 msgid "Virtual folder email provider"
 msgstr "ð???ð??»ð???ð??«ð??©ð??¤ ð???ð??´ð??¤ð???ð??¼ ð??°ð??¥ð??±ð??¤ ð???ð??®ð??©ð???ð??²ð???ð??»"
 
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:61
 msgid "For reading mail as a query of another set of folders"
 msgstr "ð???ð??¹ ð??®ð??°ð???ð??¦ð??? ð??¥ð??±ð??¤ ð??¨ð??? ð??© ð???ð??¢ð??½ð??¦ ð??? ð??©ð??¯ð??³ð???ð??¼ ð???ð??§ð??? ð??? ð???ð??´ð??¤ð???ð??¼ð???"
 
-#: ../camel/camel-provider.c:184
 #, c-format
+#: ../camel/camel-provider.c:189
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??¤ð??´ð??? %s: ð??¥ð??ªð???ð??¿ð??¤ ð??¤ð??´ð???ð??¦ð??? ð??¯ð??ªð??? ð???ð??©ð???ð??¹ð???ð??©ð??? ð??ªð??¯ ð???ð??¦ð??? ð???ð??¦ð???ð???ð??©ð??¥."
 
-#: ../camel/camel-provider.c:193
 #, c-format
+#: ../camel/camel-provider.c:198
 msgid "Could not load %s: %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??¤ð??´ð??? %s: %s"
 
-#: ../camel/camel-provider.c:379 ../camel/camel-session.c:182
+#, fuzzy, c-format
+#: ../camel/camel-provider.c:207
+msgid "Could not load %s: No initialization code in module."
+msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??¤ð??´ð??? %s: ð??¯ð??´ initialization ð???ð??´ð??? ð??¦ð??¯ ð??¥ð??ªð???ð??¿ð??¤."
+
 #, c-format
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:203
 msgid "No provider available for protocol '%s'"
 msgstr "ð??¯ð??´ ð???ð??®ð??©ð???ð??²ð???ð??» ð??©ð???ð??±ð??¤ð??©ð???ð??©ð??¤ ð???ð??¹ ð???ð??®ð??´ð???ð??©ð???ð??ªð??¤ '%s'"
 
-#: ../camel/camel-sasl-anonymous.c:36
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "ð??©ð??¯ð??ªð??¯ð??¦ð??¥ð??©ð???"
 
-#: ../camel/camel-sasl-anonymous.c:38
+#: ../camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
 msgstr "ð???ð??¦ð??? ð??ªð???ð???ð??©ð??¯ ð??¢ð??¦ð??¤ ð???ð??©ð??¯ð??§ð???ð??? ð??? ð??? ð???ð??»ð???ð??¼ ð??¿ð???ð??¦ð??? ð??©ð??¯ ð??©ð??¯ð??ªð??¯ð??¦ð??¥ð??©ð??? ð??¤ð??ªð???ð??¦ð??¯."
 
-#: ../camel/camel-sasl-anonymous.c:121 ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:68
 msgid "Authentication failed."
 msgstr "ð??·ð???ð??§ð??¯ð???ð??¦ð???ð??±ð???ð??©ð??¯ ð???ð??±ð??¤ð???."
 
-#: ../camel/camel-sasl-anonymous.c:130
 #, c-format
-msgid ""
-"Invalid email address trace information:\n"
-"%s"
-msgstr ""
-"ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð??°ð??¥ð??±ð??¤ ð??©ð???ð??®ð??§ð??? ð???ð??®ð??±ð??? ð??¦ð??¯ð???ð??¼ð??¥ð??±ð???ð??©ð??¯:\n"
-"%s"
+#: ../camel/camel-sasl-anonymous.c:78
+msgid "Invalid email address trace information:\n%s"
+msgstr "ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð??°ð??¥ð??±ð??¤ ð??©ð???ð??®ð??§ð??? ð???ð??®ð??±ð??? ð??¦ð??¯ð???ð??¼ð??¥ð??±ð???ð??©ð??¯:\n%s"
 
-#: ../camel/camel-sasl-anonymous.c:142
 #, c-format
-msgid ""
-"Invalid opaque trace information:\n"
-"%s"
-msgstr ""
-"ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð??´ð???ð??±ð??? ð???ð??®ð??±ð??? ð??¦ð??¯ð???ð??¼ð??¥ð??±ð???ð??©ð??¯:\n"
-"%s"
+#: ../camel/camel-sasl-anonymous.c:91
+msgid "Invalid opaque trace information:\n%s"
+msgstr "ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð??´ð???ð??±ð??? ð???ð??®ð??±ð??? ð??¦ð??¯ð???ð??¼ð??¥ð??±ð???ð??©ð??¯:\n%s"
 
-#: ../camel/camel-sasl-anonymous.c:154
 #, c-format
-msgid ""
-"Invalid trace information:\n"
-"%s"
-msgstr ""
-"ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð???ð??®ð??±ð??? ð??¦ð??¯ð???ð??¼ð??¥ð??±ð???ð??©ð??¯:\n"
-"%s"
+#: ../camel/camel-sasl-anonymous.c:104
+msgid "Invalid trace information:\n%s"
+msgstr "ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð???ð??®ð??±ð??? ð??¦ð??¯ð???ð??¼ð??¥ð??±ð???ð??©ð??¯:\n%s"
 
-#: ../camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:45
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:40
+#: ../camel/camel-sasl-cram-md5.c:47
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"ð???ð??¦ð??? ð??ªð???ð???ð??©ð??¯ ð??¢ð??¦ð??¤ ð???ð??©ð??¯ð??§ð???ð??? ð??? ð??? ð???ð??»ð???ð??¼ ð??¿ð???ð??¦ð??? ð??© ð???ð??¦ð???ð???ð??«ð??¼ CRAM-MD5 ð???ð??­ð???ð??¢ð??¼ð???, ð??¦ð??? ð??? ð???ð??»ð???ð??¼ "
-"ð???ð??©ð???ð??¹ð???ð??? ð??¦ð???."
+"ð???ð??¦ð??? ð??ªð???ð???ð??©ð??¯ ð??¢ð??¦ð??¤ ð???ð??©ð??¯ð??§ð???ð??? ð??? ð??? ð???ð??»ð???ð??¼ ð??¿ð???ð??¦ð??? ð??© ð???ð??¦ð???ð???ð??«ð??¼ CRAM-MD5 ð???ð??­ð???ð??¢ð??¼ð???, ð??¦ð??? ð??? ð???ð??»ð???ð??¼ ð???ð??©ð???ð??¹ð???ð??? "
+"ð??¦ð???."
 
-#: ../camel/camel-sasl-digest-md5.c:48
+#: ../camel/camel-sasl-digest-md5.c:56
 msgid "DIGEST-MD5"
 msgstr "ð???ð??²ð??¡ð??§ð???ð???-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:50
+#: ../camel/camel-sasl-digest-md5.c:58
 msgid ""
-"This option will connect to the server using a secure DIGEST-MD5 password, "
-"if the server supports it."
+"This option will connect to the server using a secure DIGEST-MD5 password, if "
+"the server supports it."
 msgstr ""
 "ð???ð??¦ð??? ð??ªð???ð???ð??©ð??¯ ð??¢ð??¦ð??¤ ð???ð??©ð??¯ð??§ð???ð??? ð??? ð??? ð???ð??»ð???ð??¼ ð??¿ð???ð??¦ð??? ð??© ð???ð??¦ð???ð???ð??«ð??¼ DIGEST-MD5 ð???ð??­ð???ð??¢ð??¼ð???, ð??¦ð??? ð??? ð???ð??»ð???ð??¼ "
 "ð???ð??©ð???ð??¹ð???ð??? ð??¦ð???."
 
-#: ../camel/camel-sasl-digest-md5.c:853
+#, fuzzy
+#: ../camel/camel-sasl-digest-md5.c:817
+msgid "Server challenge too long (>2048 octets)"
+msgstr "ð???ð??»ð???ð??¼ ð???ð??¨ð??¤ð??©ð??¯ð??¡ ð???ð??µ ð??¤ð??ªð??? (>2048 octets)"
+
+#: ../camel/camel-sasl-digest-md5.c:827
 msgid "Server challenge invalid\n"
 msgstr "ð???ð??»ð???ð??¼ ð???ð??¨ð??¤ð??©ð??¯ð??¡ ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð???\n"
 
-#: ../camel/camel-sasl-digest-md5.c:859
+#: ../camel/camel-sasl-digest-md5.c:834
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "ð???ð??»ð???ð??¼ ð???ð??¨ð??¤ð??©ð??¯ð??¡ ð???ð??©ð??¯ð???ð??±ð??¯ð??? ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? \"ð???ð??¢ð??ªð??¤ð??¦ð???ð??° ð??? ð???ð??®ð??©ð???ð??§ð???ð???ð??©ð??¯\" ð???ð??´ð???ð??©ð??¯"
 
-#: ../camel/camel-sasl-digest-md5.c:889
+#: ../camel/camel-sasl-digest-md5.c:865
 msgid "Server response did not contain authorization data"
 msgstr "ð???ð??»ð???ð??¼ ð??®ð??¦ð???ð???ð??ªð??¯ð??? ð???ð??¦ð??? ð??¯ð??ªð??? ð???ð??©ð??¯ð???ð??±ð??¯ ð??·ð???ð??¼ð??¦ð???ð??±ð???ð??©ð??¯ ð???ð??±ð???ð??©"
 
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:885
 msgid "Server response contained incomplete authorization data"
 msgstr "ð???ð??»ð???ð??¼ ð??®ð??¦ð???ð???ð??ªð??¯ð??? ð???ð??©ð??¯ð???ð??±ð??¯ð??? ð??¦ð??¯ð???ð??©ð??¥ð???ð??¤ð??°ð??? ð??·ð???ð??¼ð??¦ð???ð??±ð???ð??©ð??¯ ð???ð??±ð???ð??©"
 
-#: ../camel/camel-sasl-digest-md5.c:917
+#: ../camel/camel-sasl-digest-md5.c:897
 msgid "Server response does not match"
 msgstr "ð???ð??»ð???ð??¼ ð??®ð??¦ð???ð???ð??ªð??¯ð??? ð???ð??³ð??? ð??¯ð??ªð??? ð??¥ð??¨ð???"
 
-#: ../camel/camel-sasl-gssapi.c:159
+#, fuzzy
+#: ../camel/camel-sasl-gssapi.c:82
+msgid "GSSAPI"
+msgstr "GSSAPI"
+
+#, fuzzy
+#: ../camel/camel-sasl-gssapi.c:84
+msgid ""
+"This option will connect to the server using Kerberos 5 authentication."
+msgstr "ð???ð??¦ð??? ð??ªð???ð???ð??©ð??¯ ð??¢ð??¦ð??¤ ð???ð??©ð??¯ð??§ð???ð??? ð??? ð??? ð???ð??»ð???ð??¼ ð??¿ð???ð??¦ð??? Kerberos 5 ð??·ð???ð??§ð??¯ð???ð??¦ð???ð??±ð???ð??©ð??¯."
+
+#: ../camel/camel-sasl-gssapi.c:121
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -1711,25 +2018,34 @@ msgstr ""
 "ð??? ð???ð???ð??§ð???ð??¦ð???ð??²ð??? ð??¥ð??§ð???ð??©ð??¯ð??¦ð???ð??¥ ð??¦ð??? ð??¯ð??ªð??? ð???ð??©ð???ð??¹ð???ð??©ð??? ð???ð??² ð??? ð???ð??®ð??©ð???ð??²ð???ð??©ð??? ð???ð??®ð??¦ð???ð??§ð??¯ð???ð??©ð??¤, ð??¹ ð??¦ð??? ð??©ð??¯ð??®ð??§ð???ð??©ð???ð??¯ð??²ð???ð??? "
 "ð???ð??² ð??? ð??¦ð??¥ð???ð??¤ð??©ð??¥ð??§ð??¯ð???ð??±ð???ð??©ð??¯."
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:126
 msgid "The provided target_name parameter was ill-formed."
 msgstr "ð??? ð???ð??®ð??©ð???ð??²ð???ð??©ð??? target_name ð???ð??¼ð??¨ð??¥ð??©ð???ð??¼ ð??¢ð??ªð??? ð??¦ð??¤-ð???ð??¹ð??¥ð???."
 
-#: ../camel/camel-sasl-gssapi.c:167
+#: ../camel/camel-sasl-gssapi.c:129
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr ""
 "ð??? ð???ð??®ð??©ð???ð??²ð???ð??©ð??? target_name ð???ð??¼ð??¨ð??¥ð??©ð???ð??¼ ð???ð??©ð??¯ð???ð??±ð??¯ð??? ð??©ð??¯ ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð??¹ ð??³ð??¯ð???ð??©ð???ð??¹ð???ð??©ð??? ð???ð??²ð??? ð??? ð??¯ð??±ð??¥."
 
-#: ../camel/camel-sasl-gssapi.c:176
+#, fuzzy
+#: ../camel/camel-sasl-gssapi.c:133
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
+msgstr ""
+"ð??? input_token ð???ð??©ð??¯ð???ð??±ð??¯ð??? ð???ð??¦ð???ð??¼ð??©ð??¯ð??? ð???ð??¨ð??¯ð??©ð??¤ bindings ð??? ð???ð??´ð??? ð???ð???ð??§ð???ð??¦ð???ð??²ð??? ð???ð??²ð??© ð??? "
+"input_chan_bindings ð???ð??¼ð??¨ð??¥ð??©ð???ð??¼."
+
+#: ../camel/camel-sasl-gssapi.c:138
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr ""
 "ð??? input_token ð???ð??©ð??¯ð???ð??±ð??¯ð??? ð??©ð??¯ ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð???ð??¦ð???ð??¯ð??©ð???ð??¼, ð??¹ ð??© ð???ð??¦ð???ð??¯ð??©ð???ð??¼ ð???ð??¨ð??? ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??° ð???ð??§ð??®ð??¦ð???ð??²ð???."
 
-#: ../camel/camel-sasl-gssapi.c:180
+#: ../camel/camel-sasl-gssapi.c:142
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -1737,1975 +2053,2219 @@ msgstr ""
 "ð??? ð???ð??©ð???ð??¤ð??²ð??? ð???ð??®ð??©ð???ð??§ð??¯ð???ð??©ð??¤ð??? ð??¢ð??» ð??¯ð??ªð??? ð???ð??¨ð??¤ð??¦ð??? ð???ð??¹ ð???ð??ªð??¯ð???ð??§ð???ð???ð??? ð??¦ð??¯ð??¦ð???ð??°ð??±ð???ð??©ð??¯, ð??¹ ð??? ð???ð??®ð??¦ð???ð??§ð??¯ð???ð??©ð??¤ ð??£ð??¨ð??¯ð???ð??©ð??¤ "
 "ð???ð??¦ð??? ð??¯ð??ªð??? ð??®ð??§ð???ð??¼ð??©ð??¯ð??? ð??§ð??¯ð??¦ ð???ð??®ð??©ð???ð??§ð??¯ð???ð??©ð??¤ð???."
 
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../camel/camel-sasl-gssapi.c:147
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "ð??? ð???ð??©ð???ð??¤ð??²ð??? ð???ð??ªð??¯ð???ð??§ð???ð???ð??? ð??£ð??¨ð??¯ð???ð??©ð??¤ ð???ð??¦ð??? ð??¯ð??ªð??? ð??®ð??¦ð???ð??» ð??? ð??© ð???ð??¨ð??¤ð??¦ð??? ð???ð??ªð??¯ð???ð??§ð???ð???ð???."
 
-#: ../camel/camel-sasl-gssapi.c:188
+#: ../camel/camel-sasl-gssapi.c:150
 msgid "The consistency checks performed on the input_token failed."
 msgstr "ð??? ð???ð??©ð??¯ð???ð??¦ð???ð???ð??©ð??¯ð???ð??° ð???ð??§ð???ð??? ð???ð??¼ð???ð??¹ð??¥ð??? ð??ªð??¯ ð??? input_token ð???ð??±ð??¤ð???."
 
-#: ../camel/camel-sasl-gssapi.c:191
+#: ../camel/camel-sasl-gssapi.c:153
 msgid "The consistency checks performed on the credential failed."
 msgstr "ð??? ð???ð??©ð??¯ð???ð??¦ð???ð???ð??©ð??¯ð???ð??° ð???ð??§ð???ð??? ð???ð??¼ð???ð??¹ð??¥ð??? ð??ªð??¯ ð??? ð???ð??®ð??¦ð???ð??§ð??¯ð???ð??©ð??¤ ð???ð??±ð??¤ð???."
 
-#: ../camel/camel-sasl-gssapi.c:194
+#: ../camel/camel-sasl-gssapi.c:156
 msgid "The referenced credentials have expired."
 msgstr "ð??? ð??®ð??§ð???ð??¼ð??©ð??¯ð???ð??? ð???ð??®ð??©ð???ð??§ð??¯ð???ð??©ð??¤ð??? ð??£ð??¨ð??? ð??¦ð???ð???ð???ð??²ð??®ð???."
 
-#: ../camel/camel-sasl-gssapi.c:200 ../camel/camel-sasl-gssapi.c:248
-#: ../camel/camel-sasl-gssapi.c:284 ../camel/camel-sasl-gssapi.c:299
-#: ../camel/providers/imap/camel-imap-store.c:1272
+#: ../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:1135
 msgid "Bad authentication response from server."
 msgstr "ð???ð??¨ð??? ð??·ð???ð??§ð??¯ð???ð??¦ð???ð??±ð???ð??©ð??¯ ð??®ð??¦ð???ð???ð??ªð??¯ð??? ð???ð??®ð??ªð??¥ ð???ð??»ð???ð??¼."
 
-#: ../camel/camel-sasl-gssapi.c:309
+#: ../camel/camel-sasl-gssapi.c:366
 msgid "Unsupported security layer."
 msgstr "ð??³ð??¯ð???ð??©ð???ð??¹ð???ð??©ð??? ð???ð??¦ð???ð???ð??«ð??¼ð??¦ð???ð??¦ ð??¤ð??±ð??¼."
 
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:39
 msgid "Login"
 msgstr "ð??¤ð??ªð???ð??¦ð??¯"
 
-#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:38
+#: ../camel/camel-sasl-login.c:41 ../camel/camel-sasl-plain.c:45
 msgid "This option will connect to the server using a simple password."
 msgstr "ð???ð??¦ð??? ð??ªð???ð???ð??©ð??¯ ð??¢ð??¦ð??¤ ð???ð??©ð??¯ð??§ð???ð??? ð??? ð??? ð???ð??»ð???ð??¼ ð??¿ð???ð??¦ð??? ð??© ð???ð??¦ð??¥ð???ð??©ð??¤ ð???ð??­ð???ð??¢ð??¼ð???."
 
-#: ../camel/camel-sasl-login.c:134
+#: ../camel/camel-sasl-login.c:94
 msgid "Unknown authentication state."
 msgstr "ð??³ð??¯ð??´ð??¯ ð??·ð???ð??§ð??¯ð???ð??¦ð???ð??±ð???ð??©ð??¯ ð???ð???ð??±ð???."
 
-#: ../camel/camel-sasl-plain.c:36
+#, fuzzy
+#: ../camel/camel-sasl-ntlm.c:41
+msgid "NTLM / SPA"
+msgstr "NTLM / ð???ð???ð??­"
+
+#, fuzzy
+#: ../camel/camel-sasl-ntlm.c:43
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr ""
+"ð???ð??¦ð??? ð??ªð???ð???ð??©ð??¯ ð??¢ð??¦ð??¤ ð???ð??©ð??¯ð??§ð???ð??? ð??? ð??© ð??¢ð??¦ð??¯ð???ð??´ð???-ð???ð??±ð???ð??? ð???ð??»ð???ð??¼ ð??¿ð???ð??¦ð??? NTLM / ð???ð??¦ð???ð???ð??«ð??¼ ð???ð??­ð???ð??¢ð??¼ð??? "
+"ð??·ð???ð??§ð??¯ð???ð??¦ð???ð??±ð???ð??©ð??¯."
+
+#: ../camel/camel-sasl-plain.c:43
 msgid "PLAIN"
 msgstr "ð???ð??¤ð??±ð??¯"
 
-#: ../camel/camel-sasl-popb4smtp.c:106
+#, fuzzy
+#: ../camel/camel-sasl-popb4smtp.c:46
+msgid "POP before SMTP"
+msgstr "ð???ð??ªð??? ð???ð??¦ð???ð??¹ SMTP"
+
+#, fuzzy
+#: ../camel/camel-sasl-popb4smtp.c:48
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr "ð???ð??¦ð??? ð??ªð???ð???ð??©ð??¯ ð??¢ð??¦ð??¤ authorise ð??© ð???ð??ªð??? ð???ð??©ð??¯ð??§ð???ð???ð??©ð??¯ ð???ð??¦ð???ð??¹ ð??©ð???ð??§ð??¥ð???ð???ð??¦ð??? SMTP"
+
+#: ../camel/camel-sasl-popb4smtp.c:82
 msgid "POP Source URI"
 msgstr "POP ð???ð??¹ð??? URI"
 
-#: ../camel/camel-search-private.c:149
+#, fuzzy
+#: ../camel/camel-sasl-popb4smtp.c:88
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr "ð???ð??ªð??? ð???ð??¦ð???ð??¹ SMTP ð??ªð??? ð??¿ð???ð??¦ð??? ð??©ð??¯ ð??³ð??¯ð??´ð??¯ ð???ð??®ð??­ð??¯ð???ð???ð??¹ð???"
+
+#, fuzzy
+#: ../camel/camel-sasl-popb4smtp.c:95
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr "ð???ð??ªð??? ð???ð??¦ð???ð??¹ SMTP ð??ªð??? ð??¿ð???ð??¦ð??? ð??© ð??¯ð??ªð??¯-ð???ð??ªð??? ð???ð??¹ð???"
+
 #, c-format
+#: ../camel/camel-search-private.c:113
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "ð??®ð??§ð???ð???ð??«ð??¤ð??¼ ð??¦ð???ð???ð???ð??®ð??§ð???ð??©ð??¯ ð???ð??­ð??¥ð???ð??©ð??¤ð??±ð???ð??©ð??¯ ð???ð??±ð??¤ð???: %s: %s"
 
-#: ../camel/camel-service.c:265
 #, c-format
+#: ../camel/camel-service.c:97
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' ð??¯ð??°ð???ð??? ð??© ð??¿ð???ð??¼ð??¯ð??±ð??¥ ð???ð??©ð??¥ð???ð??´ð??¯ð??©ð??¯ð???"
 
-#: ../camel/camel-service.c:269
 #, c-format
+#: ../camel/camel-service.c:101
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' ð??¯ð??°ð???ð??? ð??© ð??£ð??´ð???ð??? ð???ð??©ð??¥ð???ð??´ð??¯ð??©ð??¯ð???"
 
-#: ../camel/camel-service.c:273
 #, c-format
+#: ../camel/camel-service.c:105
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' ð??¯ð??°ð???ð??? ð??© ð???ð??­ð??? ð???ð??©ð??¥ð???ð??´ð??¯ð??©ð??¯ð???"
 
-#: ../camel/camel-session.c:307
 #, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð???ð??²ð??®ð??§ð???ð???ð??¼ð??¦ %s:\n"
-"%s"
+#: ../camel/camel-session.c:258
+msgid "Could not create directory %s:\n%s"
+msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð???ð??²ð??®ð??§ð???ð???ð??¼ð??¦ %s:\n%s"
 
-#: ../camel/camel-session.c:479
 #, c-format
+#: ../camel/camel-session.c:743
 msgid "Please enter the %s password for %s on host %s."
 msgstr "ð???ð??¤ð??°ð??? ð??§ð??¯ð???ð??¼ ð??? %s ð???ð??­ð???ð??¢ð??¼ð??? ð???ð??¹ %s ð??ªð??¯ ð??£ð??´ð???ð??? %s."
 
-#: ../camel/camel-smime-context.c:447 ../camel/camel-smime-context.c:1012
 #, c-format
+#: ../camel/camel-smime-context.c:344 ../camel/camel-smime-context.c:969
 msgid "Cannot find certificate for '%s'"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??²ð??¯ð??? ð???ð??©ð???ð??¦ð???ð??¦ð???ð??©ð??? ð???ð??¹ '%s'"
 
-#: ../camel/camel-smime-context.c:483
+#, fuzzy
+#: ../camel/camel-smime-context.c:350
+msgid "Cannot create CMS message"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? CMS ð??¥ð??§ð???ð??¦ð??¡"
+
+#, fuzzy
+#: ../camel/camel-smime-context.c:355
+msgid "Cannot create CMS signed data"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? CMS ð???ð??²ð??¯ð??? ð???ð??±ð???ð??©"
+
+#, fuzzy
+#: ../camel/camel-smime-context.c:361
+msgid "Cannot attach CMS signed data"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð??©ð???ð??¨ð??? CMS ð???ð??²ð??¯ð??? ð???ð??±ð???ð??©"
+
+#, fuzzy
+#: ../camel/camel-smime-context.c:368
+msgid "Cannot attach CMS data"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð??©ð???ð??¨ð??? CMS ð???ð??±ð???ð??©"
+
+#, fuzzy
+#: ../camel/camel-smime-context.c:374
+msgid "Cannot create CMS Signer information"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? CMS ð???ð??²ð??¯ð??» ð??¦ð??¯ð???ð??¼ð??¥ð??±ð???ð??©ð??¯"
+
+#: ../camel/camel-smime-context.c:380
 msgid "Cannot find certificate chain"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??²ð??¯ð??? ð???ð??©ð???ð??¦ð???ð??¦ð???ð??©ð??? ð???ð??±ð??¯"
 
-#: ../camel/camel-smime-context.c:511 ../camel/camel-smime-context.c:523
+#, fuzzy
+#: ../camel/camel-smime-context.c:386
+msgid "Cannot add CMS Signing time"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð??¨ð??? CMS ð???ð??²ð??¯ð??¦ð??? ð???ð??²ð??¥"
+
 #, c-format
+#: ../camel/camel-smime-context.c:410 ../camel/camel-smime-context.c:425
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "ð??¦ð??¯ð???ð??®ð??¦ð???ð???ð??©ð??¯ ð???ð??©ð???ð??¦ð???ð??¦ð???ð??©ð??? ð???ð??¹ '%s' ð???ð??³ð??? ð??¯ð??ªð??? ð??§ð???ð???ð??¦ð???ð???"
 
-#: ../camel/camel-smime-context.c:540
+#, fuzzy
+#: ../camel/camel-smime-context.c:432
+msgid "Cannot add SMIMEEncKeyPrefs attribute"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð??¨ð??? SMIMEEncKeyPrefs ð??©ð???ð??®ð??¦ð???ð??¿ð???"
+
+#, fuzzy
+#: ../camel/camel-smime-context.c:437
+msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð??¨ð??? ð??¥ð??¦ð??? SMIMEEncKeyPrefs ð??©ð???ð??®ð??¦ð???ð??¿ð???"
+
+#: ../camel/camel-smime-context.c:442
 msgid "Cannot add encryption certificate"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð??¨ð??? ð??¦ð??¯ð???ð??®ð??¦ð???ð???ð??©ð??¯ ð???ð??©ð???ð??¦ð???ð??¦ð???ð??©ð???"
 
-#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:1084
-msgid "Cannot create encoder context"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð??§ð??¯ð???ð??´ð???ð??¼ ð???ð??ªð??¯ð???ð??§ð???ð???ð???"
-
-#: ../camel/camel-smime-context.c:627 ../camel/camel-smime-context.c:1101
-msgid "Failed to encode data"
-msgstr "ð???ð??±ð??¤ð??? ð??? ð??§ð??¯ð???ð??´ð??? ð???ð??±ð???ð??©"
+#, fuzzy
+#: ../camel/camel-smime-context.c:448
+msgid "Cannot add CMS Signer information"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð??¨ð??? CMS ð???ð??²ð??¯ð??» ð??¦ð??¯ð???ð??¼ð??¥ð??±ð???ð??©ð??¯"
 
-#: ../camel/camel-smime-context.c:700
+#: ../camel/camel-smime-context.c:480
 msgid "Unverified"
 msgstr "ð??©ð??¯ð???ð??§ð??®ð??¦ð???ð??²ð???"
 
-#: ../camel/camel-smime-context.c:702
+#: ../camel/camel-smime-context.c:482
 msgid "Good signature"
 msgstr "ð???ð??«ð??? ð???ð??¦ð???ð??¯ð??©ð???ð??¼"
 
-#: ../camel/camel-smime-context.c:704
+#: ../camel/camel-smime-context.c:484
 msgid "Bad signature"
 msgstr "ð???ð??¨ð??? ð???ð??¦ð???ð??¯ð??©ð???ð??¼"
 
-#: ../camel/camel-smime-context.c:706
+#: ../camel/camel-smime-context.c:486
 msgid "Content tampered with or altered in transit"
 msgstr "ð???ð??ªð??¯ð???ð??§ð??¯ð??? ð???ð??¨ð??¥ð???ð??»ð??? ð??¢ð??¦ð??? ð??¹ ð??·ð??¤ð???ð??¼ð??? ð??¦ð??¯ ð???ð??®ð??¨ð??¯ð???ð??¦ð???"
 
-#: ../camel/camel-smime-context.c:708
+#: ../camel/camel-smime-context.c:488
 msgid "Signing certificate not found"
 msgstr "ð???ð??²ð??¯ð??¦ð??? ð???ð??©ð???ð??¦ð???ð??¦ð???ð??©ð??? ð??¯ð??ªð??? ð???ð??¬ð??¯ð???"
 
-#: ../camel/camel-smime-context.c:710
+#: ../camel/camel-smime-context.c:490
 msgid "Signing certificate not trusted"
 msgstr "ð???ð??²ð??¯ð??¦ð??? ð???ð??©ð???ð??¦ð???ð??¦ð???ð??©ð??? ð??¯ð??ªð??? ð???ð??®ð??³ð???ð???ð??©ð???"
 
-#: ../camel/camel-smime-context.c:712
+#: ../camel/camel-smime-context.c:492
 msgid "Signature algorithm unknown"
 msgstr "ð???ð??¦ð???ð??¯ð??©ð???ð??¼ ð??¨ð??¤ð???ð??»ð??¦ð???ð??©ð??¥ ð??³ð??¯ð??´ð??¯"
 
-#: ../camel/camel-smime-context.c:714
+#: ../camel/camel-smime-context.c:494
 msgid "Signature algorithm unsupported"
 msgstr "ð???ð??¦ð???ð??¯ð??©ð???ð??¼ ð??¨ð??¤ð???ð??»ð??¦ð???ð??©ð??¥ ð??³ð??¯ð???ð??©ð???ð??¹ð???ð??©ð???"
 
-#: ../camel/camel-smime-context.c:716
+#: ../camel/camel-smime-context.c:496
 msgid "Malformed signature"
 msgstr "ð??¥ð??¨ð??¤ð???ð??¹ð??¥ð??? ð???ð??¦ð???ð??¯ð??©ð???ð??¼"
 
-#: ../camel/camel-smime-context.c:718
+#: ../camel/camel-smime-context.c:498
 msgid "Processing error"
 msgstr "ð???ð??®ð??´ð???ð??§ð???ð??¦ð??? ð??»ð??¼"
 
-#: ../camel/camel-smime-context.c:772
+#: ../camel/camel-smime-context.c:540
 msgid "No signed data in signature"
 msgstr "ð??¯ð??´ ð???ð??²ð??¯ð??? ð???ð??±ð???ð??© ð??¦ð??¯ ð???ð??¦ð???ð??¯ð??©ð???ð??¼"
 
-#: ../camel/camel-smime-context.c:777
+#: ../camel/camel-smime-context.c:545
 msgid "Digests missing from enveloped data"
 msgstr "ð???ð??©ð??¡ð??§ð???ð???ð??? ð??¥ð??¦ð???ð??¦ð??? ð???ð??®ð??ªð??¥ ð??§ð??¯ð???ð??§ð??¤ð??©ð???ð??? ð???ð??±ð???ð??©"
 
-#: ../camel/camel-smime-context.c:790 ../camel/camel-smime-context.c:800
+#: ../camel/camel-smime-context.c:558 ../camel/camel-smime-context.c:569
 msgid "Cannot calculate digests"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??¨ð??¤ð???ð??¿ð??¤ð??±ð??? ð???ð??©ð??¡ð??§ð???ð???ð???"
 
-#: ../camel/camel-smime-context.c:807 ../camel/camel-smime-context.c:811
+#: ../camel/camel-smime-context.c:576 ../camel/camel-smime-context.c:580
 msgid "Cannot set message digests"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??? ð??¥ð??§ð???ð??¦ð??¡ ð???ð??©ð??¡ð??§ð???ð???ð???"
 
-#: ../camel/camel-smime-context.c:821 ../camel/camel-smime-context.c:826
+#: ../camel/camel-smime-context.c:590 ../camel/camel-smime-context.c:595
 msgid "Certificate import failed"
 msgstr "ð???ð??©ð???ð??¦ð???ð??¦ð???ð??©ð??? ð??¦ð??¥ð???ð??¹ð??? ð???ð??±ð??¤ð???"
 
-#: ../camel/camel-smime-context.c:836
 #, c-format
+#: ../camel/camel-smime-context.c:605
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "ð???ð??©ð???ð??¦ð???ð??¦ð???ð??©ð??? ð??¦ð??? ð??? ð??´ð??¯ð??¤ð??¦ ð??¥ð??§ð???ð??¦ð??¡, ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??®ð??¦ð???ð??² ð???ð??©ð???ð??¦ð???ð??¦ð???ð??©ð???ð???"
 
-#: ../camel/camel-smime-context.c:839
 #, c-format
+#: ../camel/camel-smime-context.c:608
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "ð???ð??©ð???ð??¦ð???ð??¦ð???ð??©ð??? ð??¦ð??? ð??? ð??´ð??¯ð??¤ð??¦ ð??¥ð??§ð???ð??¦ð??¡, ð???ð??©ð???ð??¦ð???ð??¦ð???ð??©ð???ð??? ð??¦ð??¥ð???ð??¹ð???ð??©ð??? ð??¯ ð???ð??§ð??®ð??¦ð???ð??²ð???"
 
-#: ../camel/camel-smime-context.c:843
+#: ../camel/camel-smime-context.c:612
 msgid "Cannot find signature digests"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??²ð??¯ð??? ð???ð??¦ð???ð??¯ð??©ð???ð??¼ ð???ð??©ð??¡ð??§ð???ð???ð???"
 
-#: ../camel/camel-smime-context.c:859
 #, c-format
+#: ../camel/camel-smime-context.c:628
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ð???ð??²ð??¯ð??¼: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:960 ../camel/camel-smime-context.c:1184
+#: ../camel/camel-smime-context.c:763 ../camel/camel-smime-context.c:1041
+msgid "Cannot create encoder context"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð??§ð??¯ð???ð??´ð???ð??¼ ð???ð??ªð??¯ð???ð??§ð???ð???ð???"
+
+#, fuzzy
+#: ../camel/camel-smime-context.c:769
+msgid "Failed to add data to CMS encoder"
+msgstr "ð???ð??±ð??¤ð??? ð??? ð??¨ð??? ð???ð??±ð???ð??© ð??? CMS ð??§ð??¯ð???ð??´ð???ð??¼"
+
+#: ../camel/camel-smime-context.c:774 ../camel/camel-smime-context.c:1058
+msgid "Failed to encode data"
+msgstr "ð???ð??±ð??¤ð??? ð??? ð??§ð??¯ð???ð??´ð??? ð???ð??±ð???ð??©"
+
+#: ../camel/camel-smime-context.c:909 ../camel/camel-smime-context.c:1146
 msgid "Decoder failed"
 msgstr "ð???ð??°ð???ð??´ð???ð??¼ ð???ð??±ð??¤ð???"
 
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:976
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??²ð??¯ð??? ð???ð??ªð??¥ð??©ð??¯ ð???ð??©ð??¤ð??? ð??¦ð??¯ð???ð??®ð??¦ð???ð???ð??©ð??¯ ð??¨ð??¤ð???ð??»ð??¦ð???ð??©ð??¥"
 
-#: ../camel/camel-smime-context.c:1027
+#: ../camel/camel-smime-context.c:984
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð??¨ð??¤ð??´ð???ð??±ð??? ð???ð??¤ð??ªð??? ð???ð??¹ ð??¦ð??¯ð???ð??®ð??¦ð???ð???ð??©ð??¯ ð???ð??©ð??¤ð??? ð???ð??°"
 
-#: ../camel/camel-smime-context.c:1095
+#, fuzzy
+#: ../camel/camel-smime-context.c:995
+msgid "Cannot create CMS Message"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? CMS ð??¥ð??§ð???ð??¦ð??¡"
+
+#, fuzzy
+#: ../camel/camel-smime-context.c:1001
+msgid "Cannot create CMS Enveloped data"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? CMS ð??§ð??¯ð???ð??§ð??¤ð??©ð???ð??? ð???ð??±ð???ð??©"
+
+#, fuzzy
+#: ../camel/camel-smime-context.c:1007
+msgid "Cannot attach CMS Enveloped data"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð??©ð???ð??¨ð??? CMS ð??§ð??¯ð???ð??§ð??¤ð??©ð???ð??? ð???ð??±ð???ð??©"
+
+#, fuzzy
+#: ../camel/camel-smime-context.c:1013
+msgid "Cannot attach CMS data object"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð??©ð???ð??¨ð??? CMS ð???ð??±ð???ð??© ð??©ð???ð??¡ð??§ð???ð???"
+
+#, fuzzy
+#: ../camel/camel-smime-context.c:1022
+msgid "Cannot create CMS Recipient information"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? CMS ð??®ð??©ð???ð??¦ð???ð??°ð??©ð??¯ð??? ð??¦ð??¯ð???ð??¼ð??¥ð??±ð???ð??©ð??¯"
+
+#, fuzzy
+#: ../camel/camel-smime-context.c:1027
+msgid "Cannot add CMS Recipient information"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð??¨ð??? CMS ð??®ð??©ð???ð??¦ð???ð??°ð??©ð??¯ð??? ð??¦ð??¯ð???ð??¼ð??¥ð??±ð???ð??©ð??¯"
+
+#: ../camel/camel-smime-context.c:1052
 msgid "Failed to add data to encoder"
 msgstr "ð???ð??±ð??¤ð??? ð??? ð??¨ð??? ð???ð??±ð???ð??© ð??? ð??§ð??¯ð???ð??´ð???ð??¼"
 
-#: ../camel/camel-smime-context.c:1191
+#: ../camel/camel-smime-context.c:1153
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME ð???ð??¦ð???ð??®ð??¦ð???ð???: ð??¯ð??´ ð??¦ð??¯ð???ð??®ð??¦ð???ð???ð??©ð??? ð???ð??ªð??¯ð???ð??§ð??¯ð??? ð???ð??¬ð??¯ð???"
 
-#: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:171
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??? ð???ð??´ð??¤ð???ð??¼: ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð??ªð???ð??¼ð??±ð???ð??©ð??¯ ð??ªð??¯ ð???ð??¦ð??? ð???ð???ð??¹"
-
-#: ../camel/camel-store.c:316
 #, c-format
+#: ../camel/camel-store.c:426
 msgid "Cannot create folder '%s': folder exists"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð???ð??´ð??¤ð???ð??¼ '%s': ð???ð??´ð??¤ð???ð??¼ ð??§ð???ð???ð??¦ð???ð???ð???"
 
-#: ../camel/camel-store.c:395
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð???ð??´ð??¤ð???ð??¼: ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð??ªð???ð??¼ð??±ð???ð??©ð??¯ ð??ªð??¯ ð???ð??¦ð??? ð???ð???ð??¹"
-
-#: ../camel/camel-store.c:423
 #, c-format
+#: ../camel/camel-store.c:520
 msgid "Cannot create folder: %s: folder exists"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð???ð??´ð??¤ð???ð??¼: %s: ð???ð??´ð??¤ð???ð??¼ ð??§ð???ð???ð??¦ð???ð???ð???"
 
-#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:377
-#: ../camel/providers/local/camel-maildir-store.c:219
 #, c-format
+#: ../camel/camel-store.c:591 ../camel/camel-vee-store.c:261
+#: ../camel/providers/local/camel-maildir-store.c:218
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??¦ð??¤ð??°ð??? ð???ð??´ð??¤ð???ð??¼: %s: ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð??ªð???ð??¼ð??±ð???ð??©ð??¯"
 
-#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:414
-#: ../camel/providers/local/camel-maildir-store.c:291
 #, c-format
+#: ../camel/camel-store.c:655 ../camel/camel-vee-store.c:213
+#: ../camel/providers/local/camel-maildir-store.c:305
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð??®ð??°ð??¯ð??±ð??¥ ð???ð??´ð??¤ð???ð??¼: %s: ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð??ªð???ð??¼ð??±ð???ð??©ð??¯"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:900 ../camel/camel-vtrash-folder.c:54
+#: ../camel/camel-store.c:1086 ../camel/camel-vtrash-folder.c:49
 msgid "Trash"
 msgstr "ð???ð??®ð??¨ð???"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:903 ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-store.c:1089 ../camel/camel-vtrash-folder.c:51
 msgid "Junk"
 msgstr "ð??¡ð??©ð???ð???"
 
-#: ../camel/camel-tcp-stream-ssl.c:870
 #, c-format
+#: ../camel/camel-tcp-stream-ssl.c:729
 msgid ""
-"Issuer:            %s\n"
-"Subject:           %s\n"
-"Fingerprint:       %s\n"
-"Signature:         %s"
+"Issuer:            %s\nSubject:           %s\nFingerprint:       "
+"%s\nSignature:         %s"
 msgstr ""
-"ð??¦ð???ð??µð??¼:            %s\n"
-"ð???ð??©ð???ð??¡ð??§ð???ð???:           %s\n"
-"ð???ð??¦ð???ð???ð??¼ð???ð??®ð??¦ð??¯ð???:       %s\n"
-"ð???ð??¦ð???ð??¯ð??©ð???ð??¼:         %s"
+"ð??¦ð???ð??µð??¼:            %s\nð???ð??©ð???ð??¡ð??§ð???ð???:           %s\nð???ð??¦ð???ð???ð??¼ð???ð??®ð??¦ð??¯ð???:       "
+"%s\nð???ð??¦ð???ð??¯ð??©ð???ð??¼:         %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:876
+#: ../camel/camel-tcp-stream-ssl.c:735
 msgid "GOOD"
 msgstr "ð???ð??«ð???"
 
-#: ../camel/camel-tcp-stream-ssl.c:876
+#: ../camel/camel-tcp-stream-ssl.c:735
 msgid "BAD"
 msgstr "ð???ð??¨ð???"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:880
 #, c-format
-msgid ""
-"SSL Certificate check for %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept?"
-msgstr ""
-"SSL ð???ð??©ð???ð??¦ð???ð??¦ð???ð??©ð??? ð???ð??§ð??? ð???ð??¹ %s:\n"
-"\n"
-"%s\n"
-"\n"
-"ð???ð??µ ð??¿ ð??¢ð??¦ð??? ð??? ð??¨ð???ð???ð??§ð???ð????"
+#: ../camel/camel-tcp-stream-ssl.c:739
+msgid "SSL Certificate check for %s:\n\n%s\n\nDo you wish to accept?"
+msgstr "SSL ð???ð??©ð???ð??¦ð???ð??¦ð???ð??©ð??? ð???ð??§ð??? ð???ð??¹ %s:\n\n%s\n\nð???ð??µ ð??¿ ð??¢ð??¦ð??? ð??? ð??¨ð???ð???ð??§ð???ð????"
 
-#: ../camel/camel-tcp-stream-ssl.c:924
 #, c-format
-msgid ""
-"Certificate problem: %s\n"
-"Issuer: %s"
-msgstr ""
-"ð???ð??©ð???ð??¦ð???ð??¦ð???ð??©ð??? ð???ð??®ð??ªð???ð??¤ð??©ð??¥: %s\n"
-"ð??¦ð???ð??µð??¼: %s"
+#: ../camel/camel-tcp-stream-ssl.c:783
+msgid "Certificate problem: %s\nIssuer: %s"
+msgstr "ð???ð??©ð???ð??¦ð???ð??¦ð???ð??©ð??? ð???ð??®ð??ªð???ð??¤ð??©ð??¥: %s\nð??¦ð???ð??µð??¼: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:976
 #, c-format
-msgid ""
-"Bad certificate domain: %s\n"
-"Issuer: %s"
-msgstr ""
-"ð???ð??¨ð??? ð???ð??©ð???ð??¦ð???ð??¦ð???ð??©ð??? ð???ð??´ð??¥ð??±ð??¯: %s\n"
-"ð??¦ð???ð??µð??¼: %s"
+#: ../camel/camel-tcp-stream-ssl.c:835
+msgid "Bad certificate domain: %s\nIssuer: %s"
+msgstr "ð???ð??¨ð??? ð???ð??©ð???ð??¦ð???ð??¦ð???ð??©ð??? ð???ð??´ð??¥ð??±ð??¯: %s\nð??¦ð???ð??µð??¼: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:994
 #, c-format
-msgid ""
-"Certificate expired: %s\n"
-"Issuer: %s"
-msgstr ""
-"ð???ð??©ð???ð??¦ð???ð??¦ð???ð??©ð??? ð??¦ð???ð???ð???ð??²ð??®ð???: %s\n"
-"ð??¦ð???ð??µð??¼: %s"
+#: ../camel/camel-tcp-stream-ssl.c:853
+msgid "Certificate expired: %s\nIssuer: %s"
+msgstr "ð???ð??©ð???ð??¦ð???ð??¦ð???ð??©ð??? ð??¦ð???ð???ð???ð??²ð??®ð???: %s\nð??¦ð???ð??µð??¼: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1011
 #, c-format
-msgid ""
-"Certificate revocation list expired: %s\n"
-"Issuer: %s"
-msgstr ""
-"ð???ð??©ð???ð??¦ð???ð??¦ð???ð??©ð??? ð??®ð??§ð???ð??©ð???ð??±ð???ð??©ð??¯ ð??¤ð??¦ð???ð??? ð??¦ð???ð???ð???ð??²ð??®ð???: %s\n"
-"ð??¦ð???ð??µð??¼: %s"
+#: ../camel/camel-tcp-stream-ssl.c:870
+msgid "Certificate revocation list expired: %s\nIssuer: %s"
+msgstr "ð???ð??©ð???ð??¦ð???ð??¦ð???ð??©ð??? ð??®ð??§ð???ð??©ð???ð??±ð???ð??©ð??¯ ð??¤ð??¦ð???ð??? ð??¦ð???ð???ð???ð??²ð??®ð???: %s\nð??¦ð???ð??µð??¼: %s"
 
-#: ../camel/camel-url.c:313
 #, c-format
+#: ../camel/camel-url.c:315
 msgid "Could not parse URL '%s'"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??¸ð??? URL '%s'"
 
-#: ../camel/camel-vee-folder.c:576
 #, c-format
+#: ../camel/camel-vee-folder.c:1050
 msgid "Error storing '%s': %s"
 msgstr "ð??»ð??¼ ð???ð???ð??¹ð??¦ð??? '%s': %s"
 
-#: ../camel/camel-vee-folder.c:653
 #, c-format
+#: ../camel/camel-vee-folder.c:1123
 msgid "No such message %s in %s"
 msgstr "ð??¯ð??´ ð???ð??³ð??? ð??¥ð??§ð???ð??¦ð??¡ %s ð??¦ð??¯ %s"
 
-#: ../camel/camel-vee-folder.c:812 ../camel/camel-vee-folder.c:818
+#: ../camel/camel-vee-folder.c:1139 ../camel/camel-vee-folder.c:1154
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??ªð???ð??¦ ð??¹ ð??¥ð??µð??? ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? ð??¦ð??¯ð???ð??« ð??© ð???ð??»ð???ð??«ð??©ð??¤ ð???ð??´ð??¤ð???ð??¼"
 
-#: ../camel/camel-vee-store.c:113 ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:353
+#: ../camel/camel-vee-store.c:142 ../camel/camel-vee-store.c:144
+#: ../camel/camel-vee-store.c:414
 msgid "Unmatched"
 msgstr "ð??©ð??¯ð??¥ð??¨ð???ð???"
 
-#: ../camel/camel-vee-store.c:400
-#, c-format
-msgid "Cannot delete folder: %s: No such folder"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??¦ð??¤ð??°ð??? ð???ð??´ð??¤ð???ð??¼: %s: ð??¯ð??´ ð???ð??³ð??? ð???ð??´ð??¤ð???ð??¼"
-
-#: ../camel/camel-vee-store.c:422
 #, c-format
+#: ../camel/camel-vee-store.c:222
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð??®ð??°ð??¯ð??±ð??¥ ð???ð??´ð??¤ð???ð??¼: %s: ð??¯ð??´ ð???ð??³ð??? ð???ð??´ð??¤ð???ð??¼"
 
-#: ../camel/camel-vtrash-folder.c:55
+#, c-format
+#: ../camel/camel-vee-store.c:286
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??¦ð??¤ð??°ð??? ð???ð??´ð??¤ð???ð??¼: %s: ð??¯ð??´ ð???ð??³ð??? ð???ð??´ð??¤ð???ð??¼"
+
+#: ../camel/camel-vtrash-folder.c:50
 msgid "Cannot copy messages to the Trash folder"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??ªð???ð??¦ ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? ð??? ð??? ð???ð??®ð??¨ð??? ð???ð??´ð??¤ð???ð??¼"
 
-#: ../camel/camel-vtrash-folder.c:57
+#: ../camel/camel-vtrash-folder.c:52
 msgid "Cannot copy messages to the Junk folder"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??ªð???ð??¦ ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? ð??? ð??? ð??¡ð??©ð???ð??? ð???ð??´ð??¤ð???ð??¼"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
 #, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??? ð??¥ð??§ð???ð??¦ð??¡: %s\n"
-"  %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
-#: ../camel/providers/local/camel-maildir-folder.c:264
-#: ../camel/providers/local/camel-maildir-folder.c:293
-#: ../camel/providers/local/camel-maildir-folder.c:401
-#: ../camel/providers/local/camel-mbox-folder.c:363
-#: ../camel/providers/local/camel-mbox-folder.c:414
-#: ../camel/providers/local/camel-mh-folder.c:226
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:138
+msgid "Cannot get message: %s\n  %s"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??? ð??¥ð??§ð???ð??¦ð??¡: %s\n  %s"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:138
+#: ../camel/providers/local/camel-maildir-folder.c:233
+#: ../camel/providers/local/camel-maildir-folder.c:268
+#: ../camel/providers/local/camel-maildir-folder.c:389
+#: ../camel/providers/local/camel-mbox-folder.c:334
+#: ../camel/providers/local/camel-mbox-folder.c:385
+#: ../camel/providers/local/camel-mh-folder.c:221
 msgid "No such message"
 msgstr "ð??¯ð??´ ð???ð??³ð??? ð??¥ð??§ð???ð??¦ð??¡"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:148
-#: ../camel/providers/imap4/camel-imap4-folder.c:814
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:250
-#: ../camel/providers/nntp/camel-nntp-folder.c:410
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:152
 #: ../camel/providers/pop3/camel-pop3-folder.c:268
-#: ../camel/providers/pop3/camel-pop3-folder.c:578
-#: ../camel/providers/pop3/camel-pop3-folder.c:639
-#: ../camel/providers/pop3/camel-pop3-folder.c:657
+#: ../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:155
-#: ../camel/providers/imap4/camel-imap4-folder.c:819
-#: ../camel/providers/nntp/camel-nntp-folder.c:166
-#: ../camel/providers/nntp/camel-nntp-folder.c:168
-#: ../camel/providers/nntp/camel-nntp-folder.c:177
-#: ../camel/providers/nntp/camel-nntp-folder.c:252
-#: ../camel/providers/pop3/camel-pop3-folder.c:388
-#: ../camel/providers/pop3/camel-pop3-folder.c:581
-#: ../camel/providers/pop3/camel-pop3-folder.c:642
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-#: ../camel/providers/pop3/camel-pop3-folder.c:660
 #, c-format
+#: ../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
 msgid "Cannot get message %s: %s"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??? ð??¥ð??§ð???ð??¦ð??¡ %s: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:180
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2463
-#: ../camel/providers/imap4/camel-imap4-folder.c:837
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:179
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:188
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2668
 msgid "This message is not available in offline mode."
 msgstr "ð???ð??¦ð??? ð??¥ð??§ð???ð??¦ð??¡ ð??¦ð??? ð??¯ð??ªð??? ð??©ð???ð??±ð??¤ð??©ð???ð??©ð??¤ ð??¦ð??¯ ð??ªð???ð??¤ð??²ð??¯ ð??¥ð??´ð???."
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:194
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:201
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1966
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2017
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:204
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:213
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2137
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2190
 msgid "Could not get message"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??§ð??? ð??¥ð??§ð???ð??¦ð??¡"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:939
-#: ../camel/providers/imap/camel-imap-folder.c:296
 #, c-format
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1044
+#: ../camel/providers/imap/camel-imap-folder.c:369
 msgid "Could not load summary for %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??¤ð??´ð??? ð???ð??³ð??¥ð??¼ð??¦ ð???ð??¹ %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1012
 #, c-format
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1119
 msgid "Checking for deleted messages %s"
 msgstr "ð???ð??§ð???ð??¦ð??? ð???ð??¹ ð???ð??¦ð??¤ð??°ð???ð??©ð??? ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1287
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1419
 msgid "Trash Folder Full. Please Empty."
 msgstr "ð???ð??®ð??¨ð??? ð???ð??´ð??¤ð???ð??¼ ð???ð??«ð??¤. ð???ð??¤ð??°ð??? ð??§ð??¥ð???ð???ð??¦."
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1521
-#: ../camel/providers/groupwise/camel-groupwise-store.c:633
-#: ../camel/providers/groupwise/camel-groupwise-store.c:763
-#: ../camel/providers/imap/camel-imap-folder.c:3423
-#: ../camel/providers/imap/camel-imap-folder.c:3499
 #, c-format
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1666
+#: ../camel/providers/groupwise/camel-groupwise-store.c:639
+#: ../camel/providers/groupwise/camel-groupwise-store.c:776
+#: ../camel/providers/imap/camel-imap-folder.c:3628
+#: ../camel/providers/imap/camel-imap-folder.c:3706
+#: ../camel/providers/imapx/camel-imapx-server.c:3009
+#: ../camel/providers/imapx/camel-imapx-server.c:3105
 msgid "Fetching summary information for new messages in %s"
 msgstr "ð???ð??§ð???ð??¦ð??? ð???ð??³ð??¥ð??¼ð??¦ ð??¦ð??¯ð???ð??¼ð??¥ð??±ð???ð??©ð??¯ ð???ð??¹ ð??¯ð??¿ ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? ð??¦ð??¯ %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2317
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2360
 #, c-format
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2501
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2550
 msgid "Cannot append message to folder '%s': %s"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð??©ð???ð??§ð??¯ð??? ð??¥ð??§ð???ð??¦ð??¡ ð??? ð???ð??´ð??¤ð???ð??¼ '%s': %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2348
 #, c-format
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2536
 msgid "Cannot create message: %s"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð??¥ð??§ð???ð??¦ð??¡: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:281
 #, c-format
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:241
 msgid "Cannot get folder container %s"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??? ð???ð??´ð??¤ð???ð??¼ ð???ð??©ð??¯ð???ð??±ð??¯ð??¼ %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:343
-#: ../camel/providers/imap4/camel-imap4-journal.c:311
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:304
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð??©ð???ð??§ð??¯ð??? ð??¥ð??§ð???ð??¦ð??¡ ð??¦ð??¯ ð??ªð???ð??¤ð??²ð??¯ ð??¥ð??´ð???: ð???ð??¨ð??? ð??©ð??¯ð??©ð???ð??±ð??¤ð??©ð???ð??©ð??¤"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:359
-#: ../camel/providers/imap4/camel-imap4-journal.c:327
 #, c-format
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:321
 msgid "Cannot append message in offline mode: %s"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð??©ð???ð??§ð??¯ð??? ð??¥ð??§ð???ð??¦ð??¡ ð??¦ð??¯ ð??ªð???ð??¤ð??²ð??¯ ð??¥ð??´ð???: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:54
-#: ../camel/providers/imap4/camel-imap4-provider.c:38
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
 msgid "Checking for new mail"
 msgstr "ð???ð??§ð???ð??¦ð??? ð???ð??¹ ð??¯ð??¿ ð??¥ð??±ð??¤"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:51
-#: ../camel/providers/local/camel-local-provider.c:46
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:106
+#, fuzzy
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:45
+msgid "C_heck for new messages in all folders"
+msgstr "C_heck ð???ð??¹ ð??¯ð??¿ ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? ð??¦ð??¯ ð??·ð??¤ ð???ð??´ð??¤ð???ð??¼ð???"
+
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imapx/camel-imapx-provider.c:71
+#: ../camel/providers/local/camel-local-provider.c:42
+#: ../camel/providers/local/camel-local-provider.c:82
+#: ../camel/providers/local/camel-local-provider.c:102
 msgid "Options"
 msgstr "ð??ªð???ð???ð??©ð??¯ð???"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
+#, fuzzy
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
+msgid "_Apply filters to new messages in Inbox on this server"
+msgstr "_Apply ð???ð??¦ð??¤ð???ð??¼ð??? ð??? ð??¯ð??¿ ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? ð??¦ð??¯ Inbox ð??ªð??¯ ð???ð??¦ð??? ð???ð??»ð???ð??¼"
+
+#, fuzzy
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
+msgid "Check new messages for J_unk contents"
+msgstr "ð???ð??§ð??? ð??¯ð??¿ ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? ð???ð??¹ J_unk ð???ð??ªð??¯ð???ð??©ð??¯ð???ð???"
+
+#, fuzzy
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
+#: ../camel/providers/imap/camel-imap-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:77
+msgid "Only check for Junk messages in the IN_BOX folder"
+msgstr "ð??´ð??¯ð??¤ð??¦ ð???ð??§ð??? ð???ð??¹ ð??¡ð??©ð???ð??? ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? ð??¦ð??¯ ð??? IN_BOX ð???ð??´ð??¤ð???ð??¼"
+
+#, fuzzy
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
+msgid "Automatically synchroni_ze account locally"
+msgstr "ð??·ð???ð??©ð??¥ð??¨ð???ð??¦ð???ð??¤ð??¦ synchroni_ze ð??©ð???ð??¬ð??¯ð??? ð??¤ð??´ð???ð??©ð??¤ð??¦"
+
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
 msgid "SOAP Settings"
 msgstr "ð???ð??´ð??? ð???ð??§ð???ð??¦ð???ð???"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:75
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "Post Office Agent SOAP _Port:"
 msgstr "ð???ð??´ð???ð??? ð??ªð???ð??¦ð??? ð??±ð??¡ð??©ð??¯ð??? ð???ð??´ð??? _ð???ð??¹ð???:"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:104
-#: ../camel/providers/hula/camel-hula-provider.c:93
-#: ../camel/providers/imap/camel-imap-provider.c:100
-#: ../camel/providers/imap4/camel-imap4-provider.c:83
-#: ../camel/providers/imapx/camel-imapx-provider.c:66
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
+#, fuzzy
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
+msgid "Novell GroupWise"
+msgstr "ð??¯ð??´ð???ð??§ð??¤ GroupWise"
+
+#, fuzzy
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
+msgid "For accessing Novell GroupWise servers"
+msgstr "ð???ð??¹ ð??¨ð???ð???ð??§ð???ð??¦ð??? ð??¯ð??´ð???ð??§ð??¤ GroupWise ð???ð??»ð???ð??¼ð???"
+
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:98
+#: ../camel/providers/imap/camel-imap-provider.c:96
+#: ../camel/providers/imapx/camel-imapx-provider.c:103
+#: ../camel/providers/nntp/camel-nntp-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:70
 msgid "Password"
 msgstr "ð???ð??­ð???ð??¢ð??¼ð???"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:102
+#, fuzzy
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:100
+msgid ""
+"This option will connect to the GroupWise server using a plaintext password."
+msgstr "ð???ð??¦ð??? ð??ªð???ð???ð??©ð??¯ ð??¢ð??¦ð??¤ ð???ð??©ð??¯ð??§ð???ð??? ð??? ð??? GroupWise ð???ð??»ð???ð??¼ ð??¿ð???ð??¦ð??? ð??© plaintext ð???ð??­ð???ð??¢ð??¼ð???."
+
+#: ../camel/providers/groupwise/camel-groupwise-store.c:106
 msgid "Host or user not available in url"
 msgstr "ð??£ð??´ð???ð??? ð??¹ ð??¿ð???ð??¼ ð??¯ð??ªð??? ð??©ð???ð??±ð??¤ð??©ð???ð??©ð??¤ ð??¦ð??¯ URL"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:204
-#: ../camel/providers/imap/camel-imap-store.c:1356
+#: ../camel/providers/groupwise/camel-groupwise-store.c:205
+#: ../camel/providers/imap/camel-imap-store.c:1223
+#: ../camel/providers/imapx/camel-imapx-server.c:2323
 msgid "You did not enter a password."
 msgstr "ð??¿ ð???ð??¦ð??? ð??¯ð??ªð??? ð??§ð??¯ð???ð??¼ ð??© ð???ð??­ð???ð??¢ð??¼ð???."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:319
+#: ../camel/providers/groupwise/camel-groupwise-store.c:322
 msgid "Some features may not work correctly with your current server version"
 msgstr "ð???ð??³ð??¥ ð???ð??°ð???ð??¼ð??? ð??¥ð??± ð??¯ð??ªð??? ð??¢ð??»ð??? ð???ð??¼ð??§ð???ð???ð??¤ð??¦ ð??¢ð??¦ð??? ð??¿ð??¼ ð???ð??³ð??®ð??©ð??¯ð??? ð???ð??»ð???ð??¼ ð???ð??»ð?? ð??©ð??¯"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:540
-#: ../camel/providers/imap/camel-imap-store.c:1879
-#: ../camel/providers/imap/camel-imap-store.c:2077
-#: ../camel/providers/imapx/camel-imapx-store.c:243
 #, c-format
+#: ../camel/providers/groupwise/camel-groupwise-store.c:543
+#: ../camel/providers/imap/camel-imap-store.c:1757
+#: ../camel/providers/imap/camel-imap-store.c:1953
+#: ../camel/providers/imapx/camel-imapx-store.c:354
 msgid "No such folder %s"
 msgstr "ð??¯ð??´ ð???ð??³ð??? ð???ð??´ð??¤ð???ð??¼ %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:164
-msgid "Sending Message"
-msgstr "ð???ð??§ð??¯ð???ð??¦ð??? ð??¥ð??§ð???ð??¦ð??¡"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:207
-#, c-format
-msgid "Could not send message: %s"
-msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??§ð??¯ð??? ð??¥ð??§ð???ð??¦ð??¡: %s"
-
-#: ../camel/providers/hula/camel-hula-provider.c:48
-#: ../camel/providers/imap/camel-imap-provider.c:44
-msgid "Checking for New Mail"
-msgstr "ð???ð??§ð???ð??¦ð??? ð???ð??¹ ð??¯ð??¿ ð??¥ð??±ð??¤"
-
-#: ../camel/providers/hula/camel-hula-provider.c:53
-#: ../camel/providers/imap/camel-imap-provider.c:52
-msgid "Connection to Server"
-msgstr "ð???ð??©ð??¯ð??§ð???ð???ð??©ð??¯ ð??? ð???ð??»ð???ð??¼"
+#, fuzzy
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1228
+msgid "Cannot create GroupWise folders in offline mode."
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? GroupWise ð???ð??´ð??¤ð???ð??¼ð??? ð??¦ð??¯ ð??ªð???ð??¤ð??²ð??¯ ð??¥ð??´ð???."
+
+#, fuzzy
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1246
+#: ../camel/providers/imap/camel-imap-store.c:1834
+#: ../camel/providers/imap/camel-imap-store.c:2253
+#: ../camel/providers/imapx/camel-imapx-store.c:801
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "ð??? ð???ð??ºð??©ð??¯ð??? ð???ð??´ð??¤ð???ð??¼ ð??¦ð??? ð??¯ð??ªð??? ð??©ð??¤ð??¬ð??? ð??? ð???ð??©ð??¯ð???ð??±ð??¯ subfolders"
+
+#, fuzzy, c-format
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1329
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1354
+msgid "Cannot rename GroupWise folder '%s' to '%s'"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð??®ð??°ð??¯ð??±ð??¥ ð???ð??´ð??¤ð???ð??¼ '%s' ð??? '%s': ð???ð??¨ð??? ð???ð??©ð??¥ð??­ð??¯ð???"
 
-#: ../camel/providers/hula/camel-hula-provider.c:55
-#: ../camel/providers/imap/camel-imap-provider.c:54
-msgid "_Use custom command to connect to server"
-msgstr "_ð??¿ð??? ð???ð??³ð???ð???ð??©ð??¥ ð???ð??©ð??¥ð??­ð??¯ð??? ð??? ð???ð??©ð??¯ð??§ð???ð??? ð??? ð???ð??»ð???ð??¼"
+#, fuzzy, c-format
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1388
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:54
+msgid "GroupWise server %s"
+msgstr "IMAP ð???ð??»ð???ð??¼ %s"
 
-#: ../camel/providers/hula/camel-hula-provider.c:57
-#: ../camel/providers/imap/camel-imap-provider.c:56
-msgid "Command:"
-msgstr "ð???ð??©ð??¥ð??­ð??¯ð???:"
+#, fuzzy, c-format
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1390
+msgid "GroupWise service for %s on %s"
+msgstr "IMAP ð???ð??»ð???ð??¦ð??? ð???ð??¹ %s ð??ªð??¯ %s"
 
-#: ../camel/providers/hula/camel-hula-provider.c:60
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:43
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid "Folders"
-msgstr "ð???ð??´ð??¤ð???ð??¼ð???"
+#, fuzzy, c-format
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:58
+msgid "GroupWise mail delivery via %s"
+msgstr "GroupWise ð??¥ð??±ð??¤ ð???ð??¦ð??¤ð??¦ð???ð??¼ð??¦ ð???ð??²ð??© %s"
 
-#: ../camel/providers/hula/camel-hula-provider.c:62
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:45
-msgid "_Show only subscribed folders"
-msgstr "_ð???ð??´ ð??´ð??¯ð??¤ð??¦ ð???ð??©ð???ð???ð???ð??®ð??²ð???ð??? ð???ð??´ð??¤ð???ð??¼ð???"
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:94
+msgid "Sending Message"
+msgstr "ð???ð??§ð??¯ð???ð??¦ð??? ð??¥ð??§ð???ð??¦ð??¡"
 
-#: ../camel/providers/hula/camel-hula-provider.c:66
-msgid "Namespace"
-msgstr "ð??¯ð??±ð??¥ð???ð???ð??±ð???"
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:103
+msgid "Cannot get folder: Invalid operation on this store"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??? ð???ð??´ð??¤ð???ð??¼: ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð??ªð???ð??¼ð??±ð???ð??©ð??¯ ð??ªð??¯ ð???ð??¦ð??? ð???ð???ð??¹"
 
-#: ../camel/providers/hula/camel-hula-provider.c:76
-msgid "Hula"
-msgstr "ð??£ð??µð??¤ð??©"
+#, fuzzy
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:148
+msgid ""
+"You have exceeded this account's storage limit. Your messages are queued in "
+"your Outbox. Resend by pressing Send/Receive after deleting/archiving some of "
+"your mail.\n"
+msgstr ""
+"ð??¿ ð??£ð??¨ð??? ð??©ð???ð???ð??°ð???ð??©ð??? ð???ð??¦ð??? ð??©ð???ð??¶ð??¯ð???ð??? ð???ð???ð??¹ð??¦ð??¡ ð??¤ð??¦ð??¥ð??¦ð???. ð??¿ð??¼ ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? ð??¸ ð???ð??¿ð??? ð??¦ð??¯ ð??¿ð??¼ Outbox. Resend "
+"ð???ð??² ð???ð??®ð??§ð???ð??¦ð??? ð???ð??§ð??¯ð???/ð??®ð??¦ð???ð??°ð??? ð??­ð???ð???ð??¼ ð???ð??¦ð??¤ð??°ð???ð??¦ð???/ð??¸ð???ð??²ð???ð??¦ð??? ð???ð??³ð??¥ ð??? ð??¿ð??¼ ð??¥ð??±ð??¤.\n"
 
-#: ../camel/providers/hula/camel-hula-provider.c:78
-msgid "For accessing Hula servers"
-msgstr "ð???ð??¹ ð??¨ð???ð???ð??§ð???ð??¦ð??? ð??£ð??µð??¤ð??© ð???ð??»ð???ð??¼ð???"
+#, c-format
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:152
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:193
+msgid "Could not send message: %s"
+msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??§ð??¯ð??? ð??¥ð??§ð???ð??¦ð??¡: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:181
-#: ../camel/providers/imap/camel-imap-command.c:265
+#: ../camel/providers/imap/camel-imap-command.c:189
+#: ../camel/providers/imap/camel-imap-command.c:282
 msgid "No output stream"
 msgstr "ð??¯ð??´ ð??¬ð???ð???ð??«ð??? ð???ð???ð??®ð??°ð??¥"
 
-#: ../camel/providers/imap/camel-imap-command.c:186
-#: ../camel/providers/imap/camel-imap-command.c:270
+#: ../camel/providers/imap/camel-imap-command.c:196
+#: ../camel/providers/imap/camel-imap-command.c:289
 msgid "No input stream"
 msgstr "ð??¯ð??´ ð??¦ð??¯ð???ð??«ð??? ð???ð???ð??®ð??°ð??¥"
 
-#: ../camel/providers/imap/camel-imap-command.c:229
-#: ../camel/providers/imap/camel-imap-command.c:278
-#: ../camel/providers/imap/camel-imap-command.c:492
-#: ../camel/providers/imap/camel-imap-store.c:3088
+#: ../camel/providers/imap/camel-imap-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:3049
 msgid "Operation cancelled"
 msgstr "ð??ªð???ð??¼ð??±ð???ð??©ð??¯ ð???ð??¨ð??¯ð???ð??©ð??¤ð???"
 
-#: ../camel/providers/imap/camel-imap-command.c:331
-#: ../camel/providers/imap/camel-imap-store.c:3093
 #, c-format
+#: ../camel/providers/imap/camel-imap-command.c:353
+#: ../camel/providers/imap/camel-imap-store.c:3057
 msgid "Server unexpectedly disconnected: %s"
 msgstr "ð???ð??»ð???ð??¼ ð??©ð??¯ð??¦ð???ð???ð???ð??§ð???ð???ð??¦ð???ð??¤ð??° ð???ð??¦ð???ð???ð??©ð??¯ð??§ð???ð???ð??©ð???: %s"
 
 #. for imap ALERT codes, account user host
 #. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:352
 #, c-format
-msgid ""
-"Alert from IMAP server %s %s:\n"
-"%s"
-msgstr ""
-"ð??©ð??¤ð??»ð??? ð???ð??®ð??ªð??¥ IMAP ð???ð??»ð???ð??¼ %s %s:\n"
-"%s"
+#: ../camel/providers/imap/camel-imap-command.c:373
+msgid "Alert from IMAP server %s %s:\n%s"
+msgstr "ð??©ð??¤ð??»ð??? ð???ð??®ð??ªð??¥ IMAP ð???ð??»ð???ð??¼ %s %s:\n%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:421
 #, c-format
+#: ../camel/providers/imap/camel-imap-command.c:443
 msgid "Unexpected response from IMAP server: %s"
 msgstr "ð??³ð??¯ð??¦ð???ð???ð???ð??§ð???ð???ð??©ð??? ð??®ð??¦ð???ð???ð??ªð??¯ð??? ð???ð??®ð??ªð??¥ IMAP ð???ð??»ð???ð??¼: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:431
 #, c-format
+#: ../camel/providers/imap/camel-imap-command.c:454
 msgid "IMAP command failed: %s"
 msgstr "IMAP ð???ð??©ð??¥ð??­ð??¯ð??? ð???ð??±ð??¤ð???: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:506
+#: ../camel/providers/imap/camel-imap-command.c:536
 msgid "Server response ended too soon."
 msgstr "ð???ð??»ð???ð??¼ ð??®ð??¦ð???ð???ð??ªð??¯ð??? ð??§ð??¯ð???ð??©ð??? ð???ð??µ ð???ð??µð??¯."
 
-#: ../camel/providers/imap/camel-imap-command.c:712
 #, c-format
+#: ../camel/providers/imap/camel-imap-command.c:743
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP ð???ð??»ð???ð??¼ ð??®ð??¦ð???ð???ð??ªð??¯ð??? ð???ð??¦ð??? ð??¯ð??ªð??? ð???ð??©ð??¯ð???ð??±ð??¯ %s ð??¦ð??¯ð???ð??¼ð??¥ð??±ð???ð??©ð??¯"
 
-#: ../camel/providers/imap/camel-imap-command.c:748
 #, c-format
+#: ../camel/providers/imap/camel-imap-command.c:780
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "ð??³ð??¯ð??¦ð???ð???ð???ð??§ð???ð???ð??©ð??? OK ð??®ð??¦ð???ð???ð??ªð??¯ð??? ð???ð??®ð??ªð??¥ IMAP ð???ð??»ð???ð??¼: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:91
+#: ../camel/providers/imap/camel-imap-folder.c:275
 msgid "Always check for new mail in this folder"
 msgstr "ð??·ð??¤ð??¢ð??±ð??? ð???ð??§ð??? ð???ð??¹ ð??¯ð??¿ ð??¥ð??±ð??¤ ð??¦ð??¯ ð???ð??¦ð??? ð???ð??´ð??¤ð???ð??¼"
 
-#: ../camel/providers/imap/camel-imap-folder.c:277
 #, c-format
+#: ../camel/providers/imap/camel-imap-folder.c:346
 msgid "Could not create directory %s: %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð???ð??²ð??®ð??§ð???ð???ð??¼ð??¦ %s: %s"
 
-#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:919
 #, c-format
+#: ../camel/providers/imap/camel-imap-folder.c:939
+#: ../camel/providers/imapx/camel-imapx-server.c:3043
 msgid "Scanning for changed messages in %s"
 msgstr "ð???ð???ð??¨ð??¯ð??¦ð??? ð???ð??¹ ð???ð??±ð??¯ð??¡ð??? ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? ð??¦ð??¯ %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1987
 #, c-format
+#: ../camel/providers/imap/camel-imap-folder.c:2079
 msgid "Unexpected response status '%s' after APPEND command"
 msgstr "ð??³ð??¯ð??¦ð???ð???ð???ð??§ð???ð???ð??©ð??? ð??®ð??¦ð???ð???ð??ªð??¯ð??? ð???ð???ð??±ð???ð??«ð??? '%s' ð??­ð???ð???ð??¼ ð??©ð???ð??§ð??¯ð??? ð???ð??©ð??¥ð??­ð??¯ð???"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2002
+#: ../camel/providers/imap/camel-imap-folder.c:2097
 msgid "No response on continuation after APPEND command"
 msgstr "ð??¯ð??´ ð??®ð??¦ð???ð???ð??ªð??¯ð??? ð??ªð??¯ ð???ð??©ð??¯ð???ð??¦ð??¯ð???ð??µð??±ð???ð??©ð??¯ ð??­ð???ð???ð??¼ ð??©ð???ð??§ð??¯ð??? ð???ð??©ð??¥ð??­ð??¯ð???"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2047
+#: ../camel/providers/imap/camel-imap-folder.c:2150
 msgid "Unknown error occurred during APPEND command!"
 msgstr "ð??³ð??¯ð??´ð??¯ ð??»ð??¼ ð??ªð???ð??»ð??? ð???ð???ð??«ð??¼ð??¦ð??? ð??©ð???ð??§ð??¯ð??? ð???ð??©ð??¥ð??­ð??¯ð???!"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2878
 #, c-format
+#: ../camel/providers/imap/camel-imap-folder.c:3055
 msgid "Unable to retrieve message: %s"
 msgstr "ð??³ð??¯ð??±ð???ð??©ð??¤ ð??? ð??®ð??¦ð???ð??®ð??°ð??? ð??¥ð??§ð???ð??¦ð??¡: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2913
 #, c-format
+#: ../camel/providers/imap/camel-imap-folder.c:3090
+#: ../camel/providers/imapx/camel-imapx-server.c:4050
 msgid "Cannot get message with message ID %s: %s"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??? ð??¥ð??§ð???ð??¦ð??¡ ð??¢ð??¦ð??? ð??¥ð??§ð???ð??¦ð??¡ ID %s: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2914
+#: ../camel/providers/imap/camel-imap-folder.c:3091
+#: ../camel/providers/imapx/camel-imapx-server.c:4051
 msgid "No such message available."
 msgstr "ð??¯ð??´ ð???ð??³ð??? ð??¥ð??§ð???ð??¦ð??¡ ð??©ð???ð??±ð??¤ð??©ð???ð??©ð??¤."
 
-#: ../camel/providers/imap/camel-imap-folder.c:2975
-#: ../camel/providers/imap/camel-imap-folder.c:3810
-#: ../camel/providers/nntp/camel-nntp-folder.c:238
+#: ../camel/providers/imap/camel-imap-folder.c:3159
+#: ../camel/providers/imap/camel-imap-folder.c:4039
+#: ../camel/providers/nntp/camel-nntp-folder.c:331
 msgid "This message is not currently available"
 msgstr "ð???ð??¦ð??? ð??¥ð??§ð???ð??¦ð??¡ ð??¦ð??? ð??¯ð??ªð??? ð???ð??³ð??®ð??©ð??¯ð???ð??¤ð??¦ ð??©ð???ð??±ð??¤ð??©ð???ð??©ð??¤"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3626
 #, c-format
+#: ../camel/providers/imap/camel-imap-folder.c:3835
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "ð??¦ð??¯ð???ð??©ð??¥ð???ð??¤ð??°ð??? ð???ð??»ð???ð??¼ ð??®ð??¦ð???ð???ð??ªð??¯ð???: ð??¯ð??´ ð??¦ð??¯ð???ð??¼ð??¥ð??±ð???ð??©ð??¯ ð???ð??®ð??©ð???ð??²ð???ð??©ð??? ð???ð??¹ ð??¥ð??§ð???ð??¦ð??¡ %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3848
+#, fuzzy, c-format
+#: ../camel/providers/imap/camel-imap-folder.c:3845
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr "ð??¦ð??¯ð???ð??©ð??¥ð???ð??¤ð??°ð??? ð???ð??»ð???ð??¼ ð??®ð??¦ð???ð???ð??ªð??¯ð???: ð??¯ð??´ ð??¦ð??¯ð???ð??¼ð??¥ð??±ð???ð??©ð??¯ ð???ð??®ð??©ð???ð??²ð???ð??©ð??? ð???ð??¹ ð??¥ð??§ð???ð??¦ð??¡ %d"
+
+#: ../camel/providers/imap/camel-imap-folder.c:4079
 msgid "Could not find message body in FETCH response."
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??²ð??¯ð??? ð??¥ð??§ð???ð??¦ð??¡ ð???ð??ªð???ð??¦ ð??¦ð??¯ ð???ð??§ð??? ð??®ð??¦ð???ð???ð??ªð??¯ð???."
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:181
-#: ../camel/providers/imap/camel-imap-message-cache.c:244
 #, c-format
+#: ../camel/providers/imap/camel-imap-message-cache.c:196
+#: ../camel/providers/imap/camel-imap-message-cache.c:261
 msgid "Could not open cache directory: %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??´ð???ð??©ð??¯ ð???ð??¨ð??? ð???ð??²ð??®ð??§ð???ð???ð??¼ð??¦: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:330
-#: ../camel/providers/imap/camel-imap-message-cache.c:387
-#: ../camel/providers/imap/camel-imap-message-cache.c:418
-#: ../camel/providers/imap/camel-imap-message-cache.c:450
 #, c-format
+#: ../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
 msgid "Failed to cache message %s: %s"
 msgstr "ð???ð??±ð??¤ð??? ð??? ð???ð??¨ð??? ð??¥ð??§ð???ð??¦ð??¡ %s: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:530
 #, c-format
+#: ../camel/providers/imap/camel-imap-message-cache.c:549
 msgid "Failed to cache %s: %s"
 msgstr "ð???ð??±ð??¤ð??? ð??? ð???ð??¨ð??? %s: %s"
 
+#: ../camel/providers/imap/camel-imap-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:41
+msgid "Checking for New Mail"
+msgstr "ð???ð??§ð???ð??¦ð??? ð???ð??¹ ð??¯ð??¿ ð??¥ð??±ð??¤"
+
+#, fuzzy
+#: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:47
+msgid "Ch_eck for new messages in subscribed folders"
+msgstr "Ch_eck ð???ð??¹ ð??¯ð??¿ ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? ð??¦ð??¯ ð???ð??©ð???ð???ð???ð??®ð??²ð???ð??? ð???ð??´ð??¤ð???ð??¼ð???"
+
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:51
+msgid "Connection to Server"
+msgstr "ð???ð??©ð??¯ð??§ð???ð???ð??©ð??¯ ð??? ð???ð??»ð???ð??¼"
+
+#: ../camel/providers/imap/camel-imap-provider.c:50
+#: ../camel/providers/imapx/camel-imapx-provider.c:53
+msgid "_Use custom command to connect to server"
+msgstr "_ð??¿ð??? ð???ð??³ð???ð???ð??©ð??¥ ð???ð??©ð??¥ð??­ð??¯ð??? ð??? ð???ð??©ð??¯ð??§ð???ð??? ð??? ð???ð??»ð???ð??¼"
+
+#, fuzzy
+#: ../camel/providers/imap/camel-imap-provider.c:52
+msgid "Co_mmand:"
+msgstr "Co_mmand:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:61
+#: ../camel/providers/nntp/camel-nntp-provider.c:42
+msgid "Folders"
+msgstr "ð???ð??´ð??¤ð???ð??¼ð???"
+
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:63
+msgid "_Show only subscribed folders"
+msgstr "_ð???ð??´ ð??´ð??¯ð??¤ð??¦ ð???ð??©ð???ð???ð???ð??®ð??²ð???ð??? ð???ð??´ð??¤ð???ð??¼ð???"
+
+#, fuzzy
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:66
+msgid "O_verride server-supplied folder namespace"
+msgstr "O_verride ð???ð??»ð???ð??¼-ð???ð??©ð???ð??¤ð??²ð??? ð???ð??´ð??¤ð???ð??¼ ð??¯ð??±ð??¥ð???ð???ð??±ð???"
+
+#, fuzzy
+#: ../camel/providers/imap/camel-imap-provider.c:62
+msgid "Names_pace:"
+msgstr "Names_pace:"
+
+#, fuzzy
 #: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:49
-msgid "Namespace:"
-msgstr "ð??¯ð??±ð??¥ð???ð???ð??±ð???:"
+#: ../camel/providers/imapx/camel-imapx-provider.c:73
+msgid "_Apply filters to new messages in INBOX on this server"
+msgstr "_Apply ð???ð??¦ð??¤ð???ð??¼ð??? ð??? ð??¯ð??¿ ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? ð??¦ð??¯ INBOX ð??ªð??¯ ð???ð??¦ð??? ð???ð??»ð???ð??¼"
 
-#: ../camel/providers/imap/camel-imap-provider.c:83
+#, fuzzy
+#: ../camel/providers/imap/camel-imap-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
+msgid "Check new messages for Jun_k contents"
+msgstr "ð???ð??§ð??? ð??¯ð??¿ ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? ð???ð??¹ Jun_k ð???ð??ªð??¯ð???ð??©ð??¯ð???ð???"
+
+#, fuzzy
+#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:79
+msgid "Automatically synchroni_ze remote mail locally"
+msgstr "ð??·ð???ð??©ð??¥ð??¨ð???ð??¦ð???ð??¤ð??¦ synchroni_ze ð??®ð??¦ð??¥ð??´ð??? ð??¥ð??±ð??¤ ð??¤ð??´ð???ð??©ð??¤ð??¦"
+
+#: ../camel/providers/imap/camel-imap-provider.c:79
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:89
 msgid "For reading and storing mail on IMAP servers."
 msgstr "ð???ð??¹ ð??®ð??°ð???ð??¦ð??? ð??¯ ð???ð???ð??¹ð??¦ð??? ð??¥ð??±ð??¤ ð??ªð??¯ IMAP ð???ð??»ð???ð??¼ð???."
 
-#: ../camel/providers/imap/camel-imap-store.c:435
-#: ../camel/providers/imap4/camel-imap4-store.c:210
+#, fuzzy
+#: ../camel/providers/imap/camel-imap-provider.c:98
+#: ../camel/providers/imapx/camel-imapx-provider.c:105
+msgid ""
+"This option will connect to the IMAP server using a plaintext password."
+msgstr "ð???ð??¦ð??? ð??ªð???ð???ð??©ð??¯ ð??¢ð??¦ð??¤ ð???ð??©ð??¯ð??§ð???ð??? ð??? ð??? ·ð??¦Â·ð??¥Â·ð??¨Â·ð??? ð???ð??»ð???ð??¼ ð??¿ð???ð??¦ð??? ð??© plaintext ð???ð??­ð???ð??¢ð??¼ð???."
+
 #, c-format
+#: ../camel/providers/imap/camel-imap-store.c:287
+#: ../camel/providers/imapx/camel-imapx-store.c:206
 msgid "IMAP server %s"
 msgstr "IMAP ð???ð??»ð???ð??¼ %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:212
 #, c-format
+#: ../camel/providers/imap/camel-imap-store.c:289
+#: ../camel/providers/imapx/camel-imapx-store.c:208
 msgid "IMAP service for %s on %s"
 msgstr "IMAP ð???ð??»ð???ð??¦ð??? ð???ð??¹ %s ð??ªð??¯ %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:566
-#: ../camel/providers/imap/camel-imap-store.c:581
-#: ../camel/providers/imap4/camel-imap4-store.c:247
-#: ../camel/providers/imap4/camel-imap4-store.c:262
-#: ../camel/providers/nntp/camel-nntp-store.c:182
-#: ../camel/providers/nntp/camel-nntp-store.c:197
-#: ../camel/providers/pop3/camel-pop3-store.c:170
-#: ../camel/providers/pop3/camel-pop3-store.c:184
-#: ../camel/providers/smtp/camel-smtp-transport.c:259
-#: ../camel/providers/smtp/camel-smtp-transport.c:274
 #, c-format
+#: ../camel/providers/imap/camel-imap-store.c:419
+#: ../camel/providers/imap/camel-imap-store.c:436
+#: ../camel/providers/nntp/camel-nntp-store.c:230
+#: ../camel/providers/nntp/camel-nntp-store.c:246
+#: ../camel/providers/pop3/camel-pop3-store.c:170
+#: ../camel/providers/pop3/camel-pop3-store.c:186
+#: ../camel/providers/smtp/camel-smtp-transport.c:212
+#: ../camel/providers/smtp/camel-smtp-transport.c:227
 msgid "Could not connect to %s: %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??©ð??¯ð??§ð???ð??? ð??? %s: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:567
-#: ../camel/providers/imap4/camel-imap4-store.c:248
-#: ../camel/providers/nntp/camel-nntp-store.c:183
+#: ../camel/providers/imap/camel-imap-store.c:420
+#: ../camel/providers/nntp/camel-nntp-store.c:231
 #: ../camel/providers/pop3/camel-pop3-store.c:171
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
+#: ../camel/providers/smtp/camel-smtp-transport.c:213
 msgid "SSL unavailable"
 msgstr "SSL ð??©ð??¯ð??©ð???ð??±ð??¤ð??©ð???ð??©ð??¤"
 
-#: ../camel/providers/imap/camel-imap-store.c:578
-#: ../camel/providers/imap/camel-imap-store.c:860
-#: ../camel/providers/imapx/camel-imapx-server.c:1505
+#: ../camel/providers/imap/camel-imap-store.c:432
+#: ../camel/providers/imap/camel-imap-store.c:717
+#: ../camel/providers/imapx/camel-imapx-server.c:2185
 msgid "Connection cancelled"
 msgstr "ð???ð??©ð??¯ð??§ð???ð???ð??©ð??¯ ð???ð??¨ð??¯ð???ð??©ð??¤ð???"
 
-#: ../camel/providers/imap/camel-imap-store.c:689
-#: ../camel/providers/imap/camel-imap-store.c:708
-#: ../camel/providers/imap/camel-imap-store.c:714
-#: ../camel/providers/imap/camel-imap-store.c:740
-#: ../camel/providers/imap4/camel-imap4-store.c:310
-#: ../camel/providers/imap4/camel-imap4-store.c:325
-#: ../camel/providers/imap4/camel-imap4-store.c:334
 #, c-format
+#: ../camel/providers/imap/camel-imap-store.c:542
+#: ../camel/providers/imap/camel-imap-store.c:562
+#: ../camel/providers/imap/camel-imap-store.c:569
+#: ../camel/providers/imap/camel-imap-store.c:596
+#: ../camel/providers/imapx/camel-imapx-server.c:2230
+#: ../camel/providers/imapx/camel-imapx-server.c:2251
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "ð???ð??±ð??¤ð??? ð??? ð???ð??©ð??¯ð??§ð???ð??? ð??? IMAP ð???ð??»ð???ð??¼ %s ð??¦ð??¯ ð???ð??¦ð???ð???ð??«ð??¼ ð??¥ð??´ð???: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:709
+#, fuzzy
+#: ../camel/providers/imap/camel-imap-store.c:543
+#: ../camel/providers/imapx/camel-imapx-server.c:2231
+#: ../camel/providers/smtp/camel-smtp-transport.c:286
+msgid "STARTTLS not supported"
+msgstr "STARTTLS ð??¯ð??ªð??? ð???ð??©ð???ð??¹ð???ð??©ð???"
+
+#: ../camel/providers/imap/camel-imap-store.c:563
+#: ../camel/providers/imapx/camel-imapx-server.c:2252
 msgid "SSL negotiations failed"
 msgstr "SSL ð??¯ð??©ð???ð??´ð???ð??°ð??±ð???ð??©ð??¯ð??? ð???ð??±ð??¤ð???"
 
-#: ../camel/providers/imap/camel-imap-store.c:715
-#: ../camel/providers/imap4/camel-imap4-store.c:335
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
+#: ../camel/providers/imap/camel-imap-store.c:570
+#: ../camel/providers/smtp/camel-smtp-transport.c:327
 msgid "SSL is not available in this build"
 msgstr "SSL ð??¦ð??? ð??¯ð??ªð??? ð??©ð???ð??±ð??¤ð??©ð???ð??©ð??¤ ð??¦ð??¯ ð???ð??¦ð??? ð???ð??¦ð??¤ð???"
 
-#: ../camel/providers/imap/camel-imap-store.c:863
 #, c-format
+#: ../camel/providers/imap/camel-imap-store.c:721
 msgid "Could not connect with command \"%s\": %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??©ð??¯ð??§ð???ð??? ð??¢ð??¦ð??? ð???ð??©ð??¥ð??­ð??¯ð??? \"%s\": %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1303
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#, fuzzy
+#: ../camel/providers/imap/camel-imap-store.c:910
+#: ../camel/providers/imap/camel-imap-store.c:2346
+#: ../camel/providers/imapx/camel-imapx-store.c:406
+#: ../camel/providers/imapx/camel-imapx-store.c:968
+#: ../camel/providers/local/camel-maildir-folder.c:90
+#: ../camel/providers/local/camel-maildir-store.c:219
+#: ../camel/providers/local/camel-maildir-store.c:306
+#: ../camel/providers/local/camel-maildir-store.c:552
+#: ../camel/providers/local/camel-maildir-store.c:565
+#: ../camel/providers/local/camel-spool-store.c:500
+msgid "Inbox"
+msgstr "Inbox"
+
 #, c-format
+#: ../camel/providers/imap/camel-imap-store.c:1168
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ð???ð??»ð???ð??¼ %s ð???ð??³ð??? ð??¯ð??ªð??? ð???ð??©ð???ð??¹ð??? ð??®ð??¦ð???ð??¢ð??§ð???ð???ð??©ð??? ð??·ð???ð??§ð??¯ð???ð??¦ð???ð??±ð???ð??©ð??¯ ð???ð??²ð??? %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1313
-#: ../camel/providers/smtp/camel-smtp-transport.c:506
 #, c-format
+#: ../camel/providers/imap/camel-imap-store.c:1179
+#: ../camel/providers/smtp/camel-smtp-transport.c:465
 msgid "No support for authentication type %s"
 msgstr "ð??¯ð??´ ð???ð??©ð???ð??¹ð??? ð???ð??¹ ð??·ð???ð??§ð??¯ð???ð??¦ð???ð??±ð???ð??©ð??¯ ð???ð??²ð??? %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1387
 #, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"ð??³ð??¯ð??±ð???ð??©ð??¤ ð??? ð??·ð???ð??§ð??¯ð???ð??¦ð???ð??±ð??? ð??? IMAP ð???ð??»ð???ð??¼.\n"
-"%s\n"
-"\n"
+#: ../camel/providers/imap/camel-imap-store.c:1254
+#: ../camel/providers/imapx/camel-imapx-server.c:2351
+msgid "Unable to authenticate to IMAP server.\n%s\n\n"
+msgstr "ð??³ð??¯ð??±ð???ð??©ð??¤ ð??? ð??·ð???ð??§ð??¯ð???ð??¦ð???ð??±ð??? ð??? IMAP ð???ð??»ð???ð??¼.\n%s\n\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1891
-#: ../camel/providers/imap/camel-imap-store.c:2272
-#: ../camel/providers/imap4/camel-imap4-store.c:954
 #, c-format
+#: ../camel/providers/imap/camel-imap-store.c:1770
+#: ../camel/providers/imap/camel-imap-store.c:2192
+#: ../camel/providers/imapx/camel-imapx-store.c:786
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "ð??? ð???ð??´ð??¤ð???ð??¼ ð??¯ð??±ð??¥ \"%s\" ð??¦ð??? ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð???ð??¦ð???ð??ªð??? ð??¦ð??? ð???ð??©ð??¯ð???ð??±ð??¯ð??? ð??? ð???ð??¸ð??©ð???ð???ð??¼ \"%c\""
 
-#: ../camel/providers/imap/camel-imap-store.c:2008
-#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:204
-#: ../camel/providers/local/camel-mh-store.c:249
 #, c-format
+#: ../camel/providers/imap/camel-imap-store.c:1889
+#: ../camel/providers/local/camel-maildir-store.c:184
+#: ../camel/providers/local/camel-mbox-store.c:189
+#: ../camel/providers/local/camel-mh-store.c:250
 msgid "Cannot create folder '%s': folder exists."
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð???ð??´ð??¤ð???ð??¼ '%s': ð???ð??´ð??¤ð???ð??¼ ð??§ð???ð???ð??¦ð???ð???ð???."
 
-#: ../camel/providers/imap/camel-imap-store.c:2283
 #, c-format
+#: ../camel/providers/imap/camel-imap-store.c:2203
+#: ../camel/providers/imapx/camel-imapx-store.c:794
 msgid "Unknown parent folder: %s"
 msgstr "ð??³ð??¯ð??´ð??¯ ð???ð??ºð??©ð??¯ð??? ð???ð??´ð??¤ð???ð??¼: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3090
+#: ../camel/providers/imap/camel-imap-store.c:3053
 msgid "Server unexpectedly disconnected"
 msgstr "ð???ð??»ð???ð??¼ ð??©ð??¯ð??¦ð???ð???ð???ð??§ð???ð???ð??¦ð???ð??¤ð??° ð???ð??¦ð???ð???ð??©ð??¯ð??§ð???ð???ð??©ð???"
 
-#: ../camel/providers/imap4/camel-imap4-command.c:572
-#: ../camel/providers/imap4/camel-imap4-command.c:579
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "ð???ð??±ð??¤ð??? ð???ð??§ð??¯ð???ð??¦ð??? ð???ð??©ð??¥ð??­ð??¯ð??? ð??? IMAP ð???ð??»ð???ð??¼ %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:681
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "ð??³ð??¯ð??¦ð???ð???ð???ð??§ð???ð???ð??©ð??? ð??®ð??¦ð???ð???ð??ªð??¯ð??? ð???ð??®ð??ªð??¥ IMAP4 ð???ð??»ð???ð??¼ %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:215
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "ð??³ð??¯ð??¦ð???ð???ð???ð??§ð???ð???ð??©ð??? ð???ð??®ð??°ð???ð??¦ð??? ð???ð??®ð??ªð??¥ IMAP ð???ð??»ð???ð??¼ %s."
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:440
-#, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??©ð??¤ð??§ð???ð??? ð???ð??´ð??¤ð???ð??¼ '%s': ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð??¥ð??±ð??¤ð???ð??ªð???ð??? ð??¯ð??±ð??¥"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:446
-#, c-format
-msgid "Cannot select folder '%s': Bad command"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??©ð??¤ð??§ð???ð??? ð???ð??´ð??¤ð???ð??¼ '%s': ð???ð??¨ð??? ð???ð??©ð??¥ð??­ð??¯ð???"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1414
-#, c-format
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr "ð???ð??±ð??¤ð??? ð??? ð???ð??§ð??¯ð??? ð???ð??©ð??¥ð??­ð??¯ð??? ð??? IMAP ð???ð??»ð???ð??¼ %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1416
-msgid "service unavailable"
-msgstr "ð???ð??»ð???ð??¦ð??? ð??©ð??¯ð??©ð???ð??±ð??¤ð??©ð???ð??©ð??¤"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1546
-#: ../camel/providers/imap4/camel-imap4-engine.c:1584
-#: ../camel/providers/imap4/camel-imap4-engine.c:1628
-#: ../camel/providers/imap4/camel-imap4-engine.c:1683
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "IMAP4 ð???ð??»ð???ð??¼ %s ð??©ð??¯ð??¦ð???ð???ð???ð??§ð???ð???ð??¦ð???ð??¤ð??° ð???ð??¦ð???ð???ð??©ð??¯ð??§ð???ð???ð??©ð???: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:88
-msgid "Expire cached messages that haven't been read in X seconds"
-msgstr "ð??¦ð???ð???ð???ð??²ð??® ð???ð??¨ð???ð??? ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? ð???ð??¨ð??? ð??£ð??±ð???ð??©ð??¯'ð???ð??° ð???ð??°ð??¯ ð??®ð??§ð??? ð??¦ð??¯ X ð???ð??§ð???ð??©ð??¯ð???ð???"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
-msgid "Expire cached messages older than X seconds"
-msgstr "ð??¦ð???ð???ð???ð??²ð??® ð???ð??¨ð???ð??? ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? ð??´ð??¤ð???ð??¼ ð???ð??¨ð??¯ X ð???ð??§ð???ð??©ð??¯ð???ð???"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:427
-#, c-format
-msgid "Cannot access folder '%s': %s"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð??¨ð???ð???ð??§ð??? ð???ð??´ð??¤ð???ð??¼ '%s': %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:484
-#, c-format
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??¦ð???ð??? ð???ð??¤ð??¨ð???ð??? ð??? ð???ð??´ð??¤ð???ð??¼ '%s': ð??³ð??¯ð??´ð??¯ ð??»ð??¼"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:490
-#, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??¦ð???ð??? ð???ð??¤ð??¨ð???ð??? ð??? ð???ð??´ð??¤ð???ð??¼ '%s': ð???ð??¨ð??? ð???ð??©ð??¥ð??­ð??¯ð???"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:630
-#, c-format
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð??¦ð???ð???ð???ð??©ð??¯ð??¡ ð???ð??´ð??¤ð???ð??¼ '%s': ð??³ð??¯ð??´ð??¯ ð??»ð??¼"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:635
-#, c-format
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð??¦ð???ð???ð???ð??©ð??¯ð??¡ ð???ð??´ð??¤ð???ð??¼ '%s': ð???ð??¨ð??? ð???ð??©ð??¥ð??­ð??¯ð???"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:891
-#, c-format
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??? ð??¥ð??§ð???ð??¦ð??¡ %s ð???ð??®ð??ªð??¥ ð???ð??´ð??¤ð???ð??¼ '%s': ð??¯ð??´ ð???ð??³ð??? ð??¥ð??§ð???ð??¦ð??¡"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:896
-#, c-format
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??? ð??¥ð??§ð???ð??¦ð??¡ %s ð???ð??®ð??ªð??¥ ð???ð??´ð??¤ð???ð??¼ '%s': ð???ð??¨ð??? ð???ð??©ð??¥ð??­ð??¯ð???"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:940
-#, c-format
-msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð??©ð???ð??§ð??¯ð??? ð??¥ð??§ð???ð??¦ð??¡ ð??? ð???ð??´ð??¤ð???ð??¼ '%s': ð???ð??´ð??¤ð???ð??¼ ð??¦ð??? ð??®ð??§ð???-ð??´ð??¯ð??¤ð??¦"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1033
-#, c-format
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð??©ð???ð??§ð??¯ð??? ð??¥ð??§ð???ð??¦ð??¡ ð??? ð???ð??´ð??¤ð???ð??¼ '%s': ð??³ð??¯ð??´ð??¯ ð??»ð??¼"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1063
-#, c-format
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð??©ð???ð??§ð??¯ð??? ð??¥ð??§ð???ð??¦ð??¡ ð??? ð???ð??´ð??¤ð???ð??¼ '%s': ð???ð??¨ð??? ð???ð??©ð??¥ð??­ð??¯ð???"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1182
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð??¥ð??µð??? ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? ð???ð??®ð??ªð??¥ ð???ð??´ð??¤ð???ð??¼ '%s' ð??? ð???ð??´ð??¤ð???ð??¼ '%s': ð??³ð??¯ð??´ð??¯ ð??»ð??¼"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1186
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??ªð???ð??¦ ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? ð???ð??®ð??ªð??¥ ð???ð??´ð??¤ð???ð??¼ '%s' ð??? ð???ð??´ð??¤ð???ð??¼ '%s': ð??³ð??¯ð??´ð??¯ ð??»ð??¼"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1194
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð??¥ð??µð??? ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? ð???ð??®ð??ªð??¥ ð???ð??´ð??¤ð???ð??¼ '%s' ð??? ð???ð??´ð??¤ð???ð??¼ '%s': ð???ð??¨ð??? ð???ð??©ð??¥ð??­ð??¯ð???"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1198
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??ªð???ð??¦ ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? ð???ð??®ð??ªð??¥ ð???ð??´ð??¤ð???ð??¼ '%s' ð??? ð???ð??´ð??¤ð???ð??¼ '%s': ð???ð??¨ð??? ð???ð??©ð??¥ð??­ð??¯ð???"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:55
-msgid "Check new messages for _Junk contents"
-msgstr "ð???ð??§ð??? ð??¯ð??¿ ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? ð???ð??¹ _ð??¡ð??©ð???ð??? ð???ð??ªð??¯ð???ð??©ð??¯ð???ð???"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:66
-msgid "IMAP4rev1"
-msgstr "IMAP4rev1"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:68
-msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr "ð???ð??¹ ð??®ð??°ð???ð??¦ð??? ð??¯ ð???ð???ð??¹ð??¦ð??? ð??¥ð??±ð??¤ ð??ªð??¯ IMAPv4rev1 ð???ð??»ð???ð??¼ð???."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:259
-#: ../camel/providers/nntp/camel-nntp-store.c:194
-#: ../camel/providers/nntp/camel-nntp-store.c:213
-#: ../camel/providers/pop3/camel-pop3-store.c:181
-#: ../camel/providers/smtp/camel-smtp-transport.c:271
-msgid "Connection canceled"
-msgstr "ð???ð??©ð??¯ð??§ð???ð???ð??©ð??¯ ð???ð??¨ð??¯ð???ð??©ð??¤ð???"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:411
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð??·ð???ð??§ð??¯ð???ð??¦ð???ð??±ð??? ð??? IMAP ð???ð??»ð???ð??¼ %s ð??¿ð???ð??¦ð??? ð??? %s ð??·ð???ð??§ð??¯ð???ð??¦ð???ð??±ð???ð??©ð??¯ ð??¥ð??§ð???ð??©ð??¯ð??¦ð???ð??¥"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:534
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð??·ð???ð??§ð??¯ð???ð??¦ð???ð??±ð??? ð??? IMAP ð???ð??»ð???ð??¼ %s ð??¿ð???ð??¦ð??? %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:697
-#: ../camel/providers/imap4/camel-imap4-store.c:964
-msgid "Cannot create IMAP folders in offline mode."
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? IMAP ð???ð??´ð??¤ð???ð??¼ð??? ð??¦ð??¯ ð??ªð???ð??¤ð??²ð??¯ ð??¥ð??´ð???."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:736
-#, c-format
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??? ð???ð??´ð??¤ð???ð??¼ '%s' ð??ªð??¯ IMAP ð???ð??»ð???ð??¼ %s: ð??³ð??¯ð??´ð??¯ ð??»ð??¼"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:816
-#, c-format
-msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??? ð??¤ð??¦ð???ð??? ð??¦ð??¯ð???ð??¼ð??¥ð??±ð???ð??©ð??¯ ð???ð??¹ '%s' ð??ªð??¯ IMAP ð???ð??»ð???ð??¼ %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-msgid "Bad command"
-msgstr "ð???ð??¨ð??? ð???ð??©ð??¥ð??­ð??¯ð???"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:897
-#, c-format
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð???ð??´ð??¤ð???ð??¼ '%s': ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð??¥ð??±ð??¤ð???ð??ªð???ð??? ð??¯ð??±ð??¥"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:902
-#, c-format
-msgid "Cannot create folder '%s': Bad command"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð???ð??´ð??¤ð???ð??¼ '%s': ð???ð??¨ð??? ð???ð??©ð??¥ð??­ð??¯ð???"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1008
-#, c-format
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??¦ð??¤ð??°ð??? ð???ð??´ð??¤ð???ð??¼ '%s': ð???ð???ð??§ð???ð??©ð??¤ ð???ð??´ð??¤ð???ð??¼"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1015
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??¦ð??¤ð??°ð??? IMAP ð???ð??´ð??¤ð???ð??¼ð??? ð??¦ð??¯ ð??ªð???ð??¤ð??²ð??¯ ð??¥ð??´ð???."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1074
-#, c-format
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??¦ð??¤ð??°ð??? ð???ð??´ð??¤ð???ð??¼ '%s': ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð??¥ð??±ð??¤ð???ð??ªð???ð??? ð??¯ð??±ð??¥"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
-#, c-format
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??¦ð??¤ð??°ð??? ð???ð??´ð??¤ð???ð??¼ '%s': ð???ð??¨ð??? ð???ð??©ð??¥ð??­ð??¯ð???"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1099
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð??®ð??°ð??¯ð??±ð??¥ ð???ð??´ð??¤ð???ð??¼ '%s' ð??? '%s': ð???ð???ð??§ð???ð??©ð??¤ ð???ð??´ð??¤ð???ð??¼"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1106
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð??®ð??°ð??¯ð??±ð??¥ IMAP ð???ð??´ð??¤ð???ð??¼ð??? ð??¦ð??¯ ð??ªð???ð??¤ð??²ð??¯ ð??¥ð??´ð???."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1137
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð??®ð??°ð??¯ð??±ð??¥ ð???ð??´ð??¤ð???ð??¼ '%s' ð??? '%s': ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð??¥ð??±ð??¤ð???ð??ªð???ð??? ð??¯ð??±ð??¥"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Bad command"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð??®ð??°ð??¯ð??±ð??¥ ð???ð??´ð??¤ð???ð??¼ '%s' ð??? '%s': ð???ð??¨ð??? ð???ð??©ð??¥ð??­ð??¯ð???"
-
-#. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
-#. * The fourth one is an error message.
-#: ../camel/providers/imap4/camel-imap4-store.c:1572
-#, c-format
-msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??? %s ð??¦ð??¯ð???ð??¼ð??¥ð??±ð???ð??©ð??¯ ð???ð??¹ ð???ð??¨ð???ð??¼ð??¯ '%s' ð??ªð??¯ IMAP ð???ð??»ð???ð??¼ %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1633
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??©ð???ð???ð???ð??®ð??²ð??? ð??? IMAP ð???ð??´ð??¤ð???ð??¼ð??? ð??¦ð??¯ ð??ªð???ð??¤ð??²ð??¯ ð??¥ð??´ð???."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1678
-#, c-format
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??©ð???ð???ð???ð??®ð??²ð??? ð??? ð???ð??´ð??¤ð???ð??¼ '%s': ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð??¥ð??±ð??¤ð???ð??ªð???ð??? ð??¯ð??±ð??¥"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, c-format
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??©ð???ð???ð???ð??®ð??²ð??? ð??? ð???ð??´ð??¤ð???ð??¼ '%s': ð???ð??¨ð??? ð???ð??©ð??¥ð??­ð??¯ð???"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1705
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð??©ð??¯ð???ð??©ð???ð???ð???ð??®ð??²ð??? ð???ð??®ð??ªð??¥ IMAP ð???ð??´ð??¤ð???ð??¼ð??? ð??¦ð??¯ ð??ªð???ð??¤ð??²ð??¯ ð??¥ð??´ð???."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1750
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð??©ð??¯ð???ð??©ð???ð???ð???ð??®ð??²ð??? ð???ð??®ð??ªð??¥ ð???ð??´ð??¤ð???ð??¼ '%s': ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð??¥ð??±ð??¤ð???ð??ªð???ð??? ð??¯ð??±ð??¥"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr "ð???ð??¨ð??¯ð??ªð??? ð??©ð??¯ð???ð??©ð???ð???ð???ð??®ð??²ð??? ð???ð??®ð??ªð??¥ ð???ð??´ð??¤ð???ð??¼ '%s': ð???ð??¨ð??? ð???ð??©ð??¥ð??­ð??¯ð???"
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1590
-msgid "Scanning for changed messages"
-msgstr "ð???ð???ð??¨ð??¯ð??¦ð??? ð???ð??¹ ð???ð??±ð??¯ð??¡ð??? ð??¥ð??§ð???ð??¦ð??¡ð??©ð???"
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1611
-#, c-format
-msgid "IMAP server %s is in an inconsistent state."
-msgstr "IMAP ð???ð??»ð???ð??¼ %s ð??¦ð??? ð??¦ð??¯ ð??©ð??¯ ð??¦ð??¯ð???ð??©ð??¯ð???ð??¦ð???ð???ð??©ð??¯ð??? ð???ð???ð??±ð???."
+#, fuzzy, c-format
+#: ../camel/providers/imapx/camel-imapx-folder.c:74
+msgid "Could not create folder summary for %s"
+msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??¤ð??´ð??? ð???ð??³ð??¥ð??¼ð??¦ ð???ð??¹ %s"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1638
-msgid "Fetching envelopes of new messages"
-msgstr "ð???ð??§ð???ð??¦ð??? ð??§ð??¯ð???ð??©ð??¤ð??´ð???ð??? ð??? ð??¯ð??¿ ð??¥ð??§ð???ð??¦ð??¡ð??©ð???"
+#, fuzzy, c-format
+#: ../camel/providers/imapx/camel-imapx-folder.c:82
+msgid "Could not create cache for %s"
+msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð???ð??¨ð??? ð???ð??²ð??¤"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:429
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "ð??³ð??¯ð??¦ð???ð???ð???ð??§ð???ð???ð??©ð??? ð???ð??´ð???ð??©ð??¯ ð??¦ð??¯ ð??®ð??¦ð???ð???ð??ªð??¯ð??? ð???ð??®ð??ªð??¥ IMAP ð???ð??»ð???ð??¼ %s: "
+#, fuzzy
+#: ../camel/providers/imapx/camel-imapx-provider.c:43
+msgid "Use I_dle if the server supports it"
+msgstr "ð??¿ð??? I_dle ð??¦ð??? ð??? ð???ð??»ð???ð??¼ ð???ð??©ð???ð??¹ð???ð??? ð??¦ð???"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:452
-msgid "No data"
-msgstr "ð??¯ð??´ ð???ð??±ð???ð??©"
+#: ../camel/providers/imapx/camel-imapx-provider.c:55
+msgid "Command:"
+msgstr "ð???ð??©ð??¥ð??­ð??¯ð???:"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:613
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "IMAP ð???ð??»ð???ð??¼ %s ð??©ð??¯ð??¦ð???ð???ð???ð??§ð???ð???ð??¦ð???ð??¤ð??° ð???ð??¦ð???ð???ð??©ð??¯ð??§ð???ð???ð??©ð???: %s"
+#, fuzzy
+#: ../camel/providers/imapx/camel-imapx-provider.c:57
+msgid "Numbe_r of cached connections to use"
+msgstr "Numbe_r ð??? ð???ð??¨ð???ð??? ð???ð??©ð??¯ð??§ð???ð???ð??©ð??¯ð??? ð??? ð??¿ð???"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:40
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
-msgid "Message storage"
-msgstr "ð??¥ð??§ð???ð??¦ð??¡ ð???ð???ð??¹ð??¦ð??¡"
+#: ../camel/providers/imapx/camel-imapx-provider.c:68
+msgid "Namespace:"
+msgstr "ð??¯ð??±ð??¥ð???ð???ð??±ð???:"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:87
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:50
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-"ð??¦ð???ð???ð???ð??§ð??®ð??©ð??¥ð??§ð??¯ð???ð??©ð??¤ IMAP 4(.1) ð???ð??¤ð??²ð??©ð??¯ð???\n"
-"ð???ð??¦ð??? ð??¦ð??? ð??©ð??¯ð???ð??§ð???ð???ð??¦ð??? ð??¯ ð??³ð??¯ð???ð??©ð???ð??¹ð???ð??©ð??? ð???ð??´ð???, ð??¿ ð??¢ð??ªð??¯ð??? ð??? ð??¿ð??? ð???ð??¤ð??±ð??¯ IMAP ð??¦ð??¯ð???ð???ð??§ð???.\n"
-"\n"
-" !!! ð???ð??µ ð??¯ð??ªð??? ð??¿ð??? ð???ð??¦ð??? ð???ð??¹ ð???ð??®ð??©ð???ð??³ð???ð???ð??©ð??¯ ð??°ð??¥ð??±ð??¤  !!!\n"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:1508
 #, c-format
+#: ../camel/providers/imapx/camel-imapx-server.c:2188
 msgid "Could not connect to %s (port %s): %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??©ð??¯ð??§ð???ð??? ð??? %s (ð???ð??¹ð??? %s): %s"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:126
-#, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??©ð??¯ð??§ð???ð??? ð??? POP ð???ð??»ð???ð??¼ ð??ªð??¯ %s"
-
-#: ../camel/providers/local/camel-local-folder.c:178
-msgid "Index message body data"
-msgstr "ð??¦ð??¯ð???ð??§ð???ð??? ð??¥ð??§ð???ð??¦ð??¡ ð???ð??ªð???ð??¦ ð???ð??±ð???ð??©"
-
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:395
 #, c-format
+#: ../camel/providers/local/camel-local-folder.c:199
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:399
-#: ../camel/providers/local/camel-local-folder.c:402
 #, c-format
+#: ../camel/providers/local/camel-local-folder.c:209
+#: ../camel/providers/local/camel-local-folder.c:218
 msgid "mailbox: %s (%s)"
 msgstr "ð??¥ð??±ð??¤ð???ð??ªð???ð???: %s (%s)"
 
-#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:406
 #, c-format
+#: ../camel/providers/local/camel-local-folder.c:227
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-folder.c:272
+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
+#, fuzzy, c-format
+#: ../camel/providers/local/camel-local-folder.c:682
+msgid "Cannot get message %s from folder %s\n%s"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??? ð??¥ð??§ð???ð??¦ð??¡: %s ð???ð??®ð??ªð??¥ ð???ð??´ð??¤ð???ð??¼ %s\n  %s"
+
+#, fuzzy
+#: ../camel/providers/local/camel-local-provider.c:44
+msgid "_Use the '.folders' folder summary file (exmh)"
+msgstr "_Use ð??? '.ð???ð??´ð??¤ð???ð??¼ð???' ð???ð??´ð??¤ð???ð??¼ ð???ð??³ð??¥ð??¼ð??¦ ð???ð??²ð??¤ (exmh)"
+
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "MH-format mail directories"
 msgstr "MH-ð???ð??¹ð??¥ð??¨ð??? ð??¥ð??±ð??¤ ð???ð??²ð??®ð??§ð???ð???ð??¼ð??¦ð???"
 
-#: ../camel/providers/local/camel-local-provider.c:56
+#: ../camel/providers/local/camel-local-provider.c:52
 msgid "For storing local mail in MH-like mail directories."
 msgstr "ð???ð??¹ ð???ð???ð??¹ð??¦ð??? ð??¤ð??´ð???ð??©ð??¤ ð??¥ð??±ð??¤ ð??¦ð??¯ MH-ð??¤ð??²ð??? ð??¥ð??±ð??¤ ð???ð??²ð??®ð??§ð???ð???ð??¼ð??¦ð???."
 
-#: ../camel/providers/local/camel-local-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:69
 msgid "Local delivery"
 msgstr "ð??¤ð??´ð???ð??©ð??¤ ð???ð??¦ð??¤ð??¦ð???ð??¼ð??¦"
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#, fuzzy
+#: ../camel/providers/local/camel-local-provider.c:70
+msgid ""
+"For retrieving (moving) local mail from standard mbox-formatted spools into "
+"folders managed by Evolution."
+msgstr ""
+"ð???ð??¹ ð??®ð??¦ð???ð??®ð??°ð???ð??¦ð??? (ð??¥ð??µð???ð??¦ð???) ð??¤ð??´ð???ð??©ð??¤ ð??¥ð??±ð??¤ ð???ð??®ð??ªð??¥ ð???ð???ð??¨ð??¯ð???ð??¼ð??? mbox-ð???ð??¹ð??¥ð??¨ð???ð??©ð??? spools ð??¦ð??¯ð???ð??« ð???ð??´ð??¤ð???ð??¼ð??? "
+"ð??¥ð??¨ð??¯ð??¦ð??¡ð??? ð???ð??² ð??§ð???ð??©ð??¤ð??µð???ð??©ð??¯."
+
+#, fuzzy
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:103
+msgid "_Apply filters to new messages in INBOX"
+msgstr "_Apply ð???ð??¦ð??¤ð???ð??¼ð??? ð??? ð??¯ð??¿ ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? ð??¦ð??¯ INBOX"
+
+#, fuzzy
+#: ../camel/providers/local/camel-local-provider.c:91
+msgid "Maildir-format mail directories"
+msgstr "Maildir-ð???ð??¹ð??¥ð??¨ð??? ð??¥ð??±ð??¤ ð???ð??²ð??®ð??§ð???ð???ð??¼ð??¦ð???"
+
+#, fuzzy
+#: ../camel/providers/local/camel-local-provider.c:92
+msgid "For storing local mail in maildir directories."
+msgstr "ð???ð??¹ ð???ð???ð??¹ð??¦ð??? ð??¤ð??´ð???ð??©ð??¤ ð??¥ð??±ð??¤ ð??¦ð??¯ maildir ð???ð??²ð??®ð??§ð???ð???ð??¼ð??¦ð???."
+
+#: ../camel/providers/local/camel-local-provider.c:104
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "_ð???ð???ð??¹ ð???ð???ð??±ð???ð??«ð??? ð??£ð??§ð???ð??¼ð??? ð??¦ð??¯ ð??§ð??¤ð??¥/ð???ð??²ð??¯/ð??¥ð??©ð??? ð???ð??¹ð??¥ð??¨ð???"
 
-#: ../camel/providers/local/camel-local-store.c:165
-#: ../camel/providers/local/camel-local-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:359
-#: ../camel/providers/local/camel-spool-store.c:128
+#, fuzzy
+#: ../camel/providers/local/camel-local-provider.c:111
+msgid "Standard Unix mbox spool file"
+msgstr "ð???ð???ð??¨ð??¯ð???ð??¼ð??? ·ð??¿ð??¯ð??¦ð???ð??? mbox ð???ð???ð??µð??¤ ð???ð??²ð??¤"
+
+#, fuzzy
+#: ../camel/providers/local/camel-local-provider.c:112
+#: ../camel/providers/local/camel-local-provider.c:123
+msgid ""
+"For reading and storing local mail in external standard mbox spool "
+"files.\nMay also be used to read a tree of Elm, Pine, or Mutt style folders."
+msgstr ""
+"ð???ð??¹ ð??®ð??°ð???ð??¦ð??? ð??¯ ð???ð???ð??¹ð??¦ð??? ð??¤ð??´ð???ð??©ð??¤ ð??¥ð??±ð??¤ ð??¦ð??¯ ð??¦ð???ð???ð???ð??»ð??¯ð??©ð??¤ ð???ð???ð??¨ð??¯ð???ð??¼ð??? mbox ð???ð???ð??µð??¤ ð???ð??²ð??¤ð???.\nð??¥ð??± ð??·ð??¤ð???ð??´ ð???ð??° "
+"ð??¿ð???ð??? ð??? ð??®ð??°ð??? ð??© ð???ð??®ð??° ð??? ð??§ð??¤ð??¥, ð???ð??²ð??¯, ð??¹ ð??¥ð??©ð??? ð???ð???ð??²ð??¤ ð???ð??´ð??¤ð???ð??¼ð???."
+
+#, fuzzy
+#: ../camel/providers/local/camel-local-provider.c:122
+msgid "Standard Unix mbox spool directory"
+msgstr "ð???ð???ð??¨ð??¯ð???ð??¼ð??? ·ð??¿ð??¯ð??¦ð???ð??? mbox ð???ð???ð??µð??¤ ð???ð??²ð??®ð??§ð???ð???ð??¼ð??¦"
+
 #, c-format
+#: ../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
 msgid "Store root %s is not an absolute path"
 msgstr "ð???ð???ð??¹ ð??®ð??µð??? %s ð??¦ð??? ð??¯ð??ªð??? ð??©ð??¯ ð??¨ð???ð???ð??´ð??¤ð??µð??? ð???ð??­ð???"
 
-#: ../camel/providers/local/camel-local-store.c:172
 #, c-format
+#: ../camel/providers/local/camel-local-store.c:156
 msgid "Store root %s is not a regular directory"
 msgstr "ð???ð???ð??¹ ð??®ð??µð??? %s ð??¦ð??? ð??¯ð??ªð??? ð??© ð??®ð??§ð???ð???ð??«ð??¤ð??¼ ð???ð??²ð??®ð??§ð???ð???ð??¼ð??¦"
 
-#: ../camel/providers/local/camel-local-store.c:181
-#: ../camel/providers/local/camel-local-store.c:189
-#: ../camel/providers/local/camel-local-store.c:287
 #, c-format
+#: ../camel/providers/local/camel-local-store.c:166
+#: ../camel/providers/local/camel-local-store.c:175
+#: ../camel/providers/local/camel-local-store.c:290
 msgid "Cannot get folder: %s: %s"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??? ð???ð??´ð??¤ð???ð??¼: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:247
+#, fuzzy
+#: ../camel/providers/local/camel-local-store.c:188
+msgid "Local stores do not have an inbox"
+msgstr "ð??¤ð??´ð???ð??©ð??¤ ð???ð???ð??¹ð??? ð???ð??µ ð??¯ð??ªð??? ð??£ð??¨ð??? ð??©ð??¯ inbox"
+
 #, c-format
+#: ../camel/providers/local/camel-local-store.c:245
 msgid "Local mail file %s"
 msgstr "ð??¤ð??´ð???ð??©ð??¤ ð??¥ð??±ð??¤ ð???ð??²ð??¤ %s"
 
-#: ../camel/providers/local/camel-local-store.c:342
 #, c-format
+#: ../camel/providers/local/camel-local-store.c:350
 msgid "Could not rename folder %s to %s: %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??®ð??°ð??¯ð??±ð??¥ ð???ð??´ð??¤ð???ð??¼ %s ð??? %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:410
 #, c-format
+#: ../camel/providers/local/camel-local-store.c:422
 msgid "Could not rename '%s': %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??®ð??°ð??¯ð??±ð??¥ '%s': %s"
 
-#: ../camel/providers/local/camel-local-store.c:435
-#: ../camel/providers/local/camel-mbox-store.c:300
 #, c-format
+#: ../camel/providers/local/camel-local-store.c:452
+#: ../camel/providers/local/camel-mbox-store.c:293
 msgid "Could not delete folder index file '%s': %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??¦ð??¤ð??°ð??? ð???ð??´ð??¤ð???ð??¼ ð??¦ð??¯ð???ð??§ð???ð??? ð???ð??²ð??¤ '%s': %s"
 
-#: ../camel/providers/local/camel-local-store.c:458
-#: ../camel/providers/local/camel-mbox-store.c:324
 #, c-format
+#: ../camel/providers/local/camel-local-store.c:482
+#: ../camel/providers/local/camel-mbox-store.c:324
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??¦ð??¤ð??°ð??? ð???ð??´ð??¤ð???ð??¼ ð??¥ð??°ð???ð??© ð???ð??²ð??¤ '%s': %s"
 
-#: ../camel/providers/local/camel-local-summary.c:515
+#: ../camel/providers/local/camel-local-summary.c:537
 msgid "Unable to add message to summary: unknown reason"
 msgstr "ð??³ð??¯ð??±ð???ð??©ð??¤ ð??? ð??¨ð??? ð??¥ð??§ð???ð??¦ð??¡ ð??? ð???ð??³ð??¥ð??¼ð??¦: ð??³ð??¯ð??´ð??¯ ð??®ð??°ð???ð??©ð??¯"
 
-#: ../camel/providers/local/camel-maildir-folder.c:263
-#: ../camel/providers/local/camel-maildir-folder.c:292
-#: ../camel/providers/local/camel-maildir-folder.c:306
-#: ../camel/providers/local/camel-maildir-folder.c:314
-#: ../camel/providers/local/camel-maildir-folder.c:400
-#: ../camel/providers/local/camel-mbox-folder.c:362
-#: ../camel/providers/local/camel-mbox-folder.c:413
-#: ../camel/providers/local/camel-mbox-folder.c:434
-#: ../camel/providers/local/camel-mbox-folder.c:465
-#: ../camel/providers/local/camel-mbox-folder.c:473
-#: ../camel/providers/local/camel-mh-folder.c:225
-#: ../camel/providers/local/camel-mh-folder.c:236
-#: ../camel/providers/local/camel-mh-folder.c:244
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??? ð??¥ð??§ð???ð??¦ð??¡: %s ð???ð??®ð??ªð??¥ ð???ð??´ð??¤ð???ð??¼ %s\n"
-"  %s"
+#, fuzzy
+#: ../camel/providers/local/camel-maildir-folder.c:191
+msgid "Maildir append message canceled"
+msgstr "Maildir ð??©ð???ð??§ð??¯ð??? ð??¥ð??§ð???ð??¦ð??¡ ð???ð??¨ð??¯ð???ð??©ð??¤ð???"
 
-#: ../camel/providers/local/camel-maildir-folder.c:315
+#, fuzzy, c-format
+#: ../camel/providers/local/camel-maildir-folder.c:195
+msgid "Cannot append message to maildir folder: %s: %s"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð??©ð???ð??§ð??¯ð??? ð??¥ð??§ð???ð??¦ð??¡ ð??? ð??§ð??¥ð??±ð??? ð???ð??´ð??¤ð???ð??¼: %s: %s"
+
+#: ../camel/providers/local/camel-maildir-folder.c:291
 msgid "Invalid message contents"
 msgstr "ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð??¥ð??§ð???ð??¦ð??¡ ð???ð??ªð??¯ð???ð??©ð??¯ð???ð???"
 
-#: ../camel/providers/local/camel-maildir-folder.c:419
+#: ../camel/providers/local/camel-maildir-folder.c:407
 msgid "Cannot transfer message to destination folder"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??®ð??­ð??¯ð???ð???ð??¼ ð??¥ð??§ð???ð??¦ð??¡ ð??? ð???ð??§ð???ð???ð??¦ð??¯ð??±ð???ð??©ð??¯ ð???ð??´ð??¤ð???ð??¼"
 
-#: ../camel/providers/local/camel-maildir-store.c:148
-#: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:176
-#: ../camel/providers/local/camel-mbox-store.c:188
 #, c-format
+#: ../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
 msgid "Cannot create folder '%s': %s"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð???ð??´ð??¤ð???ð??¼ '%s': %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:147
-#: ../camel/providers/local/camel-mh-store.c:217
 #, c-format
+#: ../camel/providers/local/camel-maildir-store.c:148
+#: ../camel/providers/local/camel-mbox-store.c:126
+#: ../camel/providers/local/camel-mh-store.c:213
 msgid "Cannot get folder '%s': %s"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??? ð???ð??´ð??¤ð???ð??¼ '%s': %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:155
-#: ../camel/providers/local/camel-mh-store.c:224
 #, c-format
+#: ../camel/providers/local/camel-maildir-store.c:153
+#: ../camel/providers/local/camel-mbox-store.c:135
+#: ../camel/providers/local/camel-mh-store.c:221
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??? ð???ð??´ð??¤ð???ð??¼ '%s': ð???ð??´ð??¤ð???ð??¼ ð???ð??³ð??? ð??¯ð??ªð??? ð??§ð???ð???ð??¦ð???ð???."
 
-#: ../camel/providers/local/camel-maildir-store.c:234
-#: ../camel/providers/local/camel-maildir-store.c:272
-#: ../camel/providers/local/camel-mh-store.c:273
+#, fuzzy, c-format
+#: ../camel/providers/local/camel-maildir-store.c:179
+msgid "Cannot get folder '%s': not a maildir directory."
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??? ð???ð??´ð??¤ð???ð??¼ '%s': ð??¯ð??ªð??? ð??© ð???ð??²ð??®ð??§ð???ð???ð??¼ð??¦."
+
 #, c-format
+#: ../camel/providers/local/camel-maildir-store.c:235
+#: ../camel/providers/local/camel-maildir-store.c:274
+#: ../camel/providers/local/camel-mh-store.c:281
 msgid "Could not delete folder '%s': %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??¦ð??¤ð??°ð??? ð???ð??´ð??¤ð???ð??¼ '%s': %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:330
-#: ../camel/providers/local/camel-spool-store.c:344
+#, fuzzy
+#: ../camel/providers/local/camel-maildir-store.c:237
+msgid "not a maildir directory"
+msgstr "ð??¯ð??ªð??? ð??© maildir ð???ð??²ð??®ð??§ð???ð???ð??¼ð??¦"
+
 #, c-format
+#: ../camel/providers/local/camel-maildir-store.c:472
+#: ../camel/providers/local/camel-spool-store.c:357
+#: ../camel/providers/local/camel-spool-store.c:372
 msgid "Could not scan folder '%s': %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð???ð??¨ð??¯ ð???ð??´ð??¤ð???ð??¼ '%s': %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:544
+#, fuzzy, c-format
+#: ../camel/providers/local/camel-maildir-summary.c:433
+#: ../camel/providers/local/camel-maildir-summary.c:555
+msgid "Cannot open maildir directory path: %s: %s"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð??´ð???ð??©ð??¯ MH ð???ð??²ð??®ð??§ð???ð???ð??¼ð??¦ ð???ð??­ð???: %s: %s"
+
+#: ../camel/providers/local/camel-maildir-summary.c:547
 msgid "Checking folder consistency"
 msgstr "ð???ð??§ð???ð??¦ð??? ð???ð??´ð??¤ð???ð??¼ ð???ð??©ð??¯ð???ð??¦ð???ð???ð??©ð??¯ð???ð??°"
 
-#: ../camel/providers/local/camel-maildir-summary.c:637
+#: ../camel/providers/local/camel-maildir-summary.c:638
 msgid "Checking for new messages"
 msgstr "ð???ð??§ð???ð??¦ð??? ð???ð??¹ ð??¯ð??¿ ð??¥ð??§ð???ð??¦ð??¡ð??©ð???"
 
-#: ../camel/providers/local/camel-maildir-summary.c:724
-#: ../camel/providers/local/camel-mbox-summary.c:526
-#: ../camel/providers/local/camel-mbox-summary.c:722
-#: ../camel/providers/local/camel-mbox-summary.c:842
-#: ../camel/providers/local/camel-spool-summary.c:150
+#: ../camel/providers/local/camel-maildir-summary.c:729
+#: ../camel/providers/local/camel-mbox-summary.c:494
+#: ../camel/providers/local/camel-mbox-summary.c:696
+#: ../camel/providers/local/camel-mbox-summary.c:821
+#: ../camel/providers/local/camel-spool-summary.c:129
 msgid "Storing folder"
 msgstr "ð???ð???ð??¹ð??¦ð??? ð???ð??´ð??¤ð???ð??¼"
 
-#: ../camel/providers/local/camel-mbox-folder.c:167
-#: ../camel/providers/local/camel-spool-folder.c:150
 #, c-format
+#: ../camel/providers/local/camel-mbox-folder.c:123
+#: ../camel/providers/local/camel-spool-folder.c:123
 msgid "Cannot create folder lock on %s: %s"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð???ð??´ð??¤ð???ð??¼ ð??¤ð??ªð??? ð??ªð??¯ %s: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:231
 #, c-format
+#: ../camel/providers/local/camel-mbox-folder.c:194
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð??´ð???ð??©ð??¯ ð??¥ð??±ð??¤ð???ð??ªð???ð???: %s: %s\n"
 
-#: ../camel/providers/local/camel-mbox-folder.c:297
+#: ../camel/providers/local/camel-mbox-folder.c:261
 msgid "Mail append canceled"
 msgstr "ð??¥ð??±ð??¤ ð??©ð???ð??§ð??¯ð??? ð???ð??¨ð??¯ð???ð??©ð??¤ð???"
 
-#: ../camel/providers/local/camel-mbox-folder.c:474
-#: ../camel/providers/local/camel-mh-folder.c:245
+#, fuzzy, c-format
+#: ../camel/providers/local/camel-mbox-folder.c:265
+msgid "Cannot append message to mbox file: %s: %s"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð??©ð???ð??§ð??¯ð??? ð??¥ð??§ð???ð??¦ð??¡ ð??? ð??§ð??¥ð??±ð??? ð???ð??´ð??¤ð???ð??¼: %s: %s"
+
+#, fuzzy
+#: ../camel/providers/local/camel-mbox-folder.c:438
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr "ð??? ð???ð??´ð??¤ð???ð??¼ ð??©ð???ð??½ð??? ð??? ð???ð??° irrecoverably ð???ð??¼ð??³ð???ð???ð??©ð???."
+
+#: ../camel/providers/local/camel-mbox-folder.c:448
+#: ../camel/providers/local/camel-mh-folder.c:241
 msgid "Message construction failed."
 msgstr "ð??¥ð??§ð???ð??¦ð??¡ ð???ð??©ð??¯ð???ð???ð??®ð??³ð???ð???ð??©ð??¯ ð???ð??±ð??¤ð???."
 
-#: ../camel/providers/local/camel-mbox-store.c:166
-#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mbox-store.c:147
+#: ../camel/providers/local/camel-mbox-store.c:369
 msgid "Cannot create a folder by this name."
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð??© ð???ð??´ð??¤ð???ð??¼ ð???ð??² ð???ð??¦ð??? ð??¯ð??±ð??¥."
 
-#: ../camel/providers/local/camel-mbox-store.c:198
 #, c-format
+#: ../camel/providers/local/camel-mbox-store.c:182
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??? ð???ð??´ð??¤ð???ð??¼ '%s': ð??¯ð??ªð??? ð??© ð??®ð??§ð???ð???ð??«ð??¤ð??¼ ð???ð??²ð??¤."
 
-#: ../camel/providers/local/camel-mbox-store.c:228
-#: ../camel/providers/local/camel-mbox-store.c:239
-#: ../camel/providers/local/camel-mbox-store.c:262
 #, c-format
-msgid ""
-"Could not delete folder '%s':\n"
-"%s"
-msgstr ""
-"ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??¦ð??¤ð??°ð??? ð???ð??´ð??¤ð???ð??¼ '%s':\n"
-"%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
+msgid "Could not delete folder '%s':\n%s"
+msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??¦ð??¤ð??°ð??? ð???ð??´ð??¤ð???ð??¼ '%s':\n%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:247
 #, c-format
+#: ../camel/providers/local/camel-mbox-store.c:235
 msgid "'%s' is not a regular file."
 msgstr "'%s' ð??¦ð??? ð??¯ð??ªð??? ð??© ð??®ð??§ð???ð???ð??«ð??¤ð??¼ ð???ð??²ð??¤."
 
-#: ../camel/providers/local/camel-mbox-store.c:254
 #, c-format
+#: ../camel/providers/local/camel-mbox-store.c:243
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "ð???ð??´ð??¤ð???ð??¼ '%s' ð??¦ð??? ð??¯ð??ªð??? ð??§ð??¥ð???ð???ð??¦. ð??¯ð??ªð??? ð???ð??¦ð??¤ð??°ð???ð??©ð???."
 
-#: ../camel/providers/local/camel-mbox-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:288
 #, c-format
+#: ../camel/providers/local/camel-mbox-store.c:267
+#: ../camel/providers/local/camel-mbox-store.c:280
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??¦ð??¤ð??°ð??? ð???ð??´ð??¤ð???ð??¼ ð???ð??³ð??¥ð??¼ð??¦ ð???ð??²ð??¤ '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:378
 #, c-format
+#: ../camel/providers/local/camel-mbox-store.c:384
 msgid "Cannot create directory '%s': %s."
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð???ð??²ð??®ð??§ð???ð???ð??¼ð??¦ '%s': %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:392
 #, c-format
+#: ../camel/providers/local/camel-mbox-store.c:399
 msgid "Cannot create folder: %s: %s"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð???ð??´ð??¤ð???ð??¼: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:394
+#: ../camel/providers/local/camel-mbox-store.c:401
 msgid "Folder already exists"
 msgstr "ð???ð??´ð??¤ð???ð??¼ ð??·ð??¤ð??®ð??§ð???ð??¦ ð??§ð???ð???ð??¦ð???ð???ð???"
 
-#: ../camel/providers/local/camel-mbox-store.c:485
+#: ../camel/providers/local/camel-mbox-store.c:495
 msgid "The new folder name is illegal."
 msgstr "ð??? ð??¯ð??¿ ð???ð??´ð??¤ð???ð??¼ ð??¯ð??±ð??¥ ð??¦ð??? ð??¦ð??¤ð??°ð???ð??©ð??¤."
 
-#: ../camel/providers/local/camel-mbox-store.c:498
 #, c-format
+#: ../camel/providers/local/camel-mbox-store.c:509
 msgid "Could not rename '%s': '%s': %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??®ð??°ð??¯ð??±ð??¥ '%s': '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:579
 #, c-format
+#: ../camel/providers/local/camel-mbox-store.c:591
 msgid "Could not rename '%s' to %s: %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??®ð??°ð??¯ð??±ð??¥ '%s' ð??? %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:532
 #, c-format
+#: ../camel/providers/local/camel-mbox-summary.c:501
 msgid "Could not open folder: %s: %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??´ð???ð??©ð??¯ ð???ð??´ð??¤ð???ð??¼: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:659
+#, fuzzy, c-format
+#: ../camel/providers/local/camel-mbox-summary.c:552
+msgid "Fatal mail parser error near position %ld in folder %s"
+msgstr "ð???ð??±ð???ð??©ð??¤ ð??¥ð??±ð??¤ ð???ð??¸ð???ð??¼ ð??»ð??¼ ð??¯ð??½ ð???ð??©ð???ð??¦ð???ð??©ð??¯ %ld ð??¦ð??¯ ð???ð??´ð??¤ð???ð??¼ %s"
+
 #, c-format
+#: ../camel/providers/local/camel-mbox-summary.c:632
 msgid "Cannot check folder: %s: %s"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??? ð???ð??´ð??¤ð???ð??¼: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:727
-#: ../camel/providers/local/camel-mbox-summary.c:847
-#: ../camel/providers/local/camel-spool-summary.c:155
 #, c-format
+#: ../camel/providers/local/camel-mbox-summary.c:702
+#: ../camel/providers/local/camel-mbox-summary.c:827
+#: ../camel/providers/local/camel-spool-summary.c:135
 msgid "Could not open file: %s: %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??´ð???ð??©ð??¯ ð???ð??²ð??¤: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:739
-#: ../camel/providers/local/camel-spool-summary.c:168
 #, c-format
+#: ../camel/providers/local/camel-mbox-summary.c:715
+#: ../camel/providers/local/camel-spool-summary.c:149
 msgid "Cannot open temporary mailbox: %s"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð??´ð???ð??©ð??¯ ð???ð??§ð??¥ð???ð??¼ð??¼ð??¦ ð??¥ð??±ð??¤ð???ð??ªð???ð???: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:752
-#: ../camel/providers/local/camel-mbox-summary.c:956
 #, c-format
+#: ../camel/providers/local/camel-mbox-summary.c:729
+#: ../camel/providers/local/camel-mbox-summary.c:941
 msgid "Could not close source folder %s: %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??¤ð??´ð??? ð???ð??¹ð??? ð???ð??´ð??¤ð???ð??¼ %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:761
 #, c-format
+#: ../camel/providers/local/camel-mbox-summary.c:739
 msgid "Could not close temporary folder: %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??¤ð??´ð??? ð???ð??§ð??¥ð???ð??¼ð??¼ð??¦ ð???ð??´ð??¤ð???ð??¼: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:776
 #, c-format
+#: ../camel/providers/local/camel-mbox-summary.c:755
 msgid "Could not rename folder: %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??®ð??°ð??¯ð??±ð??¥ ð???ð??´ð??¤ð???ð??¼: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:858
-#: ../camel/providers/local/camel-mbox-summary.c:1083
 #, c-format
+#: ../camel/providers/local/camel-mbox-summary.c:839
+#: ../camel/providers/local/camel-mbox-summary.c:1077
 msgid "Could not store folder: %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð???ð??¹ ð???ð??´ð??¤ð???ð??¼: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:897
-#: ../camel/providers/local/camel-mbox-summary.c:905
-#: ../camel/providers/local/camel-mbox-summary.c:1113
-#: ../camel/providers/local/camel-mbox-summary.c:1121
+#: ../camel/providers/local/camel-mbox-summary.c:879
+#: ../camel/providers/local/camel-mbox-summary.c:888
+#: ../camel/providers/local/camel-mbox-summary.c:1109
+#: ../camel/providers/local/camel-mbox-summary.c:1118
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "ð???ð??³ð??¥ð??¼ð??¦ ð??¯ ð???ð??´ð??¤ð???ð??¼ ð??¥ð??¦ð???ð??¥ð??¨ð???, ð??°ð???ð??©ð??¯ ð??­ð???ð???ð??¼ ð??© ð???ð??¦ð???ð???"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1046
-#: ../camel/providers/local/camel-spool-summary.c:334
 #, c-format
+#: ../camel/providers/local/camel-mbox-summary.c:1037
+#: ../camel/providers/local/camel-spool-summary.c:326
 msgid "Unknown error: %s"
 msgstr "ð??³ð??¯ð??´ð??¯ ð??»ð??¼: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1189
-#: ../camel/providers/local/camel-mbox-summary.c:1215
 #, c-format
+#: ../camel/providers/local/camel-mbox-summary.c:1187
+#: ../camel/providers/local/camel-mbox-summary.c:1215
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "ð??®ð??²ð???ð??¦ð??? ð??? ð???ð??§ð??¥ð???ð??¼ð??¼ð??¦ ð??¥ð??±ð??¤ð???ð??ªð???ð??? ð???ð??±ð??¤ð???: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1206
 #, c-format
+#: ../camel/providers/local/camel-mbox-summary.c:1205
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "ð??®ð??²ð???ð??¦ð??? ð??? ð???ð??§ð??¥ð???ð??¼ð??¼ð??¦ ð??¥ð??±ð??¤ð???ð??ªð???ð??? ð???ð??±ð??¤ð???: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:180
+#: ../camel/providers/local/camel-mh-folder.c:166
 msgid "MH append message canceled"
 msgstr "MH ð??©ð???ð??§ð??¯ð??? ð??¥ð??§ð???ð??¦ð??¡ ð???ð??¨ð??¯ð???ð??©ð??¤ð???"
 
-#: ../camel/providers/local/camel-mh-folder.c:183
 #, c-format
+#: ../camel/providers/local/camel-mh-folder.c:170
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð??©ð???ð??§ð??¯ð??? ð??¥ð??§ð???ð??¦ð??¡ ð??? ð??§ð??¥ð??±ð??? ð???ð??´ð??¤ð???ð??¼: %s: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:232
 #, c-format
+#: ../camel/providers/local/camel-mh-store.c:230
 msgid "Could not create folder '%s': %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð???ð??´ð??¤ð???ð??¼ '%s': %s"
 
-#: ../camel/providers/local/camel-mh-store.c:244
 #, c-format
+#: ../camel/providers/local/camel-mh-store.c:243
 msgid "Cannot get folder '%s': not a directory."
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??? ð???ð??´ð??¤ð???ð??¼ '%s': ð??¯ð??ªð??? ð??© ð???ð??²ð??®ð??§ð???ð???ð??¼ð??¦."
 
-#: ../camel/providers/local/camel-mh-summary.c:240
 #, c-format
+#: ../camel/providers/local/camel-mh-summary.c:227
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð??´ð???ð??©ð??¯ MH ð???ð??²ð??®ð??§ð???ð???ð??¼ð??¦ ð???ð??­ð???: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:134
 #, c-format
+#: ../camel/providers/local/camel-spool-store.c:119
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "ð???ð???ð??µð??¤ '%s' ð???ð??¨ð??¯ð??ªð??? ð???ð??° ð??´ð???ð??©ð??¯ð???: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:146
 #, c-format
+#: ../camel/providers/local/camel-spool-store.c:132
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "ð???ð???ð??µð??¤ '%s' ð??¦ð??? ð??¯ð??ªð??? ð??© ð??®ð??§ð???ð???ð??«ð??¤ð??¼ ð???ð??²ð??¤ ð??¹ ð???ð??²ð??®ð??§ð???ð???ð??¼ð??¦"
 
-#: ../camel/providers/local/camel-spool-store.c:165
 #, c-format
+#: ../camel/providers/local/camel-spool-store.c:157
 msgid "Folder '%s/%s' does not exist."
 msgstr "ð???ð??´ð??¤ð???ð??¼ '%s/%s' ð???ð??³ð??? ð??¯ð??ªð??? ð??§ð???ð???ð??¦ð???ð???."
 
-#: ../camel/providers/local/camel-spool-store.c:175
 #, c-format
-msgid ""
-"Could not open folder '%s':\n"
-"%s"
-msgstr ""
-"ð???ð??«ð??? ð??¯ð??ªð??? ð??´ð???ð??©ð??¯ ð???ð??´ð??¤ð???ð??¼ '%s':\n"
-"%s"
+#: ../camel/providers/local/camel-spool-store.c:168
+msgid "Could not open folder '%s':\n%s"
+msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??´ð???ð??©ð??¯ ð???ð??´ð??¤ð???ð??¼ '%s':\n%s"
 
-#: ../camel/providers/local/camel-spool-store.c:179
 #, c-format
+#: ../camel/providers/local/camel-spool-store.c:173
 msgid "Folder '%s' does not exist."
 msgstr "ð???ð??´ð??¤ð???ð??¼ '%s' ð???ð??³ð??? ð??¯ð??ªð??? ð??§ð???ð???ð??¦ð???ð???."
 
-#: ../camel/providers/local/camel-spool-store.c:184
 #, c-format
-msgid ""
-"Could not create folder '%s':\n"
-"%s"
-msgstr ""
-"ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð???ð??´ð??¤ð???ð??¼ '%s':\n"
-"%s"
+#: ../camel/providers/local/camel-spool-store.c:179
+msgid "Could not create folder '%s':\n%s"
+msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð???ð??´ð??¤ð???ð??¼ '%s':\n%s"
 
-#: ../camel/providers/local/camel-spool-store.c:192
 #, c-format
+#: ../camel/providers/local/camel-spool-store.c:188
 msgid "'%s' is not a mailbox file."
 msgstr "'%s' ð??¦ð??? ð??¯ð??ªð??? ð??© ð??¥ð??±ð??¤ð???ð??ªð???ð??? ð???ð??²ð??¤."
 
-#: ../camel/providers/local/camel-spool-store.c:221
+#, fuzzy
+#: ../camel/providers/local/camel-spool-store.c:207
+msgid "Store does not support an INBOX"
+msgstr "ð???ð???ð??¹ ð???ð??³ð??? ð??¯ð??ªð??? ð???ð??©ð???ð??¹ð??? ð??©ð??¯ INBOX"
+
 #, c-format
+#: ../camel/providers/local/camel-spool-store.c:220
 msgid "Spool mail file %s"
 msgstr "ð???ð???ð??µð??¤ ð??¥ð??±ð??¤ ð???ð??²ð??¤ %s"
 
-#: ../camel/providers/local/camel-spool-store.c:221
 #, c-format
+#: ../camel/providers/local/camel-spool-store.c:220
 msgid "Spool folder tree %s"
 msgstr "ð???ð???ð??µð??¤ ð???ð??´ð??¤ð???ð??¼ ð???ð??®ð??° %s"
 
-#: ../camel/providers/local/camel-spool-store.c:229
+#: ../camel/providers/local/camel-spool-store.c:232
 msgid "Spool folders cannot be renamed"
 msgstr "ð???ð???ð??µð??¤ ð???ð??´ð??¤ð???ð??¼ð??? ð???ð??¨ð??¯ð??ªð??? ð???ð??° ð??®ð??°ð??¯ð??±ð??¥ð???"
 
-#: ../camel/providers/local/camel-spool-store.c:237
+#: ../camel/providers/local/camel-spool-store.c:245
 msgid "Spool folders cannot be deleted"
 msgstr "ð???ð???ð??µð??¤ ð???ð??´ð??¤ð???ð??¼ð??? ð???ð??¨ð??¯ð??ªð??? ð???ð??° ð???ð??¦ð??¤ð??°ð???ð??©ð???"
 
-#: ../camel/providers/local/camel-spool-summary.c:180
-#: ../camel/providers/local/camel-spool-summary.c:190
-#: ../camel/providers/local/camel-spool-summary.c:200
 #, c-format
+#: ../camel/providers/local/camel-spool-summary.c:162
+#: ../camel/providers/local/camel-spool-summary.c:173
+#: ../camel/providers/local/camel-spool-summary.c:184
 msgid "Could not sync temporary folder %s: %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??¦ð???ð??? ð???ð??§ð??¥ð???ð??¼ð??¼ð??¦ ð???ð??´ð??¤ð???ð??¼ %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:216
 #, c-format
+#: ../camel/providers/local/camel-spool-summary.c:201
 msgid "Could not sync spool folder %s: %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??¦ð???ð??? ð???ð???ð??µð??¤ ð???ð??´ð??¤ð???ð??¼ %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:246
-#: ../camel/providers/local/camel-spool-summary.c:263
-#: ../camel/providers/local/camel-spool-summary.c:274
 #, c-format
+#: ../camel/providers/local/camel-spool-summary.c:232
+#: ../camel/providers/local/camel-spool-summary.c:250
+#: ../camel/providers/local/camel-spool-summary.c:262
 msgid ""
-"Could not sync spool folder %s: %s\n"
-"Folder may be corrupt, copy saved in '%s'"
-msgstr ""
-"ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??¦ð???ð??? ð???ð???ð??µð??¤ ð???ð??´ð??¤ð???ð??¼ %s: %s\n"
-"ð???ð??´ð??¤ð???ð??¼ ð??¥ð??± ð???ð??° ð???ð??¼ð??³ð???ð???, ð???ð??ªð???ð??¦ ð???ð??±ð???ð??? ð??¦ð??¯ '%s'"
-
-#: ../camel/providers/nntp/camel-nntp-folder.c:367
-#: ../camel/providers/nntp/camel-nntp-folder.c:370
-#: ../camel/providers/nntp/camel-nntp-folder.c:412
-#: ../camel/providers/nntp/camel-nntp-folder.c:414
-#, c-format
+"Could not sync spool folder %s: %s\nFolder may be corrupt, copy saved in '%s'"
+msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??¦ð???ð??? ð???ð???ð??µð??¤ ð???ð??´ð??¤ð???ð??¼ %s: %s\nð???ð??´ð??¤ð???ð??¼ ð??¥ð??± ð???ð??° ð???ð??¼ð??³ð???ð???, ð???ð??ªð???ð??¦ ð???ð??±ð???ð??? ð??¦ð??¯ '%s'"
+
+#, fuzzy, c-format
+#: ../camel/providers/nntp/camel-nntp-folder.c:196
+#: ../camel/providers/nntp/camel-nntp-folder.c:277
+#: ../camel/providers/nntp/camel-nntp-folder.c:318
+msgid "Internal error: UID in invalid format: %s"
+msgstr "ð??¦ð??¯ð???ð??»ð??¯ð??©ð??¤ ð??»ð??¼: UID ð??¦ð??¯ ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð???ð??¹ð??¥ð??¨ð???: %s"
+
+#, fuzzy
+#: ../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:1426
+#: ../camel/providers/nntp/camel-nntp-summary.c:395
+msgid "User cancelled the operation"
+msgstr "ð??¿ð???ð??¼ ð???ð??¨ð??¯ð???ð??©ð??¤ð??? ð??? ð??ªð???ð??¼ð??±ð???ð??©ð??¯"
+
+#, c-format
+#: ../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
 msgid "Posting failed: %s"
 msgstr "ð???ð??´ð???ð???ð??¦ð??? ð???ð??±ð??¤ð???: %s"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#, fuzzy
+#: ../camel/providers/nntp/camel-nntp-folder.c:558
+msgid "You cannot post NNTP messages while working offline!"
+msgstr "ð??¿ ð???ð??¨ð??¯ð??ªð??? ð???ð??´ð???ð??? NNTP ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? ð??¢ð??²ð??¤ ð??¢ð??»ð???ð??¦ð??? ð??ªð???ð??¤ð??²ð??¯!"
+
+#, fuzzy
+#: ../camel/providers/nntp/camel-nntp-folder.c:576
+msgid "You cannot copy messages from a NNTP folder!"
+msgstr "ð??¿ ð???ð??¨ð??¯ð??ªð??? ð???ð??ªð???ð??¦ ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? ð???ð??®ð??ªð??¥ ð??© NNTP ð???ð??´ð??¤ð???ð??¼!"
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid ""
 "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr ""
 "_ð???ð??´ ð???ð??´ð??¤ð???ð??¼ð??? ð??¦ð??¯ ð???ð??¹ð??? ð??¯ð??´ð???ð??±ð???ð??©ð??¯ (ð??§.ð??¡ð??°. ð???ð??°.ð??´.·ð??¤ð??¦ð??¯ð??©ð???ð??? ð??®ð??­ð???ð??¼ ð???ð??¨ð??¯ ð???ð??­ð??¥ð???.ð??­ð???.·ð??¤ð??¦ð??¯ð??©ð???ð???)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:48
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "ð??¦ð??¯ ð??? ð???ð??©ð???ð???ð???ð??®ð??¦ð???ð???ð??©ð??¯ _ð???ð??²ð??©ð??¤ð??ªð???, ð???ð??´ ð??®ð??§ð??¤ð??©ð???ð??¦ð??? ð???ð??´ð??¤ð???ð??¼ ð??¯ð??±ð??¥ð???"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:53
 msgid "USENET news"
 msgstr "·ð???ð??µð???ð??¯ð??§ð??? ð??¯ð??¿ð???"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "ð???ð??¦ð??? ð??¦ð??? ð??© ð???ð??®ð??©ð???ð??²ð???ð??» ð???ð??¹ ð??®ð??°ð???ð??¦ð??? ð???ð??®ð??ªð??¥ ð??¯ ð???ð??´ð???ð???ð??¦ð??? ð??? ·ð???ð??µð???ð??¯ð??§ð??? ð??¯ð??µð???ð???ð??®ð??µð???ð???."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:216
+#, fuzzy
+#: ../camel/providers/nntp/camel-nntp-provider.c:74
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext password."
+msgstr "ð???ð??¦ð??? ð??ªð???ð???ð??©ð??¯ ð??¢ð??¦ð??¤ ð??·ð???ð??§ð??¯ð???ð??¦ð???ð??±ð??? ð??¢ð??¦ð??? ð??? NNTP ð???ð??»ð???ð??¼ ð??¿ð???ð??¦ð??? ð??© plaintext ð???ð??­ð???ð??¢ð??¼ð???."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:242
+#: ../camel/providers/nntp/camel-nntp-store.c:260
+#: ../camel/providers/pop3/camel-pop3-store.c:182
+#: ../camel/providers/smtp/camel-smtp-transport.c:224
+msgid "Connection canceled"
+msgstr "ð???ð??©ð??¯ð??§ð???ð???ð??©ð??¯ ð???ð??¨ð??¯ð???ð??©ð??¤ð???"
+
 #, c-format
+#: ../camel/providers/nntp/camel-nntp-store.c:263
 msgid "Could not read greeting from %s: %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??®ð??§ð??? ð???ð??®ð??°ð???ð??¦ð??? ð???ð??®ð??ªð??¥ %s: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:410
+#, fuzzy, c-format
+#: ../camel/providers/nntp/camel-nntp-store.c:275
+msgid "NNTP server %s returned error code %d: %s"
+msgstr "NNTP ð???ð??»ð???ð??¼ %s ð??®ð??¦ð???ð??»ð??¯ð??? ð??»ð??¼ ð???ð??´ð??? %d: %s"
+
 #, c-format
+#: ../camel/providers/nntp/camel-nntp-store.c:463
 msgid "USENET News via %s"
 msgstr "·ð???ð??µð???ð??¯ð??§ð??? ð??¯ð??¿ð??? ð???ð??²ð??© %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:819
 #, c-format
-msgid ""
-"Error retrieving newsgroups:\n"
-"\n"
-"%s"
-msgstr ""
-"ð??»ð??¼ ð??®ð??¦ð???ð??®ð??°ð???ð??¦ð??? ð??¯ð??µð???ð???ð??®ð??µð???ð???:\n"
-"\n"
-"%s"
+#: ../camel/providers/nntp/camel-nntp-store.c:963
+msgid "Error retrieving newsgroups:\n\n%s"
+msgstr "ð??»ð??¼ ð??®ð??¦ð???ð??®ð??°ð???ð??¦ð??? ð??¯ð??µð???ð???ð??®ð??µð???ð???:\n\n%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:913
+#: ../camel/providers/nntp/camel-nntp-store.c:1059
 msgid ""
-"You cannot subscribe to this newsgroup:\n"
-"\n"
-"No such newsgroup. The selected item is a probably a parent folder."
+"You cannot subscribe to this newsgroup:\n\nNo such newsgroup. The selected "
+"item is a probably a parent folder."
 msgstr ""
-"ð??¿ ð???ð??¨ð??¯ð??ªð??? ð???ð??©ð???ð???ð???ð??®ð??²ð??? ð??? ð???ð??¦ð??? ð??¯ð??µð???ð???ð??®ð??µð???:\n"
-"\n"
-"ð??¯ð??´ ð???ð??³ð??? ð??¯ð??µð???ð???ð??®ð??µð???. ð??? ð???ð??©ð??¤ð??§ð???ð???ð??©ð??? ð??²ð???ð??©ð??¥ ð??¦ð??? ð??© ð???ð??®ð??ªð???ð??©ð???ð??¤ð??¦ ð??© ð???ð??ºð??©ð??¯ð??? ð???ð??´ð??¤ð???ð??¼."
+"ð??¿ ð???ð??¨ð??¯ð??ªð??? ð???ð??©ð???ð???ð???ð??®ð??²ð??? ð??? ð???ð??¦ð??? ð??¯ð??µð???ð???ð??®ð??µð???:\n\nð??¯ð??´ ð???ð??³ð??? ð??¯ð??µð???ð???ð??®ð??µð???. ð??? ð???ð??©ð??¤ð??§ð???ð???ð??©ð??? ð??²ð???ð??©ð??¥ ð??¦ð??? ð??© "
+"ð???ð??®ð??ªð???ð??©ð???ð??¤ð??¦ ð??© ð???ð??ºð??©ð??¯ð??? ð???ð??´ð??¤ð???ð??¼."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:945
-msgid ""
-"You cannot unsubscribe to this newsgroup:\n"
-"\n"
-"newsgroup does not exist!"
-msgstr ""
-"ð??¿ ð???ð??¨ð??¯ð??ªð??? ð??©ð??¯ð???ð??©ð???ð???ð???ð??®ð??²ð??? ð??? ð???ð??¦ð??? ð??¯ð??µð???ð???ð??®ð??µð???:\n"
-"\n"
-"ð??¯ð??µð???ð???ð??®ð??µð??? ð???ð??³ð??? ð??¯ð??ªð??? ð??§ð???ð???ð??¦ð???ð???!"
+#: ../camel/providers/nntp/camel-nntp-store.c:1098
+msgid "You cannot unsubscribe to this newsgroup:\n\nnewsgroup does not exist!"
+msgstr "ð??¿ ð???ð??¨ð??¯ð??ªð??? ð??©ð??¯ð???ð??©ð???ð???ð???ð??®ð??²ð??? ð??? ð???ð??¦ð??? ð??¯ð??µð???ð???ð??®ð??µð???:\n\nð??¯ð??µð???ð???ð??®ð??µð??? ð???ð??³ð??? ð??¯ð??ªð??? ð??§ð???ð???ð??¦ð???ð???!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:970
+#: ../camel/providers/nntp/camel-nntp-store.c:1127
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "ð??¿ ð???ð??¨ð??¯ð??ªð??? ð???ð??®ð??¦ð??±ð??? ð??© ð???ð??´ð??¤ð???ð??¼ ð??¦ð??¯ ð??© ð??¯ð??¿ð??? ð???ð???ð??¹: ð???ð??©ð???ð???ð???ð??®ð??²ð??? ð??¦ð??¯ð???ð???ð??§ð???."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:978
+#: ../camel/providers/nntp/camel-nntp-store.c:1138
 msgid "You cannot rename a folder in a News store."
 msgstr "ð??¿ ð???ð??¨ð??¯ð??ªð??? ð??®ð??°ð??¯ð??±ð??¥ ð??© ð???ð??´ð??¤ð???ð??¼ ð??¦ð??¯ ð??© ð??¯ð??¿ð??? ð???ð???ð??¹."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:986
+#: ../camel/providers/nntp/camel-nntp-store.c:1150
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "ð??¿ ð???ð??¨ð??¯ð??ªð??? ð??®ð??¦ð??¥ð??µð??? ð??© ð???ð??´ð??¤ð???ð??¼ ð??¦ð??¯ ð??© ð??¯ð??¿ð??? ð???ð???ð??¹: ð??©ð??¯ð???ð??©ð???ð???ð???ð??®ð??²ð??? ð??¦ð??¯ð???ð???ð??§ð???."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1180
+#: ../camel/providers/nntp/camel-nntp-store.c:1287
 msgid "Authentication requested but no username provided"
 msgstr "ð??·ð???ð??§ð??¯ð???ð??¦ð???ð??±ð???ð??©ð??¯ ð??®ð??¦ð???ð??¢ð??§ð???ð???ð??©ð??? ð???ð??³ð??? ð??¯ð??´ ð??¿ð???ð??¼ð??¯ð??±ð??¥ ð???ð??®ð??©ð???ð??²ð???ð??©ð???"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1192
 #, c-format
+#: ../camel/providers/nntp/camel-nntp-store.c:1299
 msgid "Cannot authenticate to server: %s"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð??·ð???ð??§ð??¯ð???ð??¦ð???ð??±ð??? ð??? ð???ð??»ð???ð??¼: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1369
+#, fuzzy, c-format
+#: ../camel/providers/nntp/camel-nntp-store.c:1430
+msgid "NNTP Command failed: %s"
+msgstr "IMAP ð???ð??©ð??¥ð??­ð??¯ð??? ð???ð??±ð??¤ð???: %s"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1486
 msgid "Not connected."
 msgstr "ð??¯ð??ªð??? ð???ð??©ð??¯ð??§ð???ð???ð??©ð???."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1422
 #, c-format
+#: ../camel/providers/nntp/camel-nntp-store.c:1543
 msgid "No such folder: %s"
 msgstr "ð??¯ð??´ ð???ð??³ð??? ð???ð??´ð??¤ð???ð??¼: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:272
-#: ../camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
+#: ../camel/providers/nntp/camel-nntp-summary.c:238
+#: ../camel/providers/nntp/camel-nntp-summary.c:340
 msgid "%s: Scanning new messages"
 msgstr "%s: ð???ð???ð??¨ð??¯ð??¦ð??? ð??¯ð??¿ ð??¥ð??§ð???ð??¦ð??¡ð??©ð???"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:384
+#, fuzzy, c-format
+#: ../camel/providers/nntp/camel-nntp-summary.c:249
+msgid "Unexpected server response from xover: %s"
+msgstr "ð??³ð??¯ð??¦ð???ð???ð???ð??§ð???ð???ð??©ð??? ð???ð??»ð???ð??¼ ð??®ð??¦ð???ð???ð??ªð??¯ð??? ð???ð??®ð??ªð??¥ ð??£ð??§ð???: %s"
+
 #, c-format
+#: ../camel/providers/nntp/camel-nntp-summary.c:356
 msgid "Unexpected server response from head: %s"
 msgstr "ð??³ð??¯ð??¦ð???ð???ð???ð??§ð???ð???ð??©ð??? ð???ð??»ð???ð??¼ ð??®ð??¦ð???ð???ð??ªð??¯ð??? ð???ð??®ð??ªð??¥ ð??£ð??§ð???: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:420
-msgid "Use cancel"
-msgstr "ð??¿ð??? ð???ð??¨ð??¯ð???ð??©ð??¤"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:422
 #, c-format
+#: ../camel/providers/nntp/camel-nntp-summary.c:399
 msgid "Operation failed: %s"
 msgstr "ð??ªð???ð??¼ð??±ð???ð??©ð??¯ ð???ð??±ð??¤ð???: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
+#: ../camel/providers/pop3/camel-pop3-folder.c:251
 msgid "Retrieving POP summary"
 msgstr "ð??®ð??¦ð???ð??®ð??°ð???ð??¦ð??? POP ð???ð??³ð??¥ð??¼ð??¦"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
 #, c-format
+#: ../camel/providers/pop3/camel-pop3-folder.c:272
 msgid "Cannot get POP summary: %s"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??? POP ð???ð??³ð??¥ð??¼ð??¦: %s"
 
+#, fuzzy
+#: ../camel/providers/pop3/camel-pop3-folder.c:322
+msgid "Expunging old messages"
+msgstr "Expunging ð??´ð??¤ð??? ð??¥ð??§ð???ð??¦ð??¡ð??©ð???"
+
+#, fuzzy
+#: ../camel/providers/pop3/camel-pop3-folder.c:330
+msgid "Expunging deleted messages"
+msgstr "Expunging ð???ð??¦ð??¤ð??°ð???ð??©ð??? ð??¥ð??§ð???ð??¦ð??¡ð??©ð???"
+
+#, fuzzy, c-format
+#: ../camel/providers/pop3/camel-pop3-folder.c:563
+#: ../camel/providers/pop3/camel-pop3-folder.c:592
+msgid "No message with UID %s"
+msgstr "ð??¯ð??´ ð???ð??³ð??? ð??¥ð??§ð???ð??¦ð??¡ %s ð??¦ð??¯ %s"
+
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:559
 #, c-format
+#: ../camel/providers/pop3/camel-pop3-folder.c:599
 msgid "Retrieving POP message %d"
 msgstr "ð??®ð??¦ð???ð??®ð??°ð???ð??¦ð??? POP ð??¥ð??§ð???ð??¦ð??¡ %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
+#: ../camel/providers/pop3/camel-pop3-folder.c:696
 msgid "Unknown reason"
 msgstr "ð??³ð??¯ð??´ð??¯ ð??®ð??°ð???ð??©ð??¯"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
+msgid "Message storage"
+msgstr "ð??¥ð??§ð???ð??¦ð??¡ ð???ð???ð??¹ð??¦ð??¡"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
 msgstr "_ð??¤ð??°ð??? ð??¥ð??§ð???ð??¦ð??¡ð??©ð??? ð??ªð??¯ ð???ð??»ð???ð??¼"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
 #, c-format
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
 msgid "_Delete after %s day(s)"
 msgstr "_ð???ð??¦ð??¤ð??°ð??? ð??­ð???ð???ð??¼ %s ð???ð??±(ð???)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:49
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
 msgid "Disable _support for all POP3 extensions"
 msgstr "ð???ð??¦ð???ð??±ð???ð??©ð??¤ _ð???ð??©ð???ð??¹ð??? ð???ð??¹ ð??·ð??¤ POP3 ð??©ð???ð???ð???ð??§ð??¯ð???ð??©ð??¯ð???"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:53
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:59
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "ð???ð??¹ ð???ð??©ð??¯ð??§ð???ð???ð??¦ð??? ð??? ð??¯ ð???ð??¬ð??¯ð??¤ð??´ð???ð??¦ð??? ð??¥ð??±ð??¤ ð???ð??®ð??ªð??¥ POP ð???ð??»ð???ð??¼ð???."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:207
+#, fuzzy
+#: ../camel/providers/pop3/camel-pop3-provider.c:72
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
+msgstr ""
+"ð???ð??¦ð??? ð??ªð???ð???ð??©ð??¯ ð??¢ð??¦ð??¤ ð???ð??©ð??¯ð??§ð???ð??? ð??? ð??? ð???ð??ªð??? ð???ð??»ð???ð??¼ ð??¿ð???ð??¦ð??? ð??© plaintext ð???ð??­ð???ð??¢ð??¼ð???. ð???ð??¦ð??? ð??¦ð??? ð??? ð??´ð??¯ð??¤ð??¦ "
+"ð??ªð???ð???ð??©ð??¯ ð???ð??©ð???ð??¹ð???ð??©ð??? ð???ð??² ð??¥ð??§ð??¯ð??¦ ð???ð??ªð??? ð???ð??»ð???ð??¼ð???."
+
+#, fuzzy
+#: ../camel/providers/pop3/camel-pop3-provider.c:82
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that claim "
+"to support it."
+msgstr ""
+"ð???ð??¦ð??? ð??ªð???ð???ð??©ð??¯ ð??¢ð??¦ð??¤ ð???ð??©ð??¯ð??§ð???ð??? ð??? ð??? ð???ð??ªð??? ð???ð??»ð???ð??¼ ð??¿ð???ð??¦ð??? ð??©ð??¯ ð??¦ð??¯ð???ð??®ð??¦ð???ð???ð??©ð??? ð???ð??­ð???ð??¢ð??¼ð??? ð???ð??²ð??© ð??? APOP "
+"ð???ð??®ð??´ð???ð??©ð???ð??ªð??¤. ð???ð??¦ð??? ð??¥ð??± ð??¯ð??ªð??? ð??¢ð??»ð??? ð???ð??¹ ð??·ð??¤ ð??¿ð???ð??¼ð??? ð??°ð???ð??©ð??¯ ð??ªð??¯ ð???ð??»ð???ð??¼ð??? ð???ð??¨ð??? ð???ð??¤ð??±ð??¥ ð??? ð???ð??©ð???ð??¹ð??? ð??¦ð???."
+
+#. Translators: This is the separator between an error and an explanation
+#, fuzzy
+#: ../camel/providers/pop3/camel-pop3-store.c:140
+msgid ": "
+msgstr ": "
+
 #, c-format
+#: ../camel/providers/pop3/camel-pop3-store.c:209
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "ð???ð??±ð??¤ð??? ð??? ð??®ð??°ð??? ð??© ð???ð??¨ð??¤ð??¦ð??? ð???ð??®ð??°ð???ð??¦ð??? ð???ð??®ð??ªð??¥ POP ð???ð??»ð???ð??¼ %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:224
-#: ../camel/providers/pop3/camel-pop3-store.c:238
-#: ../camel/providers/pop3/camel-pop3-store.c:248
-#: ../camel/providers/pop3/camel-pop3-store.c:254
 #, c-format
+#: ../camel/providers/pop3/camel-pop3-store.c:227
+#: ../camel/providers/pop3/camel-pop3-store.c:258
+#: ../camel/providers/pop3/camel-pop3-store.c:264
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "ð???ð??±ð??¤ð??? ð??? ð???ð??©ð??¯ð??§ð???ð??? ð??? POP ð???ð??»ð???ð??¼ %s ð??¦ð??¯ ð???ð??¦ð???ð???ð??«ð??¼ ð??¥ð??´ð???: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:361
+#, fuzzy
+#: ../camel/providers/pop3/camel-pop3-store.c:228
+msgid "STLS not supported by server"
+msgstr "STLS ð??¯ð??ªð??? ð???ð??©ð???ð??¹ð???ð??©ð??? ð???ð??² ð???ð??»ð???ð??¼"
+
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#, fuzzy, c-format
+#: ../camel/providers/pop3/camel-pop3-store.c:246
+msgid "Failed to connect to POP server %s in secure mode%s"
+msgstr "ð???ð??±ð??¤ð??? ð??? ð???ð??©ð??¯ð??§ð???ð??? ð??? POP ð???ð??»ð???ð??¼ %s ð??¦ð??¯ ð???ð??¦ð???ð???ð??«ð??¼ ð??¥ð??´ð???: %s"
+
+#, fuzzy
+#: ../camel/providers/pop3/camel-pop3-store.c:259
+msgid "TLS negotiations failed"
+msgstr "TLS ð??¯ð??©ð???ð??´ð???ð??°ð??±ð???ð??©ð??¯ð??? ð???ð??±ð??¤ð???"
+
+#, fuzzy
+#: ../camel/providers/pop3/camel-pop3-store.c:265
+msgid "TLS is not available in this build"
+msgstr "TLS ð??¦ð??? ð??¯ð??ªð??? ð??©ð???ð??±ð??¤ð??©ð???ð??©ð??¤ ð??¦ð??¯ ð???ð??¦ð??? ð???ð??¦ð??¤ð???"
+
 #, c-format
+#: ../camel/providers/pop3/camel-pop3-store.c:378
 msgid "Could not connect to POP server %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??©ð??¯ð??§ð???ð??? ð??? POP ð???ð??»ð???ð??¼ %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:402
-#: ../camel/providers/pop3/camel-pop3-store.c:535
 #, c-format
+#: ../camel/providers/pop3/camel-pop3-store.c:422
+#: ../camel/providers/pop3/camel-pop3-store.c:574
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr ""
 "ð??³ð??¯ð??±ð???ð??©ð??¤ ð??? ð???ð??©ð??¯ð??§ð???ð??? ð??? POP ð???ð??»ð???ð??¼ %s: ð??¯ð??´ ð???ð??©ð???ð??¹ð??? ð???ð??¹ ð??®ð??¦ð???ð??¢ð??§ð???ð???ð??©ð??? ð??·ð???ð??§ð??¯ð???ð??¦ð???ð??±ð???ð??©ð??¯ ð??¥ð??§ð???ð??©ð??¯ð??¦ð???ð??¥."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:449
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#, fuzzy, c-format
+#: ../camel/providers/pop3/camel-pop3-store.c:444
+msgid "SASL '%s' Login failed for POP server %s%s"
+msgstr "SASL '%s' ð??¤ð??ªð???ð??¦ð??¯ ð???ð??±ð??¤ð??? ð???ð??¹ ð???ð??ªð??? ð???ð??»ð???ð??¼ %s%s"
+
+#, fuzzy, c-format
+#: ../camel/providers/pop3/camel-pop3-store.c:460
+msgid "Cannot login to POP server %s: SASL Protocol error"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð??¤ð??ªð???ð??¦ð??¯ ð??? ð???ð??ªð??? ð???ð??»ð???ð??¼ %s: SASL ð???ð??®ð??´ð???ð??©ð???ð??ªð??¤ ð??»ð??¼"
+
 #, c-format
+#: ../camel/providers/pop3/camel-pop3-store.c:481
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "ð???ð??±ð??¤ð??? ð??? ð??·ð???ð??§ð??¯ð???ð??¦ð???ð??±ð??? ð??ªð??¯ POP ð???ð??»ð???ð??¼ %s: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:549
-#: ../camel/providers/pop3/camel-pop3-store.c:562
-#, c-format
+#, fuzzy, c-format
+#: ../camel/providers/pop3/camel-pop3-store.c:544
 msgid ""
-"Unable to connect to POP server %s.\n"
-"Error sending password: %s"
+"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
+"attack suspected. Please contact your admin."
 msgstr ""
-"ð??³ð??¯ð??±ð???ð??©ð??¤ ð??? ð???ð??©ð??¯ð??§ð???ð??? ð??? POP ð???ð??»ð???ð??¼ %s.\n"
-"ð??»ð??¼ ð???ð??§ð??¯ð???ð??¦ð??? ð???ð??­ð???ð??¢ð??¼ð???: %s"
+"ð??³ð??¯ð??±ð???ð??©ð??¤ ð??? ð???ð??©ð??¯ð??§ð???ð??? ð??? ð???ð??ªð??? ð???ð??»ð???ð??¼ %s:\tð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? APOP ð??¦ð??? ð??®ð??¦ð???ð??°ð???ð???. ð??¦ð??¥ð???ð??»ð???ð??©ð??¯ð??±ð???ð??©ð??¯ ð??©ð???ð??¨ð??? "
+"ð???ð??³ð???ð???ð??§ð???ð???ð??©ð???. ð???ð??¤ð??°ð??? ð???ð??ªð??¯ð???ð??¨ð???ð??? ð??¿ð??¼ admin."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:556
 #, c-format
-msgid ""
-"Unable to connect to POP server %s.\n"
-"Error sending username: %s"
-msgstr ""
-"ð??³ð??¯ð??±ð???ð??©ð??¤ ð??? ð???ð??©ð??¯ð??§ð???ð??? ð??? POP ð???ð??»ð???ð??¼ %s.\n"
-"ð??»ð??¼ ð???ð??§ð??¯ð???ð??¦ð??? ð??¿ð???ð??¼ð??¯ð??±ð??¥: %s"
+#: ../camel/providers/pop3/camel-pop3-store.c:590
+msgid "Unable to connect to POP server %s.\nError sending password: %s"
+msgstr "ð??³ð??¯ð??±ð???ð??©ð??¤ ð??? ð???ð??©ð??¯ð??§ð???ð??? ð??? POP ð???ð??»ð???ð??¼ %s.\nð??»ð??¼ ð???ð??§ð??¯ð???ð??¦ð??? ð???ð??­ð???ð??¢ð??¼ð???: %s"
+
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#, fuzzy, c-format
+#: ../camel/providers/pop3/camel-pop3-store.c:601
+msgid "Unable to connect to POP server %s.\nError sending username%s"
+msgstr "ð??³ð??¯ð??±ð???ð??©ð??¤ ð??? ð???ð??©ð??¯ð??§ð???ð??? ð??? POP ð???ð??»ð???ð??¼ %s.\nð??»ð??¼ ð???ð??§ð??¯ð???ð??¦ð??? ð??¿ð???ð??¼ð??¯ð??±ð??¥: %s"
+
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#, fuzzy, c-format
+#: ../camel/providers/pop3/camel-pop3-store.c:613
+msgid "Unable to connect to POP server %s.\nError sending password%s"
+msgstr "ð??³ð??¯ð??±ð???ð??©ð??¤ ð??? ð???ð??©ð??¯ð??§ð???ð??? ð??? POP ð???ð??»ð???ð??¼ %s.\nð??»ð??¼ ð???ð??§ð??¯ð???ð??¦ð??? ð???ð??­ð???ð??¢ð??¼ð???: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:669
 #, c-format
+#: ../camel/providers/pop3/camel-pop3-store.c:729
 msgid "No such folder '%s'."
 msgstr "ð??¯ð??´ ð???ð??³ð??? ð???ð??´ð??¤ð???ð??¼ '%s'."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:113
+#, fuzzy
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
+msgid "Sendmail"
+msgstr "Sendmail"
+
+#, fuzzy
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
+msgstr ""
+"ð???ð??¹ ð???ð??¦ð??¤ð??¦ð???ð??¼ð??¦ð??? ð??¥ð??±ð??¤ ð???ð??² ð???ð??­ð???ð??¦ð??? ð??¦ð??? ð??? ð??? \"sendmail\" ð???ð??®ð??´ð???ð??®ð??¨ð??¥ ð??ªð??¯ ð??? ð??¤ð??´ð???ð??©ð??¤ ð???ð??¦ð???ð???ð??©ð??¥."
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:98
 msgid "Could not parse recipient list"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??¸ð??? ð??®ð??©ð???ð??¦ð???ð??°ð??©ð??¯ð??? ð??¤ð??¦ð???ð???"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:242
+#, fuzzy, c-format
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:130
+msgid "Could not create pipe to sendmail: %s: mail not sent"
+msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??§ð???ð???ð??©ð???ð??¿ð??? %s: ð??¥ð??±ð??¤ ð??¯ð??ªð??? ð???ð??§ð??¯ð???."
+
+#, fuzzy, c-format
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:151
+msgid "Could not fork sendmail: %s: mail not sent"
+msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??§ð???ð???ð??©ð???ð??¿ð??? %s: ð??¥ð??±ð??¤ ð??¯ð??ªð??? ð???ð??§ð??¯ð???."
+
+#, fuzzy, c-format
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
+msgid "sendmail exited with signal %s: mail not sent."
+msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??§ð???ð???ð??©ð???ð??¿ð??? %s: ð??¥ð??±ð??¤ ð??¯ð??ªð??? ð???ð??§ð??¯ð???."
+
 #, c-format
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
 msgid "Could not execute %s: mail not sent."
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??§ð???ð???ð??©ð???ð??¿ð??? %s: ð??¥ð??±ð??¤ ð??¯ð??ªð??? ð???ð??§ð??¯ð???."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:167
+#, fuzzy, c-format
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
+msgid "sendmail exited with status %d: mail not sent."
+msgstr "sendmail ð??§ð???ð???ð??¦ð???ð??©ð??? ð??¢ð??¦ð??? ð???ð???ð??±ð???ð??«ð??? %d: ð??¥ð??±ð??¤ ð??¯ð??ªð??? ð???ð??§ð??¯ð???."
+
+#, fuzzy
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:248
+msgid "sendmail"
+msgstr "sendmail"
+
+#, fuzzy
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:250
+msgid "Mail delivery via the sendmail program"
+msgstr "ð??¥ð??±ð??¤ ð???ð??¦ð??¤ð??¦ð???ð??¼ð??¦ ð???ð??²ð??© ð??? sendmail ð???ð??®ð??´ð???ð??®ð??¨ð??¥"
+
+#, fuzzy
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
+msgid "SMTP"
+msgstr "SMTP"
+
+#, fuzzy
+#: ../camel/providers/smtp/camel-smtp-provider.c:45
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+msgstr "ð???ð??¹ ð???ð??¦ð??¤ð??¦ð???ð??¼ð??¦ð??? ð??¥ð??±ð??¤ ð???ð??² ð???ð??©ð??¯ð??§ð???ð???ð??¦ð??? ð??? ð??© ð??®ð??¦ð??¥ð??´ð??? mailhub ð??¿ð???ð??¦ð??? SMTP."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:117
 msgid "Syntax error, command unrecognized"
 msgstr "ð???ð??¦ð??¯ð???ð??¨ð???ð??? ð??»ð??¼, ð???ð??©ð??¥ð??­ð??¯ð??? ð??©ð??¯ð??®ð??§ð???ð??©ð???ð??¯ð??²ð???ð???"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:169
+#: ../camel/providers/smtp/camel-smtp-transport.c:119
 msgid "Syntax error in parameters or arguments"
 msgstr "ð???ð??¦ð??¯ð???ð??¨ð???ð??? ð??»ð??¼ ð??¦ð??¯ ð???ð??¼ð??¨ð??¥ð??©ð???ð??¼ð??? ð??¹ ð??¸ð???ð??¿ð??¥ð??©ð??¯ð???ð???"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:171
+#: ../camel/providers/smtp/camel-smtp-transport.c:121
 msgid "Command not implemented"
 msgstr "ð???ð??©ð??¥ð??­ð??¯ð??? ð??¯ð??ªð??? ð??¦ð??¥ð???ð??¤ð??©ð??¥ð??§ð??¯ð???ð??©ð???"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:173
+#: ../camel/providers/smtp/camel-smtp-transport.c:123
 msgid "Command parameter not implemented"
 msgstr "ð???ð??©ð??¥ð??­ð??¯ð??? ð???ð??¼ð??¨ð??¥ð??©ð???ð??¼ ð??¯ð??ªð??? ð??¦ð??¥ð???ð??¤ð??©ð??¥ð??§ð??¯ð???ð??©ð???"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:175
+#: ../camel/providers/smtp/camel-smtp-transport.c:125
 msgid "System status, or system help reply"
 msgstr "ð???ð??¦ð???ð???ð??©ð??¥ ð???ð???ð??±ð???ð??«ð???, ð??¹ ð???ð??¦ð???ð???ð??©ð??¥ ð??£ð??§ð??¤ð??? ð??®ð??¦ð???ð??¤ð??²"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:177
+#: ../camel/providers/smtp/camel-smtp-transport.c:127
 msgid "Help message"
 msgstr "ð??£ð??§ð??¤ð??? ð??¥ð??§ð???ð??¦ð??¡"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:179
+#: ../camel/providers/smtp/camel-smtp-transport.c:129
 msgid "Service ready"
 msgstr "ð???ð??»ð???ð??¦ð??? ð??®ð??§ð???ð??¦"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:181
+#: ../camel/providers/smtp/camel-smtp-transport.c:131
 msgid "Service closing transmission channel"
 msgstr "ð???ð??»ð???ð??¦ð??? ð???ð??¤ð??´ð???ð??¦ð??? ð???ð??®ð??¨ð??¯ð???ð??¥ð??¦ð???ð??©ð??¯ ð???ð??¨ð??¯ð??©ð??¤"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:183
+#: ../camel/providers/smtp/camel-smtp-transport.c:133
 msgid "Service not available, closing transmission channel"
 msgstr "ð???ð??»ð???ð??¦ð??? ð??¯ð??ªð??? ð??©ð???ð??±ð??¤ð??©ð???ð??©ð??¤, ð???ð??¤ð??´ð???ð??¦ð??? ð???ð??®ð??¨ð??¯ð???ð??¥ð??¦ð???ð??©ð??¯ ð???ð??¨ð??¯ð??©ð??¤"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:185
+#: ../camel/providers/smtp/camel-smtp-transport.c:135
 msgid "Requested mail action okay, completed"
 msgstr "ð??®ð??¦ð???ð??¢ð??§ð???ð???ð??©ð??? ð??¥ð??±ð??¤ ð??¨ð???ð???ð??©ð??¯ ð??´ð???ð??±, ð???ð??©ð??¥ð???ð??¤ð??°ð???ð??©ð???"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:187
+#: ../camel/providers/smtp/camel-smtp-transport.c:137
 msgid "User not local; will forward to <forward-path>"
 msgstr "ð??¿ð???ð??¼ ð??¯ð??ªð??? ð??¤ð??´ð???ð??©ð??¤; ð??¢ð??¦ð??¤ ð???ð??¹ð??¢ð??¼ð??? ð??? <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:189
+#: ../camel/providers/smtp/camel-smtp-transport.c:139
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "ð??®ð??¦ð???ð??¢ð??§ð???ð???ð??©ð??? ð??¥ð??±ð??¤ ð??¨ð???ð???ð??©ð??¯ ð??¯ð??ªð??? ð???ð??±ð???ð??©ð??¯: ð??¥ð??±ð??¤ð???ð??ªð???ð??? ð??©ð??¯ð??©ð???ð??±ð??¤ð??©ð???ð??©ð??¤"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:191
+#: ../camel/providers/smtp/camel-smtp-transport.c:141
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "ð??®ð??¦ð???ð??¢ð??§ð???ð???ð??©ð??? ð??¨ð???ð???ð??©ð??¯ ð??¯ð??ªð??? ð???ð??±ð???ð??©ð??¯: ð??¥ð??±ð??¤ð???ð??ªð???ð??? ð??©ð??¯ð??©ð???ð??±ð??¤ð??©ð???ð??©ð??¤"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:143
 msgid "Requested action aborted: error in processing"
 msgstr "ð??®ð??¦ð???ð??¢ð??§ð???ð???ð??©ð??? ð??¨ð???ð???ð??©ð??¯ ð??©ð???ð??¹ð???ð??©ð???: ð??»ð??¼ ð??¦ð??¯ ð???ð??®ð??´ð???ð??§ð???ð??¦ð???"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:195
+#: ../camel/providers/smtp/camel-smtp-transport.c:145
 msgid "User not local; please try <forward-path>"
 msgstr "ð??¿ð???ð??¼ ð??¯ð??ªð??? ð??¤ð??´ð???ð??©ð??¤; ð???ð??¤ð??°ð??? ð???ð??®ð??² <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:197
+#: ../camel/providers/smtp/camel-smtp-transport.c:147
 msgid "Requested action not taken: insufficient system storage"
 msgstr "ð??®ð??¦ð???ð??¢ð??§ð???ð???ð??©ð??? ð??¨ð???ð???ð??©ð??¯ ð??¯ð??ªð??? ð???ð??±ð???ð??©ð??¯: ð??¦ð??¯ð???ð??©ð???ð??¦ð???ð??©ð??¯ð??? ð???ð??¦ð???ð???ð??©ð??¥ ð???ð???ð??¹ð??¦ð??¡"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:199
+#: ../camel/providers/smtp/camel-smtp-transport.c:149
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "ð??®ð??¦ð???ð??¢ð??§ð???ð???ð??©ð??? ð??¥ð??±ð??¤ ð??¨ð???ð???ð??©ð??¯ ð??©ð???ð??¹ð???ð??©ð???: ð??©ð???ð???ð??°ð???ð??©ð??? ð???ð???ð??¹ð??¦ð??¡ ð??¨ð??¤ð??´ð???ð??±ð???ð??©ð??¯"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:201
+#: ../camel/providers/smtp/camel-smtp-transport.c:151
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "ð??®ð??¦ð???ð??¢ð??§ð???ð???ð??©ð??? ð??¨ð???ð???ð??©ð??¯ ð??¯ð??ªð??? ð???ð??±ð???ð??©ð??¯: ð??¥ð??±ð??¤ð???ð??ªð???ð??? ð??¯ð??±ð??¥ ð??¯ð??ªð??? ð??©ð??¤ð??¬ð???"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:205
+#, fuzzy
+#: ../camel/providers/smtp/camel-smtp-transport.c:153
+msgid "Start mail input; end with <CRLF>.<CRLF>"
+msgstr "ð???ð???ð??¸ð??? ð??¥ð??±ð??¤ ð??¦ð??¯ð???ð??«ð???; ð??§ð??¯ð??? ð??¢ð??¦ð??? <CRLF>.<CRLF>"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:155
 msgid "Transaction failed"
 msgstr "ð???ð??®ð??¨ð??¯ð???ð??¨ð???ð???ð??©ð??¯ ð???ð??±ð??¤ð???"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:209
+#: ../camel/providers/smtp/camel-smtp-transport.c:159
 msgid "A password transition is needed"
 msgstr "ð??© ð???ð??­ð???ð??¢ð??¼ð??? ð???ð??®ð??¨ð??¯ð???ð??¦ð???ð??©ð??¯ ð??¦ð??? ð??¯ð??°ð???ð??©ð???"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:211
+#: ../camel/providers/smtp/camel-smtp-transport.c:161
 msgid "Authentication mechanism is too weak"
 msgstr "ð??·ð???ð??§ð??¯ð???ð??¦ð???ð??±ð???ð??©ð??¯ ð??¥ð??§ð???ð??©ð??¯ð??¦ð???ð??¥ ð??¦ð??? ð???ð??µ ð??¢ð??°ð???"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/smtp/camel-smtp-transport.c:163
 msgid "Encryption required for requested authentication mechanism"
 msgstr "ð??¦ð??¯ð???ð??®ð??¦ð???ð???ð??©ð??¯ ð??®ð??¦ð???ð??¢ð??²ð??¼ð??? ð???ð??¹ ð??®ð??¦ð???ð??¢ð??§ð???ð???ð??©ð??? ð??·ð???ð??§ð??¯ð???ð??¦ð???ð??±ð???ð??©ð??¯ ð??¥ð??§ð???ð??©ð??¯ð??¦ð???ð??¥"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
+#: ../camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Temporary authentication failure"
 msgstr "ð???ð??§ð??¥ð???ð??¼ð??¼ð??¦ ð??·ð???ð??§ð??¯ð???ð??¦ð???ð??±ð???ð??©ð??¯ ð???ð??±ð??¤ð???ð??¼"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:296
+#: ../camel/providers/smtp/camel-smtp-transport.c:249
 msgid "Welcome response error"
 msgstr "ð??¢ð??§ð??¤ð???ð??©ð??¥ ð??®ð??¦ð???ð???ð??ªð??¯ð??? ð??»ð??¼"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:720
+#, fuzzy, c-format
+#: ../camel/providers/smtp/camel-smtp-transport.c:285
+#: ../camel/providers/smtp/camel-smtp-transport.c:319
+#: ../camel/providers/smtp/camel-smtp-transport.c:326
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr "ð???ð??±ð??¤ð??? ð??? ð???ð??©ð??¯ð??§ð???ð??? ð??? IMAP ð???ð??»ð???ð??¼ %s ð??¦ð??¯ ð???ð??¦ð???ð???ð??«ð??¼ ð??¥ð??´ð???: %s"
+
+#, fuzzy, c-format
+#: ../camel/providers/smtp/camel-smtp-transport.c:295
+msgid "STARTTLS command failed: %s"
+msgstr "ð??ªð??? ð???ð??©ð??¥ð??­ð??¯ð??? ð???ð??±ð??¤ð???: %s"
+
+#, fuzzy
+#: ../camel/providers/smtp/camel-smtp-transport.c:309
+msgid "STARTTLS command failed"
+msgstr "STARTTLS ð???ð??©ð??¥ð??­ð??¯ð??? ð???ð??±ð??¤ð???"
+
+#, fuzzy, c-format
+#: ../camel/providers/smtp/camel-smtp-transport.c:454
+msgid "SMTP server %s does not support requested authentication type %s."
+msgstr "IMAP ð???ð??»ð???ð??¼ %s ð???ð??³ð??? ð??¯ð??ªð??? ð???ð??©ð???ð??¹ð??? ð??®ð??¦ð???ð??¢ð??§ð???ð???ð??©ð??? ð??·ð???ð??§ð??¯ð???ð??¦ð???ð??±ð???ð??©ð??¯ ð???ð??²ð??? %s"
+
+#, fuzzy, c-format
+#: ../camel/providers/smtp/camel-smtp-transport.c:526
+msgid "Unable to authenticate to SMTP server.\n%s\n\n"
+msgstr "ð??³ð??¯ð??±ð???ð??©ð??¤ ð??? ð??·ð???ð??§ð??¯ð???ð??¦ð???ð??±ð??? ð??? IMAP ð???ð??»ð???ð??¼.\n%s\n\n"
+
+#, fuzzy, c-format
+#: ../camel/providers/smtp/camel-smtp-transport.c:664
+msgid "SMTP server %s"
+msgstr "IMAP ð???ð??»ð???ð??¼ %s"
+
+#, fuzzy, c-format
+#: ../camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP mail delivery via %s"
+msgstr "SMTP ð??¥ð??±ð??¤ ð???ð??¦ð??¤ð??¦ð???ð??¼ð??¦ ð???ð??²ð??© %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:685
 msgid "Cannot send message: service not connected."
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??¯ð??? ð??¥ð??§ð???ð??¦ð??¡: ð???ð??»ð???ð??¦ð??? ð??¯ð??ªð??? ð???ð??©ð??¯ð??§ð???ð???ð??©ð???."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:726
+#: ../camel/providers/smtp/camel-smtp-transport.c:692
 msgid "Cannot send message: sender address not valid."
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??¯ð??? ð??¥ð??§ð???ð??¦ð??¡: ð???ð??§ð??¯ð???ð??» ð??©ð???ð??®ð??§ð??? ð??¯ð??ªð??? ð???ð??¨ð??¤ð??¦ð???."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:730
+#: ../camel/providers/smtp/camel-smtp-transport.c:696
 msgid "Sending message"
 msgstr "ð???ð??§ð??¯ð???ð??¦ð??? ð??¥ð??§ð???ð??¦ð??¡"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
+#: ../camel/providers/smtp/camel-smtp-transport.c:712
 msgid "Cannot send message: no recipients defined."
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??¯ð??? ð??¥ð??§ð???ð??¦ð??¡: ð??¯ð??´ ð??®ð??¦ð???ð??¦ð???ð??°ð??©ð??¯ð???ð??? ð???ð??¦ð???ð??²ð??¯ð???."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:756
+#: ../camel/providers/smtp/camel-smtp-transport.c:724
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??§ð??¯ð??? ð??¥ð??§ð???ð??¦ð??¡: ð??¢ð??³ð??¯ ð??¹ ð??¥ð??¹ ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð??®ð??¦ð???ð??¦ð???ð??°ð??©ð??¯ð???ð???"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1116
-#: ../camel/providers/smtp/camel-smtp-transport.c:1127
+#, fuzzy
+#: ../camel/providers/smtp/camel-smtp-transport.c:961
+msgid "SMTP Greeting"
+msgstr "SMTP ð???ð??®ð??°ð???ð??¦ð???"
+
+#, fuzzy, c-format
+#: ../camel/providers/smtp/camel-smtp-transport.c:986
+msgid "HELO command failed: %s"
+msgstr "ð??ªð??? ð???ð??©ð??¥ð??­ð??¯ð??? ð???ð??±ð??¤ð???: %s"
+
+#, fuzzy
+#: ../camel/providers/smtp/camel-smtp-transport.c:1003
+msgid "HELO command failed"
+msgstr "HELO ð???ð??©ð??¥ð??­ð??¯ð??? ð???ð??±ð??¤ð???"
+
+#, fuzzy
+#: ../camel/providers/smtp/camel-smtp-transport.c:1070
+msgid "SMTP Authentication"
+msgstr "SMTP ð??·ð???ð??§ð??¯ð???ð??¦ð???ð??±ð???ð??©ð??¯"
+
+#, fuzzy
+#: ../camel/providers/smtp/camel-smtp-transport.c:1077
+msgid "Error creating SASL authentication object."
+msgstr "ð??»ð??¼ ð???ð??®ð??¦ð??±ð???ð??¦ð??? SASL ð??·ð???ð??§ð??¯ð???ð??¦ð???ð??±ð???ð??©ð??¯ ð??©ð???ð??¡ð??§ð???ð???."
+
 #, c-format
+#: ../camel/providers/smtp/camel-smtp-transport.c:1094
+#: ../camel/providers/smtp/camel-smtp-transport.c:1105
 msgid "AUTH command failed: %s"
 msgstr "ð??ªð??? ð???ð??©ð??¥ð??­ð??¯ð??? ð???ð??±ð??¤ð???: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1133
+#: ../camel/providers/smtp/camel-smtp-transport.c:1113
 msgid "AUTH command failed"
 msgstr "ð??ªð??? ð???ð??©ð??¥ð??­ð??¯ð??? ð???ð??±ð??¤ð???"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1203
+#: ../camel/providers/smtp/camel-smtp-transport.c:1184
 msgid "Bad authentication response from server.\n"
 msgstr "ð???ð??¨ð??? ð??·ð???ð??§ð??¯ð???ð??¦ð???ð??±ð???ð??©ð??¯ ð??®ð??¦ð???ð???ð??ªð??¯ð??? ð???ð??®ð??ªð??¥ ð???ð??»ð???ð??¼.\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1230
 #, c-format
+#: ../camel/providers/smtp/camel-smtp-transport.c:1211
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "ð??¥ð??±ð??¤ ð???ð??®ð??ªð??¥ ð???ð??©ð??¥ð??­ð??¯ð??? ð???ð??±ð??¤ð???: %s: ð??¥ð??±ð??¤ ð??¯ð??ªð??? ð???ð??§ð??¯ð???"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1247
+#: ../camel/providers/smtp/camel-smtp-transport.c:1226
 msgid "MAIL FROM command failed"
 msgstr "ð??¥ð??±ð??¤ ð???ð??®ð??ªð??¥ ð???ð??©ð??¥ð??­ð??¯ð??? ð???ð??±ð??¤ð???"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1330
-#: ../camel/providers/smtp/camel-smtp-transport.c:1399
-#: ../camel/providers/smtp/camel-smtp-transport.c:1418
+#, fuzzy, c-format
+#: ../camel/providers/smtp/camel-smtp-transport.c:1250
+msgid "RCPT TO command failed: %s: mail not sent"
+msgstr "ð???ð??±ð???ð??© ð???ð??©ð??¥ð??­ð??¯ð??? ð???ð??±ð??¤ð???: %s: ð??¥ð??±ð??¤ ð??¯ð??ªð??? ð???ð??§ð??¯ð???"
+
+#, fuzzy, c-format
+#: ../camel/providers/smtp/camel-smtp-transport.c:1269
+msgid "RCPT TO <%s> failed"
+msgstr "RCPT ð??? <%s> ð???ð??±ð??¤ð???"
+
 #, c-format
+#: ../camel/providers/smtp/camel-smtp-transport.c:1309
+#: ../camel/providers/smtp/camel-smtp-transport.c:1384
+#: ../camel/providers/smtp/camel-smtp-transport.c:1402
 msgid "DATA command failed: %s: mail not sent"
 msgstr "ð???ð??±ð???ð??© ð???ð??©ð??¥ð??­ð??¯ð??? ð???ð??±ð??¤ð???: %s: ð??¥ð??±ð??¤ ð??¯ð??ªð??? ð???ð??§ð??¯ð???"
 
-#. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1347
-#: ../camel/providers/smtp/camel-smtp-transport.c:1434
+#: ../camel/providers/smtp/camel-smtp-transport.c:1326
+#: ../camel/providers/smtp/camel-smtp-transport.c:1415
 msgid "DATA command failed"
 msgstr "ð???ð??±ð???ð??© ð???ð??©ð??¥ð??­ð??¯ð??? ð???ð??±ð??¤ð???"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1496
+#, fuzzy, c-format
+#: ../camel/providers/smtp/camel-smtp-transport.c:1438
+msgid "RSET command failed: %s"
+msgstr "ð??ªð??? ð???ð??©ð??¥ð??­ð??¯ð??? ð???ð??±ð??¤ð???: %s"
+
+#, fuzzy
+#: ../camel/providers/smtp/camel-smtp-transport.c:1453
+msgid "RSET command failed"
+msgstr "RSET ð???ð??©ð??¥ð??­ð??¯ð??? ð???ð??±ð??¤ð???"
+
 #, c-format
+#: ../camel/providers/smtp/camel-smtp-transport.c:1476
 msgid "QUIT command failed: %s"
 msgstr "ð???ð??¢ð??¦ð??? ð???ð??©ð??¥ð??­ð??¯ð??? ð???ð??±ð??¤ð???: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1510
+#: ../camel/providers/smtp/camel-smtp-transport.c:1492
 msgid "QUIT command failed"
 msgstr "ð???ð??¢ð??¦ð??? ð???ð??©ð??¥ð??­ð??¯ð??? ð???ð??±ð??¤ð???"
 
@@ -3783,6 +4343,11 @@ msgstr "ð???ð??©ð???ð??¤ð??²ð??¼ð???"
 msgid "Time & Expenses"
 msgstr "ð???ð??²ð??¥ & ð??¦ð???ð???ð???ð??§ð??¯ð???ð??©ð???"
 
+#, fuzzy
+#: ../libedataserver/e-categories.c:67
+msgid "VIP"
+msgstr "VIP"
+
 #: ../libedataserver/e-categories.c:68
 msgid "Waiting"
 msgstr "ð??¢ð??±ð???ð??¦ð???"
@@ -3791,7 +4356,7 @@ msgstr "ð??¢ð??±ð???ð??¦ð???"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1900
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1902
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
@@ -3799,7 +4364,7 @@ msgstr "%a %m/%d/%Y %I:%M:%S %p"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1891
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1893
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
@@ -3807,7 +4372,7 @@ msgstr "%a %m/%d/%Y %H:%M:%S"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1896
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1898
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
@@ -3815,7 +4380,7 @@ msgstr "%a %m/%d/%Y %I:%M %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1887
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1889
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
@@ -3833,8 +4398,8 @@ msgstr "%a %m/%d/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1763
-#: ../libedataserver/e-time-utils.c:1882
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1765
+#: ../libedataserver/e-time-utils.c:1884
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
@@ -3874,19 +4439,19 @@ msgstr "%m/%d/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1766
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1768
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1824 ../libedataserver/e-time-utils.c:1944
+#: ../libedataserver/e-time-utils.c:1826 ../libedataserver/e-time-utils.c:1946
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1828 ../libedataserver/e-time-utils.c:1936
+#: ../libedataserver/e-time-utils.c:1830 ../libedataserver/e-time-utils.c:1938
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -3894,24 +4459,24 @@ msgstr "%H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1833 ../libedataserver/e-time-utils.c:1941
+#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1943
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1837 ../libedataserver/e-time-utils.c:1933
+#: ../libedataserver/e-time-utils.c:1839 ../libedataserver/e-time-utils.c:1935
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1840
+#: ../libedataserver/e-time-utils.c:1842
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1844
+#: ../libedataserver/e-time-utils.c:1846
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -3923,79 +4488,76 @@ msgstr "ð??¨ð???ð???ð??§ð???ð??¦ð??? LDAP ð???ð??»ð???ð??¼ ð??©ð??¯ð??ªð??¯ð??¦
 msgid "Failed to authenticate.\n"
 msgstr "ð???ð??±ð??¤ð??? ð??? ð??·ð???ð??§ð??¯ð???ð??¦ð???ð??±ð???.\n"
 
-#: ../libedataserverui/e-categories-dialog.c:338
+#: ../libedataserverui/e-categories-dialog.c:145
+msgid "Category Icon"
+msgstr "ð???ð??¨ð???ð??§ð???ð??¹ð??° ð??²ð???ð??ªð??¯"
+
+#, fuzzy
+#: ../libedataserverui/e-categories-dialog.c:151
+msgid "_No Image"
+msgstr "_No ð??¦ð??¥ð??¦ð??¡"
+
 #, c-format
+#: ../libedataserverui/e-categories-dialog.c:372
 msgid ""
-"There is already a category '%s' in the configuration. Please use another "
-"name"
+"There is already a category '%s' in the configuration. Please use another name"
 msgstr "ð???ð??º ð??¦ð??? ð??·ð??¤ð??®ð??§ð???ð??¦ ð??© ð???ð??¨ð???ð??§ð???ð??¹ð??° '%s' ð??¦ð??¯ ð??? ð???ð??©ð??¯ð???ð??¦ð???ð???ð??¼ð??±ð???ð??©ð??¯. ð???ð??¤ð??°ð??? ð??¿ð??? ð??©ð??¯ð??³ð???ð??¼ ð??¯ð??±ð??¥"
 
-#: ../libedataserverui/e-categories-dialog.c:641
+#: ../libedataserverui/e-categories-dialog.c:680
 msgid "Icon"
 msgstr "ð??²ð???ð??ªð??¯"
 
-#: ../libedataserverui/e-categories-dialog.c:646
+#: ../libedataserverui/e-categories-dialog.c:685
 msgid "Category"
 msgstr "ð???ð??¨ð???ð??§ð???ð??¹ð??°"
 
 #: ../libedataserverui/e-categories-dialog.ui.h:1
-msgid "Category Icon"
-msgstr "ð???ð??¨ð???ð??§ð???ð??¹ð??° ð??²ð???ð??ªð??¯"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:2
 msgid "Category Properties"
 msgstr "ð???ð??¨ð???ð??§ð???ð??¹ð??° ð???ð??®ð??ªð???ð??¼ð???ð??¦ð???"
 
-#: ../libedataserverui/e-categories-dialog.ui.h:3
+#: ../libedataserverui/e-categories-dialog.ui.h:2
 msgid "Category _Icon"
 msgstr "ð???ð??¨ð???ð??§ð???ð??¹ð??° _ð??²ð???ð??ªð??¯"
 
-#: ../libedataserverui/e-categories-dialog.ui.h:4
+#: ../libedataserverui/e-categories-dialog.ui.h:3
 msgid "Category _Name"
 msgstr "ð???ð??¨ð???ð??§ð???ð??¹ð??° _ð??¯ð??±ð??¥"
 
-#: ../libedataserverui/e-categories-dialog.ui.h:5
-msgid "Item(s) _belong to these categories:"
-msgstr "ð??²ð???ð??©ð??¥(ð???) _ð???ð??¦ð??¤ð??ªð??? ð??? ð???ð??°ð??? ð???ð??¨ð???ð??©ð???ð??ªð??®ð??°ð???:"
+#, fuzzy
+#: ../libedataserverui/e-categories-dialog.ui.h:4
+msgid "Currently _used categories:"
+msgstr "ð???ð??³ð??®ð??©ð??¯ð???ð??¤ð??¦ _used ð???ð??¨ð???ð??©ð???ð??ªð??®ð??°ð???:"
 
-#: ../libedataserverui/e-categories-dialog.ui.h:6
+#: ../libedataserverui/e-categories-dialog.ui.h:5
 msgid "_Available Categories:"
 msgstr "_ð??©ð???ð??±ð??¤ð??©ð???ð??©ð??¤ ð???ð??¨ð???ð??©ð???ð??ªð??®ð??°ð???:"
 
-#: ../libedataserverui/e-categories-dialog.ui.h:7
+#: ../libedataserverui/e-categories-dialog.ui.h:6
 msgid "_Edit"
 msgstr "_ð??§ð???ð??¦ð???"
 
-#: ../libedataserverui/e-categories-dialog.ui.h:8
+#: ../libedataserverui/e-categories-dialog.ui.h:7
 msgid "categories"
 msgstr "ð???ð??¨ð???ð??©ð???ð??ªð??®ð??°ð???"
 
-#: ../libedataserverui/e-category-completion.c:290
 #, c-format
+#: ../libedataserverui/e-category-completion.c:292
 msgid "Create category \"%s\""
 msgstr "ð???ð??®ð??¦ð??±ð??? ð???ð??¨ð???ð??§ð???ð??¹ð??° \"%s\""
 
-#: ../libedataserverui/e-cell-renderer-color.c:222
-msgid "Color Info"
-msgstr "ð???ð??³ð??¤ð??¼ ð??¦ð??¯ð???ð??´"
-
-#: ../libedataserverui/e-cell-renderer-color.c:223
-msgid "The color to render"
-msgstr "ð??? ð???ð??³ð??¤ð??¼ ð??? ð??®ð??§ð??¯ð???ð??»"
-
-#: ../libedataserverui/e-name-selector-dialog.c:292
+#: ../libedataserverui/e-name-selector-dialog.c:319
 msgid "Select Contacts from Address Book"
 msgstr "ð???ð??©ð??¤ð??§ð???ð??? ð???ð??ªð??¯ð???ð??¨ð???ð???ð??? ð???ð??®ð??ªð??¥ ð??©ð???ð??®ð??§ð??? ð???ð??«ð???"
 
-#: ../libedataserverui/e-name-selector-dialog.c:579
+#: ../libedataserverui/e-name-selector-dialog.c:659
 msgid "_Add"
 msgstr "_ð??¨ð???"
 
-#: ../libedataserverui/e-name-selector-dialog.c:604
+#: ../libedataserverui/e-name-selector-dialog.c:663
 msgid "_Remove"
 msgstr "_ð??®ð??¦ð??¥ð??µð???"
 
-#: ../libedataserverui/e-name-selector-dialog.c:781
+#: ../libedataserverui/e-name-selector-dialog.c:854
 #: ../libedataserverui/e-name-selector-dialog.ui.h:6
 msgid "Any Category"
 msgstr "ð??§ð??¯ð??¦ ð???ð??¨ð???ð??§ð???ð??¹ð??°"
@@ -4004,14 +4566,29 @@ msgstr "ð??§ð??¯ð??¦ ð???ð??¨ð???ð??§ð???ð??¹ð??°"
 msgid "*"
 msgstr "*"
 
+#, fuzzy
+#: ../libedataserverui/e-name-selector-dialog.ui.h:2
+msgid "<b>Co_ntacts</b>"
+msgstr "<ð???ð??°>Co_ntacts</ð???ð??°>"
+
 #: ../libedataserverui/e-name-selector-dialog.ui.h:3
 msgid "<b>Show Contacts</b>"
 msgstr "<b>ð???ð??´ ð???ð??ªð??¯ð???ð??¨ð???ð???ð???</b>"
 
+#, fuzzy
+#: ../libedataserverui/e-name-selector-dialog.ui.h:4
+msgid "Address B_ook:"
+msgstr "ð??©ð???ð??®ð??§ð??? B_ook:"
+
 #: ../libedataserverui/e-name-selector-dialog.ui.h:5
 msgid "Address Book"
 msgstr "ð??©ð???ð??®ð??§ð??? ð???ð??«ð???"
 
+#, fuzzy
+#: ../libedataserverui/e-name-selector-dialog.ui.h:7
+msgid "Cate_gory:"
+msgstr "Cate_gory:"
+
 #: ../libedataserverui/e-name-selector-dialog.ui.h:8
 msgid "Contacts"
 msgstr "ð???ð??ªð??¯ð???ð??¨ð???ð???ð???"
@@ -4024,31 +4601,59 @@ msgstr "ð???ð??»ð???"
 msgid "_Search:"
 msgstr "_ð???ð??»ð???:"
 
+#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
+#, fuzzy, c-format
+#: ../libedataserverui/e-name-selector-entry.c:2498
+msgid "E_xpand %s Inline"
+msgstr "E_xpand %s Inline"
+
+#. Copy Contact Item
+#, fuzzy, c-format
+#: ../libedataserverui/e-name-selector-entry.c:2513
+msgid "Cop_y %s"
+msgstr "Cop_y %s"
+
+#. Cut Contact Item
+#, fuzzy, c-format
+#: ../libedataserverui/e-name-selector-entry.c:2523
+msgid "C_ut %s"
+msgstr "_ð??§ð???ð??¦ð??? %s"
+
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2550
 #, c-format
+#: ../libedataserverui/e-name-selector-entry.c:2540
 msgid "_Edit %s"
 msgstr "_ð??§ð???ð??¦ð??? %s"
 
-#: ../libedataserverui/e-name-selector-list.c:469
 #, c-format
+#: ../libedataserverui/e-name-selector-list.c:517
 msgid "_Delete %s"
 msgstr "_ð???ð??¦ð??¤ð??°ð??? %s"
 
-#: ../libedataserverui/e-passwords.c:234
 #, c-format
+#: ../libedataserverui/e-passwords.c:257
 msgid "Keyring key is unusable: no user or host name"
 msgstr "ð???ð??°ð??®ð??¦ð??? ð???ð??° ð??¦ð??? ð??©ð??¯ð???ð??µð???ð??©ð???ð??©ð??¤: ð??¯ð??´ ð??¿ð???ð??¼ ð??¹ ð??£ð??´ð???ð??? ð??¯ð??±ð??¥"
 
-#: ../libedataserverui/e-passwords.c:1093
+#: ../libedataserverui/e-passwords.c:1116
 msgid "You have the Caps Lock key on."
 msgstr "ð??¿ ð??£ð??¨ð??? ð??? ð???ð??¨ð???ð??? ð??¤ð??ªð??? ð???ð??° ð??ªð??¯."
 
-#: ../libedataserverui/e-passwords.c:1221
+#, fuzzy
+#: ../libedataserverui/e-passwords.c:1238
+msgid "_Remember this passphrase"
+msgstr "_Remember ð???ð??¦ð??? passphrase"
+
+#, fuzzy
+#: ../libedataserverui/e-passwords.c:1239
+msgid "_Remember this passphrase for the remainder of this session"
+msgstr "_Remember ð???ð??¦ð??? passphrase ð???ð??¹ ð??? ð??®ð??¦ð??¥ð??±ð??¯ð???ð??¼ ð??? ð???ð??¦ð??? ð???ð??§ð???ð??©ð??¯"
+
+#: ../libedataserverui/e-passwords.c:1244
 msgid "_Remember this password"
 msgstr "_ð??®ð??¦ð??¥ð??§ð??¥ð???ð??¼ ð???ð??¦ð??? ð???ð??­ð???ð??¢ð??¼ð???"
 
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:1245
 msgid "_Remember this password for the remainder of this session"
 msgstr "_ð??®ð??¦ð??¥ð??§ð??¥ð???ð??¼ ð???ð??¦ð??? ð???ð??­ð???ð??¢ð??¼ð??? ð???ð??¹ ð??? ð??®ð??¦ð??¥ð??±ð??¯ð???ð??¼ ð??? ð???ð??¦ð??? ð???ð??§ð???ð??©ð??¯"
 
@@ -4057,22 +4662,23 @@ msgstr "_ð??®ð??¦ð??¥ð??§ð??¥ð???ð??¼ ð???ð??¦ð??? ð???ð??­ð???ð??¢ð??¼ð??? ð???
 msgid "Select destination"
 msgstr "ð???ð??©ð??¤ð??§ð???ð??? ð???ð??§ð???ð???ð??¦ð??¯ð??±ð???ð??©ð??¯"
 
-#: ../libedataserverui/e-source-selector-dialog.c:156
+#: ../libedataserverui/e-source-selector-dialog.c:172
 msgid "_Destination"
 msgstr "_ð???ð??§ð???ð???ð??¦ð??¯ð??±ð???ð??©ð??¯"
 
-#: ../servers/groupwise/e-gw-connection.c:225
+#: ../servers/groupwise/e-gw-connection.c:227
 msgid "Invalid connection"
 msgstr "ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð???ð??©ð??¯ð??§ð???ð???ð??©ð??¯"
 
-#: ../servers/groupwise/e-gw-connection.c:229
+#: ../servers/groupwise/e-gw-connection.c:231
 msgid "Invalid response from server"
 msgstr "ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð??®ð??¦ð???ð???ð??ªð??¯ð??? ð???ð??®ð??ªð??¥ ð???ð??»ð???ð??¼"
 
-#: ../servers/groupwise/e-gw-connection.c:231
+#: ../servers/groupwise/e-gw-connection.c:233
 msgid "No response from the server"
 msgstr "ð??¯ð??´ ð??®ð??¦ð???ð???ð??ªð??¯ð??? ð???ð??®ð??ªð??¥ ð??? ð???ð??»ð???ð??¼"
 
-#: ../servers/groupwise/e-gw-connection.c:237
+#: ../servers/groupwise/e-gw-connection.c:239
 msgid "Bad parameter"
 msgstr "ð???ð??¨ð??? ð???ð??¼ð??¨ð??¥ð??©ð???ð??¼"
+



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