[evolution-data-server] Updated Traditional Chinese translation(Hong Kong and Taiwan)

From: Chao-Hsiung Liao <chliao src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-data-server] Updated Traditional Chinese translation(Hong Kong and Taiwan)
Date: Tue, 20 Jul 2010 06:25:47 +0000 (UTC)
commit b6e27b3d327bb7bbea62115366dcb0cc65e312e7
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Tue Jul 20 14:25:28 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 4097 ++++++++++++++++++++++++++++-------------------------------
 po/zh_TW.po | 4097 ++++++++++++++++++++++++++++-------------------------------
 2 files changed, 3888 insertions(+), 4306 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index dc313f8..092c11c 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -6,10 +6,10 @@
 # Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005. 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution-data-server 2.29.91\n"
+"Project-Id-Version: evolution-data-server 2.31.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-15 11:49+0800\n"
-"PO-Revision-Date: 2010-02-15 11:49+0800\n"
+"POT-Creation-Date: 2010-07-20 14:23+0800\n"
+"PO-Revision-Date: 2010-07-20 14:25+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "MIME-Version: 1.0\n"
@@ -19,92 +19,108 @@ msgstr ""
 
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
-#: ../addressbook/backends/file/e-book-backend-file.c:560
+#: ../addressbook/backends/file/e-book-backend-file.c:570
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
 msgid "Loading..."
 msgstr "è¼?å?¥ä¸..."
 
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
-#: ../addressbook/backends/file/e-book-backend-file.c:563
+#: ../addressbook/backends/file/e-book-backend-file.c:573
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4551
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4491
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
 msgid "Searching..."
 msgstr "æ??å°?ä¸..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4715
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2698
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4650
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "æ£å?¨ä¸?è¼?è?¯çµ¡äºº (%d)..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2845
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2846
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3029
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3073
 #, c-format
 msgid "Updating contacts cache (%d)... "
 msgstr "æ£å?¨æ?´æ?°è?¯çµ¡äººå¿«å?? (%d)..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:816
+# ui/evolution-addressbook.xml.h:17
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172
+msgid "Not connected"
+msgstr "æ?ªé?£ç·?"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:753
 msgid "Using Distinguished Name (DN)"
 msgstr "ä½¿ç?¨è¾¨èª?ç??å??ç¨± (DN)"
 
 # mail/mail-config.glade.h:29
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:819
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:756
 msgid "Using Email Address"
 msgstr "ä½¿ç?¨é?»å?é?µä»¶å?°å??"
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1096
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1031
 msgid "Reconnecting to LDAP server..."
 msgstr "æ£å?¨é??æ?°é?£æ?¥ LDAP ä¼ºæ??å?¨..."
 
+# camel/providers/local/camel-maildir-folder.c:218
+# camel/providers/local/camel-mh-folder.c:203
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1156
+msgid "Invalid DN syntax"
+msgstr "ç?¡æ??ç?? DN èª?æ³?"
+
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1738
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1672
 msgid "Adding contact to LDAP server..."
 msgstr "æ£å?¨æ?°å¢?è?¯çµ¡äººè?³ LDAP ä¼ºæ??å?¨..."
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1872
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1804
 msgid "Removing contact from LDAP server..."
 msgstr "æ£å?¨ç§»é?¤ LDAP ä¼ºæ??å?¨ä¸ç??è?¯çµ¡äºº..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2309
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2238
 msgid "Modifying contact from LDAP server..."
 msgstr "æ£å?¨ä¿®æ?¹ LDAP ä¼ºæ??å?¨ä¸ç??è?¯çµ¡äºº..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4412
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4341
 msgid "Receiving LDAP search results..."
 msgstr "æ£å?¨æ?¥æ?¶ LDAP æ??å°?çµ?æ??..."
 
 # executive-summary/component/e-summary.c:940
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4573
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4513
 msgid "Error performing search"
 msgstr "é?²è¡?æ??å°?æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/libebook/e-book.c:2149
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:329
 #, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
-msgstr "%sï¼?æ²?æ??å?²å?æ?¼ gconf ä¸ç?? uid `%s' ä¾?æº?ã??"
+msgid "Create resource '%s' failed with http status: %d"
+msgstr ""
+
+#: ../addressbook/libebook/e-book.c:3001
+#, c-format
+msgid "%s: there was no source for UID '%s' stored in GConf."
+msgstr "%sï¼?æ²?æ??å?²å?æ?¼ GConf ä¸ç?? UIDã??%sã??ä¾?æº?ã??"
 
 #. 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"
 
@@ -114,672 +130,869 @@ 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/contact-editor/e-contact-quick-add.c:276
 # addressbook/gui/widgets/e-addressbook-view.c:700
-#: ../addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook/e-contact.c:125
 msgid "Given Name"
 msgstr "å??"
 
 # addressbook/contact-editor/e-contact-quick-add.c:276
 # addressbook/gui/widgets/e-addressbook-view.c:700
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:126
 msgid "Family Name"
 msgstr "å§?"
 
 # addressbook/gui/widgets/e-addressbook-view.c:734
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:127
 msgid "Nickname"
 msgstr "ç¶²å??"
 
 # addressbook/contact-editor/e-contact-editor.c:1286
 # addressbook/gui/widgets/e-addressbook-view.c:726
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Email 1"
 msgstr "é?»å?é?µä»¶ 1"
 
 # addressbook/contact-editor/e-contact-editor.c:1285
 # addressbook/gui/widgets/e-addressbook-view.c:725
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Email 2"
 msgstr "é?»å?é?µä»¶ 2"
 
 # addressbook/contact-editor/e-contact-editor.c:1286
 # addressbook/gui/widgets/e-addressbook-view.c:726
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:132
 msgid "Email 3"
 msgstr "é?»å?é?µä»¶ 3"
 
 # addressbook/contact-editor/e-contact-editor.c:1286
 # addressbook/gui/widgets/e-addressbook-view.c:726
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 4"
 msgstr "é?»å?é?µä»¶ 4"
 
 # addressbook/backend/ebook/e-card.c:3428
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Mailer"
 msgstr "å¯?ä»¶è??"
 
 # data/evolution.keys.in.h:1
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Home Address Label"
 msgstr "ä½?å??æ¨?ç±¤"
 
 # data/evolution.keys.in.h:1
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:139
 msgid "Work Address Label"
 msgstr "å·¥ä½?å?°å??æ¨?ç±¤"
 
 # data/evolution.keys.in.h:1
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Other Address Label"
 msgstr "å?¶ä»?å?°å??æ¨?ç±¤"
 
 # addressbook/gui/widgets/e-addressbook-view.c:703
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Assistant Phone"
 msgstr "å?©ç??é?»è©±"
 
 # addressbook/gui/widgets/e-addressbook-view.c:704
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:144
 msgid "Business Phone"
 msgstr "å??å??é?»è©±"
 
 # addressbook/gui/widgets/e-addressbook-view.c:715
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Business Phone 2"
 msgstr "å??å??é?»è©± 2"
 
 # addressbook/contact-editor/e-contact-editor.c:1245
 # addressbook/gui/widgets/e-addressbook-view.c:713
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Business Fax"
 msgstr "å??å??å??ç??"
 
 # addressbook/gui/widgets/e-addressbook-view.c:705
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Callback Phone"
 msgstr "å??æ?¥é?»è©±"
 
 # addressbook/gui/widgets/e-addressbook-view.c:712
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Car Phone"
 msgstr "æ±½è»?é?»è©±"
 
 # addressbook/gui/widgets/e-addressbook-view.c:706
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Company Phone"
 msgstr "å?¬å?¸é?»è©±"
 
 # addressbook/gui/widgets/e-addressbook-view.c:707
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Home Phone"
 msgstr "å®¶ç?¨é?»è©±"
 
 # addressbook/gui/widgets/e-addressbook-view.c:716
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Home Phone 2"
 msgstr "å®¶ç?¨é?»è©± 2"
 
 # addressbook/contact-editor/e-contact-editor.c:1251
 # addressbook/gui/widgets/e-addressbook-view.c:714
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Home Fax"
 msgstr "å®¶ç?¨å?³ç??"
 
 # addressbook/contact-editor/e-contact-editor.c:1252
 # addressbook/gui/widgets/e-addressbook-view.c:717
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:153
 msgid "ISDN"
 msgstr "ISDN"
 
 # addressbook/gui/widgets/e-addressbook-view.c:711
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Mobile Phone"
 msgstr "æµ?å??é?»è©±"
 
 # addressbook/gui/widgets/e-addressbook-view.c:718
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Other Phone"
 msgstr "å?¶å®?é?»è©±"
 
 # addressbook/contact-editor/e-contact-editor.c:1255
 # addressbook/gui/widgets/e-addressbook-view.c:719
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Other Fax"
 msgstr "å?¶å®?å?³ç??"
 
 # addressbook/contact-editor/e-contact-editor.c:1256
 # addressbook/gui/widgets/e-addressbook-view.c:720
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Pager"
 msgstr "å?³å?¼æ©?"
 
 # addressbook/gui/widgets/e-addressbook-view.c:702
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Primary Phone"
 msgstr "ä¸»è¦?é?»è©±"
 
 # addressbook/contact-editor/e-contact-editor.c:1258
 # addressbook/gui/widgets/e-addressbook-view.c:721
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Radio"
 msgstr "ç?¡ç·?é?»é?»è©±"
 
 # addressbook/contact-editor/e-contact-editor.c:1259
 # addressbook/gui/widgets/e-addressbook-view.c:722
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Telex"
 msgstr "é?»å ±"
 
 # addressbook/gui/widgets/e-addressbook-view.c:723
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:162
 msgid "TTY"
 msgstr "TTY"
 
 # addressbook/gui/widgets/e-addressbook-view.c:708
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Organization"
 msgstr "å??é«?"
 
 # addressbook/gui/widgets/e-addressbook-view.c:708
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Organizational Unit"
 msgstr "å??é«?å?®ä½?"
 
 # addressbook/gui/widgets/e-addressbook-view.c:729
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Office"
 msgstr "è¾¦å?¬å®¤"
 
 # addressbook/gui/widgets/e-addressbook-view.c:730
-#: ../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/gui/widgets/e-addressbook-view.c:732
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Manager"
 msgstr "ä¸»ç®¡"
 
 # addressbook/contact-editor/e-contact-editor.c:1242
 # addressbook/gui/widgets/e-addressbook-view.c:733
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Assistant"
 msgstr "å?©ç??"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Homepage URL"
 msgstr "é¦?é ? URL"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Weblog URL"
 msgstr "ç¶²èª? URL"
 
 # calendar/gui/e-calendar-table.c:150
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:669
+#: ../addressbook/libebook/e-contact.c:178
+#: ../libedataserverui/e-categories-dialog.c:671
 msgid "Categories"
 msgstr "å??é¡?"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Calendar URI"
 msgstr "è¡?äº?æ?? URI"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:182
 msgid "Free/Busy URL"
 msgstr "ç©ºé??/å¿?ç¢? URL"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:183
 msgid "ICS Calendar"
 msgstr "ICS è¡?äº?æ??"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Video Conferencing URL"
 msgstr "è¦?å??æ??è° URL"
 
 # addressbook/gui/widgets/e-addressbook-view.c:735
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:187
 msgid "Spouse's Name"
 msgstr "é??å?¶å§?å??"
 
 # addressbook/gui/widgets/e-addressbook-view.c:736
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:188
 msgid "Note"
 msgstr "å??è¨»"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:189
+#: ../addressbook/libebook/e-contact.c:191
 msgid "AIM Home Screen Name 1"
 msgstr "AIM å®¶ç?¨è?¢å¹?å??ç¨± 1"
 
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:192
 msgid "AIM Home Screen Name 2"
 msgstr "AIM å®¶ç?¨è?¢å¹?å??ç¨± 2"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:193
 msgid "AIM Home Screen Name 3"
 msgstr "AIM å®¶ç?¨è?¢å¹?å??ç¨± 3"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:194
 msgid "AIM Work Screen Name 1"
 msgstr "AIM å·¥ä½?è?¢å¹?å??ç¨± 1"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Work Screen Name 2"
 msgstr "AIM å·¥ä½?è?¢å¹?å??ç¨± 2"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Work Screen Name 3"
 msgstr "AIM å·¥ä½?è?¢å¹?å??ç¨± 3"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:197
 msgid "GroupWise Home Screen Name 1"
 msgstr "GroupWise å®¶ç?¨è?¢å¹?å??ç¨± 1"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:198
 msgid "GroupWise Home Screen Name 2"
 msgstr "GroupWise å®¶ç?¨è?¢å¹?å??ç¨± 2"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:199
 msgid "GroupWise Home Screen Name 3"
 msgstr "GroupWise å®¶ç?¨è?¢å¹?å??ç¨± 3"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:200
 msgid "GroupWise Work Screen Name 1"
 msgstr "GroupWise å·¥ä½?è?¢å¹?å??ç¨± 1"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Work Screen Name 2"
 msgstr "GroupWise å·¥ä½?è?¢å¹?å??ç¨± 2"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Work Screen Name 3"
 msgstr "GroupWise å·¥ä½?è?¢å¹?å??ç¨± 3"
 
 # addressbook/gui/component/addressbook-storage.c:99
-#: ../addressbook/libebook/e-contact.c:201
-msgid "Jabber Home Id 1"
-msgstr "Jabber å®¶ç?¨ Id 1"
-
-# addressbook/gui/component/addressbook-storage.c:99
-#: ../addressbook/libebook/e-contact.c:202
-msgid "Jabber Home Id 2"
-msgstr "Jabber å®¶ç?¨ Id 2"
-
-# addressbook/gui/component/addressbook-storage.c:99
 #: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 3"
-msgstr "Jabber å®¶ç?¨ Id 3"
+msgid "Jabber Home ID 1"
+msgstr "Jabber å®¶ç?¨ ID 1"
 
 # addressbook/gui/component/addressbook-storage.c:99
 #: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Work Id 1"
-msgstr "Jabber å·¥ä½? Id 1"
+msgid "Jabber Home ID 2"
+msgstr "Jabber å®¶ç?¨ ID 2"
 
 # addressbook/gui/component/addressbook-storage.c:99
 #: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Work Id 2"
-msgstr "Jabber å·¥ä½? Id 2"
+msgid "Jabber Home ID 3"
+msgstr "Jabber å®¶ç?¨ ID 3"
 
 # addressbook/gui/component/addressbook-storage.c:99
 #: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 3"
-msgstr "Jabber å·¥ä½? Id 3"
+msgid "Jabber Work ID 1"
+msgstr "Jabber å·¥ä½? ID 1"
 
+# addressbook/gui/component/addressbook-storage.c:99
 #: ../addressbook/libebook/e-contact.c:207
+msgid "Jabber Work ID 2"
+msgstr "Jabber å·¥ä½? ID 2"
+
+# addressbook/gui/component/addressbook-storage.c:99
+#: ../addressbook/libebook/e-contact.c:208
+msgid "Jabber Work ID 3"
+msgstr "Jabber å·¥ä½? ID 3"
+
+#: ../addressbook/libebook/e-contact.c:209
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo!å®¶ç?¨è?¢å¹?å??ç¨± 1"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo!å®¶ç?¨è?¢å¹?å??ç¨± 2"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo!å®¶ç?¨è?¢å¹?å??ç¨± 3"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo!å·¥ä½?è?¢å¹?å??ç¨± 1"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo!å·¥ä½?è?¢å¹?å??ç¨± 2"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo!å·¥ä½?è?¢å¹?å??ç¨± 3"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:215
 msgid "MSN Home Screen Name 1"
 msgstr "MSN å®¶ç?¨è?¢å¹?å??ç¨± 1"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:216
 msgid "MSN Home Screen Name 2"
 msgstr "MSN å®¶ç?¨è?¢å¹?å??ç¨± 2"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:217
 msgid "MSN Home Screen Name 3"
 msgstr "MSN å®¶ç?¨è?¢å¹?å??ç¨± 3"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:218
 msgid "MSN Work Screen Name 1"
 msgstr "MSN å·¥ä½?è?¢å¹?å??ç¨± 1"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Work Screen Name 2"
 msgstr "MSN å·¥ä½?è?¢å¹?å??ç¨± 2"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Work Screen Name 3"
 msgstr "MSN å·¥ä½?è?¢å¹?å??ç¨± 3"
 
-#: ../addressbook/libebook/e-contact.c:219
-msgid "ICQ Home Id 1"
-msgstr "ICQ å®¶ç?¨ Id 1"
-
-# addressbook/contact-editor/e-contact-editor.c:1250
-#: ../addressbook/libebook/e-contact.c:220
-msgid "ICQ Home Id 2"
-msgstr "ICQ å®¶ç?¨ Id 2"
-
 #: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 3"
-msgstr "ICQ å®¶ç?¨ Id 3"
+msgid "ICQ Home ID 1"
+msgstr "ICQ å®¶ç?¨ ID 1"
 
+# addressbook/contact-editor/e-contact-editor.c:1250
 #: ../addressbook/libebook/e-contact.c:222
-msgid "ICQ Work Id 1"
-msgstr "ICQ å·¥ä½? Id 1"
+msgid "ICQ Home ID 2"
+msgstr "ICQ å®¶ç?¨ ID 2"
 
 #: ../addressbook/libebook/e-contact.c:223
-msgid "ICQ Work Id 2"
-msgstr "ICQ å·¥ä½? Id 2"
+msgid "ICQ Home ID 3"
+msgstr "ICQ å®¶ç?¨ ID 3"
 
 #: ../addressbook/libebook/e-contact.c:224
-msgid "ICQ Work Id 3"
-msgstr "ICQ å·¥ä½? Id 3"
+msgid "ICQ Work ID 1"
+msgstr "ICQ å·¥ä½? ID 1"
+
+#: ../addressbook/libebook/e-contact.c:225
+msgid "ICQ Work ID 2"
+msgstr "ICQ å·¥ä½? ID 2"
+
+#: ../addressbook/libebook/e-contact.c:226
+msgid "ICQ Work ID 3"
+msgstr "ICQ å·¥ä½? ID 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 "å§?å??æ??çµ?ç¹?"
 
 # addressbook/backend/ebook/e-card.c:3346
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Address List"
 msgstr "å?°å??æ¸?å?®"
 
 # addressbook/gui/widgets/e-addressbook-view.c:710
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:234
 msgid "Home Address"
 msgstr "ä½?å??"
 
 # addressbook/gui/widgets/e-addressbook-view.c:710
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:235
 msgid "Work Address"
 msgstr "å·¥ä½?å?°å??"
 
 # addressbook/gui/widgets/e-addressbook-view.c:724
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:236
 msgid "Other Address"
 msgstr "å?¶å®?å?°å??"
 
 # calendar/gui/e-calendar-table.c:150
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Category List"
 msgstr "å??é¡?æ¸?å?®"
 
 # addressbook/gui/component/addressbook-config.c:409
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Photo"
 msgstr "ç?¸ç??"
 
 # mail/mail-format.c:762
 # mail/message-list.c:1083
-#: ../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/contact-editor/e-contact-editor.c:1285
 # addressbook/gui/widgets/e-addressbook-view.c:725
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Email List"
 msgstr "é?»å?é?µä»¶æ¸?å?®"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook/e-contact.c:249
 msgid "AIM Screen Name List"
 msgstr "AIM è?¢å¹?å??ç¨±æ¸?å?®"
 
-#: ../addressbook/libebook/e-contact.c:248
-msgid "GroupWise Id List"
-msgstr "GroupWise Id æ¸?å?®"
+#: ../addressbook/libebook/e-contact.c:250
+msgid "GroupWise ID List"
+msgstr "GroupWise ID æ¸?å?®"
 
 # addressbook/gui/component/addressbook-storage.c:99
-#: ../addressbook/libebook/e-contact.c:249
-msgid "Jabber Id List"
-msgstr "Jabber Id æ¸?å?®"
+#: ../addressbook/libebook/e-contact.c:251
+msgid "Jabber ID List"
+msgstr "Jabber ID æ¸?å?®"
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:252
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo!è?¢å¹?å??ç¨±æ¸?å?®"
 
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:253
 msgid "MSN Screen Name List"
 msgstr "MSN è?¢å¹?å??ç¨±æ¸?å?®"
 
 # mail/mail-config.glade.h:45
-#: ../addressbook/libebook/e-contact.c:252
-msgid "ICQ Id List"
-msgstr "ICQ Id æ¸?å?®"
-
 #: ../addressbook/libebook/e-contact.c:254
+msgid "ICQ ID List"
+msgstr "ICQ ID æ¸?å?®"
+
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Wants HTML Mail"
 msgstr "é??è¦? HTML é?µä»¶"
 
 # addressbook/contact-editor/fullname.glade.h:8
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:258
 msgid "List"
 msgstr "æ¸?å?®"
 
 # addressbook/gui/widgets/e-addressbook-view.c:724
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:259
 msgid "List Show Addresses"
 msgstr "æ¸?å?®é¡¯ç¤ºå?°å??"
 
 # addressbook/backend/ebook/e-card.c:3335
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:261
 msgid "Birth Date"
 msgstr "å?ºç??æ?¥æ??"
 
 # addressbook/contact-editor/contact-editor.glade.h:2
-#: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:713
-#: ../libedataserver/e-categories.c:45
+#: ../addressbook/libebook/e-contact.c:262
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
+#: ../libedataserver/e-categories.c:43
 msgid "Anniversary"
 msgstr "é?±å¹´ç´?å¿µæ?¥"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:263
+#: ../addressbook/libebook/e-contact.c:265
 msgid "X.509 Certificate"
 msgstr "X.509 è?æ?¸"
 
 # addressbook/gui/component/addressbook-storage.c:99
-#: ../addressbook/libebook/e-contact.c:265
-msgid "Gadu-Gadu Home Id 1"
-msgstr "Gadu-Gadu å®¶ç?¨ Id 1"
-
-# addressbook/gui/component/addressbook-storage.c:99
-#: ../addressbook/libebook/e-contact.c:266
-msgid "Gadu-Gadu Home Id 2"
-msgstr "Gadu-Gadu å®¶ç?¨ Id 2"
-
-# addressbook/gui/component/addressbook-storage.c:99
 #: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 3"
-msgstr "Gadu-Gadu å®¶ç?¨ Id 3"
+msgid "Gadu-Gadu Home ID 1"
+msgstr "Gadu-Gadu å®¶ç?¨ ID 1"
 
 # addressbook/gui/component/addressbook-storage.c:99
 #: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Work Id 1"
-msgstr "Gadu-Gadu å·¥ä½? Id 1"
+msgid "Gadu-Gadu Home ID 2"
+msgstr "Gadu-Gadu å®¶ç?¨ ID 2"
 
 # addressbook/gui/component/addressbook-storage.c:99
 #: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Work Id 2"
-msgstr "Gadu-Gadu å·¥ä½? Id 2"
+msgid "Gadu-Gadu Home ID 3"
+msgstr "Gadu-Gadu å®¶ç?¨ ID 3"
 
 # addressbook/gui/component/addressbook-storage.c:99
 #: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 3"
-msgstr "Gadu-Gadu å·¥ä½? Id 3"
+msgid "Gadu-Gadu Work ID 1"
+msgstr "Gadu-Gadu å·¥ä½? ID 1"
 
+# addressbook/gui/component/addressbook-storage.c:99
 #: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Id List"
-msgstr "Gadu-Gadu Id æ¸?å?®"
+msgid "Gadu-Gadu Work ID 2"
+msgstr "Gadu-Gadu å·¥ä½? ID 2"
+
+# addressbook/gui/component/addressbook-storage.c:99
+#: ../addressbook/libebook/e-contact.c:272
+msgid "Gadu-Gadu Work ID 3"
+msgstr "Gadu-Gadu å·¥ä½? ID 3"
+
+#: ../addressbook/libebook/e-contact.c:273
+msgid "Gadu-Gadu ID List"
+msgstr "Gadu-Gadu ID æ¸?å?®"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Geographic Information"
 msgstr "å?°ç??è³?è¨?"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:278
 msgid "Telephone"
 msgstr "é?»è©±"
 
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:280
 msgid "Skype Home Name 1"
 msgstr "Skype ä½?å®¶å??ç¨± 1"
 
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Skype Home Name 2"
 msgstr "Skype ä½?å®¶å??ç¨± 2"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:282
 msgid "Skype Home Name 3"
 msgstr "Skype ä½?å®¶å??ç¨± 3"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Work Name 1"
 msgstr "Skype å·¥ä½?å??ç¨± 1"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Work Name 2"
 msgstr "Skype å·¥ä½?å??ç¨± 2"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Work Name 3"
 msgstr "Skype å·¥ä½?å??ç¨± 3"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Name List"
 msgstr "Skype å??ç¨±æ¸?å?®"
 
 # addressbook/gui/widgets/e-addressbook-view.c:710
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:288
 msgid "SIP address"
 msgstr "SIP ä½?å??"
 
 # addressbook/gui/component/addressbook-storage.c:99
-#: ../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:290
+#: ../addressbook/libedata-book/e-data-book-factory.c:322
 #, c-format
 msgid "Empty URI"
 msgstr "ç©ºç?? URI"
 
-#: ../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
+#: ../addressbook/libedata-book/e-data-book-factory.c:340
+#: ../addressbook/libedata-book/e-data-book-factory.c:377
+#: ../calendar/libedata-cal/e-data-cal-factory.c:333
+#: ../calendar/libedata-cal/e-data-cal-factory.c:345
 #, c-format
 msgid "Invalid source"
 msgstr "ç?¡æ??ç??ä¾?æº?"
 
+#: ../addressbook/libedata-book/e-data-book.c:185
+#: ../calendar/libedata-cal/e-data-cal.c:113
+msgid "Success"
+msgstr "æ??å??"
+
+# shell/e-shell-view-menu.c:602
+# shell/e-shell-view-menu.c:614
+#: ../addressbook/libedata-book/e-data-book.c:186
+#: ../calendar/libedata-cal/e-data-cal.c:114
+msgid "Repository offline"
+msgstr "è³?æ??åº«é?¢ç·?"
+
+# shell/e-storage.c:475
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libecal/e-cal.c:4118 ../calendar/libedata-cal/e-data-cal.c:115
+msgid "Permission denied"
+msgstr "æ¬?é??ä¸?è¶³"
+
+#: ../addressbook/libedata-book/e-data-book.c:188
+msgid "Contact not found"
+msgstr "æ?¾ä¸?å?°è?¯çµ¡äºº"
+
+#: ../addressbook/libedata-book/e-data-book.c:189
+msgid "Contact ID already exists"
+msgstr "è?¯çµ¡äºº ID å·²ç¶?å?å?¨"
+
+# camel/camel-sasl-anonymous.c:110
+# camel/camel-sasl-plain.c:87
+#: ../addressbook/libedata-book/e-data-book.c:190
+#: ../calendar/libedata-cal/e-data-cal.c:120
+msgid "Authentication Failed"
+msgstr "é©?è?å¤±æ??"
+
+# camel/providers/smtp/camel-smtp-transport.c:218
+#: ../addressbook/libedata-book/e-data-book.c:191
+#: ../calendar/libedata-cal/e-data-cal.c:121
+msgid "Authentication Required"
+msgstr "è¦?æ±?é©?è?"
+
+# mail/mail-config.glade.h:1
+#: ../addressbook/libedata-book/e-data-book.c:192
+#: ../calendar/libedata-cal/e-data-cal.c:122
+msgid "Unsupported field"
+msgstr "ä¸?æ?¯æ?´ç??æ¬?ä½?"
+
+# camel/providers/imap/camel-imap-store.c:466
+# camel/providers/smtp/camel-smtp-transport.c:366
+#: ../addressbook/libedata-book/e-data-book.c:193
+#: ../calendar/libedata-cal/e-data-cal.c:124
+msgid "Unsupported authentication method"
+msgstr "ä¸?æ?¯æ?´ç??é©?è?æ?¹æ³?"
+
+#: ../addressbook/libedata-book/e-data-book.c:194
+#: ../calendar/libedata-cal/e-data-cal.c:125
+msgid "TLS not available"
+msgstr "ç?¡æ³?ä½¿ç?¨ TLS"
+
+# camel/providers/local/camel-maildir-store.c:100
+# camel/providers/local/camel-mbox-store.c:101
+# camel/providers/local/camel-mh-store.c:97
+#: ../addressbook/libedata-book/e-data-book.c:195
+msgid "Address Book does not exist"
+msgstr "é??è¨?é??ä¸?å?å?¨"
+
+#: ../addressbook/libedata-book/e-data-book.c:196
+msgid "Book removed"
+msgstr "é??è¨?é??å·²ç¶?ç§»é?¤"
+
+# camel/providers/imap/camel-imap-folder.c:1047
+# camel/providers/imap/camel-imap-folder.c:1281
+#: ../addressbook/libedata-book/e-data-book.c:197
+#: ../calendar/libedata-cal/e-data-cal.c:128
+msgid "Not available in offline mode"
+msgstr "ç?¡æ³?å?¨é?¢ç·?æ¨¡å¼?ä¸?ä½¿ç?¨"
+
+#: ../addressbook/libedata-book/e-data-book.c:198
+#: ../calendar/libedata-cal/e-data-cal.c:129
+msgid "Search size limit exceeded"
+msgstr "è¶?é??æ??å°?å¤§å°?é??å?¶"
+
+#: ../addressbook/libedata-book/e-data-book.c:199
+#: ../calendar/libedata-cal/e-data-cal.c:130
+msgid "Search time limit exceeded"
+msgstr "è¶?é??æ??å°?æ??é??é??å?¶"
+
+# camel/providers/local/camel-maildir-folder.c:218
+# camel/providers/local/camel-mh-folder.c:203
+#: ../addressbook/libedata-book/e-data-book.c:200
+#: ../calendar/libedata-cal/e-data-cal.c:131
+msgid "Invalid query"
+msgstr "ç?¡æ??ç??æ?¥è©¢"
+
+#: ../addressbook/libedata-book/e-data-book.c:201
+#: ../calendar/libedata-cal/e-data-cal.c:132
+msgid "Query refused"
+msgstr "æ?¥è©¢è¢«æ??çµ?"
+
+# calendar/gui/e-itip-control.c:883
+#: ../addressbook/libedata-book/e-data-book.c:202
+#: ../calendar/libedata-cal/e-data-cal.c:133
+msgid "Could not cancel"
+msgstr "ç?¡æ³?å??æ¶?"
+
+# camel/providers/local/camel-maildir-folder.c:218
+# camel/providers/local/camel-mh-folder.c:203
+#. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
+#. { OtherError,			N_("Other error") },
+#: ../addressbook/libedata-book/e-data-book.c:204
+#: ../calendar/libedata-cal/e-data-cal.c:135
+msgid "Invalid server version"
+msgstr "ç?¡æ??ç??ä¼ºæ??å?¨ç??æ?¬"
+
+# camel/providers/imap/camel-imap-provider.c:54
+#: ../addressbook/libedata-book/e-data-book.c:205
+msgid "No space"
+msgstr "æ²?æ??ç©ºé??"
+
+# camel/providers/local/camel-maildir-folder.c:218
+# camel/providers/local/camel-mh-folder.c:203
+#: ../addressbook/libedata-book/e-data-book.c:206
+#: ../calendar/libecal/e-cal.c:4102 ../calendar/libedata-cal/e-data-cal.c:136
+msgid "Invalid argument"
+msgstr "ç?¡æ??ç??å??æ?¸"
+
+# shell/e-storage.c:477
+#: ../addressbook/libedata-book/e-data-book.c:207
+#: ../calendar/libecal/e-cal.c:4140 ../calendar/libedata-cal/e-data-cal.c:137
+msgid "Not supported"
+msgstr "ä¸?æ?¯æ?´"
+
+# addressbook/gui/widgets/e-addressbook-view.c:718
+#: ../addressbook/libedata-book/e-data-book.c:216
+#: ../calendar/libedata-cal/e-data-cal.c:145
+msgid "Other error"
+msgstr "å?¶ä»?é?¯èª¤"
+
 # camel/camel-filter-driver.c:671
-#: ../addressbook/libedata-book/e-data-book.c:301
-msgid "Cannot open book"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:374
+#, fuzzy, c-format
+#| msgid "Cannot open book"
+msgid "Cannot open book: %s"
 msgstr "ä¸?è?½é??å??æ?¸ç±?"
 
-#: ../addressbook/libedata-book/e-data-book.c:319
-msgid "Cannot remove book"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:394
+#, fuzzy, c-format
+#| msgid "Cannot remove book"
+msgid "Cannot remove book: %s"
 msgstr "ä¸?è?½ç§»é?¤æ?¸ç±?"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../addressbook/libedata-book/e-data-book.c:331
-#: ../addressbook/libedata-book/e-data-book.c:346
-msgid "Cannot get contact"
-msgstr "ä¸?è?½å??å¾?è?¯çµ¡äºº"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:411
+#: ../addressbook/libedata-book/e-data-book.c:428
+#, c-format
+msgid "Cannot get contact: %s"
+msgstr "ä¸?è?½å??å¾?è?¯çµ¡äººï¼?%s"
 
-#: ../addressbook/libedata-book/e-data-book.c:358
-msgid "Empty query"
-msgstr "ç©ºç??æ?¥è©¢"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:443
+#, c-format
+msgid "Empty query: %s"
+msgstr "ç©ºç??æ?¥è©¢ï¼?%s"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:457
+#, c-format
+msgid "Cannot get contact list: %s"
+msgstr "ä¸?è?½å??å¾?è?¯çµ¡äººæ¸?å?®ï¼?%s"
 
 # camel/providers/pop3/camel-pop3-store.c:199
-#: ../addressbook/libedata-book/e-data-book.c:402
-msgid "Cannot authenticate user"
-msgstr "ä¸?è?½é©?è?ä½¿ç?¨è??"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:492
+#, c-format
+msgid "Cannot authenticate user: %s"
+msgstr "ä¸?è?½é©?è?ä½¿ç?¨è??ï¼?%s"
 
-#: ../addressbook/libedata-book/e-data-book.c:414
-#: ../addressbook/libedata-book/e-data-book.c:429
-msgid "Cannot add contact"
-msgstr "ä¸?è?½å? å?¥è?¯çµ¡äºº"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:507
+#: ../addressbook/libedata-book/e-data-book.c:524
+#, c-format
+msgid "Cannot add contact: %s"
+msgstr "ä¸?è?½å? å?¥è?¯çµ¡äººï¼?%s"
 
 # mail/mail-crypto.c:251
-#: ../addressbook/libedata-book/e-data-book.c:444
-#: ../addressbook/libedata-book/e-data-book.c:459
-msgid "Cannot modify contact"
-msgstr "ä¸?è?½ä¿®æ?¹è?¯çµ¡äºº"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:542
+#: ../addressbook/libedata-book/e-data-book.c:559
+#, c-format
+msgid "Cannot modify contact: %s"
+msgstr "ä¸?è?½ä¿®æ?¹è?¯çµ¡äººï¼?%s"
 
 # mail/mail-crypto.c:251
-#: ../addressbook/libedata-book/e-data-book.c:494
-msgid "Cannot remove contacts"
-msgstr "ä¸?è?½ç§»é?¤è?¯çµ¡äºº"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:596
+#, c-format
+msgid "Cannot remove contacts: %s"
+msgstr "ä¸?è?½ç§»é?¤è?¯çµ¡äººï¼?%s"
+
+# camel/providers/local/camel-maildir-folder.c:197
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:217
+# camel/providers/local/camel-mbox-folder.c:319
+# camel/providers/local/camel-mh-folder.c:185
+# camel/providers/local/camel-mh-folder.c:194
+# camel/providers/local/camel-mh-folder.c:202
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:626
+#, c-format
+msgid "Cannot get supported fields: %s"
+msgstr "ä¸?è?½å??å¾?æ?¯æ?´ç??æ¬?ä½?ï¼?%s"
+
+# camel/providers/local/camel-maildir-folder.c:197
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:217
+# camel/providers/local/camel-mbox-folder.c:319
+# camel/providers/local/camel-mh-folder.c:185
+# camel/providers/local/camel-mh-folder.c:194
+# camel/providers/local/camel-mh-folder.c:202
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:639
+#, c-format
+msgid "Cannot get required fields: %s"
+msgstr "ä¸?è?½å??å¾?è¦?æ±?ç??æ¬?ä½?ï¼?%s"
+
+# camel/providers/imap/camel-imap-store.c:466
+# camel/providers/smtp/camel-smtp-transport.c:366
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:652
+#, c-format
+msgid "Cannot get supported auth methods: %s"
+msgstr "ä¸?è?½å??å¾?æ?¯æ?´ç??é©?è?æ?¹æ³?ï¼?%s"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../addressbook/libedata-book/e-data-book.c:569
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Invalid query"
-msgstr "ç?¡æ??ç??æ?¥è©¢"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:677
+#, c-format
+msgid "Invalid query: %s"
+msgstr "ç?¡æ??ç??æ?¥è©¢ï¼?%s"
 
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-maildir-folder.c:209
@@ -788,172 +1001,165 @@ msgstr "ç?¡æ??ç??æ?¥è©¢"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../addressbook/libedata-book/e-data-book.c:598
-msgid "Cannot get changes"
-msgstr "ä¸?è?½å??å¾?æ?´æ?¹"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:708
+#, c-format
+msgid "Cannot get changes: %s"
+msgstr "ä¸?è?½å??å¾?æ?´æ?¹ï¼?%s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:501
+#, fuzzy, c-format
+#| msgid ""
+#| "Unexpected GnuPG status message encountered:\n"
+#| "\n"
+#| "%s"
+msgid "Unexpected HTTP status code %d returned"
+msgstr ""
+"é??å?°é??é ?æ??ç?? GnuPG ç??æ??è¨?æ?¯ï¼?\n"
+"\n"
+"%s"
 
-# calendar/gui/e-itip-control.c:883
-#: ../addressbook/libedata-book/e-data-book.c:699
-msgid "Cannot complete operation"
-msgstr "ä¸?è?½å®?æ??æ¤é ?æ??ä½?"
+# camel/providers/local/camel-maildir-store.c:100
+# camel/providers/local/camel-mbox-store.c:101
+# camel/providers/local/camel-mh-store.c:97
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4114
+#, fuzzy
+#| msgid "Calendar does not exist"
+msgid "Calendar doesn't support Free/Busy"
+msgstr "è¡?äº?æ??ä¸?å?å?¨"
 
 # addressbook/contact-editor/contact-editor.glade.h:20
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:715
-#: ../libedataserver/e-categories.c:46
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:719
+#: ../libedataserver/e-categories.c:44
 msgid "Birthday"
 msgstr "ç??æ?¥"
 
 # addressbook/contact-editor/contact-editor.glade.h:20
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:744
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:748
 #, c-format
 msgid "Birthday: %s"
 msgstr "ç??æ?¥ï¼?%s"
 
 # addressbook/contact-editor/contact-editor.glade.h:2
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:768
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:772
 #, c-format
 msgid "Anniversary: %s"
 msgstr "ç´?å¿µæ?¥ï¼?%s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:234
+#: ../calendar/backends/file/e-cal-backend-file.c:239
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "ç?¡æ³?å?²å?è¡?äº?æ??è³?æ??ï¼?URI ç??æ ¼å¼?ä¸?æ£ç¢ºã??"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:241
-#: ../calendar/backends/file/e-cal-backend-file.c:247
+#: ../calendar/backends/file/e-cal-backend-file.c:246
+#: ../calendar/backends/file/e-cal-backend-file.c:252
 msgid "Cannot save calendar data"
 msgstr "ä¸?è?½å?²å?è¡?äº?æ??è³?æ??"
 
-# camel/providers/imap/camel-imap-folder.c:172
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:342
-msgid "Could not create thread for getting deltas"
-msgstr "ç?¡æ³?å»ºç«?å??å¾? deltas ç??å?·è¡?ç·?"
-
-# camel/providers/local/camel-mbox-store.c:110
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:374
-#: ../calendar/backends/google/e-cal-backend-google.c:1142
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1079
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1380
-#: ../calendar/backends/http/e-cal-backend-http.c:676
-#: ../calendar/backends/weather/e-cal-backend-weather.c:490
-msgid "Could not create cache file"
-msgstr "ç?¡æ³?å»ºç«?å¿«å??æª?æ¡?"
-
-# camel/providers/imap/camel-imap-folder.c:172
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:387
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1092
-msgid "Could not create thread for populating cache"
-msgstr "ç?¡æ³?å»ºç«?ç§»æ¤?å¿«å??ç??å?·è¡?ç·?"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2122
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1118
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2224
 msgid "Reply Requested: by "
 msgstr "è¦?æ±?å??è¦?ï¼?æ ¹æ??"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2127
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1123
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2229
 msgid "Reply Requested: When convenient"
 msgstr "è¦?æ±?å??è¦?ï¼?ç?¶æ??ç©ºæ??"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:281
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:296
 #, c-format
 msgid "Loading %s items"
 msgstr "è¼?å?¥ %s å??é ?ç?®"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:917
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:927
 msgid "Calendar"
 msgstr "è¡?äº?æ??"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:991
 msgid "Invalid server URI"
 msgstr "ç?¡æ??ç??ä¼ºæ??å?¨ URI"
 
-# camel/camel-sasl-anonymous.c:110
-# camel/camel-sasl-plain.c:87
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:994
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1003
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1097
-#: ../calendar/libecal/e-cal.c:4016
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1335
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1371
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1386
-#: ../camel/providers/groupwise/camel-groupwise-store.c:598
-#: ../camel/providers/groupwise/camel-groupwise-store.c:773
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:181
-msgid "Authentication failed"
-msgstr "é©?è?å¤±æ??"
+# camel/providers/local/camel-mbox-store.c:110
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1095
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1382
+#: ../calendar/backends/http/e-cal-backend-http.c:671
+#: ../calendar/backends/weather/e-cal-backend-weather.c:484
+msgid "Could not create cache file"
+msgstr "ç?¡æ³?å»ºç«?å¿«å??æª?æ¡?"
+
+# camel/providers/imap/camel-imap-folder.c:172
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1108
+msgid "Could not create thread for populating cache"
+msgstr "ç?¡æ³?å»ºç«?ç§»æ¤?å¿«å??ç??å?·è¡?ç·?"
 
 # mail/mail-config.glade.h:37
-#: ../calendar/backends/http/e-cal-backend-http.c:333
+#: ../calendar/backends/http/e-cal-backend-http.c:327
 msgid "Redirected to Invalid URI"
 msgstr "é??æ?°æ??å??ç?¡æ??ç?? URI"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: ../calendar/backends/http/e-cal-backend-http.c:356
+#: ../calendar/backends/http/e-cal-backend-http.c:350
 msgid "Bad file format."
 msgstr "é?¯èª¤ç??æª?æ¡?æ ¼å¼?ã??"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: ../calendar/backends/http/e-cal-backend-http.c:363
+#: ../calendar/backends/http/e-cal-backend-http.c:357
 msgid "Not a calendar."
 msgstr "ä¸¦é??è¡?äº?æ??ã??"
 
 # mail/mail-ops.c:1872
-#: ../calendar/backends/weather/e-cal-backend-weather.c:150
+#: ../calendar/backends/weather/e-cal-backend-weather.c:154
 msgid "Could not retrieve weather data"
 msgstr "ç?¡æ³?å??å¾?å¤©æ°£è³?æ??"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
+#: ../calendar/backends/weather/e-cal-backend-weather.c:253
 msgid "Weather: Fog"
 msgstr "å¤©æ°£ï¼?èµ·é?§"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
+#: ../calendar/backends/weather/e-cal-backend-weather.c:254
 msgid "Weather: Cloudy Night"
 msgstr "å¤©æ°£ï¼?å¤?é?²ç??å¤?æ??"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:255
 msgid "Weather: Cloudy"
 msgstr "å¤©æ°£ï¼?å¤?é?²"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:256
 msgid "Weather: Overcast"
 msgstr "å¤©æ°£ï¼?å¤?é?²"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:257
 msgid "Weather: Showers"
 msgstr "å¤©æ°£ï¼?é?£é?¨"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:258
 msgid "Weather: Snow"
 msgstr "å¤©æ°£ï¼?ä¸?é?ª"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:259
 msgid "Weather: Clear Night"
 msgstr "å¤©æ°£ï¼?æ?´æ??ç??å¤?æ??"
 
 # ui/evolution-event-editor.xml.h:9
 # ui/evolution-task-editor-dialog.xml.h:10
-#: ../calendar/backends/weather/e-cal-backend-weather.c:256
+#: ../calendar/backends/weather/e-cal-backend-weather.c:260
 msgid "Weather: Sunny"
 msgstr "å¤©æ°£ï¼?è?·é?½"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:257
+#: ../calendar/backends/weather/e-cal-backend-weather.c:261
 msgid "Weather: Thunderstorms"
 msgstr "å¤©æ°£ï¼?é?·æ?´"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:403
+#: ../calendar/backends/weather/e-cal-backend-weather.c:407
 msgid "Forecast"
 msgstr "å¤©æ°£é ?å ±"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:2
-#: ../calendar/libecal/e-cal-component.c:1316
+#: ../calendar/libecal/e-cal-component.c:1286
 msgid "Untitled appointment"
 msgstr "æ?ªå?½å??ç??ç´?æ??"
 
@@ -1143,7 +1349,7 @@ msgid "Undefined"
 msgstr "æ?ªæ??å®?"
 
 # camel/camel-smime-context.c:194
-#: ../calendar/libecal/e-cal.c:1169 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1233 ../libedataserverui/e-book-auth-util.c:206
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "è¼¸å?¥ %s (ä½¿ç?¨è?? %s) ç??å¯?ç¢¼ "
@@ -1153,79 +1359,60 @@ 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:1183
+#: ../calendar/libecal/e-cal.c:1247
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "è¼¸å?¥ %s ç??å¯?ç¢¼ä»¥ä¾¿ä½¿ç?¨è?? %s è?½ä½¿ç?¨ä»£ç??ä¼ºæ??å?¨"
 
-# camel/providers/local/camel-maildir-folder.c:218
-# camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libecal/e-cal.c:3988
-msgid "Invalid argument"
-msgstr "ç?¡æ??ç??å??æ?¸"
-
-#: ../calendar/libecal/e-cal.c:3990
+#: ../calendar/libecal/e-cal.c:4104
 msgid "Backend is busy"
 msgstr "å¾?ç«¯å¿?ç¢?ä¸"
 
 # shell/e-shell-view-menu.c:602
 # shell/e-shell-view-menu.c:614
-#: ../calendar/libecal/e-cal.c:3992
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:4106
 msgid "Repository is offline"
 msgstr "å??åº«å·²é?¢ç·?"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: ../calendar/libecal/e-cal.c:3994
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
+#: ../calendar/libecal/e-cal.c:4108
 msgid "No such calendar"
 msgstr "ç?¡æ¤è¡?äº?æ??"
 
-#: ../calendar/libecal/e-cal.c:3996
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
-#: ../servers/groupwise/e-gw-connection.c:233
+#: ../calendar/libecal/e-cal.c:4110 ../calendar/libedata-cal/e-data-cal.c:117
+#: ../servers/groupwise/e-gw-connection.c:235
 msgid "Object not found"
 msgstr "æ?¾ä¸?å?°ç?©ä»¶"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libecal/e-cal.c:3998
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
-#: ../servers/groupwise/e-gw-connection.c:227
+#: ../calendar/libecal/e-cal.c:4112 ../calendar/libedata-cal/e-data-cal.c:118
+#: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "ç?¡æ??ç??ç?©ä»¶"
 
 # addressbook/conduit/address-conduit.c:214
-#: ../calendar/libecal/e-cal.c:4000
+#: ../calendar/libecal/e-cal.c:4114
 msgid "URI not loaded"
 msgstr "URI æ?ªè¼?å?¥"
 
-#: ../calendar/libecal/e-cal.c:4002
+#: ../calendar/libecal/e-cal.c:4116
 msgid "URI already loaded"
 msgstr "URI å·²è¼?å?¥"
 
-# shell/e-storage.c:475
-#: ../calendar/libecal/e-cal.c:4004
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
-msgid "Permission denied"
-msgstr "æ¬?é??ä¸?è¶³"
-
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../calendar/libecal/e-cal.c:4006
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
-#: ../servers/groupwise/e-gw-connection.c:235
+#: ../calendar/libecal/e-cal.c:4120 ../servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "ä¸?æ??ç??ä½¿ç?¨è??"
 
-#: ../calendar/libecal/e-cal.c:4008
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../calendar/libecal/e-cal.c:4122 ../calendar/libedata-cal/e-data-cal.c:119
 msgid "Object ID already exists"
 msgstr "ç?©ä»¶ ID å·²å?å?¨"
 
 # shell/e-storage.c:477
-#: ../calendar/libecal/e-cal.c:4010
+#: ../calendar/libecal/e-cal.c:4124
 msgid "Protocol not supported"
 msgstr "é??è¨?å??å®?ä¸?æ?¯æ?´"
 
@@ -1233,125 +1420,127 @@ msgstr "é??è¨?å??å®?ä¸?æ?¯æ?´"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: ../calendar/libecal/e-cal.c:4012
+#: ../calendar/libecal/e-cal.c:4126
 msgid "Operation has been canceled"
 msgstr "æ??ä½?å·²å??æ¶?"
 
 # calendar/gui/e-itip-control.c:883
-#: ../calendar/libecal/e-cal.c:4014
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
+#: ../calendar/libecal/e-cal.c:4128
 msgid "Could not cancel operation"
 msgstr "ç?¡æ³?å??æ¶?æ??ä½?"
 
+# camel/camel-sasl-anonymous.c:110
+# camel/camel-sasl-plain.c:87
+#: ../calendar/libecal/e-cal.c:4130
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1434
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1452
+#: ../camel/providers/groupwise/camel-groupwise-store.c:618
+#: ../camel/providers/groupwise/camel-groupwise-store.c:793
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:85
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:118
+#, c-format
+msgid "Authentication failed"
+msgstr "é©?è?å¤±æ??"
+
 # camel/providers/smtp/camel-smtp-transport.c:218
-#: ../calendar/libecal/e-cal.c:4018
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:217
+#: ../calendar/libecal/e-cal.c:4132
+#: ../camel/providers/smtp/camel-smtp-transport.c:166
 msgid "Authentication required"
 msgstr "è¦?æ±?é©?è?"
 
-#: ../calendar/libecal/e-cal.c:4020
-msgid "A CORBA exception has occurred"
-msgstr "ç?¼ç?? CORBA ä¾?å¤?"
+#: ../calendar/libecal/e-cal.c:4134
+msgid "A DBUS exception has occurred"
+msgstr "ç?¼ç?? DBUS ä¾?å¤?"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../calendar/libecal/e-cal.c:4022
-#: ../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:582
-#: ../servers/groupwise/e-gw-connection.c:241
+#: ../calendar/libecal/e-cal.c:4136
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:158
+#: ../camel/providers/imap/camel-imap-command.c:457
+#: ../camel/providers/imap/camel-imap-store.c:626
+#: ../camel/providers/pop3/camel-pop3-store.c:495
+#: ../servers/groupwise/e-gw-connection.c:243
 msgid "Unknown error"
 msgstr "ä¸?æ??ç??é?¯èª¤"
 
 # shell/e-storage.c:459
-#: ../calendar/libecal/e-cal.c:4024
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
+#: ../calendar/libecal/e-cal.c:4138
 msgid "No error"
 msgstr "æ²?æ??é?¯èª¤"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:67
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:693
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:802
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1023
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1050
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:695
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:804
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1025
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1052
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "ã??%sã??ä¸?é??è¦?å¼?æ?¸"
 
 # camel/providers/smtp/camel-smtp-transport.c:170
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:100
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:210
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:252
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:288
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:102
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:212
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:290
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1090
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "ã??%sã??é??è¦?ä¸?å??å¼?æ?¸"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:106
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:294
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:735
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:296
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:737
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "ã??%sã??ç??ç¬¬ä¸?å??å¼?æ?¸å¿?é ?ç?ºå?ä¸²"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr "ã??%sã??ç??ç¬¬ä¸?å??å¼?æ?¸å¿?é ?ç?º ISO 8601 æ?¥æ??/æ??é??å?ä¸²"
 
 # camel/providers/smtp/camel-smtp-transport.c:170
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:361
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:162
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:363
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:415
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:731
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:864
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "ã??%sã??é??è¦?å?©å??å¼?æ?¸"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:216
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:258
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:367
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:419
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1094
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:168
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:218
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:260
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:369
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:421
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:870
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1096
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "ã??%sã??ç??ç¬¬ä¸?å??å¼?æ?¸å¿?é ?ç?º time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "ã??%sã??ç??ç¬¬äº?å??å¼?æ?¸å¿?é ?ç?ºæ?´æ?¸"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:375
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:377
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:430
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "ã??%sã??ç??ç¬¬äº?å??å¼?æ?¸å¿?é ?ç?º time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:743
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:745
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "ã??%sã??ç??ç¬¬äº?å??å¼?æ?¸å¿?é ?ç?ºå?ä¸²"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:773
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1359,12 +1548,12 @@ msgid ""
 "\"classification\""
 msgstr "ã??%sã??ç??ç¬¬ä¸?å??å¼?æ?¸å¿?é ?ç?ºã??ä»»ä½?ã??ã??ã??æ??è¦?ã??ä¹?ä¸?ï¼?æ??ã??æ??è¿°ã??ã??ã??ä½?ç½®ã??ã??ã??å?°æ??è??ã??ã??ã??å?¬é??äººã??ã??ã??å??é¡?ã??å?¶ä¸ä¹?ä¸?"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:925
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "ã??%sã??é??è¦?è?³å°?ä¸?å??å¼?æ?¸"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:939
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:941
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1373,257 +1562,272 @@ msgstr "ã??%sã??ç??æ??æ??å¼?æ?¸å¿?é ?ç?ºå?ä¸²ï¼?æ??å?ªæ??ä¸?å??å¼?æ?¸ç?ºé??è¼¯
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+#: ../calendar/libedata-cal/e-data-cal.c:116
 msgid "Invalid range"
 msgstr "ç?¡æ??ç??ç¯?å??"
 
 # mail/mail-config.glade.h:1
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
-msgid "Unsupported field"
-msgstr "ä¸?æ?¯æ?´ç??æ¬?ä½?"
-
-# mail/mail-config.glade.h:1
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-data-cal.c:123
 msgid "Unsupported method"
 msgstr "ä¸?æ?¯æ?´ç??æ?¹æ³?"
 
-# camel/providers/imap/camel-imap-store.c:466
-# camel/providers/smtp/camel-smtp-transport.c:366
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
-msgid "Unsupported authentication method"
-msgstr "ä¸?æ?¯æ?´ç??é©?è?æ?¹æ³?"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-msgid "TLS not available"
-msgstr "ç?¡æ³?ä½¿ç?¨ TLS"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-msgid "Offline mode unavailable"
-msgstr "é?¢ç·?æ¨¡å¼?ç?¡æ³?ä½¿ç?¨"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-msgid "Search size limit exceeded"
-msgstr "è¶?é??æ??å°?å¤§å°?é??å?¶"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-msgid "Search time limit exceeded"
-msgstr "è¶?é??æ??å°?æ??é??é??å?¶"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
-msgid "Query refused"
-msgstr "æ?¥è©¢è¢«æ??çµ?"
+# camel/providers/local/camel-maildir-store.c:100
+# camel/providers/local/camel-mbox-store.c:101
+# camel/providers/local/camel-mh-store.c:97
+#: ../calendar/libedata-cal/e-data-cal.c:126
+msgid "Calendar does not exist"
+msgstr "è¡?äº?æ??ä¸?å?å?¨"
 
-# camel/providers/local/camel-maildir-folder.c:218
-# camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
-msgid "Invalid server version"
-msgstr "ç?¡æ??ç??ä¼ºæ??å?¨ç??æ?¬"
+# camel/providers/imap/camel-imap-command.c:241
+# shell/e-storage.c:481
+#: ../calendar/libedata-cal/e-data-cal.c:127
+msgid "UnknownUser"
+msgstr "ä¸?æ??ç??ä½¿ç?¨è??"
 
-#: ../calendar/libedata-cal/e-data-cal.c:491
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:595
 #, c-format
-msgid "Cannot retrieve calendar address"
-msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ä½?å??"
+msgid "Cannot retrieve calendar address: %s"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ä½?å??ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:509
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:615
 #, c-format
-msgid "Cannot retrieve calendar alarm e-mail address"
-msgstr "ä¸?è?½å??å¾?è¡?äº?æ??é¬§é?´é?»å?é?µä»¶ä½?å??"
+msgid "Cannot retrieve calendar alarm e-mail address: %s"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??é¬§é?´é?»å?é?µä»¶ä½?å??ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:527
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:635
 #, c-format
-msgid "Cannot retrieve calendar's ldap attribute"
-msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?? ldap å±¬æ?§"
+msgid "Cannot retrieve calendar's ldap attribute: %s"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?? ldap å±¬æ?§ï¼?%s"
 
 # camel/camel-filter-driver.c:671
-#: ../calendar/libedata-cal/e-data-cal.c:545
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:655
 #, c-format
-msgid "Cannot retrieve calendar scheduling information"
-msgstr "ä¸?è?½å??å¾?è¡?äº?æ??è¡?ç¨?è³?è¨?"
+msgid "Cannot retrieve calendar scheduling information: %s"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??è¡?ç¨?è³?è¨?ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:562
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:674
 #, c-format
-msgid "Cannot open calendar"
-msgstr "ä¸?è?½é??å??è¡?äº?æ??"
+msgid "Cannot open calendar: %s"
+msgstr "ä¸?è?½é??å??è¡?äº?æ??ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:579
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:695
 #, c-format
-msgid "Cannot refresh calendar"
-msgstr "ä¸?è?½é??æ?°æ?´ç??è¡?äº?æ??"
+msgid "Cannot refresh calendar: %s"
+msgstr "ä¸?è?½é??æ?°æ?´ç??è¡?äº?æ??ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:596
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:714
 #, c-format
-msgid "Cannot remove calendar"
-msgstr "ä¸?è?½ç§»é?¤è¡?äº?æ??"
+msgid "Cannot remove calendar: %s"
+msgstr "ä¸?è?½ç§»é?¤è¡?äº?æ??ï¼?%s"
 
 # mail/mail-crypto.c:251
-#: ../calendar/libedata-cal/e-data-cal.c:615
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:735
 #, c-format
-msgid "Cannot create calendar object"
-msgstr "ä¸?è?½å»ºç«?è¡?äº?æ??ç?©ä»¶"
+msgid "Cannot create calendar object: %s"
+msgstr "ä¸?è?½å»ºç«?è¡?äº?æ??ç?©ä»¶ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:637
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:759
 #, c-format
-msgid "Cannot modify calendar object"
-msgstr "ä¸?è?½ä¿®æ?¹è¡?äº?æ??ç?©ä»¶"
+msgid "Cannot modify calendar object: %s"
+msgstr "ä¸?è?½ä¿®æ?¹è¡?äº?æ??ç?©ä»¶ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:661
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:785
 #, c-format
-msgid "Cannot remove calendar object"
-msgstr "ä¸?è?½ç§»é?¤è¡?äº?æ??ç?©ä»¶"
+msgid "Cannot remove calendar object: %s"
+msgstr "ä¸?è?½ç§»é?¤è¡?äº?æ??ç?©ä»¶ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:680
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:806
 #, c-format
-msgid "Cannot receive calendar objects"
-msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?©ä»¶"
+msgid "Cannot receive calendar objects: %s"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?©ä»¶ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:697
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:825
 #, c-format
-msgid "Cannot discard calendar alarm"
-msgstr "ä¸?è?½å??æ¶?è¡?äº?æ??é¬§é?´"
+msgid "Cannot discard calendar alarm: %s"
+msgstr "ä¸?è?½å??æ¶?è¡?äº?æ??é¬§é?´ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:716
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:846
 #, c-format
-msgid "Cannot send calendar objects"
-msgstr "ä¸?è?½å?³é??è¡?äº?æ??ç?©ä»¶"
+msgid "Cannot send calendar objects: %s"
+msgstr "ä¸?è?½å?³é??è¡?äº?æ??ç?©ä»¶ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:751
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:883
 #, c-format
-msgid "Cannot retrieve default calendar object path"
-msgstr "ä¸?è?½å??å¾?é ?è¨ç??è¡?äº?æ??ç?©ä»¶è·¯å¾?"
+msgid "Cannot retrieve default calendar object path: %s"
+msgstr "ä¸?è?½å??å¾?é ?è¨ç??è¡?äº?æ??ç?©ä»¶è·¯å¾?ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:769
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:903
 #, c-format
-msgid "Cannot retrieve calendar object path"
-msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?©ä»¶è·¯å¾?"
+msgid "Cannot retrieve calendar object path: %s"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?©ä»¶è·¯å¾?ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:787
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:923
 #, c-format
-msgid "Cannot retrieve calendar object list"
-msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?©ä»¶æ¸?å?®"
+msgid "Cannot retrieve calendar object list: %s"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?©ä»¶æ¸?å?®ï¼?%s"
 
 # mail/mail-ops.c:1872
-#: ../calendar/libedata-cal/e-data-cal.c:825
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:963
 #, c-format
-msgid "Could not retrieve attachment list"
-msgstr "ä¸?è?½å??å¾?é??ä»¶æ¸?å?®"
+msgid "Could not retrieve attachment list: %s"
+msgstr "ä¸?è?½å??å¾?é??ä»¶æ¸?å?®ï¼?%s"
 
 # camel/providers/local/camel-mbox-store.c:110
-#: ../calendar/libedata-cal/e-data-cal.c:847
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:987
 #, c-format
-msgid "Could not complete calendar query"
-msgstr "ä¸?è?½å®?æ??è¡?äº?æ??æ?¥è©¢"
+msgid "Could not complete calendar query: %s"
+msgstr "ä¸?è?½å®?æ??è¡?äº?æ??æ?¥è©¢ï¼?%s"
 
 # mail/mail-ops.c:1872
-#: ../calendar/libedata-cal/e-data-cal.c:865
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1007
 #, c-format
-msgid "Could not retrieve calendar time zone"
-msgstr "ä¸?è?½å??å¾?å¤©æ°£è¡?äº?æ??æ??å??"
+msgid "Could not retrieve calendar time zone: %s"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??æ??å??ï¼?%s"
 
 # calendar/gui/e-itip-control.c:883
-#: ../calendar/libedata-cal/e-data-cal.c:883
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1027
 #, c-format
-msgid "Could not add calendar time zone"
-msgstr "ä¸?è?½å? å?¥è¡?äº?æ??æ??å??"
+msgid "Could not add calendar time zone: %s"
+msgstr "ä¸?è?½å? å?¥è¡?äº?æ??æ??å??ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:900
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1046
 #, c-format
-msgid "Could not set default calendar time zone"
-msgstr "ä¸?è?½è¨å®?é ?è¨ç??è¡?äº?æ??æ??å??"
+msgid "Could not set default calendar time zone: %s"
+msgstr "ä¸?è?½è¨å®?é ?è¨ç??è¡?äº?æ??æ??å??ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:921
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1069
 #, c-format
-msgid "Cannot retrieve calendar changes"
-msgstr "ä¸?è?½å??å¾?è¡?äº?æ??æ?´æ?¹"
+msgid "Cannot retrieve calendar changes: %s"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??æ?´æ?¹ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:971
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1121
 #, c-format
-msgid "Cannot retrieve calendar free/busy list"
-msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç©ºé??/å¿?ç¢?æ¸?å?®"
+msgid "Cannot retrieve calendar free/busy list: %s"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç©ºé??/å¿?ç¢?æ¸?å?®ï¼?%s"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libedata-cal/e-data-cal-factory.c:339
+#: ../calendar/libedata-cal/e-data-cal-factory.c:355
 #, c-format
 msgid "Invalid URI"
 msgstr "ç?¡æ??ç?? URI"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:350
+#: ../calendar/libedata-cal/e-data-cal-factory.c:370
 #, c-format
 msgid "No backend factory for '%s' of '%s'"
 msgstr "æ²?æ??ã??%2$sã??ç??ã??%1$sã??ç??å¾?ç«¯å·¥å» "
 
 # camel/providers/local/camel-mbox-store.c:110
-#: ../calendar/libedata-cal/e-data-cal-factory.c:390
+#: ../calendar/libedata-cal/e-data-cal-factory.c:420
 #, c-format
 msgid "Could not instantiate backend"
 msgstr "ç?¡æ³?å¯¦é«?å??å¾?ç«¯ç¨?å¼?"
 
 # camel/camel-cipher-context.c:171
-#: ../camel/camel-cipher-context.c:102
+#: ../camel/camel-cipher-context.c:75
+#, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "é??ç¨®å? å¯?æ?¹å¼?ä¸?æ?¯æ?´ç°½ç½²"
 
 # mail/mail-ops.c:603
-#: ../camel/camel-cipher-context.c:128
+#: ../camel/camel-cipher-context.c:110
 msgid "Signing message"
 msgstr "æ£å?¨ç°½ç½²è¨?æ?¯"
 
 # camel/camel-cipher-context.c:251
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:131
+#, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "é??ç¨®å? å¯?æ?¹å¼?ä¸?æ?¯æ?´é©?è?ç°½ç½²"
 
 # mail/mail-ops.c:603
-#: ../camel/camel-cipher-context.c:171
+#: ../camel/camel-cipher-context.c:164
 msgid "Verifying message"
 msgstr "æ£å?¨ç¢ºèª?è¨?æ?¯"
 
 # camel/camel-cipher-context.c:294
-#: ../camel/camel-cipher-context.c:189
+#: ../camel/camel-cipher-context.c:188
+#, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "é??ç¨®å? å¯?æ?¹å¼?ä¸?æ?¯æ?´å? å¯?"
 
 # mail/mail-ops.c:603
-#: ../camel/camel-cipher-context.c:215
+#: ../camel/camel-cipher-context.c:223
 msgid "Encrypting message"
 msgstr "æ£å?¨å? å¯?è¨?æ?¯"
 
 # camel/camel-cipher-context.c:336
-#: ../camel/camel-cipher-context.c:232
+#: ../camel/camel-cipher-context.c:246
+#, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "é??ç¨®å? å¯?æ?¹å¼?ä¸?æ?¯æ?´è§£å¯?"
 
 # mail/mail-ops.c:603
-#: ../camel/camel-cipher-context.c:254
+#: ../camel/camel-cipher-context.c:276
 msgid "Decrypting message"
 msgstr "æ£å?¨è§£å¯?è¨?æ?¯"
 
 # camel/camel-cipher-context.c:336
-#: ../camel/camel-cipher-context.c:271
+#: ../camel/camel-cipher-context.c:297
+#, c-format
 msgid "You may not import keys with this cipher"
 msgstr "ä½ ä¸?è?½å?¯å?¥é??ç¨®å? å¯?æ?¹å¼?ç??å¯?ç¢¼å??"
 
 # camel/camel-cipher-context.c:336
-#: ../camel/camel-cipher-context.c:301
+#: ../camel/camel-cipher-context.c:341
+#, c-format
 msgid "You may not export keys with this cipher"
 msgstr "ä½ ä¸?è?½å?¯å?ºé??ç¨®å? å¯?æ?¹å¼?ç??å¯?ç¢¼å??"
 
 # mail/mail-ops.c:1728
-#: ../camel/camel-data-cache.c:135
+#: ../camel/camel-data-cache.c:181
+#, c-format
 msgid "Unable to create cache path"
 msgstr "ç?¡æ³?å»ºç«?å¿«å??è·¯å¾?"
 
 # camel/providers/imap/camel-imap-message-cache.c:150
-#: ../camel/camel-data-cache.c:401
+#: ../camel/camel-data-cache.c:494
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "ç?¡æ³?ç§»é?¤å¿«å??é ?ç?®ï¼? %sï¼? %s"
 
-#: ../camel/camel-db.c:411
+# camel/providers/local/camel-maildir-folder.c:197
+# camel/providers/local/camel-mbox-folder.c:319
+# camel/providers/local/camel-mh-folder.c:185
+#: ../camel/camel-data-wrapper.c:89
+#, c-format
+msgid "No stream available"
+msgstr "æ²?æ??å?¯ç?¨ç??ä¸²æµ?"
+
+#: ../camel/camel-db.c:464
+#, c-format
 msgid "Insufficient memory"
 msgstr "è¨?æ?¶é«?ä¸?è¶³"
 
-#: ../camel/camel-disco-diary.c:197
+#: ../camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1634,8 +1838,8 @@ msgstr ""
 "æ?¥ä¸?ä¾?å?¨æ¤ä¼ºæ??å?¨ä¸?ç??æ??ä½?ï¼?å?¨ä½ é??æ?°é?£ç·?å?°ç¶²çµ¡æ??\n"
 "å°?ä¸?æ??é??æ?ã??"
 
-#: ../camel/camel-disco-diary.c:260
-#: ../camel/providers/imap/camel-imap-journal.c:320
+#: ../camel/camel-disco-diary.c:258
+#: ../camel/providers/imap/camel-imap-journal.c:298
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1646,152 +1850,184 @@ msgstr ""
 "%s\n"
 "é??å??è³?æ??å¤¾å?§æ??å??ç??æ?´æ?¹å°?ä¸?æ??é??æ?°å??æ¥ã??"
 
-#: ../camel/camel-disco-diary.c:296
+#: ../camel/camel-disco-diary.c:299
 msgid "Resynchronizing with server"
 msgstr "è??ä¼ºæ??å?¨é??æ?°å??æ¥"
 
-#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:51
-msgid "Copy folder content locally for offline operation"
-msgstr "è¤?è£½è³?æ??å¤¾å?§å®¹è?³æ?¬å?°ç?¨æ?¼é?¢ç·?ä½?æ¥"
-
-#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:107
+#: ../camel/camel-disco-folder.c:68 ../camel/camel-offline-folder.c:66
 msgid "Downloading new messages for offline mode"
 msgstr "æ£å?¨ä¸?è¼?æ?°è¨?æ?¯ç?¨æ?¼é?¢ç·?æ¨¡å¼?"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: ../camel/camel-disco-folder.c:466
+#: ../camel/camel-disco-folder.c:379
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "æº?å??è³?æ??å¤¾ã??%sã??ä¾?é?¢ç·?ä½¿ç?¨"
 
+#: ../camel/camel-disco-folder.c:445 ../camel/camel-offline-folder.c:224
+msgid "Copy folder content locally for offline operation"
+msgstr "è¤?è£½è³?æ??å¤¾å?§å®¹è?³æ?¬å?°ç?¨æ?¼é?¢ç·?ä½?æ¥"
+
 # camel/camel-disco-store.c:271
-#: ../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:3068
+#: ../camel/camel-disco-store.c:395
+#: ../camel/providers/groupwise/camel-groupwise-store.c:230
+#: ../camel/providers/imap/camel-imap-store.c:895
+#: ../camel/providers/imap/camel-imap-store.c:1739
+#: ../camel/providers/imap/camel-imap-store.c:2197
+#: ../camel/providers/imap/camel-imap-store.c:3041
+#: ../camel/providers/imapx/camel-imapx-store.c:185
+#: ../camel/providers/imapx/camel-imapx-store.c:709
+#: ../camel/providers/imapx/camel-imapx-store.c:772
+#: ../camel/providers/imapx/camel-imapx-store.c:831
+#, c-format
 msgid "You must be working online to complete this operation"
 msgstr "ä½ å¿?é ?æ?¼ç¶²ä¸?å·¥ä½?æ??è?½å®?æ??æ¤æ??ä½?"
 
-#: ../camel/camel-exception.c:260
-msgid "No description available"
-msgstr "æ²?æ??å?¯ç?¨ç??æ??è¿°"
+# calendar/gui/calendar-model.c:647
+# calendar/gui/calendar-model.c:1182
+# calendar/gui/dialogs/task-editor-dialog.glade.h:4
+# calendar/gui/e-calendar-table.c:422
+# camel/camel-service.c:544
+# camel/camel-service.c:580
+#: ../camel/camel-file-utils.c:430 ../camel/camel-file-utils.c:489
+#: ../camel/camel-file-utils.c:529 ../camel/camel-file-utils.c:599
+#: ../camel/camel-file-utils.c:691 ../camel/camel-gpg-context.c:887
+#: ../camel/camel-gpg-context.c:1175 ../camel/camel-net-utils.c:512
+#: ../camel/camel-net-utils.c:689 ../camel/camel-net-utils.c:838
+#: ../camel/providers/imapx/camel-imapx-server.c:4677
+#: ../camel/providers/imapx/camel-imapx-server.c:4694
+#: ../camel/providers/nntp/camel-nntp-summary.c:396
+#: ../camel/providers/pop3/camel-pop3-folder.c:269
+#: ../camel/providers/pop3/camel-pop3-folder.c:625
+#: ../camel/providers/pop3/camel-pop3-folder.c:690
+#: ../camel/providers/pop3/camel-pop3-store.c:487
+#: ../libedataserverui/e-book-auth-util.c:229
+#, c-format
+msgid "Cancelled"
+msgstr "å·²å??æ¶?"
+
+# calendar/gui/calendar-model.c:647
+# calendar/gui/calendar-model.c:1182
+# calendar/gui/dialogs/task-editor-dialog.glade.h:4
+# calendar/gui/e-calendar-table.c:422
+# camel/camel-service.c:544
+# camel/camel-service.c:580
+#: ../camel/camel-file-utils.c:643 ../camel/camel-file-utils.c:734
+#: ../camel/camel-file-utils.c:791
+#, c-format
+msgid "Canceled"
+msgstr "å·²å??æ¶?"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-filter-driver.c:794 ../camel/camel-filter-search.c:579
+#: ../camel/camel-filter-driver.c:808 ../camel/camel-filter-search.c:582
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "ç?¡æ³?å»ºç«?å?ä»£è??ç?? '%s'ï¼?%s"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/camel-filter-driver.c:836
+#: ../camel/camel-filter-driver.c:853
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "ç?¡æ³?è®?å?? %s ç??æ¡è¿?è¾ï¼? %s"
 
 # camel/camel-filter-driver.c:534
 # camel/camel-filter-driver.c:543
-#: ../camel/camel-filter-driver.c:1025 ../camel/camel-filter-driver.c:1034
+#: ../camel/camel-filter-driver.c:1037 ../camel/camel-filter-driver.c:1046
 msgid "Syncing folders"
 msgstr "å??æ¥è??ç??è³?æ??å¤¾"
 
 # camel/camel-filter-driver.c:866
-#: ../camel/camel-filter-driver.c:1121 ../camel/camel-filter-driver.c:1522
+#: ../camel/camel-filter-driver.c:1134 ../camel/camel-filter-driver.c:1569
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "å??æ??é??æ¿¾å?¨ç?¼ç??é?¯èª¤ï¼? %s: %s"
 
 # camel/camel-filter-driver.c:871
-#: ../camel/camel-filter-driver.c:1130 ../camel/camel-filter-driver.c:1531
+#: ../camel/camel-filter-driver.c:1145 ../camel/camel-filter-driver.c:1580
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "å?·è¡?é??æ¿¾å?¨ç?¼ç??é?¯èª¤ï¼? %s: %s"
 
 # camel/camel-filter-driver.c:643
-#: ../camel/camel-filter-driver.c:1216
+#: ../camel/camel-filter-driver.c:1240
+#, c-format
 msgid "Unable to open spool folder"
-msgstr "ç?¡æ³?é??å?? spool è³?æ??å¤¾"
+msgstr "ç?¡æ³?é??å??æ??ç¨?å?¨è³?æ??å¤¾"
 
 # camel/camel-filter-driver.c:652
-#: ../camel/camel-filter-driver.c:1225
+#: ../camel/camel-filter-driver.c:1251
+#, c-format
 msgid "Unable to process spool folder"
-msgstr "ç?¡æ³?è??ç?? spool è³?æ??å¤¾"
+msgstr "ç?¡æ³?è??ç??æ??ç¨?å?¨è³?æ??å¤¾"
 
 # camel/camel-filter-driver.c:666
-#: ../camel/camel-filter-driver.c:1241
+#: ../camel/camel-filter-driver.c:1269
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "æ?¥æ?¶é?µä»¶ %d (%d%%)"
 
-# camel/camel-filter-driver.c:671
-#: ../camel/camel-filter-driver.c:1245
-msgid "Cannot open message"
-msgstr "ä¸?è?½é??å??é?µä»¶"
-
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1264
+#: ../camel/camel-filter-driver.c:1275 ../camel/camel-filter-driver.c:1297
 #, c-format
 msgid "Failed on message %d"
 msgstr "å?¨ç¬¬ %d å°?é?µä»¶ç?¼ç??é?¯èª¤"
 
 # camel/camel-filter-driver.c:690
 # camel/camel-filter-driver.c:788
-#: ../camel/camel-filter-driver.c:1278 ../camel/camel-filter-driver.c:1368
+#: ../camel/camel-filter-driver.c:1312 ../camel/camel-filter-driver.c:1411
 msgid "Syncing folder"
 msgstr "å??æ¥è??ç??è³?æ??å¤¾"
 
 # camel/camel-filter-driver.c:694
 # camel/camel-filter-driver.c:793
-#: ../camel/camel-filter-driver.c:1282 ../camel/camel-filter-driver.c:1373
+#: ../camel/camel-filter-driver.c:1316 ../camel/camel-filter-driver.c:1416
 msgid "Complete"
 msgstr "å®?æ??"
 
 # camel/camel-filter-driver.c:748
-#: ../camel/camel-filter-driver.c:1338
+#: ../camel/camel-filter-driver.c:1377
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "æ£å?¨æ?¥æ?¶ç¬¬ %d / %d å°?é?µä»¶"
 
 # camel/camel-filter-driver.c:753
 # camel/camel-filter-driver.c:771
-#: ../camel/camel-filter-driver.c:1353
+#: ../camel/camel-filter-driver.c:1395
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "å?¨ç¬¬ %d / %d å°?é?µä»¶å¤±æ??"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-filter-search.c:137
+#: ../camel/camel-filter-search.c:135
 msgid "Failed to retrieve message"
 msgstr "å??å??é?µä»¶å¤±æ??ã??"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../camel/camel-filter-search.c:399
+#: ../camel/camel-filter-search.c:401
 msgid "Invalid arguments to (system-flag)"
 msgstr "ç?¡æ??ç??å??æ?¸çµ¦ (system-flag)"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../camel/camel-filter-search.c:414
+#: ../camel/camel-filter-search.c:416
 msgid "Invalid arguments to (user-tag)"
 msgstr "ç?¡æ??ç??å??æ?¸çµ¦ (user-tag)"
 
 # camel/camel-filter-search.c:439
 # camel/camel-filter-search.c:445
-#. 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
+#: ../camel/camel-filter-search.c:744 ../camel/camel-filter-search.c:753
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "å?·è¡?é??æ¿¾å?¨æ??å°?ç?¼ç??é?¯èª¤ï¼? %s: %s"
 
 # camel/camel-folder-search.c:328
-#: ../camel/camel-folder-search.c:351 ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:608
+#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
+#: ../camel/camel-folder-search.c:627
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1801,8 +2037,8 @@ msgstr ""
 "%s"
 
 # camel/camel-folder-search.c:338
-#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:463
-#: ../camel/camel-folder-search.c:618
+#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:468
+#: ../camel/camel-folder-search.c:639
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1813,83 +2049,83 @@ msgstr ""
 
 # camel/camel-folder-search.c:485
 # camel/camel-folder-search.c:513
-#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:852
+#: ../camel/camel-folder-search.c:843 ../camel/camel-folder-search.c:885
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) é??è¦?å?®ä¸?é??è¼¯å?¼çµ?æ??"
 
-#: ../camel/camel-folder-search.c:905
+#: ../camel/camel-folder-search.c:938
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) ä¸?å??è¨±æ?¾å?¨ %s è£?é?¢"
 
-#: ../camel/camel-folder-search.c:911 ../camel/camel-folder-search.c:918
+#: ../camel/camel-folder-search.c:944 ../camel/camel-folder-search.c:951
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) é??è¦?ç?¸ç¬¦é¡?å??å?ä¸²"
 
 # camel/camel-folder-search.c:485
 # camel/camel-folder-search.c:513
-#: ../camel/camel-folder-search.c:945
+#: ../camel/camel-folder-search.c:978
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) æ??æ??é?£å??çµ?æ??"
 
 # camel/camel-folder-search.c:485
 # camel/camel-folder-search.c:513
-#: ../camel/camel-folder-search.c:954
+#: ../camel/camel-folder-search.c:987
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) é??è¦?è³?æ??å¤¾è¨å®?"
 
-#: ../camel/camel-folder.c:676
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "ä¸?æ?¯æ?´ç??æ??ä½?ï¼?æ·»å? é?µä»¶ï¼? %s"
-
-# camel/camel-folder-search.c:338
-#: ../camel/camel-folder.c:1381
+# mail/mail-ops.c:1649
+#: ../camel/camel-folder.c:125
 #, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "ä¸?æ?¯æ?´ç??æ??ä½?ï¼?ä»¥è©?å?¥æ??å°?ï¼? %s"
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "æ£å?¨å¸ç¿?ã??%sã??ä¸ç??æ?°å??å?¾é?µä»¶"
 
-# camel/camel-folder-search.c:338
-#: ../camel/camel-folder.c:1422
-#, c-format
-msgid "Unsupported operation: count by expression: for %s"
-msgstr "ä¸?æ?¯æ?´ç??æ??ä½?ï¼?ä»¥è©?å?¥è¨?æ?¸ï¼?ç?¨æ?¼ %s"
+# mail/mail-ops.c:1649
+#: ../camel/camel-folder.c:147
+#, fuzzy, c-format
+#| msgid "Scanning for changed messages in %s"
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "å°?é??è¦?è½?å¯?ç??é?µä»¶å¤¾é??æ?¼æ?°é?µä»¶ç??å?§æ??ä¸"
 
-#: ../camel/camel-folder.c:1461
+# mail/mail-ops.c:1565
+#: ../camel/camel-folder.c:171
 #, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "ä¸?æ?¯æ?´ç??æ??ä½?ï¼?ä»¥ UIDs æ??å°?ï¼? %s"
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "æ£å?¨é??æ¿¾ã??%sã??ä¸ç??æ?°é?µä»¶"
 
 # mail/mail-ops.c:898
-#: ../camel/camel-folder.c:1574
-#: ../camel/providers/local/camel-maildir-folder.c:387
+#: ../camel/camel-folder.c:688
+#: ../camel/providers/local/camel-maildir-folder.c:366
 msgid "Moving messages"
 msgstr "æ£å?¨ç§»å??é?µä»¶"
 
 # mail/mail-ops.c:898
-#: ../camel/camel-folder.c:1574
+#: ../camel/camel-folder.c:690
 msgid "Copying messages"
 msgstr "æ£å?¨è¤?è£½é?µä»¶"
 
-# widgets/misc/e-messagebox.c:159
-#: ../camel/camel-folder.c:1915
-msgid "Learning junk"
-msgstr "äº?è§£å??å?¾é?µä»¶"
-
-#: ../camel/camel-folder.c:1933
-msgid "Learning non-junk"
-msgstr "äº?è§£é??å??å?¾é?µä»¶"
+# camel/camel-filter-driver.c:670
+# camel/camel-filter-driver.c:679
+#: ../camel/camel-gpg-context.c:701 ../camel/camel-gpg-context.c:706
+#: ../camel/camel-gpg-context.c:1330
+#, c-format
+msgid "Failed to execute gpg: %s"
+msgstr "å?·è¡? gpg å¤±æ??ï¼? %s"
 
-# mail/mail-ops.c:1565
-#: ../camel/camel-folder.c:1953
-msgid "Filtering new message(s)"
-msgstr "å??å?? %d å°?é?µä»¶"
+#: ../camel/camel-gpg-context.c:706
+#: ../camel/providers/smtp/camel-smtp-transport.c:114
+#: ../camel/providers/smtp/camel-smtp-transport.c:169
+msgid "Unknown"
+msgstr "ä¸?æ??"
 
-#: ../camel/camel-gpg-context.c:760
+#: ../camel/camel-gpg-context.c:770
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1900,15 +2136,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:775
+#: ../camel/camel-gpg-context.c:787
+#, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "è§£æ?? gpg userid æ??ç¤ºæ??å¤±æ??ã??"
 
-#: ../camel/camel-gpg-context.c:799 ../camel/camel-gpg-context.c:813
+#: ../camel/camel-gpg-context.c:812 ../camel/camel-gpg-context.c:827
+#, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "è§£æ?? gpg å¯?èª?è¦?æ±?æ??å¤±æ??ã??"
 
-#: ../camel/camel-gpg-context.c:833
+#: ../camel/camel-gpg-context.c:848
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1917,7 +2155,7 @@ msgstr ""
 "é??è¦? PIN æ??è?½ç?ºä½ ç??æ?ºæ?§å?¡è§£é??ï¼?\n"
 "ã??%sã??"
 
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:852
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1927,125 +2165,98 @@ msgstr ""
 "ã??%sã??"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: ../camel/camel-gpg-context.c:842
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "GnuPG å?³å??å°?ã??%sã??æ?ªé ?æ??ç??è¦?æ±?"
 
-# mail/mail-send-recv.c:471
-#: ../camel/camel-gpg-context.c:867 ../camel/camel-gpg-context.c:1113
-#: ../camel/providers/nntp/camel-nntp-store.c:1313
-msgid "Canceled."
-msgstr "å·²å??æ¶?ã??"
-
-#: ../camel/camel-gpg-context.c:881
+#: ../camel/camel-gpg-context.c:905
+#, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "è§£é??ç§?å¯?å¯?ç¢¼å??æ??å¤±æ??ï¼?è¼¸å?¥äº? 3 æ¬¡é?¯èª¤ç??å¯?èª? ã??"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: ../camel/camel-gpg-context.c:889
+#: ../camel/camel-gpg-context.c:917
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "å¾? GnuPG å?³å??æ??å¤?ç??å??æ??ï¼? %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/camel-gpg-context.c:988
+#: ../camel/camel-gpg-context.c:1048
+#, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "ä¸?è?½å? å¯?é?µä»¶ï¼?æ²?æ??æ??ä¾?æ??æ??ç??æ?¶ä»¶è??ã??"
 
-# camel/camel-filter-driver.c:670
-# camel/camel-filter-driver.c:679
-#. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1262 ../camel/camel-gpg-context.c:1387
-#: ../camel/camel-gpg-context.c:1953 ../camel/camel-gpg-context.c:1998
-#, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "å?·è¡? gpg å¤±æ??ï¼? %s"
-
 # mail/mail-ops.c:1872
-#: ../camel/camel-gpg-context.c:1355 ../camel/camel-smime-context.c:605
-#, c-format
-msgid "Could not generate signing data: %s"
-msgstr "ç?¡æ³?ç?¢ç??ç°½ç½²è³?æ??ï¼?%s"
+#: ../camel/camel-gpg-context.c:1434 ../camel/camel-smime-context.c:821
+msgid "Could not generate signing data: "
+msgstr "ç?¡æ³?ç?¢ç??ç°½ç½²è³?æ??ï¼?"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-gpg-context.c:1402 ../camel/camel-gpg-context.c:1630
-#: ../camel/camel-gpg-context.c:1646 ../camel/camel-gpg-context.c:1728
-#: ../camel/camel-gpg-context.c:1743 ../camel/camel-gpg-context.c:1859
-#: ../camel/camel-gpg-context.c:1874 ../camel/camel-gpg-context.c:1969
-#: ../camel/camel-gpg-context.c:2014
+#: ../camel/camel-gpg-context.c:1481 ../camel/camel-gpg-context.c:1740
+#: ../camel/camel-gpg-context.c:1848 ../camel/camel-gpg-context.c:1987
+#: ../camel/camel-gpg-context.c:2081 ../camel/camel-gpg-context.c:2128
 msgid "Failed to execute gpg."
 msgstr "å?·è¡? gpg å¤±æ??ã??"
 
 # camel/camel-pgp-context.c:890
-#: ../camel/camel-gpg-context.c:1534 ../camel/camel-gpg-context.c:1540
-#: ../camel/camel-gpg-context.c:1546 ../camel/camel-gpg-context.c:1561
-#: ../camel/camel-smime-context.c:929 ../camel/camel-smime-context.c:940
-#: ../camel/camel-smime-context.c:947
+#: ../camel/camel-gpg-context.c:1622 ../camel/camel-gpg-context.c:1630
+#: ../camel/camel-gpg-context.c:1638 ../camel/camel-gpg-context.c:1655
+#: ../camel/camel-smime-context.c:943 ../camel/camel-smime-context.c:957
+#: ../camel/camel-smime-context.c:966
+#, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "ä¸?è?½é©?è?æ¤é?µä»¶ç??ç°½ç½²ï¼?é?¯èª¤ç??è¨?æ?¯æ ¼å¼?"
 
 # camel/camel-pgp-context.c:890
-#: ../camel/camel-gpg-context.c:1600
-#, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "ä¸?è?½é©?è?æ¤é?µä»¶ç??ç°½ç½²ï¼?ç?¡æ³?å»ºç«?æ?«å?æª?æ¡?ï¼?%s"
+#: ../camel/camel-gpg-context.c:1695
+msgid "Cannot verify message signature: "
+msgstr "ä¸?è?½é©?è?æ¤é?µä»¶ç??ç°½ç½²ï¼?"
 
 # mail/mail-ops.c:1872
-#: ../camel/camel-gpg-context.c:1711
-#, c-format
-msgid "Could not generate encrypting data: %s"
-msgstr "ç?¡æ³?ç?¢ç??å? å¯?è³?æ??ï¼?%s"
+#: ../camel/camel-gpg-context.c:1814
+msgid "Could not generate encrypting data: "
+msgstr "ç?¡æ³?ç?¢ç??å? å¯?è³?æ??ï¼?"
 
-#: ../camel/camel-gpg-context.c:1761
+#: ../camel/camel-gpg-context.c:1866
 msgid "This is a digitally encrypted message part"
 msgstr "é??æ?¯æ?¸ç¢¼å??å? å¯?è¨?æ?¯é?¨ä»½"
 
 # camel/camel-pgp-context.c:890
-#: ../camel/camel-gpg-context.c:1814 ../camel/camel-gpg-context.c:1822
-#: ../camel/camel-gpg-context.c:1841
+#: ../camel/camel-gpg-context.c:1922 ../camel/camel-gpg-context.c:1931
+#: ../camel/camel-gpg-context.c:1954
+#, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "ä¸?è?½è§£å¯?æ¤é?µä»¶ï¼?é?¯èª¤ç??è¨?æ?¯æ ¼å¼?"
 
-#: ../camel/camel-gpg-context.c:1831
+#: ../camel/camel-gpg-context.c:1942
+#, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "è§£å¯? MIME çµ?ä»¶æ??å¤±æ??ï¼?é??è¨?å??å®?é?¯èª¤"
 
-#: ../camel/camel-gpg-context.c:1909 ../camel/camel-smime-context.c:1205
+#: ../camel/camel-gpg-context.c:2023 ../camel/camel-smime-context.c:1241
 msgid "Encrypted content"
 msgstr "å? å¯?å?§å®¹"
 
-# camel/providers/pop3/camel-pop3-folder.c:320
-#: ../camel/camel-gpg-context.c:1930
-msgid "Unable to parse message content"
-msgstr "ç?¡æ³?å¾?ç·¨è¼¯å?¨å??å¾?é?µä»¶"
-
-#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:1999
-#: ../camel/providers/imap4/camel-imap4-utils.c:614
-#: ../camel/providers/smtp/camel-smtp-transport.c:165
-#: ../camel/providers/smtp/camel-smtp-transport.c:220
-msgid "Unknown"
-msgstr "ä¸?æ??"
-
 # camel/camel-movemail.c:306
-#: ../camel/camel-lock-client.c:104
+#: ../camel/camel-lock-client.c:106
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "ä¸?è?½å»ºç«?é??å®? helper å°?ç®¡ï¼?%s"
 
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock-client.c:130
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "ä¸?è?½å??å??é??å®? helper ï¼? %s"
 
-#: ../camel/camel-lock-client.c:203 ../camel/camel-lock-client.c:226
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "ç?¡æ³?é??å®?ã??%sã??ï¼? lock-helper å??å®?é?¯èª¤"
 
 # camel/camel-movemail.c:318
-#: ../camel/camel-lock-client.c:216
+#: ../camel/camel-lock-client.c:227
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "ç?¡æ³?é??å®?ã??%sã??"
@@ -2054,32 +2265,32 @@ msgstr "ç?¡æ³?é??å®?ã??%sã??"
 # camel/camel-lock.c:111
 # camel/camel-movemail.c:138
 # camel/camel-movemail.c:185
-#: ../camel/camel-lock.c:103
+#: ../camel/camel-lock.c:102
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "ç?¡æ³?å»ºç«?ç?¨æ?¼ %s: %s ç??é??å®?æª?æ¡?"
 
 # camel/camel-lock.c:151
 # camel/camel-movemail.c:219
-#: ../camel/camel-lock.c:144
+#: ../camel/camel-lock.c:145
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Timed out trying to get lock file on %s.  Try again later."
 msgstr "å??è©¦å??å¾? %s ä¸?ç??é??å®?æª?æ¡?é?¾æ??ã??è«?ç¨?å¾?å??è©¦ä¸?æ¬¡ã??"
 
 # camel/camel-lock.c:201
-#: ../camel/camel-lock.c:199
+#: ../camel/camel-lock.c:205
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "ä½¿ç?¨ fcntl(2) å??å¾?é??å¤±æ??ï¼? %s"
 
 # camel/camel-lock.c:255
-#: ../camel/camel-lock.c:262
+#: ../camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "ä½¿ç?¨ flock(2) å??å¾?é??å¤±æ??ï¼? %s"
 
 # camel/camel-movemail.c:101
-#: ../camel/camel-movemail.c:106
+#: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "ç?¡æ³?æª¢æ?¥é?µä»¶æª?æ¡? %sï¼?%s"
@@ -2091,179 +2302,173 @@ msgid "Could not open mail file %s: %s"
 msgstr "ç?¡æ³?é??å??é?µä»¶æª?æ¡? %sï¼?%s"
 
 # camel/camel-movemail.c:158
-#: ../camel/camel-movemail.c:127
+#: ../camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "ç?¡æ³?é??å??æ?«å?é?µä»¶æª?æ¡? %sï¼?%s"
 
 # camel/camel-movemail.c:274
-#: ../camel/camel-movemail.c:156
+#: ../camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "å?²å?é?µä»¶è?³æ?«å?æª?æ¡?æ??å¤±æ?? %sï¼?%s"
 
 # camel/camel-movemail.c:306
-#: ../camel/camel-movemail.c:186
+#: ../camel/camel-movemail.c:193
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "ç?¡æ³?å»ºç«?å°?ç®¡ï¼?%s"
 
 # camel/camel-movemail.c:318
-#: ../camel/camel-movemail.c:198
+#: ../camel/camel-movemail.c:207
 #, c-format
 msgid "Could not fork: %s"
 msgstr "ç?¡æ³?å?¦å¤?å?·è¡?ä¸?å??è¡?ç¨?ï¼?%s"
 
 # camel/camel-movemail.c:356
-#: ../camel/camel-movemail.c:236
+#: ../camel/camel-movemail.c:245
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail ç¨?å¼?å¤±æ??ï¼?%s"
 
 # camel/camel-movemail.c:357
-#: ../camel/camel-movemail.c:237
+#: ../camel/camel-movemail.c:246
 msgid "(Unknown error)"
 msgstr "(ä¸?æ??ç??é?¯èª¤)"
 
 # camel/camel-movemail.c:245
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:273
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "è®?å??é?µä»¶æª?æ¡?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
 # camel/camel-movemail.c:256
-#: ../camel/camel-movemail.c:271
+#: ../camel/camel-movemail.c:286
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "å¯«å?¥é?µä»¶æ?«å?æª?æ¡?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
 # camel/camel-movemail.c:587
-#: ../camel/camel-movemail.c:464 ../camel/camel-movemail.c:531
+#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "è¤?è£½é?µä»¶æ?«å?æª?æ¡?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
+#: ../camel/camel-multipart-signed.c:285
+#, c-format
+msgid "No content available"
+msgstr "æ²?æ??å?¯ç?¨ç??å?§å®¹"
+
+#: ../camel/camel-multipart-signed.c:293
+#, c-format
+msgid "No signature available"
+msgstr "æ²?æ??å?¯ç?¨ç??ç°½ç½²"
+
 # shell/e-storage.c:467
-#: ../camel/camel-multipart-signed.c:592
+#: ../camel/camel-multipart-signed.c:612
+#, c-format
 msgid "parse error"
 msgstr "è§£æ??é?¯èª¤"
 
-# calendar/gui/calendar-model.c:647
-# calendar/gui/calendar-model.c:1182
-# calendar/gui/dialogs/task-editor-dialog.glade.h:4
-# calendar/gui/e-calendar-table.c:422
-# camel/camel-service.c:544
-# camel/camel-service.c:580
-#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:674
-#: ../camel/camel-net-utils.c:805
-#: ../camel/providers/pop3/camel-pop3-store.c:476
-#: ../camel/providers/pop3/camel-pop3-store.c:576
-msgid "Canceled"
-msgstr "å·²å??æ¶?"
-
-# camel/camel-filter-driver.c:671
-#: ../camel/camel-net-utils.c:521
-msgid "cannot create thread"
-msgstr "ç?¡æ³?å»ºç«?å?·è¡?ç·?"
-
 # camel/camel-service.c:548
-#: ../camel/camel-net-utils.c:678
+#: ../camel/camel-net-utils.c:693
 #, c-format
 msgid "Resolving: %s"
 msgstr "è§£æ??ï¼?%s"
 
 # camel/camel-service.c:600
-#: ../camel/camel-net-utils.c:700
+#: ../camel/camel-net-utils.c:715
 msgid "Host lookup failed"
 msgstr "æ??å°?ä¸»æ©?å¤±æ??"
 
 # camel/camel-service.c:600
-#: ../camel/camel-net-utils.c:702
+#: ../camel/camel-net-utils.c:719
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "æ??å°?ä¸»æ©?å¤±æ??ï¼? %s ï¼?%s"
 
 # camel/camel-service.c:548
-#: ../camel/camel-net-utils.c:809
+#: ../camel/camel-net-utils.c:842
 msgid "Resolving address"
 msgstr "è§£æ??ä½?å??"
 
-#: ../camel/camel-net-utils.c:829
+#: ../camel/camel-net-utils.c:862
 msgid "Name lookup failed"
 msgstr "æ?¥è©¢å??ç¨±å¤±æ??"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/camel-net-utils.c:832
+#: ../camel/camel-net-utils.c:867
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "æ??å°?å??ç¨±å¤±æ??ï¼? %s"
 
 # mail/mail-ops.c:898
-#: ../camel/camel-offline-folder.c:249
+#: ../camel/camel-offline-folder.c:169
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "æ£å?¨å°?è³?æ??å¤¾ã??%sã??ä¸ç??é?µä»¶å??æ¥å?°ç£?ç¢?"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-offline-journal.c:159 ../camel/camel-offline-journal.c:182
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:170
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "ä¸?è?½å¯«å?¥è³?æ??å¤¾ã??%sã??ç??é?¢ç·?æ?¥èª?ï¼?%s"
 
 # camel/camel-session.c:68
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:58
 msgid "Virtual folder email provider"
 msgstr "è??æ?¬è³?æ??å¤¾é?»å?é?µä»¶ä¾?æ??å??"
 
 # camel/camel-session.c:70
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:60
 msgid "For reading mail as a query of another set of folders"
 msgstr "ä½¿è®?å??é?µä»¶å¦?å??æ?¥è©¢å?¶ä»?è³?æ??å¤¾"
 
 # camel/camel-provider.c:131
-#: ../camel/camel-provider.c:184
+#: ../camel/camel-provider.c:188
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "ç?¡æ³?è¼?å?¥æ¨¡çµ? %sï¼? æ¤ç³»çµ±ä¸?æ?¯æ?´è¼?å?¥æ¨¡çµ?ã??"
 
 # camel/camel-provider.c:140
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:197
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "ç?¡æ³?è¼?å?¥ %sï¼?%s"
 
 # camel/camel-provider.c:148
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:206
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "ç?¡æ³?è¼?å?¥ %sï¼?æ¨¡çµ?å?§æ²?æ??å??å§?ç¢¼ã??"
 
 # camel/camel-session.c:295
 # camel/camel-session.c:364
-#: ../camel/camel-provider.c:379 ../camel/camel-session.c:180
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:207
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "æ²?æ??é??è¨?å??å®?ã??%sã??ç??æ??ä¾?è??"
 
 # camel/camel-sasl-anonymous.c:33
-#: ../camel/camel-sasl-anonymous.c:36
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "å?¿å??"
 
 # camel/camel-sasl-anonymous.c:35
-#: ../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:110
 # camel/camel-sasl-plain.c:87
-#: ../camel/camel-sasl-anonymous.c:121 ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:69
+#, c-format
 msgid "Authentication failed."
 msgstr "é©?è?å¤±æ??ã??"
 
 # camel/camel-sasl-anonymous.c:119
-#: ../camel/camel-sasl-anonymous.c:130
+#: ../camel/camel-sasl-anonymous.c:80
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -2273,7 +2478,7 @@ msgstr ""
 "%s"
 
 # camel/camel-sasl-anonymous.c:131
-#: ../camel/camel-sasl-anonymous.c:142
+#: ../camel/camel-sasl-anonymous.c:94
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -2283,7 +2488,7 @@ msgstr ""
 "%s"
 
 # camel/camel-sasl-anonymous.c:143
-#: ../camel/camel-sasl-anonymous.c:154
+#: ../camel/camel-sasl-anonymous.c:108
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -2293,209 +2498,220 @@ msgstr ""
 "%s"
 
 # camel/camel-sasl-cram-md5.c:35
-#: ../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:37
-#: ../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 å? å¯?ç??å¯?ç¢¼é?£ç·?è?³ä¼ºæ??å?¨ï¼?è?¥ç?¼ç?¾è©²ä¼ºæ??å?¨æ?¯æ?´é??ç¨®æ??å??ã??"
 
 # camel/camel-sasl-digest-md5.c:43
-#: ../camel/camel-sasl-digest-md5.c:48
+#: ../camel/camel-sasl-digest-md5.c:56
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
 # camel/camel-sasl-digest-md5.c:45
-#: ../camel/camel-sasl-digest-md5.c:50
+#: ../camel/camel-sasl-digest-md5.c:58
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨ DIGEST-MD5 å? å¯?ç??å¯?ç¢¼é?£ç·?è?³ä¼ºæ??å?¨ï¼?è?¥ç?¼ç?¾è©²ä¼ºæ??å?¨æ?¯æ?´é??ç¨®æ??å??ã??"
 
 # camel/camel-sasl-digest-md5.c:810
-#: ../camel/camel-sasl-digest-md5.c:844
+#: ../camel/camel-sasl-digest-md5.c:818
+#, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "ä¼ºæ??å?¨æ?¥å??é??é?·(>2048 ä½?å?? )"
 
 # camel/camel-sasl-digest-md5.c:819
-#: ../camel/camel-sasl-digest-md5.c:853
+#: ../camel/camel-sasl-digest-md5.c:829
+#, c-format
 msgid "Server challenge invalid\n"
 msgstr "ä¼ºæ??å?¨æ?¥å??ç?¡æ??\n"
 
 # camel/camel-sasl-digest-md5.c:825
-#: ../camel/camel-sasl-digest-md5.c:859
+#: ../camel/camel-sasl-digest-md5.c:837
+#, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "ä¼ºæ??å?¨æ?¥å??å??å?«ç?¡æ??ç?? ã??Quality of Protectionã??ä»£ç¬¦"
 
 # camel/camel-sasl-digest-md5.c:847
-#: ../camel/camel-sasl-digest-md5.c:889
+#: ../camel/camel-sasl-digest-md5.c:869
+#, c-format
 msgid "Server response did not contain authorization data"
 msgstr "ä¼ºæ??å?¨å??æ??ä¸¦æ?ªå??å?«æ??æ¬?è³?æ??"
 
 # camel/camel-sasl-digest-md5.c:865
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:890
+#, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "ä¼ºæ??å?¨å??æ??å??å?«ä¸?å®?æ?´ç??æ??æ¬?è³?æ??"
 
 # camel/camel-sasl-digest-md5.c:875
-#: ../camel/camel-sasl-digest-md5.c:917
+#: ../camel/camel-sasl-digest-md5.c:903
+#, c-format
 msgid "Server response does not match"
 msgstr "ä¼ºæ??å?¨å??æ??ä¸?ç¬¦"
 
-#: ../camel/camel-sasl-gssapi.c:72
+#: ../camel/camel-sasl-gssapi.c:82
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
 # camel/camel-sasl-kerberos4.c:42
-#: ../camel/camel-sasl-gssapi.c:74
+#: ../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:168
+#: ../camel/camel-sasl-gssapi.c:121
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
 msgstr "æ??ä¾?ç??è?ä»¶ä¸?æ?¯æ?´æ??å®?ç??æ©?å?¶ï¼?æ??è??æ?¯å?·è¡?ç?¡æ³?è¾¨è?ã??"
 
-#: ../camel/camel-sasl-gssapi.c:173
+#: ../camel/camel-sasl-gssapi.c:126
 msgid "The provided target_name parameter was ill-formed."
 msgstr "æ??ä¾?ç?? target_name å??æ?¸æ ¼å¼?é?¯èª¤ã??"
 
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../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:180
+#: ../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 å??å?«ä¸?å??ç??é??é??ï¼?é??é??  input_chan_bindingsï¼?é?£çµ?è?³é??äº?æ??å®?ç??å??æ?¸ã??"
 
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../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:189
+#: ../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."
 msgstr "æ??ä¾?ç??è?ä»¶ä¸?é?©ç?¨æ?¼ç¶²çµ¡ä½?ç½®ï¼?æ??è??è?ä»¶è?å?¥æ??æ¨?æ?ªå??ç?§ä»»ä½?è?æ?¸ã??"
 
-#: ../camel/camel-sasl-gssapi.c:194
+#: ../camel/camel-sasl-gssapi.c:147
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "æ??ä¾?ç??ç¶²çµ¡ä½?ç½®è?å?¥æ??æ¨?æ?ªå??ç?§æ??æ??ç??ç¶²çµ¡ä½?ç½®ã??"
 
-#: ../camel/camel-sasl-gssapi.c:197
+#: ../camel/camel-sasl-gssapi.c:150
 msgid "The consistency checks performed on the input_token failed."
 msgstr "å?¨ input_token å?·è¡?ä¸?è?´æ?§æª¢æ?¥å¤±æ??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:200
+#: ../camel/camel-sasl-gssapi.c:153
 msgid "The consistency checks performed on the credential failed."
 msgstr "å?¨è?ä»¶å?·è¡?ä¸?è?´æ?§æª¢æ?¥å¤±æ??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:203
+#: ../camel/camel-sasl-gssapi.c:156
 msgid "The referenced credentials have expired."
 msgstr "å??ç?§ç??è?ä»¶å·²ç¶?é??æ??ã??"
 
 # camel/camel-sasl-kerberos4.c:218
 # camel/providers/imap/camel-imap-store.c:433
-#: ../camel/camel-sasl-gssapi.c:209 ../camel/camel-sasl-gssapi.c:316
-#: ../camel/camel-sasl-gssapi.c:358 ../camel/camel-sasl-gssapi.c:373
-#: ../camel/providers/imap/camel-imap-store.c:1272
+#: ../camel/camel-sasl-gssapi.c:162 ../camel/camel-sasl-gssapi.c:300
+#: ../camel/camel-sasl-gssapi.c:344 ../camel/camel-sasl-gssapi.c:361
+#: ../camel/providers/smtp/camel-smtp-transport.c:1192
+#, c-format
 msgid "Bad authentication response from server."
 msgstr "ä¾?è?ªä¼ºæ??å?¨ç??ä¸?è?¯è¨±å?¯å??æ??ã??"
 
 # mail/mail-config.glade.h:1
-#: ../camel/camel-sasl-gssapi.c:383
+#: ../camel/camel-sasl-gssapi.c:373
+#, c-format
 msgid "Unsupported security layer."
 msgstr "ä¸?æ?¯æ?´ç??é¡?å??"
 
 # camel/camel-sasl-login.c:32
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:39
 msgid "Login"
 msgstr "ç?»å?¥"
 
 # camel/camel-sasl-login.c:34
 # camel/camel-sasl-plain.c:34
-#: ../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:127
-#: ../camel/camel-sasl-login.c:134
+#: ../camel/camel-sasl-login.c:94
+#, c-format
 msgid "Unknown authentication state."
 msgstr "æ?ªç?¥ç??é©?è¨¼ç??æ³?ã??"
 
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:41
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
 # camel/camel-sasl-kerberos4.c:42
-#: ../camel/camel-sasl-ntlm.c:36
+#: ../camel/camel-sasl-ntlm.c:43
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
 msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨ NTLM / å®?å?¨å¯?ç¢¼é©?è?é?£ç·?è?³å?ºæ?¼ Windows ç??ä¼ºæ??å?¨ã??"
 
-#: ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-plain.c:43
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:46
 msgid "POP before SMTP"
 msgstr "POP å??æ?¼ SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:41
+#: ../camel/camel-sasl-popb4smtp.c:48
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "é??å??é?¸é ?å°?æ??å?¨é?²è¡? SMTP ä¹?å??å??è¨± POPé?£ç·?"
 
 # addressbook/gui/widgets/e-addressbook-view.c:735
-#: ../camel/camel-sasl-popb4smtp.c:106
+#: ../camel/camel-sasl-popb4smtp.c:82
 msgid "POP Source URI"
 msgstr "POP ä¾?æº? URI"
 
-#: ../camel/camel-sasl-popb4smtp.c:109
+#: ../camel/camel-sasl-popb4smtp.c:89
+#, c-format
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "POP å??æ?¼ SMTP å??è¨±ä½¿ç?¨æ?ªç?¥ç??å?³è¼¸"
 
-#: ../camel/camel-sasl-popb4smtp.c:114
+#: ../camel/camel-sasl-popb4smtp.c:97
+#, c-format
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP å??æ?¼ SMTP å??è¨±ä½¿ç?¨é?? POP ä¾?æº?"
 
 # camel/camel-search-private.c:111
-#: ../camel/camel-search-private.c:147
+#: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "æ£è¦?è¡¨ç¤ºå¼?ç·¨è¯å¤±æ??ï¼? %sï¼? %s"
 
 # camel/camel-service.c:154
-#: ../camel/camel-service.c:265
+#: ../camel/camel-service.c:88
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URLã??%sã??é??è¦? username å??ä»¶"
 
 # camel/camel-service.c:162
-#: ../camel/camel-service.c:269
+#: ../camel/camel-service.c:92
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URLã??%sã??é??è¦? host å??ä»¶"
 
 # camel/camel-service.c:170
-#: ../camel/camel-service.c:273
+#: ../camel/camel-service.c:96
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URLã??%sã??é??è¦? path å??ä»¶"
 
 # camel/camel-session.c:479
-#: ../camel/camel-session.c:305
+#: ../camel/camel-session.c:263
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2505,148 +2721,130 @@ msgstr ""
 "%s"
 
 # camel/providers/pop3/camel-pop3-store.c:361
-#: ../camel/camel-session.c:477
+#: ../camel/camel-session.c:760
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "è«?è¼¸å?¥ %2$s æ?¼ä¸»æ©? %3$s ç?? %1$s å¯?ç¢¼ã??"
 
-#: ../camel/camel-session.c:815
-msgid "Camel session doesn't support forwarding of a message."
-msgstr "Camel ä½?æ¥é??æ®µä¸?æ?¯æ?´è½?é??è¨?æ?¯ã??"
-
 # camel/camel-smime-context.c:327
-#: ../camel/camel-smime-context.c:447 ../camel/camel-smime-context.c:1012
+#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1041
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "æ?¾ä¸?å?° '%s' ç??è?æ?¸"
 
 # camel/camel-filter-driver.c:671
-#: ../camel/camel-smime-context.c:453
+#: ../camel/camel-smime-context.c:376
 msgid "Cannot create CMS message"
 msgstr "ç?¡æ³?å»ºç«? CMS è¨?æ?¯"
 
-#: ../camel/camel-smime-context.c:458
+#: ../camel/camel-smime-context.c:381
 msgid "Cannot create CMS signed data"
 msgstr "ç?¡æ³?å»ºç«? CMS signedData"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-smime-context.c:464
+#: ../camel/camel-smime-context.c:387
 msgid "Cannot attach CMS signed data"
 msgstr "ç?¡æ³?é??å?  CMS signedData"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-smime-context.c:471
+#: ../camel/camel-smime-context.c:394
 msgid "Cannot attach CMS data"
 msgstr "ç?¡æ³?é??å?  CMS è³?æ??"
 
-#: ../camel/camel-smime-context.c:477
+#: ../camel/camel-smime-context.c:400
 msgid "Cannot create CMS Signer information"
 msgstr "ç?¡æ³?å»ºç«? CMS SignerInfo"
 
-#: ../camel/camel-smime-context.c:483
+#: ../camel/camel-smime-context.c:406
 msgid "Cannot find certificate chain"
 msgstr "æ?¾ä¸?å?°è?æ?¸é??"
 
-#: ../camel/camel-smime-context.c:489
+#: ../camel/camel-smime-context.c:412
 msgid "Cannot add CMS Signing time"
 msgstr "ç?¡æ³?æ?°å¢? CMS SigningTime"
 
 # composer/e-msg-composer.c:1092
-#: ../camel/camel-smime-context.c:511 ../camel/camel-smime-context.c:523
+#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' ç??å? å¯?è?æ?¸ä¸?å?å?¨"
 
-#: ../camel/camel-smime-context.c:530
+#: ../camel/camel-smime-context.c:458
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "ç?¡æ³?æ?°å¢? SMIMEEncKeyPrefs å±¬æ?§"
 
-#: ../camel/camel-smime-context.c:535
+#: ../camel/camel-smime-context.c:463
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "ç?¡æ³?æ?°å¢? MS SMIMEEncKeyPrefs å±¬æ?§"
 
-#: ../camel/camel-smime-context.c:540
+#: ../camel/camel-smime-context.c:468
 msgid "Cannot add encryption certificate"
 msgstr "ç?¡æ³?æ?°å¢?å? å¯?è?æ?¸"
 
-#: ../camel/camel-smime-context.c:546
+#: ../camel/camel-smime-context.c:474
 msgid "Cannot add CMS Signer information"
 msgstr "ç?¡æ³?æ?°å¢? CMS SignerInfo"
 
-# mail/mail-crypto.c:251
-#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:1084
-msgid "Cannot create encoder context"
-msgstr "ç?¡æ³?å»ºç«?ç·¨ç¢¼å?¨ç¶²çµ¡ä½?ç½®"
-
-# camel/camel-movemail.c:274
-#: ../camel/camel-smime-context.c:622
-msgid "Failed to add data to CMS encoder"
-msgstr "ç?¡æ³?æ?°å¢?è³?æ??è?³ CMS ç·¨ç¢¼å?¨"
-
-#: ../camel/camel-smime-context.c:627 ../camel/camel-smime-context.c:1101
-msgid "Failed to encode data"
-msgstr "ç?¡æ³?ç·¨ç¢¼è³?æ??"
-
 # calendar/gui/calendar-model.c:1064
 # calendar/gui/dialogs/task-editor-dialog.glade.h:22
 # calendar/gui/e-calendar-table.c:348
-#: ../camel/camel-smime-context.c:700
+#: ../camel/camel-smime-context.c:506
 msgid "Unverified"
 msgstr "æ?ªæ??å®?"
 
 # mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:702
+#: ../camel/camel-smime-context.c:508
 msgid "Good signature"
 msgstr "è?¯å¥½ç??ç°½ç½²"
 
 # mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:704
+#: ../camel/camel-smime-context.c:510
 msgid "Bad signature"
 msgstr "é?¯èª¤ç??ç°½ç½²"
 
-#: ../camel/camel-smime-context.c:706
+#: ../camel/camel-smime-context.c:512
 msgid "Content tampered with or altered in transit"
 msgstr "å?§å®¹å?¨å?³é??æ??è¢«ç«?æ?¹æ??æ?´æ?¹"
 
-#: ../camel/camel-smime-context.c:708
+#: ../camel/camel-smime-context.c:514
 msgid "Signing certificate not found"
 msgstr "æ?¾ä¸?å?°ç°½ç½²è?æ?¸"
 
-#: ../camel/camel-smime-context.c:710
+#: ../camel/camel-smime-context.c:516
 msgid "Signing certificate not trusted"
 msgstr "ç°½ç½²è?æ?¸ä¸?å??ä¿¡ä»»"
 
-#: ../camel/camel-smime-context.c:712
+#: ../camel/camel-smime-context.c:518
 msgid "Signature algorithm unknown"
 msgstr "æ?ªç?¥ç??ç°½ç½²æ¼?ç®?æ³?"
 
-#: ../camel/camel-smime-context.c:714
+#: ../camel/camel-smime-context.c:520
 msgid "Signature algorithm unsupported"
 msgstr "ä¸?æ?¯æ?´é??ç¨®ç°½ç½²æ¼?ç®?æ³?"
 
 # mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:716
+#: ../camel/camel-smime-context.c:522
 msgid "Malformed signature"
 msgstr "æ ¼å¼?ä¸?è?¯ç??ç°½ç½²"
 
 # shell/e-storage.c:467
-#: ../camel/camel-smime-context.c:718
+#: ../camel/camel-smime-context.c:524
 msgid "Processing error"
 msgstr "è§£æ??é?¯èª¤"
 
-#: ../camel/camel-smime-context.c:772
+#: ../camel/camel-smime-context.c:566
 msgid "No signed data in signature"
 msgstr "ç°½ç½²ä¸æ²?æ??è¢«ç°½ç½²ç??è³?æ??"
 
-#: ../camel/camel-smime-context.c:777
+#: ../camel/camel-smime-context.c:571
 msgid "Digests missing from enveloped data"
 msgstr "å??è£¹ç??è³?æ??ä¸é?ºæ¼?æ??è¦?"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-smime-context.c:790 ../camel/camel-smime-context.c:800
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
 msgstr "ç?¡æ³?è¨?ç®?æ??è¦?"
 
@@ -2657,134 +2855,128 @@ msgstr "ç?¡æ³?è¨?ç®?æ??è¦?"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../camel/camel-smime-context.c:807 ../camel/camel-smime-context.c:811
+#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
 msgstr "ç?¡æ³?è¨å®?é?µä»¶æ??è¦?"
 
 # mail/mail-crypto.c:59
-#: ../camel/camel-smime-context.c:821 ../camel/camel-smime-context.c:826
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
 msgstr "è?æ?¸å?¯å?¥å¤±æ??"
 
-#: ../camel/camel-smime-context.c:836
+#: ../camel/camel-smime-context.c:631
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "é??è?æ?¸è¨?æ?¯ï¼?ç?¡æ³?é©?è?è?æ?¸"
 
-#: ../camel/camel-smime-context.c:839
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "é??è?æ?¸è¨?æ?¯ã??å?¯å?¥å??é©?è?ç??è?æ?¸"
 
 # mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:843
+#: ../camel/camel-smime-context.c:638
 msgid "Cannot find signature digests"
 msgstr "æ?¾ä¸?å?°ç°½ç½²æ??è¦?"
 
 # mail/mail-config.glade.h:72
-#: ../camel/camel-smime-context.c:859
+#: ../camel/camel-smime-context.c:654
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ç°½ç½²è??ï¼? %s<%s>ï¼? %s\n"
 
+# mail/mail-crypto.c:251
+#: ../camel/camel-smime-context.c:832 ../camel/camel-smime-context.c:1114
+msgid "Cannot create encoder context"
+msgstr "ç?¡æ³?å»ºç«?ç·¨ç¢¼å?¨ç¶²çµ¡ä½?ç½®"
+
+# camel/camel-movemail.c:274
+#: ../camel/camel-smime-context.c:838
+msgid "Failed to add data to CMS encoder"
+msgstr "ç?¡æ³?æ?°å¢?è³?æ??è?³ CMS ç·¨ç¢¼å?¨"
+
+#: ../camel/camel-smime-context.c:843 ../camel/camel-smime-context.c:1131
+msgid "Failed to encode data"
+msgstr "ç?¡æ³?ç·¨ç¢¼è³?æ??"
+
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/camel-smime-context.c:960 ../camel/camel-smime-context.c:1184
+#: ../camel/camel-smime-context.c:981 ../camel/camel-smime-context.c:1220
 msgid "Decoder failed"
 msgstr "è§£ç¢¼å?¨å¤±æ??"
 
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1049
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "æ?¾ä¸?å?°ä¸?è?¬å¤§é??å? å¯?æ¼?ç®?æ³?"
 
-#: ../camel/camel-smime-context.c:1027
+#: ../camel/camel-smime-context.c:1057
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "ç?¡æ³?é??ç½®æ??æ§½çµ¦å? å¯?å¤§é??å¯?ç¢¼å??"
 
 # camel/camel-filter-driver.c:671
-#: ../camel/camel-smime-context.c:1038
+#: ../camel/camel-smime-context.c:1068
 msgid "Cannot create CMS Message"
 msgstr "ç?¡æ³?å»ºç«? CMS è¨?æ?¯"
 
 # camel/camel-filter-driver.c:671
-#: ../camel/camel-smime-context.c:1044
+#: ../camel/camel-smime-context.c:1074
 msgid "Cannot create CMS Enveloped data"
 msgstr "ç?¡æ³?å»ºç«? CMS EnvelopedData"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-smime-context.c:1050
+#: ../camel/camel-smime-context.c:1080
 msgid "Cannot attach CMS Enveloped data"
 msgstr "ç?¡æ³?é??å?  CMS EnvelopedData"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-smime-context.c:1056
+#: ../camel/camel-smime-context.c:1086
 msgid "Cannot attach CMS data object"
 msgstr "ç?¡æ³?é??å?  CMS è³?æ??ç?©ä»¶"
 
 # camel/camel-filter-driver.c:671
-#: ../camel/camel-smime-context.c:1065
+#: ../camel/camel-smime-context.c:1095
 msgid "Cannot create CMS Recipient information"
 msgstr "ç?¡æ³?å»ºç«? CMS RecipientInfo"
 
-#: ../camel/camel-smime-context.c:1070
+#: ../camel/camel-smime-context.c:1100
 msgid "Cannot add CMS Recipient information"
 msgstr "ç?¡æ³?æ?°å¢? CMS RecipientInfo"
 
 # camel/providers/imap/camel-imap-store.c:531
-#: ../camel/camel-smime-context.c:1095
+#: ../camel/camel-smime-context.c:1125
 msgid "Failed to add data to encoder"
 msgstr "ç?¡æ³?æ?°å¢?è³?æ??è?³ç·¨ç¢¼å?¨"
 
-#: ../camel/camel-smime-context.c:1191
+#: ../camel/camel-smime-context.c:1227
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME è§£å¯?ï¼?æ?¾ä¸?å?°å? å¯?å?§å®¹"
 
-# camel/providers/smtp/camel-smtp-transport.c:172
-#: ../camel/camel-smime-context.c:1219
-msgid "import keys: unimplemented"
-msgstr "å?¯å?¥å¯?ç¢¼å??ï¼?æ?ªå?·è¡?"
-
-#: ../camel/camel-smime-context.c:1227
-msgid "export keys: unimplemented"
-msgstr "å?¯å?ºå¯?ç¢¼å??ï¼?æ?ªå?·è¡?"
-
-# camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:171
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ï¼?å?¨æ¤å?²å?ç©ºé??ä¸?ç?¡æ??ç??æ??ä½?"
-
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-store.c:316
+#: ../camel/camel-store.c:444
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?è³?æ??å¤¾å·²å?å?¨"
 
-# camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/camel-store.c:395
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ï¼?å?¨æ¤å?²å?ç©ºé??ä¸?ç?¡æ??ç??æ??ä½?"
-
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-store.c:423
+#: ../camel/camel-store.c:543
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "ç?¡æ³?å»ºç«?è³?æ??å¤¾ï¼?%sï¼?è³?æ??å¤¾å·²å?å?¨"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:377
-#: ../camel/providers/local/camel-maildir-store.c:219
+#: ../camel/camel-store.c:616 ../camel/camel-vee-store.c:263
+#: ../camel/providers/local/camel-maildir-store.c:224
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "ä¸?è?½å?ªé?¤è³?æ??å¤¾ï¼? %s ï¼?ç?¡æ??ç??æ??ä½?"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:414
-#: ../camel/providers/local/camel-maildir-store.c:291
+#: ../camel/camel-store.c:680 ../camel/camel-vee-store.c:213
+#: ../camel/providers/local/camel-maildir-store.c:314
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "ä¸?è?½é??æ?°å?½å??è³?æ??å¤¾ï¼? %s ï¼?ç?¡æ??ç??æ??ä½?"
@@ -2795,17 +2987,17 @@ msgstr "ä¸?è?½é??æ?°å?½å??è³?æ??å¤¾ï¼? %s ï¼?ç?¡æ??ç??æ??ä½?"
 # mail/mail-ops.c:1032
 # mail/mail-ops.c:1033
 #. 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:1128 ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "å??æ?¶ç?"
 
 # calendar/gui/goto-dialog.glade.h:9
 #. 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:1131 ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "å??å?¾é?µä»¶"
 
-#: ../camel/camel-tcp-stream-ssl.c:870
+#: ../camel/camel-tcp-stream-ssl.c:786
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2818,18 +3010,18 @@ msgstr ""
 "æ??ç´?æª?:              %s\n"
 "ç°½ç½²:              %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:876
+#: ../camel/camel-tcp-stream-ssl.c:792
 msgid "GOOD"
 msgstr "è?¯å¥½"
 
-#: ../camel/camel-tcp-stream-ssl.c:876
+#: ../camel/camel-tcp-stream-ssl.c:792
 msgid "BAD"
 msgstr "ä¸?è?¯"
 
 # camel/camel-tcp-stream-openssl.c:428
 # camel/camel-tcp-stream-ssl.c:364
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-ssl.c:796
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2844,7 +3036,7 @@ msgstr ""
 "\n"
 "ä½ æ?³è¦?æ?¥å??å??ï¼?"
 
-#: ../camel/camel-tcp-stream-ssl.c:924
+#: ../camel/camel-tcp-stream-ssl.c:840
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2853,7 +3045,7 @@ msgstr ""
 "è?æ?¸å??é¡?ï¼? %s\n"
 "ç?¼ç?§è??ï¼? %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:976
+#: ../camel/camel-tcp-stream-ssl.c:892
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2862,7 +3054,7 @@ msgstr ""
 "ä¸?æ£ç¢ºç??è?æ?¸ç¶²å??ï¼? %s\n"
 "ç?¼ç?§è??ï¼? %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:994
+#: ../camel/camel-tcp-stream-ssl.c:910
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2871,7 +3063,7 @@ msgstr ""
 "è?æ?¸å·²é?¾æ??ï¼? %s\n"
 "ç?¼ç?§è??ï¼? %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1011
+#: ../camel/camel-tcp-stream-ssl.c:927
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2881,53 +3073,54 @@ msgstr ""
 "ç?¼ç?§è??ï¼? %s"
 
 # camel/camel-url.c:289
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:314
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "ç?¡æ³?è§£æ?? URLã??%sã??"
 
 # shell/e-shell-importer.c:384
-#: ../camel/camel-vee-folder.c:577
+#: ../camel/camel-vee-folder.c:1044
 #, c-format
-msgid "Error storing '%s': %s"
-msgstr "å?²å?ã??%sã??ç?¼ç??é?¯èª¤ï¼?%s"
+msgid "Error storing '%s': "
+msgstr "å?²å?ã??%sã??ç?¼ç??é?¯èª¤ï¼?"
 
 # camel/camel-vee-folder.c:451
-#: ../camel/camel-vee-folder.c:654
+#: ../camel/camel-vee-folder.c:1117
 #, c-format
 msgid "No such message %s in %s"
 msgstr "æ²?æ?? %s é??é¡?é?µä»¶å?¨ %s ä¸"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/camel-vee-folder.c:813 ../camel/camel-vee-folder.c:819
+#: ../camel/camel-vee-folder.c:1133 ../camel/camel-vee-folder.c:1148
+#, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "ä¸?è?½è¤?è£½æ??ç§»å??é?µä»¶å?°è??æ?¬è³?æ??å¤¾ä¸"
 
-#: ../camel/camel-vee-store.c:113 ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:353
+#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
+#: ../camel/camel-vee-store.c:417
 msgid "Unmatched"
 msgstr "æ²?æ??ç?¸ç¬¦è³?æ??"
 
+# camel/providers/local/camel-local-store.c:237
+#: ../camel/camel-vee-store.c:223
+#, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "ä¸?è?½é??æ?°å?½å??è³?æ??å¤¾ï¼? %s ï¼?æ²?æ??é??å??è³?æ??å¤¾"
+
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: ../camel/camel-vee-store.c:400
+#: ../camel/camel-vee-store.c:289
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "ä¸?è?½å?ªé?¤è³?æ??å¤¾ï¼? %s ï¼?æ²?æ??é??å??è³?æ??å¤¾"
 
-# camel/providers/local/camel-local-store.c:237
-#: ../camel/camel-vee-store.c:422
-#, c-format
-msgid "Cannot rename folder: %s: No such folder"
-msgstr "ä¸?è?½é??æ?°å?½å??è³?æ??å¤¾ï¼? %s ï¼?æ²?æ??é??å??è³?æ??å¤¾"
-
 # camel/providers/local/camel-mbox-summary.c:644
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "ç?¡æ³?è¤?è£½è¨?æ?¯å?°ã??å??æ?¶ç?ã??è³?æ??å¤¾"
 
 # camel/providers/local/camel-mbox-summary.c:644
-#: ../camel/camel-vtrash-folder.c:57
+#: ../camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
 msgstr "ç?¡æ³?è¤?è£½è¨?æ?¯å?°ã??å??å?¾é?µä»¶ã??è³?æ??å¤¾"
 
@@ -2938,7 +3131,7 @@ msgstr "ç?¡æ³?è¤?è£½è¨?æ?¯å?°ã??å??å?¾é?µä»¶ã??è³?æ??å¤¾"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2950,32 +3143,16 @@ msgstr ""
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-mbox-folder.c:319
 # camel/providers/local/camel-mh-folder.c:185
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
-#: ../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:139
+#: ../camel/providers/local/camel-maildir-folder.c:233
+#: ../camel/providers/local/camel-maildir-folder.c:268
+#: ../camel/providers/local/camel-maildir-folder.c:380
+#: ../camel/providers/local/camel-mbox-folder.c:329
+#: ../camel/providers/local/camel-mbox-folder.c:380
+#: ../camel/providers/local/camel-mh-folder.c:215
 msgid "No such message"
 msgstr "ç?¡æ¤é?µä»¶"
 
-# camel/camel-remote-store.c:337
-# camel/camel-remote-store.c:399
-# camel/camel-remote-store.c:470
-# camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:149
-#: ../camel/providers/imap4/camel-imap4-folder.c:814
-#: ../camel/providers/nntp/camel-nntp-folder.c:173
-#: ../camel/providers/nntp/camel-nntp-folder.c:248
-#: ../camel/providers/nntp/camel-nntp-folder.c:408
-#: ../camel/providers/pop3/camel-pop3-folder.c:268
-#: ../camel/providers/pop3/camel-pop3-folder.c:578
-#: ../camel/providers/pop3/camel-pop3-folder.c:639
-#: ../camel/providers/pop3/camel-pop3-folder.c:657
-msgid "User canceled"
-msgstr "ä½¿ç?¨è??å·²å??æ¶?"
-
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-maildir-folder.c:209
 # camel/providers/local/camel-maildir-folder.c:217
@@ -2983,73 +3160,63 @@ msgstr "ä½¿ç?¨è??å·²å??æ¶?"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:156
-#: ../camel/providers/imap4/camel-imap4-folder.c:819
-#: ../camel/providers/nntp/camel-nntp-folder.c:164
-#: ../camel/providers/nntp/camel-nntp-folder.c:166
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:250
-#: ../camel/providers/pop3/camel-pop3-folder.c:388
-#: ../camel/providers/pop3/camel-pop3-folder.c:581
-#: ../camel/providers/pop3/camel-pop3-folder.c:642
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-#: ../camel/providers/pop3/camel-pop3-folder.c:660
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:158
+#: ../camel/providers/nntp/camel-nntp-folder.c:244
+#: ../camel/providers/nntp/camel-nntp-folder.c:337
+#: ../camel/providers/pop3/camel-pop3-folder.c:714
 #, c-format
-msgid "Cannot get message %s: %s"
-msgstr "ç?¡æ³?å??å¾?é?µä»¶ %sï¼? %s"
+msgid "Cannot get message %s: "
+msgstr "ç?¡æ³?å??å¾?é?µä»¶ %sï¼?"
 
 # camel/providers/imap/camel-imap-folder.c:1047
 # camel/providers/imap/camel-imap-folder.c:1281
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:173
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:181
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2507
-#: ../camel/providers/imap4/camel-imap4-folder.c:837
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:176
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:186
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2644
+#, c-format
 msgid "This message is not available in offline mode."
 msgstr "é??å°?é?µä»¶ç?¡æ³?å?¨é?¢ç·?æ¨¡å¼?ä¸?ä½¿ç?¨ã??"
 
 # camel/camel-movemail.c:306
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:195
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2010
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2061
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:203
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:213
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2109
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2163
+#, c-format
 msgid "Could not get message"
 msgstr "ç?¡æ³?å??å¾?é?µä»¶ã??"
 
 # camel/providers/imap/camel-imap-folder.c:191
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:983
-#: ../camel/providers/imap/camel-imap-folder.c:295
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1038
+#: ../camel/providers/imap/camel-imap-folder.c:376
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "ç?¡æ³?è¼?å?¥ %s ç??æ??è¦?"
 
 # mail/mail-ops.c:992
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1056
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1112
 #, c-format
 msgid "Checking for deleted messages %s"
 msgstr "æª¢æ?¥å?ªé?¤ç??é?µä»¶ %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1331
-msgid "Trash Folder Full. Please Empty."
-msgstr "å??æ?¶ç?è³?æ??å¤¾å·²æ»¿ã??è«?å°?å®?æ¸?ç©ºã??"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1565
-#: ../camel/providers/groupwise/camel-groupwise-store.c:633
-#: ../camel/providers/groupwise/camel-groupwise-store.c:763
-#: ../camel/providers/imap/camel-imap-folder.c:3429
-#: ../camel/providers/imap/camel-imap-folder.c:3505
-#: ../camel/providers/imapx/camel-imapx-server.c:2728
-#: ../camel/providers/imapx/camel-imapx-server.c:2813
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1637
+#: ../camel/providers/groupwise/camel-groupwise-store.c:654
+#: ../camel/providers/groupwise/camel-groupwise-store.c:779
+#: ../camel/providers/imap/camel-imap-folder.c:3806
+#: ../camel/providers/imap/camel-imap-folder.c:3884
+#: ../camel/providers/imapx/camel-imapx-server.c:3720
+#: ../camel/providers/imapx/camel-imapx-server.c:3844
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "æ£å??å¾? %s ä¸æ?°é?µä»¶ç??æ??è¦?è³?è¨?"
 
 # camel/providers/local/camel-mh-folder.c:149
 # camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2361
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2404
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2474
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2524
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
-msgstr "ä¸?è?½å°?é?µä»¶å? å?¥è?³è³?æ??å¤¾ã??%sã??ï¼?%s"
+msgstr "ä¸?è?½å°?é?µä»¶å?²å?è?³è³?æ??å¤¾ã??%sã??ï¼?%s"
 
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-maildir-folder.c:209
@@ -3058,93 +3225,87 @@ msgstr "ä¸?è?½å°?é?µä»¶å? å?¥è?³è³?æ??å¤¾ã??%sã??ï¼?%s"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2392
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2510
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "ç?¡æ³?å»ºç«?é?µä»¶ï¼? %s"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:281
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:240
 #, c-format
 msgid "Cannot get folder container %s"
 msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾å®¹å?¨ %s"
 
 # camel/providers/local/camel-mh-folder.c:149
 # camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:343
-#: ../camel/providers/imap4/camel-imap4-journal.c:311
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:303
+#, c-format
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr "ä¸?è?½å?¨é?¢ç·?æ¨¡å¼?ä¸å? å?¥é?µä»¶ï¼?ç?¡æ³?ä½¿ç?¨å¿«å??"
 
 # camel/providers/local/camel-mbox-folder.c:259
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:359
-#: ../camel/providers/imap4/camel-imap4-journal.c:327
-#, c-format
-msgid "Cannot append message in offline mode: %s"
-msgstr "ä¸?è?½å?¨é?¢ç·?æ¨¡å¼?ä¸å? å?¥é?µä»¶ï¼? %s"
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:320
+msgid "Cannot append message in offline mode: "
+msgstr "ä¸?è?½å?¨é?¢ç·?æ¨¡å¼?ä¸å? å?¥é?µä»¶ï¼?"
 
 # camel/providers/imap/camel-imap-provider.c:43
 # mail/mail-config.glade.h:13
-#: ../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/imap/camel-imap-provider.c:45
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:56
-#: ../camel/providers/hula/camel-hula-provider.c:50
-#: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:40
-#: ../camel/providers/imapx/camel-imapx-provider.c:48
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:47
 msgid "C_heck for new messages in all folders"
 msgstr "æª¢æ?¥æ??æ??è³?æ??å¤¾ä¸æ?¯å?¦æ??æ?°é?µä»¶(_H)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:51
-#: ../camel/providers/imapx/camel-imapx-provider.c:72
-#: ../camel/providers/local/camel-local-provider.c:46
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:106
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imapx/camel-imapx-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:42
+#: ../camel/providers/local/camel-local-provider.c:82
+#: ../camel/providers/local/camel-local-provider.c:102
 msgid "Options"
 msgstr "é?¸é ?"
 
 # camel/providers/imap/camel-imap-provider.c:57
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr "å¥?ç?¨é??æ¿¾å?¨è?³æ¤ä¼ºæ??å?¨æ?¶ä»¶å?£ç??æ?°é?µä»¶(_A)"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:63
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
 msgid "Check new messages for J_unk contents"
 msgstr "æª¢æ?¥æ?°é?µä»¶ä¸æ?¯å?¦æ??å??å?¾é?µä»¶å?§å®¹(_U)"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:74
-#: ../camel/providers/imapx/camel-imapx-provider.c:78
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
+#: ../camel/providers/imap/camel-imap-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:79
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "å?ªæª¢æ?¥æ?¶ä»¶å?£è³?æ??å¤¾ä¸ç??å??å?¾é?µä»¶(_B)"
 
 # mail/mail-config.glade.h:12
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:67
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
 msgid "Automatically synchroni_ze account locally"
 msgstr "è?ªå??å??æ¥æ?¬å?°å¸³è??(_Z)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
 msgid "SOAP Settings"
 msgstr "SOAP è¨å®?å?¼"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:75
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "Post Office Agent SOAP _Port:"
 msgstr "é?µå±?ä»£è¾¦ SOAP å? (_P):"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "For accessing Novell GroupWise servers"
 msgstr "ç?¨æ?¼å?å?? Novell Groupwise ä¼ºæ??å?¨"
 
@@ -3154,92 +3315,110 @@ msgstr "ç?¨æ?¼å?å?? Novell Groupwise ä¼ºæ??å?¨"
 # camel/providers/nntp/camel-nntp-store.c:291
 # camel/providers/pop3/camel-pop3-provider.c:67
 # mail/mail-config.glade.h:52
-#: ../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:104
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:98
+#: ../camel/providers/imap/camel-imap-provider.c:97
+#: ../camel/providers/imapx/camel-imapx-provider.c:105
+#: ../camel/providers/nntp/camel-nntp-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:70
 msgid "Password"
 msgstr "å¯?ç¢¼"
 
 # camel/providers/imap/camel-imap-provider.c:82
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:100
 msgid ""
 "This option will connect to the GroupWise server using a plaintext password."
 msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨ç°¡æ??ç??å¯?ç¢¼é?£ç·?è?³ GroupWise ä¼ºæ??å?¨ã??"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: ../camel/providers/groupwise/camel-groupwise-store.c:102
+#: ../camel/providers/groupwise/camel-groupwise-store.c:107
+#, c-format
 msgid "Host or user not available in url"
 msgstr "ç¶²å??ä¸ç??ä½¿ç?¨è??æ??ä¸»æ©?ç?¡æ³?ä½¿ç?¨"
 
 # camel/providers/imap/camel-imap-store.c:505
 # camel/providers/smtp/camel-smtp-transport.c:410
-#: ../camel/providers/groupwise/camel-groupwise-store.c:204
-#: ../camel/providers/imap/camel-imap-store.c:1356
+#: ../camel/providers/groupwise/camel-groupwise-store.c:207
+#: ../camel/providers/imap/camel-imap-store.c:1207
+#: ../camel/providers/imapx/camel-imapx-server.c:2974
+#, c-format
 msgid "You did not enter a password."
 msgstr "ä½ æ²?æ??è¼¸å?¥å¯?ç¢¼ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:319
+#: ../camel/providers/groupwise/camel-groupwise-store.c:328
 msgid "Some features may not work correctly with your current server version"
 msgstr "æ??äº?å??è?½å?¯è?½ç?¡æ³?å?¨ä½ ç?®å??ç??ä¼ºæ??å?¨ç??æ?¬ä¸?æ£å¸¸é??ä½?"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: ../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:297
+#: ../camel/providers/groupwise/camel-groupwise-store.c:550
+#: ../camel/providers/imap/camel-imap-store.c:1776
+#: ../camel/providers/imap/camel-imap-store.c:1971
+#: ../camel/providers/imapx/camel-imapx-store.c:410
 #, c-format
 msgid "No such folder %s"
 msgstr "æ²?æ??é??å??è³?æ??å¤¾ %s"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1266
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1187
+#, c-format
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "å?¨é?¢ç·?æ¨¡å¼?ä¸ä¸?è?½å»ºç«? GroupWise è³?æ??å¤¾ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1280
-#: ../camel/providers/imap/camel-imap-store.c:1954
-#: ../camel/providers/imap/camel-imap-store.c:2334
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1196
+#, c-format
+msgid "Cannot create a special system folder"
+msgstr "ä¸?è?½å»ºç«?ç?¹æ®?ç??ç³»çµ±è³?æ??å¤¾"
+
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1206
+#: ../camel/providers/imap/camel-imap-store.c:1854
+#: ../camel/providers/imap/camel-imap-store.c:2276
+#: ../camel/providers/imapx/camel-imapx-store.c:873
+#, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "æ¯?è³?æ??å¤¾ä¸¦ä¸?å??è¨±å??å?«å?è³?æ??å¤¾"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1289
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1314
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
 msgstr "ä¸?è?½å°? GroupWise è³?æ??å¤¾ã??%sã??é??æ?°å?½å??ç?ºã??%sã??"
 
 # shell/e-shortcuts-view.c:137
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1414
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1348
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:54
 #, c-format
 msgid "GroupWise server %s"
 msgstr "GroupWise ä¼ºæ??å?¨ %s"
 
 # camel/camel-remote-store.c:195
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1416
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1350
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "%s ç?? GroupWise æ??å??æ?¼ %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:536
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:122
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:58
 #, c-format
 msgid "GroupWise mail delivery via %s"
 msgstr "ç¶?ç?± %s å?³é?? GroupWise é?µä»¶"
 
 # mail/mail-ops.c:603
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:164
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:95
 msgid "Sending Message"
 msgstr "æ£å?¨å?³é??é?µä»¶"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:212
+# camel/providers/local/camel-mbox-folder.c:152
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:105
+#, c-format
+msgid "Cannot get folder: Invalid operation on this store"
+msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ï¼?å?¨æ¤å?²å?ç©ºé??ä¸?ç?¡æ??ç??æ??ä½?"
+
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:152
+#, c-format
 msgid ""
 "You have exceeded this account's storage limit. Your messages are queued in "
 "your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
@@ -3247,93 +3426,20 @@ msgid ""
 msgstr "ä½ å·²ç¶?è¶?é??é??å??å¸³è??ç??å?²å?é??å?¶ã??ä½ ç??é?µä»¶æ??å??å?å?¨å¯?ä»¶å?£ä¸ã??è«?å??å?ªé?¤/å°?å?ä½ ç??é?µä»¶å¾?å??æ?? å?³é??/æ?¥æ?¶ é??æ?°å¯?é??ã??\n"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:150
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:207
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
 #, c-format
 msgid "Could not send message: %s"
 msgstr "é?µä»¶ç?¡æ³?å?³é??ï¼? %s"
 
-# camel/providers/imap/camel-imap-provider.c:43
-# mail/mail-config.glade.h:13
-#: ../camel/providers/hula/camel-hula-provider.c:48
-#: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
-msgid "Checking for New Mail"
-msgstr "æª¢æ?¥æ?°é?µä»¶"
-
-# mail/mail-config.c:1213
-# mail/mail-config.c:1216
-#: ../camel/providers/hula/camel-hula-provider.c:53
-#: ../camel/providers/imap/camel-imap-provider.c:52
-#: ../camel/providers/imapx/camel-imapx-provider.c:54
-msgid "Connection to Server"
-msgstr "é?£ç·?å?°ä¼ºæ??å?¨"
-
-# camel/providers/imap/camel-imap-store.c:531
-#: ../camel/providers/hula/camel-hula-provider.c:55
-#: ../camel/providers/imap/camel-imap-provider.c:54
-#: ../camel/providers/imapx/camel-imapx-provider.c:56
-msgid "_Use custom command to connect to server"
-msgstr "ä½¿ç?¨è?ªé?¸æ??ä»¤ä¾?é?£ç·?å?°ä¼ºæ??å?¨(_U)"
-
-# addressbook/contact-editor/e-contact-editor.c:1248
-#: ../camel/providers/hula/camel-hula-provider.c:57
-#: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:58
-msgid "Command:"
-msgstr "æ??ä»¤ï¼?"
-
-# camel/providers/imap/camel-imap-provider.c:48
-# shell/e-shell-view.c:552
-#: ../camel/providers/hula/camel-hula-provider.c:60
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:43
-#: ../camel/providers/imapx/camel-imapx-provider.c:64
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid "Folders"
-msgstr "è³?æ??å¤¾"
-
-# camel/providers/imap/camel-imap-provider.c:50
-#: ../camel/providers/hula/camel-hula-provider.c:62
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:45
-#: ../camel/providers/imapx/camel-imapx-provider.c:66
-msgid "_Show only subscribed folders"
-msgstr "å?ªé¡¯ç¤ºå·²è¨?é?±ç??è³?æ??å¤¾(_S)"
-
-# camel/providers/imap/camel-imap-provider.c:52
-#: ../camel/providers/hula/camel-hula-provider.c:64
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:47
-#: ../camel/providers/imapx/camel-imapx-provider.c:68
-msgid "O_verride server-supplied folder namespace"
-msgstr "è¦?è??ä¼ºæ??å?¨æ??ä¾?ä¹?è³?æ??å¤¾ç??å?½å??ç©ºé??(_V)"
-
-# camel/providers/imap/camel-imap-provider.c:54
-#: ../camel/providers/hula/camel-hula-provider.c:66
-msgid "Namespace"
-msgstr "å?½å??ç©ºé??"
-
-#: ../camel/providers/hula/camel-hula-provider.c:76
-msgid "Hula"
-msgstr "Hula"
-
-#: ../camel/providers/hula/camel-hula-provider.c:78
-msgid "For accessing Hula servers"
-msgstr "ç?¨æ?¼å?å?? Hula ä¼ºæ??å?¨"
-
-# camel/providers/imap/camel-imap-provider.c:82
-#: ../camel/providers/hula/camel-hula-provider.c:95
-msgid "This option will connect to the Hula server using a plaintext password."
-msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨ç°¡æ??ç??å¯?ç¢¼é?£ç·?è?³ Hula ä¼ºæ??å?¨ã??"
-
-#: ../camel/providers/imap/camel-imap-command.c:181
-#: ../camel/providers/imap/camel-imap-command.c:265
+#: ../camel/providers/imap/camel-imap-command.c:190
+#: ../camel/providers/imap/camel-imap-command.c:288
+#, c-format
 msgid "No output stream"
 msgstr "æ²?æ??è¼¸å?ºä¸²æµ?"
 
-#: ../camel/providers/imap/camel-imap-command.c:186
-#: ../camel/providers/imap/camel-imap-command.c:270
+#: ../camel/providers/imap/camel-imap-command.c:198
+#: ../camel/providers/imap/camel-imap-command.c:296
+#, c-format
 msgid "No input stream"
 msgstr "æ²?æ??è¼¸å?¥ä¸²æµ?"
 
@@ -3341,16 +3447,13 @@ msgstr "æ²?æ??è¼¸å?¥ä¸²æµ?"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: ../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:3105
+#: ../camel/providers/imap/camel-imap-command.c:245
+#, c-format
 msgid "Operation cancelled"
 msgstr "æ??ä½?ç¨?åº?å·²å??æ¶?"
 
 # camel/camel-remote-store.c:476
-#: ../camel/providers/imap/camel-imap-command.c:331
-#: ../camel/providers/imap/camel-imap-store.c:3110
+#: ../camel/providers/imap/camel-imap-command.c:353
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "ä¼ºæ??å?¨çª?ç?¶ä¸æ?·é?£ç·?ï¼? %s"
@@ -3358,7 +3461,7 @@ msgstr "ä¼ºæ??å?¨çª?ç?¶ä¸æ?·é?£ç·?ï¼? %s"
 # camel/providers/imap/camel-imap-command.c:232
 #. 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
+#: ../camel/providers/imap/camel-imap-command.c:373
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -3368,71 +3471,57 @@ msgstr ""
 "%s"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: ../camel/providers/imap/camel-imap-command.c:421
+#: ../camel/providers/imap/camel-imap-command.c:444
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "å¾? IMAP ä¼ºæ??å?¨å?³å??ä¸?ç?¶ç??å??æ??ï¼? %s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/imap/camel-imap-command.c:431
+#: ../camel/providers/imap/camel-imap-command.c:456
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP æ??ä»¤å¤±æ??ï¼? %s"
 
 # camel/providers/imap/camel-imap-command.c:295
-#: ../camel/providers/imap/camel-imap-command.c:506
+#: ../camel/providers/imap/camel-imap-command.c:532
+#, c-format
 msgid "Server response ended too soon."
 msgstr "ä¼ºæ??å?¨å¤ªæ?©å?³å??çµ?æ??ç??å??æ??ã??"
 
 # camel/providers/imap/camel-imap-command.c:487
-#: ../camel/providers/imap/camel-imap-command.c:712
+#: ../camel/providers/imap/camel-imap-command.c:740
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP ä¼ºæ??å?¨ç??å??æ??æ²?æ??å??å?« %s è³?è¨?"
 
 # camel/providers/imap/camel-imap-command.c:524
-#: ../camel/providers/imap/camel-imap-command.c:748
+#: ../camel/providers/imap/camel-imap-command.c:778
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "å¾? IMAP ä¼ºæ??å?¨å?³å??ä¸?ç?¶ç?? OK å??æ??ï¼? %s"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/providers/imap/camel-imap-folder.c:90
+#: ../camel/providers/imap/camel-imap-folder.c:281
 msgid "Always check for new mail in this folder"
 msgstr "æ°¸é? æª¢æ?¥é??å??è³?æ??å¤¾ä¸æ?¯å?¦æ??æ?°é?µä»¶"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/providers/imap/camel-imap-folder.c:276
+#: ../camel/providers/imap/camel-imap-folder.c:353
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "ç?¡æ³?å»ºç«?ç?®é?? %sï¼?%s"
 
 # mail/mail-ops.c:1649
-#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:918
-#: ../camel/providers/imapx/camel-imapx-server.c:2758
+#: ../camel/providers/imap/camel-imap-folder.c:960
+#: ../camel/providers/imapx/camel-imapx-server.c:3759
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "æ??æ?? %s ä¸æ?´æ?¹é??ç??é?µä»¶"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1986
-#, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr "å?¨ APPEND æ??ä»¤å¾?å?³å??æ?ªé ?æ??ç??å??æ??ç??æ??ã??%sã??"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2001
-msgid "No response on continuation after APPEND command"
-msgstr "å?¨ APPEND æ??ä»¤å¾?æ²?æ??æ??çº?å??æ??"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2046
-msgid "Unknown error occurred during APPEND command!"
-msgstr "å?¨ APPEND æ??ä»¤æ??é??ç?¼ç??æ?ªç?¥ç??é?¯èª¤ï¼?"
-
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: ../camel/providers/imap/camel-imap-folder.c:2877
-#, c-format
-msgid "Unable to retrieve message: %s"
-msgstr "ç?¡æ³?å¾?å??å??é?µä»¶ï¼? %s"
+#: ../camel/providers/imap/camel-imap-folder.c:3231
+msgid "Unable to retrieve message: "
+msgstr "ç?¡æ³?å??å??é?µä»¶ï¼?"
 
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-maildir-folder.c:209
@@ -3441,7 +3530,8 @@ msgstr "ç?¡æ³?å¾?å??å??é?µä»¶ï¼? %s"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/imap/camel-imap-folder.c:2912
+#: ../camel/providers/imap/camel-imap-folder.c:3266
+#: ../camel/providers/imapx/camel-imapx-server.c:4956
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "ç?¡æ³?å??å¾?é?µä»¶ ID ç?º %s ç??é?µä»¶ï¼? %s"
@@ -3449,229 +3539,273 @@ msgstr "ç?¡æ³?å??å¾?é?µä»¶ ID ç?º %s ç??é?µä»¶ï¼? %s"
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-mbox-folder.c:319
 # camel/providers/local/camel-mh-folder.c:185
-#: ../camel/providers/imap/camel-imap-folder.c:2913
+#: ../camel/providers/imap/camel-imap-folder.c:3267
+#: ../camel/providers/imapx/camel-imapx-server.c:4957
 msgid "No such message available."
 msgstr "æ²?æ??é??å??é?µä»¶ã??"
 
 # camel/providers/imap/camel-imap-folder.c:1047
 # camel/providers/imap/camel-imap-folder.c:1281
-#: ../camel/providers/imap/camel-imap-folder.c:2974
-#: ../camel/providers/imap/camel-imap-folder.c:3819
-#: ../camel/providers/nntp/camel-nntp-folder.c:236
+#: ../camel/providers/imap/camel-imap-folder.c:3337
+#: ../camel/providers/imap/camel-imap-folder.c:4203
+#: ../camel/providers/nntp/camel-nntp-folder.c:326
+#, c-format
 msgid "This message is not currently available"
 msgstr "é??å°?é?µä»¶ç?®å??ä»?æ?ªå?¯ç?¨"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3632
+#: ../camel/providers/imap/camel-imap-folder.c:4013
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "ä¸?å®?æ?´ç??ä¼ºæ??å?¨å??æ??ï¼?æ?ªæ??ä¾?ä»»ä½?è³?è¨?çµ¦è¨?æ?¯ %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3640
+#: ../camel/providers/imap/camel-imap-folder.c:4023
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "ä¸?å®?æ?´ç??ä¼ºæ??å?¨å??æ??ï¼?æ?ªæ??ä¾? UID çµ¦è¨?æ?¯ %d"
 
 # camel/providers/imap/camel-imap-folder.c:1075
 # camel/providers/imap/camel-imap-folder.c:1314
-#: ../camel/providers/imap/camel-imap-folder.c:3857
+#: ../camel/providers/imap/camel-imap-folder.c:4243
+#, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "å?¨ FETCH ç??å??æ??å?§æ?¾ä¸?å?°é?µä»¶ç??å?§æ??ã??"
 
 # camel/providers/imap/camel-imap-message-cache.c:150
-#: ../camel/providers/imap/camel-imap-message-cache.c:181
-#: ../camel/providers/imap/camel-imap-message-cache.c:244
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "ç?¡æ³?é??å??å¿«å??ç?®é??ï¼?%s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:193
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
+msgid "Could not open cache directory: "
+msgstr "ç?¡æ³?é??å??å¿«å??ç?®é??ï¼?"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../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
+#: ../camel/providers/imap/camel-imap-message-cache.c:326
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "å¿«å??é?µä»¶ %s å¤±æ??ï¼? %s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/providers/imap/camel-imap-message-cache.c:530
+#: ../camel/providers/imap/camel-imap-message-cache.c:388
+#, c-format
+msgid "Failed to cache message %s: "
+msgstr "å¿«å??é?µä»¶ %s å¤±æ??ï¼?"
+
+# camel/camel-filter-driver.c:670
+# camel/camel-filter-driver.c:679
+#: ../camel/providers/imap/camel-imap-message-cache.c:525
 #, c-format
-msgid "Failed to cache %s: %s"
-msgstr "å¿«å?? %s å¤±æ??ï¼? %s"
+msgid "Failed to cache %s: "
+msgstr "å¿«å?? %s å¤±æ??ï¼?"
+
+# camel/providers/imap/camel-imap-provider.c:43
+# mail/mail-config.glade.h:13
+#: ../camel/providers/imap/camel-imap-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:41
+msgid "Checking for New Mail"
+msgstr "æª¢æ?¥æ?°é?µä»¶"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:50
+#: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:49
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "æª¢æ?¥è¨?é?±è³?æ??å¤¾è£?ç??æ?°é?µä»¶(_E)"
 
+# mail/mail-config.c:1213
+# mail/mail-config.c:1216
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:53
+msgid "Connection to Server"
+msgstr "é?£ç·?å?°ä¼ºæ??å?¨"
+
+# camel/providers/imap/camel-imap-store.c:531
+#: ../camel/providers/imap/camel-imap-provider.c:50
+#: ../camel/providers/imapx/camel-imapx-provider.c:55
+msgid "_Use custom command to connect to server"
+msgstr "ä½¿ç?¨è?ªé?¸æ??ä»¤ä¾?é?£ç·?å?°ä¼ºæ??å?¨(_U)"
+
+# addressbook/contact-editor/e-contact-editor.c:1248
+#: ../camel/providers/imap/camel-imap-provider.c:52
+msgid "Co_mmand:"
+msgstr "æ??ä»¤(_M):"
+
+# camel/providers/imap/camel-imap-provider.c:48
+# shell/e-shell-view.c:552
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:63
+#: ../camel/providers/nntp/camel-nntp-provider.c:42
+msgid "Folders"
+msgstr "è³?æ??å¤¾"
+
+# camel/providers/imap/camel-imap-provider.c:50
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:65
+msgid "_Show only subscribed folders"
+msgstr "å?ªé¡¯ç¤ºå·²è¨?é?±ç??è³?æ??å¤¾(_S)"
+
+# camel/providers/imap/camel-imap-provider.c:52
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:68
+msgid "O_verride server-supplied folder namespace"
+msgstr "è¦?è??ä¼ºæ??å?¨æ??ä¾?ä¹?è³?æ??å¤¾ç??å?½å??ç©ºé??(_V)"
+
 # camel/providers/imap/camel-imap-provider.c:54
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:49
-#: ../camel/providers/imapx/camel-imapx-provider.c:70
-msgid "Namespace:"
-msgstr "å?½å??ç©ºé??"
+#: ../camel/providers/imap/camel-imap-provider.c:62
+msgid "Names_pace:"
+msgstr "å?½å??ç©ºé??(_P):"
 
 # camel/providers/imap/camel-imap-provider.c:57
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:53
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
 msgid "_Apply filters to new messages in INBOX on this server"
 msgstr "å¥?ç?¨é??æ¿¾æ¢?ä»¶è?³æ¤ä¼ºæ??å?¨æ?¶ä»¶å?£ç??æ?°é?µä»¶(_A)"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/providers/imap/camel-imap-provider.c:72
-#: ../camel/providers/imapx/camel-imapx-provider.c:76
+#: ../camel/providers/imap/camel-imap-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:77
 msgid "Check new messages for Jun_k contents"
 msgstr "æª¢æ?¥æ?°é?µä»¶ä¸æ?¯å?¦æ??å??å?¾é?µä»¶å?§å®¹(_K)"
 
 # mail/mail-config.glade.h:12
-#: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:59
-#: ../camel/providers/imapx/camel-imapx-provider.c:80
+#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:81
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "è?ªå??å°?é? ç«¯é?µä»¶å??æ¥å?°æ?¬å?°ç«¯(_Z)"
 
 # camel/providers/imap/camel-imap-provider.c:63
-#: ../camel/providers/imap/camel-imap-provider.c:83
+#: ../camel/providers/imap/camel-imap-provider.c:79
 msgid "IMAP"
 msgstr "IMAP"
 
 # camel/providers/imap/camel-imap-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:85
-#: ../camel/providers/imapx/camel-imapx-provider.c:90
+#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:91
 msgid "For reading and storing mail on IMAP servers."
 msgstr "ç?¨ä½?è®?å??å??å?²å?é?µä»¶æ?¼ IMAP ä¼ºæ??å?¨ã??"
 
 # camel/providers/imap/camel-imap-provider.c:82
-#: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapx/camel-imapx-provider.c:106
+#: ../camel/providers/imap/camel-imap-provider.c:99
+#: ../camel/providers/imapx/camel-imapx-provider.c:107
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨ç°¡æ??ç??å¯?ç¢¼é?£ç·?è?³ IMAP ä¼ºæ??å?¨ã??"
 
 # camel/providers/smtp/camel-smtp-transport.c:534
-#: ../camel/providers/imap/camel-imap-store.c:435
-#: ../camel/providers/imap4/camel-imap4-store.c:210
-#: ../camel/providers/imapx/camel-imapx-store.c:167
+#: ../camel/providers/imap/camel-imap-store.c:310
+#: ../camel/providers/imapx/camel-imapx-store.c:220
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP ä¼ºæ??å?¨ %s"
 
 # camel/camel-remote-store.c:195
-#: ../camel/providers/imap/camel-imap-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:212
-#: ../camel/providers/imapx/camel-imapx-store.c:169
+#: ../camel/providers/imap/camel-imap-store.c:312
+#: ../camel/providers/imapx/camel-imapx-store.c:222
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s ç?? IMAP æ??å??æ?¼ %s"
 
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
-#: ../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:192
-#: ../camel/providers/pop3/camel-pop3-store.c:206
-#: ../camel/providers/smtp/camel-smtp-transport.c:259
-#: ../camel/providers/smtp/camel-smtp-transport.c:274
+#: ../camel/providers/imap/camel-imap-store.c:446
+#: ../camel/providers/nntp/camel-nntp-store.c:234
+#: ../camel/providers/pop3/camel-pop3-store.c:132
+#: ../camel/providers/smtp/camel-smtp-transport.c:215
 #, c-format
 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/pop3/camel-pop3-store.c:193
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
+#: ../camel/providers/imap/camel-imap-store.c:447
+#: ../camel/providers/nntp/camel-nntp-store.c:235
+#: ../camel/providers/pop3/camel-pop3-store.c:133
+#: ../camel/providers/smtp/camel-smtp-transport.c:216
 msgid "SSL unavailable"
 msgstr "SSL ç?¡æ³?ä½¿ç?¨"
 
-# camel/camel-remote-store.c:252
-#: ../camel/providers/imap/camel-imap-store.c:578
-#: ../camel/providers/imap/camel-imap-store.c:860
-#: ../camel/providers/imapx/camel-imapx-server.c:2017
-msgid "Connection cancelled"
-msgstr "é?£ç·?å·²å??æ¶?"
+# camel/camel-remote-store.c:255
+# camel/providers/smtp/camel-smtp-transport.c:269
+#: ../camel/providers/imap/camel-imap-store.c:465
+#: ../camel/providers/nntp/camel-nntp-store.c:252
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "ç?¡æ³?é?£æ?¥å?° %sï¼?"
 
 # camel/providers/pop3/camel-pop3-store.c:379
-#: ../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
-#: ../camel/providers/imapx/camel-imapx-server.c:2057
-#: ../camel/providers/imapx/camel-imapx-server.c:2071
+#: ../camel/providers/imap/camel-imap-store.c:571
+#: ../camel/providers/imap/camel-imap-store.c:591
+#: ../camel/providers/imap/camel-imap-store.c:598
+#: ../camel/providers/imap/camel-imap-store.c:625
+#: ../camel/providers/imapx/camel-imapx-server.c:2827
+#: ../camel/providers/imapx/camel-imapx-server.c:2863
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "ä»¥å®?å?¨æ¨¡å¼?é?£ç·?å?° IMAP ä¼ºæ??å?¨ %s æ??å¤±æ??äº?ï¼? %s"
 
 # shell/e-storage.c:477
-#: ../camel/providers/imap/camel-imap-store.c:690
-#: ../camel/providers/imapx/camel-imapx-server.c:2058
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
+#: ../camel/providers/imap/camel-imap-store.c:572
+#: ../camel/providers/imapx/camel-imapx-server.c:2828
+#: ../camel/providers/smtp/camel-smtp-transport.c:295
 msgid "STARTTLS not supported"
 msgstr "ä¸?æ?¯æ?´ STARTTLS"
 
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
-#: ../camel/providers/imap/camel-imap-store.c:709
-#: ../camel/providers/imapx/camel-imapx-server.c:2072
+#: ../camel/providers/imap/camel-imap-store.c:592
+#: ../camel/providers/imapx/camel-imapx-server.c:2864
 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:599
+#: ../camel/providers/smtp/camel-smtp-transport.c:339
 msgid "SSL is not available in this build"
 msgstr "æ¤ä¸?ç??æ?¬ä¸¦æ?ªå??ç?¨ SSL"
 
+# camel/camel-remote-store.c:252
+#: ../camel/providers/imap/camel-imap-store.c:747
+#: ../camel/providers/imapx/camel-imapx-server.c:2647
+#, c-format
+msgid "Connection cancelled"
+msgstr "é?£ç·?å·²å??æ¶?"
+
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
-#: ../camel/providers/imap/camel-imap-store.c:863
+#: ../camel/providers/imap/camel-imap-store.c:752
+#: ../camel/providers/imapx/camel-imapx-server.c:2652
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "ç?¡æ³?ä»¥æ??ä»¤ã??%sã??é?£ç·?ï¼? %s"
 
 # mail/local-config.glade.h:8
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1051
-#: ../camel/providers/imap/camel-imap-store.c:2430
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:356
-#: ../camel/providers/imap4/camel-imap4-store.c:1403
-#: ../camel/providers/imapx/camel-imapx-store.c:349
-#: ../camel/providers/imapx/camel-imapx-store.c:578
-#: ../camel/providers/local/camel-maildir-folder.c:81
-#: ../camel/providers/local/camel-maildir-store.c:219
-#: ../camel/providers/local/camel-maildir-store.c:291
-#: ../camel/providers/local/camel-maildir-store.c:517
-#: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:461
+#: ../camel/providers/imap/camel-imap-store.c:945
+#: ../camel/providers/imap/camel-imap-store.c:2369
+#: ../camel/providers/imapx/camel-imapx-store.c:457
+#: ../camel/providers/imapx/camel-imapx-store.c:1054
+#: ../camel/providers/local/camel-maildir-folder.c:90
+#: ../camel/providers/local/camel-maildir-store.c:225
+#: ../camel/providers/local/camel-maildir-store.c:315
+#: ../camel/providers/local/camel-maildir-store.c:562
+#: ../camel/providers/local/camel-maildir-store.c:575
+#: ../camel/providers/local/camel-spool-store.c:508
 msgid "Inbox"
 msgstr "æ?¶ä»¶å?£"
 
 # camel/providers/imap/camel-imap-store.c:456
-#: ../camel/providers/imap/camel-imap-store.c:1303
+#: ../camel/providers/imap/camel-imap-store.c:1148
+#: ../camel/providers/imapx/camel-imapx-server.c:2930
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ä¼ºæ??å?¨ %s ä¸?æ?¯æ?´æ??è¦?æ±?ç??é©?è?é¡?å?? %s"
 
 # camel/providers/imap/camel-imap-store.c:466
 # camel/providers/smtp/camel-smtp-transport.c:366
-#: ../camel/providers/imap/camel-imap-store.c:1313
-#: ../camel/providers/smtp/camel-smtp-transport.c:506
+#: ../camel/providers/imap/camel-imap-store.c:1160
+#: ../camel/providers/imapx/camel-imapx-server.c:2942
+#: ../camel/providers/smtp/camel-smtp-transport.c:483
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "ä¸?æ?¯æ?´é©?è?é¡?å?? %s"
 
 # camel/providers/imap/camel-imap-store.c:531
-#: ../camel/providers/imap/camel-imap-store.c:1387
+#: ../camel/providers/imap/camel-imap-store.c:1239
+#: ../camel/providers/imapx/camel-imapx-server.c:3012
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3682,9 +3816,9 @@ msgstr ""
 "%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
+#: ../camel/providers/imap/camel-imap-store.c:1790
+#: ../camel/providers/imap/camel-imap-store.c:2212
+#: ../camel/providers/imapx/camel-imapx-store.c:852
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -3692,540 +3826,224 @@ msgstr "è³?æ??å¤¾å??ç¨±ã??%sã??ç?¡æ??ï¼?å? ç?ºå®?å??æ?¬å?ç¬¦ã??%cã??"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap/camel-imap-store.c:2008
-#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:202
-#: ../camel/providers/local/camel-mh-store.c:249
+#: ../camel/providers/imap/camel-imap-store.c:1906
+#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-mbox-store.c:193
+#: ../camel/providers/local/camel-mh-store.c:255
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?è³?æ??å¤¾å·²å?å?¨ã??"
 
 # camel/providers/local/camel-mbox-summary.c:879
-#: ../camel/providers/imap/camel-imap-store.c:2283
+#: ../camel/providers/imap/camel-imap-store.c:2225
+#: ../camel/providers/imapx/camel-imapx-store.c:863
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "ä¸?æ??ç??æ¯?è³?æ??å¤¾ï¼? %s"
 
 # camel/camel-remote-store.c:476
-#: ../camel/providers/imap/camel-imap-store.c:3107
+#: ../camel/providers/imap/camel-imap-store.c:3081
+#, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "ä¼ºæ??å?¨çª?ç?¶ä¸æ?·é?£ç·?"
 
-# camel/providers/pop3/camel-pop3-store.c:199
-#: ../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/imap/camel-imap-command.c:232
-#: ../camel/providers/imap4/camel-imap4-command.c:681
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "IMAP4 ä¼ºæ??å?¨ %s é??é ?æ??ç??å??æ??ï¼?%s"
-
-# camel/providers/imap/camel-imap-command.c:232
-#: ../camel/providers/imap4/camel-imap4-engine.c:215
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "IMAP ä¼ºæ??å?¨ %s é??é ?æ??ç??å??å??èª?ã??"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/imap4/camel-imap4-engine.c:440
-#, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr "ç?¡æ³?é?¸å??è³?æ??å¤¾ã??%sã??ï¼?ç?¡æ??ç??ä¿¡ç®±å??ç¨±"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-engine.c:446
-#, c-format
-msgid "Cannot select folder '%s': Bad command"
-msgstr "ç?¡æ³?é?¸å??è³?æ??å¤¾ã??%sã??ï¼?é?¯èª¤ç??æ??ä»¤"
-
-# camel/providers/pop3/camel-pop3-store.c:199
-#: ../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/camel-remote-store.c:476
-#: ../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:87
-msgid ""
-"Enable extended Mailing-List detection required for some filter and vFolder "
-"rules"
-msgstr "å??ç?¨æ??äº?é??æ¿¾å?¨å??è??æ?¬è³?æ??å¤¾è¦?å??æ??è¦?æ±?ç??é??ä¿¡è«?å£?å?µæ¸¬"
-
-#: ../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/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-folder.c:427
-#, c-format
-msgid "Cannot access folder '%s': %s"
-msgstr "ä¸?è?½å?å??è³?æ??å¤¾ã??%sã??ï¼?%s"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-folder.c:484
-#, c-format
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr "ä¸?è?½å??æ¥æ??æ¨?è?³è³?æ??å¤¾ã??%sã??ï¼?æ?ªç?¥ç??é?¯èª¤"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-folder.c:490
-#, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr "ä¸?è?½å??æ¥æ??æ¨?è?³è³?æ??å¤¾ã??%sã??ï¼?é?¯èª¤ç??æ??ä»¤"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-folder.c:630
-#, c-format
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "ä¸?è?½æ¸?ç©ºè³?æ??å¤¾ã??%sã??ï¼?æ?ªç?¥ç??é?¯èª¤"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-folder.c:635
-#, c-format
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "ä¸?è?½æ¸?ç©ºè³?æ??å¤¾ã??%sã??ï¼?é?¯èª¤ç??æ??ä»¤"
-
-# camel/providers/local/camel-mbox-folder.c:335
-# camel/providers/local/camel-mbox-folder.c:367
-# camel/providers/local/camel-mbox-folder.c:380
-#: ../camel/providers/imap4/camel-imap4-folder.c:891
-#, c-format
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr "ä¸?è?½å??å¾?å¾?è³?æ??å¤¾ã??%2$sã??å??å¾?é?µä»¶ %1$sï¼?æ²?æ??æ¤é?µä»¶"
-
-# camel/providers/local/camel-mbox-folder.c:335
-# camel/providers/local/camel-mbox-folder.c:367
-# camel/providers/local/camel-mbox-folder.c:380
-#: ../camel/providers/imap4/camel-imap4-folder.c:896
-#, c-format
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr "ä¸?è?½å??å¾?å¾?è³?æ??å¤¾ã??%2$sã??å??å¾?é?µä»¶ %1$sï¼?é?¯èª¤ç??æ??ä»¤"
-
-# camel/providers/local/camel-mh-folder.c:149
-# camel/providers/local/camel-mh-folder.c:157
-#: ../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/local/camel-mh-folder.c:149
-# camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/imap4/camel-imap4-folder.c:1033
-#, c-format
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "ä¸?è?½å°?é?µä»¶é??å? å?°è³?æ??å¤¾ã??%sã??ï¼?æ?ªç?¥ç??é?¯èª¤"
-
-# camel/providers/local/camel-mh-folder.c:149
-# camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/imap4/camel-imap4-folder.c:1063
-#, c-format
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr "ä¸?è?½å°?é?µä»¶é??å? å?°è³?æ??å¤¾ã??%sã??ï¼?é?¯èª¤ç??æ??ä»¤"
-
-# camel/providers/local/camel-mbox-folder.c:335
-# camel/providers/local/camel-mbox-folder.c:367
-# camel/providers/local/camel-mbox-folder.c:380
-#: ../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/local/camel-mbox-folder.c:335
-# camel/providers/local/camel-mbox-folder.c:367
-# camel/providers/local/camel-mbox-folder.c:380
-#: ../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/local/camel-mbox-folder.c:335
-# camel/providers/local/camel-mbox-folder.c:367
-# camel/providers/local/camel-mbox-folder.c:380
-#: ../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/imap/camel-imap-store.c:3084
+msgid "Server unexpectedly disconnected: "
+msgstr "ä¼ºæ??å?¨çª?ç?¶ä¸æ?·é?£ç·?ï¼?"
 
-# camel/providers/local/camel-mbox-folder.c:335
-# camel/providers/local/camel-mbox-folder.c:367
-# camel/providers/local/camel-mbox-folder.c:380
-#: ../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/imap/camel-imap-provider.c:45
-#: ../camel/providers/imap4/camel-imap4-provider.c:55
-msgid "Check new messages for _Junk contents"
-msgstr "æª¢æ?¥æ?°é?µä»¶ä¸æ?¯å?¦æ??å??å?¾é?µä»¶(_J)"
-
-# camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/providers/imap4/camel-imap4-provider.c:57
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "å?ªæª¢æ?¥ã??æ?¶ä»¶å?£ã??è³?æ??å¤¾ä¸ç??ã??å??å?¾é?µä»¶ã??(_G)"
-
-# mail/mail-config.glade.h:34
-#: ../camel/providers/imap4/camel-imap4-provider.c:66
-msgid "IMAP4rev1"
-msgstr "IMAP4rev1"
-
-# camel/providers/imap/camel-imap-provider.c:65
-#: ../camel/providers/imap4/camel-imap4-provider.c:68
-msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr "ç?¨ä½?è®?å??å??å?²å? IMAPv4rev1 ä¼ºæ??å?¨ç??é?µä»¶ã??"
-
-# camel/providers/imap/camel-imap-provider.c:82
-#: ../camel/providers/imap4/camel-imap4-provider.c:85
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "æ¤é?¸é ?æ??ä½¿ç?¨ç´?æ??å?å¯?ç¢¼ï¼?é?£ç·?å?° IMAPv4rev1 ä¼ºæ??å?¨ã??"
-
-# camel/camel-remote-store.c:252
-#: ../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:203
-#: ../camel/providers/smtp/camel-smtp-transport.c:271
-msgid "Connection canceled"
-msgstr "é?£ç·?å·²å??æ¶?"
-
-# camel/providers/pop3/camel-pop3-store.c:379
-#: ../camel/providers/imap4/camel-imap4-store.c:296
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "ä»¥å®?å?¨æ¨¡å¼?é?£ç·?å?° IMAP ä¼ºæ??å?¨ %s æ??å¤±æ??äº?ï¼? ä¼ºæ??å?¨ä¸?æ?¯æ?´ STARTTLS"
-
-# camel/camel-sasl-anonymous.c:110
-# camel/camel-sasl-plain.c:87
-#: ../camel/providers/imap4/camel-imap4-store.c:326
-#: ../camel/providers/pop3/camel-pop3-store.c:275
-msgid "TLS negotiations failed"
-msgstr "TLS å??å??å¤±æ??"
-
-# camel/providers/pop3/camel-pop3-store.c:409
-#: ../camel/providers/imap4/camel-imap4-store.c:411
+# camel/providers/imap/camel-imap-folder.c:191
+#: ../camel/providers/imapx/camel-imapx-folder.c:75
 #, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr "ç?¡æ³?é©?è? IMAP ä¼ºæ??å?¨ %s (ä½¿ç?¨ %s é©?è?æ©?å?¶)"
+msgid "Could not create folder summary for %s"
+msgstr "ç?¡æ³?å»ºç«? %s ç??è³?æ??å¤¾æ??è¦?"
 
-# camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/imap4/camel-imap4-store.c:534
+# camel/providers/local/camel-mbox-store.c:110
+#: ../camel/providers/imapx/camel-imapx-folder.c:83
 #, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "ç?¡æ³?é©?è? IMAP ä¼ºæ??å?¨ %s (ä½¿ç?¨ %s)"
+msgid "Could not create cache for %s: "
+msgstr "ç?¡æ³?å»ºç«? %s ç??å¿«å??ï¼?"
 
-# camel/providers/local/camel-mbox-folder.c:152
-#: ../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/imapx/camel-imapx-provider.c:43
+msgid "Use _Quick Resync if the server supports it"
+msgstr "å¦?æ??ä¼ºæ??å?¨æ?¯æ?´å??ä½¿ç?¨å¿«é??é??æ?°å??æ¥(_Q)"
 
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-store.c:736
-#, c-format
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr "ä¸?è?½å¾? IMAP ä¼ºæ??å?¨ %2$s å??å¾?è³?æ??å¤¾ã??%1$sã??ï¼?æ?ªç?¥ç??é?¯èª¤"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:816
-#, c-format
-msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-msgstr "ä¸?è?½å¾? IMAP ä¼ºæ??å?¨ %2$s å??å¾?ã??%1$sã??ç?? LIST è³?è¨? ï¼?%3$s"
+#: ../camel/providers/imapx/camel-imapx-provider.c:45
+msgid "Use I_dle if the server supports it"
+msgstr "å¦?æ??ä¼ºæ??å?¨æ?¯æ?´å??ä½¿ç?¨é??ç½®(_D)"
 
 # addressbook/contact-editor/e-contact-editor.c:1248
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-msgid "Bad command"
-msgstr "é?¯èª¤ç??æ??ä»¤"
-
-# camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/imap4/camel-imap4-store.c:897
-#, c-format
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?ç?¡æ??ç??ä¿¡ç®±å??ç¨±"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-store.c:902
-#, c-format
-msgid "Cannot create folder '%s': Bad command"
-msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?é?¯èª¤ç??æ??ä»¤"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/imap4/camel-imap4-store.c:1008
-#, c-format
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "ä¸?è?½å?ªé?¤è³?æ??å¤¾ã??%sã??ï¼?ç?¹æ®?ç??è³?æ??å¤¾"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/imap4/camel-imap4-store.c:1015
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr "å?¨é?¢ç·?æ¨¡å¼?ä¸ç?¡æ³?å?ªé?¤ IMAP è³?æ??å¤¾ã??"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/imap4/camel-imap4-store.c:1074
-#, c-format
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "ä¸?è?½å?ªé?¤è³?æ??å¤¾ã??%sã??ï¼?ç?¡æ??ç??ä¿¡ç®±å??ç¨±"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
-#, c-format
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "ä¸?è?½å?ªé?¤è³?æ??å¤¾ã??%sã??ï¼?é?¯èª¤ç??æ??ä»¤"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/imap4/camel-imap4-store.c:1099
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "ä¸?è?½å°?è³?æ??å¤¾ã??%sã??é??æ?°å?½å??ç?ºã??%sã??ï¼?ç?¹æ®?ç??è³?æ??å¤¾"
-
-# camel/providers/local/camel-local-store.c:237
-#: ../camel/providers/imap4/camel-imap4-store.c:1106
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "å?¨é?¢ç·?æ¨¡å¼?ä¸ç?¡æ³?é??æ?°å?½å?? IMAP è³?æ??å¤¾ã??"
-
-# camel/providers/local/camel-mbox-summary.c:655
-#: ../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/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../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 "ç?¡æ³?æ?¼ IMAP ä¼ºæ??å?¨ %3$s å??å¾?æ¨£å¼?ã??%2$sã??ç?? %1$s è³?è¨?ï¼?%4$s"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-store.c:1633
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "å?¨é?¢ç·?æ¨¡å¼?ä¸ç?¡æ³?è¨?é?± IMAP è³?æ??å¤¾ã??"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/imap4/camel-imap4-store.c:1678
-#, c-format
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr "ä¸?è?½è¨?é?±è³?æ??å¤¾ã??%sã??ï¼?ç?¡æ??ç??ä¿¡ç®±å??ç¨±"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, c-format
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "ä¸?è?½è¨?é?±è³?æ??å¤¾ã??%sã??ï¼?é?¯èª¤ç??æ??ä»¤"
+#: ../camel/providers/imapx/camel-imapx-provider.c:57
+msgid "Command:"
+msgstr "æ??ä»¤ï¼?"
 
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-store.c:1705
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr "å?¨é?¢ç·?æ¨¡å¼?ä¸ç?¡æ³?å??æ¶?è¨?é?± IMAP è³?æ??å¤¾ã??"
+#: ../camel/providers/imapx/camel-imapx-provider.c:59
+msgid "Numbe_r of cached connections to use"
+msgstr "è¦?ä½¿ç?¨ç??å¿«å??é?£ç·?æ?¸é??(_R)"
 
-# camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/imap4/camel-imap4-store.c:1750
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr "ä¸?è?½å??æ¶?è¨?é?±è³?æ??å¤¾ã??%sã??ï¼?ç?¡æ??ç??ä¿¡ç®±å??ç¨±"
+# camel/providers/imap/camel-imap-provider.c:54
+#: ../camel/providers/imapx/camel-imapx-provider.c:70
+msgid "Namespace:"
+msgstr "å?½å??ç©ºé??"
 
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr "ä¸?è?½å??æ¶?è¨?é?±è³?æ??å¤¾ã??%sã??ï¼?é?¯èª¤ç??æ??ä»¤"
+# camel/providers/imap/camel-imap-provider.c:63
+#: ../camel/providers/imapx/camel-imapx-provider.c:89
+msgid "IMAP+"
+msgstr "IMAP"
 
-# mail/mail-ops.c:1649
-#: ../camel/providers/imap4/camel-imap4-summary.c:1590
-msgid "Scanning for changed messages"
-msgstr "æ??æ??å·²æ?´æ?¹ç??é?µä»¶"
+# camel/camel-movemail.c:256
+#: ../camel/providers/imapx/camel-imapx-server.c:1365
+msgid "Error writing to cache stream: "
+msgstr "å¯«å?¥å¿«å??ä¸²æµ?æ??ç?¼ç??é?¯èª¤ï¼?"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1611
+# camel/providers/pop3/camel-pop3-store.c:199
+#: ../camel/providers/imapx/camel-imapx-server.c:2007
 #, c-format
-msgid "IMAP server %s is in an inconsistent state."
-msgstr "IMAP ä¼ºæ??å?¨ %s è??æ?¼ä¸?å??èª¿ç??ç??æ??ã??"
+msgid "Not authenticated"
+msgstr "å°?æ?ªé©?è?"
 
-# mail/mail-ops.c:992
-#: ../camel/providers/imap4/camel-imap4-summary.c:1638
-msgid "Fetching envelopes of new messages"
-msgstr "å??å¾?æ?°é?µä»¶ç??å°?å¥?"
-
-# camel/providers/imap/camel-imap-command.c:232
-#: ../camel/providers/imap4/camel-imap4-utils.c:429
+# camel/camel-remote-store.c:255
+# camel/providers/smtp/camel-smtp-transport.c:269
+#: ../camel/providers/imapx/camel-imapx-server.c:2755
 #, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "IMAP ä¼ºæ??å?¨ %s ç??å??æ??ç?¼ç??æ??å¤?ï¼? "
+msgid "Could not connect to %s (port %s): "
+msgstr "ç?¡æ³?é?£ç·?è?³ %s (å? è?? %s)ï¼?"
 
-# ui/evolution-tasks.xml.h:3
-#: ../camel/providers/imap4/camel-imap4-utils.c:452
-msgid "No data"
-msgstr "æ²?æ??è³?æ??"
+# camel/camel-remote-store.c:337
+# camel/camel-remote-store.c:399
+# camel/camel-remote-store.c:470
+# camel/providers/imap/camel-imap-command.c:287
+#: ../camel/providers/imapx/camel-imapx-server.c:3184
+msgid "Closing tmp stream failed: "
+msgstr "ç?¡æ³?é??é?? tmp ä¸²æµ?ï¼?"
 
-# camel/camel-remote-store.c:476
-#: ../camel/providers/imap4/camel-imap4-utils.c:613
+# camel/providers/local/camel-maildir-folder.c:197
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:217
+# camel/providers/local/camel-mbox-folder.c:319
+# camel/providers/local/camel-mh-folder.c:185
+# camel/providers/local/camel-mh-folder.c:194
+# camel/providers/local/camel-mh-folder.c:202
+#: ../camel/providers/imapx/camel-imapx-server.c:5080
 #, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "IMAP ä¼ºæ??å?¨ %s æ??å¤?ä¸æ?·é?£ç·?ï¼?%s"
+msgid "Cannot create spool file: %s"
+msgstr "ä¸?è?½å»ºç«?æ??ç¨?å?¨æª?æ¡?ï¼?%s"
 
-# camel/providers/imap/camel-imap-folder.c:191
-#: ../camel/providers/imapx/camel-imapx-folder.c:84
-#, c-format
-msgid "Could not create folder summary for %s"
-msgstr "ç?¡æ³?å»ºç«? %s ç??è³?æ??å¤¾æ??è¦?"
+# camel/providers/local/camel-maildir-folder.c:197
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:217
+# camel/providers/local/camel-mbox-folder.c:319
+# camel/providers/local/camel-mh-folder.c:185
+# camel/providers/local/camel-mh-folder.c:194
+# camel/providers/local/camel-mh-folder.c:202
+#: ../camel/providers/imapx/camel-imapx-server.c:5095
+msgid "Cannot create spool file: "
+msgstr "ä¸?è?½å»ºç«?æ??ç¨?å?¨æª?æ¡?ï¼?"
 
-# camel/providers/local/camel-mbox-store.c:110
-#: ../camel/providers/imapx/camel-imapx-folder.c:92
+# camel/providers/imap/camel-imap-store.c:803
+# mail/mail-local.c:334
+#: ../camel/providers/imapx/camel-imapx-store.c:426
+#: ../camel/providers/nntp/camel-nntp-store.c:1529
 #, c-format
-msgid "Could not create cache for %s"
-msgstr "ç?¡æ³?å»ºç«? %s ç??å¿«å??"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
-msgid "Use I_dle if the server supports it"
-msgstr "å¦?æ??ä¼ºæ??å?¨æ?¯æ?´å??ä½¿ç?¨é??ç½®(_D)"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:60
-msgid "Numbe_r of cached connections to use"
-msgstr "è¦?ä½¿ç?¨ç??å¿«å??é?£ç·?æ?¸é??(_R)"
-
-# camel/providers/imap/camel-imap-provider.c:63
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
-msgid "IMAP+"
-msgstr "IMAP"
+msgid "No such folder: %s"
+msgstr "æ²?æ??é??å??è³?æ??å¤¾ï¼? %s"
 
-# camel/camel-remote-store.c:255
-# camel/providers/smtp/camel-smtp-transport.c:269
-#: ../camel/providers/imapx/camel-imapx-server.c:2020
+#: ../camel/providers/imapx/camel-imapx-stream.c:71
 #, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "ç?¡æ³?é?£ç·?è?³ %s (å? è?? %s)ï¼? %s"
+msgid "Source stream returned no data"
+msgstr "ä¾?æº?ä¸²æµ?å?³å??ç?¡è³?æ??"
 
-# camel/providers/pop3/camel-pop3-store.c:361
-#: ../camel/providers/imapx/camel-imapx-server.c:2100
+#: ../camel/providers/imapx/camel-imapx-stream.c:80
 #, c-format
-msgid "%sPlease enter the IMAP password for %s %s"
-msgstr "%sè«?è¼¸å?¥ %s %s ç?? IMAP å¯?ç¢¼"
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-# addressbook/gui/widgets/e-addressbook-view.c:613
-#: ../camel/providers/local/camel-local-folder.c:178
-msgid "Index message body data"
-msgstr "å?³é??é?µä»¶çµ¦è?¯çµ¡äºº"
+msgid "Source stream unavailable"
+msgstr "ä¾?æº?ä¸²æµ?ç?¡æ³?ä½¿ç?¨"
 
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:395
+#: ../camel/providers/local/camel-local-folder.c:199
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 # camel/providers/local/camel-mbox-folder.c:203
-#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:399
-#: ../camel/providers/local/camel-local-folder.c:402
+#: ../camel/providers/local/camel-local-folder.c:209
+#: ../camel/providers/local/camel-local-folder.c:218
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "ä¿¡ç®±ï¼?%s (%s)"
 
-#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:406
+#: ../camel/providers/local/camel-local-folder.c:227
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-provider.c:48
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+# addressbook/gui/widgets/e-addressbook-view.c:613
+#: ../camel/providers/local/camel-local-folder.c:272
+msgid "Index message body data"
+msgstr "å?³é??é?µä»¶çµ¦è?¯çµ¡äºº"
+
+# camel/providers/local/camel-mbox-folder.c:335
+# camel/providers/local/camel-mbox-folder.c:367
+# camel/providers/local/camel-mbox-folder.c:380
+#: ../camel/providers/local/camel-local-folder.c:683
+#, c-format
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
+msgstr ""
+"ä¸?è?½å¾?è³?æ??å¤¾ %2$s å??å¾?é?µä»¶ %1$s \n"
+"%3$s"
+
+#: ../camel/providers/local/camel-local-provider.c:44
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr "ä½¿ç?¨ã??.foldersã??è³?æ??å¤¾æ??è¦?æª?æ¡?[exmh](_U)"
 
 # camel/providers/local/camel-local-provider.c:39
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "MH-format mail directories"
 msgstr "MH-format é?µä»¶ç?®é??"
 
-#: ../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-like é?µä»¶ç?®é??ã??"
 
 # mail/mail-config.glade.h:76
-#: ../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:74
+#: ../camel/providers/local/camel-local-provider.c:70
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
 msgstr "ç?¨æ?¼è?ªæ¨?æº? mbox æ ¼å¼?æ??ç¨?å?¨æ?¥æ?¶ï¼?ç§»å??ï¼?æ?¬å?°ç«¯é?µä»¶è?³ Evolution ç®¡ç??ç??è³?æ??å¤¾ã??"
 
 # camel/providers/imap/camel-imap-provider.c:57
-#: ../camel/providers/local/camel-local-provider.c:88
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:103
 msgid "_Apply filters to new messages in INBOX"
 msgstr "å°?é??æ¿¾å?¨å¥?ç?¨æ?¼ I_NBOX è£?ç??æ?°é?µä»¶"
 
 # camel/providers/local/camel-local-provider.c:39
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:91
 msgid "Maildir-format mail directories"
 msgstr "Maildir-format é?µä»¶ç?®é??"
 
-#: ../camel/providers/local/camel-local-provider.c:96
+#: ../camel/providers/local/camel-local-provider.c:92
 msgid "For storing local mail in maildir directories."
 msgstr "ç?¨æ?¼å?²å?æ?¬å?°ç«¯é?µä»¶è?³ maildir ç?®é??ã??"
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:104
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "å?²å?å?¨ Elm/_Pine/Mutt æ ¼å¼?ä¸ç??ç??æ??æª?é "
 
 # mail/mail-config.glade.h:77
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:111
 msgid "Standard Unix mbox spool file"
 msgstr "æ¨?æº? Unix mbox æ??ç¨?å?¨æª?æ¡?"
 
 # camel/providers/imap/camel-imap-provider.c:65
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:112
+#: ../camel/providers/local/camel-local-provider.c:123
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -4234,140 +4052,119 @@ msgstr ""
 "ä¹?å?¯ä»¥ç?¨ä¾?è®? Elm ã?? Pine æ?? Mutt å½¢å¼?è³?æ??å¤¾ç??æ¨¹ç??çµ?æ§?ã??"
 
 # mail/mail-config.glade.h:77
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:122
 msgid "Standard Unix mbox spool directory"
 msgstr "æ¨?æº? Unix mbox æ??ç¨?å?¨ç?®é??"
 
 # camel/providers/local/camel-local-store.c:127
-#: ../camel/providers/local/camel-local-store.c:163
-#: ../camel/providers/local/camel-local-store.c:274
-#: ../camel/providers/local/camel-mbox-store.c:357
-#: ../camel/providers/local/camel-spool-store.c:126
+#: ../camel/providers/local/camel-local-store.c:149
+#: ../camel/providers/local/camel-local-store.c:284
+#: ../camel/providers/local/camel-mbox-store.c:371
+#: ../camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "å?²å?æ ¹ç?®é?? %s ä¸?æ?¯çµ?å°?è·¯å¾?"
 
 # camel/providers/local/camel-local-store.c:134
-#: ../camel/providers/local/camel-local-store.c:170
+#: ../camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "å?²å?æ ¹ç?®é?? %s ä¸?æ?¯å??æ³?ç??ç?®é??"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/local/camel-local-store.c:169
 #: ../camel/providers/local/camel-local-store.c:179
-#: ../camel/providers/local/camel-local-store.c:187
-#: ../camel/providers/local/camel-local-store.c:285
+#: ../camel/providers/local/camel-local-store.c:297
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ï¼?%sï¼?%s"
 
 # camel/providers/local/camel-local-store.c:173
-#: ../camel/providers/local/camel-local-store.c:199
+#: ../camel/providers/local/camel-local-store.c:193
+#, c-format
 msgid "Local stores do not have an inbox"
 msgstr "æ?¬å?°ç«¯ç??å?å?²æ²?æ??æ?¶ä»¶å?£"
 
 # camel/providers/local/camel-local-store.c:183
-#: ../camel/providers/local/camel-local-store.c:245
+#: ../camel/providers/local/camel-local-store.c:250
 #, c-format
 msgid "Local mail file %s"
 msgstr "æ?¬å?°ç«¯é?µä»¶æª?æ¡? %s"
 
 # camel/providers/local/camel-local-store.c:237
-#: ../camel/providers/local/camel-local-store.c:340
+#: ../camel/providers/local/camel-local-store.c:358
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "ç?¡æ³?å°?è³?æ??å¤¾ %s é??æ?°å?½å??ç?º %sï¼? %s"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-local-store.c:408
+#: ../camel/providers/local/camel-local-store.c:431
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "ç?¡æ³?é??æ?°å?½å??ã??%sã??ï¼?%s "
 
 # camel/providers/local/camel-local-store.c:289
-#: ../camel/providers/local/camel-local-store.c:433
-#: ../camel/providers/local/camel-mbox-store.c:298
+#: ../camel/providers/local/camel-local-store.c:461
+#: ../camel/providers/local/camel-mbox-store.c:304
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "ä¸?è?½å?ªé?¤è³?æ??å¤¾ç´¢å¼?æª?æ¡?ã??%sã??ï¼? %s"
 
 # camel/providers/local/camel-local-store.c:279
-#: ../camel/providers/local/camel-local-store.c:456
-#: ../camel/providers/local/camel-mbox-store.c:322
+#: ../camel/providers/local/camel-local-store.c:489
+#: ../camel/providers/local/camel-mbox-store.c:333
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "ä¸?è?½å?ªé?¤è³?æ??å¤¾ä¸ç¹¼æª?æ¡?ã??%sã??ï¼?%s"
 
 # camel/providers/local/camel-local-summary.c:404
-#: ../camel/providers/local/camel-local-summary.c:515
+#: ../camel/providers/local/camel-local-summary.c:537
+#, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "ç?¡æ³?æ?°å¢?é?µä»¶å?°æ??è¦?è³?è¨?ï¼?ä¸?æ??ç??å??å? "
 
-# camel/camel-filter-driver.c:670
-# camel/camel-filter-driver.c:679
-#: ../camel/providers/local/camel-maildir-folder.c:230
-msgid "Maildir append message canceled"
-msgstr "Maildir å¢?æ·»é?µä»¶å·²å??æ¶?"
-
 # camel/providers/local/camel-maildir-folder.c:150
 # camel/providers/local/camel-maildir-folder.c:158
 # camel/providers/local/camel-maildir-folder.c:169
-#: ../camel/providers/local/camel-maildir-folder.c:233
+#: ../camel/providers/local/camel-maildir-folder.c:195
 #, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "ç?¡æ³?å°?é?µä»¶å?²å?å?° maildir è³?æ??å¤¾ï¼? %sï¼? %s"
+msgid "Cannot append message to maildir folder: %s: "
+msgstr "ä¸?è?½å°?é?µä»¶å?²å?å?° maildir è³?æ??å¤¾ï¼? %sï¼?"
 
 # camel/providers/local/camel-mbox-folder.c:335
 # camel/providers/local/camel-mbox-folder.c:367
 # camel/providers/local/camel-mbox-folder.c:380
-#: ../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
+#: ../camel/providers/local/camel-maildir-folder.c:283
+#: ../camel/providers/local/camel-maildir-folder.c:291
+#: ../camel/providers/local/camel-mbox-folder.c:440
+#: ../camel/providers/local/camel-mh-folder.c:227
+#: ../camel/providers/local/camel-mh-folder.c:235
 #, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"ä¸?è?½å??å¾?é?µä»¶ï¼?%s å¾?è³?æ??å¤¾ %s\n"
-"  %s"
-
-# camel/providers/local/camel-maildir-folder.c:218
-# camel/providers/local/camel-mh-folder.c:203
-#: ../camel/providers/local/camel-maildir-folder.c:315
-msgid "Invalid message contents"
-msgstr "ç?¡æ??ç??é?µä»¶å?§æ??"
+msgid "Cannot get message %s from folder %s: "
+msgstr "ä¸?è?½å¾?è³?æ??å¤¾ %2$s å??å¾?é?µä»¶ %1$sï¼?"
 
 # camel/providers/local/camel-mbox-summary.c:644
-#: ../camel/providers/local/camel-maildir-folder.c:419
-msgid "Cannot transfer message to destination folder"
-msgstr "ä¸?è?½å°?é?µä»¶å?³è¼¸å?°ç?®ç??ç«¯è³?æ??å¤¾"
+#: ../camel/providers/local/camel-maildir-folder.c:399
+#, c-format
+msgid "Cannot transfer message to destination folder: %s"
+msgstr "ä¸?è?½å°?é?µä»¶å?³è¼¸å?°ç?®ç??ç«¯è³?æ??å¤¾ï¼?%s"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-maildir-store.c:148
-#: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:174
-#: ../camel/providers/local/camel-mbox-store.c:186
+#: ../camel/providers/local/camel-maildir-store.c:136
+#: ../camel/providers/local/camel-maildir-store.c:167
+#: ../camel/providers/local/camel-mbox-store.c:161
+#: ../camel/providers/local/camel-mbox-store.c:175
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?%s"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:145
-#: ../camel/providers/local/camel-mh-store.c:217
+#: ../camel/providers/local/camel-maildir-store.c:151
+#: ../camel/providers/local/camel-mbox-store.c:127
+#: ../camel/providers/local/camel-mh-store.c:215
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?%s"
@@ -4375,15 +4172,15 @@ msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?%s"
 # camel/providers/local/camel-maildir-store.c:100
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
-#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:153
+#: ../camel/providers/local/camel-maildir-store.c:157
+#: ../camel/providers/local/camel-mbox-store.c:137
 #: ../camel/providers/local/camel-mh-store.c:224
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ã??%sã??ï¼?è³?æ??å¤¾ä¸?å?å?¨ã??"
 
 # camel/providers/local/camel-maildir-store.c:122
-#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-maildir-store.c:184
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ã??%sã??ï¼?ä¸?æ?¯ maildir ç?®é??ã??"
@@ -4391,111 +4188,98 @@ msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ã??%sã??ï¼?ä¸?æ?¯ maildir ç?®é??ã??"
 # camel/providers/local/camel-maildir-store.c:151
 # camel/providers/local/camel-maildir-store.c:188
 # camel/providers/local/camel-mh-store.c:127
-#: ../camel/providers/local/camel-maildir-store.c:234
-#: ../camel/providers/local/camel-maildir-store.c:272
-#: ../camel/providers/local/camel-mh-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:242
+#: ../camel/providers/local/camel-maildir-store.c:282
+#: ../camel/providers/local/camel-mh-store.c:287
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "ç?¡æ³?å?ªé?¤è³?æ??å¤¾ã??%sã??ï¼?%s"
 
 # camel/providers/local/camel-maildir-store.c:152
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:244
 msgid "not a maildir directory"
 msgstr "ä¸?æ?¯ä¸?å?? maildir ç?®é??"
 
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:328
-#: ../camel/providers/local/camel-spool-store.c:342
+#: ../camel/providers/local/camel-maildir-store.c:482
+#: ../camel/providers/local/camel-spool-store.c:364
+#: ../camel/providers/local/camel-spool-store.c:380
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "ç?¡æ³?æ??æ??è³?æ??å¤¾ã??%sã??ï¼?%s"
 
 # camel/providers/local/camel-maildir-summary.c:405
 # camel/providers/local/camel-maildir-summary.c:526
-#: ../camel/providers/local/camel-maildir-summary.c:432
-#: ../camel/providers/local/camel-maildir-summary.c:551
+#: ../camel/providers/local/camel-maildir-summary.c:435
+#: ../camel/providers/local/camel-maildir-summary.c:558
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "ä¸?è?½é??å?? maildir ç?®é??è·¯å¾?ï¼?%sï¼? %s"
 
 # camel/providers/imap/camel-imap-provider.c:43
 # mail/mail-config.glade.h:13
-#: ../camel/providers/local/camel-maildir-summary.c:544
+#: ../camel/providers/local/camel-maildir-summary.c:549
 msgid "Checking folder consistency"
 msgstr "æª¢æ?¥è³?æ??å¤¾ç??ä¸?è?´æ?§"
 
 # mail/mail-ops.c:992
-#: ../camel/providers/local/camel-maildir-summary.c:637
+#: ../camel/providers/local/camel-maildir-summary.c:641
 msgid "Checking for new messages"
 msgstr "æª¢æ?¥æ?°é?µä»¶"
 
 # camel/camel-filter-driver.c:690
 # camel/camel-filter-driver.c:788
-#: ../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:732
+#: ../camel/providers/local/camel-mbox-summary.c:465
+#: ../camel/providers/local/camel-mbox-summary.c:669
+#: ../camel/providers/local/camel-mbox-summary.c:799
+#: ../camel/providers/local/camel-spool-summary.c:130
 msgid "Storing folder"
 msgstr "å?²å?è³?æ??å¤¾"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/providers/local/camel-mbox-folder.c:167
-#: ../camel/providers/local/camel-spool-folder.c:150
+#: ../camel/providers/local/camel-mbox-folder.c:124
+#: ../camel/providers/local/camel-spool-folder.c:125
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾é??å®? %s ï¼? %s"
 
 # camel/providers/local/camel-mbox-folder.c:203
-#: ../camel/providers/local/camel-mbox-folder.c:231
+#: ../camel/providers/local/camel-mbox-folder.c:194
 #, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "ä¸?è?½é??å?? mailboxï¼?%sï¼? %s\n"
-
-# camel/camel-remote-store.c:337
-# camel/camel-remote-store.c:399
-# camel/camel-remote-store.c:470
-# camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/local/camel-mbox-folder.c:297
-msgid "Mail append canceled"
-msgstr "é?µä»¶å¢?æ·»å·²å??æ¶?"
+msgid "Cannot open mailbox: %s: "
+msgstr "ä¸?è?½é??å?? mailboxï¼?%s"
 
 # camel/providers/local/camel-mbox-folder.c:259
-#: ../camel/providers/local/camel-mbox-folder.c:300
+#: ../camel/providers/local/camel-mbox-folder.c:260
 #, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "ä¸?è?½å°?é?µä»¶å?²å?å?° mbox æª?æ¡?ï¼? %sï¼? %s"
+msgid "Cannot append message to mbox file: %s: "
+msgstr "ä¸?è?½å°?é?µä»¶å?²å?å?° mbox æª?æ¡?ï¼?%s"
 
 # camel/providers/local/camel-mbox-folder.c:368
-#: ../camel/providers/local/camel-mbox-folder.c:466
+#: ../camel/providers/local/camel-mbox-folder.c:433
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "è³?æ??å¤¾å¥½å??å·²ç¶?æ??æ¯?ä¸¦ä¸?ä¸?è?½å¾©å??ã??"
 
-# camel/providers/local/camel-mbox-folder.c:381
-#: ../camel/providers/local/camel-mbox-folder.c:474
-#: ../camel/providers/local/camel-mh-folder.c:245
-msgid "Message construction failed."
-msgstr "è¨?æ?¯çµ?æ§?å¤±æ??ã??"
-
 # camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/providers/local/camel-mbox-store.c:164
-#: ../camel/providers/local/camel-mbox-store.c:363
+#: ../camel/providers/local/camel-mbox-store.c:149
+#: ../camel/providers/local/camel-mbox-store.c:379
+#, c-format
 msgid "Cannot create a folder by this name."
 msgstr "ç?¡æ³?å»ºç«?ä»¥æ¤ç?ºå??ç??è³?æ??å¤¾"
 
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
-#: ../camel/providers/local/camel-mbox-store.c:196
+#: ../camel/providers/local/camel-mbox-store.c:186
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ã??%sã??ï¼?ä¸?æ?¯ä¸?è?¬æª?æ¡?ã??"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:226
-#: ../camel/providers/local/camel-mbox-store.c:237
+#: ../camel/providers/local/camel-mbox-store.c:218
+#: ../camel/providers/local/camel-mbox-store.c:231
 #: ../camel/providers/local/camel-mbox-store.c:260
 #, c-format
 msgid ""
@@ -4507,116 +4291,116 @@ msgstr ""
 
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
-#: ../camel/providers/local/camel-mbox-store.c:245
+#: ../camel/providers/local/camel-mbox-store.c:241
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "ã??%sã??ä¸?æ?¯æ?®é??ç??æª?æ¡?ã??"
 
 # camel/providers/local/camel-mbox-store.c:153
-#: ../camel/providers/local/camel-mbox-store.c:252
+#: ../camel/providers/local/camel-mbox-store.c:250
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "è³?æ??å¤¾ã??%sã??å?§ä»?æ??æª?æ¡?ã??æ??ä»¥ä¸?å?ªé?¤ã??"
 
 # camel/providers/local/camel-local-store.c:279
-#: ../camel/providers/local/camel-mbox-store.c:274
-#: ../camel/providers/local/camel-mbox-store.c:286
+#: ../camel/providers/local/camel-mbox-store.c:276
+#: ../camel/providers/local/camel-mbox-store.c:290
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "ç?¡æ³?å?ªé?¤è³?æ??å¤¾æ??è¦?æª?æ¡?ã??%sã??ï¼? %s"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/providers/local/camel-mbox-store.c:376
+#: ../camel/providers/local/camel-mbox-store.c:395
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "ä¸?è?½å»ºç«?ç?®é??ã??%sã??ï¼? %sã??"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-mbox-store.c:390
+#: ../camel/providers/local/camel-mbox-store.c:411
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ï¼?%sï¼?%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:413
 msgid "Folder already exists"
 msgstr "è³?æ??å¤¾å·²å?å?¨"
 
 # shell/e-shell-folder-creation-dialog.c:156
-#: ../camel/providers/local/camel-mbox-store.c:483
+#: ../camel/providers/local/camel-mbox-store.c:507
+#, c-format
 msgid "The new folder name is illegal."
-msgstr "æ??å®?ç??è³?æ??å¤¾å??ç¨±ä¸?å??æ³?ï¼? %s"
+msgstr "æ?°ç??è³?æ??å¤¾å??ç¨±ä¸?å??æ³?ã??"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-mbox-store.c:496
+#: ../camel/providers/local/camel-mbox-store.c:522
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "ç?¡æ³?é??æ?°å?½å??ã??%sã??ï¼?ã??%sã??ï¼?%s"
 
 # camel/providers/local/camel-local-store.c:237
-#: ../camel/providers/local/camel-mbox-store.c:577
+#: ../camel/providers/local/camel-mbox-store.c:605
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "ç?¡æ³?å°? '%s' é??æ?°å?½å??æ?? %sï¼?%s"
 
 # camel/providers/local/camel-maildir-store.c:96
 # camel/providers/local/camel-mh-store.c:90
-#: ../camel/providers/local/camel-mbox-summary.c:532
+#: ../camel/providers/local/camel-mbox-summary.c:473
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "ç?¡æ³?é??å??è³?æ??å¤¾ï¼? %sï¼? %s"
 
 # camel/providers/local/camel-mbox-summary.c:296
-#: ../camel/providers/local/camel-mbox-summary.c:582
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "é? è¿? %ld (æ?¼è³?æ??å¤¾ %s)ç??ä½?ç½®ç?¼ç??å?´é??ç??é?µä»¶å??æ??é?¯èª¤"
+#: ../camel/providers/local/camel-mbox-summary.c:524
+msgid "Fatal mail parser error near position %"
+msgstr "ç?¼ç??å?´é??ç??é?µä»¶å??æ??é?¯èª¤ï¼?é? è¿?ä½?ç½® %"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-mbox-summary.c:659
+#: ../camel/providers/local/camel-mbox-summary.c:605
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "ä¸?è?½æª¢æ?¥è³?æ??å¤¾ï¼?%sï¼? %s"
 
 # camel/providers/local/camel-mbox-store.c:94
-#: ../camel/providers/local/camel-mbox-summary.c:727
-#: ../camel/providers/local/camel-mbox-summary.c:847
-#: ../camel/providers/local/camel-spool-summary.c:155
+#: ../camel/providers/local/camel-mbox-summary.c:676
+#: ../camel/providers/local/camel-mbox-summary.c:806
+#: ../camel/providers/local/camel-spool-summary.c:137
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "ç?¡æ³?é??å??æª?æ¡?ï¼? %sï¼? %s"
 
 # camel/providers/local/camel-mbox-summary.c:524
-#: ../camel/providers/local/camel-mbox-summary.c:739
-#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-mbox-summary.c:690
+#: ../camel/providers/local/camel-spool-summary.c:152
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "ä¸?è?½é??å??æ?«å? mailboxï¼?%s"
 
 # camel/providers/local/camel-mbox-summary.c:635
 # camel/providers/local/camel-mbox-summary.c:804
-#: ../camel/providers/local/camel-mbox-summary.c:752
-#: ../camel/providers/local/camel-mbox-summary.c:956
+#: ../camel/providers/local/camel-mbox-summary.c:705
+#: ../camel/providers/local/camel-mbox-summary.c:923
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "ç?¡æ³?é??é??ä¾?æº?è³?æ??å¤¾ %s ï¼? %s"
 
 # camel/providers/local/camel-mbox-summary.c:644
-#: ../camel/providers/local/camel-mbox-summary.c:761
+#: ../camel/providers/local/camel-mbox-summary.c:716
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "ç?¡æ³?é??é??æ?«å?è³?æ??å¤¾ï¼? %s"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-mbox-summary.c:776
+#: ../camel/providers/local/camel-mbox-summary.c:733
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "ç?¡æ³?é??æ?°å?½å??è³?æ??å¤¾ï¼?%s "
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-mbox-summary.c:858
-#: ../camel/providers/local/camel-mbox-summary.c:1083
+#: ../camel/providers/local/camel-mbox-summary.c:819
+#: ../camel/providers/local/camel-mbox-summary.c:1061
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "ç?¡æ³?å?²å?è³?æ??å¤¾ï¼?%s "
@@ -4625,71 +4409,68 @@ msgstr "ç?¡æ³?å?²å?è³?æ??å¤¾ï¼?%s "
 # camel/providers/local/camel-mbox-summary.c:557
 # camel/providers/local/camel-mbox-summary.c:746
 # camel/providers/local/camel-mbox-summary.c:754
-#: ../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:860
+#: ../camel/providers/local/camel-mbox-summary.c:869
+#: ../camel/providers/local/camel-mbox-summary.c:1094
+#: ../camel/providers/local/camel-mbox-summary.c:1103
+#, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "æ??è¦?è??è³?æ??å¤¾ä¸?å??èª¿ï¼?å?³ä½¿ç¶?é??å??æ¥"
 
 # camel/providers/local/camel-mbox-summary.c:879
-#: ../camel/providers/local/camel-mbox-summary.c:1046
-#: ../camel/providers/local/camel-spool-summary.c:334
+#: ../camel/providers/local/camel-mbox-summary.c:1020
+#: ../camel/providers/local/camel-spool-summary.c:337
 #, c-format
 msgid "Unknown error: %s"
 msgstr "ä¸?æ??ç??é?¯èª¤ï¼? %s"
 
 # camel/providers/local/camel-mbox-summary.c:617
-#: ../camel/providers/local/camel-mbox-summary.c:1189
-#: ../camel/providers/local/camel-mbox-summary.c:1215
+#: ../camel/providers/local/camel-mbox-summary.c:1173
+#: ../camel/providers/local/camel-mbox-summary.c:1203
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "å¯«å?¥æ?«å?é?µç®±å¤±æ??ï¼?  %s"
 
 # camel/providers/local/camel-mbox-summary.c:617
-#: ../camel/providers/local/camel-mbox-summary.c:1206
+#: ../camel/providers/local/camel-mbox-summary.c:1192
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "å¯«å?¥æ?«å?é?µç®±å¤±æ??ï¼? %sï¼? %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:180
-msgid "MH append message canceled"
-msgstr "MH å¢?æ·»é?µä»¶å·²å??æ¶?"
-
 # camel/providers/local/camel-mh-folder.c:149
 # camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/local/camel-mh-folder.c:183
+#: ../camel/providers/local/camel-mh-folder.c:165
 #, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "ä¸?è?½å°?é?µä»¶å?²å?å?° mh è³?æ??å¤¾ï¼? %sï¼? %s"
+msgid "Cannot append message to mh folder: %s: "
+msgstr "ä¸?è?½å°?é?µä»¶å?²å?å?° mh è³?æ??å¤¾ï¼? %sï¼?"
 
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
-#: ../camel/providers/local/camel-mh-store.c:232
+#: ../camel/providers/local/camel-mh-store.c:234
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "ç?¡æ³?å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?%s"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-mh-store.c:244
+#: ../camel/providers/local/camel-mh-store.c:248
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ã??%sã??ï¼?ä¸?æ?¯ç?®é??ã??"
 
 # camel/providers/local/camel-mh-summary.c:218
-#: ../camel/providers/local/camel-mh-summary.c:240
+#: ../camel/providers/local/camel-mh-summary.c:228
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "ä¸?è?½é??å?? MH ç?®é??è·¯å¾?ï¼? %sï¼? %s"
 
-#: ../camel/providers/local/camel-spool-store.c:132
+#: ../camel/providers/local/camel-spool-store.c:118
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "æ??ç¨?å?¨ã??%sã??ä¸?è?½è¢«é??å??ï¼?%s"
 
 # camel/providers/local/camel-local-store.c:134
-#: ../camel/providers/local/camel-spool-store.c:144
+#: ../camel/providers/local/camel-spool-store.c:132
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "æ??ç¨?å?¨ã??%sã??ä¸?æ?¯ä¸?è?¬æª?æ¡?æ??ç?®é??ã??"
@@ -4697,14 +4478,14 @@ msgstr "æ??ç¨?å?¨ã??%sã??ä¸?æ?¯ä¸?è?¬æª?æ¡?æ??ç?®é??ã??"
 # camel/providers/local/camel-maildir-store.c:100
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
-#: ../camel/providers/local/camel-spool-store.c:163
+#: ../camel/providers/local/camel-spool-store.c:158
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "è³?æ??å¤¾ã??%s/%sã??ä¸?å?å?¨ã??"
 
 # camel/providers/local/camel-maildir-store.c:96
 # camel/providers/local/camel-mh-store.c:90
-#: ../camel/providers/local/camel-spool-store.c:173
+#: ../camel/providers/local/camel-spool-store.c:170
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -4716,14 +4497,14 @@ msgstr ""
 # camel/providers/local/camel-maildir-store.c:100
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
-#: ../camel/providers/local/camel-spool-store.c:177
+#: ../camel/providers/local/camel-spool-store.c:176
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "è³?æ??å¤¾ã??%sã??ä¸?å?å?¨ã??"
 
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
-#: ../camel/providers/local/camel-spool-store.c:182
+#: ../camel/providers/local/camel-spool-store.c:183
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -4734,52 +4515,55 @@ msgstr ""
 
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
-#: ../camel/providers/local/camel-spool-store.c:190
+#: ../camel/providers/local/camel-spool-store.c:193
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "ã??%sã??ä¸?æ?¯ mailbox æª?æ¡?ã??"
 
-#: ../camel/providers/local/camel-spool-store.c:207
+#: ../camel/providers/local/camel-spool-store.c:213
+#, c-format
 msgid "Store does not support an INBOX"
 msgstr "å?²å?ä¸¦ä¸?æ?¯æ?´ INBOX"
 
 # camel/providers/local/camel-local-store.c:183
-#: ../camel/providers/local/camel-spool-store.c:219
+#: ../camel/providers/local/camel-spool-store.c:226
 #, c-format
 msgid "Spool mail file %s"
 msgstr "æ??ç¨?é?µä»¶æª?æ¡? %s"
 
-#: ../camel/providers/local/camel-spool-store.c:219
+#: ../camel/providers/local/camel-spool-store.c:226
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "æ??ç¨?è³?æ??å¤¾æ¨¹ç??çµ?æ§? %s"
 
-#: ../camel/providers/local/camel-spool-store.c:227
+#: ../camel/providers/local/camel-spool-store.c:238
+#, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "æ??ç¨?è³?æ??å¤¾ä¸?è?½é??æ?°å?½å??"
 
-#: ../camel/providers/local/camel-spool-store.c:235
+#: ../camel/providers/local/camel-spool-store.c:251
+#, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "æ??ç¨?è³?æ??å¤¾ä¸?è?½å?ªé?¤"
 
 # camel/camel-movemail.c:158
-#: ../camel/providers/local/camel-spool-summary.c:180
+#: ../camel/providers/local/camel-spool-summary.c:166
+#: ../camel/providers/local/camel-spool-summary.c:178
 #: ../camel/providers/local/camel-spool-summary.c:190
-#: ../camel/providers/local/camel-spool-summary.c:200
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "ç?¡æ³?è??æ?«å?è³?æ??å¤¾å??æ¥ %sï¼? %s"
 
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
-#: ../camel/providers/local/camel-spool-summary.c:216
+#: ../camel/providers/local/camel-spool-summary.c:208
 #, c-format
 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
+#: ../camel/providers/local/camel-spool-summary.c:240
+#: ../camel/providers/local/camel-spool-summary.c:259
+#: ../camel/providers/local/camel-spool-summary.c:272
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -4788,79 +4572,105 @@ msgstr ""
 "ç?¡æ³?å??æ¥æ??ç¨?è³?æ??å¤¾ %sï¼? %s\n"
 "è³?æ??å¤¾å?¯è?½æ??æ¯?ï¼?è¤?è£½å?²å?æ?¼ã??%sã??"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:135
-#: ../camel/providers/nntp/camel-nntp-folder.c:192
-#: ../camel/providers/nntp/camel-nntp-folder.c:224
+#: ../camel/providers/nntp/camel-nntp-folder.c:197
+#: ../camel/providers/nntp/camel-nntp-folder.c:271
+#: ../camel/providers/nntp/camel-nntp-folder.c:312
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "å?§é?¨é?¯èª¤ï¼?UID æ ¼å¼?ç?¡æ??ï¼?%s"
 
+# camel/providers/local/camel-maildir-folder.c:197
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:217
+# camel/providers/local/camel-mbox-folder.c:319
+# camel/providers/local/camel-mh-folder.c:185
+# camel/providers/local/camel-mh-folder.c:194
+# camel/providers/local/camel-mh-folder.c:202
+#: ../camel/providers/nntp/camel-nntp-folder.c:234
+#: ../camel/providers/nntp/camel-nntp-folder.c:238
+#: ../camel/providers/pop3/camel-pop3-folder.c:402
+#: ../camel/providers/pop3/camel-pop3-folder.c:630
+#: ../camel/providers/pop3/camel-pop3-folder.c:695
+#: ../camel/providers/pop3/camel-pop3-folder.c:706
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "ç?¡æ³?å??å¾?é?µä»¶ %sï¼? %s"
+
 # camel/camel-remote-store.c:337
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/nntp/camel-nntp-folder.c:365
-#: ../camel/providers/nntp/camel-nntp-folder.c:368
-#: ../camel/providers/nntp/camel-nntp-folder.c:410
-#: ../camel/providers/nntp/camel-nntp-folder.c:412
+#: ../camel/providers/nntp/camel-nntp-folder.c:465
+#: ../camel/providers/nntp/camel-nntp-folder.c:471
+#: ../camel/providers/nntp/camel-nntp-folder.c:518
 #, c-format
 msgid "Posting failed: %s"
 msgstr "å¼µè²¼å¤±æ??ï¼?%s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:430
+# camel/camel-remote-store.c:337
+# camel/camel-remote-store.c:399
+# camel/camel-remote-store.c:470
+# camel/providers/imap/camel-imap-command.c:287
+#: ../camel/providers/nntp/camel-nntp-folder.c:513
+msgid "Posting failed: "
+msgstr "å¼µè²¼å¤±æ??ï¼?"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:541
+#, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "é?¢ç·?å·¥ä½?æ??ç?¡æ³?å¼µè²¼ NNTP è¨?æ?¯ï¼?"
 
 # camel/providers/local/camel-mbox-summary.c:644
-#: ../camel/providers/nntp/camel-nntp-folder.c:441
+#: ../camel/providers/nntp/camel-nntp-folder.c:560
+#, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "ä½ ç?¡æ³?å¾? NNTP è³?æ??å¤¾è¤?è£½è¨?æ?¯ï¼?"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid ""
 "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr "ä»¥ç°¡ç?è¡¨ç¤ºæ³?é¡¯ç¤ºè³?æ??å¤¾(ä¾?å¦?ï¼?c.o.linux è??ä¸?æ?¯ comp.o_s.linux)"
 
-#: ../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 "å?¨è¨?é?±å°?è©±æ?¹å¡?ï¼?é¡¯ç¤ºç?¸é??è³?æ??å¤¾å??ç¨±(_D)"
 
 # camel/providers/nntp/camel-nntp-provider.c:42
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:53
 msgid "USENET news"
 msgstr "USENET æ?°è??"
 
 # camel/providers/nntp/camel-nntp-provider.c:44
-#: ../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 "é??æ?¯è®?å??è??ç?¼ä¿¡è?³ USENET æ?°è??ç¾£çµ?ç??ä¾?æ??è??ã??"
 
 # camel/providers/nntp/camel-nntp-store.c:293
-#: ../camel/providers/nntp/camel-nntp-provider.c:76
+#: ../camel/providers/nntp/camel-nntp-provider.c:74
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨ç´?æ??å?ç??å¯?ç¢¼é©?è? NNTP ä¼ºæ??å?¨ã??"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/providers/nntp/camel-nntp-store.c:216
+#: ../camel/providers/nntp/camel-nntp-store.c:265
 #, c-format
-msgid "Could not read greeting from %s: %s"
-msgstr "ç?¡æ³?è®?å?? %s ç??æ¡è¿?è¾ï¼? %s"
+msgid "Could not read greeting from %s: "
+msgstr "ç?¡æ³?è®?å?? %s ç??æ¡è¿?è¾ï¼?"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:228
+#: ../camel/providers/nntp/camel-nntp-store.c:278
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP ä¼ºæ??å?¨ %s å?³å??é?¯èª¤ä»£ç¢¼ %d ï¼? %s"
 
 # camel/providers/nntp/camel-nntp-store.c:286
-#: ../camel/providers/nntp/camel-nntp-store.c:410
+#: ../camel/providers/nntp/camel-nntp-store.c:453
 #, c-format
 msgid "USENET News via %s"
 msgstr "ç¶?ç?± %s ç?? USENET æ?°è??"
 
 # mail/mail-ops.c:1755
-#: ../camel/providers/nntp/camel-nntp-store.c:819
+#: ../camel/providers/nntp/camel-nntp-store.c:946
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4871,7 +4681,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:913
+#: ../camel/providers/nntp/camel-nntp-store.c:1043
+#, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -4881,7 +4692,8 @@ msgstr ""
 "\n"
 "æ²?æ??é¡?ä¼¼ç??æ?°è??ç¾£çµ?ã??é?¸å??ç??é ?ç?®å?¯è?½æ?¯ç?¶ä»£è³?æ??å¤¾ã??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:945
+#: ../camel/providers/nntp/camel-nntp-store.c:1083
+#, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -4891,106 +4703,98 @@ msgstr ""
 "\n"
 "æ?°è??ç¾£çµ?ä¸?å?å?¨ï¼?"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:970
+#: ../camel/providers/nntp/camel-nntp-store.c:1113
+#, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "ä½ ç?¡æ³?å?¨ã??æ?°è??ã??å?²å?å??å»ºç«?è³?æ??å¤¾ï¼?æ?¹ä»¥è¨?é?±ã??"
 
 # camel/providers/local/camel-local-store.c:237
-#: ../camel/providers/nntp/camel-nntp-store.c:978
+#: ../camel/providers/nntp/camel-nntp-store.c:1125
+#, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "ä½ ç?¡æ³?å?¨ã??æ?°è??ã??å?²å?å??é??æ?°å?½å??è³?æ??å¤¾ã??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:986
+#: ../camel/providers/nntp/camel-nntp-store.c:1138
+#, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "ä½ ç?¡æ³?å?¨ã??æ?°è??ã??å?²å?å??ç§»é?¤è³?æ??å¤¾ï¼?æ?¹ä»¥å??æ¶?è¨?é?±ã??"
 
 # camel/providers/smtp/camel-smtp-transport.c:218
-#: ../camel/providers/nntp/camel-nntp-store.c:1180
+#: ../camel/providers/nntp/camel-nntp-store.c:1276
+#, c-format
 msgid "Authentication requested but no username provided"
 msgstr "é??è¦?é©?è?ï¼?ä½?æ?ªæ??ä¾?ä½¿ç?¨è??å??ç¨±"
 
 # camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/nntp/camel-nntp-store.c:1192
+#: ../camel/providers/nntp/camel-nntp-store.c:1288
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "ç?¡æ³?é©?è?ä¼ºæ??å?¨ï¼?%s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/nntp/camel-nntp-store.c:1315
-#, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP æ??ä»¤å¤±æ??ï¼? %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1414
+msgid "NNTP Command failed: "
+msgstr "NNTP æ??ä»¤å¤±æ??ï¼?"
 
 # ui/evolution-addressbook.xml.h:17
-#: ../camel/providers/nntp/camel-nntp-store.c:1369
+#: ../camel/providers/nntp/camel-nntp-store.c:1472
+#, c-format
 msgid "Not connected."
 msgstr "æ?ªé?£ç·?ã??"
 
-# camel/providers/imap/camel-imap-store.c:803
-# mail/mail-local.c:334
-#: ../camel/providers/nntp/camel-nntp-store.c:1422
-#, c-format
-msgid "No such folder: %s"
-msgstr "æ²?æ??é??å??è³?æ??å¤¾ï¼? %s"
-
 # mail/mail-ops.c:992
-#: ../camel/providers/nntp/camel-nntp-summary.c:272
-#: ../camel/providers/nntp/camel-nntp-summary.c:370
+#: ../camel/providers/nntp/camel-nntp-summary.c:238
+#: ../camel/providers/nntp/camel-nntp-summary.c:340
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%sï¼?æ??æ??æ?°é?µä»¶"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: ../camel/providers/nntp/camel-nntp-summary.c:279
+#: ../camel/providers/nntp/camel-nntp-summary.c:249
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "xover å?³ä¾?æ??å¤?ç??ä¼ºæ??å?¨å??æ??ï¼?%s"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: ../camel/providers/nntp/camel-nntp-summary.c:384
+#: ../camel/providers/nntp/camel-nntp-summary.c:356
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "æ¨?é¡?å?³ä¾?æ??å¤?ç??ä¼ºæ??å?¨å??æ??ï¼?%s"
 
-# ui/evolution-mail.xml.h:2
-#: ../camel/providers/nntp/camel-nntp-summary.c:420
-msgid "Use cancel"
-msgstr "ä½¿ç?¨å??æ¶?"
-
 # camel/camel-remote-store.c:337
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/nntp/camel-nntp-summary.c:422
+#: ../camel/providers/nntp/camel-nntp-summary.c:401
 #, c-format
 msgid "Operation failed: %s"
 msgstr "ä½?æ¥å¤±æ??ï¼? %s"
 
 # camel/providers/pop3/camel-pop3-folder.c:149
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
+#: ../camel/providers/pop3/camel-pop3-folder.c:251
 msgid "Retrieving POP summary"
 msgstr "å??å?? POP ç??æ??è¦?"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
+#: ../camel/providers/pop3/camel-pop3-folder.c:274
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "ä¸?è?½å??å¾? POP æ??è¦?ï¼? %s"
 
 # mail/message-browser.c:199
-#: ../camel/providers/pop3/camel-pop3-folder.c:314
+#: ../camel/providers/pop3/camel-pop3-folder.c:324
 msgid "Expunging old messages"
 msgstr "æ¸?ç©ºè??ç??é?µä»¶"
 
 # mail/message-browser.c:199
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
+#: ../camel/providers/pop3/camel-pop3-folder.c:332
 msgid "Expunging deleted messages"
 msgstr "æ¸?ç©ºå?ªé?¤ç??é?µä»¶"
 
 # camel/providers/pop3/camel-pop3-folder.c:292
-#: ../camel/providers/pop3/camel-pop3-folder.c:530
-#: ../camel/providers/pop3/camel-pop3-folder.c:552
+#: ../camel/providers/pop3/camel-pop3-folder.c:566
+#: ../camel/providers/pop3/camel-pop3-folder.c:596
 #, c-format
 msgid "No message with UID %s"
 msgstr "æ²?æ??é?µä»¶å?·æ??é??å?? UID %s"
@@ -4998,123 +4802,130 @@ msgstr "æ²?æ??é?µä»¶å?·æ??é??å?? UID %s"
 # camel/providers/pop3/camel-pop3-folder.c:296
 #. 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
+#: ../camel/providers/pop3/camel-pop3-folder.c:603
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "æ?¥æ?¶ POP é?µä»¶ %d"
 
 # camel/camel-sasl-login.c:127
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
+#: ../camel/providers/pop3/camel-pop3-folder.c:707
 msgid "Unknown reason"
 msgstr "ä¸?æ??ç??å??å? "
 
 # camel/providers/pop3/camel-pop3-provider.c:37
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
 msgid "Message storage"
 msgstr "é?µä»¶å?²å?ç©ºé??"
 
 # camel/providers/pop3/camel-pop3-provider.c:39
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
 msgstr "å?¨ä¼ºæ??å?¨ä¿?ç??é?µä»¶å??ä»½(_L)"
 
 # camel/providers/pop3/camel-pop3-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "å?ªé?¤ %s å¤©å¾?ç??é?µä»¶(_D)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:49
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
 msgid "Disable _support for all POP3 extensions"
 msgstr "å??æ¢æ??æ?? P_OP3 å»¶ä¼¸å??è?½ç??æ?¯æ?´"
 
 # camel/providers/pop3/camel-pop3-provider.c:48
 # mail/mail-config.glade.h:51
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:53
 msgid "POP"
 msgstr "POP"
 
 # camel/providers/imap/camel-imap-provider.c:65
-#: ../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-provider.c:69
-#: ../camel/providers/pop3/camel-pop3-provider.c:76
+#: ../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 "é??å??é?¸é ?å°?æ??ä½¿ç?¨ç´?æ??å?ç??å¯?ç¢¼é?£ç·?å?° POP ä¼ºæ??å?¨ã??ä¸?è?¬ç?? POP ä¼ºæ??å?¨å?ªæ??æ?¯æ?´é??ç¨®æ?¹å¼?ã??"
 
 # camel/providers/pop3/camel-pop3-provider.c:79
-#: ../camel/providers/pop3/camel-pop3-provider.c:86
+#: ../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 é??è¨?å??å®?é?£ç·?å?° POP ä¼ºæ??å?¨ã??ä¸?é??å°±ç®?ä¼ºæ??å?¨è?²ç¨±è?½å¤ æ?¯æ?´ï¼?ä½?å°?æ?¼æ??æ??ä½¿ç?¨è??ä¾?è¬?é?½æ?ªå¿?ä¸?å®?å?¯è¡?ã??"
 
+#. Translators: This is the separator between an error and an explanation
+#: ../camel/providers/pop3/camel-pop3-store.c:98
+msgid ": "
+msgstr "ï¼?"
+
 # camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/pop3/camel-pop3-store.c:229
+#: ../camel/providers/pop3/camel-pop3-store.c:168
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "ç?¡æ³?å¾? POP ä¼ºæ??å?¨ %s è®?å??æ??æ??ç??å??å??èª?"
 
 # camel/providers/pop3/camel-pop3-store.c:379
-#: ../camel/providers/pop3/camel-pop3-store.c:246
-#: ../camel/providers/pop3/camel-pop3-store.c:274
-#: ../camel/providers/pop3/camel-pop3-store.c:280
+#: ../camel/providers/pop3/camel-pop3-store.c:186
+#: ../camel/providers/pop3/camel-pop3-store.c:217
+#: ../camel/providers/pop3/camel-pop3-store.c:224
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "ç?¡æ³?ä»¥å®?å?¨æ¨¡å¼?é?£ç·?å?° POP ä¼ºæ??å?¨ %sï¼? %s"
 
 # shell/e-storage.c:477
-#: ../camel/providers/pop3/camel-pop3-store.c:247
+#: ../camel/providers/pop3/camel-pop3-store.c:187
 msgid "STLS not supported by server"
 msgstr "ä¼ºæ??å?¨ä¸?æ?¯æ?´ STLS"
 
 # camel/providers/pop3/camel-pop3-store.c:379
-#: ../camel/providers/pop3/camel-pop3-store.c:262
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:205
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr "ç?¡æ³?ä»¥å®?å?¨æ¨¡å¼?é?£ç·?å?° POP ä¼ºæ??å?¨ %s%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:281
+# camel/camel-sasl-anonymous.c:110
+# camel/camel-sasl-plain.c:87
+#: ../camel/providers/pop3/camel-pop3-store.c:218
+msgid "TLS negotiations failed"
+msgstr "TLS å??å??å¤±æ??"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:225
 msgid "TLS is not available in this build"
 msgstr "æ¤ä¸?ç??æ?¬ä¸¦æ?ªå??ç?¨ TLS"
 
-# camel/providers/pop3/camel-pop3-store.c:322
-#: ../camel/providers/pop3/camel-pop3-store.c:387
-#, c-format
-msgid "Could not connect to POP server %s"
-msgstr "ç?¡æ³?é?£ç·?å?° POP ä¼ºæ??å?¨ %s"
-
 # camel/providers/pop3/camel-pop3-store.c:409
-#: ../camel/providers/pop3/camel-pop3-store.c:428
-#: ../camel/providers/pop3/camel-pop3-store.c:565
+#: ../camel/providers/pop3/camel-pop3-store.c:321
+#: ../camel/providers/pop3/camel-pop3-store.c:473
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr "ç?¡æ³?é?£ç·?å?° POP ä¼ºæ??å?¨ %sï¼?ä¸?æ?¯æ?´æ??è¦?æ±?ç??é©?è?æ©?å?¶ã??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:446
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:344
 #, c-format
 msgid "SASL '%s' Login failed for POP server %s%s"
 msgstr "å?¨ POP ä¼ºæ??å?¨ %2$s ä»¥ SASL ã??%1$sã??ç?»å?¥å¤±æ??%3$s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:460
+#: ../camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "ä¸?è?½ç?»å?¥ POP ä¼ºæ??å?¨ %sï¼? SASL é??è¨?å??å®?é?¯èª¤"
 
 # camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/pop3/camel-pop3-store.c:479
+#: ../camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
-msgid "Failed to authenticate on POP server %s: %s"
-msgstr "ç?¡æ³?é©?è? POP ä¼ºæ??å?¨ %sï¼?%s"
+msgid "Failed to authenticate on POP server %s: "
+msgstr "ç?¡æ³?é©?è? POP ä¼ºæ??å?¨ %sï¼?"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:538
+#: ../camel/providers/pop3/camel-pop3-store.c:442
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -5122,7 +4933,7 @@ msgid ""
 msgstr "ç?¡æ³?é?£ç·?è?³ POP ä¼ºæ??å?¨ %sï¼?\tæ?¶å?°ç?¡æ??ç?? APOP IDã??æ?¨æ¸¬å?¯è?½æ?¯ä½¿ç?¨è??å??å??æ?»æ??ã??è«?è?¯çµ¡ä½ ç??ç³»çµ±ç®¡ç??è??ã??"
 
 # camel/providers/pop3/camel-pop3-store.c:417
-#: ../camel/providers/pop3/camel-pop3-store.c:579
+#: ../camel/providers/pop3/camel-pop3-store.c:492
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -5132,7 +4943,8 @@ msgstr ""
 "å?³é??å¯?ç¢¼æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
 # camel/providers/pop3/camel-pop3-store.c:417
-#: ../camel/providers/pop3/camel-pop3-store.c:588
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:505
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -5142,7 +4954,8 @@ msgstr ""
 "å?³é??ä½¿ç?¨è??å??ç¨±ç?¼ç??é?¯èª¤%s"
 
 # camel/providers/pop3/camel-pop3-store.c:417
-#: ../camel/providers/pop3/camel-pop3-store.c:597
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:518
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -5151,233 +4964,259 @@ msgstr ""
 "ç?¡æ³?é?£ç·?å?° POP ä¼ºæ??å?¨ %sã??\n"
 "å?³é??å¯?ç¢¼æ??ç?¼ç??é?¯èª¤%s"
 
+# camel/providers/pop3/camel-pop3-store.c:322
+#: ../camel/providers/pop3/camel-pop3-store.c:674
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr "ç?¡æ³?é?£ç·?å?° POP ä¼ºæ??å?¨ %s"
+
+# camel/providers/smtp/camel-smtp-transport.c:534
+#: ../camel/providers/pop3/camel-pop3-store.c:687
+#, c-format
+msgid "POP3 server %s"
+msgstr "POP3 ä¼ºæ??å?¨ %s"
+
+# camel/camel-remote-store.c:195
+#: ../camel/providers/pop3/camel-pop3-store.c:691
+#, c-format
+msgid "POP3 server for %s on %s"
+msgstr "%s å?¨ %s ç?? POP3 ä¼ºæ??å?¨"
+
 # camel/providers/pop3/camel-pop3-store.c:484
-#: ../camel/providers/pop3/camel-pop3-store.c:703
+#: ../camel/providers/pop3/camel-pop3-store.c:706
 #, c-format
 msgid "No such folder '%s'."
 msgstr "æ²?æ??é??å??è³?æ??å¤¾ã??%sã??ã??"
 
+#: ../camel/providers/pop3/camel-pop3-store.c:730
+#, c-format
+msgid "POP3 stores have no folder hierarchy"
+msgstr "POP3 å?²å?å??æ²?æ??è³?æ??å¤¾é??å±¤"
+
 # camel/providers/sendmail/camel-sendmail-provider.c:37
 # mail/mail-config.glade.h:67
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "Sendmail"
 msgstr "Sendmail"
 
 # camel/providers/sendmail/camel-sendmail-provider.c:39
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:40
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr "å°?é??é??ç??é?µä»¶äº¤çµ¦æ?¬å?°ç«¯ç³»çµ±ä¸?ç??ã??sendmailã??ç¨?å¼?è??ç??ã??"
 
 # camel/camel-url.c:289
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:113
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:98
+#, c-format
 msgid "Could not parse recipient list"
 msgstr "ç?¡æ³?å??æ??æ?¶ä»¶äººæ¸?å?®"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:107
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:144
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:131
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "ç?¡æ³?å»ºç«?å°?ç®¡å?°ã??sendmailã??ç¨?å¼?ï¼? %sï¼?é?µä»¶ç?¡æ³?å?³é??"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:124
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:165
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:153
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "ç?¡æ³?å?¦å¤?å??å??å??ä¸?å?? sendmail è¡?ç¨?ï¼? %sï¼?é?µä»¶ç?¡æ³?å?³é??"
 
+# camel/providers/sendmail/camel-sendmail-transport.c:150
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:194
+msgid "Could not send message: "
+msgstr "ç?¡æ³?å?³é??é?µä»¶ï¼?"
+
 # camel/providers/sendmail/camel-sendmail-transport.c:163
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:235
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail å??å?³é??é??è¨?æ?¯ %sï¼?é?µä»¶ç?¡æ³?å?³é??"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:170
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:242
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "ç?¡æ³?å?·è¡? %sï¼? é?µä»¶ç?¡æ³?å?³é??ã??"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:175
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:247
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail ç?±æ?¼ç??æ³? %d é??é??ï¼? é?µä»¶ç?¡æ³?å?³é??ã??"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:247
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:261
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:248
 msgid "sendmail"
 msgstr "sendmail"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:249
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:250
 msgid "Mail delivery via the sendmail program"
 msgstr "ç¶?ç?± sendmail ç¨?å¼?å?³é??é?µä»¶"
 
 # camel/providers/smtp/camel-smtp-provider.c:38
 # mail/mail-config.glade.h:62
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
 msgid "SMTP"
 msgstr "SMTP"
 
 # camel/providers/smtp/camel-smtp-provider.c:40
-#: ../camel/providers/smtp/camel-smtp-provider.c:43
+#: ../camel/providers/smtp/camel-smtp-provider.c:45
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "ä½¿ç?¨ SMTP é?£ç·?å?°é? ç«¯ mailhub ä¾?å?³é??é?µä»¶ã??"
 
 # camel/providers/smtp/camel-smtp-transport.c:168
-#: ../camel/providers/smtp/camel-smtp-transport.c:167
+#: ../camel/providers/smtp/camel-smtp-transport.c:116
 msgid "Syntax error, command unrecognized"
 msgstr "èª?æ³?é?¯èª¤ï¼?ä¸?èª?è?ç??æ??ä»¤"
 
 # camel/providers/smtp/camel-smtp-transport.c:170
-#: ../camel/providers/smtp/camel-smtp-transport.c:169
+#: ../camel/providers/smtp/camel-smtp-transport.c:118
 msgid "Syntax error in parameters or arguments"
 msgstr "å??æ?¸å?§ç??èª?æ³?é?¯èª¤"
 
 # camel/providers/smtp/camel-smtp-transport.c:172
-#: ../camel/providers/smtp/camel-smtp-transport.c:171
+#: ../camel/providers/smtp/camel-smtp-transport.c:120
 msgid "Command not implemented"
 msgstr "æ??ä»¤æ²?æ??å¯¦ä½?"
 
 # camel/providers/smtp/camel-smtp-transport.c:174
-#: ../camel/providers/smtp/camel-smtp-transport.c:173
+#: ../camel/providers/smtp/camel-smtp-transport.c:122
 msgid "Command parameter not implemented"
 msgstr "æ??ä»¤ç??å??æ?¸æ²?æ??å¯¦ä½?"
 
 # camel/providers/smtp/camel-smtp-transport.c:176
-#: ../camel/providers/smtp/camel-smtp-transport.c:175
+#: ../camel/providers/smtp/camel-smtp-transport.c:124
 msgid "System status, or system help reply"
 msgstr "ç³»çµ±ç??æ³?ï¼?æ??è??æ?¯ç³»çµ±ç??æ±?å?©èªªæ??å??æ??"
 
 # camel/providers/smtp/camel-smtp-transport.c:178
-#: ../camel/providers/smtp/camel-smtp-transport.c:177
+#: ../camel/providers/smtp/camel-smtp-transport.c:126
 msgid "Help message"
 msgstr "æ±?å?©èªªæ??è¨?æ?¯"
 
 # camel/providers/smtp/camel-smtp-transport.c:180
-#: ../camel/providers/smtp/camel-smtp-transport.c:179
+#: ../camel/providers/smtp/camel-smtp-transport.c:128
 msgid "Service ready"
 msgstr "æ??å??å·²å°±ç·?"
 
 # camel/providers/smtp/camel-smtp-transport.c:182
-#: ../camel/providers/smtp/camel-smtp-transport.c:181
+#: ../camel/providers/smtp/camel-smtp-transport.c:130
 msgid "Service closing transmission channel"
 msgstr "æ¤æ??å??å°?å?³è¼¸é??é??é??é??"
 
 # camel/providers/smtp/camel-smtp-transport.c:184
-#: ../camel/providers/smtp/camel-smtp-transport.c:183
+#: ../camel/providers/smtp/camel-smtp-transport.c:132
 msgid "Service not available, closing transmission channel"
 msgstr "æ¤æ??å??ä»?æ?ªå?¯ç?¨ï¼?å?³è¼¸é??é??é??é??"
 
 # camel/providers/smtp/camel-smtp-transport.c:186
-#: ../camel/providers/smtp/camel-smtp-transport.c:185
+#: ../camel/providers/smtp/camel-smtp-transport.c:134
 msgid "Requested mail action okay, completed"
 msgstr " æ??è¦?æ±?ç??é?µä»¶å??ä½?å·²æ??å??å®?æ??"
 
 # camel/providers/smtp/camel-smtp-transport.c:188
-#: ../camel/providers/smtp/camel-smtp-transport.c:187
+#: ../camel/providers/smtp/camel-smtp-transport.c:136
 msgid "User not local; will forward to <forward-path>"
 msgstr "ä¸?æ?¯æ?¬å?°ç«¯ç??ä½¿ç?¨è??ï¼?å°?æ??è½?å¯?è?³ <è½?å¯?è·¯å¾?>"
 
 # camel/providers/smtp/camel-smtp-transport.c:190
-#: ../camel/providers/smtp/camel-smtp-transport.c:189
+#: ../camel/providers/smtp/camel-smtp-transport.c:138
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "æ??è¦?æ±?ç??é?µä»¶å??ä½?ç?¡æ³?å?·è¡?ï¼?é?µç®±ä»?æ?ªå?¯ç?¨"
 
 # camel/providers/smtp/camel-smtp-transport.c:192
-#: ../camel/providers/smtp/camel-smtp-transport.c:191
+#: ../camel/providers/smtp/camel-smtp-transport.c:140
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "æ??è¦?æ±?ç??å??ä½?ç?¡æ³?å?·è¡?ï¼?é?µç®±ä»?æ?ªå?¯ç?¨"
 
 # camel/providers/smtp/camel-smtp-transport.c:194
-#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:142
 msgid "Requested action aborted: error in processing"
 msgstr "æ??è¦?æ±?ç??å??ä½?å·²æ?¾æ£?ï¼?æ£å?¨è??ç??æ??ç?¼ç??é?¯èª¤"
 
 # camel/providers/smtp/camel-smtp-transport.c:196
-#: ../camel/providers/smtp/camel-smtp-transport.c:195
+#: ../camel/providers/smtp/camel-smtp-transport.c:144
 msgid "User not local; please try <forward-path>"
 msgstr "ä¸?æ?¯æ?¬å?°ç«¯ç??ä½¿ç?¨è??ï¼?è«?å??è©¦ä½¿ç?¨ <è½?å¯?è·¯å¾?>"
 
 # camel/providers/smtp/camel-smtp-transport.c:198
-#: ../camel/providers/smtp/camel-smtp-transport.c:197
+#: ../camel/providers/smtp/camel-smtp-transport.c:146
 msgid "Requested action not taken: insufficient system storage"
 msgstr "æ??è¦?æ±?ç??å??ä½?ç?¡æ³?å?·è¡?ï¼?ç³»çµ±ç??å?²å?ç©ºé??ä¸?è¶³"
 
 # camel/providers/smtp/camel-smtp-transport.c:200
-#: ../camel/providers/smtp/camel-smtp-transport.c:199
+#: ../camel/providers/smtp/camel-smtp-transport.c:148
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "æ??è¦?æ±?ç??é?µä»¶å??ä½?å·²æ?¾æ£?ï¼?è¶?å?ºå?¯ä¾?å?²å?ç©ºé??ç??é??å?¶"
 
 # camel/providers/smtp/camel-smtp-transport.c:202
-#: ../camel/providers/smtp/camel-smtp-transport.c:201
+#: ../camel/providers/smtp/camel-smtp-transport.c:150
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "æ??è¦?æ±?ç??å??ä½?å·²æ?¾æ£?ï¼?ä¸?å??è¨±ç??é?µç®±å??ç¨±"
 
 # camel/providers/smtp/camel-smtp-transport.c:204
-#: ../camel/providers/smtp/camel-smtp-transport.c:203
+#: ../camel/providers/smtp/camel-smtp-transport.c:152
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "è«?é??å§?è¼¸å?¥é?µä»¶ç??è³?æ??ï¼?<CRLF>.<CRLF> çµ?æ??æ?°å¯«é?µä»¶"
 
 # camel/providers/smtp/camel-smtp-transport.c:206
-#: ../camel/providers/smtp/camel-smtp-transport.c:205
+#: ../camel/providers/smtp/camel-smtp-transport.c:154
 msgid "Transaction failed"
 msgstr "å?·è¡?å¤±æ??"
 
 # camel/providers/smtp/camel-smtp-transport.c:210
-#: ../camel/providers/smtp/camel-smtp-transport.c:209
+#: ../camel/providers/smtp/camel-smtp-transport.c:158
 msgid "A password transition is needed"
 msgstr "é??è¦?å¯?ç¢¼å?³é??"
 
 # camel/providers/smtp/camel-smtp-transport.c:212
-#: ../camel/providers/smtp/camel-smtp-transport.c:211
+#: ../camel/providers/smtp/camel-smtp-transport.c:160
 msgid "Authentication mechanism is too weak"
 msgstr "é©?è?æ©?å?¶å¤ªå¼±äº?"
 
 # camel/providers/smtp/camel-smtp-transport.c:214
-#: ../camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/smtp/camel-smtp-transport.c:162
 msgid "Encryption required for requested authentication mechanism"
 msgstr "æ??è¦?æ±?ç??é©?è?æ©?å?¶å¿?é ?å? å¯?è??ç??"
 
 # camel/providers/smtp/camel-smtp-transport.c:216
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
+#: ../camel/providers/smtp/camel-smtp-transport.c:164
 msgid "Temporary authentication failure"
 msgstr "è?¨æ??é©?è?å¤±æ??"
 
 # camel/providers/smtp/camel-smtp-transport.c:1043
-#: ../camel/providers/smtp/camel-smtp-transport.c:296
-msgid "Welcome response error"
-msgstr "è¿?æ?¥ç??å??æ??é?¯èª¤"
+#: ../camel/providers/smtp/camel-smtp-transport.c:252
+#: ../camel/providers/smtp/camel-smtp-transport.c:258
+msgid "Welcome response error: "
+msgstr "è¿?æ?¥ç??å??æ??é?¯èª¤ï¼?"
 
 # camel/providers/pop3/camel-pop3-store.c:379
+#: ../camel/providers/smtp/camel-smtp-transport.c:294
 #: ../camel/providers/smtp/camel-smtp-transport.c:331
-#: ../camel/providers/smtp/camel-smtp-transport.c:364
-#: ../camel/providers/smtp/camel-smtp-transport.c:370
+#: ../camel/providers/smtp/camel-smtp-transport.c:338
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "ç?¡æ³?ä»¥å®?å?¨æ¨¡å¼?é?£ç·?å?° SMTP ä¼ºæ??å?¨ %sï¼? %s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:340
-#, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "STARTTLS æ??ä»¤å¤±æ??ï¼?%s"
-
-# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:355
-msgid "STARTTLS command failed"
-msgstr "STARTTLS æ??ä»¤å¤±æ??"
+#: ../camel/providers/smtp/camel-smtp-transport.c:302
+#: ../camel/providers/smtp/camel-smtp-transport.c:314
+#: ../camel/providers/smtp/camel-smtp-transport.c:320
+msgid "STARTTLS command failed: "
+msgstr "STARTTLS æ??ä»¤å¤±æ??ï¼?"
 
 # camel/providers/smtp/camel-smtp-transport.c:356
-#: ../camel/providers/smtp/camel-smtp-transport.c:496
+#: ../camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP ä¼ºæ??å?¨ %s ä¸?æ?¯æ?´æ??è¦?æ±?ç??é©?è?é¡?å?? %sã??"
 
 # camel/providers/smtp/camel-smtp-transport.c:418
-#: ../camel/providers/smtp/camel-smtp-transport.c:567
+#: ../camel/providers/smtp/camel-smtp-transport.c:547
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5389,237 +5228,210 @@ msgstr ""
 "\n"
 
 # camel/providers/smtp/camel-smtp-transport.c:534
-#: ../camel/providers/smtp/camel-smtp-transport.c:700
+#: ../camel/providers/smtp/camel-smtp-transport.c:685
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ä¼ºæ??å?¨ %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:536
-#: ../camel/providers/smtp/camel-smtp-transport.c:702
+#: ../camel/providers/smtp/camel-smtp-transport.c:687
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "ç¶?ç?± %s å?³é?? SMTP é?µä»¶"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/providers/smtp/camel-smtp-transport.c:720
+#: ../camel/providers/smtp/camel-smtp-transport.c:707
+#, c-format
 msgid "Cannot send message: service not connected."
 msgstr "ç?¡æ³?å?³é??è¨?æ?¯ï¼?æ??å??æ?ªé?£ç·?ã??"
 
 # camel/providers/smtp/camel-smtp-transport.c:568
-#: ../camel/providers/smtp/camel-smtp-transport.c:726
+#: ../camel/providers/smtp/camel-smtp-transport.c:714
+#, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "ä¸?è?½å?³é??é?µä»¶ï¼?å¯?ä»¶è??ç??å?°å??ç?¡æ??ã??"
 
 # mail/mail-ops.c:603
-#: ../camel/providers/smtp/camel-smtp-transport.c:730
+#: ../camel/providers/smtp/camel-smtp-transport.c:718
 msgid "Sending message"
 msgstr "å?³é??é?µä»¶"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
+#: ../camel/providers/smtp/camel-smtp-transport.c:734
+#, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "ä¸?è?½å?³é??é?µä»¶ï¼?æ²?æ??å®?ç¾©æ?¶ä»¶è??ã??"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/providers/smtp/camel-smtp-transport.c:756
+#: ../camel/providers/smtp/camel-smtp-transport.c:746
+#, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "ä¸?è?½å?³é??é?µä»¶ï¼?ä¸?æ??å¤?å??ç?¡æ??ç??æ?¶ä»¶è??"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: ../camel/providers/smtp/camel-smtp-transport.c:985
+#: ../camel/providers/smtp/camel-smtp-transport.c:982
 msgid "SMTP Greeting"
 msgstr "SMTP è¿?æ?¥"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1010
-#, c-format
-msgid "HELO command failed: %s"
-msgstr "HELO æ??ä»¤å¤±æ??ï¼?%s"
-
-# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1027
-msgid "HELO command failed"
-msgstr "HELO æ??ä»¤å¤±æ??"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1006
+#: ../camel/providers/smtp/camel-smtp-transport.c:1021
+#: ../camel/providers/smtp/camel-smtp-transport.c:1028
+msgid "HELO command failed: "
+msgstr "HELO æ??ä»¤å¤±æ??ï¼?"
 
 # mail/mail-config.glade.h:10
-#: ../camel/providers/smtp/camel-smtp-transport.c:1093
+#: ../camel/providers/smtp/camel-smtp-transport.c:1095
 msgid "SMTP Authentication"
 msgstr "SMTP é©?è?"
 
 # camel/providers/smtp/camel-smtp-transport.c:728
-#: ../camel/providers/smtp/camel-smtp-transport.c:1099
+#: ../camel/providers/smtp/camel-smtp-transport.c:1102
+#, c-format
 msgid "Error creating SASL authentication object."
 msgstr "å»ºç«? SASL é©?è?ç?©ä»¶æ??ç?¼ç??é?¯èª¤ã??"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1116
-#: ../camel/providers/smtp/camel-smtp-transport.c:1127
-#, c-format
-msgid "AUTH command failed: %s"
-msgstr "AUTH æ??ä»¤å¤±æ??ï¼?%s"
-
-# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1133
-msgid "AUTH command failed"
-msgstr "AUTH æ??ä»¤å¤±æ??"
-
-# camel/providers/smtp/camel-smtp-transport.c:809
-#: ../camel/providers/smtp/camel-smtp-transport.c:1203
-msgid "Bad authentication response from server.\n"
-msgstr "å¾?ä¼ºæ??å?¨å?³å??ä¸?æ£ç¢ºé©?è?ç??å??æ??ã??\n"
-
-# camel/providers/smtp/camel-smtp-transport.c:835
-#: ../camel/providers/smtp/camel-smtp-transport.c:1230
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "MAIL FROM æ??ä»¤å¤±æ??ï¼?%sï¼?é?µä»¶æ?ªå?³é??"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1118
+#: ../camel/providers/smtp/camel-smtp-transport.c:1128
+#: ../camel/providers/smtp/camel-smtp-transport.c:1136
+msgid "AUTH command failed: "
+msgstr "AUTH æ??ä»¤å¤±æ??ï¼?"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1247
-msgid "MAIL FROM command failed"
-msgstr "MAIL FROM æ??ä»¤å¤±æ??"
-
-# camel/providers/smtp/camel-smtp-transport.c:879
-#: ../camel/providers/smtp/camel-smtp-transport.c:1271
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "RCPT TO æ??ä»¤å¤±æ??ï¼?%sï¼?é?µä»¶æ?ªå?³é??"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1290
-#, c-format
-msgid "RCPT TO <%s> failed"
-msgstr "RCPT TO <%s> å¤±æ??"
-
-# camel/providers/smtp/camel-smtp-transport.c:929
-#: ../camel/providers/smtp/camel-smtp-transport.c:1330
-#: ../camel/providers/smtp/camel-smtp-transport.c:1399
-#: ../camel/providers/smtp/camel-smtp-transport.c:1418
-#, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "DATA æ??ä»¤å¤±æ??ï¼?%sï¼?é?µä»¶æ?ªå?³é??"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1233
+#: ../camel/providers/smtp/camel-smtp-transport.c:1245
+#: ../camel/providers/smtp/camel-smtp-transport.c:1252
+msgid "MAIL FROM command failed: "
+msgstr "MAIL FROM æ??ä»¤å¤±æ??ï¼?"
 
 # camel/providers/imap/camel-imap-command.c:240
-#. 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
-msgid "DATA command failed"
-msgstr "DATA æ??ä»¤å¤±æ??"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1275
+msgid "RCPT TO command failed: "
+msgstr "RCPT TO æ??ä»¤å¤±æ??ï¼?"
 
-# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1457
+#: ../camel/providers/smtp/camel-smtp-transport.c:1289
+#: ../camel/providers/smtp/camel-smtp-transport.c:1297
 #, c-format
-msgid "RSET command failed: %s"
-msgstr "RSET æ??ä»¤å¤±æ??ï¼?%s"
+msgid "RCPT TO <%s> failed: "
+msgstr "RCPT TO <%s> å¤±æ??ï¼?"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1473
-msgid "RSET command failed"
-msgstr "RSET æ??ä»¤å¤±æ??"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1335
+#: ../camel/providers/smtp/camel-smtp-transport.c:1344
+#: ../camel/providers/smtp/camel-smtp-transport.c:1354
+#: ../camel/providers/smtp/camel-smtp-transport.c:1411
+#: ../camel/providers/smtp/camel-smtp-transport.c:1427
+#: ../camel/providers/smtp/camel-smtp-transport.c:1438
+#: ../camel/providers/smtp/camel-smtp-transport.c:1445
+msgid "DATA command failed: "
+msgstr "DATA æ??ä»¤å¤±æ??ï¼?"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1496
-#, c-format
-msgid "QUIT command failed: %s"
-msgstr "QUIT æ??ä»¤å¤±æ??ï¼?%s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1467
+#: ../camel/providers/smtp/camel-smtp-transport.c:1479
+#: ../camel/providers/smtp/camel-smtp-transport.c:1486
+msgid "RSET command failed: "
+msgstr "RSET æ??ä»¤å¤±æ??ï¼?"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1510
-msgid "QUIT command failed"
-msgstr "QUIT æ??ä»¤å¤±æ??"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1508
+#: ../camel/providers/smtp/camel-smtp-transport.c:1521
+#: ../camel/providers/smtp/camel-smtp-transport.c:1527
+msgid "QUIT command failed: "
+msgstr "QUIT æ??ä»¤å¤±æ??ï¼?"
 
 # addressbook/contact-editor/e-contact-editor.c:1243
 # addressbook/contact-editor/e-contact-editor.c:1310
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:45
 msgid "Business"
 msgstr "å??å??é?»è©±"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:46
 msgid "Competition"
 msgstr "ç«¶ç?è??"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:47
 msgid "Favorites"
 msgstr "å??æ??ç??"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:48
 msgid "Gifts"
 msgstr "ç¦®ç?©"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:49
 msgid "Goals/Objectives"
 msgstr "çµ?é»?/ç?®æ¨?"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:50
 msgid "Holiday"
 msgstr "å??æ?¥"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:51
 msgid "Holiday Cards"
 msgstr "å??æ?¥é??è«?å?¡"
 
 # ui/evolution-addressbook.xml.h:17
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:53
 msgid "Hot Contacts"
 msgstr "ç?±é??è?¯çµ¡äºº"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:54
 msgid "Ideas"
 msgstr "å?µæ??"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:55
 msgid "International"
 msgstr "å??é??ç??"
 
 # ui/evolution-event-editor.xml.h:15
 # ui/evolution-task-editor-dialog.xml.h:16
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:56
 msgid "Key Customer"
 msgstr "é??é?µå®¢æ?¶"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:57
 msgid "Miscellaneous"
 msgstr "é??é ?"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:58
 msgid "Personal"
 msgstr "å??äºº"
 
 # calendar/gui/e-meeting-dialog.glade.h:21
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:59
 msgid "Phone Calls"
 msgstr "é?»è©±"
 
 # calendar/gui/e-meeting-dialog.glade.h:23
 # mail/message-list.c:1081
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:61
 msgid "Status"
 msgstr "ç??æ??"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:62
 msgid "Strategies"
 msgstr "ç?ç?¥"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:63
 msgid "Suppliers"
 msgstr "ä¾?æ??å??"
 
 # addressbook/backend/ebook/e-card.c:3434
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:64
 msgid "Time & Expenses"
 msgstr "æ??é??è??é??é?·"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:65
 msgid "VIP"
 msgstr "VIP"
 
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:66
 msgid "Waiting"
 msgstr "æ£å?¨ç?å¾?"
 
@@ -5629,7 +5441,7 @@ msgstr "æ£å?¨ç?å¾?"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1633 ../libedataserver/e-time-utils.c:1898
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1902
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
@@ -5639,7 +5451,7 @@ msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1638 ../libedataserver/e-time-utils.c:1889
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1893
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %H:%M:%S"
 
@@ -5648,7 +5460,7 @@ msgstr "%Y/%m/%d (%a) %H:%M:%S"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1643 ../libedataserver/e-time-utils.c:1894
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1898
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
@@ -5657,21 +5469,21 @@ 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:1648 ../libedataserver/e-time-utils.c:1885
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1889
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 # e-util/e-time-utils.c:283
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1653
+#: ../libedataserver/e-time-utils.c:1655
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %m/%d/%Y %I %p"
 
 # e-util/e-time-utils.c:274
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1658
+#: ../libedataserver/e-time-utils.c:1660
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %m/%d/%Y %H"
 
@@ -5680,43 +5492,43 @@ msgstr "%a %m/%d/%Y %H"
 # widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1661 ../libedataserver/e-time-utils.c:1761
-#: ../libedataserver/e-time-utils.c:1880
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1765
+#: ../libedataserver/e-time-utils.c:1884
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
 # calendar/gui/calendar-model.c:797
 # e-util/e-time-utils.c:287
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1668
+#: ../libedataserver/e-time-utils.c:1670
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%m/%d/%Y %I:%M:%S %p"
 
 # calendar/gui/calendar-model.c:794
 # e-util/e-time-utils.c:278
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1672
+#: ../libedataserver/e-time-utils.c:1674
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%m/%d/%Y %H:%M:%S"
 
 # e-util/e-time-utils.c:283
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1677
+#: ../libedataserver/e-time-utils.c:1679
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%m/%d/%Y %I:%M %p"
 
 # e-util/e-time-utils.c:274
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1682
+#: ../libedataserver/e-time-utils.c:1684
 msgid "%m/%d/%Y %H:%M"
 msgstr "%m/%d/%Y %H:%M"
 
 # e-util/e-time-utils.c:283
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1687
+#: ../libedataserver/e-time-utils.c:1689
 msgid "%m/%d/%Y %I %p"
 msgstr "%m/%d/%Y %I %p"
 
@@ -5727,7 +5539,7 @@ msgstr "%m/%d/%Y %I %p"
 # widgets/misc/e-dateedit.c:1465
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1692
+#: ../libedataserver/e-time-utils.c:1694
 msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%Y %H"
 
@@ -5738,21 +5550,21 @@ msgstr "%m/%d/%Y %H"
 # widgets/misc/e-dateedit.c:1465
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1695 ../libedataserver/e-time-utils.c:1764
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1768
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
 # e-util/e-time-utils.c:323
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1822 ../libedataserver/e-time-utils.c:1942
+#: ../libedataserver/e-time-utils.c:1826 ../libedataserver/e-time-utils.c:1946
 msgid "%I:%M:%S %p"
 msgstr "%p %I:%M:%S"
 
 # e-util/e-time-utils.c:315
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1826 ../libedataserver/e-time-utils.c:1934
+#: ../libedataserver/e-time-utils.c:1830 ../libedataserver/e-time-utils.c:1938
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -5764,7 +5576,7 @@ msgstr "%H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1831 ../libedataserver/e-time-utils.c:1939
+#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1943
 msgid "%I:%M %p"
 msgstr "%p %I:%M"
 
@@ -5775,7 +5587,7 @@ msgstr "%p %I:%M"
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1931
+#: ../libedataserver/e-time-utils.c:1839 ../libedataserver/e-time-utils.c:1935
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -5784,7 +5596,7 @@ msgstr "%H:%M"
 # widgets/misc/e-dateedit.c:1318
 # widgets/misc/e-dateedit.c:1497
 #. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1838
+#: ../libedataserver/e-time-utils.c:1842
 msgid "%H%M"
 msgstr "%H%M"
 
@@ -5793,40 +5605,40 @@ msgstr "%H%M"
 # widgets/misc/e-dateedit.c:1321
 # widgets/misc/e-dateedit.c:1500
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1842
+#: ../libedataserver/e-time-utils.c:1846
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-book-auth-util.c:90
+#: ../libedataserverui/e-book-auth-util.c:93
 msgid "Accessing LDAP Server anonymously"
 msgstr "æ£ä»¥å?¿å??æ?¹å¼?å?å?? LDAP ä¼ºæ??å?¨"
 
-#: ../libedataserverui/e-book-auth-util.c:192
+#: ../libedataserverui/e-book-auth-util.c:199
 msgid "Failed to authenticate.\n"
 msgstr "é©?è?è?æ?¸å¤±æ??ã??\n"
 
 # calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.c:143
+#: ../libedataserverui/e-categories-dialog.c:145
 msgid "Category Icon"
 msgstr "å??é¡?å??ç¤º"
 
-#: ../libedataserverui/e-categories-dialog.c:149
+#: ../libedataserverui/e-categories-dialog.c:151
 msgid "_No Image"
 msgstr "æ²?æ??å??ç??(_N)"
 
-#: ../libedataserverui/e-categories-dialog.c:370
+#: ../libedataserverui/e-categories-dialog.c:372
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "å?¨çµ?æ??ä¸å·²ç¶?æ??å??ç?ºã??%sã??ç??å??é¡?ã??è«?ä½¿ç?¨å?¦å¤?ç??å??ç¨±"
 
-#: ../libedataserverui/e-categories-dialog.c:678
+#: ../libedataserverui/e-categories-dialog.c:680
 msgid "Icon"
 msgstr "å??ç¤º"
 
 # calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-categories-dialog.c:683
+#: ../libedataserverui/e-categories-dialog.c:685
 msgid "Category"
 msgstr "å??é¡?"
 
@@ -5846,10 +5658,9 @@ msgstr "å??é¡?å??ç¤º(_I)"
 msgid "Category _Name"
 msgstr "å??é¡?å??ç¨±(_N)"
 
-# addressbook/contact-editor/e-contact-editor.c:603
 #: ../libedataserverui/e-categories-dialog.ui.h:4
-msgid "Item(s) _belong to these categories:"
-msgstr "å±¬æ?¼é??äº?å??é¡?ç??é ?ç?®(_B):"
+msgid "Currently _used categories:"
+msgstr "ç?®å??ä½¿ç?¨ç??å??é¡?(_U):"
 
 # calendar/gui/e-calendar-table.c:150
 #: ../libedataserverui/e-categories-dialog.ui.h:5
@@ -5866,33 +5677,25 @@ msgid "categories"
 msgstr "å??é¡?"
 
 # calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-category-completion.c:290
+#: ../libedataserverui/e-category-completion.c:292
 #, c-format
 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:587
+#: ../libedataserverui/e-name-selector-dialog.c:658
 msgid "_Add"
 msgstr "å? å?¥(_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:612
+#: ../libedataserverui/e-name-selector-dialog.c:662
 msgid "_Remove"
 msgstr "ç§»é?¤(_R)"
 
 # calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-name-selector-dialog.c:789
+#: ../libedataserverui/e-name-selector-dialog.c:858
 #: ../libedataserverui/e-name-selector-dialog.ui.h:6
 msgid "Any Category"
 msgstr "ä»»ä½?å??é¡?"
@@ -5937,56 +5740,56 @@ msgid "_Search:"
 msgstr "æ??å°?(_S):"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2508
+#: ../libedataserverui/e-name-selector-entry.c:2559
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "å±?é??è¡?å?§ %s"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2523
+#: ../libedataserverui/e-name-selector-entry.c:2574
 #, c-format
 msgid "Cop_y %s"
 msgstr "è¤?è£½(_Y) %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2533
+#: ../libedataserverui/e-name-selector-entry.c:2584
 #, c-format
 msgid "C_ut %s"
 msgstr "å?ªä¸?(_U) %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2550
+#: ../libedataserverui/e-name-selector-entry.c:2601
 #, c-format
 msgid "_Edit %s"
 msgstr "ç·¨è¼¯ %s(_E)"
 
-#: ../libedataserverui/e-name-selector-list.c:469
+#: ../libedataserverui/e-name-selector-list.c:517
 #, c-format
 msgid "_Delete %s"
 msgstr "å?ªé?¤(_D) %s"
 
-#: ../libedataserverui/e-passwords.c:234
+#: ../libedataserverui/e-passwords.c:257
 #, c-format
 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 "ä½ ç?? Caps Lock æ?¯é??å??ç??ã??"
 
-#: ../libedataserverui/e-passwords.c:1215
+#: ../libedataserverui/e-passwords.c:1238
 msgid "_Remember this passphrase"
 msgstr "è¨?ä½?é??å??å¯?èª?(_R)"
 
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:1239
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "è¨?ä½?é??å??ç?¨æ?¼å?©é¤?ç??å·¥ä½?é??æ®µç??å¯?èª?(_R)"
 
-#: ../libedataserverui/e-passwords.c:1221
+#: ../libedataserverui/e-passwords.c:1244
 msgid "_Remember this password"
 msgstr "è¨?ä½?é??å??å¯?ç¢¼(_R)"
 
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:1245
 msgid "_Remember this password for the remainder of this session"
 msgstr "è¨?ä½?é??å??ç?¨æ?¼å?©é¤?ç??å·¥ä½?é??æ®µç??å¯?ç¢¼(_R)"
 
@@ -5996,40 +5799,28 @@ msgstr "è¨?ä½?é??å??ç?¨æ?¼å?©é¤?ç??å·¥ä½?é??æ®µç??å¯?ç¢¼(_R)"
 msgid "Select destination"
 msgstr "é?¸å??ç?®ç??å?°"
 
-#: ../libedataserverui/e-source-selector-dialog.c:156
+#: ../libedataserverui/e-source-selector-dialog.c:172
 msgid "_Destination"
 msgstr "ç?®ç??ç«¯(_D)"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../servers/groupwise/e-gw-connection.c:225
+#: ../servers/groupwise/e-gw-connection.c:227
 msgid "Invalid connection"
 msgstr "ç?¡æ??ç??é?£ç·?"
 
 # camel/camel-sasl-kerberos4.c:218
 # camel/providers/imap/camel-imap-store.c:433
-#: ../servers/groupwise/e-gw-connection.c:229
+#: ../servers/groupwise/e-gw-connection.c:231
 msgid "Invalid response from server"
 msgstr "ç?¡æ??ç??ä¼ºæ??å?¨å??æ??"
 
 # camel/camel-sasl-kerberos4.c:218
 # camel/providers/imap/camel-imap-store.c:433
-#: ../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 "é?¯èª¤ç??å??æ?¸"
-
-#~ 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"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 5e404c6..034d420 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,10 +6,10 @@
 # Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005. 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution-data-server 2.29.91\n"
+"Project-Id-Version: evolution-data-server 2.31.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-15 11:49+0800\n"
-"PO-Revision-Date: 2010-02-14 22:42+0800\n"
+"POT-Creation-Date: 2010-07-20 14:23+0800\n"
+"PO-Revision-Date: 2010-07-16 09:49+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n lists linux org tw>\n"
 "MIME-Version: 1.0\n"
@@ -19,92 +19,108 @@ msgstr ""
 
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
-#: ../addressbook/backends/file/e-book-backend-file.c:560
+#: ../addressbook/backends/file/e-book-backend-file.c:570
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
 msgid "Loading..."
 msgstr "è¼?å?¥ä¸..."
 
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
-#: ../addressbook/backends/file/e-book-backend-file.c:563
+#: ../addressbook/backends/file/e-book-backend-file.c:573
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4551
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4491
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
 msgid "Searching..."
 msgstr "æ??å°?ä¸..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4715
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2698
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4650
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "æ£å?¨ä¸?è¼?é?£çµ¡äºº (%d)..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2845
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2846
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3029
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3073
 #, c-format
 msgid "Updating contacts cache (%d)... "
 msgstr "æ£å?¨æ?´æ?°é?£çµ¡äººå¿«å?? (%d)..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:816
+# ui/evolution-addressbook.xml.h:17
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172
+msgid "Not connected"
+msgstr "æ?ªé?£ç·?"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:753
 msgid "Using Distinguished Name (DN)"
 msgstr "ä½¿ç?¨è¾¨èª?ç??å??ç¨± (DN)"
 
 # mail/mail-config.glade.h:29
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:819
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:756
 msgid "Using Email Address"
 msgstr "ä½¿ç?¨é?»å?é?µä»¶å?°å??"
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1096
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1031
 msgid "Reconnecting to LDAP server..."
 msgstr "æ£å?¨é??æ?°é?£æ?¥ LDAP ä¼ºæ??å?¨..."
 
+# camel/providers/local/camel-maildir-folder.c:218
+# camel/providers/local/camel-mh-folder.c:203
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1156
+msgid "Invalid DN syntax"
+msgstr "ç?¡æ??ç?? DN èª?æ³?"
+
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1738
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1672
 msgid "Adding contact to LDAP server..."
 msgstr "æ£å?¨æ?°å¢?é?£çµ¡äººè?³ LDAP ä¼ºæ??å?¨..."
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1872
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1804
 msgid "Removing contact from LDAP server..."
 msgstr "æ£å?¨ç§»é?¤ LDAP ä¼ºæ??å?¨ä¸ç??é?£çµ¡äºº..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2309
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2238
 msgid "Modifying contact from LDAP server..."
 msgstr "æ£å?¨ä¿®æ?¹ LDAP ä¼ºæ??å?¨ä¸ç??é?£çµ¡äºº..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4412
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4341
 msgid "Receiving LDAP search results..."
 msgstr "æ£å?¨æ?¥æ?¶ LDAP æ??å°?çµ?æ??..."
 
 # executive-summary/component/e-summary.c:940
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4573
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4513
 msgid "Error performing search"
 msgstr "é?²è¡?æ??å°?æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/libebook/e-book.c:2149
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:329
 #, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
-msgstr "%sï¼?æ²?æ??å?²å?æ?¼ gconf ä¸ç?? uid `%s' ä¾?æº?ã??"
+msgid "Create resource '%s' failed with http status: %d"
+msgstr ""
+
+#: ../addressbook/libebook/e-book.c:3001
+#, c-format
+msgid "%s: there was no source for UID '%s' stored in GConf."
+msgstr "%sï¼?æ²?æ??å?²å?æ?¼ GConf ä¸ç?? UIDã??%sã??ä¾?æº?ã??"
 
 #. 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"
 
@@ -114,672 +130,869 @@ 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/contact-editor/e-contact-quick-add.c:276
 # addressbook/gui/widgets/e-addressbook-view.c:700
-#: ../addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook/e-contact.c:125
 msgid "Given Name"
 msgstr "å??"
 
 # addressbook/contact-editor/e-contact-quick-add.c:276
 # addressbook/gui/widgets/e-addressbook-view.c:700
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:126
 msgid "Family Name"
 msgstr "å§?"
 
 # addressbook/gui/widgets/e-addressbook-view.c:734
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:127
 msgid "Nickname"
 msgstr "æ?±ç¨±"
 
 # addressbook/contact-editor/e-contact-editor.c:1286
 # addressbook/gui/widgets/e-addressbook-view.c:726
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Email 1"
 msgstr "é?»å?é?µä»¶ 1"
 
 # addressbook/contact-editor/e-contact-editor.c:1285
 # addressbook/gui/widgets/e-addressbook-view.c:725
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Email 2"
 msgstr "é?»å?é?µä»¶ 2"
 
 # addressbook/contact-editor/e-contact-editor.c:1286
 # addressbook/gui/widgets/e-addressbook-view.c:726
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:132
 msgid "Email 3"
 msgstr "é?»å?é?µä»¶ 3"
 
 # addressbook/contact-editor/e-contact-editor.c:1286
 # addressbook/gui/widgets/e-addressbook-view.c:726
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 4"
 msgstr "é?»å?é?µä»¶ 4"
 
 # addressbook/backend/ebook/e-card.c:3428
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Mailer"
 msgstr "å¯?ä»¶è??"
 
 # data/evolution.keys.in.h:1
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Home Address Label"
 msgstr "ä½?å®¶å?°å??æ¨?ç±¤"
 
 # data/evolution.keys.in.h:1
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:139
 msgid "Work Address Label"
 msgstr "å·¥ä½?å?°å??æ¨?ç±¤"
 
 # data/evolution.keys.in.h:1
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Other Address Label"
 msgstr "å?¶ä»?å?°å??æ¨?ç±¤"
 
 # addressbook/gui/widgets/e-addressbook-view.c:703
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Assistant Phone"
 msgstr "å?©ç??é?»è©±"
 
 # addressbook/gui/widgets/e-addressbook-view.c:704
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:144
 msgid "Business Phone"
 msgstr "å??å??é?»è©±"
 
 # addressbook/gui/widgets/e-addressbook-view.c:715
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Business Phone 2"
 msgstr "å??å??é?»è©± 2"
 
 # addressbook/contact-editor/e-contact-editor.c:1245
 # addressbook/gui/widgets/e-addressbook-view.c:713
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Business Fax"
 msgstr "å??å??å??ç??"
 
 # addressbook/gui/widgets/e-addressbook-view.c:705
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Callback Phone"
 msgstr "å??æ?¥é?»è©±"
 
 # addressbook/gui/widgets/e-addressbook-view.c:712
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Car Phone"
 msgstr "æ±½è»?é?»è©±"
 
 # addressbook/gui/widgets/e-addressbook-view.c:706
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Company Phone"
 msgstr "å?¬å?¸é?»è©±"
 
 # addressbook/gui/widgets/e-addressbook-view.c:707
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Home Phone"
 msgstr "ä½?å®¶é?»è©±"
 
 # addressbook/gui/widgets/e-addressbook-view.c:716
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Home Phone 2"
 msgstr "ä½?å®¶é?»è©± 2"
 
 # addressbook/contact-editor/e-contact-editor.c:1251
 # addressbook/gui/widgets/e-addressbook-view.c:714
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Home Fax"
 msgstr "ä½?å®¶å?³ç??"
 
 # addressbook/contact-editor/e-contact-editor.c:1252
 # addressbook/gui/widgets/e-addressbook-view.c:717
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:153
 msgid "ISDN"
 msgstr "ISDN"
 
 # addressbook/gui/widgets/e-addressbook-view.c:711
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Mobile Phone"
 msgstr "è¡?å??é?»è©±"
 
 # addressbook/gui/widgets/e-addressbook-view.c:718
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Other Phone"
 msgstr "å?¶å®?é?»è©±"
 
 # addressbook/contact-editor/e-contact-editor.c:1255
 # addressbook/gui/widgets/e-addressbook-view.c:719
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Other Fax"
 msgstr "å?¶å®?å?³ç??"
 
 # addressbook/contact-editor/e-contact-editor.c:1256
 # addressbook/gui/widgets/e-addressbook-view.c:720
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Pager"
 msgstr "å?¼å?«å?¨"
 
 # addressbook/gui/widgets/e-addressbook-view.c:702
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Primary Phone"
 msgstr "ä¸»è¦?é?»è©±"
 
 # addressbook/contact-editor/e-contact-editor.c:1258
 # addressbook/gui/widgets/e-addressbook-view.c:721
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Radio"
 msgstr "ç?¡ç·?é?»é?»è©±"
 
 # addressbook/contact-editor/e-contact-editor.c:1259
 # addressbook/gui/widgets/e-addressbook-view.c:722
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Telex"
 msgstr "é?»å ±"
 
 # addressbook/gui/widgets/e-addressbook-view.c:723
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:162
 msgid "TTY"
 msgstr "TTY"
 
 # addressbook/gui/widgets/e-addressbook-view.c:708
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Organization"
 msgstr "å??é«?"
 
 # addressbook/gui/widgets/e-addressbook-view.c:708
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Organizational Unit"
 msgstr "å??é«?å?®ä½?"
 
 # addressbook/gui/widgets/e-addressbook-view.c:729
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Office"
 msgstr "è¾¦å?¬å®¤"
 
 # addressbook/gui/widgets/e-addressbook-view.c:730
-#: ../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/gui/widgets/e-addressbook-view.c:732
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Manager"
 msgstr "ä¸»ç®¡"
 
 # addressbook/contact-editor/e-contact-editor.c:1242
 # addressbook/gui/widgets/e-addressbook-view.c:733
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Assistant"
 msgstr "å?©ç??"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Homepage URL"
 msgstr "é¦?é ? URL"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Weblog URL"
 msgstr "ç¶²èª? URL"
 
 # calendar/gui/e-calendar-table.c:150
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:669
+#: ../addressbook/libebook/e-contact.c:178
+#: ../libedataserverui/e-categories-dialog.c:671
 msgid "Categories"
 msgstr "å??é¡?"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Calendar URI"
 msgstr "è¡?äº?æ?? URI"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:182
 msgid "Free/Busy URL"
 msgstr "ç©ºé??/å¿?ç¢? URL"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:183
 msgid "ICS Calendar"
 msgstr "ICS è¡?äº?æ??"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Video Conferencing URL"
 msgstr "è¦?è¨?æ??è° URL"
 
 # addressbook/gui/widgets/e-addressbook-view.c:735
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:187
 msgid "Spouse's Name"
 msgstr "é??å?¶å§?å??"
 
 # addressbook/gui/widgets/e-addressbook-view.c:736
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:188
 msgid "Note"
 msgstr "å??è¨»"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:189
+#: ../addressbook/libebook/e-contact.c:191
 msgid "AIM Home Screen Name 1"
 msgstr "AIM å®¶ç?¨è?¢å¹?å??ç¨± 1"
 
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:192
 msgid "AIM Home Screen Name 2"
 msgstr "AIM å®¶ç?¨è?¢å¹?å??ç¨± 2"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:193
 msgid "AIM Home Screen Name 3"
 msgstr "AIM å®¶ç?¨è?¢å¹?å??ç¨± 3"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:194
 msgid "AIM Work Screen Name 1"
 msgstr "AIM å·¥ä½?è?¢å¹?å??ç¨± 1"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Work Screen Name 2"
 msgstr "AIM å·¥ä½?è?¢å¹?å??ç¨± 2"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Work Screen Name 3"
 msgstr "AIM å·¥ä½?è?¢å¹?å??ç¨± 3"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:197
 msgid "GroupWise Home Screen Name 1"
 msgstr "GroupWise å®¶ç?¨è?¢å¹?å??ç¨± 1"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:198
 msgid "GroupWise Home Screen Name 2"
 msgstr "GroupWise å®¶ç?¨è?¢å¹?å??ç¨± 2"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:199
 msgid "GroupWise Home Screen Name 3"
 msgstr "GroupWise å®¶ç?¨è?¢å¹?å??ç¨± 3"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:200
 msgid "GroupWise Work Screen Name 1"
 msgstr "GroupWise å·¥ä½?è?¢å¹?å??ç¨± 1"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Work Screen Name 2"
 msgstr "GroupWise å·¥ä½?è?¢å¹?å??ç¨± 2"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Work Screen Name 3"
 msgstr "GroupWise å·¥ä½?è?¢å¹?å??ç¨± 3"
 
 # addressbook/gui/component/addressbook-storage.c:99
-#: ../addressbook/libebook/e-contact.c:201
-msgid "Jabber Home Id 1"
-msgstr "Jabber å®¶ç?¨ Id 1"
-
-# addressbook/gui/component/addressbook-storage.c:99
-#: ../addressbook/libebook/e-contact.c:202
-msgid "Jabber Home Id 2"
-msgstr "Jabber å®¶ç?¨ Id 2"
-
-# addressbook/gui/component/addressbook-storage.c:99
 #: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 3"
-msgstr "Jabber å®¶ç?¨ Id 3"
+msgid "Jabber Home ID 1"
+msgstr "Jabber å®¶ç?¨ ID 1"
 
 # addressbook/gui/component/addressbook-storage.c:99
 #: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Work Id 1"
-msgstr "Jabber å·¥ä½? Id 1"
+msgid "Jabber Home ID 2"
+msgstr "Jabber å®¶ç?¨ ID 2"
 
 # addressbook/gui/component/addressbook-storage.c:99
 #: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Work Id 2"
-msgstr "Jabber å·¥ä½? Id 2"
+msgid "Jabber Home ID 3"
+msgstr "Jabber å®¶ç?¨ ID 3"
 
 # addressbook/gui/component/addressbook-storage.c:99
 #: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 3"
-msgstr "Jabber å·¥ä½? Id 3"
+msgid "Jabber Work ID 1"
+msgstr "Jabber å·¥ä½? ID 1"
 
+# addressbook/gui/component/addressbook-storage.c:99
 #: ../addressbook/libebook/e-contact.c:207
+msgid "Jabber Work ID 2"
+msgstr "Jabber å·¥ä½? ID 2"
+
+# addressbook/gui/component/addressbook-storage.c:99
+#: ../addressbook/libebook/e-contact.c:208
+msgid "Jabber Work ID 3"
+msgstr "Jabber å·¥ä½? ID 3"
+
+#: ../addressbook/libebook/e-contact.c:209
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo!å®¶ç?¨è?¢å¹?å??ç¨± 1"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo!å®¶ç?¨è?¢å¹?å??ç¨± 2"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo!å®¶ç?¨è?¢å¹?å??ç¨± 3"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo!å·¥ä½?è?¢å¹?å??ç¨± 1"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo!å·¥ä½?è?¢å¹?å??ç¨± 2"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo!å·¥ä½?è?¢å¹?å??ç¨± 3"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:215
 msgid "MSN Home Screen Name 1"
 msgstr "MSN å®¶ç?¨è?¢å¹?å??ç¨± 1"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:216
 msgid "MSN Home Screen Name 2"
 msgstr "MSN å®¶ç?¨è?¢å¹?å??ç¨± 2"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:217
 msgid "MSN Home Screen Name 3"
 msgstr "MSN å®¶ç?¨è?¢å¹?å??ç¨± 3"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:218
 msgid "MSN Work Screen Name 1"
 msgstr "MSN å·¥ä½?è?¢å¹?å??ç¨± 1"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Work Screen Name 2"
 msgstr "MSN å·¥ä½?è?¢å¹?å??ç¨± 2"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Work Screen Name 3"
 msgstr "MSN å·¥ä½?è?¢å¹?å??ç¨± 3"
 
-#: ../addressbook/libebook/e-contact.c:219
-msgid "ICQ Home Id 1"
-msgstr "ICQ å®¶ç?¨ Id 1"
-
-# addressbook/contact-editor/e-contact-editor.c:1250
-#: ../addressbook/libebook/e-contact.c:220
-msgid "ICQ Home Id 2"
-msgstr "ICQ å®¶ç?¨ Id 2"
-
 #: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 3"
-msgstr "ICQ å®¶ç?¨ Id 3"
+msgid "ICQ Home ID 1"
+msgstr "ICQ å®¶ç?¨ ID 1"
 
+# addressbook/contact-editor/e-contact-editor.c:1250
 #: ../addressbook/libebook/e-contact.c:222
-msgid "ICQ Work Id 1"
-msgstr "ICQ å·¥ä½? Id 1"
+msgid "ICQ Home ID 2"
+msgstr "ICQ å®¶ç?¨ ID 2"
 
 #: ../addressbook/libebook/e-contact.c:223
-msgid "ICQ Work Id 2"
-msgstr "ICQ å·¥ä½? Id 2"
+msgid "ICQ Home ID 3"
+msgstr "ICQ å®¶ç?¨ ID 3"
 
 #: ../addressbook/libebook/e-contact.c:224
-msgid "ICQ Work Id 3"
-msgstr "ICQ å·¥ä½? Id 3"
+msgid "ICQ Work ID 1"
+msgstr "ICQ å·¥ä½? ID 1"
+
+#: ../addressbook/libebook/e-contact.c:225
+msgid "ICQ Work ID 2"
+msgstr "ICQ å·¥ä½? ID 2"
+
+#: ../addressbook/libebook/e-contact.c:226
+msgid "ICQ Work ID 3"
+msgstr "ICQ å·¥ä½? ID 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 "å§?å??æ??çµ?ç¹?"
 
 # addressbook/backend/ebook/e-card.c:3346
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Address List"
 msgstr "å?°å??æ¸?å?®"
 
 # addressbook/gui/widgets/e-addressbook-view.c:710
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:234
 msgid "Home Address"
 msgstr "ä½?å®¶å?°å??"
 
 # addressbook/gui/widgets/e-addressbook-view.c:710
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:235
 msgid "Work Address"
 msgstr "å·¥ä½?å?°å??"
 
 # addressbook/gui/widgets/e-addressbook-view.c:724
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:236
 msgid "Other Address"
 msgstr "å?¶å®?å?°å??"
 
 # calendar/gui/e-calendar-table.c:150
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Category List"
 msgstr "å??é¡?æ¸?å?®"
 
 # addressbook/gui/component/addressbook-config.c:409
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Photo"
 msgstr "ç?¸ç??"
 
 # mail/mail-format.c:762
 # mail/message-list.c:1083
-#: ../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/contact-editor/e-contact-editor.c:1285
 # addressbook/gui/widgets/e-addressbook-view.c:725
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Email List"
 msgstr "é?»å?é?µä»¶æ¸?å?®"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook/e-contact.c:249
 msgid "AIM Screen Name List"
 msgstr "AIM è?¢å¹?å??ç¨±æ¸?å?®"
 
-#: ../addressbook/libebook/e-contact.c:248
-msgid "GroupWise Id List"
-msgstr "GroupWise Id æ¸?å?®"
+#: ../addressbook/libebook/e-contact.c:250
+msgid "GroupWise ID List"
+msgstr "GroupWise ID æ¸?å?®"
 
 # addressbook/gui/component/addressbook-storage.c:99
-#: ../addressbook/libebook/e-contact.c:249
-msgid "Jabber Id List"
-msgstr "Jabber Id æ¸?å?®"
+#: ../addressbook/libebook/e-contact.c:251
+msgid "Jabber ID List"
+msgstr "Jabber ID æ¸?å?®"
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:252
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo!è?¢å¹?å??ç¨±æ¸?å?®"
 
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:253
 msgid "MSN Screen Name List"
 msgstr "MSN è?¢å¹?å??ç¨±æ¸?å?®"
 
 # mail/mail-config.glade.h:45
-#: ../addressbook/libebook/e-contact.c:252
-msgid "ICQ Id List"
-msgstr "ICQ Id æ¸?å?®"
-
 #: ../addressbook/libebook/e-contact.c:254
+msgid "ICQ ID List"
+msgstr "ICQ ID æ¸?å?®"
+
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Wants HTML Mail"
 msgstr "é??è¦? HTML é?µä»¶"
 
 # addressbook/contact-editor/fullname.glade.h:8
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:258
 msgid "List"
 msgstr "æ¸?å?®"
 
 # addressbook/gui/widgets/e-addressbook-view.c:724
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:259
 msgid "List Show Addresses"
 msgstr "æ¸?å?®é¡¯ç¤ºå?°å??"
 
 # addressbook/backend/ebook/e-card.c:3335
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:261
 msgid "Birth Date"
 msgstr "å?ºç??æ?¥æ??"
 
 # addressbook/contact-editor/contact-editor.glade.h:2
-#: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:713
-#: ../libedataserver/e-categories.c:45
+#: ../addressbook/libebook/e-contact.c:262
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
+#: ../libedataserver/e-categories.c:43
 msgid "Anniversary"
 msgstr "é?±å¹´ç´?å¿µæ?¥"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:263
+#: ../addressbook/libebook/e-contact.c:265
 msgid "X.509 Certificate"
 msgstr "X.509 æ??è?"
 
 # addressbook/gui/component/addressbook-storage.c:99
-#: ../addressbook/libebook/e-contact.c:265
-msgid "Gadu-Gadu Home Id 1"
-msgstr "Gadu-Gadu å®¶ç?¨ Id 1"
-
-# addressbook/gui/component/addressbook-storage.c:99
-#: ../addressbook/libebook/e-contact.c:266
-msgid "Gadu-Gadu Home Id 2"
-msgstr "Gadu-Gadu å®¶ç?¨ Id 2"
-
-# addressbook/gui/component/addressbook-storage.c:99
 #: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 3"
-msgstr "Gadu-Gadu å®¶ç?¨ Id 3"
+msgid "Gadu-Gadu Home ID 1"
+msgstr "Gadu-Gadu å®¶ç?¨ ID 1"
 
 # addressbook/gui/component/addressbook-storage.c:99
 #: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Work Id 1"
-msgstr "Gadu-Gadu å·¥ä½? Id 1"
+msgid "Gadu-Gadu Home ID 2"
+msgstr "Gadu-Gadu å®¶ç?¨ ID 2"
 
 # addressbook/gui/component/addressbook-storage.c:99
 #: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Work Id 2"
-msgstr "Gadu-Gadu å·¥ä½? Id 2"
+msgid "Gadu-Gadu Home ID 3"
+msgstr "Gadu-Gadu å®¶ç?¨ ID 3"
 
 # addressbook/gui/component/addressbook-storage.c:99
 #: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 3"
-msgstr "Gadu-Gadu å·¥ä½? Id 3"
+msgid "Gadu-Gadu Work ID 1"
+msgstr "Gadu-Gadu å·¥ä½? ID 1"
 
+# addressbook/gui/component/addressbook-storage.c:99
 #: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Id List"
-msgstr "Gadu-Gadu Id æ¸?å?®"
+msgid "Gadu-Gadu Work ID 2"
+msgstr "Gadu-Gadu å·¥ä½? ID 2"
+
+# addressbook/gui/component/addressbook-storage.c:99
+#: ../addressbook/libebook/e-contact.c:272
+msgid "Gadu-Gadu Work ID 3"
+msgstr "Gadu-Gadu å·¥ä½? ID 3"
+
+#: ../addressbook/libebook/e-contact.c:273
+msgid "Gadu-Gadu ID List"
+msgstr "Gadu-Gadu ID æ¸?å?®"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Geographic Information"
 msgstr "å?°ç??è³?è¨?"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:278
 msgid "Telephone"
 msgstr "é?»è©±"
 
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:280
 msgid "Skype Home Name 1"
 msgstr "Skype ä½?å®¶å??ç¨± 1"
 
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Skype Home Name 2"
 msgstr "Skype ä½?å®¶å??ç¨± 2"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:282
 msgid "Skype Home Name 3"
 msgstr "Skype ä½?å®¶å??ç¨± 3"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Work Name 1"
 msgstr "Skype å·¥ä½?å??ç¨± 1"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Work Name 2"
 msgstr "Skype å·¥ä½?å??ç¨± 2"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Work Name 3"
 msgstr "Skype å·¥ä½?å??ç¨± 3"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Name List"
 msgstr "Skype å??ç¨±æ¸?å?®"
 
 # addressbook/gui/widgets/e-addressbook-view.c:710
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:288
 msgid "SIP address"
 msgstr "SIP ä½?å??"
 
 # addressbook/gui/component/addressbook-storage.c:99
-#: ../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:290
+#: ../addressbook/libedata-book/e-data-book-factory.c:322
 #, c-format
 msgid "Empty URI"
 msgstr "ç©ºç?? URI"
 
-#: ../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
+#: ../addressbook/libedata-book/e-data-book-factory.c:340
+#: ../addressbook/libedata-book/e-data-book-factory.c:377
+#: ../calendar/libedata-cal/e-data-cal-factory.c:333
+#: ../calendar/libedata-cal/e-data-cal-factory.c:345
 #, c-format
 msgid "Invalid source"
 msgstr "ç?¡æ??ç??ä¾?æº?"
 
+#: ../addressbook/libedata-book/e-data-book.c:185
+#: ../calendar/libedata-cal/e-data-cal.c:113
+msgid "Success"
+msgstr "æ??å??"
+
+# shell/e-shell-view-menu.c:602
+# shell/e-shell-view-menu.c:614
+#: ../addressbook/libedata-book/e-data-book.c:186
+#: ../calendar/libedata-cal/e-data-cal.c:114
+msgid "Repository offline"
+msgstr "è³?æ??åº«é?¢ç·?"
+
+# shell/e-storage.c:475
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libecal/e-cal.c:4118 ../calendar/libedata-cal/e-data-cal.c:115
+msgid "Permission denied"
+msgstr "æ¬?é??ä¸?è¶³"
+
+#: ../addressbook/libedata-book/e-data-book.c:188
+msgid "Contact not found"
+msgstr "æ?¾ä¸?å?°é?£çµ¡äºº"
+
+#: ../addressbook/libedata-book/e-data-book.c:189
+msgid "Contact ID already exists"
+msgstr "é?£çµ¡äºº ID å·²ç¶?å?å?¨"
+
+# camel/camel-sasl-anonymous.c:110
+# camel/camel-sasl-plain.c:87
+#: ../addressbook/libedata-book/e-data-book.c:190
+#: ../calendar/libedata-cal/e-data-cal.c:120
+msgid "Authentication Failed"
+msgstr "é©?è?å¤±æ??"
+
+# camel/providers/smtp/camel-smtp-transport.c:218
+#: ../addressbook/libedata-book/e-data-book.c:191
+#: ../calendar/libedata-cal/e-data-cal.c:121
+msgid "Authentication Required"
+msgstr "è¦?æ±?é©?è?"
+
+# mail/mail-config.glade.h:1
+#: ../addressbook/libedata-book/e-data-book.c:192
+#: ../calendar/libedata-cal/e-data-cal.c:122
+msgid "Unsupported field"
+msgstr "ä¸?æ?¯æ?´ç??æ¬?ä½?"
+
+# camel/providers/imap/camel-imap-store.c:466
+# camel/providers/smtp/camel-smtp-transport.c:366
+#: ../addressbook/libedata-book/e-data-book.c:193
+#: ../calendar/libedata-cal/e-data-cal.c:124
+msgid "Unsupported authentication method"
+msgstr "ä¸?æ?¯æ?´ç??é©?è?æ?¹æ³?"
+
+#: ../addressbook/libedata-book/e-data-book.c:194
+#: ../calendar/libedata-cal/e-data-cal.c:125
+msgid "TLS not available"
+msgstr "ç?¡æ³?ä½¿ç?¨ TLS"
+
+# camel/providers/local/camel-maildir-store.c:100
+# camel/providers/local/camel-mbox-store.c:101
+# camel/providers/local/camel-mh-store.c:97
+#: ../addressbook/libedata-book/e-data-book.c:195
+msgid "Address Book does not exist"
+msgstr "é??è¨?é??ä¸?å?å?¨"
+
+#: ../addressbook/libedata-book/e-data-book.c:196
+msgid "Book removed"
+msgstr "é??è¨?é??å·²ç¶?ç§»é?¤"
+
+# camel/providers/imap/camel-imap-folder.c:1047
+# camel/providers/imap/camel-imap-folder.c:1281
+#: ../addressbook/libedata-book/e-data-book.c:197
+#: ../calendar/libedata-cal/e-data-cal.c:128
+msgid "Not available in offline mode"
+msgstr "ç?¡æ³?å?¨é?¢ç·?æ¨¡å¼?ä¸?ä½¿ç?¨"
+
+#: ../addressbook/libedata-book/e-data-book.c:198
+#: ../calendar/libedata-cal/e-data-cal.c:129
+msgid "Search size limit exceeded"
+msgstr "è¶?é??æ??å°?å¤§å°?é??å?¶"
+
+#: ../addressbook/libedata-book/e-data-book.c:199
+#: ../calendar/libedata-cal/e-data-cal.c:130
+msgid "Search time limit exceeded"
+msgstr "è¶?é??æ??å°?æ??é??é??å?¶"
+
+# camel/providers/local/camel-maildir-folder.c:218
+# camel/providers/local/camel-mh-folder.c:203
+#: ../addressbook/libedata-book/e-data-book.c:200
+#: ../calendar/libedata-cal/e-data-cal.c:131
+msgid "Invalid query"
+msgstr "ç?¡æ??ç??æ?¥è©¢"
+
+#: ../addressbook/libedata-book/e-data-book.c:201
+#: ../calendar/libedata-cal/e-data-cal.c:132
+msgid "Query refused"
+msgstr "æ?¥è©¢è¢«æ??çµ?"
+
+# calendar/gui/e-itip-control.c:883
+#: ../addressbook/libedata-book/e-data-book.c:202
+#: ../calendar/libedata-cal/e-data-cal.c:133
+msgid "Could not cancel"
+msgstr "ç?¡æ³?å??æ¶?"
+
+# camel/providers/local/camel-maildir-folder.c:218
+# camel/providers/local/camel-mh-folder.c:203
+#. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
+#. { OtherError,			N_("Other error") },
+#: ../addressbook/libedata-book/e-data-book.c:204
+#: ../calendar/libedata-cal/e-data-cal.c:135
+msgid "Invalid server version"
+msgstr "ç?¡æ??ç??ä¼ºæ??å?¨ç??æ?¬"
+
+# camel/providers/imap/camel-imap-provider.c:54
+#: ../addressbook/libedata-book/e-data-book.c:205
+msgid "No space"
+msgstr "æ²?æ??ç©ºé??"
+
+# camel/providers/local/camel-maildir-folder.c:218
+# camel/providers/local/camel-mh-folder.c:203
+#: ../addressbook/libedata-book/e-data-book.c:206
+#: ../calendar/libecal/e-cal.c:4102 ../calendar/libedata-cal/e-data-cal.c:136
+msgid "Invalid argument"
+msgstr "ç?¡æ??ç??å??æ?¸"
+
+# shell/e-storage.c:477
+#: ../addressbook/libedata-book/e-data-book.c:207
+#: ../calendar/libecal/e-cal.c:4140 ../calendar/libedata-cal/e-data-cal.c:137
+msgid "Not supported"
+msgstr "ä¸?æ?¯æ?´"
+
+# addressbook/gui/widgets/e-addressbook-view.c:718
+#: ../addressbook/libedata-book/e-data-book.c:216
+#: ../calendar/libedata-cal/e-data-cal.c:145
+msgid "Other error"
+msgstr "å?¶ä»?é?¯èª¤"
+
 # camel/camel-filter-driver.c:671
-#: ../addressbook/libedata-book/e-data-book.c:301
-msgid "Cannot open book"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:374
+#, fuzzy, c-format
+#| msgid "Cannot open book"
+msgid "Cannot open book: %s"
 msgstr "ä¸?è?½é??å??æ?¸ç±?"
 
-#: ../addressbook/libedata-book/e-data-book.c:319
-msgid "Cannot remove book"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:394
+#, fuzzy, c-format
+#| msgid "Cannot remove book"
+msgid "Cannot remove book: %s"
 msgstr "ä¸?è?½ç§»é?¤æ?¸ç±?"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../addressbook/libedata-book/e-data-book.c:331
-#: ../addressbook/libedata-book/e-data-book.c:346
-msgid "Cannot get contact"
-msgstr "ä¸?è?½å??å¾?é?£çµ¡äºº"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:411
+#: ../addressbook/libedata-book/e-data-book.c:428
+#, c-format
+msgid "Cannot get contact: %s"
+msgstr "ä¸?è?½å??å¾?é?£çµ¡äººï¼?%s"
 
-#: ../addressbook/libedata-book/e-data-book.c:358
-msgid "Empty query"
-msgstr "ç©ºç??æ?¥è©¢"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:443
+#, c-format
+msgid "Empty query: %s"
+msgstr "ç©ºç??æ?¥è©¢ï¼?%s"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:457
+#, c-format
+msgid "Cannot get contact list: %s"
+msgstr "ä¸?è?½å??å¾?é?£çµ¡äººæ¸?å?®ï¼?%s"
 
 # camel/providers/pop3/camel-pop3-store.c:199
-#: ../addressbook/libedata-book/e-data-book.c:402
-msgid "Cannot authenticate user"
-msgstr "ä¸?è?½é©?è?ä½¿ç?¨è??"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:492
+#, c-format
+msgid "Cannot authenticate user: %s"
+msgstr "ä¸?è?½é©?è?ä½¿ç?¨è??ï¼?%s"
 
-#: ../addressbook/libedata-book/e-data-book.c:414
-#: ../addressbook/libedata-book/e-data-book.c:429
-msgid "Cannot add contact"
-msgstr "ä¸?è?½å? å?¥é?£çµ¡äºº"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:507
+#: ../addressbook/libedata-book/e-data-book.c:524
+#, c-format
+msgid "Cannot add contact: %s"
+msgstr "ä¸?è?½å? å?¥é?£çµ¡äººï¼?%s"
 
 # mail/mail-crypto.c:251
-#: ../addressbook/libedata-book/e-data-book.c:444
-#: ../addressbook/libedata-book/e-data-book.c:459
-msgid "Cannot modify contact"
-msgstr "ä¸?è?½ä¿®æ?¹é?£çµ¡äºº"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:542
+#: ../addressbook/libedata-book/e-data-book.c:559
+#, c-format
+msgid "Cannot modify contact: %s"
+msgstr "ä¸?è?½ä¿®æ?¹é?£çµ¡äººï¼?%s"
 
 # mail/mail-crypto.c:251
-#: ../addressbook/libedata-book/e-data-book.c:494
-msgid "Cannot remove contacts"
-msgstr "ä¸?è?½ç§»é?¤é?£çµ¡äºº"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:596
+#, c-format
+msgid "Cannot remove contacts: %s"
+msgstr "ä¸?è?½ç§»é?¤é?£çµ¡äººï¼?%s"
+
+# camel/providers/local/camel-maildir-folder.c:197
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:217
+# camel/providers/local/camel-mbox-folder.c:319
+# camel/providers/local/camel-mh-folder.c:185
+# camel/providers/local/camel-mh-folder.c:194
+# camel/providers/local/camel-mh-folder.c:202
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:626
+#, c-format
+msgid "Cannot get supported fields: %s"
+msgstr "ä¸?è?½å??å¾?æ?¯æ?´ç??æ¬?ä½?ï¼?%s"
+
+# camel/providers/local/camel-maildir-folder.c:197
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:217
+# camel/providers/local/camel-mbox-folder.c:319
+# camel/providers/local/camel-mh-folder.c:185
+# camel/providers/local/camel-mh-folder.c:194
+# camel/providers/local/camel-mh-folder.c:202
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:639
+#, c-format
+msgid "Cannot get required fields: %s"
+msgstr "ä¸?è?½å??å¾?è¦?æ±?ç??æ¬?ä½?ï¼?%s"
+
+# camel/providers/imap/camel-imap-store.c:466
+# camel/providers/smtp/camel-smtp-transport.c:366
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:652
+#, c-format
+msgid "Cannot get supported auth methods: %s"
+msgstr "ä¸?è?½å??å¾?æ?¯æ?´ç??é©?è?æ?¹æ³?ï¼?%s"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../addressbook/libedata-book/e-data-book.c:569
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Invalid query"
-msgstr "ç?¡æ??ç??æ?¥è©¢"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:677
+#, c-format
+msgid "Invalid query: %s"
+msgstr "ç?¡æ??ç??æ?¥è©¢ï¼?%s"
 
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-maildir-folder.c:209
@@ -788,172 +1001,165 @@ msgstr "ç?¡æ??ç??æ?¥è©¢"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../addressbook/libedata-book/e-data-book.c:598
-msgid "Cannot get changes"
-msgstr "ä¸?è?½å??å¾?è®?æ?´"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:708
+#, c-format
+msgid "Cannot get changes: %s"
+msgstr "ä¸?è?½å??å¾?è®?æ?´ï¼?%s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:501
+#, fuzzy, c-format
+#| msgid ""
+#| "Unexpected GnuPG status message encountered:\n"
+#| "\n"
+#| "%s"
+msgid "Unexpected HTTP status code %d returned"
+msgstr ""
+"é??å?°é??é ?æ??ç?? GnuPG ç??æ??è¨?æ?¯ï¼?\n"
+"\n"
+"%s"
 
-# calendar/gui/e-itip-control.c:883
-#: ../addressbook/libedata-book/e-data-book.c:699
-msgid "Cannot complete operation"
-msgstr "ä¸?è?½å®?æ??æ¤é ?æ??ä½?"
+# camel/providers/local/camel-maildir-store.c:100
+# camel/providers/local/camel-mbox-store.c:101
+# camel/providers/local/camel-mh-store.c:97
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4114
+#, fuzzy
+#| msgid "Calendar does not exist"
+msgid "Calendar doesn't support Free/Busy"
+msgstr "è¡?äº?æ??ä¸?å?å?¨"
 
 # addressbook/contact-editor/contact-editor.glade.h:20
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:715
-#: ../libedataserver/e-categories.c:46
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:719
+#: ../libedataserver/e-categories.c:44
 msgid "Birthday"
 msgstr "ç??æ?¥"
 
 # addressbook/contact-editor/contact-editor.glade.h:20
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:744
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:748
 #, c-format
 msgid "Birthday: %s"
 msgstr "ç??æ?¥ï¼?%s"
 
 # addressbook/contact-editor/contact-editor.glade.h:2
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:768
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:772
 #, c-format
 msgid "Anniversary: %s"
 msgstr "ç´?å¿µæ?¥ï¼?%s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:234
+#: ../calendar/backends/file/e-cal-backend-file.c:239
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "ç?¡æ³?å?²å?è¡?äº?æ??è³?æ??ï¼?URI ç??æ ¼å¼?ä¸?æ£ç¢ºã??"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:241
-#: ../calendar/backends/file/e-cal-backend-file.c:247
+#: ../calendar/backends/file/e-cal-backend-file.c:246
+#: ../calendar/backends/file/e-cal-backend-file.c:252
 msgid "Cannot save calendar data"
 msgstr "ä¸?è?½å?²å?è¡?äº?æ??è³?æ??"
 
-# camel/providers/imap/camel-imap-folder.c:172
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:342
-msgid "Could not create thread for getting deltas"
-msgstr "ç?¡æ³?å»ºæ§?å??å¾? deltas ç??å?·è¡?ç·?"
-
-# camel/providers/local/camel-mbox-store.c:110
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:374
-#: ../calendar/backends/google/e-cal-backend-google.c:1142
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1079
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1380
-#: ../calendar/backends/http/e-cal-backend-http.c:676
-#: ../calendar/backends/weather/e-cal-backend-weather.c:490
-msgid "Could not create cache file"
-msgstr "ç?¡æ³?å»ºæ§?å¿«å??æª?æ¡?"
-
-# camel/providers/imap/camel-imap-folder.c:172
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:387
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1092
-msgid "Could not create thread for populating cache"
-msgstr "ç?¡æ³?å»ºæ§?ç§»æ¤?å¿«å??ç??å?·è¡?ç·?"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2122
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1118
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2224
 msgid "Reply Requested: by "
 msgstr "è¦?æ±?å??è¦?ï¼?ä¾?"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2127
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1123
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2229
 msgid "Reply Requested: When convenient"
 msgstr "è¦?æ±?å??è¦?ï¼?ç?¶æ??ç©ºæ??"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:281
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:296
 #, c-format
 msgid "Loading %s items"
 msgstr "è¼?å?¥ %s å??é ?ç?®"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:917
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:927
 msgid "Calendar"
 msgstr "è¡?äº?æ??"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:991
 msgid "Invalid server URI"
 msgstr "ç?¡æ??ç??ä¼ºæ??å?¨ URI"
 
-# camel/camel-sasl-anonymous.c:110
-# camel/camel-sasl-plain.c:87
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:994
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1003
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1097
-#: ../calendar/libecal/e-cal.c:4016
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1335
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1371
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1386
-#: ../camel/providers/groupwise/camel-groupwise-store.c:598
-#: ../camel/providers/groupwise/camel-groupwise-store.c:773
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:181
-msgid "Authentication failed"
-msgstr "é©?è?å¤±æ??"
+# camel/providers/local/camel-mbox-store.c:110
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1095
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1382
+#: ../calendar/backends/http/e-cal-backend-http.c:671
+#: ../calendar/backends/weather/e-cal-backend-weather.c:484
+msgid "Could not create cache file"
+msgstr "ç?¡æ³?å»ºæ§?å¿«å??æª?æ¡?"
+
+# camel/providers/imap/camel-imap-folder.c:172
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1108
+msgid "Could not create thread for populating cache"
+msgstr "ç?¡æ³?å»ºæ§?ç§»æ¤?å¿«å??ç??å?·è¡?ç·?"
 
 # mail/mail-config.glade.h:37
-#: ../calendar/backends/http/e-cal-backend-http.c:333
+#: ../calendar/backends/http/e-cal-backend-http.c:327
 msgid "Redirected to Invalid URI"
 msgstr "é??æ?°æ??å??ç?¡æ??ç?? URI"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: ../calendar/backends/http/e-cal-backend-http.c:356
+#: ../calendar/backends/http/e-cal-backend-http.c:350
 msgid "Bad file format."
 msgstr "é?¯èª¤ç??æª?æ¡?æ ¼å¼?ã??"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: ../calendar/backends/http/e-cal-backend-http.c:363
+#: ../calendar/backends/http/e-cal-backend-http.c:357
 msgid "Not a calendar."
 msgstr "ä¸¦é??è¡?äº?æ??ã??"
 
 # mail/mail-ops.c:1872
-#: ../calendar/backends/weather/e-cal-backend-weather.c:150
+#: ../calendar/backends/weather/e-cal-backend-weather.c:154
 msgid "Could not retrieve weather data"
 msgstr "ç?¡æ³?å??å¾?å¤©æ°£è³?æ??"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
+#: ../calendar/backends/weather/e-cal-backend-weather.c:253
 msgid "Weather: Fog"
 msgstr "å¤©æ°£ï¼?èµ·é?§"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
+#: ../calendar/backends/weather/e-cal-backend-weather.c:254
 msgid "Weather: Cloudy Night"
 msgstr "å¤©æ°£ï¼?å¤?é?²ç??å¤?æ??"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:255
 msgid "Weather: Cloudy"
 msgstr "å¤©æ°£ï¼?å¤?é?²"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:256
 msgid "Weather: Overcast"
 msgstr "å¤©æ°£ï¼?å¤?é?²"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:257
 msgid "Weather: Showers"
 msgstr "å¤©æ°£ï¼?é?£é?¨"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:258
 msgid "Weather: Snow"
 msgstr "å¤©æ°£ï¼?ä¸?é?ª"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:259
 msgid "Weather: Clear Night"
 msgstr "å¤©æ°£ï¼?æ?´æ??ç??å¤?æ??"
 
 # ui/evolution-event-editor.xml.h:9
 # ui/evolution-task-editor-dialog.xml.h:10
-#: ../calendar/backends/weather/e-cal-backend-weather.c:256
+#: ../calendar/backends/weather/e-cal-backend-weather.c:260
 msgid "Weather: Sunny"
 msgstr "å¤©æ°£ï¼?è?·é?½"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:257
+#: ../calendar/backends/weather/e-cal-backend-weather.c:261
 msgid "Weather: Thunderstorms"
 msgstr "å¤©æ°£ï¼?é?·æ?´"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:403
+#: ../calendar/backends/weather/e-cal-backend-weather.c:407
 msgid "Forecast"
 msgstr "å¤©æ°£é ?å ±"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:2
-#: ../calendar/libecal/e-cal-component.c:1316
+#: ../calendar/libecal/e-cal-component.c:1286
 msgid "Untitled appointment"
 msgstr "æ?ªå?½å??ç??ç´?æ??"
 
@@ -1143,7 +1349,7 @@ msgid "Undefined"
 msgstr "æ?ªæ??å®?"
 
 # camel/camel-smime-context.c:194
-#: ../calendar/libecal/e-cal.c:1169 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1233 ../libedataserverui/e-book-auth-util.c:206
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "è¼¸å?¥ %s (ä½¿ç?¨è?? %s) ç??å¯?ç¢¼ "
@@ -1153,79 +1359,60 @@ 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:1183
+#: ../calendar/libecal/e-cal.c:1247
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "è¼¸å?¥ %s ç??å¯?ç¢¼ä»¥ä¾¿ä½¿ç?¨è?? %s è?½ä½¿ç?¨ä»£ç??ä¼ºæ??å?¨"
 
-# camel/providers/local/camel-maildir-folder.c:218
-# camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libecal/e-cal.c:3988
-msgid "Invalid argument"
-msgstr "ç?¡æ??ç??å??æ?¸"
-
-#: ../calendar/libecal/e-cal.c:3990
+#: ../calendar/libecal/e-cal.c:4104
 msgid "Backend is busy"
 msgstr "å¾?ç«¯å¿?ç¢?ä¸"
 
 # shell/e-shell-view-menu.c:602
 # shell/e-shell-view-menu.c:614
-#: ../calendar/libecal/e-cal.c:3992
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:4106
 msgid "Repository is offline"
 msgstr "å??åº«å·²é?¢ç·?"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: ../calendar/libecal/e-cal.c:3994
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
+#: ../calendar/libecal/e-cal.c:4108
 msgid "No such calendar"
 msgstr "ç?¡æ¤è¡?äº?æ??"
 
-#: ../calendar/libecal/e-cal.c:3996
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
-#: ../servers/groupwise/e-gw-connection.c:233
+#: ../calendar/libecal/e-cal.c:4110 ../calendar/libedata-cal/e-data-cal.c:117
+#: ../servers/groupwise/e-gw-connection.c:235
 msgid "Object not found"
 msgstr "æ?¾ä¸?å?°ç?©ä»¶"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libecal/e-cal.c:3998
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
-#: ../servers/groupwise/e-gw-connection.c:227
+#: ../calendar/libecal/e-cal.c:4112 ../calendar/libedata-cal/e-data-cal.c:118
+#: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "ç?¡æ??ç??ç?©ä»¶"
 
 # addressbook/conduit/address-conduit.c:214
-#: ../calendar/libecal/e-cal.c:4000
+#: ../calendar/libecal/e-cal.c:4114
 msgid "URI not loaded"
 msgstr "URI æ?ªè¼?å?¥"
 
-#: ../calendar/libecal/e-cal.c:4002
+#: ../calendar/libecal/e-cal.c:4116
 msgid "URI already loaded"
 msgstr "URI å·²è¼?å?¥"
 
-# shell/e-storage.c:475
-#: ../calendar/libecal/e-cal.c:4004
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
-msgid "Permission denied"
-msgstr "æ¬?é??ä¸?è¶³"
-
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../calendar/libecal/e-cal.c:4006
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
-#: ../servers/groupwise/e-gw-connection.c:235
+#: ../calendar/libecal/e-cal.c:4120 ../servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "ä¸?æ??ç??ä½¿ç?¨è??"
 
-#: ../calendar/libecal/e-cal.c:4008
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../calendar/libecal/e-cal.c:4122 ../calendar/libedata-cal/e-data-cal.c:119
 msgid "Object ID already exists"
 msgstr "ç?©ä»¶ ID å·²å?å?¨"
 
 # shell/e-storage.c:477
-#: ../calendar/libecal/e-cal.c:4010
+#: ../calendar/libecal/e-cal.c:4124
 msgid "Protocol not supported"
 msgstr "é??è¨?å??å®?ä¸?æ?¯æ?´"
 
@@ -1233,125 +1420,127 @@ msgstr "é??è¨?å??å®?ä¸?æ?¯æ?´"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: ../calendar/libecal/e-cal.c:4012
+#: ../calendar/libecal/e-cal.c:4126
 msgid "Operation has been canceled"
 msgstr "æ??ä½?å·²å??æ¶?"
 
 # calendar/gui/e-itip-control.c:883
-#: ../calendar/libecal/e-cal.c:4014
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
+#: ../calendar/libecal/e-cal.c:4128
 msgid "Could not cancel operation"
 msgstr "ç?¡æ³?å??æ¶?æ??ä½?"
 
+# camel/camel-sasl-anonymous.c:110
+# camel/camel-sasl-plain.c:87
+#: ../calendar/libecal/e-cal.c:4130
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1434
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1452
+#: ../camel/providers/groupwise/camel-groupwise-store.c:618
+#: ../camel/providers/groupwise/camel-groupwise-store.c:793
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:85
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:118
+#, c-format
+msgid "Authentication failed"
+msgstr "é©?è?å¤±æ??"
+
 # camel/providers/smtp/camel-smtp-transport.c:218
-#: ../calendar/libecal/e-cal.c:4018
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:217
+#: ../calendar/libecal/e-cal.c:4132
+#: ../camel/providers/smtp/camel-smtp-transport.c:166
 msgid "Authentication required"
 msgstr "è¦?æ±?é©?è?"
 
-#: ../calendar/libecal/e-cal.c:4020
-msgid "A CORBA exception has occurred"
-msgstr "ç?¼ç?? CORBA ä¾?å¤?"
+#: ../calendar/libecal/e-cal.c:4134
+msgid "A DBUS exception has occurred"
+msgstr "ç?¼ç?? DBUS ä¾?å¤?"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../calendar/libecal/e-cal.c:4022
-#: ../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:582
-#: ../servers/groupwise/e-gw-connection.c:241
+#: ../calendar/libecal/e-cal.c:4136
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:158
+#: ../camel/providers/imap/camel-imap-command.c:457
+#: ../camel/providers/imap/camel-imap-store.c:626
+#: ../camel/providers/pop3/camel-pop3-store.c:495
+#: ../servers/groupwise/e-gw-connection.c:243
 msgid "Unknown error"
 msgstr "ä¸?æ??ç??é?¯èª¤"
 
 # shell/e-storage.c:459
-#: ../calendar/libecal/e-cal.c:4024
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
+#: ../calendar/libecal/e-cal.c:4138
 msgid "No error"
 msgstr "æ²?æ??é?¯èª¤"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:67
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:693
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:802
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1023
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1050
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:695
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:804
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1025
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1052
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "ã??%sã??ä¸?é??è¦?å¼?æ?¸"
 
 # camel/providers/smtp/camel-smtp-transport.c:170
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:100
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:210
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:252
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:288
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:102
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:212
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:290
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1090
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "ã??%sã??é??è¦?ä¸?å??å¼?æ?¸"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:106
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:294
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:735
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:296
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:737
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "ã??%sã??ç??ç¬¬ä¸?å??å¼?æ?¸å¿?é ?ç?ºå?ä¸²"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr "ã??%sã??ç??ç¬¬ä¸?å??å¼?æ?¸å¿?é ?ç?º ISO 8601 æ?¥æ??/æ??é??å?ä¸²"
 
 # camel/providers/smtp/camel-smtp-transport.c:170
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:361
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:162
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:363
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:415
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:731
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:864
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "ã??%sã??é??è¦?å?©å??å¼?æ?¸"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:216
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:258
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:367
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:419
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1094
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:168
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:218
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:260
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:369
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:421
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:870
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1096
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "ã??%sã??ç??ç¬¬ä¸?å??å¼?æ?¸å¿?é ?ç?º time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "ã??%sã??ç??ç¬¬äº?å??å¼?æ?¸å¿?é ?ç?ºæ?´æ?¸"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:375
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:377
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:430
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "ã??%sã??ç??ç¬¬äº?å??å¼?æ?¸å¿?é ?ç?º time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:743
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:745
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "ã??%sã??ç??ç¬¬äº?å??å¼?æ?¸å¿?é ?ç?ºå?ä¸²"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:773
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1361,12 +1550,12 @@ msgstr ""
 "ã??%sã??ç??ç¬¬ä¸?å??å¼?æ?¸å¿?é ?ç?ºã??ä»»ä½?ã??ã??ã??æ??è¦?ã??ä¹?ä¸?ï¼?æ??ã??æ??è¿°ã??ã??ã??ä½?ç½®ã??ã??ã??å?°æ??"
 "è??ã??ã??ã??å?¬é??äººã??ã??ã??å??é¡?ã??å?¶ä¸ä¹?ä¸?"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:925
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "ã??%sã??é??è¦?è?³å°?ä¸?å??å¼?æ?¸"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:939
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:941
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1375,257 +1564,272 @@ msgstr "ã??%sã??ç??æ??æ??å¼?æ?¸å¿?é ?ç?ºå?ä¸²ï¼?æ??å?ªæ??ä¸?å??å¼?æ?¸ç?ºå¸?æ??
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+#: ../calendar/libedata-cal/e-data-cal.c:116
 msgid "Invalid range"
 msgstr "ç?¡æ??ç??ç¯?å??"
 
 # mail/mail-config.glade.h:1
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
-msgid "Unsupported field"
-msgstr "ä¸?æ?¯æ?´ç??æ¬?ä½?"
-
-# mail/mail-config.glade.h:1
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-data-cal.c:123
 msgid "Unsupported method"
 msgstr "ä¸?æ?¯æ?´ç??æ?¹æ³?"
 
-# camel/providers/imap/camel-imap-store.c:466
-# camel/providers/smtp/camel-smtp-transport.c:366
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
-msgid "Unsupported authentication method"
-msgstr "ä¸?æ?¯æ?´ç??é©?è?æ?¹æ³?"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-msgid "TLS not available"
-msgstr "ç?¡æ³?ä½¿ç?¨ TLS"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-msgid "Offline mode unavailable"
-msgstr "é?¢ç·?æ¨¡å¼?ç?¡æ³?ä½¿ç?¨"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-msgid "Search size limit exceeded"
-msgstr "è¶?é??æ??å°?å¤§å°?é??å?¶"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-msgid "Search time limit exceeded"
-msgstr "è¶?é??æ??å°?æ??é??é??å?¶"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
-msgid "Query refused"
-msgstr "æ?¥è©¢è¢«æ??çµ?"
+# camel/providers/local/camel-maildir-store.c:100
+# camel/providers/local/camel-mbox-store.c:101
+# camel/providers/local/camel-mh-store.c:97
+#: ../calendar/libedata-cal/e-data-cal.c:126
+msgid "Calendar does not exist"
+msgstr "è¡?äº?æ??ä¸?å?å?¨"
 
-# camel/providers/local/camel-maildir-folder.c:218
-# camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
-msgid "Invalid server version"
-msgstr "ç?¡æ??ç??ä¼ºæ??å?¨ç??æ?¬"
+# camel/providers/imap/camel-imap-command.c:241
+# shell/e-storage.c:481
+#: ../calendar/libedata-cal/e-data-cal.c:127
+msgid "UnknownUser"
+msgstr "ä¸?æ??ç??ä½¿ç?¨è??"
 
-#: ../calendar/libedata-cal/e-data-cal.c:491
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:595
 #, c-format
-msgid "Cannot retrieve calendar address"
-msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ä½?å??"
+msgid "Cannot retrieve calendar address: %s"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ä½?å??ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:509
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:615
 #, c-format
-msgid "Cannot retrieve calendar alarm e-mail address"
-msgstr "ä¸?è?½å??å¾?è¡?äº?æ??é¬§é?´é?»å?é?µä»¶ä½?å??"
+msgid "Cannot retrieve calendar alarm e-mail address: %s"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??é¬§é?´é?»å?é?µä»¶ä½?å??ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:527
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:635
 #, c-format
-msgid "Cannot retrieve calendar's ldap attribute"
-msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?? ldap å±¬æ?§"
+msgid "Cannot retrieve calendar's ldap attribute: %s"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?? ldap å±¬æ?§ï¼?%s"
 
 # camel/camel-filter-driver.c:671
-#: ../calendar/libedata-cal/e-data-cal.c:545
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:655
 #, c-format
-msgid "Cannot retrieve calendar scheduling information"
-msgstr "ä¸?è?½å??å¾?è¡?äº?æ??è¡?ç¨?è³?è¨?"
+msgid "Cannot retrieve calendar scheduling information: %s"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??è¡?ç¨?è³?è¨?ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:562
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:674
 #, c-format
-msgid "Cannot open calendar"
-msgstr "ä¸?è?½é??å??è¡?äº?æ??"
+msgid "Cannot open calendar: %s"
+msgstr "ä¸?è?½é??å??è¡?äº?æ??ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:579
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:695
 #, c-format
-msgid "Cannot refresh calendar"
-msgstr "ä¸?è?½é??æ?°æ?´ç??è¡?äº?æ??"
+msgid "Cannot refresh calendar: %s"
+msgstr "ä¸?è?½é??æ?°æ?´ç??è¡?äº?æ??ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:596
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:714
 #, c-format
-msgid "Cannot remove calendar"
-msgstr "ä¸?è?½ç§»é?¤è¡?äº?æ??"
+msgid "Cannot remove calendar: %s"
+msgstr "ä¸?è?½ç§»é?¤è¡?äº?æ??ï¼?%s"
 
 # mail/mail-crypto.c:251
-#: ../calendar/libedata-cal/e-data-cal.c:615
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:735
 #, c-format
-msgid "Cannot create calendar object"
-msgstr "ä¸?è?½å»ºç«?è¡?äº?æ??ç?©ä»¶"
+msgid "Cannot create calendar object: %s"
+msgstr "ä¸?è?½å»ºç«?è¡?äº?æ??ç?©ä»¶ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:637
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:759
 #, c-format
-msgid "Cannot modify calendar object"
-msgstr "ä¸?è?½ä¿®æ?¹è¡?äº?æ??ç?©ä»¶"
+msgid "Cannot modify calendar object: %s"
+msgstr "ä¸?è?½ä¿®æ?¹è¡?äº?æ??ç?©ä»¶ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:661
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:785
 #, c-format
-msgid "Cannot remove calendar object"
-msgstr "ä¸?è?½ç§»é?¤è¡?äº?æ??ç?©ä»¶"
+msgid "Cannot remove calendar object: %s"
+msgstr "ä¸?è?½ç§»é?¤è¡?äº?æ??ç?©ä»¶ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:680
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:806
 #, c-format
-msgid "Cannot receive calendar objects"
-msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?©ä»¶"
+msgid "Cannot receive calendar objects: %s"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?©ä»¶ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:697
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:825
 #, c-format
-msgid "Cannot discard calendar alarm"
-msgstr "ä¸?è?½å??æ¶?è¡?äº?æ??é¬§é?´"
+msgid "Cannot discard calendar alarm: %s"
+msgstr "ä¸?è?½å??æ¶?è¡?äº?æ??é¬§é?´ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:716
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:846
 #, c-format
-msgid "Cannot send calendar objects"
-msgstr "ä¸?è?½å?³é??è¡?äº?æ??ç?©ä»¶"
+msgid "Cannot send calendar objects: %s"
+msgstr "ä¸?è?½å?³é??è¡?äº?æ??ç?©ä»¶ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:751
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:883
 #, c-format
-msgid "Cannot retrieve default calendar object path"
-msgstr "ä¸?è?½å??å¾?é ?è¨ç??è¡?äº?æ??ç?©ä»¶è·¯å¾?"
+msgid "Cannot retrieve default calendar object path: %s"
+msgstr "ä¸?è?½å??å¾?é ?è¨ç??è¡?äº?æ??ç?©ä»¶è·¯å¾?ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:769
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:903
 #, c-format
-msgid "Cannot retrieve calendar object path"
-msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?©ä»¶è·¯å¾?"
+msgid "Cannot retrieve calendar object path: %s"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?©ä»¶è·¯å¾?ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:787
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:923
 #, c-format
-msgid "Cannot retrieve calendar object list"
-msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?©ä»¶æ¸?å?®"
+msgid "Cannot retrieve calendar object list: %s"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?©ä»¶æ¸?å?®ï¼?%s"
 
 # mail/mail-ops.c:1872
-#: ../calendar/libedata-cal/e-data-cal.c:825
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:963
 #, c-format
-msgid "Could not retrieve attachment list"
-msgstr "ä¸?è?½å??å¾?é??ä»¶æ¸?å?®"
+msgid "Could not retrieve attachment list: %s"
+msgstr "ä¸?è?½å??å¾?é??ä»¶æ¸?å?®ï¼?%s"
 
 # camel/providers/local/camel-mbox-store.c:110
-#: ../calendar/libedata-cal/e-data-cal.c:847
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:987
 #, c-format
-msgid "Could not complete calendar query"
-msgstr "ä¸?è?½å®?æ??è¡?äº?æ??æ?¥è©¢"
+msgid "Could not complete calendar query: %s"
+msgstr "ä¸?è?½å®?æ??è¡?äº?æ??æ?¥è©¢ï¼?%s"
 
 # mail/mail-ops.c:1872
-#: ../calendar/libedata-cal/e-data-cal.c:865
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1007
 #, c-format
-msgid "Could not retrieve calendar time zone"
-msgstr "ä¸?è?½å??å¾?å¤©æ°£è¡?äº?æ??æ??å??"
+msgid "Could not retrieve calendar time zone: %s"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??æ??å??ï¼?%s"
 
 # calendar/gui/e-itip-control.c:883
-#: ../calendar/libedata-cal/e-data-cal.c:883
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1027
 #, c-format
-msgid "Could not add calendar time zone"
-msgstr "ä¸?è?½å? å?¥è¡?äº?æ??æ??å??"
+msgid "Could not add calendar time zone: %s"
+msgstr "ä¸?è?½å? å?¥è¡?äº?æ??æ??å??ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:900
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1046
 #, c-format
-msgid "Could not set default calendar time zone"
-msgstr "ä¸?è?½è¨å®?é ?è¨ç??è¡?äº?æ??æ??å??"
+msgid "Could not set default calendar time zone: %s"
+msgstr "ä¸?è?½è¨å®?é ?è¨ç??è¡?äº?æ??æ??å??ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:921
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1069
 #, c-format
-msgid "Cannot retrieve calendar changes"
-msgstr "ä¸?è?½å??å¾?è¡?äº?æ??è®?æ?´"
+msgid "Cannot retrieve calendar changes: %s"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??è®?æ?´ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:971
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1121
 #, c-format
-msgid "Cannot retrieve calendar free/busy list"
-msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç©ºé??/å¿?ç¢?æ¸?å?®"
+msgid "Cannot retrieve calendar free/busy list: %s"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç©ºé??/å¿?ç¢?æ¸?å?®ï¼?%s"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libedata-cal/e-data-cal-factory.c:339
+#: ../calendar/libedata-cal/e-data-cal-factory.c:355
 #, c-format
 msgid "Invalid URI"
 msgstr "ç?¡æ??ç?? URI"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:350
+#: ../calendar/libedata-cal/e-data-cal-factory.c:370
 #, c-format
 msgid "No backend factory for '%s' of '%s'"
 msgstr "æ²?æ??ã??%2$sã??ç??ã??%1$sã??ç??å¾?ç«¯å·¥å» "
 
 # camel/providers/local/camel-mbox-store.c:110
-#: ../calendar/libedata-cal/e-data-cal-factory.c:390
+#: ../calendar/libedata-cal/e-data-cal-factory.c:420
 #, c-format
 msgid "Could not instantiate backend"
 msgstr "ç?¡æ³?å¯¦é«?å??å¾?ç«¯ç¨?å¼?"
 
 # camel/camel-cipher-context.c:171
-#: ../camel/camel-cipher-context.c:102
+#: ../camel/camel-cipher-context.c:75
+#, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "é??ç¨®å? å¯?æ?¹å¼?ä¸?æ?¯æ?´ç°½ç½²"
 
 # mail/mail-ops.c:603
-#: ../camel/camel-cipher-context.c:128
+#: ../camel/camel-cipher-context.c:110
 msgid "Signing message"
 msgstr "æ£å?¨ç°½ç½²è¨?æ?¯"
 
 # camel/camel-cipher-context.c:251
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:131
+#, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "é??ç¨®å? å¯?æ?¹å¼?ä¸?æ?¯æ?´é©?è?ç°½ç½²"
 
 # mail/mail-ops.c:603
-#: ../camel/camel-cipher-context.c:171
+#: ../camel/camel-cipher-context.c:164
 msgid "Verifying message"
 msgstr "æ£å?¨ç¢ºèª?è¨?æ?¯"
 
 # camel/camel-cipher-context.c:294
-#: ../camel/camel-cipher-context.c:189
+#: ../camel/camel-cipher-context.c:188
+#, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "é??ç¨®å? å¯?æ?¹å¼?ä¸?æ?¯æ?´å? å¯?"
 
 # mail/mail-ops.c:603
-#: ../camel/camel-cipher-context.c:215
+#: ../camel/camel-cipher-context.c:223
 msgid "Encrypting message"
 msgstr "æ£å?¨å? å¯?è¨?æ?¯"
 
 # camel/camel-cipher-context.c:336
-#: ../camel/camel-cipher-context.c:232
+#: ../camel/camel-cipher-context.c:246
+#, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "é??ç¨®å? å¯?æ?¹å¼?ä¸?æ?¯æ?´è§£å¯?"
 
 # mail/mail-ops.c:603
-#: ../camel/camel-cipher-context.c:254
+#: ../camel/camel-cipher-context.c:276
 msgid "Decrypting message"
 msgstr "æ£å?¨è§£å¯?è¨?æ?¯"
 
 # camel/camel-cipher-context.c:336
-#: ../camel/camel-cipher-context.c:271
+#: ../camel/camel-cipher-context.c:297
+#, c-format
 msgid "You may not import keys with this cipher"
 msgstr "æ?¨ä¸?è?½å?¯å?¥é??ç¨®å? å¯?æ?¹å¼?ç??é??é?°"
 
 # camel/camel-cipher-context.c:336
-#: ../camel/camel-cipher-context.c:301
+#: ../camel/camel-cipher-context.c:341
+#, c-format
 msgid "You may not export keys with this cipher"
 msgstr "æ?¨ä¸?è?½å?¯å?ºé??ç¨®å? å¯?æ?¹å¼?ç??é??é?°"
 
 # mail/mail-ops.c:1728
-#: ../camel/camel-data-cache.c:135
+#: ../camel/camel-data-cache.c:181
+#, c-format
 msgid "Unable to create cache path"
 msgstr "ç?¡æ³?å»ºæ§?å¿«å??è·¯å¾?"
 
 # camel/providers/imap/camel-imap-message-cache.c:150
-#: ../camel/camel-data-cache.c:401
+#: ../camel/camel-data-cache.c:494
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "ç?¡æ³?ç§»é?¤å¿«å??é ?ç?®ï¼? %sï¼? %s"
 
-#: ../camel/camel-db.c:411
+# camel/providers/local/camel-maildir-folder.c:197
+# camel/providers/local/camel-mbox-folder.c:319
+# camel/providers/local/camel-mh-folder.c:185
+#: ../camel/camel-data-wrapper.c:89
+#, c-format
+msgid "No stream available"
+msgstr "æ²?æ??å?¯ç?¨ç??ä¸²æµ?"
+
+#: ../camel/camel-db.c:464
+#, c-format
 msgid "Insufficient memory"
 msgstr "è¨?æ?¶é«?ä¸?è¶³"
 
-#: ../camel/camel-disco-diary.c:197
+#: ../camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1636,8 +1840,8 @@ msgstr ""
 "æ?¥ä¸?ä¾?å?¨æ¤ä¼ºæ??å?¨ä¸?ç??æ??ä½?ï¼?å?¨æ?¨é??æ?°é?£ç·?å?°ç¶²è·¯æ??\n"
 "å°?ä¸?æ??é??æ?ã??"
 
-#: ../camel/camel-disco-diary.c:260
-#: ../camel/providers/imap/camel-imap-journal.c:320
+#: ../camel/camel-disco-diary.c:258
+#: ../camel/providers/imap/camel-imap-journal.c:298
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1648,152 +1852,184 @@ msgstr ""
 "%s\n"
 "é??å??è³?æ??å¤¾å?§æ??å??ç??è®?æ?´å°?ä¸?æ??é??æ?°å??æ¥ã??"
 
-#: ../camel/camel-disco-diary.c:296
+#: ../camel/camel-disco-diary.c:299
 msgid "Resynchronizing with server"
 msgstr "è??ä¼ºæ??å?¨é??æ?°å??æ¥"
 
-#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:51
-msgid "Copy folder content locally for offline operation"
-msgstr "è¤?è£½è³?æ??å¤¾å?§å®¹è?³æ?¬å?°ç?¨æ?¼é?¢ç·?ä½?æ¥"
-
-#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:107
+#: ../camel/camel-disco-folder.c:68 ../camel/camel-offline-folder.c:66
 msgid "Downloading new messages for offline mode"
 msgstr "æ£å?¨ä¸?è¼?æ?°è¨?æ?¯ç?¨æ?¼é?¢ç·?æ¨¡å¼?"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: ../camel/camel-disco-folder.c:466
+#: ../camel/camel-disco-folder.c:379
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "æº?å??è³?æ??å¤¾ã??%sã??ä¾?é?¢ç·?ä½¿ç?¨"
 
+#: ../camel/camel-disco-folder.c:445 ../camel/camel-offline-folder.c:224
+msgid "Copy folder content locally for offline operation"
+msgstr "è¤?è£½è³?æ??å¤¾å?§å®¹è?³æ?¬å?°ç?¨æ?¼é?¢ç·?ä½?æ¥"
+
 # camel/camel-disco-store.c:271
-#: ../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:3068
+#: ../camel/camel-disco-store.c:395
+#: ../camel/providers/groupwise/camel-groupwise-store.c:230
+#: ../camel/providers/imap/camel-imap-store.c:895
+#: ../camel/providers/imap/camel-imap-store.c:1739
+#: ../camel/providers/imap/camel-imap-store.c:2197
+#: ../camel/providers/imap/camel-imap-store.c:3041
+#: ../camel/providers/imapx/camel-imapx-store.c:185
+#: ../camel/providers/imapx/camel-imapx-store.c:709
+#: ../camel/providers/imapx/camel-imapx-store.c:772
+#: ../camel/providers/imapx/camel-imapx-store.c:831
+#, c-format
 msgid "You must be working online to complete this operation"
 msgstr "æ?¨å¿?é ?æ?¼ç·?ä¸?å·¥ä½?æ??è?½å®?æ??æ¤æ??ä½?"
 
-#: ../camel/camel-exception.c:260
-msgid "No description available"
-msgstr "æ²?æ??å?¯ç?¨ç??æ??è¿°"
+# calendar/gui/calendar-model.c:647
+# calendar/gui/calendar-model.c:1182
+# calendar/gui/dialogs/task-editor-dialog.glade.h:4
+# calendar/gui/e-calendar-table.c:422
+# camel/camel-service.c:544
+# camel/camel-service.c:580
+#: ../camel/camel-file-utils.c:430 ../camel/camel-file-utils.c:489
+#: ../camel/camel-file-utils.c:529 ../camel/camel-file-utils.c:599
+#: ../camel/camel-file-utils.c:691 ../camel/camel-gpg-context.c:887
+#: ../camel/camel-gpg-context.c:1175 ../camel/camel-net-utils.c:512
+#: ../camel/camel-net-utils.c:689 ../camel/camel-net-utils.c:838
+#: ../camel/providers/imapx/camel-imapx-server.c:4677
+#: ../camel/providers/imapx/camel-imapx-server.c:4694
+#: ../camel/providers/nntp/camel-nntp-summary.c:396
+#: ../camel/providers/pop3/camel-pop3-folder.c:269
+#: ../camel/providers/pop3/camel-pop3-folder.c:625
+#: ../camel/providers/pop3/camel-pop3-folder.c:690
+#: ../camel/providers/pop3/camel-pop3-store.c:487
+#: ../libedataserverui/e-book-auth-util.c:229
+#, c-format
+msgid "Cancelled"
+msgstr "å·²å??æ¶?"
+
+# calendar/gui/calendar-model.c:647
+# calendar/gui/calendar-model.c:1182
+# calendar/gui/dialogs/task-editor-dialog.glade.h:4
+# calendar/gui/e-calendar-table.c:422
+# camel/camel-service.c:544
+# camel/camel-service.c:580
+#: ../camel/camel-file-utils.c:643 ../camel/camel-file-utils.c:734
+#: ../camel/camel-file-utils.c:791
+#, c-format
+msgid "Canceled"
+msgstr "å·²å??æ¶?"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-filter-driver.c:794 ../camel/camel-filter-search.c:579
+#: ../camel/camel-filter-driver.c:808 ../camel/camel-filter-search.c:582
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "ç?¡æ³?å»ºæ§?å?ä»£è??ç?? '%s'ï¼?%s"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/camel-filter-driver.c:836
+#: ../camel/camel-filter-driver.c:853
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "ç?¡æ³?è®?å?? %s ç??æ¡è¿?è¾ï¼? %s"
 
 # camel/camel-filter-driver.c:534
 # camel/camel-filter-driver.c:543
-#: ../camel/camel-filter-driver.c:1025 ../camel/camel-filter-driver.c:1034
+#: ../camel/camel-filter-driver.c:1037 ../camel/camel-filter-driver.c:1046
 msgid "Syncing folders"
 msgstr "å??æ¥è??ç??è³?æ??å¤¾"
 
 # camel/camel-filter-driver.c:866
-#: ../camel/camel-filter-driver.c:1121 ../camel/camel-filter-driver.c:1522
+#: ../camel/camel-filter-driver.c:1134 ../camel/camel-filter-driver.c:1569
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "å??æ??é??æ¿¾å?¨ç?¼ç??é?¯èª¤ï¼? %s: %s"
 
 # camel/camel-filter-driver.c:871
-#: ../camel/camel-filter-driver.c:1130 ../camel/camel-filter-driver.c:1531
+#: ../camel/camel-filter-driver.c:1145 ../camel/camel-filter-driver.c:1580
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "å?·è¡?é??æ¿¾å?¨ç?¼ç??é?¯èª¤ï¼? %s: %s"
 
 # camel/camel-filter-driver.c:643
-#: ../camel/camel-filter-driver.c:1216
+#: ../camel/camel-filter-driver.c:1240
+#, c-format
 msgid "Unable to open spool folder"
-msgstr "ç?¡æ³?é??å?? spool è³?æ??å¤¾"
+msgstr "ç?¡æ³?é??å??æ??ç¨?å?¨è³?æ??å¤¾"
 
 # camel/camel-filter-driver.c:652
-#: ../camel/camel-filter-driver.c:1225
+#: ../camel/camel-filter-driver.c:1251
+#, c-format
 msgid "Unable to process spool folder"
-msgstr "ç?¡æ³?è??ç?? spool è³?æ??å¤¾"
+msgstr "ç?¡æ³?è??ç??æ??ç¨?å?¨è³?æ??å¤¾"
 
 # camel/camel-filter-driver.c:666
-#: ../camel/camel-filter-driver.c:1241
+#: ../camel/camel-filter-driver.c:1269
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "æ?¥æ?¶é?µä»¶ %d (%d%%)"
 
-# camel/camel-filter-driver.c:671
-#: ../camel/camel-filter-driver.c:1245
-msgid "Cannot open message"
-msgstr "ä¸?è?½é??å??é?µä»¶"
-
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1264
+#: ../camel/camel-filter-driver.c:1275 ../camel/camel-filter-driver.c:1297
 #, c-format
 msgid "Failed on message %d"
 msgstr "å?¨ç¬¬ %d å°?é?µä»¶ç?¼ç??é?¯èª¤"
 
 # camel/camel-filter-driver.c:690
 # camel/camel-filter-driver.c:788
-#: ../camel/camel-filter-driver.c:1278 ../camel/camel-filter-driver.c:1368
+#: ../camel/camel-filter-driver.c:1312 ../camel/camel-filter-driver.c:1411
 msgid "Syncing folder"
 msgstr "å??æ¥è??ç??è³?æ??å¤¾"
 
 # camel/camel-filter-driver.c:694
 # camel/camel-filter-driver.c:793
-#: ../camel/camel-filter-driver.c:1282 ../camel/camel-filter-driver.c:1373
+#: ../camel/camel-filter-driver.c:1316 ../camel/camel-filter-driver.c:1416
 msgid "Complete"
 msgstr "å®?æ??"
 
 # camel/camel-filter-driver.c:748
-#: ../camel/camel-filter-driver.c:1338
+#: ../camel/camel-filter-driver.c:1377
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "æ£å?¨æ?¥æ?¶ç¬¬ %d / %d å°?é?µä»¶"
 
 # camel/camel-filter-driver.c:753
 # camel/camel-filter-driver.c:771
-#: ../camel/camel-filter-driver.c:1353
+#: ../camel/camel-filter-driver.c:1395
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "å?¨ç¬¬ %d / %d å°?é?µä»¶å¤±æ??"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-filter-search.c:137
+#: ../camel/camel-filter-search.c:135
 msgid "Failed to retrieve message"
 msgstr "å??å??é?µä»¶å¤±æ??ã??"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../camel/camel-filter-search.c:399
+#: ../camel/camel-filter-search.c:401
 msgid "Invalid arguments to (system-flag)"
 msgstr "ç?¡æ??ç??å??æ?¸çµ¦ (system-flag)"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../camel/camel-filter-search.c:414
+#: ../camel/camel-filter-search.c:416
 msgid "Invalid arguments to (user-tag)"
 msgstr "ç?¡æ??ç??å??æ?¸çµ¦ (user-tag)"
 
 # camel/camel-filter-search.c:439
 # camel/camel-filter-search.c:445
-#. 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
+#: ../camel/camel-filter-search.c:744 ../camel/camel-filter-search.c:753
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "å?·è¡?é??æ¿¾å?¨æ??å°?ç?¼ç??é?¯èª¤ï¼? %s: %s"
 
 # camel/camel-folder-search.c:328
-#: ../camel/camel-folder-search.c:351 ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:608
+#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
+#: ../camel/camel-folder-search.c:627
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1803,8 +2039,8 @@ msgstr ""
 "%s"
 
 # camel/camel-folder-search.c:338
-#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:463
-#: ../camel/camel-folder-search.c:618
+#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:468
+#: ../camel/camel-folder-search.c:639
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1815,83 +2051,83 @@ msgstr ""
 
 # camel/camel-folder-search.c:485
 # camel/camel-folder-search.c:513
-#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:852
+#: ../camel/camel-folder-search.c:843 ../camel/camel-folder-search.c:885
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) é??è¦?å?®ä¸?å¸?æ??å?¼çµ?æ??"
 
-#: ../camel/camel-folder-search.c:905
+#: ../camel/camel-folder-search.c:938
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) ä¸?å??è¨±æ?¾å?¨ %s è£¡é?¢"
 
-#: ../camel/camel-folder-search.c:911 ../camel/camel-folder-search.c:918
+#: ../camel/camel-folder-search.c:944 ../camel/camel-folder-search.c:951
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) é??è¦?ç?¸ç¬¦é¡?å??å?ä¸²"
 
 # camel/camel-folder-search.c:485
 # camel/camel-folder-search.c:513
-#: ../camel/camel-folder-search.c:945
+#: ../camel/camel-folder-search.c:978
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) æ??æ??é?£å??çµ?æ??"
 
 # camel/camel-folder-search.c:485
 # camel/camel-folder-search.c:513
-#: ../camel/camel-folder-search.c:954
+#: ../camel/camel-folder-search.c:987
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) é??è¦?è³?æ??å¤¾è¨å®?"
 
-#: ../camel/camel-folder.c:676
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "ä¸?æ?¯æ?´ç??æ??ä½?ï¼?æ·»å? é?µä»¶ï¼? %s"
-
-# camel/camel-folder-search.c:338
-#: ../camel/camel-folder.c:1381
+# mail/mail-ops.c:1649
+#: ../camel/camel-folder.c:125
 #, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "ä¸?æ?¯æ?´ç??æ??ä½?ï¼?ä»¥è©?å?¥æ??å°?ï¼? %s"
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "æ£å?¨å¸ç¿?ã??%sã??ä¸ç??æ?°å??å?¾é?µä»¶"
 
-# camel/camel-folder-search.c:338
-#: ../camel/camel-folder.c:1422
-#, c-format
-msgid "Unsupported operation: count by expression: for %s"
-msgstr "ä¸?æ?¯æ?´ç??æ??ä½?ï¼?ä»¥è©?å?¥è¨?æ?¸ï¼?ç?¨æ?¼ %s"
+# mail/mail-ops.c:1649
+#: ../camel/camel-folder.c:147
+#, fuzzy, c-format
+#| msgid "Scanning for changed messages in %s"
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "å°?é??è¦?è½?å¯?ç??é?µä»¶å¤¾é??æ?¼æ?°é?µä»¶ç??å?§æ??ä¸"
 
-#: ../camel/camel-folder.c:1461
+# mail/mail-ops.c:1565
+#: ../camel/camel-folder.c:171
 #, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "ä¸?æ?¯æ?´ç??æ??ä½?ï¼?ä»¥ UIDs æ??å°?ï¼? %s"
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "æ£å?¨é??æ¿¾ã??%sã??ä¸ç??æ?°é?µä»¶"
 
 # mail/mail-ops.c:898
-#: ../camel/camel-folder.c:1574
-#: ../camel/providers/local/camel-maildir-folder.c:387
+#: ../camel/camel-folder.c:688
+#: ../camel/providers/local/camel-maildir-folder.c:366
 msgid "Moving messages"
 msgstr "æ£å?¨ç§»å??é?µä»¶"
 
 # mail/mail-ops.c:898
-#: ../camel/camel-folder.c:1574
+#: ../camel/camel-folder.c:690
 msgid "Copying messages"
 msgstr "æ£å?¨è¤?è£½é?µä»¶"
 
-# widgets/misc/e-messagebox.c:159
-#: ../camel/camel-folder.c:1915
-msgid "Learning junk"
-msgstr "äº?è§£å??å?¾é?µä»¶"
-
-#: ../camel/camel-folder.c:1933
-msgid "Learning non-junk"
-msgstr "äº?è§£é??å??å?¾é?µä»¶"
+# camel/camel-filter-driver.c:670
+# camel/camel-filter-driver.c:679
+#: ../camel/camel-gpg-context.c:701 ../camel/camel-gpg-context.c:706
+#: ../camel/camel-gpg-context.c:1330
+#, c-format
+msgid "Failed to execute gpg: %s"
+msgstr "å?·è¡? gpg å¤±æ??ï¼? %s"
 
-# mail/mail-ops.c:1565
-#: ../camel/camel-folder.c:1953
-msgid "Filtering new message(s)"
-msgstr "å??å?? %d å°?é?µä»¶"
+#: ../camel/camel-gpg-context.c:706
+#: ../camel/providers/smtp/camel-smtp-transport.c:114
+#: ../camel/providers/smtp/camel-smtp-transport.c:169
+msgid "Unknown"
+msgstr "ä¸?æ??"
 
-#: ../camel/camel-gpg-context.c:760
+#: ../camel/camel-gpg-context.c:770
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1902,15 +2138,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:775
+#: ../camel/camel-gpg-context.c:787
+#, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "è§£æ?? gpg userid æ??ç¤ºæ??å¤±æ??ã??"
 
-#: ../camel/camel-gpg-context.c:799 ../camel/camel-gpg-context.c:813
+#: ../camel/camel-gpg-context.c:812 ../camel/camel-gpg-context.c:827
+#, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "è§£æ?? gpg å¯?èª?è¦?æ±?æ??å¤±æ??ã??"
 
-#: ../camel/camel-gpg-context.c:833
+#: ../camel/camel-gpg-context.c:848
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1919,7 +2157,7 @@ msgstr ""
 "é??è¦? PIN æ??è?½ç?ºæ?¨ç??æ?ºæ?§å?¡è§£é??ï¼?\n"
 "ã??%sã??"
 
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:852
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1929,125 +2167,98 @@ msgstr ""
 "ã??%sã??"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: ../camel/camel-gpg-context.c:842
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "GnuPG å?³å??å°?ã??%sã??æ?ªé ?æ??ç??è¦?æ±?"
 
-# mail/mail-send-recv.c:471
-#: ../camel/camel-gpg-context.c:867 ../camel/camel-gpg-context.c:1113
-#: ../camel/providers/nntp/camel-nntp-store.c:1313
-msgid "Canceled."
-msgstr "å·²å??æ¶?ã??"
-
-#: ../camel/camel-gpg-context.c:881
+#: ../camel/camel-gpg-context.c:905
+#, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "è§£é??ç§?å¯?é??é?°æ??å¤±æ??ï¼?è¼¸å?¥äº? 3 æ¬¡é?¯èª¤ç??å¯?èª? ã??"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: ../camel/camel-gpg-context.c:889
+#: ../camel/camel-gpg-context.c:917
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "å¾? GnuPG å?³å??æ??å¤?ç??å??æ??ï¼? %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/camel-gpg-context.c:988
+#: ../camel/camel-gpg-context.c:1048
+#, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "ä¸?è?½å? å¯?é?µä»¶ï¼?æ²?æ??æ??ä¾?æ??æ??ç??æ?¶ä»¶è??ã??"
 
-# camel/camel-filter-driver.c:670
-# camel/camel-filter-driver.c:679
-#. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1262 ../camel/camel-gpg-context.c:1387
-#: ../camel/camel-gpg-context.c:1953 ../camel/camel-gpg-context.c:1998
-#, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "å?·è¡? gpg å¤±æ??ï¼? %s"
-
 # mail/mail-ops.c:1872
-#: ../camel/camel-gpg-context.c:1355 ../camel/camel-smime-context.c:605
-#, c-format
-msgid "Could not generate signing data: %s"
-msgstr "ç?¡æ³?ç?¢ç??ç°½ç« è³?æ??ï¼?%s"
+#: ../camel/camel-gpg-context.c:1434 ../camel/camel-smime-context.c:821
+msgid "Could not generate signing data: "
+msgstr "ç?¡æ³?ç?¢ç??ç°½ç« è³?æ??ï¼?"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-gpg-context.c:1402 ../camel/camel-gpg-context.c:1630
-#: ../camel/camel-gpg-context.c:1646 ../camel/camel-gpg-context.c:1728
-#: ../camel/camel-gpg-context.c:1743 ../camel/camel-gpg-context.c:1859
-#: ../camel/camel-gpg-context.c:1874 ../camel/camel-gpg-context.c:1969
-#: ../camel/camel-gpg-context.c:2014
+#: ../camel/camel-gpg-context.c:1481 ../camel/camel-gpg-context.c:1740
+#: ../camel/camel-gpg-context.c:1848 ../camel/camel-gpg-context.c:1987
+#: ../camel/camel-gpg-context.c:2081 ../camel/camel-gpg-context.c:2128
 msgid "Failed to execute gpg."
 msgstr "å?·è¡? gpg å¤±æ??ã??"
 
 # camel/camel-pgp-context.c:890
-#: ../camel/camel-gpg-context.c:1534 ../camel/camel-gpg-context.c:1540
-#: ../camel/camel-gpg-context.c:1546 ../camel/camel-gpg-context.c:1561
-#: ../camel/camel-smime-context.c:929 ../camel/camel-smime-context.c:940
-#: ../camel/camel-smime-context.c:947
+#: ../camel/camel-gpg-context.c:1622 ../camel/camel-gpg-context.c:1630
+#: ../camel/camel-gpg-context.c:1638 ../camel/camel-gpg-context.c:1655
+#: ../camel/camel-smime-context.c:943 ../camel/camel-smime-context.c:957
+#: ../camel/camel-smime-context.c:966
+#, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "ä¸?è?½é©?è?æ¤é?µä»¶ç??ç°½ç« ï¼?é?¯èª¤ç??è¨?æ?¯æ ¼å¼?"
 
 # camel/camel-pgp-context.c:890
-#: ../camel/camel-gpg-context.c:1600
-#, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "ä¸?è?½é©?è?æ¤é?µä»¶ç??ç°½ç« ï¼?ç?¡æ³?å»ºæ§?æ?«å?æª?æ¡?ï¼?%s"
+#: ../camel/camel-gpg-context.c:1695
+msgid "Cannot verify message signature: "
+msgstr "ä¸?è?½é©?è?æ¤é?µä»¶ç??ç°½ç« ï¼?"
 
 # mail/mail-ops.c:1872
-#: ../camel/camel-gpg-context.c:1711
-#, c-format
-msgid "Could not generate encrypting data: %s"
-msgstr "ç?¡æ³?ç?¢ç??å? å¯?è³?æ??ï¼?%s"
+#: ../camel/camel-gpg-context.c:1814
+msgid "Could not generate encrypting data: "
+msgstr "ç?¡æ³?ç?¢ç??å? å¯?è³?æ??ï¼?"
 
-#: ../camel/camel-gpg-context.c:1761
+#: ../camel/camel-gpg-context.c:1866
 msgid "This is a digitally encrypted message part"
 msgstr "é??æ?¯æ?¸ä½?å??å? å¯?è¨?æ?¯é?¨ä»½"
 
 # camel/camel-pgp-context.c:890
-#: ../camel/camel-gpg-context.c:1814 ../camel/camel-gpg-context.c:1822
-#: ../camel/camel-gpg-context.c:1841
+#: ../camel/camel-gpg-context.c:1922 ../camel/camel-gpg-context.c:1931
+#: ../camel/camel-gpg-context.c:1954
+#, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "ä¸?è?½è§£å¯?æ¤é?µä»¶ï¼?é?¯èª¤ç??è¨?æ?¯æ ¼å¼?"
 
-#: ../camel/camel-gpg-context.c:1831
+#: ../camel/camel-gpg-context.c:1942
+#, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "è§£å¯? MIME çµ?ä»¶æ??å¤±æ??ï¼?é??è¨?å??å®?é?¯èª¤"
 
-#: ../camel/camel-gpg-context.c:1909 ../camel/camel-smime-context.c:1205
+#: ../camel/camel-gpg-context.c:2023 ../camel/camel-smime-context.c:1241
 msgid "Encrypted content"
 msgstr "å? å¯?å?§å®¹"
 
-# camel/providers/pop3/camel-pop3-folder.c:320
-#: ../camel/camel-gpg-context.c:1930
-msgid "Unable to parse message content"
-msgstr "ç?¡æ³?å¾?ç·¨è¼¯å?¨å??å¾?é?µä»¶"
-
-#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:1999
-#: ../camel/providers/imap4/camel-imap4-utils.c:614
-#: ../camel/providers/smtp/camel-smtp-transport.c:165
-#: ../camel/providers/smtp/camel-smtp-transport.c:220
-msgid "Unknown"
-msgstr "ä¸?æ??"
-
 # camel/camel-movemail.c:306
-#: ../camel/camel-lock-client.c:104
+#: ../camel/camel-lock-client.c:106
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "ä¸?è?½å»ºæ§?é??å®? helper å°?ç®¡ï¼?%s"
 
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock-client.c:130
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "ä¸?è?½å??å??é??å®? helper ï¼? %s"
 
-#: ../camel/camel-lock-client.c:203 ../camel/camel-lock-client.c:226
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "ç?¡æ³?é??å®?ã??%sã??ï¼? lock-helper å??å®?é?¯èª¤"
 
 # camel/camel-movemail.c:318
-#: ../camel/camel-lock-client.c:216
+#: ../camel/camel-lock-client.c:227
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "ç?¡æ³?é??å®?ã??%sã??"
@@ -2056,32 +2267,32 @@ msgstr "ç?¡æ³?é??å®?ã??%sã??"
 # camel/camel-lock.c:111
 # camel/camel-movemail.c:138
 # camel/camel-movemail.c:185
-#: ../camel/camel-lock.c:103
+#: ../camel/camel-lock.c:102
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "ç?¡æ³?å»ºæ§?ç?¨æ?¼ %s: %s ç??é??å®?æª?æ¡?"
 
 # camel/camel-lock.c:151
 # camel/camel-movemail.c:219
-#: ../camel/camel-lock.c:144
+#: ../camel/camel-lock.c:145
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Timed out trying to get lock file on %s.  Try again later."
 msgstr "å??è©¦å??å¾? %s ä¸?ç??é??å®?æª?æ¡?é?¾æ??ã??è«?ç¨?å¾?å??è©¦ä¸?æ¬¡ã??"
 
 # camel/camel-lock.c:201
-#: ../camel/camel-lock.c:199
+#: ../camel/camel-lock.c:205
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "ä½¿ç?¨ fcntl(2) å??å¾?é??å¤±æ??ï¼? %s"
 
 # camel/camel-lock.c:255
-#: ../camel/camel-lock.c:262
+#: ../camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "ä½¿ç?¨ flock(2) å??å¾?é??å¤±æ??ï¼? %s"
 
 # camel/camel-movemail.c:101
-#: ../camel/camel-movemail.c:106
+#: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "ç?¡æ³?æª¢æ?¥é?µä»¶æª?æ¡? %sï¼?%s"
@@ -2093,179 +2304,173 @@ msgid "Could not open mail file %s: %s"
 msgstr "ç?¡æ³?é??å??é?µä»¶æª?æ¡? %sï¼?%s"
 
 # camel/camel-movemail.c:158
-#: ../camel/camel-movemail.c:127
+#: ../camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "ç?¡æ³?é??å??æ?«å?é?µä»¶æª?æ¡? %sï¼?%s"
 
 # camel/camel-movemail.c:274
-#: ../camel/camel-movemail.c:156
+#: ../camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "å?²å?é?µä»¶è?³æ?«å?æª?æ¡?æ??å¤±æ?? %sï¼?%s"
 
 # camel/camel-movemail.c:306
-#: ../camel/camel-movemail.c:186
+#: ../camel/camel-movemail.c:193
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "ç?¡æ³?å»ºæ§?å°?ç®¡ï¼?%s"
 
 # camel/camel-movemail.c:318
-#: ../camel/camel-movemail.c:198
+#: ../camel/camel-movemail.c:207
 #, c-format
 msgid "Could not fork: %s"
 msgstr "ç?¡æ³?å?¦å¤?å?·è¡?ä¸?å??è¡?ç¨?ï¼?%s"
 
 # camel/camel-movemail.c:356
-#: ../camel/camel-movemail.c:236
+#: ../camel/camel-movemail.c:245
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail ç¨?å¼?å¤±æ??ï¼?%s"
 
 # camel/camel-movemail.c:357
-#: ../camel/camel-movemail.c:237
+#: ../camel/camel-movemail.c:246
 msgid "(Unknown error)"
 msgstr "(ä¸?æ??ç??é?¯èª¤)"
 
 # camel/camel-movemail.c:245
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:273
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "è®?å??é?µä»¶æª?æ¡?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
 # camel/camel-movemail.c:256
-#: ../camel/camel-movemail.c:271
+#: ../camel/camel-movemail.c:286
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "å¯«å?¥é?µä»¶æ?«å?æª?æ¡?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
 # camel/camel-movemail.c:587
-#: ../camel/camel-movemail.c:464 ../camel/camel-movemail.c:531
+#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "è¤?è£½é?µä»¶æ?«å?æª?æ¡?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
+#: ../camel/camel-multipart-signed.c:285
+#, c-format
+msgid "No content available"
+msgstr "æ²?æ??å?¯ç?¨ç??å?§å®¹"
+
+#: ../camel/camel-multipart-signed.c:293
+#, c-format
+msgid "No signature available"
+msgstr "æ²?æ??å?¯ç?¨ç??ç°½ç« "
+
 # shell/e-storage.c:467
-#: ../camel/camel-multipart-signed.c:592
+#: ../camel/camel-multipart-signed.c:612
+#, c-format
 msgid "parse error"
 msgstr "è§£æ??é?¯èª¤"
 
-# calendar/gui/calendar-model.c:647
-# calendar/gui/calendar-model.c:1182
-# calendar/gui/dialogs/task-editor-dialog.glade.h:4
-# calendar/gui/e-calendar-table.c:422
-# camel/camel-service.c:544
-# camel/camel-service.c:580
-#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:674
-#: ../camel/camel-net-utils.c:805
-#: ../camel/providers/pop3/camel-pop3-store.c:476
-#: ../camel/providers/pop3/camel-pop3-store.c:576
-msgid "Canceled"
-msgstr "å·²å??æ¶?"
-
-# camel/camel-filter-driver.c:671
-#: ../camel/camel-net-utils.c:521
-msgid "cannot create thread"
-msgstr "ç?¡æ³?å»ºæ§?å?·è¡?ç·?"
-
 # camel/camel-service.c:548
-#: ../camel/camel-net-utils.c:678
+#: ../camel/camel-net-utils.c:693
 #, c-format
 msgid "Resolving: %s"
 msgstr "è§£æ??ï¼?%s"
 
 # camel/camel-service.c:600
-#: ../camel/camel-net-utils.c:700
+#: ../camel/camel-net-utils.c:715
 msgid "Host lookup failed"
 msgstr "æ??å°?ä¸»æ©?å¤±æ??"
 
 # camel/camel-service.c:600
-#: ../camel/camel-net-utils.c:702
+#: ../camel/camel-net-utils.c:719
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "æ??å°?ä¸»æ©?å¤±æ??ï¼? %s ï¼?%s"
 
 # camel/camel-service.c:548
-#: ../camel/camel-net-utils.c:809
+#: ../camel/camel-net-utils.c:842
 msgid "Resolving address"
 msgstr "è§£æ??ä½?å??"
 
-#: ../camel/camel-net-utils.c:829
+#: ../camel/camel-net-utils.c:862
 msgid "Name lookup failed"
 msgstr "æ?¥è©¢å??ç¨±å¤±æ??"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/camel-net-utils.c:832
+#: ../camel/camel-net-utils.c:867
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "æ??å°?å??ç¨±å¤±æ??ï¼? %s"
 
 # mail/mail-ops.c:898
-#: ../camel/camel-offline-folder.c:249
+#: ../camel/camel-offline-folder.c:169
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "æ£å?¨å°?è³?æ??å¤¾ã??%sã??ä¸ç??é?µä»¶å??æ¥å?°ç£?ç¢?"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-offline-journal.c:159 ../camel/camel-offline-journal.c:182
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:170
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "ä¸?è?½å¯«å?¥è³?æ??å¤¾ã??%sã??ç??é?¢ç·?æ?¥èª?ï¼?%s"
 
 # camel/camel-session.c:68
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:58
 msgid "Virtual folder email provider"
 msgstr "è??æ?¬è³?æ??å¤¾é?»å?é?µä»¶ä¾?æ??å??"
 
 # camel/camel-session.c:70
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:60
 msgid "For reading mail as a query of another set of folders"
 msgstr "ä½¿è®?å??é?µä»¶å¦?å??æ?¥è©¢å?¶ä»?è³?æ??å¤¾"
 
 # camel/camel-provider.c:131
-#: ../camel/camel-provider.c:184
+#: ../camel/camel-provider.c:188
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "ç?¡æ³?è¼?å?¥æ¨¡çµ? %sï¼? æ¤ç³»çµ±ä¸?æ?¯æ?´è¼?å?¥æ¨¡çµ?ã??"
 
 # camel/camel-provider.c:140
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:197
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "ç?¡æ³?è¼?å?¥ %sï¼?%s"
 
 # camel/camel-provider.c:148
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:206
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "ç?¡æ³?è¼?å?¥ %sï¼?æ¨¡çµ?å?§æ²?æ??å??å§?ç¢¼ã??"
 
 # camel/camel-session.c:295
 # camel/camel-session.c:364
-#: ../camel/camel-provider.c:379 ../camel/camel-session.c:180
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:207
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "æ²?æ??é??è¨?å??å®?ã??%sã??ç??æ??ä¾?è??"
 
 # camel/camel-sasl-anonymous.c:33
-#: ../camel/camel-sasl-anonymous.c:36
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "å?¿å??"
 
 # camel/camel-sasl-anonymous.c:35
-#: ../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:110
 # camel/camel-sasl-plain.c:87
-#: ../camel/camel-sasl-anonymous.c:121 ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:69
+#, c-format
 msgid "Authentication failed."
 msgstr "é©?è?å¤±æ??ã??"
 
 # camel/camel-sasl-anonymous.c:119
-#: ../camel/camel-sasl-anonymous.c:130
+#: ../camel/camel-sasl-anonymous.c:80
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -2275,7 +2480,7 @@ msgstr ""
 "%s"
 
 # camel/camel-sasl-anonymous.c:131
-#: ../camel/camel-sasl-anonymous.c:142
+#: ../camel/camel-sasl-anonymous.c:94
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -2285,7 +2490,7 @@ msgstr ""
 "%s"
 
 # camel/camel-sasl-anonymous.c:143
-#: ../camel/camel-sasl-anonymous.c:154
+#: ../camel/camel-sasl-anonymous.c:108
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -2295,12 +2500,12 @@ msgstr ""
 "%s"
 
 # camel/camel-sasl-cram-md5.c:35
-#: ../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:37
-#: ../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."
@@ -2309,12 +2514,12 @@ msgstr ""
 "å??ã??"
 
 # camel/camel-sasl-digest-md5.c:43
-#: ../camel/camel-sasl-digest-md5.c:48
+#: ../camel/camel-sasl-digest-md5.c:56
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
 # camel/camel-sasl-digest-md5.c:45
-#: ../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."
@@ -2323,186 +2528,197 @@ msgstr ""
 "å??ã??"
 
 # camel/camel-sasl-digest-md5.c:810
-#: ../camel/camel-sasl-digest-md5.c:844
+#: ../camel/camel-sasl-digest-md5.c:818
+#, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "ä¼ºæ??å?¨æ?¥å??é??é?·(>2048 ä½?å?? )"
 
 # camel/camel-sasl-digest-md5.c:819
-#: ../camel/camel-sasl-digest-md5.c:853
+#: ../camel/camel-sasl-digest-md5.c:829
+#, c-format
 msgid "Server challenge invalid\n"
 msgstr "ä¼ºæ??å?¨æ?¥å??ç?¡æ??\n"
 
 # camel/camel-sasl-digest-md5.c:825
-#: ../camel/camel-sasl-digest-md5.c:859
+#: ../camel/camel-sasl-digest-md5.c:837
+#, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "ä¼ºæ??å?¨æ?¥å??å??å?«ç?¡æ??ç?? ã??Quality of Protectionã??ä»£ç¬¦"
 
 # camel/camel-sasl-digest-md5.c:847
-#: ../camel/camel-sasl-digest-md5.c:889
+#: ../camel/camel-sasl-digest-md5.c:869
+#, c-format
 msgid "Server response did not contain authorization data"
 msgstr "ä¼ºæ??å?¨å??æ??ä¸¦æ?ªå??å?«æ??æ¬?è³?æ??"
 
 # camel/camel-sasl-digest-md5.c:865
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:890
+#, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "ä¼ºæ??å?¨å??æ??å??å?«ä¸?å®?æ?´ç??æ??æ¬?è³?æ??"
 
 # camel/camel-sasl-digest-md5.c:875
-#: ../camel/camel-sasl-digest-md5.c:917
+#: ../camel/camel-sasl-digest-md5.c:903
+#, c-format
 msgid "Server response does not match"
 msgstr "ä¼ºæ??å?¨å??æ??ä¸?ç¬¦"
 
-#: ../camel/camel-sasl-gssapi.c:72
+#: ../camel/camel-sasl-gssapi.c:82
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
 # camel/camel-sasl-kerberos4.c:42
-#: ../camel/camel-sasl-gssapi.c:74
+#: ../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:168
+#: ../camel/camel-sasl-gssapi.c:121
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
 msgstr "æ??ä¾?ç??è?ä»¶ä¸?æ?¯æ?´æ??å®?ç??æ©?å?¶ï¼?æ??è??æ?¯å?·è¡?ç?¡æ³?è¾¨è?ã??"
 
-#: ../camel/camel-sasl-gssapi.c:173
+#: ../camel/camel-sasl-gssapi.c:126
 msgid "The provided target_name parameter was ill-formed."
 msgstr "æ??ä¾?ç?? target_name å??æ?¸æ ¼å¼?é?¯èª¤ã??"
 
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../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:180
+#: ../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 å??å?«ä¸?å??ç??é??é??ï¼?é??é??  input_chan_bindingsï¼?é?£çµ?è?³é??äº?æ??å®?ç??å??æ?¸ã??"
 
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../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:189
+#: ../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."
 msgstr "æ??ä¾?ç??è?ä»¶ä¸?é?©ç?¨æ?¼ç¶²è·¯ä½?ç½®ï¼?æ??è??è?ä»¶è?å?¥æ??æ¨?æ?ªå??ç?§ä»»ä½?æ??è?ã??"
 
-#: ../camel/camel-sasl-gssapi.c:194
+#: ../camel/camel-sasl-gssapi.c:147
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "æ??ä¾?ç??ç¶²è·¯ä½?ç½®è?å?¥æ??æ¨?æ?ªå??ç?§æ??æ??ç??ç¶²è·¯ä½?ç½®ã??"
 
-#: ../camel/camel-sasl-gssapi.c:197
+#: ../camel/camel-sasl-gssapi.c:150
 msgid "The consistency checks performed on the input_token failed."
 msgstr "å?¨ input_token å?·è¡?ä¸?è?´æ?§æª¢æ?¥å¤±æ??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:200
+#: ../camel/camel-sasl-gssapi.c:153
 msgid "The consistency checks performed on the credential failed."
 msgstr "å?¨è?ä»¶å?·è¡?ä¸?è?´æ?§æª¢æ?¥å¤±æ??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:203
+#: ../camel/camel-sasl-gssapi.c:156
 msgid "The referenced credentials have expired."
 msgstr "å??ç?§ç??è?ä»¶å·²ç¶?é??æ??ã??"
 
 # camel/camel-sasl-kerberos4.c:218
 # camel/providers/imap/camel-imap-store.c:433
-#: ../camel/camel-sasl-gssapi.c:209 ../camel/camel-sasl-gssapi.c:316
-#: ../camel/camel-sasl-gssapi.c:358 ../camel/camel-sasl-gssapi.c:373
-#: ../camel/providers/imap/camel-imap-store.c:1272
+#: ../camel/camel-sasl-gssapi.c:162 ../camel/camel-sasl-gssapi.c:300
+#: ../camel/camel-sasl-gssapi.c:344 ../camel/camel-sasl-gssapi.c:361
+#: ../camel/providers/smtp/camel-smtp-transport.c:1192
+#, c-format
 msgid "Bad authentication response from server."
 msgstr "ä¾?è?ªä¼ºæ??å?¨ç??ä¸?è?¯è¨±å?¯å??æ??ã??"
 
 # mail/mail-config.glade.h:1
-#: ../camel/camel-sasl-gssapi.c:383
+#: ../camel/camel-sasl-gssapi.c:373
+#, c-format
 msgid "Unsupported security layer."
 msgstr "ä¸?æ?¯æ?´ç??é¡?å??"
 
 # camel/camel-sasl-login.c:32
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:39
 msgid "Login"
 msgstr "ç?»å?¥"
 
 # camel/camel-sasl-login.c:34
 # camel/camel-sasl-plain.c:34
-#: ../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:127
-#: ../camel/camel-sasl-login.c:134
+#: ../camel/camel-sasl-login.c:94
+#, c-format
 msgid "Unknown authentication state."
 msgstr "æ?ªç?¥ç??é©?è¨¼ç??æ³?ã??"
 
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:41
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
 # camel/camel-sasl-kerberos4.c:42
-#: ../camel/camel-sasl-ntlm.c:36
+#: ../camel/camel-sasl-ntlm.c:43
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
 msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨ NTLM / å®?å?¨å¯?ç¢¼é©?è?é?£ç·?è?³å?ºæ?¼ Windows ç??ä¼ºæ??å?¨ã??"
 
-#: ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-plain.c:43
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:46
 msgid "POP before SMTP"
 msgstr "POP å??æ?¼ SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:41
+#: ../camel/camel-sasl-popb4smtp.c:48
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "é??å??é?¸é ?å°?æ??å?¨é?²è¡? SMTP ä¹?å??å??è¨± POPé?£ç·?"
 
 # addressbook/gui/widgets/e-addressbook-view.c:735
-#: ../camel/camel-sasl-popb4smtp.c:106
+#: ../camel/camel-sasl-popb4smtp.c:82
 msgid "POP Source URI"
 msgstr "POP ä¾?æº? URI"
 
-#: ../camel/camel-sasl-popb4smtp.c:109
+#: ../camel/camel-sasl-popb4smtp.c:89
+#, c-format
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "POP å??æ?¼ SMTP å??è¨±ä½¿ç?¨æ?ªç?¥ç??å?³è¼¸"
 
-#: ../camel/camel-sasl-popb4smtp.c:114
+#: ../camel/camel-sasl-popb4smtp.c:97
+#, c-format
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP å??æ?¼ SMTP å??è¨±ä½¿ç?¨é?? POP ä¾?æº?"
 
 # camel/camel-search-private.c:111
-#: ../camel/camel-search-private.c:147
+#: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "æ£è¦?è¡¨ç¤ºå¼?ç·¨è¯å¤±æ??ï¼? %sï¼? %s"
 
 # camel/camel-service.c:154
-#: ../camel/camel-service.c:265
+#: ../camel/camel-service.c:88
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URLã??%sã??é??è¦? username å??ä»¶"
 
 # camel/camel-service.c:162
-#: ../camel/camel-service.c:269
+#: ../camel/camel-service.c:92
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URLã??%sã??é??è¦? host å??ä»¶"
 
 # camel/camel-service.c:170
-#: ../camel/camel-service.c:273
+#: ../camel/camel-service.c:96
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URLã??%sã??é??è¦? path å??ä»¶"
 
 # camel/camel-session.c:479
-#: ../camel/camel-session.c:305
+#: ../camel/camel-session.c:263
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2512,148 +2728,130 @@ msgstr ""
 "%s"
 
 # camel/providers/pop3/camel-pop3-store.c:361
-#: ../camel/camel-session.c:477
+#: ../camel/camel-session.c:760
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "è«?è¼¸å?¥ %2$s æ?¼ä¸»æ©? %3$s ç?? %1$s å¯?ç¢¼ã??"
 
-#: ../camel/camel-session.c:815
-msgid "Camel session doesn't support forwarding of a message."
-msgstr "Camel ä½?æ¥é??æ®µä¸?æ?¯æ?´è½?é??è¨?æ?¯ã??"
-
 # camel/camel-smime-context.c:327
-#: ../camel/camel-smime-context.c:447 ../camel/camel-smime-context.c:1012
+#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1041
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "æ?¾ä¸?å?° '%s' ç??æ??è?"
 
 # camel/camel-filter-driver.c:671
-#: ../camel/camel-smime-context.c:453
+#: ../camel/camel-smime-context.c:376
 msgid "Cannot create CMS message"
 msgstr "ç?¡æ³?å»ºæ§? CMS è¨?æ?¯"
 
-#: ../camel/camel-smime-context.c:458
+#: ../camel/camel-smime-context.c:381
 msgid "Cannot create CMS signed data"
 msgstr "ç?¡æ³?å»ºæ§? CMS signedData"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-smime-context.c:464
+#: ../camel/camel-smime-context.c:387
 msgid "Cannot attach CMS signed data"
 msgstr "ç?¡æ³?é??å?  CMS signedData"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-smime-context.c:471
+#: ../camel/camel-smime-context.c:394
 msgid "Cannot attach CMS data"
 msgstr "ç?¡æ³?é??å?  CMS è³?æ??"
 
-#: ../camel/camel-smime-context.c:477
+#: ../camel/camel-smime-context.c:400
 msgid "Cannot create CMS Signer information"
 msgstr "ç?¡æ³?å»ºæ§? CMS SignerInfo"
 
-#: ../camel/camel-smime-context.c:483
+#: ../camel/camel-smime-context.c:406
 msgid "Cannot find certificate chain"
 msgstr "æ?¾ä¸?å?°æ??è?é??"
 
-#: ../camel/camel-smime-context.c:489
+#: ../camel/camel-smime-context.c:412
 msgid "Cannot add CMS Signing time"
 msgstr "ç?¡æ³?æ?°å¢? CMS SigningTime"
 
 # composer/e-msg-composer.c:1092
-#: ../camel/camel-smime-context.c:511 ../camel/camel-smime-context.c:523
+#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' ç??å? å¯?æ??è?ä¸?å?å?¨"
 
-#: ../camel/camel-smime-context.c:530
+#: ../camel/camel-smime-context.c:458
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "ç?¡æ³?æ?°å¢? SMIMEEncKeyPrefs å±¬æ?§"
 
-#: ../camel/camel-smime-context.c:535
+#: ../camel/camel-smime-context.c:463
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "ç?¡æ³?æ?°å¢? MS SMIMEEncKeyPrefs å±¬æ?§"
 
-#: ../camel/camel-smime-context.c:540
+#: ../camel/camel-smime-context.c:468
 msgid "Cannot add encryption certificate"
 msgstr "ç?¡æ³?æ?°å¢?å? å¯?æ??è?"
 
-#: ../camel/camel-smime-context.c:546
+#: ../camel/camel-smime-context.c:474
 msgid "Cannot add CMS Signer information"
 msgstr "ç?¡æ³?æ?°å¢? CMS SignerInfo"
 
-# mail/mail-crypto.c:251
-#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:1084
-msgid "Cannot create encoder context"
-msgstr "ç?¡æ³?å»ºæ§?ç·¨ç¢¼å?¨ç¶²è·¯ä½?ç½®"
-
-# camel/camel-movemail.c:274
-#: ../camel/camel-smime-context.c:622
-msgid "Failed to add data to CMS encoder"
-msgstr "ç?¡æ³?æ?°å¢?è³?æ??è?³ CMS ç·¨ç¢¼å?¨"
-
-#: ../camel/camel-smime-context.c:627 ../camel/camel-smime-context.c:1101
-msgid "Failed to encode data"
-msgstr "ç?¡æ³?ç·¨ç¢¼è³?æ??"
-
 # calendar/gui/calendar-model.c:1064
 # calendar/gui/dialogs/task-editor-dialog.glade.h:22
 # calendar/gui/e-calendar-table.c:348
-#: ../camel/camel-smime-context.c:700
+#: ../camel/camel-smime-context.c:506
 msgid "Unverified"
 msgstr "æ?ªæ??å®?"
 
 # mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:702
+#: ../camel/camel-smime-context.c:508
 msgid "Good signature"
 msgstr "è?¯å¥½ç??ç°½ç« "
 
 # mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:704
+#: ../camel/camel-smime-context.c:510
 msgid "Bad signature"
 msgstr "é?¯èª¤ç??ç°½ç« "
 
-#: ../camel/camel-smime-context.c:706
+#: ../camel/camel-smime-context.c:512
 msgid "Content tampered with or altered in transit"
 msgstr "å?§å®¹å?¨å?³é??æ??è¢«ç«?æ?¹æ??è®?æ?´"
 
-#: ../camel/camel-smime-context.c:708
+#: ../camel/camel-smime-context.c:514
 msgid "Signing certificate not found"
 msgstr "æ?¾ä¸?å?°ç°½ç½²æ??è?"
 
-#: ../camel/camel-smime-context.c:710
+#: ../camel/camel-smime-context.c:516
 msgid "Signing certificate not trusted"
 msgstr "ç°½ç½²æ??è?ä¸?å??ä¿¡ä»»"
 
-#: ../camel/camel-smime-context.c:712
+#: ../camel/camel-smime-context.c:518
 msgid "Signature algorithm unknown"
 msgstr "æ?ªç?¥ç??ç°½ç« æ¼?ç®?æ³?"
 
-#: ../camel/camel-smime-context.c:714
+#: ../camel/camel-smime-context.c:520
 msgid "Signature algorithm unsupported"
 msgstr "ä¸?æ?¯æ?´é??ç¨®ç°½ç« æ¼?ç®?æ³?"
 
 # mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:716
+#: ../camel/camel-smime-context.c:522
 msgid "Malformed signature"
 msgstr "æ ¼å¼?ä¸?è?¯ç??ç°½ç« "
 
 # shell/e-storage.c:467
-#: ../camel/camel-smime-context.c:718
+#: ../camel/camel-smime-context.c:524
 msgid "Processing error"
 msgstr "è§£æ??é?¯èª¤"
 
-#: ../camel/camel-smime-context.c:772
+#: ../camel/camel-smime-context.c:566
 msgid "No signed data in signature"
 msgstr "ç°½ç« ä¸æ²?æ??è¢«ç°½ç½²ç??è³?æ??"
 
-#: ../camel/camel-smime-context.c:777
+#: ../camel/camel-smime-context.c:571
 msgid "Digests missing from enveloped data"
 msgstr "å??è£¹ç??è³?æ??ä¸é?ºæ¼?æ??è¦?"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-smime-context.c:790 ../camel/camel-smime-context.c:800
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
 msgstr "ç?¡æ³?è¨?ç®?æ??è¦?"
 
@@ -2664,134 +2862,128 @@ msgstr "ç?¡æ³?è¨?ç®?æ??è¦?"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../camel/camel-smime-context.c:807 ../camel/camel-smime-context.c:811
+#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
 msgstr "ç?¡æ³?è¨å®?é?µä»¶æ??è¦?"
 
 # mail/mail-crypto.c:59
-#: ../camel/camel-smime-context.c:821 ../camel/camel-smime-context.c:826
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
 msgstr "æ??è?å?¯å?¥å¤±æ??"
 
-#: ../camel/camel-smime-context.c:836
+#: ../camel/camel-smime-context.c:631
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "é??æ??è?è¨?æ?¯ï¼?ç?¡æ³?é©?è?æ??è?"
 
-#: ../camel/camel-smime-context.c:839
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "é??æ??è?è¨?æ?¯ã??å?¯å?¥å??é©?è?ç??æ??è?"
 
 # mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:843
+#: ../camel/camel-smime-context.c:638
 msgid "Cannot find signature digests"
 msgstr "æ?¾ä¸?å?°ç°½ç« æ??è¦?"
 
 # mail/mail-config.glade.h:72
-#: ../camel/camel-smime-context.c:859
+#: ../camel/camel-smime-context.c:654
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ç°½ç½²è??ï¼? %s<%s>ï¼? %s\n"
 
+# mail/mail-crypto.c:251
+#: ../camel/camel-smime-context.c:832 ../camel/camel-smime-context.c:1114
+msgid "Cannot create encoder context"
+msgstr "ç?¡æ³?å»ºæ§?ç·¨ç¢¼å?¨ç¶²è·¯ä½?ç½®"
+
+# camel/camel-movemail.c:274
+#: ../camel/camel-smime-context.c:838
+msgid "Failed to add data to CMS encoder"
+msgstr "ç?¡æ³?æ?°å¢?è³?æ??è?³ CMS ç·¨ç¢¼å?¨"
+
+#: ../camel/camel-smime-context.c:843 ../camel/camel-smime-context.c:1131
+msgid "Failed to encode data"
+msgstr "ç?¡æ³?ç·¨ç¢¼è³?æ??"
+
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/camel-smime-context.c:960 ../camel/camel-smime-context.c:1184
+#: ../camel/camel-smime-context.c:981 ../camel/camel-smime-context.c:1220
 msgid "Decoder failed"
 msgstr "è§£ç¢¼å?¨å¤±æ??"
 
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1049
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "æ?¾ä¸?å?°ä¸?è?¬å¤§é??å? å¯?æ¼?ç®?æ³?"
 
-#: ../camel/camel-smime-context.c:1027
+#: ../camel/camel-smime-context.c:1057
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "ç?¡æ³?é??ç½®æ??æ§½çµ¦å? å¯?å¤§é??é?°å??"
 
 # camel/camel-filter-driver.c:671
-#: ../camel/camel-smime-context.c:1038
+#: ../camel/camel-smime-context.c:1068
 msgid "Cannot create CMS Message"
 msgstr "ç?¡æ³?å»ºæ§? CMS è¨?æ?¯"
 
 # camel/camel-filter-driver.c:671
-#: ../camel/camel-smime-context.c:1044
+#: ../camel/camel-smime-context.c:1074
 msgid "Cannot create CMS Enveloped data"
 msgstr "ç?¡æ³?å»ºæ§? CMS EnvelopedData"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-smime-context.c:1050
+#: ../camel/camel-smime-context.c:1080
 msgid "Cannot attach CMS Enveloped data"
 msgstr "ç?¡æ³?é??å?  CMS EnvelopedData"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-smime-context.c:1056
+#: ../camel/camel-smime-context.c:1086
 msgid "Cannot attach CMS data object"
 msgstr "ç?¡æ³?é??å?  CMS è³?æ??ç?©ä»¶"
 
 # camel/camel-filter-driver.c:671
-#: ../camel/camel-smime-context.c:1065
+#: ../camel/camel-smime-context.c:1095
 msgid "Cannot create CMS Recipient information"
 msgstr "ç?¡æ³?å»ºæ§? CMS RecipientInfo"
 
-#: ../camel/camel-smime-context.c:1070
+#: ../camel/camel-smime-context.c:1100
 msgid "Cannot add CMS Recipient information"
 msgstr "ç?¡æ³?æ?°å¢? CMS RecipientInfo"
 
 # camel/providers/imap/camel-imap-store.c:531
-#: ../camel/camel-smime-context.c:1095
+#: ../camel/camel-smime-context.c:1125
 msgid "Failed to add data to encoder"
 msgstr "ç?¡æ³?æ?°å¢?è³?æ??è?³ç·¨ç¢¼å?¨"
 
-#: ../camel/camel-smime-context.c:1191
+#: ../camel/camel-smime-context.c:1227
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME è§£å¯?ï¼?æ?¾ä¸?å?°å? å¯?å?§å®¹"
 
-# camel/providers/smtp/camel-smtp-transport.c:172
-#: ../camel/camel-smime-context.c:1219
-msgid "import keys: unimplemented"
-msgstr "å?¯å?¥é?°å??ï¼?æ?ªå?·è¡?"
-
-#: ../camel/camel-smime-context.c:1227
-msgid "export keys: unimplemented"
-msgstr "å?¯å?ºé?°å??ï¼?æ?ªå?·è¡?"
-
-# camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:171
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ï¼?å?¨æ¤å?²å?ç©ºé??ä¸?ç?¡æ??ç??æ??ä½?"
-
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-store.c:316
+#: ../camel/camel-store.c:444
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?è³?æ??å¤¾å·²å?å?¨"
 
-# camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/camel-store.c:395
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr "ä¸?è?½å»ºæ§?è³?æ??å¤¾ï¼?å?¨æ¤å?²å?ç©ºé??ä¸?ç?¡æ??ç??æ??ä½?"
-
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-store.c:423
+#: ../camel/camel-store.c:543
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "ç?¡æ³?å»ºæ§?è³?æ??å¤¾ï¼?%sï¼?è³?æ??å¤¾å·²å?å?¨"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:377
-#: ../camel/providers/local/camel-maildir-store.c:219
+#: ../camel/camel-store.c:616 ../camel/camel-vee-store.c:263
+#: ../camel/providers/local/camel-maildir-store.c:224
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "ä¸?è?½å?ªé?¤è³?æ??å¤¾ï¼? %s ï¼?ç?¡æ??ç??æ??ä½?"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:414
-#: ../camel/providers/local/camel-maildir-store.c:291
+#: ../camel/camel-store.c:680 ../camel/camel-vee-store.c:213
+#: ../camel/providers/local/camel-maildir-store.c:314
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "ä¸?è?½é??æ?°å?½å??è³?æ??å¤¾ï¼? %s ï¼?ç?¡æ??ç??æ??ä½?"
@@ -2802,17 +2994,17 @@ msgstr "ä¸?è?½é??æ?°å?½å??è³?æ??å¤¾ï¼? %s ï¼?ç?¡æ??ç??æ??ä½?"
 # mail/mail-ops.c:1032
 # mail/mail-ops.c:1033
 #. 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:1128 ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "å??æ?¶ç?"
 
 # calendar/gui/goto-dialog.glade.h:9
 #. 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:1131 ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "å??å?¾é?µä»¶"
 
-#: ../camel/camel-tcp-stream-ssl.c:870
+#: ../camel/camel-tcp-stream-ssl.c:786
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2825,18 +3017,18 @@ msgstr ""
 "æ??ç´?æª?:              %s\n"
 "ç°½ç« :              %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:876
+#: ../camel/camel-tcp-stream-ssl.c:792
 msgid "GOOD"
 msgstr "è?¯å¥½"
 
-#: ../camel/camel-tcp-stream-ssl.c:876
+#: ../camel/camel-tcp-stream-ssl.c:792
 msgid "BAD"
 msgstr "ä¸?è?¯"
 
 # camel/camel-tcp-stream-openssl.c:428
 # camel/camel-tcp-stream-ssl.c:364
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-ssl.c:796
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2851,7 +3043,7 @@ msgstr ""
 "\n"
 "æ?¨æ?³è¦?æ?¥å??å??ï¼?"
 
-#: ../camel/camel-tcp-stream-ssl.c:924
+#: ../camel/camel-tcp-stream-ssl.c:840
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2860,7 +3052,7 @@ msgstr ""
 "æ??è?å??é¡?ï¼? %s\n"
 "ç?¼ç?§è??ï¼? %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:976
+#: ../camel/camel-tcp-stream-ssl.c:892
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2869,7 +3061,7 @@ msgstr ""
 "ä¸?æ£ç¢ºç??æ??è?ç¶²å??ï¼? %s\n"
 "ç?¼ç?§è??ï¼? %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:994
+#: ../camel/camel-tcp-stream-ssl.c:910
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2878,7 +3070,7 @@ msgstr ""
 "æ??è?å·²é?¾æ??ï¼? %s\n"
 "ç?¼ç?§è??ï¼? %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1011
+#: ../camel/camel-tcp-stream-ssl.c:927
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2888,53 +3080,54 @@ msgstr ""
 "ç?¼ç?§è??ï¼? %s"
 
 # camel/camel-url.c:289
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:314
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "ç?¡æ³?è§£æ?? URLã??%sã??"
 
 # shell/e-shell-importer.c:384
-#: ../camel/camel-vee-folder.c:577
+#: ../camel/camel-vee-folder.c:1044
 #, c-format
-msgid "Error storing '%s': %s"
-msgstr "å?²å?ã??%sã??ç?¼ç??é?¯èª¤ï¼?%s"
+msgid "Error storing '%s': "
+msgstr "å?²å?ã??%sã??ç?¼ç??é?¯èª¤ï¼?"
 
 # camel/camel-vee-folder.c:451
-#: ../camel/camel-vee-folder.c:654
+#: ../camel/camel-vee-folder.c:1117
 #, c-format
 msgid "No such message %s in %s"
 msgstr "æ²?æ?? %s é??é¡?é?µä»¶å?¨ %s ä¸"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/camel-vee-folder.c:813 ../camel/camel-vee-folder.c:819
+#: ../camel/camel-vee-folder.c:1133 ../camel/camel-vee-folder.c:1148
+#, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "ä¸?è?½è¤?è£½æ??ç§»å??é?µä»¶å?°è??æ?¬è³?æ??å¤¾ä¸"
 
-#: ../camel/camel-vee-store.c:113 ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:353
+#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
+#: ../camel/camel-vee-store.c:417
 msgid "Unmatched"
 msgstr "æ²?æ??ç?¸ç¬¦è³?æ??"
 
+# camel/providers/local/camel-local-store.c:237
+#: ../camel/camel-vee-store.c:223
+#, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "ä¸?è?½é??æ?°å?½å??è³?æ??å¤¾ï¼? %s ï¼?æ²?æ??é??å??è³?æ??å¤¾"
+
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: ../camel/camel-vee-store.c:400
+#: ../camel/camel-vee-store.c:289
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "ä¸?è?½å?ªé?¤è³?æ??å¤¾ï¼? %s ï¼?æ²?æ??é??å??è³?æ??å¤¾"
 
-# camel/providers/local/camel-local-store.c:237
-#: ../camel/camel-vee-store.c:422
-#, c-format
-msgid "Cannot rename folder: %s: No such folder"
-msgstr "ä¸?è?½é??æ?°å?½å??è³?æ??å¤¾ï¼? %s ï¼?æ²?æ??é??å??è³?æ??å¤¾"
-
 # camel/providers/local/camel-mbox-summary.c:644
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "ç?¡æ³?è¤?è£½è¨?æ?¯å?°ã??å??æ?¶ç?ã??è³?æ??å¤¾"
 
 # camel/providers/local/camel-mbox-summary.c:644
-#: ../camel/camel-vtrash-folder.c:57
+#: ../camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
 msgstr "ç?¡æ³?è¤?è£½è¨?æ?¯å?°ã??å??å?¾é?µä»¶ã??è³?æ??å¤¾"
 
@@ -2945,7 +3138,7 @@ msgstr "ç?¡æ³?è¤?è£½è¨?æ?¯å?°ã??å??å?¾é?µä»¶ã??è³?æ??å¤¾"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2957,32 +3150,16 @@ msgstr ""
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-mbox-folder.c:319
 # camel/providers/local/camel-mh-folder.c:185
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
-#: ../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:139
+#: ../camel/providers/local/camel-maildir-folder.c:233
+#: ../camel/providers/local/camel-maildir-folder.c:268
+#: ../camel/providers/local/camel-maildir-folder.c:380
+#: ../camel/providers/local/camel-mbox-folder.c:329
+#: ../camel/providers/local/camel-mbox-folder.c:380
+#: ../camel/providers/local/camel-mh-folder.c:215
 msgid "No such message"
 msgstr "ç?¡æ¤é?µä»¶"
 
-# camel/camel-remote-store.c:337
-# camel/camel-remote-store.c:399
-# camel/camel-remote-store.c:470
-# camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:149
-#: ../camel/providers/imap4/camel-imap4-folder.c:814
-#: ../camel/providers/nntp/camel-nntp-folder.c:173
-#: ../camel/providers/nntp/camel-nntp-folder.c:248
-#: ../camel/providers/nntp/camel-nntp-folder.c:408
-#: ../camel/providers/pop3/camel-pop3-folder.c:268
-#: ../camel/providers/pop3/camel-pop3-folder.c:578
-#: ../camel/providers/pop3/camel-pop3-folder.c:639
-#: ../camel/providers/pop3/camel-pop3-folder.c:657
-msgid "User canceled"
-msgstr "ä½¿ç?¨è??å·²å??æ¶?"
-
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-maildir-folder.c:209
 # camel/providers/local/camel-maildir-folder.c:217
@@ -2990,73 +3167,63 @@ msgstr "ä½¿ç?¨è??å·²å??æ¶?"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:156
-#: ../camel/providers/imap4/camel-imap4-folder.c:819
-#: ../camel/providers/nntp/camel-nntp-folder.c:164
-#: ../camel/providers/nntp/camel-nntp-folder.c:166
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:250
-#: ../camel/providers/pop3/camel-pop3-folder.c:388
-#: ../camel/providers/pop3/camel-pop3-folder.c:581
-#: ../camel/providers/pop3/camel-pop3-folder.c:642
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-#: ../camel/providers/pop3/camel-pop3-folder.c:660
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:158
+#: ../camel/providers/nntp/camel-nntp-folder.c:244
+#: ../camel/providers/nntp/camel-nntp-folder.c:337
+#: ../camel/providers/pop3/camel-pop3-folder.c:714
 #, c-format
-msgid "Cannot get message %s: %s"
-msgstr "ç?¡æ³?å??å¾?é?µä»¶ %sï¼? %s"
+msgid "Cannot get message %s: "
+msgstr "ç?¡æ³?å??å¾?é?µä»¶ %sï¼?"
 
 # camel/providers/imap/camel-imap-folder.c:1047
 # camel/providers/imap/camel-imap-folder.c:1281
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:173
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:181
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2507
-#: ../camel/providers/imap4/camel-imap4-folder.c:837
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:176
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:186
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2644
+#, c-format
 msgid "This message is not available in offline mode."
 msgstr "é??å°?é?µä»¶ç?¡æ³?å?¨é?¢ç·?æ¨¡å¼?ä¸?ä½¿ç?¨ã??"
 
 # camel/camel-movemail.c:306
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:195
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2010
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2061
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:203
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:213
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2109
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2163
+#, c-format
 msgid "Could not get message"
 msgstr "ç?¡æ³?å??å¾?é?µä»¶ã??"
 
 # camel/providers/imap/camel-imap-folder.c:191
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:983
-#: ../camel/providers/imap/camel-imap-folder.c:295
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1038
+#: ../camel/providers/imap/camel-imap-folder.c:376
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "ç?¡æ³?è¼?å?¥ %s ç??æ??è¦?"
 
 # mail/mail-ops.c:992
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1056
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1112
 #, c-format
 msgid "Checking for deleted messages %s"
 msgstr "æª¢æ?¥å?ªé?¤ç??é?µä»¶ %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1331
-msgid "Trash Folder Full. Please Empty."
-msgstr "å??æ?¶ç?è³?æ??å¤¾å·²æ»¿ã??è«?å°?å®?æ¸?ç©ºã??"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1565
-#: ../camel/providers/groupwise/camel-groupwise-store.c:633
-#: ../camel/providers/groupwise/camel-groupwise-store.c:763
-#: ../camel/providers/imap/camel-imap-folder.c:3429
-#: ../camel/providers/imap/camel-imap-folder.c:3505
-#: ../camel/providers/imapx/camel-imapx-server.c:2728
-#: ../camel/providers/imapx/camel-imapx-server.c:2813
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1637
+#: ../camel/providers/groupwise/camel-groupwise-store.c:654
+#: ../camel/providers/groupwise/camel-groupwise-store.c:779
+#: ../camel/providers/imap/camel-imap-folder.c:3806
+#: ../camel/providers/imap/camel-imap-folder.c:3884
+#: ../camel/providers/imapx/camel-imapx-server.c:3720
+#: ../camel/providers/imapx/camel-imapx-server.c:3844
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "æ£å??å¾? %s ä¸æ?°é?µä»¶ç??æ??è¦?è³?è¨?"
 
 # camel/providers/local/camel-mh-folder.c:149
 # camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2361
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2404
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2474
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2524
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
-msgstr "ä¸?è?½å°?é?µä»¶å? å?¥è?³è³?æ??å¤¾ã??%sã??ï¼?%s"
+msgstr "ä¸?è?½å°?é?µä»¶å?²å?è?³è³?æ??å¤¾ã??%sã??ï¼?%s"
 
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-maildir-folder.c:209
@@ -3065,93 +3232,87 @@ msgstr "ä¸?è?½å°?é?µä»¶å? å?¥è?³è³?æ??å¤¾ã??%sã??ï¼?%s"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2392
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2510
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "ç?¡æ³?å»ºæ§?é?µä»¶ï¼? %s"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:281
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:240
 #, c-format
 msgid "Cannot get folder container %s"
 msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾å®¹å?¨ %s"
 
 # camel/providers/local/camel-mh-folder.c:149
 # camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:343
-#: ../camel/providers/imap4/camel-imap4-journal.c:311
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:303
+#, c-format
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr "ä¸?è?½å?¨é?¢ç·?æ¨¡å¼?ä¸å? å?¥é?µä»¶ï¼?ç?¡æ³?ä½¿ç?¨å¿«å??"
 
 # camel/providers/local/camel-mbox-folder.c:259
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:359
-#: ../camel/providers/imap4/camel-imap4-journal.c:327
-#, c-format
-msgid "Cannot append message in offline mode: %s"
-msgstr "ä¸?è?½å?¨é?¢ç·?æ¨¡å¼?ä¸å? å?¥é?µä»¶ï¼? %s"
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:320
+msgid "Cannot append message in offline mode: "
+msgstr "ä¸?è?½å?¨é?¢ç·?æ¨¡å¼?ä¸å? å?¥é?µä»¶ï¼?"
 
 # camel/providers/imap/camel-imap-provider.c:43
 # mail/mail-config.glade.h:13
-#: ../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/imap/camel-imap-provider.c:45
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:56
-#: ../camel/providers/hula/camel-hula-provider.c:50
-#: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:40
-#: ../camel/providers/imapx/camel-imapx-provider.c:48
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:47
 msgid "C_heck for new messages in all folders"
 msgstr "æª¢æ?¥æ??æ??è³?æ??å¤¾ä¸æ?¯å?¦æ??æ?°é?µä»¶(_H)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:51
-#: ../camel/providers/imapx/camel-imapx-provider.c:72
-#: ../camel/providers/local/camel-local-provider.c:46
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:106
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imapx/camel-imapx-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:42
+#: ../camel/providers/local/camel-local-provider.c:82
+#: ../camel/providers/local/camel-local-provider.c:102
 msgid "Options"
 msgstr "é?¸é ?"
 
 # camel/providers/imap/camel-imap-provider.c:57
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr "å¥?ç?¨é??æ¿¾å?¨è?³æ¤ä¼ºæ??å?¨æ?¶ä»¶å?£ç??æ?°é?µä»¶(_A)"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:63
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
 msgid "Check new messages for J_unk contents"
 msgstr "æª¢æ?¥æ?°é?µä»¶ä¸æ?¯å?¦æ??å??å?¾é?µä»¶å?§å®¹(_U)"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:74
-#: ../camel/providers/imapx/camel-imapx-provider.c:78
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
+#: ../camel/providers/imap/camel-imap-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:79
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "å?ªæª¢æ?¥æ?¶ä»¶å?£è³?æ??å¤¾ä¸ç??å??å?¾é?µä»¶(_B)"
 
 # mail/mail-config.glade.h:12
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:67
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
 msgid "Automatically synchroni_ze account locally"
 msgstr "è?ªå??å??æ¥æ?¬å?°å¸³è??(_Z)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
 msgid "SOAP Settings"
 msgstr "SOAP è¨å®?å?¼"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:75
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "Post Office Agent SOAP _Port:"
 msgstr "é?µå±?ä»£è¾¦ SOAP å? (_P):"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "For accessing Novell GroupWise servers"
 msgstr "ç?¨æ?¼å?å?? Novell Groupwise ä¼ºæ??å?¨"
 
@@ -3161,92 +3322,110 @@ msgstr "ç?¨æ?¼å?å?? Novell Groupwise ä¼ºæ??å?¨"
 # camel/providers/nntp/camel-nntp-store.c:291
 # camel/providers/pop3/camel-pop3-provider.c:67
 # mail/mail-config.glade.h:52
-#: ../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:104
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:98
+#: ../camel/providers/imap/camel-imap-provider.c:97
+#: ../camel/providers/imapx/camel-imapx-provider.c:105
+#: ../camel/providers/nntp/camel-nntp-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:70
 msgid "Password"
 msgstr "å¯?ç¢¼"
 
 # camel/providers/imap/camel-imap-provider.c:82
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:100
 msgid ""
 "This option will connect to the GroupWise server using a plaintext password."
 msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨ç°¡æ??ç??å¯?ç¢¼é?£ç·?è?³ GroupWise ä¼ºæ??å?¨ã??"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: ../camel/providers/groupwise/camel-groupwise-store.c:102
+#: ../camel/providers/groupwise/camel-groupwise-store.c:107
+#, c-format
 msgid "Host or user not available in url"
 msgstr "ç¶²å??ä¸ç??ä½¿ç?¨è??æ??ä¸»æ©?ç?¡æ³?ä½¿ç?¨"
 
 # camel/providers/imap/camel-imap-store.c:505
 # camel/providers/smtp/camel-smtp-transport.c:410
-#: ../camel/providers/groupwise/camel-groupwise-store.c:204
-#: ../camel/providers/imap/camel-imap-store.c:1356
+#: ../camel/providers/groupwise/camel-groupwise-store.c:207
+#: ../camel/providers/imap/camel-imap-store.c:1207
+#: ../camel/providers/imapx/camel-imapx-server.c:2974
+#, c-format
 msgid "You did not enter a password."
 msgstr "æ?¨æ²?æ??è¼¸å?¥å¯?ç¢¼ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:319
+#: ../camel/providers/groupwise/camel-groupwise-store.c:328
 msgid "Some features may not work correctly with your current server version"
 msgstr "æ??äº?å??è?½å?¯è?½ç?¡æ³?å?¨æ?¨ç?®å??ç??ä¼ºæ??å?¨ç??æ?¬ä¸?æ£å¸¸é??ä½?"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: ../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:297
+#: ../camel/providers/groupwise/camel-groupwise-store.c:550
+#: ../camel/providers/imap/camel-imap-store.c:1776
+#: ../camel/providers/imap/camel-imap-store.c:1971
+#: ../camel/providers/imapx/camel-imapx-store.c:410
 #, c-format
 msgid "No such folder %s"
 msgstr "æ²?æ??é??å??è³?æ??å¤¾ %s"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1266
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1187
+#, c-format
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "å?¨é?¢ç·?æ¨¡å¼?ä¸ä¸?è?½å»ºæ§? GroupWise è³?æ??å¤¾ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1280
-#: ../camel/providers/imap/camel-imap-store.c:1954
-#: ../camel/providers/imap/camel-imap-store.c:2334
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1196
+#, c-format
+msgid "Cannot create a special system folder"
+msgstr "ä¸?è?½å»ºç«?ç?¹æ®?ç??ç³»çµ±è³?æ??å¤¾"
+
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1206
+#: ../camel/providers/imap/camel-imap-store.c:1854
+#: ../camel/providers/imap/camel-imap-store.c:2276
+#: ../camel/providers/imapx/camel-imapx-store.c:873
+#, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "æ¯?è³?æ??å¤¾ä¸¦ä¸?å??è¨±å??å?«å?è³?æ??å¤¾"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1289
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1314
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
 msgstr "ä¸?è?½å°? GroupWise è³?æ??å¤¾ã??%sã??é??æ?°å?½å??ç?ºã??%sã??"
 
 # shell/e-shortcuts-view.c:137
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1414
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1348
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:54
 #, c-format
 msgid "GroupWise server %s"
 msgstr "GroupWise ä¼ºæ??å?¨ %s"
 
 # camel/camel-remote-store.c:195
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1416
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1350
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "%s ç?? GroupWise æ??å??æ?¼ %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:536
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:122
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:58
 #, c-format
 msgid "GroupWise mail delivery via %s"
 msgstr "ç¶?ç?± %s å?³é?? GroupWise é?µä»¶"
 
 # mail/mail-ops.c:603
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:164
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:95
 msgid "Sending Message"
 msgstr "æ£å?¨å?³é??é?µä»¶"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:212
+# camel/providers/local/camel-mbox-folder.c:152
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:105
+#, c-format
+msgid "Cannot get folder: Invalid operation on this store"
+msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ï¼?å?¨æ¤å?²å?ç©ºé??ä¸?ç?¡æ??ç??æ??ä½?"
+
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:152
+#, c-format
 msgid ""
 "You have exceeded this account's storage limit. Your messages are queued in "
 "your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
@@ -3256,93 +3435,20 @@ msgstr ""
 "å¾?å??æ?? å?³é??/æ?¥æ?¶ é??æ?°å¯?é??ã??\n"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:150
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:207
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
 #, c-format
 msgid "Could not send message: %s"
 msgstr "é?µä»¶ç?¡æ³?å?³é??ï¼? %s"
 
-# camel/providers/imap/camel-imap-provider.c:43
-# mail/mail-config.glade.h:13
-#: ../camel/providers/hula/camel-hula-provider.c:48
-#: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
-msgid "Checking for New Mail"
-msgstr "æª¢æ?¥æ?°é?µä»¶"
-
-# mail/mail-config.c:1213
-# mail/mail-config.c:1216
-#: ../camel/providers/hula/camel-hula-provider.c:53
-#: ../camel/providers/imap/camel-imap-provider.c:52
-#: ../camel/providers/imapx/camel-imapx-provider.c:54
-msgid "Connection to Server"
-msgstr "é?£ç·?å?°ä¼ºæ??å?¨"
-
-# camel/providers/imap/camel-imap-store.c:531
-#: ../camel/providers/hula/camel-hula-provider.c:55
-#: ../camel/providers/imap/camel-imap-provider.c:54
-#: ../camel/providers/imapx/camel-imapx-provider.c:56
-msgid "_Use custom command to connect to server"
-msgstr "ä½¿ç?¨è?ªè¨?æ??ä»¤ä¾?é?£ç·?å?°ä¼ºæ??å?¨(_U)"
-
-# addressbook/contact-editor/e-contact-editor.c:1248
-#: ../camel/providers/hula/camel-hula-provider.c:57
-#: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:58
-msgid "Command:"
-msgstr "æ??ä»¤ï¼?"
-
-# camel/providers/imap/camel-imap-provider.c:48
-# shell/e-shell-view.c:552
-#: ../camel/providers/hula/camel-hula-provider.c:60
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:43
-#: ../camel/providers/imapx/camel-imapx-provider.c:64
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid "Folders"
-msgstr "è³?æ??å¤¾"
-
-# camel/providers/imap/camel-imap-provider.c:50
-#: ../camel/providers/hula/camel-hula-provider.c:62
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:45
-#: ../camel/providers/imapx/camel-imapx-provider.c:66
-msgid "_Show only subscribed folders"
-msgstr "å?ªé¡¯ç¤ºå·²è¨?é?±ç??è³?æ??å¤¾(_S)"
-
-# camel/providers/imap/camel-imap-provider.c:52
-#: ../camel/providers/hula/camel-hula-provider.c:64
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:47
-#: ../camel/providers/imapx/camel-imapx-provider.c:68
-msgid "O_verride server-supplied folder namespace"
-msgstr "è¦?è??ä¼ºæ??å?¨æ??ä¾?ä¹?è³?æ??å¤¾ç??å?½å??ç©ºé??(_V)"
-
-# camel/providers/imap/camel-imap-provider.c:54
-#: ../camel/providers/hula/camel-hula-provider.c:66
-msgid "Namespace"
-msgstr "å?½å??ç©ºé??"
-
-#: ../camel/providers/hula/camel-hula-provider.c:76
-msgid "Hula"
-msgstr "Hula"
-
-#: ../camel/providers/hula/camel-hula-provider.c:78
-msgid "For accessing Hula servers"
-msgstr "ç?¨æ?¼å?å?? Hula ä¼ºæ??å?¨"
-
-# camel/providers/imap/camel-imap-provider.c:82
-#: ../camel/providers/hula/camel-hula-provider.c:95
-msgid "This option will connect to the Hula server using a plaintext password."
-msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨ç°¡æ??ç??å¯?ç¢¼é?£ç·?è?³ Hula ä¼ºæ??å?¨ã??"
-
-#: ../camel/providers/imap/camel-imap-command.c:181
-#: ../camel/providers/imap/camel-imap-command.c:265
+#: ../camel/providers/imap/camel-imap-command.c:190
+#: ../camel/providers/imap/camel-imap-command.c:288
+#, c-format
 msgid "No output stream"
 msgstr "æ²?æ??è¼¸å?ºä¸²æµ?"
 
-#: ../camel/providers/imap/camel-imap-command.c:186
-#: ../camel/providers/imap/camel-imap-command.c:270
+#: ../camel/providers/imap/camel-imap-command.c:198
+#: ../camel/providers/imap/camel-imap-command.c:296
+#, c-format
 msgid "No input stream"
 msgstr "æ²?æ??è¼¸å?¥ä¸²æµ?"
 
@@ -3350,16 +3456,13 @@ msgstr "æ²?æ??è¼¸å?¥ä¸²æµ?"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: ../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:3105
+#: ../camel/providers/imap/camel-imap-command.c:245
+#, c-format
 msgid "Operation cancelled"
 msgstr "æ??ä½?ç¨?åº?å·²å??æ¶?"
 
 # camel/camel-remote-store.c:476
-#: ../camel/providers/imap/camel-imap-command.c:331
-#: ../camel/providers/imap/camel-imap-store.c:3110
+#: ../camel/providers/imap/camel-imap-command.c:353
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "ä¼ºæ??å?¨çª?ç?¶ä¸æ?·é?£ç·?ï¼? %s"
@@ -3367,7 +3470,7 @@ msgstr "ä¼ºæ??å?¨çª?ç?¶ä¸æ?·é?£ç·?ï¼? %s"
 # camel/providers/imap/camel-imap-command.c:232
 #. 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
+#: ../camel/providers/imap/camel-imap-command.c:373
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -3377,71 +3480,57 @@ msgstr ""
 "%s"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: ../camel/providers/imap/camel-imap-command.c:421
+#: ../camel/providers/imap/camel-imap-command.c:444
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "å¾? IMAP ä¼ºæ??å?¨å?³å??ä¸?ç?¶ç??å??æ??ï¼? %s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/imap/camel-imap-command.c:431
+#: ../camel/providers/imap/camel-imap-command.c:456
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP æ??ä»¤å¤±æ??ï¼? %s"
 
 # camel/providers/imap/camel-imap-command.c:295
-#: ../camel/providers/imap/camel-imap-command.c:506
+#: ../camel/providers/imap/camel-imap-command.c:532
+#, c-format
 msgid "Server response ended too soon."
 msgstr "ä¼ºæ??å?¨å¤ªæ?©å?³å??çµ?æ??ç??å??æ??ã??"
 
 # camel/providers/imap/camel-imap-command.c:487
-#: ../camel/providers/imap/camel-imap-command.c:712
+#: ../camel/providers/imap/camel-imap-command.c:740
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP ä¼ºæ??å?¨ç??å??æ??æ²?æ??å??å?« %s è³?è¨?"
 
 # camel/providers/imap/camel-imap-command.c:524
-#: ../camel/providers/imap/camel-imap-command.c:748
+#: ../camel/providers/imap/camel-imap-command.c:778
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "å¾? IMAP ä¼ºæ??å?¨å?³å??ä¸?ç?¶ç?? OK å??æ??ï¼? %s"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/providers/imap/camel-imap-folder.c:90
+#: ../camel/providers/imap/camel-imap-folder.c:281
 msgid "Always check for new mail in this folder"
 msgstr "æ°¸é? æª¢æ?¥é??å??è³?æ??å¤¾ä¸æ?¯å?¦æ??æ?°é?µä»¶"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/providers/imap/camel-imap-folder.c:276
+#: ../camel/providers/imap/camel-imap-folder.c:353
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "ç?¡æ³?å»ºç«?ç?®é?? %sï¼?%s"
 
 # mail/mail-ops.c:1649
-#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:918
-#: ../camel/providers/imapx/camel-imapx-server.c:2758
+#: ../camel/providers/imap/camel-imap-folder.c:960
+#: ../camel/providers/imapx/camel-imapx-server.c:3759
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "æ??æ?? %s ä¸è®?æ?´é??ç??é?µä»¶"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1986
-#, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr "å?¨ APPEND æ??ä»¤å¾?å?³å??æ?ªé ?æ??ç??å??æ??ç??æ??ã??%sã??"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2001
-msgid "No response on continuation after APPEND command"
-msgstr "å?¨ APPEND æ??ä»¤å¾?æ²?æ??æ??çº?å??æ??"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2046
-msgid "Unknown error occurred during APPEND command!"
-msgstr "å?¨ APPEND æ??ä»¤æ??é??ç?¼ç??æ?ªç?¥ç??é?¯èª¤ï¼?"
-
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: ../camel/providers/imap/camel-imap-folder.c:2877
-#, c-format
-msgid "Unable to retrieve message: %s"
-msgstr "ç?¡æ³?å¾?å??å??é?µä»¶ï¼? %s"
+#: ../camel/providers/imap/camel-imap-folder.c:3231
+msgid "Unable to retrieve message: "
+msgstr "ç?¡æ³?å??å??é?µä»¶ï¼?"
 
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-maildir-folder.c:209
@@ -3450,7 +3539,8 @@ msgstr "ç?¡æ³?å¾?å??å??é?µä»¶ï¼? %s"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/imap/camel-imap-folder.c:2912
+#: ../camel/providers/imap/camel-imap-folder.c:3266
+#: ../camel/providers/imapx/camel-imapx-server.c:4956
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "ç?¡æ³?å??å¾?é?µä»¶ ID ç?º %s ç??é?µä»¶ï¼? %s"
@@ -3458,229 +3548,273 @@ msgstr "ç?¡æ³?å??å¾?é?µä»¶ ID ç?º %s ç??é?µä»¶ï¼? %s"
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-mbox-folder.c:319
 # camel/providers/local/camel-mh-folder.c:185
-#: ../camel/providers/imap/camel-imap-folder.c:2913
+#: ../camel/providers/imap/camel-imap-folder.c:3267
+#: ../camel/providers/imapx/camel-imapx-server.c:4957
 msgid "No such message available."
 msgstr "æ²?æ??é??å??é?µä»¶ã??"
 
 # camel/providers/imap/camel-imap-folder.c:1047
 # camel/providers/imap/camel-imap-folder.c:1281
-#: ../camel/providers/imap/camel-imap-folder.c:2974
-#: ../camel/providers/imap/camel-imap-folder.c:3819
-#: ../camel/providers/nntp/camel-nntp-folder.c:236
+#: ../camel/providers/imap/camel-imap-folder.c:3337
+#: ../camel/providers/imap/camel-imap-folder.c:4203
+#: ../camel/providers/nntp/camel-nntp-folder.c:326
+#, c-format
 msgid "This message is not currently available"
 msgstr "é??å°?é?µä»¶ç?®å??ä»?æ?ªå?¯ç?¨"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3632
+#: ../camel/providers/imap/camel-imap-folder.c:4013
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "ä¸?å®?æ?´ç??ä¼ºæ??å?¨å??æ??ï¼?æ?ªæ??ä¾?ä»»ä½?è³?è¨?çµ¦è¨?æ?¯ %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3640
+#: ../camel/providers/imap/camel-imap-folder.c:4023
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "ä¸?å®?æ?´ç??ä¼ºæ??å?¨å??æ??ï¼?æ?ªæ??ä¾? UID çµ¦è¨?æ?¯ %d"
 
 # camel/providers/imap/camel-imap-folder.c:1075
 # camel/providers/imap/camel-imap-folder.c:1314
-#: ../camel/providers/imap/camel-imap-folder.c:3857
+#: ../camel/providers/imap/camel-imap-folder.c:4243
+#, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "å?¨ FETCH ç??å??æ??å?§æ?¾ä¸?å?°é?µä»¶ç??å?§æ??ã??"
 
 # camel/providers/imap/camel-imap-message-cache.c:150
-#: ../camel/providers/imap/camel-imap-message-cache.c:181
-#: ../camel/providers/imap/camel-imap-message-cache.c:244
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "ç?¡æ³?é??å??å¿«å??ç?®é??ï¼?%s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:193
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
+msgid "Could not open cache directory: "
+msgstr "ç?¡æ³?é??å??å¿«å??ç?®é??ï¼?"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../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
+#: ../camel/providers/imap/camel-imap-message-cache.c:326
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "å¿«å??é?µä»¶ %s å¤±æ??ï¼? %s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/providers/imap/camel-imap-message-cache.c:530
+#: ../camel/providers/imap/camel-imap-message-cache.c:388
+#, c-format
+msgid "Failed to cache message %s: "
+msgstr "å¿«å??é?µä»¶ %s å¤±æ??ï¼?"
+
+# camel/camel-filter-driver.c:670
+# camel/camel-filter-driver.c:679
+#: ../camel/providers/imap/camel-imap-message-cache.c:525
 #, c-format
-msgid "Failed to cache %s: %s"
-msgstr "å¿«å?? %s å¤±æ??ï¼? %s"
+msgid "Failed to cache %s: "
+msgstr "å¿«å?? %s å¤±æ??ï¼?"
+
+# camel/providers/imap/camel-imap-provider.c:43
+# mail/mail-config.glade.h:13
+#: ../camel/providers/imap/camel-imap-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:41
+msgid "Checking for New Mail"
+msgstr "æª¢æ?¥æ?°é?µä»¶"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:50
+#: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:49
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "æª¢æ?¥è¨?é?±è³?æ??å¤¾è£¡ç??æ?°é?µä»¶(_E)"
 
+# mail/mail-config.c:1213
+# mail/mail-config.c:1216
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:53
+msgid "Connection to Server"
+msgstr "é?£ç·?å?°ä¼ºæ??å?¨"
+
+# camel/providers/imap/camel-imap-store.c:531
+#: ../camel/providers/imap/camel-imap-provider.c:50
+#: ../camel/providers/imapx/camel-imapx-provider.c:55
+msgid "_Use custom command to connect to server"
+msgstr "ä½¿ç?¨è?ªè¨?æ??ä»¤ä¾?é?£ç·?å?°ä¼ºæ??å?¨(_U)"
+
+# addressbook/contact-editor/e-contact-editor.c:1248
+#: ../camel/providers/imap/camel-imap-provider.c:52
+msgid "Co_mmand:"
+msgstr "æ??ä»¤(_M):"
+
+# camel/providers/imap/camel-imap-provider.c:48
+# shell/e-shell-view.c:552
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:63
+#: ../camel/providers/nntp/camel-nntp-provider.c:42
+msgid "Folders"
+msgstr "è³?æ??å¤¾"
+
+# camel/providers/imap/camel-imap-provider.c:50
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:65
+msgid "_Show only subscribed folders"
+msgstr "å?ªé¡¯ç¤ºå·²è¨?é?±ç??è³?æ??å¤¾(_S)"
+
+# camel/providers/imap/camel-imap-provider.c:52
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:68
+msgid "O_verride server-supplied folder namespace"
+msgstr "è¦?è??ä¼ºæ??å?¨æ??ä¾?ä¹?è³?æ??å¤¾ç??å?½å??ç©ºé??(_V)"
+
 # camel/providers/imap/camel-imap-provider.c:54
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:49
-#: ../camel/providers/imapx/camel-imapx-provider.c:70
-msgid "Namespace:"
-msgstr "å?½å??ç©ºé??"
+#: ../camel/providers/imap/camel-imap-provider.c:62
+msgid "Names_pace:"
+msgstr "å?½å??ç©ºé??(_P):"
 
 # camel/providers/imap/camel-imap-provider.c:57
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:53
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
 msgid "_Apply filters to new messages in INBOX on this server"
 msgstr "å¥?ç?¨é??æ¿¾æ¢?ä»¶è?³æ¤ä¼ºæ??å?¨æ?¶ä»¶å?£ç??æ?°é?µä»¶(_A)"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/providers/imap/camel-imap-provider.c:72
-#: ../camel/providers/imapx/camel-imapx-provider.c:76
+#: ../camel/providers/imap/camel-imap-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:77
 msgid "Check new messages for Jun_k contents"
 msgstr "æª¢æ?¥æ?°é?µä»¶ä¸æ?¯å?¦æ??å??å?¾é?µä»¶å?§å®¹(_K)"
 
 # mail/mail-config.glade.h:12
-#: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:59
-#: ../camel/providers/imapx/camel-imapx-provider.c:80
+#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:81
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "è?ªå??å°?é? ç«¯é?µä»¶å??æ¥å?°æ?¬å?°ç«¯(_Z)"
 
 # camel/providers/imap/camel-imap-provider.c:63
-#: ../camel/providers/imap/camel-imap-provider.c:83
+#: ../camel/providers/imap/camel-imap-provider.c:79
 msgid "IMAP"
 msgstr "IMAP"
 
 # camel/providers/imap/camel-imap-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:85
-#: ../camel/providers/imapx/camel-imapx-provider.c:90
+#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:91
 msgid "For reading and storing mail on IMAP servers."
 msgstr "ç?¨ä½?è®?å??å??å?²å?é?µä»¶æ?¼ IMAP ä¼ºæ??å?¨ã??"
 
 # camel/providers/imap/camel-imap-provider.c:82
-#: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapx/camel-imapx-provider.c:106
+#: ../camel/providers/imap/camel-imap-provider.c:99
+#: ../camel/providers/imapx/camel-imapx-provider.c:107
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨ç°¡æ??ç??å¯?ç¢¼é?£ç·?è?³ IMAP ä¼ºæ??å?¨ã??"
 
 # camel/providers/smtp/camel-smtp-transport.c:534
-#: ../camel/providers/imap/camel-imap-store.c:435
-#: ../camel/providers/imap4/camel-imap4-store.c:210
-#: ../camel/providers/imapx/camel-imapx-store.c:167
+#: ../camel/providers/imap/camel-imap-store.c:310
+#: ../camel/providers/imapx/camel-imapx-store.c:220
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP ä¼ºæ??å?¨ %s"
 
 # camel/camel-remote-store.c:195
-#: ../camel/providers/imap/camel-imap-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:212
-#: ../camel/providers/imapx/camel-imapx-store.c:169
+#: ../camel/providers/imap/camel-imap-store.c:312
+#: ../camel/providers/imapx/camel-imapx-store.c:222
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s ç?? IMAP æ??å??æ?¼ %s"
 
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
-#: ../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:192
-#: ../camel/providers/pop3/camel-pop3-store.c:206
-#: ../camel/providers/smtp/camel-smtp-transport.c:259
-#: ../camel/providers/smtp/camel-smtp-transport.c:274
+#: ../camel/providers/imap/camel-imap-store.c:446
+#: ../camel/providers/nntp/camel-nntp-store.c:234
+#: ../camel/providers/pop3/camel-pop3-store.c:132
+#: ../camel/providers/smtp/camel-smtp-transport.c:215
 #, c-format
 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/pop3/camel-pop3-store.c:193
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
+#: ../camel/providers/imap/camel-imap-store.c:447
+#: ../camel/providers/nntp/camel-nntp-store.c:235
+#: ../camel/providers/pop3/camel-pop3-store.c:133
+#: ../camel/providers/smtp/camel-smtp-transport.c:216
 msgid "SSL unavailable"
 msgstr "SSL ç?¡æ³?ä½¿ç?¨"
 
-# camel/camel-remote-store.c:252
-#: ../camel/providers/imap/camel-imap-store.c:578
-#: ../camel/providers/imap/camel-imap-store.c:860
-#: ../camel/providers/imapx/camel-imapx-server.c:2017
-msgid "Connection cancelled"
-msgstr "é?£ç·?å·²å??æ¶?"
+# camel/camel-remote-store.c:255
+# camel/providers/smtp/camel-smtp-transport.c:269
+#: ../camel/providers/imap/camel-imap-store.c:465
+#: ../camel/providers/nntp/camel-nntp-store.c:252
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "ç?¡æ³?é?£æ?¥å?° %sï¼?"
 
 # camel/providers/pop3/camel-pop3-store.c:379
-#: ../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
-#: ../camel/providers/imapx/camel-imapx-server.c:2057
-#: ../camel/providers/imapx/camel-imapx-server.c:2071
+#: ../camel/providers/imap/camel-imap-store.c:571
+#: ../camel/providers/imap/camel-imap-store.c:591
+#: ../camel/providers/imap/camel-imap-store.c:598
+#: ../camel/providers/imap/camel-imap-store.c:625
+#: ../camel/providers/imapx/camel-imapx-server.c:2827
+#: ../camel/providers/imapx/camel-imapx-server.c:2863
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "ä»¥å®?å?¨æ¨¡å¼?é?£ç·?å?° IMAP ä¼ºæ??å?¨ %s æ??å¤±æ??äº?ï¼? %s"
 
 # shell/e-storage.c:477
-#: ../camel/providers/imap/camel-imap-store.c:690
-#: ../camel/providers/imapx/camel-imapx-server.c:2058
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
+#: ../camel/providers/imap/camel-imap-store.c:572
+#: ../camel/providers/imapx/camel-imapx-server.c:2828
+#: ../camel/providers/smtp/camel-smtp-transport.c:295
 msgid "STARTTLS not supported"
 msgstr "ä¸?æ?¯æ?´ STARTTLS"
 
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
-#: ../camel/providers/imap/camel-imap-store.c:709
-#: ../camel/providers/imapx/camel-imapx-server.c:2072
+#: ../camel/providers/imap/camel-imap-store.c:592
+#: ../camel/providers/imapx/camel-imapx-server.c:2864
 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:599
+#: ../camel/providers/smtp/camel-smtp-transport.c:339
 msgid "SSL is not available in this build"
 msgstr "æ¤ä¸?ç??æ?¬ä¸¦æ?ªå??ç?¨ SSL"
 
+# camel/camel-remote-store.c:252
+#: ../camel/providers/imap/camel-imap-store.c:747
+#: ../camel/providers/imapx/camel-imapx-server.c:2647
+#, c-format
+msgid "Connection cancelled"
+msgstr "é?£ç·?å·²å??æ¶?"
+
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
-#: ../camel/providers/imap/camel-imap-store.c:863
+#: ../camel/providers/imap/camel-imap-store.c:752
+#: ../camel/providers/imapx/camel-imapx-server.c:2652
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "ç?¡æ³?ä»¥æ??ä»¤ã??%sã??é?£ç·?ï¼? %s"
 
 # mail/local-config.glade.h:8
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1051
-#: ../camel/providers/imap/camel-imap-store.c:2430
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:356
-#: ../camel/providers/imap4/camel-imap4-store.c:1403
-#: ../camel/providers/imapx/camel-imapx-store.c:349
-#: ../camel/providers/imapx/camel-imapx-store.c:578
-#: ../camel/providers/local/camel-maildir-folder.c:81
-#: ../camel/providers/local/camel-maildir-store.c:219
-#: ../camel/providers/local/camel-maildir-store.c:291
-#: ../camel/providers/local/camel-maildir-store.c:517
-#: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:461
+#: ../camel/providers/imap/camel-imap-store.c:945
+#: ../camel/providers/imap/camel-imap-store.c:2369
+#: ../camel/providers/imapx/camel-imapx-store.c:457
+#: ../camel/providers/imapx/camel-imapx-store.c:1054
+#: ../camel/providers/local/camel-maildir-folder.c:90
+#: ../camel/providers/local/camel-maildir-store.c:225
+#: ../camel/providers/local/camel-maildir-store.c:315
+#: ../camel/providers/local/camel-maildir-store.c:562
+#: ../camel/providers/local/camel-maildir-store.c:575
+#: ../camel/providers/local/camel-spool-store.c:508
 msgid "Inbox"
 msgstr "æ?¶ä»¶å?£"
 
 # camel/providers/imap/camel-imap-store.c:456
-#: ../camel/providers/imap/camel-imap-store.c:1303
+#: ../camel/providers/imap/camel-imap-store.c:1148
+#: ../camel/providers/imapx/camel-imapx-server.c:2930
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ä¼ºæ??å?¨ %s ä¸?æ?¯æ?´æ??è¦?æ±?ç??é©?è?é¡?å?? %s"
 
 # camel/providers/imap/camel-imap-store.c:466
 # camel/providers/smtp/camel-smtp-transport.c:366
-#: ../camel/providers/imap/camel-imap-store.c:1313
-#: ../camel/providers/smtp/camel-smtp-transport.c:506
+#: ../camel/providers/imap/camel-imap-store.c:1160
+#: ../camel/providers/imapx/camel-imapx-server.c:2942
+#: ../camel/providers/smtp/camel-smtp-transport.c:483
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "ä¸?æ?¯æ?´é©?è?é¡?å?? %s"
 
 # camel/providers/imap/camel-imap-store.c:531
-#: ../camel/providers/imap/camel-imap-store.c:1387
+#: ../camel/providers/imap/camel-imap-store.c:1239
+#: ../camel/providers/imapx/camel-imapx-server.c:3012
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3691,9 +3825,9 @@ msgstr ""
 "%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
+#: ../camel/providers/imap/camel-imap-store.c:1790
+#: ../camel/providers/imap/camel-imap-store.c:2212
+#: ../camel/providers/imapx/camel-imapx-store.c:852
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -3701,508 +3835,192 @@ msgstr "è³?æ??å¤¾å??ç¨±ã??%sã??ç?¡æ??ï¼?å? ç?ºå®?å??æ?¬å?å??ã??%cã??"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap/camel-imap-store.c:2008
-#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:202
-#: ../camel/providers/local/camel-mh-store.c:249
+#: ../camel/providers/imap/camel-imap-store.c:1906
+#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-mbox-store.c:193
+#: ../camel/providers/local/camel-mh-store.c:255
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?è³?æ??å¤¾å·²å?å?¨ã??"
 
 # camel/providers/local/camel-mbox-summary.c:879
-#: ../camel/providers/imap/camel-imap-store.c:2283
+#: ../camel/providers/imap/camel-imap-store.c:2225
+#: ../camel/providers/imapx/camel-imapx-store.c:863
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "ä¸?æ??ç??æ¯?è³?æ??å¤¾ï¼? %s"
 
 # camel/camel-remote-store.c:476
-#: ../camel/providers/imap/camel-imap-store.c:3107
+#: ../camel/providers/imap/camel-imap-store.c:3081
+#, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "ä¼ºæ??å?¨çª?ç?¶ä¸æ?·é?£ç·?"
 
-# camel/providers/pop3/camel-pop3-store.c:199
-#: ../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/imap/camel-imap-command.c:232
-#: ../camel/providers/imap4/camel-imap4-command.c:681
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "IMAP4 ä¼ºæ??å?¨ %s é??é ?æ??ç??å??æ??ï¼?%s"
-
-# camel/providers/imap/camel-imap-command.c:232
-#: ../camel/providers/imap4/camel-imap4-engine.c:215
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "IMAP ä¼ºæ??å?¨ %s é??é ?æ??ç??å??å??èª?ã??"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/imap4/camel-imap4-engine.c:440
-#, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr "ç?¡æ³?é?¸å??è³?æ??å¤¾ã??%sã??ï¼?ç?¡æ??ç??ä¿¡ç®±å??ç¨±"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-engine.c:446
-#, c-format
-msgid "Cannot select folder '%s': Bad command"
-msgstr "ç?¡æ³?é?¸å??è³?æ??å¤¾ã??%sã??ï¼?é?¯èª¤ç??æ??ä»¤"
-
-# camel/providers/pop3/camel-pop3-store.c:199
-#: ../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/camel-remote-store.c:476
-#: ../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:87
-msgid ""
-"Enable extended Mailing-List detection required for some filter and vFolder "
-"rules"
-msgstr "å??ç?¨æ??äº?é??æ¿¾å?¨å??è??æ?¬è³?æ??å¤¾è¦?å??æ??è¦?æ±?ç??é??ä¿¡è«?å£?å?µæ¸¬"
-
-#: ../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/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-folder.c:427
-#, c-format
-msgid "Cannot access folder '%s': %s"
-msgstr "ä¸?è?½å?å??è³?æ??å¤¾ã??%sã??ï¼?%s"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-folder.c:484
-#, c-format
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr "ä¸?è?½å??æ¥æ??æ¨?è?³è³?æ??å¤¾ã??%sã??ï¼?æ?ªç?¥ç??é?¯èª¤"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-folder.c:490
-#, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr "ä¸?è?½å??æ¥æ??æ¨?è?³è³?æ??å¤¾ã??%sã??ï¼?é?¯èª¤ç??æ??ä»¤"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-folder.c:630
-#, c-format
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "ä¸?è?½æ¸?ç©ºè³?æ??å¤¾ã??%sã??ï¼?æ?ªç?¥ç??é?¯èª¤"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-folder.c:635
-#, c-format
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "ä¸?è?½æ¸?ç©ºè³?æ??å¤¾ã??%sã??ï¼?é?¯èª¤ç??æ??ä»¤"
-
-# camel/providers/local/camel-mbox-folder.c:335
-# camel/providers/local/camel-mbox-folder.c:367
-# camel/providers/local/camel-mbox-folder.c:380
-#: ../camel/providers/imap4/camel-imap4-folder.c:891
-#, c-format
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr "ä¸?è?½å??å¾?å¾?è³?æ??å¤¾ã??%2$sã??å??å¾?é?µä»¶ %1$sï¼?æ²?æ??æ¤é?µä»¶"
-
-# camel/providers/local/camel-mbox-folder.c:335
-# camel/providers/local/camel-mbox-folder.c:367
-# camel/providers/local/camel-mbox-folder.c:380
-#: ../camel/providers/imap4/camel-imap4-folder.c:896
-#, c-format
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr "ä¸?è?½å??å¾?å¾?è³?æ??å¤¾ã??%2$sã??å??å¾?é?µä»¶ %1$sï¼?é?¯èª¤ç??æ??ä»¤"
-
-# camel/providers/local/camel-mh-folder.c:149
-# camel/providers/local/camel-mh-folder.c:157
-#: ../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/local/camel-mh-folder.c:149
-# camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/imap4/camel-imap4-folder.c:1033
-#, c-format
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "ä¸?è?½å°?é?µä»¶é??å? å?°è³?æ??å¤¾ã??%sã??ï¼?æ?ªç?¥ç??é?¯èª¤"
-
-# camel/providers/local/camel-mh-folder.c:149
-# camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/imap4/camel-imap4-folder.c:1063
-#, c-format
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr "ä¸?è?½å°?é?µä»¶é??å? å?°è³?æ??å¤¾ã??%sã??ï¼?é?¯èª¤ç??æ??ä»¤"
-
-# camel/providers/local/camel-mbox-folder.c:335
-# camel/providers/local/camel-mbox-folder.c:367
-# camel/providers/local/camel-mbox-folder.c:380
-#: ../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/local/camel-mbox-folder.c:335
-# camel/providers/local/camel-mbox-folder.c:367
-# camel/providers/local/camel-mbox-folder.c:380
-#: ../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/local/camel-mbox-folder.c:335
-# camel/providers/local/camel-mbox-folder.c:367
-# camel/providers/local/camel-mbox-folder.c:380
-#: ../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/imap/camel-imap-store.c:3084
+msgid "Server unexpectedly disconnected: "
+msgstr "ä¼ºæ??å?¨çª?ç?¶ä¸æ?·é?£ç·?ï¼?"
 
-# camel/providers/local/camel-mbox-folder.c:335
-# camel/providers/local/camel-mbox-folder.c:367
-# camel/providers/local/camel-mbox-folder.c:380
-#: ../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/imap/camel-imap-provider.c:45
-#: ../camel/providers/imap4/camel-imap4-provider.c:55
-msgid "Check new messages for _Junk contents"
-msgstr "æª¢æ?¥æ?°é?µä»¶ä¸æ?¯å?¦æ??å??å?¾é?µä»¶(_J)"
-
-# camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/providers/imap4/camel-imap4-provider.c:57
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "å?ªæª¢æ?¥ã??æ?¶ä»¶å?£ã??è³?æ??å¤¾ä¸ç??ã??å??å?¾é?µä»¶ã??(_G)"
-
-# mail/mail-config.glade.h:34
-#: ../camel/providers/imap4/camel-imap4-provider.c:66
-msgid "IMAP4rev1"
-msgstr "IMAP4rev1"
-
-# camel/providers/imap/camel-imap-provider.c:65
-#: ../camel/providers/imap4/camel-imap4-provider.c:68
-msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr "ç?¨ä½?è®?å??å??å?²å? IMAPv4rev1 ä¼ºæ??å?¨ç??é?µä»¶ã??"
-
-# camel/providers/imap/camel-imap-provider.c:82
-#: ../camel/providers/imap4/camel-imap4-provider.c:85
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "æ¤é?¸é ?æ??ä½¿ç?¨ç´?æ??å?å¯?ç¢¼ï¼?é?£ç·?å?° IMAPv4rev1 ä¼ºæ??å?¨ã??"
-
-# camel/camel-remote-store.c:252
-#: ../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:203
-#: ../camel/providers/smtp/camel-smtp-transport.c:271
-msgid "Connection canceled"
-msgstr "é?£ç·?å·²å??æ¶?"
-
-# camel/providers/pop3/camel-pop3-store.c:379
-#: ../camel/providers/imap4/camel-imap4-store.c:296
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "ä»¥å®?å?¨æ¨¡å¼?é?£ç·?å?° IMAP ä¼ºæ??å?¨ %s æ??å¤±æ??äº?ï¼? ä¼ºæ??å?¨ä¸?æ?¯æ?´ STARTTLS"
-
-# camel/camel-sasl-anonymous.c:110
-# camel/camel-sasl-plain.c:87
-#: ../camel/providers/imap4/camel-imap4-store.c:326
-#: ../camel/providers/pop3/camel-pop3-store.c:275
-msgid "TLS negotiations failed"
-msgstr "TLS å??å??å¤±æ??"
-
-# camel/providers/pop3/camel-pop3-store.c:409
-#: ../camel/providers/imap4/camel-imap4-store.c:411
+# camel/providers/imap/camel-imap-folder.c:191
+#: ../camel/providers/imapx/camel-imapx-folder.c:75
 #, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr "ç?¡æ³?é©?è? IMAP ä¼ºæ??å?¨ %s (ä½¿ç?¨ %s é©?è?æ©?å?¶)"
+msgid "Could not create folder summary for %s"
+msgstr "ç?¡æ³?å»ºç«? %s ç??è³?æ??å¤¾æ??è¦?"
 
-# camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/imap4/camel-imap4-store.c:534
+# camel/providers/local/camel-mbox-store.c:110
+#: ../camel/providers/imapx/camel-imapx-folder.c:83
 #, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "ç?¡æ³?é©?è? IMAP ä¼ºæ??å?¨ %s (ä½¿ç?¨ %s)"
+msgid "Could not create cache for %s: "
+msgstr "ç?¡æ³?å»ºç«? %s ç??å¿«å??ï¼?"
 
-# camel/providers/local/camel-mbox-folder.c:152
-#: ../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/imapx/camel-imapx-provider.c:43
+msgid "Use _Quick Resync if the server supports it"
+msgstr "å¦?æ??ä¼ºæ??å?¨æ?¯æ?´å??ä½¿ç?¨å¿«é??é??æ?°å??æ¥(_Q)"
 
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-store.c:736
-#, c-format
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr "ä¸?è?½å¾? IMAP ä¼ºæ??å?¨ %2$s å??å¾?è³?æ??å¤¾ã??%1$sã??ï¼?æ?ªç?¥ç??é?¯èª¤"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:816
-#, c-format
-msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-msgstr "ä¸?è?½å¾? IMAP ä¼ºæ??å?¨ %2$s å??å¾?ã??%1$sã??ç?? LIST è³?è¨? ï¼?%3$s"
+#: ../camel/providers/imapx/camel-imapx-provider.c:45
+msgid "Use I_dle if the server supports it"
+msgstr "å¦?æ??ä¼ºæ??å?¨æ?¯æ?´å??ä½¿ç?¨é??ç½®(_D)"
 
 # addressbook/contact-editor/e-contact-editor.c:1248
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-msgid "Bad command"
-msgstr "é?¯èª¤ç??æ??ä»¤"
-
-# camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/imap4/camel-imap4-store.c:897
-#, c-format
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?ç?¡æ??ç??ä¿¡ç®±å??ç¨±"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-store.c:902
-#, c-format
-msgid "Cannot create folder '%s': Bad command"
-msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?é?¯èª¤ç??æ??ä»¤"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/imap4/camel-imap4-store.c:1008
-#, c-format
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "ä¸?è?½å?ªé?¤è³?æ??å¤¾ã??%sã??ï¼?ç?¹æ®?ç??è³?æ??å¤¾"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/imap4/camel-imap4-store.c:1015
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr "å?¨é?¢ç·?æ¨¡å¼?ä¸ç?¡æ³?å?ªé?¤ IMAP è³?æ??å¤¾ã??"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/imap4/camel-imap4-store.c:1074
-#, c-format
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "ä¸?è?½å?ªé?¤è³?æ??å¤¾ã??%sã??ï¼?ç?¡æ??ç??ä¿¡ç®±å??ç¨±"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
-#, c-format
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "ä¸?è?½å?ªé?¤è³?æ??å¤¾ã??%sã??ï¼?é?¯èª¤ç??æ??ä»¤"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/imap4/camel-imap4-store.c:1099
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "ä¸?è?½å°?è³?æ??å¤¾ã??%sã??é??æ?°å?½å??ç?ºã??%sã??ï¼?ç?¹æ®?ç??è³?æ??å¤¾"
-
-# camel/providers/local/camel-local-store.c:237
-#: ../camel/providers/imap4/camel-imap4-store.c:1106
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "å?¨é?¢ç·?æ¨¡å¼?ä¸ç?¡æ³?é??æ?°å?½å?? IMAP è³?æ??å¤¾ã??"
-
-# camel/providers/local/camel-mbox-summary.c:655
-#: ../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/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../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 "ç?¡æ³?æ?¼ IMAP ä¼ºæ??å?¨ %3$s å??å¾?æ¨£å¼?ã??%2$sã??ç?? %1$s è³?è¨?ï¼?%4$s"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-store.c:1633
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "å?¨é?¢ç·?æ¨¡å¼?ä¸ç?¡æ³?è¨?é?± IMAP è³?æ??å¤¾ã??"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/imap4/camel-imap4-store.c:1678
-#, c-format
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr "ä¸?è?½è¨?é?±è³?æ??å¤¾ã??%sã??ï¼?ç?¡æ??ç??ä¿¡ç®±å??ç¨±"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, c-format
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "ä¸?è?½è¨?é?±è³?æ??å¤¾ã??%sã??ï¼?é?¯èª¤ç??æ??ä»¤"
+#: ../camel/providers/imapx/camel-imapx-provider.c:57
+msgid "Command:"
+msgstr "æ??ä»¤ï¼?"
 
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-store.c:1705
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr "å?¨é?¢ç·?æ¨¡å¼?ä¸ç?¡æ³?å??æ¶?è¨?é?± IMAP è³?æ??å¤¾ã??"
+#: ../camel/providers/imapx/camel-imapx-provider.c:59
+msgid "Numbe_r of cached connections to use"
+msgstr "è¦?ä½¿ç?¨ç??å¿«å??é?£ç·?æ?¸é??(_R)"
 
-# camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/imap4/camel-imap4-store.c:1750
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr "ä¸?è?½å??æ¶?è¨?é?±è³?æ??å¤¾ã??%sã??ï¼?ç?¡æ??ç??ä¿¡ç®±å??ç¨±"
+# camel/providers/imap/camel-imap-provider.c:54
+#: ../camel/providers/imapx/camel-imapx-provider.c:70
+msgid "Namespace:"
+msgstr "å?½å??ç©ºé??"
 
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr "ä¸?è?½å??æ¶?è¨?é?±è³?æ??å¤¾ã??%sã??ï¼?é?¯èª¤ç??æ??ä»¤"
+# camel/providers/imap/camel-imap-provider.c:63
+#: ../camel/providers/imapx/camel-imapx-provider.c:89
+msgid "IMAP+"
+msgstr "IMAP"
 
-# mail/mail-ops.c:1649
-#: ../camel/providers/imap4/camel-imap4-summary.c:1590
-msgid "Scanning for changed messages"
-msgstr "æ??æ??å·²è®?æ?´ç??é?µä»¶"
+# camel/camel-movemail.c:256
+#: ../camel/providers/imapx/camel-imapx-server.c:1365
+msgid "Error writing to cache stream: "
+msgstr "å¯«å?¥å¿«å??ä¸²æµ?æ??ç?¼ç??é?¯èª¤ï¼?"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1611
+# camel/providers/pop3/camel-pop3-store.c:199
+#: ../camel/providers/imapx/camel-imapx-server.c:2007
 #, c-format
-msgid "IMAP server %s is in an inconsistent state."
-msgstr "IMAP ä¼ºæ??å?¨ %s è??æ?¼ä¸?å??èª¿ç??ç??æ??ã??"
+msgid "Not authenticated"
+msgstr "å°?æ?ªé©?è?"
 
-# mail/mail-ops.c:992
-#: ../camel/providers/imap4/camel-imap4-summary.c:1638
-msgid "Fetching envelopes of new messages"
-msgstr "å??å¾?æ?°é?µä»¶ç??å°?å¥?"
-
-# camel/providers/imap/camel-imap-command.c:232
-#: ../camel/providers/imap4/camel-imap4-utils.c:429
+# camel/camel-remote-store.c:255
+# camel/providers/smtp/camel-smtp-transport.c:269
+#: ../camel/providers/imapx/camel-imapx-server.c:2755
 #, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "IMAP ä¼ºæ??å?¨ %s ç??å??æ??ç?¼ç??æ??å¤?ï¼? "
+msgid "Could not connect to %s (port %s): "
+msgstr "ç?¡æ³?é?£ç·?è?³ %s (å? è?? %s)ï¼?"
 
-# ui/evolution-tasks.xml.h:3
-#: ../camel/providers/imap4/camel-imap4-utils.c:452
-msgid "No data"
-msgstr "æ²?æ??è³?æ??"
+# camel/camel-remote-store.c:337
+# camel/camel-remote-store.c:399
+# camel/camel-remote-store.c:470
+# camel/providers/imap/camel-imap-command.c:287
+#: ../camel/providers/imapx/camel-imapx-server.c:3184
+msgid "Closing tmp stream failed: "
+msgstr "ç?¡æ³?é??é?? tmp ä¸²æµ?ï¼?"
 
-# camel/camel-remote-store.c:476
-#: ../camel/providers/imap4/camel-imap4-utils.c:613
+# camel/providers/local/camel-maildir-folder.c:197
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:217
+# camel/providers/local/camel-mbox-folder.c:319
+# camel/providers/local/camel-mh-folder.c:185
+# camel/providers/local/camel-mh-folder.c:194
+# camel/providers/local/camel-mh-folder.c:202
+#: ../camel/providers/imapx/camel-imapx-server.c:5080
 #, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "IMAP ä¼ºæ??å?¨ %s æ??å¤?ä¸æ?·é?£ç·?ï¼?%s"
+msgid "Cannot create spool file: %s"
+msgstr "ä¸?è?½å»ºç«?æ??ç¨?å?¨æª?æ¡?ï¼?%s"
 
-# camel/providers/imap/camel-imap-folder.c:191
-#: ../camel/providers/imapx/camel-imapx-folder.c:84
-#, c-format
-msgid "Could not create folder summary for %s"
-msgstr "ç?¡æ³?å»ºç«? %s ç??è³?æ??å¤¾æ??è¦?"
+# camel/providers/local/camel-maildir-folder.c:197
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:217
+# camel/providers/local/camel-mbox-folder.c:319
+# camel/providers/local/camel-mh-folder.c:185
+# camel/providers/local/camel-mh-folder.c:194
+# camel/providers/local/camel-mh-folder.c:202
+#: ../camel/providers/imapx/camel-imapx-server.c:5095
+msgid "Cannot create spool file: "
+msgstr "ä¸?è?½å»ºç«?æ??ç¨?å?¨æª?æ¡?ï¼?"
 
-# camel/providers/local/camel-mbox-store.c:110
-#: ../camel/providers/imapx/camel-imapx-folder.c:92
+# camel/providers/imap/camel-imap-store.c:803
+# mail/mail-local.c:334
+#: ../camel/providers/imapx/camel-imapx-store.c:426
+#: ../camel/providers/nntp/camel-nntp-store.c:1529
 #, c-format
-msgid "Could not create cache for %s"
-msgstr "ç?¡æ³?å»ºç«? %s ç??å¿«å??"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
-msgid "Use I_dle if the server supports it"
-msgstr "å¦?æ??ä¼ºæ??å?¨æ?¯æ?´å??ä½¿ç?¨é??ç½®(_D)"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:60
-msgid "Numbe_r of cached connections to use"
-msgstr "è¦?ä½¿ç?¨ç??å¿«å??é?£ç·?æ?¸é??(_R)"
-
-# camel/providers/imap/camel-imap-provider.c:63
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
-msgid "IMAP+"
-msgstr "IMAP"
+msgid "No such folder: %s"
+msgstr "æ²?æ??é??å??è³?æ??å¤¾ï¼? %s"
 
-# camel/camel-remote-store.c:255
-# camel/providers/smtp/camel-smtp-transport.c:269
-#: ../camel/providers/imapx/camel-imapx-server.c:2020
+#: ../camel/providers/imapx/camel-imapx-stream.c:71
 #, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "ç?¡æ³?é?£ç·?è?³ %s (å? è?? %s)ï¼? %s"
+msgid "Source stream returned no data"
+msgstr "ä¾?æº?ä¸²æµ?å?³å??ç?¡è³?æ??"
 
-# camel/providers/pop3/camel-pop3-store.c:361
-#: ../camel/providers/imapx/camel-imapx-server.c:2100
+#: ../camel/providers/imapx/camel-imapx-stream.c:80
 #, c-format
-msgid "%sPlease enter the IMAP password for %s %s"
-msgstr "%sè«?è¼¸å?¥ %s %s ç?? IMAP å¯?ç¢¼"
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-# addressbook/gui/widgets/e-addressbook-view.c:613
-#: ../camel/providers/local/camel-local-folder.c:178
-msgid "Index message body data"
-msgstr "å?³é??é?µä»¶çµ¦é?£çµ¡äºº"
+msgid "Source stream unavailable"
+msgstr "ä¾?æº?ä¸²æµ?ç?¡æ³?ä½¿ç?¨"
 
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:395
+#: ../camel/providers/local/camel-local-folder.c:199
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 # camel/providers/local/camel-mbox-folder.c:203
-#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:399
-#: ../camel/providers/local/camel-local-folder.c:402
+#: ../camel/providers/local/camel-local-folder.c:209
+#: ../camel/providers/local/camel-local-folder.c:218
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "ä¿¡ç®±ï¼?%s (%s)"
 
-#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:406
+#: ../camel/providers/local/camel-local-folder.c:227
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-provider.c:48
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+# addressbook/gui/widgets/e-addressbook-view.c:613
+#: ../camel/providers/local/camel-local-folder.c:272
+msgid "Index message body data"
+msgstr "å?³é??é?µä»¶çµ¦é?£çµ¡äºº"
+
+# camel/providers/local/camel-mbox-folder.c:335
+# camel/providers/local/camel-mbox-folder.c:367
+# camel/providers/local/camel-mbox-folder.c:380
+#: ../camel/providers/local/camel-local-folder.c:683
+#, c-format
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
+msgstr ""
+"ä¸?è?½å¾?è³?æ??å¤¾ %2$s å??å¾?é?µä»¶ %1$s \n"
+"%3$s"
+
+#: ../camel/providers/local/camel-local-provider.c:44
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr "ä½¿ç?¨ã??.foldersã??è³?æ??å¤¾æ??è¦?æª?æ¡?[exmh](_U)"
 
 # camel/providers/local/camel-local-provider.c:39
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "MH-format mail directories"
 msgstr "MH-format é?µä»¶ç?®é??"
 
-#: ../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-like é?µä»¶ç?®é??ã??"
 
 # mail/mail-config.glade.h:76
-#: ../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:74
+#: ../camel/providers/local/camel-local-provider.c:70
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
@@ -4210,32 +4028,32 @@ msgstr ""
 "ç?¨æ?¼è?ªæ¨?æº? mbox æ ¼å¼?æ??ç¨?å?¨æ?¥æ?¶ï¼?ç§»å??ï¼?æ?¬å?°ç«¯é?µä»¶è?³ Evolution ç®¡ç??ç??è³?æ??å¤¾ã??"
 
 # camel/providers/imap/camel-imap-provider.c:57
-#: ../camel/providers/local/camel-local-provider.c:88
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:103
 msgid "_Apply filters to new messages in INBOX"
 msgstr "å°?é??æ¿¾å?¨å¥?ç?¨æ?¼ I_NBOX è£¡ç??æ?°é?µä»¶"
 
 # camel/providers/local/camel-local-provider.c:39
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:91
 msgid "Maildir-format mail directories"
 msgstr "Maildir-format é?µä»¶ç?®é??"
 
-#: ../camel/providers/local/camel-local-provider.c:96
+#: ../camel/providers/local/camel-local-provider.c:92
 msgid "For storing local mail in maildir directories."
 msgstr "ç?¨æ?¼å?²å?æ?¬å?°ç«¯é?µä»¶è?³ maildir ç?®é??ã??"
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:104
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "å?²å?å?¨ Elm/_Pine/Mutt æ ¼å¼?ä¸ç??ç??æ??æª?é "
 
 # mail/mail-config.glade.h:77
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:111
 msgid "Standard Unix mbox spool file"
 msgstr "æ¨?æº? Unix mbox æ??ç¨?å?¨æª?æ¡?"
 
 # camel/providers/imap/camel-imap-provider.c:65
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:112
+#: ../camel/providers/local/camel-local-provider.c:123
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -4244,140 +4062,119 @@ msgstr ""
 "ä¹?å?¯ä»¥ç?¨ä¾?è®? Elm ã?? Pine æ?? Mutt å½¢å¼?è³?æ??å¤¾ç??æ¨¹ç??çµ?æ§?ã??"
 
 # mail/mail-config.glade.h:77
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:122
 msgid "Standard Unix mbox spool directory"
 msgstr "æ¨?æº? Unix mbox æ??ç¨?å?¨ç?®é??"
 
 # camel/providers/local/camel-local-store.c:127
-#: ../camel/providers/local/camel-local-store.c:163
-#: ../camel/providers/local/camel-local-store.c:274
-#: ../camel/providers/local/camel-mbox-store.c:357
-#: ../camel/providers/local/camel-spool-store.c:126
+#: ../camel/providers/local/camel-local-store.c:149
+#: ../camel/providers/local/camel-local-store.c:284
+#: ../camel/providers/local/camel-mbox-store.c:371
+#: ../camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "å?²å?æ ¹ç?®é?? %s ä¸?æ?¯çµ?å°?è·¯å¾?"
 
 # camel/providers/local/camel-local-store.c:134
-#: ../camel/providers/local/camel-local-store.c:170
+#: ../camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "å?²å?æ ¹ç?®é?? %s ä¸?æ?¯å??æ³?ç??ç?®é??"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/local/camel-local-store.c:169
 #: ../camel/providers/local/camel-local-store.c:179
-#: ../camel/providers/local/camel-local-store.c:187
-#: ../camel/providers/local/camel-local-store.c:285
+#: ../camel/providers/local/camel-local-store.c:297
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ï¼?%sï¼?%s"
 
 # camel/providers/local/camel-local-store.c:173
-#: ../camel/providers/local/camel-local-store.c:199
+#: ../camel/providers/local/camel-local-store.c:193
+#, c-format
 msgid "Local stores do not have an inbox"
 msgstr "æ?¬å?°ç«¯ç??å?å?²æ²?æ??æ?¶ä»¶å?£"
 
 # camel/providers/local/camel-local-store.c:183
-#: ../camel/providers/local/camel-local-store.c:245
+#: ../camel/providers/local/camel-local-store.c:250
 #, c-format
 msgid "Local mail file %s"
 msgstr "æ?¬å?°ç«¯é?µä»¶æª?æ¡? %s"
 
 # camel/providers/local/camel-local-store.c:237
-#: ../camel/providers/local/camel-local-store.c:340
+#: ../camel/providers/local/camel-local-store.c:358
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "ç?¡æ³?å°?è³?æ??å¤¾ %s é??æ?°å?½å??ç?º %sï¼? %s"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-local-store.c:408
+#: ../camel/providers/local/camel-local-store.c:431
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "ç?¡æ³?é??æ?°å?½å??ã??%sã??ï¼?%s "
 
 # camel/providers/local/camel-local-store.c:289
-#: ../camel/providers/local/camel-local-store.c:433
-#: ../camel/providers/local/camel-mbox-store.c:298
+#: ../camel/providers/local/camel-local-store.c:461
+#: ../camel/providers/local/camel-mbox-store.c:304
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "ä¸?è?½å?ªé?¤è³?æ??å¤¾ç´¢å¼?æª?æ¡?ã??%sã??ï¼? %s"
 
 # camel/providers/local/camel-local-store.c:279
-#: ../camel/providers/local/camel-local-store.c:456
-#: ../camel/providers/local/camel-mbox-store.c:322
+#: ../camel/providers/local/camel-local-store.c:489
+#: ../camel/providers/local/camel-mbox-store.c:333
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "ä¸?è?½å?ªé?¤è³?æ??å¤¾ä¸ç¹¼æª?æ¡?ã??%sã??ï¼?%s"
 
 # camel/providers/local/camel-local-summary.c:404
-#: ../camel/providers/local/camel-local-summary.c:515
+#: ../camel/providers/local/camel-local-summary.c:537
+#, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "ç?¡æ³?æ?°å¢?é?µä»¶å?°æ??è¦?è³?è¨?ï¼?ä¸?æ??ç??å??å? "
 
-# camel/camel-filter-driver.c:670
-# camel/camel-filter-driver.c:679
-#: ../camel/providers/local/camel-maildir-folder.c:230
-msgid "Maildir append message canceled"
-msgstr "Maildir å¢?æ·»é?µä»¶å·²å??æ¶?"
-
 # camel/providers/local/camel-maildir-folder.c:150
 # camel/providers/local/camel-maildir-folder.c:158
 # camel/providers/local/camel-maildir-folder.c:169
-#: ../camel/providers/local/camel-maildir-folder.c:233
+#: ../camel/providers/local/camel-maildir-folder.c:195
 #, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "ç?¡æ³?å°?é?µä»¶å?²å?å?° maildir è³?æ??å¤¾ï¼? %sï¼? %s"
+msgid "Cannot append message to maildir folder: %s: "
+msgstr "ä¸?è?½å°?é?µä»¶å?²å?å?° maildir è³?æ??å¤¾ï¼? %sï¼?"
 
 # camel/providers/local/camel-mbox-folder.c:335
 # camel/providers/local/camel-mbox-folder.c:367
 # camel/providers/local/camel-mbox-folder.c:380
-#: ../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
+#: ../camel/providers/local/camel-maildir-folder.c:283
+#: ../camel/providers/local/camel-maildir-folder.c:291
+#: ../camel/providers/local/camel-mbox-folder.c:440
+#: ../camel/providers/local/camel-mh-folder.c:227
+#: ../camel/providers/local/camel-mh-folder.c:235
 #, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"ä¸?è?½å??å¾?é?µä»¶ï¼?%s å¾?è³?æ??å¤¾ %s\n"
-"  %s"
-
-# camel/providers/local/camel-maildir-folder.c:218
-# camel/providers/local/camel-mh-folder.c:203
-#: ../camel/providers/local/camel-maildir-folder.c:315
-msgid "Invalid message contents"
-msgstr "ç?¡æ??ç??é?µä»¶å?§æ??"
+msgid "Cannot get message %s from folder %s: "
+msgstr "ä¸?è?½å¾?è³?æ??å¤¾ %2$s å??å¾?é?µä»¶ %1$sï¼?"
 
 # camel/providers/local/camel-mbox-summary.c:644
-#: ../camel/providers/local/camel-maildir-folder.c:419
-msgid "Cannot transfer message to destination folder"
-msgstr "ä¸?è?½å°?é?µä»¶å?³è¼¸å?°ç?®ç??ç«¯è³?æ??å¤¾"
+#: ../camel/providers/local/camel-maildir-folder.c:399
+#, c-format
+msgid "Cannot transfer message to destination folder: %s"
+msgstr "ä¸?è?½å°?é?µä»¶å?³è¼¸å?°ç?®ç??ç«¯è³?æ??å¤¾ï¼?%s"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-maildir-store.c:148
-#: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:174
-#: ../camel/providers/local/camel-mbox-store.c:186
+#: ../camel/providers/local/camel-maildir-store.c:136
+#: ../camel/providers/local/camel-maildir-store.c:167
+#: ../camel/providers/local/camel-mbox-store.c:161
+#: ../camel/providers/local/camel-mbox-store.c:175
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?%s"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:145
-#: ../camel/providers/local/camel-mh-store.c:217
+#: ../camel/providers/local/camel-maildir-store.c:151
+#: ../camel/providers/local/camel-mbox-store.c:127
+#: ../camel/providers/local/camel-mh-store.c:215
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?%s"
@@ -4385,15 +4182,15 @@ msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?%s"
 # camel/providers/local/camel-maildir-store.c:100
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
-#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:153
+#: ../camel/providers/local/camel-maildir-store.c:157
+#: ../camel/providers/local/camel-mbox-store.c:137
 #: ../camel/providers/local/camel-mh-store.c:224
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ã??%sã??ï¼?è³?æ??å¤¾ä¸?å?å?¨ã??"
 
 # camel/providers/local/camel-maildir-store.c:122
-#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-maildir-store.c:184
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ã??%sã??ï¼?ä¸?æ?¯ maildir ç?®é??ã??"
@@ -4401,111 +4198,98 @@ msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ã??%sã??ï¼?ä¸?æ?¯ maildir ç?®é??ã??"
 # camel/providers/local/camel-maildir-store.c:151
 # camel/providers/local/camel-maildir-store.c:188
 # camel/providers/local/camel-mh-store.c:127
-#: ../camel/providers/local/camel-maildir-store.c:234
-#: ../camel/providers/local/camel-maildir-store.c:272
-#: ../camel/providers/local/camel-mh-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:242
+#: ../camel/providers/local/camel-maildir-store.c:282
+#: ../camel/providers/local/camel-mh-store.c:287
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "ç?¡æ³?å?ªé?¤è³?æ??å¤¾ã??%sã??ï¼?%s"
 
 # camel/providers/local/camel-maildir-store.c:152
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:244
 msgid "not a maildir directory"
 msgstr "ä¸?æ?¯ä¸?å?? maildir ç?®é??"
 
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:328
-#: ../camel/providers/local/camel-spool-store.c:342
+#: ../camel/providers/local/camel-maildir-store.c:482
+#: ../camel/providers/local/camel-spool-store.c:364
+#: ../camel/providers/local/camel-spool-store.c:380
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "ç?¡æ³?æ??æ??è³?æ??å¤¾ã??%sã??ï¼?%s"
 
 # camel/providers/local/camel-maildir-summary.c:405
 # camel/providers/local/camel-maildir-summary.c:526
-#: ../camel/providers/local/camel-maildir-summary.c:432
-#: ../camel/providers/local/camel-maildir-summary.c:551
+#: ../camel/providers/local/camel-maildir-summary.c:435
+#: ../camel/providers/local/camel-maildir-summary.c:558
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "ä¸?è?½é??å?? maildir ç?®é??è·¯å¾?ï¼?%sï¼? %s"
 
 # camel/providers/imap/camel-imap-provider.c:43
 # mail/mail-config.glade.h:13
-#: ../camel/providers/local/camel-maildir-summary.c:544
+#: ../camel/providers/local/camel-maildir-summary.c:549
 msgid "Checking folder consistency"
 msgstr "æª¢æ?¥è³?æ??å¤¾ç??ä¸?è?´æ?§"
 
 # mail/mail-ops.c:992
-#: ../camel/providers/local/camel-maildir-summary.c:637
+#: ../camel/providers/local/camel-maildir-summary.c:641
 msgid "Checking for new messages"
 msgstr "æª¢æ?¥æ?°é?µä»¶"
 
 # camel/camel-filter-driver.c:690
 # camel/camel-filter-driver.c:788
-#: ../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:732
+#: ../camel/providers/local/camel-mbox-summary.c:465
+#: ../camel/providers/local/camel-mbox-summary.c:669
+#: ../camel/providers/local/camel-mbox-summary.c:799
+#: ../camel/providers/local/camel-spool-summary.c:130
 msgid "Storing folder"
 msgstr "å?²å?è³?æ??å¤¾"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/providers/local/camel-mbox-folder.c:167
-#: ../camel/providers/local/camel-spool-folder.c:150
+#: ../camel/providers/local/camel-mbox-folder.c:124
+#: ../camel/providers/local/camel-spool-folder.c:125
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "ä¸?è?½å»ºæ§?è³?æ??å¤¾é??å®? %s ï¼? %s"
 
 # camel/providers/local/camel-mbox-folder.c:203
-#: ../camel/providers/local/camel-mbox-folder.c:231
+#: ../camel/providers/local/camel-mbox-folder.c:194
 #, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "ä¸?è?½é??å?? mailboxï¼?%sï¼? %s\n"
-
-# camel/camel-remote-store.c:337
-# camel/camel-remote-store.c:399
-# camel/camel-remote-store.c:470
-# camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/local/camel-mbox-folder.c:297
-msgid "Mail append canceled"
-msgstr "é?µä»¶å¢?æ·»å·²å??æ¶?"
+msgid "Cannot open mailbox: %s: "
+msgstr "ä¸?è?½é??å?? mailboxï¼?%s"
 
 # camel/providers/local/camel-mbox-folder.c:259
-#: ../camel/providers/local/camel-mbox-folder.c:300
+#: ../camel/providers/local/camel-mbox-folder.c:260
 #, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "ä¸?è?½å°?é?µä»¶å?²å?å?° mbox æª?æ¡?ï¼? %sï¼? %s"
+msgid "Cannot append message to mbox file: %s: "
+msgstr "ä¸?è?½å°?é?µä»¶å?²å?å?° mbox æª?æ¡?ï¼?%s"
 
 # camel/providers/local/camel-mbox-folder.c:368
-#: ../camel/providers/local/camel-mbox-folder.c:466
+#: ../camel/providers/local/camel-mbox-folder.c:433
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "è³?æ??å¤¾å¥½å??å·²ç¶?æ??æ¯?ä¸¦ä¸?ä¸?è?½å¾©å??ã??"
 
-# camel/providers/local/camel-mbox-folder.c:381
-#: ../camel/providers/local/camel-mbox-folder.c:474
-#: ../camel/providers/local/camel-mh-folder.c:245
-msgid "Message construction failed."
-msgstr "è¨?æ?¯çµ?æ§?å¤±æ??ã??"
-
 # camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/providers/local/camel-mbox-store.c:164
-#: ../camel/providers/local/camel-mbox-store.c:363
+#: ../camel/providers/local/camel-mbox-store.c:149
+#: ../camel/providers/local/camel-mbox-store.c:379
+#, c-format
 msgid "Cannot create a folder by this name."
 msgstr "ç?¡æ³?å»ºæ§?ä»¥æ¤ç?ºå??ç??è³?æ??å¤¾"
 
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
-#: ../camel/providers/local/camel-mbox-store.c:196
+#: ../camel/providers/local/camel-mbox-store.c:186
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ã??%sã??ï¼?ä¸?æ?¯ä¸?è?¬æª?æ¡?ã??"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:226
-#: ../camel/providers/local/camel-mbox-store.c:237
+#: ../camel/providers/local/camel-mbox-store.c:218
+#: ../camel/providers/local/camel-mbox-store.c:231
 #: ../camel/providers/local/camel-mbox-store.c:260
 #, c-format
 msgid ""
@@ -4517,116 +4301,116 @@ msgstr ""
 
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
-#: ../camel/providers/local/camel-mbox-store.c:245
+#: ../camel/providers/local/camel-mbox-store.c:241
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "ã??%sã??ä¸?æ?¯æ?®é??ç??æª?æ¡?ã??"
 
 # camel/providers/local/camel-mbox-store.c:153
-#: ../camel/providers/local/camel-mbox-store.c:252
+#: ../camel/providers/local/camel-mbox-store.c:250
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "è³?æ??å¤¾ã??%sã??å?§ä»?æ??æª?æ¡?ã??æ??ä»¥ä¸?å?ªé?¤ã??"
 
 # camel/providers/local/camel-local-store.c:279
-#: ../camel/providers/local/camel-mbox-store.c:274
-#: ../camel/providers/local/camel-mbox-store.c:286
+#: ../camel/providers/local/camel-mbox-store.c:276
+#: ../camel/providers/local/camel-mbox-store.c:290
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "ç?¡æ³?å?ªé?¤è³?æ??å¤¾æ??è¦?æª?æ¡?ã??%sã??ï¼? %s"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/providers/local/camel-mbox-store.c:376
+#: ../camel/providers/local/camel-mbox-store.c:395
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "ä¸?è?½å»ºç«?ç?®é??ã??%sã??ï¼? %sã??"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-mbox-store.c:390
+#: ../camel/providers/local/camel-mbox-store.c:411
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ï¼?%sï¼?%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:413
 msgid "Folder already exists"
 msgstr "è³?æ??å¤¾å·²å?å?¨"
 
 # shell/e-shell-folder-creation-dialog.c:156
-#: ../camel/providers/local/camel-mbox-store.c:483
+#: ../camel/providers/local/camel-mbox-store.c:507
+#, c-format
 msgid "The new folder name is illegal."
-msgstr "æ??å®?ç??è³?æ??å¤¾å??ç¨±ä¸?å??æ³?ï¼? %s"
+msgstr "æ?°ç??è³?æ??å¤¾å??ç¨±ä¸?å??æ³?ã??"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-mbox-store.c:496
+#: ../camel/providers/local/camel-mbox-store.c:522
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "ç?¡æ³?é??æ?°å?½å??ã??%sã??ï¼?ã??%sã??ï¼?%s"
 
 # camel/providers/local/camel-local-store.c:237
-#: ../camel/providers/local/camel-mbox-store.c:577
+#: ../camel/providers/local/camel-mbox-store.c:605
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "ç?¡æ³?å°? '%s' é??æ?°å?½å??æ?? %sï¼?%s"
 
 # camel/providers/local/camel-maildir-store.c:96
 # camel/providers/local/camel-mh-store.c:90
-#: ../camel/providers/local/camel-mbox-summary.c:532
+#: ../camel/providers/local/camel-mbox-summary.c:473
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "ç?¡æ³?é??å??è³?æ??å¤¾ï¼? %sï¼? %s"
 
 # camel/providers/local/camel-mbox-summary.c:296
-#: ../camel/providers/local/camel-mbox-summary.c:582
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "é? è¿? %ld (æ?¼è³?æ??å¤¾ %s)ç??ä½?ç½®ç?¼ç??å?´é??ç??é?µä»¶å??æ??é?¯èª¤"
+#: ../camel/providers/local/camel-mbox-summary.c:524
+msgid "Fatal mail parser error near position %"
+msgstr "ç?¼ç??å?´é??ç??é?µä»¶å??æ??é?¯èª¤ï¼?é? è¿?ä½?ç½® %"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-mbox-summary.c:659
+#: ../camel/providers/local/camel-mbox-summary.c:605
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "ä¸?è?½æª¢æ?¥è³?æ??å¤¾ï¼?%sï¼? %s"
 
 # camel/providers/local/camel-mbox-store.c:94
-#: ../camel/providers/local/camel-mbox-summary.c:727
-#: ../camel/providers/local/camel-mbox-summary.c:847
-#: ../camel/providers/local/camel-spool-summary.c:155
+#: ../camel/providers/local/camel-mbox-summary.c:676
+#: ../camel/providers/local/camel-mbox-summary.c:806
+#: ../camel/providers/local/camel-spool-summary.c:137
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "ç?¡æ³?é??å??æª?æ¡?ï¼? %sï¼? %s"
 
 # camel/providers/local/camel-mbox-summary.c:524
-#: ../camel/providers/local/camel-mbox-summary.c:739
-#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-mbox-summary.c:690
+#: ../camel/providers/local/camel-spool-summary.c:152
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "ä¸?è?½é??å??æ?«å? mailboxï¼?%s"
 
 # camel/providers/local/camel-mbox-summary.c:635
 # camel/providers/local/camel-mbox-summary.c:804
-#: ../camel/providers/local/camel-mbox-summary.c:752
-#: ../camel/providers/local/camel-mbox-summary.c:956
+#: ../camel/providers/local/camel-mbox-summary.c:705
+#: ../camel/providers/local/camel-mbox-summary.c:923
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "ç?¡æ³?é??é??ä¾?æº?è³?æ??å¤¾ %s ï¼? %s"
 
 # camel/providers/local/camel-mbox-summary.c:644
-#: ../camel/providers/local/camel-mbox-summary.c:761
+#: ../camel/providers/local/camel-mbox-summary.c:716
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "ç?¡æ³?é??é??æ?«å?è³?æ??å¤¾ï¼? %s"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-mbox-summary.c:776
+#: ../camel/providers/local/camel-mbox-summary.c:733
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "ç?¡æ³?é??æ?°å?½å??è³?æ??å¤¾ï¼?%s "
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-mbox-summary.c:858
-#: ../camel/providers/local/camel-mbox-summary.c:1083
+#: ../camel/providers/local/camel-mbox-summary.c:819
+#: ../camel/providers/local/camel-mbox-summary.c:1061
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "ç?¡æ³?å?²å?è³?æ??å¤¾ï¼?%s "
@@ -4635,71 +4419,68 @@ msgstr "ç?¡æ³?å?²å?è³?æ??å¤¾ï¼?%s "
 # camel/providers/local/camel-mbox-summary.c:557
 # camel/providers/local/camel-mbox-summary.c:746
 # camel/providers/local/camel-mbox-summary.c:754
-#: ../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:860
+#: ../camel/providers/local/camel-mbox-summary.c:869
+#: ../camel/providers/local/camel-mbox-summary.c:1094
+#: ../camel/providers/local/camel-mbox-summary.c:1103
+#, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "æ??è¦?è??è³?æ??å¤¾ä¸?å??èª¿ï¼?å?³ä½¿ç¶?é??å??æ¥"
 
 # camel/providers/local/camel-mbox-summary.c:879
-#: ../camel/providers/local/camel-mbox-summary.c:1046
-#: ../camel/providers/local/camel-spool-summary.c:334
+#: ../camel/providers/local/camel-mbox-summary.c:1020
+#: ../camel/providers/local/camel-spool-summary.c:337
 #, c-format
 msgid "Unknown error: %s"
 msgstr "ä¸?æ??ç??é?¯èª¤ï¼? %s"
 
 # camel/providers/local/camel-mbox-summary.c:617
-#: ../camel/providers/local/camel-mbox-summary.c:1189
-#: ../camel/providers/local/camel-mbox-summary.c:1215
+#: ../camel/providers/local/camel-mbox-summary.c:1173
+#: ../camel/providers/local/camel-mbox-summary.c:1203
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "å¯«å?¥æ?«å?é?µç®±å¤±æ??ï¼?  %s"
 
 # camel/providers/local/camel-mbox-summary.c:617
-#: ../camel/providers/local/camel-mbox-summary.c:1206
+#: ../camel/providers/local/camel-mbox-summary.c:1192
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "å¯«å?¥æ?«å?é?µç®±å¤±æ??ï¼? %sï¼? %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:180
-msgid "MH append message canceled"
-msgstr "MH å¢?æ·»é?µä»¶å·²å??æ¶?"
-
 # camel/providers/local/camel-mh-folder.c:149
 # camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/local/camel-mh-folder.c:183
+#: ../camel/providers/local/camel-mh-folder.c:165
 #, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "ä¸?è?½å°?é?µä»¶å?²å?å?° mh è³?æ??å¤¾ï¼? %sï¼? %s"
+msgid "Cannot append message to mh folder: %s: "
+msgstr "ä¸?è?½å°?é?µä»¶å?²å?å?° mh è³?æ??å¤¾ï¼? %sï¼?"
 
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
-#: ../camel/providers/local/camel-mh-store.c:232
+#: ../camel/providers/local/camel-mh-store.c:234
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "ç?¡æ³?å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?%s"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-mh-store.c:244
+#: ../camel/providers/local/camel-mh-store.c:248
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ã??%sã??ï¼?ä¸?æ?¯ç?®é??ã??"
 
 # camel/providers/local/camel-mh-summary.c:218
-#: ../camel/providers/local/camel-mh-summary.c:240
+#: ../camel/providers/local/camel-mh-summary.c:228
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "ä¸?è?½é??å?? MH ç?®é??è·¯å¾?ï¼? %sï¼? %s"
 
-#: ../camel/providers/local/camel-spool-store.c:132
+#: ../camel/providers/local/camel-spool-store.c:118
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "æ??ç¨?å?¨ã??%sã??ä¸?è?½è¢«é??å??ï¼?%s"
 
 # camel/providers/local/camel-local-store.c:134
-#: ../camel/providers/local/camel-spool-store.c:144
+#: ../camel/providers/local/camel-spool-store.c:132
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "æ??ç¨?å?¨ã??%sã??ä¸?æ?¯ä¸?è?¬æª?æ¡?æ??ç?®é??ã??"
@@ -4707,14 +4488,14 @@ msgstr "æ??ç¨?å?¨ã??%sã??ä¸?æ?¯ä¸?è?¬æª?æ¡?æ??ç?®é??ã??"
 # camel/providers/local/camel-maildir-store.c:100
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
-#: ../camel/providers/local/camel-spool-store.c:163
+#: ../camel/providers/local/camel-spool-store.c:158
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "è³?æ??å¤¾ã??%s/%sã??ä¸?å?å?¨ã??"
 
 # camel/providers/local/camel-maildir-store.c:96
 # camel/providers/local/camel-mh-store.c:90
-#: ../camel/providers/local/camel-spool-store.c:173
+#: ../camel/providers/local/camel-spool-store.c:170
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -4726,14 +4507,14 @@ msgstr ""
 # camel/providers/local/camel-maildir-store.c:100
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
-#: ../camel/providers/local/camel-spool-store.c:177
+#: ../camel/providers/local/camel-spool-store.c:176
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "è³?æ??å¤¾ã??%sã??ä¸?å?å?¨ã??"
 
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
-#: ../camel/providers/local/camel-spool-store.c:182
+#: ../camel/providers/local/camel-spool-store.c:183
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -4744,52 +4525,55 @@ msgstr ""
 
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
-#: ../camel/providers/local/camel-spool-store.c:190
+#: ../camel/providers/local/camel-spool-store.c:193
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "ã??%sã??ä¸?æ?¯ mailbox æª?æ¡?ã??"
 
-#: ../camel/providers/local/camel-spool-store.c:207
+#: ../camel/providers/local/camel-spool-store.c:213
+#, c-format
 msgid "Store does not support an INBOX"
 msgstr "å?²å?ä¸¦ä¸?æ?¯æ?´ INBOX"
 
 # camel/providers/local/camel-local-store.c:183
-#: ../camel/providers/local/camel-spool-store.c:219
+#: ../camel/providers/local/camel-spool-store.c:226
 #, c-format
 msgid "Spool mail file %s"
 msgstr "æ??ç¨?é?µä»¶æª?æ¡? %s"
 
-#: ../camel/providers/local/camel-spool-store.c:219
+#: ../camel/providers/local/camel-spool-store.c:226
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "æ??ç¨?è³?æ??å¤¾æ¨¹ç??çµ?æ§? %s"
 
-#: ../camel/providers/local/camel-spool-store.c:227
+#: ../camel/providers/local/camel-spool-store.c:238
+#, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "æ??ç¨?è³?æ??å¤¾ä¸?è?½é??æ?°å?½å??"
 
-#: ../camel/providers/local/camel-spool-store.c:235
+#: ../camel/providers/local/camel-spool-store.c:251
+#, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "æ??ç¨?è³?æ??å¤¾ä¸?è?½å?ªé?¤"
 
 # camel/camel-movemail.c:158
-#: ../camel/providers/local/camel-spool-summary.c:180
+#: ../camel/providers/local/camel-spool-summary.c:166
+#: ../camel/providers/local/camel-spool-summary.c:178
 #: ../camel/providers/local/camel-spool-summary.c:190
-#: ../camel/providers/local/camel-spool-summary.c:200
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "ç?¡æ³?è??æ?«å?è³?æ??å¤¾å??æ¥ %sï¼? %s"
 
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
-#: ../camel/providers/local/camel-spool-summary.c:216
+#: ../camel/providers/local/camel-spool-summary.c:208
 #, c-format
 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
+#: ../camel/providers/local/camel-spool-summary.c:240
+#: ../camel/providers/local/camel-spool-summary.c:259
+#: ../camel/providers/local/camel-spool-summary.c:272
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -4798,79 +4582,105 @@ msgstr ""
 "ç?¡æ³?å??æ¥æ??ç¨?è³?æ??å¤¾ %sï¼? %s\n"
 "è³?æ??å¤¾å?¯è?½æ??æ¯?ï¼?è¤?è£½å?²å?æ?¼ã??%sã??"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:135
-#: ../camel/providers/nntp/camel-nntp-folder.c:192
-#: ../camel/providers/nntp/camel-nntp-folder.c:224
+#: ../camel/providers/nntp/camel-nntp-folder.c:197
+#: ../camel/providers/nntp/camel-nntp-folder.c:271
+#: ../camel/providers/nntp/camel-nntp-folder.c:312
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "å?§é?¨é?¯èª¤ï¼?UID æ ¼å¼?ç?¡æ??ï¼?%s"
 
+# camel/providers/local/camel-maildir-folder.c:197
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:217
+# camel/providers/local/camel-mbox-folder.c:319
+# camel/providers/local/camel-mh-folder.c:185
+# camel/providers/local/camel-mh-folder.c:194
+# camel/providers/local/camel-mh-folder.c:202
+#: ../camel/providers/nntp/camel-nntp-folder.c:234
+#: ../camel/providers/nntp/camel-nntp-folder.c:238
+#: ../camel/providers/pop3/camel-pop3-folder.c:402
+#: ../camel/providers/pop3/camel-pop3-folder.c:630
+#: ../camel/providers/pop3/camel-pop3-folder.c:695
+#: ../camel/providers/pop3/camel-pop3-folder.c:706
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "ç?¡æ³?å??å¾?é?µä»¶ %sï¼? %s"
+
 # camel/camel-remote-store.c:337
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/nntp/camel-nntp-folder.c:365
-#: ../camel/providers/nntp/camel-nntp-folder.c:368
-#: ../camel/providers/nntp/camel-nntp-folder.c:410
-#: ../camel/providers/nntp/camel-nntp-folder.c:412
+#: ../camel/providers/nntp/camel-nntp-folder.c:465
+#: ../camel/providers/nntp/camel-nntp-folder.c:471
+#: ../camel/providers/nntp/camel-nntp-folder.c:518
 #, c-format
 msgid "Posting failed: %s"
 msgstr "å¼µè²¼å¤±æ??ï¼?%s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:430
+# camel/camel-remote-store.c:337
+# camel/camel-remote-store.c:399
+# camel/camel-remote-store.c:470
+# camel/providers/imap/camel-imap-command.c:287
+#: ../camel/providers/nntp/camel-nntp-folder.c:513
+msgid "Posting failed: "
+msgstr "å¼µè²¼å¤±æ??ï¼?"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:541
+#, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "é?¢ç·?å·¥ä½?æ??ç?¡æ³?å¼µè²¼ NNTP è¨?æ?¯ï¼?"
 
 # camel/providers/local/camel-mbox-summary.c:644
-#: ../camel/providers/nntp/camel-nntp-folder.c:441
+#: ../camel/providers/nntp/camel-nntp-folder.c:560
+#, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "æ?¨ç?¡æ³?å¾? NNTP è³?æ??å¤¾è¤?è£½è¨?æ?¯ï¼?"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid ""
 "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr "ä»¥ç°¡ç?è¡¨ç¤ºæ³?é¡¯ç¤ºè³?æ??å¤¾(ä¾?å¦?ï¼?c.o.linux è??ä¸?æ?¯ comp.o_s.linux)"
 
-#: ../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 "å?¨è¨?é?±å°?è©±æ?¹å¡?ï¼?é¡¯ç¤ºç?¸é??è³?æ??å¤¾å??ç¨±(_D)"
 
 # camel/providers/nntp/camel-nntp-provider.c:42
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:53
 msgid "USENET news"
 msgstr "USENET æ?°è??"
 
 # camel/providers/nntp/camel-nntp-provider.c:44
-#: ../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 "é??æ?¯è®?å??è??ç?¼ä¿¡è?³ USENET æ?°è??ç¾¤çµ?ç??ä¾?æ??è??ã??"
 
 # camel/providers/nntp/camel-nntp-store.c:293
-#: ../camel/providers/nntp/camel-nntp-provider.c:76
+#: ../camel/providers/nntp/camel-nntp-provider.c:74
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨ç´?æ??å?ç??å¯?ç¢¼é©?è? NNTP ä¼ºæ??å?¨ã??"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/providers/nntp/camel-nntp-store.c:216
+#: ../camel/providers/nntp/camel-nntp-store.c:265
 #, c-format
-msgid "Could not read greeting from %s: %s"
-msgstr "ç?¡æ³?è®?å?? %s ç??æ¡è¿?è¾ï¼? %s"
+msgid "Could not read greeting from %s: "
+msgstr "ç?¡æ³?è®?å?? %s ç??æ¡è¿?è¾ï¼?"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:228
+#: ../camel/providers/nntp/camel-nntp-store.c:278
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP ä¼ºæ??å?¨ %s å?³å??é?¯èª¤ä»£ç¢¼ %d ï¼? %s"
 
 # camel/providers/nntp/camel-nntp-store.c:286
-#: ../camel/providers/nntp/camel-nntp-store.c:410
+#: ../camel/providers/nntp/camel-nntp-store.c:453
 #, c-format
 msgid "USENET News via %s"
 msgstr "ç¶?ç?± %s ç?? USENET æ?°è??"
 
 # mail/mail-ops.c:1755
-#: ../camel/providers/nntp/camel-nntp-store.c:819
+#: ../camel/providers/nntp/camel-nntp-store.c:946
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4881,7 +4691,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:913
+#: ../camel/providers/nntp/camel-nntp-store.c:1043
+#, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -4891,7 +4702,8 @@ msgstr ""
 "\n"
 "æ²?æ??é¡?ä¼¼ç??æ?°è??ç¾¤çµ?ã??é?¸å??ç??é ?ç?®å?¯è?½æ?¯ç?¶ä»£è³?æ??å¤¾ã??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:945
+#: ../camel/providers/nntp/camel-nntp-store.c:1083
+#, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -4901,106 +4713,98 @@ msgstr ""
 "\n"
 "æ?°è??ç¾¤çµ?ä¸?å?å?¨ï¼?"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:970
+#: ../camel/providers/nntp/camel-nntp-store.c:1113
+#, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "æ?¨ç?¡æ³?å?¨ã??æ?°è??ã??å?²å?å??å»ºæ§?è³?æ??å¤¾ï¼?æ?¹ä»¥è¨?é?±ã??"
 
 # camel/providers/local/camel-local-store.c:237
-#: ../camel/providers/nntp/camel-nntp-store.c:978
+#: ../camel/providers/nntp/camel-nntp-store.c:1125
+#, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "æ?¨ç?¡æ³?å?¨ã??æ?°è??ã??å?²å?å??é??æ?°å?½å??è³?æ??å¤¾ã??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:986
+#: ../camel/providers/nntp/camel-nntp-store.c:1138
+#, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "æ?¨ç?¡æ³?å?¨ã??æ?°è??ã??å?²å?å??ç§»é?¤è³?æ??å¤¾ï¼?æ?¹ä»¥å??æ¶?è¨?é?±ã??"
 
 # camel/providers/smtp/camel-smtp-transport.c:218
-#: ../camel/providers/nntp/camel-nntp-store.c:1180
+#: ../camel/providers/nntp/camel-nntp-store.c:1276
+#, c-format
 msgid "Authentication requested but no username provided"
 msgstr "é??è¦?é©?è?ï¼?ä½?æ?ªæ??ä¾?ä½¿ç?¨è??å??ç¨±"
 
 # camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/nntp/camel-nntp-store.c:1192
+#: ../camel/providers/nntp/camel-nntp-store.c:1288
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "ç?¡æ³?é©?è?ä¼ºæ??å?¨ï¼?%s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/nntp/camel-nntp-store.c:1315
-#, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP æ??ä»¤å¤±æ??ï¼? %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1414
+msgid "NNTP Command failed: "
+msgstr "NNTP æ??ä»¤å¤±æ??ï¼?"
 
 # ui/evolution-addressbook.xml.h:17
-#: ../camel/providers/nntp/camel-nntp-store.c:1369
+#: ../camel/providers/nntp/camel-nntp-store.c:1472
+#, c-format
 msgid "Not connected."
 msgstr "æ?ªé?£ç·?ã??"
 
-# camel/providers/imap/camel-imap-store.c:803
-# mail/mail-local.c:334
-#: ../camel/providers/nntp/camel-nntp-store.c:1422
-#, c-format
-msgid "No such folder: %s"
-msgstr "æ²?æ??é??å??è³?æ??å¤¾ï¼? %s"
-
 # mail/mail-ops.c:992
-#: ../camel/providers/nntp/camel-nntp-summary.c:272
-#: ../camel/providers/nntp/camel-nntp-summary.c:370
+#: ../camel/providers/nntp/camel-nntp-summary.c:238
+#: ../camel/providers/nntp/camel-nntp-summary.c:340
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%sï¼?æ??æ??æ?°é?µä»¶"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: ../camel/providers/nntp/camel-nntp-summary.c:279
+#: ../camel/providers/nntp/camel-nntp-summary.c:249
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "xover å?³ä¾?æ??å¤?ç??ä¼ºæ??å?¨å??æ??ï¼?%s"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: ../camel/providers/nntp/camel-nntp-summary.c:384
+#: ../camel/providers/nntp/camel-nntp-summary.c:356
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "æ¨?é¡?å?³ä¾?æ??å¤?ç??ä¼ºæ??å?¨å??æ??ï¼?%s"
 
-# ui/evolution-mail.xml.h:2
-#: ../camel/providers/nntp/camel-nntp-summary.c:420
-msgid "Use cancel"
-msgstr "ä½¿ç?¨å??æ¶?"
-
 # camel/camel-remote-store.c:337
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/nntp/camel-nntp-summary.c:422
+#: ../camel/providers/nntp/camel-nntp-summary.c:401
 #, c-format
 msgid "Operation failed: %s"
 msgstr "ä½?æ¥å¤±æ??ï¼? %s"
 
 # camel/providers/pop3/camel-pop3-folder.c:149
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
+#: ../camel/providers/pop3/camel-pop3-folder.c:251
 msgid "Retrieving POP summary"
 msgstr "å??å?? POP ç??æ??è¦?"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
+#: ../camel/providers/pop3/camel-pop3-folder.c:274
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "ä¸?è?½å??å¾? POP æ??è¦?ï¼? %s"
 
 # mail/message-browser.c:199
-#: ../camel/providers/pop3/camel-pop3-folder.c:314
+#: ../camel/providers/pop3/camel-pop3-folder.c:324
 msgid "Expunging old messages"
 msgstr "æ¸?ç©ºè??ç??é?µä»¶"
 
 # mail/message-browser.c:199
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
+#: ../camel/providers/pop3/camel-pop3-folder.c:332
 msgid "Expunging deleted messages"
 msgstr "æ¸?ç©ºå?ªé?¤ç??é?µä»¶"
 
 # camel/providers/pop3/camel-pop3-folder.c:292
-#: ../camel/providers/pop3/camel-pop3-folder.c:530
-#: ../camel/providers/pop3/camel-pop3-folder.c:552
+#: ../camel/providers/pop3/camel-pop3-folder.c:566
+#: ../camel/providers/pop3/camel-pop3-folder.c:596
 #, c-format
 msgid "No message with UID %s"
 msgstr "æ²?æ??é?µä»¶å?·æ??é??å?? UID %s"
@@ -5008,49 +4812,49 @@ msgstr "æ²?æ??é?µä»¶å?·æ??é??å?? UID %s"
 # camel/providers/pop3/camel-pop3-folder.c:296
 #. 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
+#: ../camel/providers/pop3/camel-pop3-folder.c:603
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "æ?¥æ?¶ POP é?µä»¶ %d"
 
 # camel/camel-sasl-login.c:127
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
+#: ../camel/providers/pop3/camel-pop3-folder.c:707
 msgid "Unknown reason"
 msgstr "ä¸?æ??ç??å??å? "
 
 # camel/providers/pop3/camel-pop3-provider.c:37
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
 msgid "Message storage"
 msgstr "é?µä»¶å?²å?ç©ºé??"
 
 # camel/providers/pop3/camel-pop3-provider.c:39
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
 msgstr "å?¨ä¼ºæ??å?¨ä¿?ç??é?µä»¶å??ä»½(_L)"
 
 # camel/providers/pop3/camel-pop3-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "å?ªé?¤ %s å¤©å¾?ç??é?µä»¶(_D)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:49
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
 msgid "Disable _support for all POP3 extensions"
 msgstr "å??æ¢æ??æ?? P_OP3 å»¶ä¼¸å??è?½ç??æ?¯æ?´"
 
 # camel/providers/pop3/camel-pop3-provider.c:48
 # mail/mail-config.glade.h:51
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:53
 msgid "POP"
 msgstr "POP"
 
 # camel/providers/imap/camel-imap-provider.c:65
-#: ../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-provider.c:69
-#: ../camel/providers/pop3/camel-pop3-provider.c:76
+#: ../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."
@@ -5059,7 +4863,7 @@ msgstr ""
 "æ?¹å¼?ã??"
 
 # camel/providers/pop3/camel-pop3-provider.c:79
-#: ../camel/providers/pop3/camel-pop3-provider.c:86
+#: ../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 "
@@ -5068,67 +4872,74 @@ msgstr ""
 "é??å??é?¸é ?å°?æ??ä½¿ç?¨å? å¯?ç??å¯?ç¢¼ç¶?ç?± APOP é??è¨?å??å®?é?£ç·?å?° POP ä¼ºæ??å?¨ã??ä¸?é??å°±ç®?ä¼ºæ??å?¨"
 "è?²ç¨±è?½å¤ æ?¯æ?´ï¼?ä½?å°?æ?¼æ??æ??ä½¿ç?¨è??ä¾?è¬?é?½æ?ªå¿?ä¸?å®?å?¯è¡?ã??"
 
+#. Translators: This is the separator between an error and an explanation
+#: ../camel/providers/pop3/camel-pop3-store.c:98
+msgid ": "
+msgstr "ï¼?"
+
 # camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/pop3/camel-pop3-store.c:229
+#: ../camel/providers/pop3/camel-pop3-store.c:168
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "ç?¡æ³?å¾? POP ä¼ºæ??å?¨ %s è®?å??æ??æ??ç??å??å??èª?"
 
 # camel/providers/pop3/camel-pop3-store.c:379
-#: ../camel/providers/pop3/camel-pop3-store.c:246
-#: ../camel/providers/pop3/camel-pop3-store.c:274
-#: ../camel/providers/pop3/camel-pop3-store.c:280
+#: ../camel/providers/pop3/camel-pop3-store.c:186
+#: ../camel/providers/pop3/camel-pop3-store.c:217
+#: ../camel/providers/pop3/camel-pop3-store.c:224
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "ç?¡æ³?ä»¥å®?å?¨æ¨¡å¼?é?£ç·?å?° POP ä¼ºæ??å?¨ %sï¼? %s"
 
 # shell/e-storage.c:477
-#: ../camel/providers/pop3/camel-pop3-store.c:247
+#: ../camel/providers/pop3/camel-pop3-store.c:187
 msgid "STLS not supported by server"
 msgstr "ä¼ºæ??å?¨ä¸?æ?¯æ?´ STLS"
 
 # camel/providers/pop3/camel-pop3-store.c:379
-#: ../camel/providers/pop3/camel-pop3-store.c:262
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:205
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr "ç?¡æ³?ä»¥å®?å?¨æ¨¡å¼?é?£ç·?å?° POP ä¼ºæ??å?¨ %s%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:281
+# camel/camel-sasl-anonymous.c:110
+# camel/camel-sasl-plain.c:87
+#: ../camel/providers/pop3/camel-pop3-store.c:218
+msgid "TLS negotiations failed"
+msgstr "TLS å??å??å¤±æ??"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:225
 msgid "TLS is not available in this build"
 msgstr "æ¤ä¸?ç??æ?¬ä¸¦æ?ªå??ç?¨ TLS"
 
-# camel/providers/pop3/camel-pop3-store.c:322
-#: ../camel/providers/pop3/camel-pop3-store.c:387
-#, c-format
-msgid "Could not connect to POP server %s"
-msgstr "ç?¡æ³?é?£ç·?å?° POP ä¼ºæ??å?¨ %s"
-
 # camel/providers/pop3/camel-pop3-store.c:409
-#: ../camel/providers/pop3/camel-pop3-store.c:428
-#: ../camel/providers/pop3/camel-pop3-store.c:565
+#: ../camel/providers/pop3/camel-pop3-store.c:321
+#: ../camel/providers/pop3/camel-pop3-store.c:473
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr "ç?¡æ³?é?£ç·?å?° POP ä¼ºæ??å?¨ %sï¼?ä¸?æ?¯æ?´æ??è¦?æ±?ç??é©?è?æ©?å?¶ã??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:446
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:344
 #, c-format
 msgid "SASL '%s' Login failed for POP server %s%s"
 msgstr "å?¨ POP ä¼ºæ??å?¨ %2$s ä»¥ SASL ã??%1$sã??ç?»å?¥å¤±æ??%3$s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:460
+#: ../camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "ä¸?è?½ç?»å?¥ POP ä¼ºæ??å?¨ %sï¼? SASL é??è¨?å??å®?é?¯èª¤"
 
 # camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/pop3/camel-pop3-store.c:479
+#: ../camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
-msgid "Failed to authenticate on POP server %s: %s"
-msgstr "ç?¡æ³?é©?è? POP ä¼ºæ??å?¨ %sï¼?%s"
+msgid "Failed to authenticate on POP server %s: "
+msgstr "ç?¡æ³?é©?è? POP ä¼ºæ??å?¨ %sï¼?"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:538
+#: ../camel/providers/pop3/camel-pop3-store.c:442
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -5138,7 +4949,7 @@ msgstr ""
 "è?¯çµ¡æ?¨ç??ç³»çµ±ç®¡ç??è??ã??"
 
 # camel/providers/pop3/camel-pop3-store.c:417
-#: ../camel/providers/pop3/camel-pop3-store.c:579
+#: ../camel/providers/pop3/camel-pop3-store.c:492
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -5148,7 +4959,8 @@ msgstr ""
 "å?³é??å¯?ç¢¼æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
 # camel/providers/pop3/camel-pop3-store.c:417
-#: ../camel/providers/pop3/camel-pop3-store.c:588
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:505
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -5158,7 +4970,8 @@ msgstr ""
 "å?³é??ä½¿ç?¨è??å??ç¨±ç?¼ç??é?¯èª¤%s"
 
 # camel/providers/pop3/camel-pop3-store.c:417
-#: ../camel/providers/pop3/camel-pop3-store.c:597
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:518
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -5167,233 +4980,259 @@ msgstr ""
 "ç?¡æ³?é?£ç·?å?° POP ä¼ºæ??å?¨ %sã??\n"
 "å?³é??å¯?ç¢¼æ??ç?¼ç??é?¯èª¤%s"
 
+# camel/providers/pop3/camel-pop3-store.c:322
+#: ../camel/providers/pop3/camel-pop3-store.c:674
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr "ç?¡æ³?é?£ç·?å?° POP ä¼ºæ??å?¨ %s"
+
+# camel/providers/smtp/camel-smtp-transport.c:534
+#: ../camel/providers/pop3/camel-pop3-store.c:687
+#, c-format
+msgid "POP3 server %s"
+msgstr "POP3 ä¼ºæ??å?¨ %s"
+
+# camel/camel-remote-store.c:195
+#: ../camel/providers/pop3/camel-pop3-store.c:691
+#, c-format
+msgid "POP3 server for %s on %s"
+msgstr "%s å?¨ %s ç?? POP3 ä¼ºæ??å?¨"
+
 # camel/providers/pop3/camel-pop3-store.c:484
-#: ../camel/providers/pop3/camel-pop3-store.c:703
+#: ../camel/providers/pop3/camel-pop3-store.c:706
 #, c-format
 msgid "No such folder '%s'."
 msgstr "æ²?æ??é??å??è³?æ??å¤¾ã??%sã??ã??"
 
+#: ../camel/providers/pop3/camel-pop3-store.c:730
+#, c-format
+msgid "POP3 stores have no folder hierarchy"
+msgstr "POP3 å?²å?å??æ²?æ??è³?æ??å¤¾é??å±¤"
+
 # camel/providers/sendmail/camel-sendmail-provider.c:37
 # mail/mail-config.glade.h:67
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "Sendmail"
 msgstr "Sendmail"
 
 # camel/providers/sendmail/camel-sendmail-provider.c:39
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:40
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr "å°?é??é??ç??é?µä»¶äº¤çµ¦æ?¬å?°ç«¯ç³»çµ±ä¸?ç??ã??sendmailã??ç¨?å¼?è??ç??ã??"
 
 # camel/camel-url.c:289
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:113
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:98
+#, c-format
 msgid "Could not parse recipient list"
 msgstr "ç?¡æ³?å??æ??æ?¶ä»¶äººæ¸?å?®"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:107
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:144
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:131
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "ç?¡æ³?å»ºæ§?å°?ç®¡å?°ã??sendmailã??ç¨?å¼?ï¼? %sï¼?é?µä»¶ç?¡æ³?å?³é??"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:124
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:165
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:153
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "ç?¡æ³?å?¦å¤?å??å??å??ä¸?å?? sendmail è¡?ç¨?ï¼? %sï¼?é?µä»¶ç?¡æ³?å?³é??"
 
+# camel/providers/sendmail/camel-sendmail-transport.c:150
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:194
+msgid "Could not send message: "
+msgstr "ç?¡æ³?å?³é??é?µä»¶ï¼?"
+
 # camel/providers/sendmail/camel-sendmail-transport.c:163
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:235
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail å??å?³é??é??è¨?æ?¯ %sï¼?é?µä»¶ç?¡æ³?å?³é??"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:170
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:242
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "ç?¡æ³?å?·è¡? %sï¼? é?µä»¶ç?¡æ³?å?³é??ã??"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:175
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:247
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail ç?±æ?¼ç??æ³? %d é??é??ï¼? é?µä»¶ç?¡æ³?å?³é??ã??"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:247
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:261
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:248
 msgid "sendmail"
 msgstr "sendmail"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:249
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:250
 msgid "Mail delivery via the sendmail program"
 msgstr "ç¶?ç?± sendmail ç¨?å¼?å?³é??é?µä»¶"
 
 # camel/providers/smtp/camel-smtp-provider.c:38
 # mail/mail-config.glade.h:62
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
 msgid "SMTP"
 msgstr "SMTP"
 
 # camel/providers/smtp/camel-smtp-provider.c:40
-#: ../camel/providers/smtp/camel-smtp-provider.c:43
+#: ../camel/providers/smtp/camel-smtp-provider.c:45
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "ä½¿ç?¨ SMTP é?£ç·?å?°é? ç«¯ mailhub ä¾?å?³é??é?µä»¶ã??"
 
 # camel/providers/smtp/camel-smtp-transport.c:168
-#: ../camel/providers/smtp/camel-smtp-transport.c:167
+#: ../camel/providers/smtp/camel-smtp-transport.c:116
 msgid "Syntax error, command unrecognized"
 msgstr "èª?æ³?é?¯èª¤ï¼?ä¸?èª?è?ç??æ??ä»¤"
 
 # camel/providers/smtp/camel-smtp-transport.c:170
-#: ../camel/providers/smtp/camel-smtp-transport.c:169
+#: ../camel/providers/smtp/camel-smtp-transport.c:118
 msgid "Syntax error in parameters or arguments"
 msgstr "å??æ?¸å?§ç??èª?æ³?é?¯èª¤"
 
 # camel/providers/smtp/camel-smtp-transport.c:172
-#: ../camel/providers/smtp/camel-smtp-transport.c:171
+#: ../camel/providers/smtp/camel-smtp-transport.c:120
 msgid "Command not implemented"
 msgstr "æ??ä»¤æ²?æ??å¯¦ä½?"
 
 # camel/providers/smtp/camel-smtp-transport.c:174
-#: ../camel/providers/smtp/camel-smtp-transport.c:173
+#: ../camel/providers/smtp/camel-smtp-transport.c:122
 msgid "Command parameter not implemented"
 msgstr "æ??ä»¤ç??å??æ?¸æ²?æ??å¯¦ä½?"
 
 # camel/providers/smtp/camel-smtp-transport.c:176
-#: ../camel/providers/smtp/camel-smtp-transport.c:175
+#: ../camel/providers/smtp/camel-smtp-transport.c:124
 msgid "System status, or system help reply"
 msgstr "ç³»çµ±ç??æ³?ï¼?æ??è??æ?¯ç³»çµ±ç??æ±?å?©èªªæ??å??æ??"
 
 # camel/providers/smtp/camel-smtp-transport.c:178
-#: ../camel/providers/smtp/camel-smtp-transport.c:177
+#: ../camel/providers/smtp/camel-smtp-transport.c:126
 msgid "Help message"
 msgstr "æ±?å?©èªªæ??è¨?æ?¯"
 
 # camel/providers/smtp/camel-smtp-transport.c:180
-#: ../camel/providers/smtp/camel-smtp-transport.c:179
+#: ../camel/providers/smtp/camel-smtp-transport.c:128
 msgid "Service ready"
 msgstr "æ??å??å·²å°±ç·?"
 
 # camel/providers/smtp/camel-smtp-transport.c:182
-#: ../camel/providers/smtp/camel-smtp-transport.c:181
+#: ../camel/providers/smtp/camel-smtp-transport.c:130
 msgid "Service closing transmission channel"
 msgstr "æ¤æ??å??å°?å?³è¼¸é??é??é??é??"
 
 # camel/providers/smtp/camel-smtp-transport.c:184
-#: ../camel/providers/smtp/camel-smtp-transport.c:183
+#: ../camel/providers/smtp/camel-smtp-transport.c:132
 msgid "Service not available, closing transmission channel"
 msgstr "æ¤æ??å??ä»?æ?ªå?¯ç?¨ï¼?å?³è¼¸é??é??é??é??"
 
 # camel/providers/smtp/camel-smtp-transport.c:186
-#: ../camel/providers/smtp/camel-smtp-transport.c:185
+#: ../camel/providers/smtp/camel-smtp-transport.c:134
 msgid "Requested mail action okay, completed"
 msgstr " æ??è¦?æ±?ç??é?µä»¶å??ä½?å·²æ??å??å®?æ??"
 
 # camel/providers/smtp/camel-smtp-transport.c:188
-#: ../camel/providers/smtp/camel-smtp-transport.c:187
+#: ../camel/providers/smtp/camel-smtp-transport.c:136
 msgid "User not local; will forward to <forward-path>"
 msgstr "ä¸?æ?¯æ?¬å?°ç«¯ç??ä½¿ç?¨è??ï¼?å°?æ??è½?å¯?è?³ <è½?å¯?è·¯å¾?>"
 
 # camel/providers/smtp/camel-smtp-transport.c:190
-#: ../camel/providers/smtp/camel-smtp-transport.c:189
+#: ../camel/providers/smtp/camel-smtp-transport.c:138
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "æ??è¦?æ±?ç??é?µä»¶å??ä½?ç?¡æ³?å?·è¡?ï¼?é?µç®±ä»?æ?ªå?¯ç?¨"
 
 # camel/providers/smtp/camel-smtp-transport.c:192
-#: ../camel/providers/smtp/camel-smtp-transport.c:191
+#: ../camel/providers/smtp/camel-smtp-transport.c:140
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "æ??è¦?æ±?ç??å??ä½?ç?¡æ³?å?·è¡?ï¼?é?µç®±ä»?æ?ªå?¯ç?¨"
 
 # camel/providers/smtp/camel-smtp-transport.c:194
-#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:142
 msgid "Requested action aborted: error in processing"
 msgstr "æ??è¦?æ±?ç??å??ä½?å·²æ?¾æ£?ï¼?æ£å?¨è??ç??æ??ç?¼ç??é?¯èª¤"
 
 # camel/providers/smtp/camel-smtp-transport.c:196
-#: ../camel/providers/smtp/camel-smtp-transport.c:195
+#: ../camel/providers/smtp/camel-smtp-transport.c:144
 msgid "User not local; please try <forward-path>"
 msgstr "ä¸?æ?¯æ?¬å?°ç«¯ç??ä½¿ç?¨è??ï¼?è«?å??è©¦ä½¿ç?¨ <è½?å¯?è·¯å¾?>"
 
 # camel/providers/smtp/camel-smtp-transport.c:198
-#: ../camel/providers/smtp/camel-smtp-transport.c:197
+#: ../camel/providers/smtp/camel-smtp-transport.c:146
 msgid "Requested action not taken: insufficient system storage"
 msgstr "æ??è¦?æ±?ç??å??ä½?ç?¡æ³?å?·è¡?ï¼?ç³»çµ±ç??å?²å?ç©ºé??ä¸?è¶³"
 
 # camel/providers/smtp/camel-smtp-transport.c:200
-#: ../camel/providers/smtp/camel-smtp-transport.c:199
+#: ../camel/providers/smtp/camel-smtp-transport.c:148
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "æ??è¦?æ±?ç??é?µä»¶å??ä½?å·²æ?¾æ£?ï¼?è¶?å?ºå?¯ä¾?å?²å?ç©ºé??ç??é??å?¶"
 
 # camel/providers/smtp/camel-smtp-transport.c:202
-#: ../camel/providers/smtp/camel-smtp-transport.c:201
+#: ../camel/providers/smtp/camel-smtp-transport.c:150
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "æ??è¦?æ±?ç??å??ä½?å·²æ?¾æ£?ï¼?ä¸?å??è¨±ç??é?µç®±å??ç¨±"
 
 # camel/providers/smtp/camel-smtp-transport.c:204
-#: ../camel/providers/smtp/camel-smtp-transport.c:203
+#: ../camel/providers/smtp/camel-smtp-transport.c:152
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "è«?é??å§?è¼¸å?¥é?µä»¶ç??è³?æ??ï¼?<CRLF>.<CRLF> çµ?æ??æ?°å¯«é?µä»¶"
 
 # camel/providers/smtp/camel-smtp-transport.c:206
-#: ../camel/providers/smtp/camel-smtp-transport.c:205
+#: ../camel/providers/smtp/camel-smtp-transport.c:154
 msgid "Transaction failed"
 msgstr "å?·è¡?å¤±æ??"
 
 # camel/providers/smtp/camel-smtp-transport.c:210
-#: ../camel/providers/smtp/camel-smtp-transport.c:209
+#: ../camel/providers/smtp/camel-smtp-transport.c:158
 msgid "A password transition is needed"
 msgstr "é??è¦?å¯?ç¢¼å?³é??"
 
 # camel/providers/smtp/camel-smtp-transport.c:212
-#: ../camel/providers/smtp/camel-smtp-transport.c:211
+#: ../camel/providers/smtp/camel-smtp-transport.c:160
 msgid "Authentication mechanism is too weak"
 msgstr "é©?è?æ©?å?¶å¤ªå¼±äº?"
 
 # camel/providers/smtp/camel-smtp-transport.c:214
-#: ../camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/smtp/camel-smtp-transport.c:162
 msgid "Encryption required for requested authentication mechanism"
 msgstr "æ??è¦?æ±?ç??é©?è?æ©?å?¶å¿?é ?å? å¯?è??ç??"
 
 # camel/providers/smtp/camel-smtp-transport.c:216
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
+#: ../camel/providers/smtp/camel-smtp-transport.c:164
 msgid "Temporary authentication failure"
 msgstr "è?¨æ??é©?è?å¤±æ??"
 
 # camel/providers/smtp/camel-smtp-transport.c:1043
-#: ../camel/providers/smtp/camel-smtp-transport.c:296
-msgid "Welcome response error"
-msgstr "è¿?æ?¥ç??å??æ??é?¯èª¤"
+#: ../camel/providers/smtp/camel-smtp-transport.c:252
+#: ../camel/providers/smtp/camel-smtp-transport.c:258
+msgid "Welcome response error: "
+msgstr "è¿?æ?¥ç??å??æ??é?¯èª¤ï¼?"
 
 # camel/providers/pop3/camel-pop3-store.c:379
+#: ../camel/providers/smtp/camel-smtp-transport.c:294
 #: ../camel/providers/smtp/camel-smtp-transport.c:331
-#: ../camel/providers/smtp/camel-smtp-transport.c:364
-#: ../camel/providers/smtp/camel-smtp-transport.c:370
+#: ../camel/providers/smtp/camel-smtp-transport.c:338
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "ç?¡æ³?ä»¥å®?å?¨æ¨¡å¼?é?£ç·?å?° SMTP ä¼ºæ??å?¨ %sï¼? %s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:340
-#, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "STARTTLS æ??ä»¤å¤±æ??ï¼?%s"
-
-# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:355
-msgid "STARTTLS command failed"
-msgstr "STARTTLS æ??ä»¤å¤±æ??"
+#: ../camel/providers/smtp/camel-smtp-transport.c:302
+#: ../camel/providers/smtp/camel-smtp-transport.c:314
+#: ../camel/providers/smtp/camel-smtp-transport.c:320
+msgid "STARTTLS command failed: "
+msgstr "STARTTLS æ??ä»¤å¤±æ??ï¼?"
 
 # camel/providers/smtp/camel-smtp-transport.c:356
-#: ../camel/providers/smtp/camel-smtp-transport.c:496
+#: ../camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP ä¼ºæ??å?¨ %s ä¸?æ?¯æ?´æ??è¦?æ±?ç??é©?è?é¡?å?? %sã??"
 
 # camel/providers/smtp/camel-smtp-transport.c:418
-#: ../camel/providers/smtp/camel-smtp-transport.c:567
+#: ../camel/providers/smtp/camel-smtp-transport.c:547
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5405,237 +5244,210 @@ msgstr ""
 "\n"
 
 # camel/providers/smtp/camel-smtp-transport.c:534
-#: ../camel/providers/smtp/camel-smtp-transport.c:700
+#: ../camel/providers/smtp/camel-smtp-transport.c:685
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ä¼ºæ??å?¨ %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:536
-#: ../camel/providers/smtp/camel-smtp-transport.c:702
+#: ../camel/providers/smtp/camel-smtp-transport.c:687
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "ç¶?ç?± %s å?³é?? SMTP é?µä»¶"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/providers/smtp/camel-smtp-transport.c:720
+#: ../camel/providers/smtp/camel-smtp-transport.c:707
+#, c-format
 msgid "Cannot send message: service not connected."
 msgstr "ç?¡æ³?å?³é??è¨?æ?¯ï¼?æ??å??æ?ªé?£ç·?ã??"
 
 # camel/providers/smtp/camel-smtp-transport.c:568
-#: ../camel/providers/smtp/camel-smtp-transport.c:726
+#: ../camel/providers/smtp/camel-smtp-transport.c:714
+#, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "ä¸?è?½å?³é??é?µä»¶ï¼?å¯?ä»¶è??ç??å?°å??ç?¡æ??ã??"
 
 # mail/mail-ops.c:603
-#: ../camel/providers/smtp/camel-smtp-transport.c:730
+#: ../camel/providers/smtp/camel-smtp-transport.c:718
 msgid "Sending message"
 msgstr "å?³é??é?µä»¶"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
+#: ../camel/providers/smtp/camel-smtp-transport.c:734
+#, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "ä¸?è?½å?³é??é?µä»¶ï¼?æ²?æ??å®?ç¾©æ?¶ä»¶è??ã??"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/providers/smtp/camel-smtp-transport.c:756
+#: ../camel/providers/smtp/camel-smtp-transport.c:746
+#, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "ä¸?è?½å?³é??é?µä»¶ï¼?ä¸?æ??å¤?å??ç?¡æ??ç??æ?¶ä»¶è??"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: ../camel/providers/smtp/camel-smtp-transport.c:985
+#: ../camel/providers/smtp/camel-smtp-transport.c:982
 msgid "SMTP Greeting"
 msgstr "SMTP è¿?æ?¥"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1010
-#, c-format
-msgid "HELO command failed: %s"
-msgstr "HELO æ??ä»¤å¤±æ??ï¼?%s"
-
-# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1027
-msgid "HELO command failed"
-msgstr "HELO æ??ä»¤å¤±æ??"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1006
+#: ../camel/providers/smtp/camel-smtp-transport.c:1021
+#: ../camel/providers/smtp/camel-smtp-transport.c:1028
+msgid "HELO command failed: "
+msgstr "HELO æ??ä»¤å¤±æ??ï¼?"
 
 # mail/mail-config.glade.h:10
-#: ../camel/providers/smtp/camel-smtp-transport.c:1093
+#: ../camel/providers/smtp/camel-smtp-transport.c:1095
 msgid "SMTP Authentication"
 msgstr "SMTP é©?è?"
 
 # camel/providers/smtp/camel-smtp-transport.c:728
-#: ../camel/providers/smtp/camel-smtp-transport.c:1099
+#: ../camel/providers/smtp/camel-smtp-transport.c:1102
+#, c-format
 msgid "Error creating SASL authentication object."
 msgstr "å»ºæ§? SASL é©?è?ç?©ä»¶æ??ç?¼ç??é?¯èª¤ã??"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1116
-#: ../camel/providers/smtp/camel-smtp-transport.c:1127
-#, c-format
-msgid "AUTH command failed: %s"
-msgstr "AUTH æ??ä»¤å¤±æ??ï¼?%s"
-
-# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1133
-msgid "AUTH command failed"
-msgstr "AUTH æ??ä»¤å¤±æ??"
-
-# camel/providers/smtp/camel-smtp-transport.c:809
-#: ../camel/providers/smtp/camel-smtp-transport.c:1203
-msgid "Bad authentication response from server.\n"
-msgstr "å¾?ä¼ºæ??å?¨å?³å??ä¸?æ£ç¢ºé©?è?ç??å??æ??ã??\n"
-
-# camel/providers/smtp/camel-smtp-transport.c:835
-#: ../camel/providers/smtp/camel-smtp-transport.c:1230
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "MAIL FROM æ??ä»¤å¤±æ??ï¼?%sï¼?é?µä»¶æ?ªå?³é??"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1118
+#: ../camel/providers/smtp/camel-smtp-transport.c:1128
+#: ../camel/providers/smtp/camel-smtp-transport.c:1136
+msgid "AUTH command failed: "
+msgstr "AUTH æ??ä»¤å¤±æ??ï¼?"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1247
-msgid "MAIL FROM command failed"
-msgstr "MAIL FROM æ??ä»¤å¤±æ??"
-
-# camel/providers/smtp/camel-smtp-transport.c:879
-#: ../camel/providers/smtp/camel-smtp-transport.c:1271
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "RCPT TO æ??ä»¤å¤±æ??ï¼?%sï¼?é?µä»¶æ?ªå?³é??"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1290
-#, c-format
-msgid "RCPT TO <%s> failed"
-msgstr "RCPT TO <%s> å¤±æ??"
-
-# camel/providers/smtp/camel-smtp-transport.c:929
-#: ../camel/providers/smtp/camel-smtp-transport.c:1330
-#: ../camel/providers/smtp/camel-smtp-transport.c:1399
-#: ../camel/providers/smtp/camel-smtp-transport.c:1418
-#, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "DATA æ??ä»¤å¤±æ??ï¼?%sï¼?é?µä»¶æ?ªå?³é??"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1233
+#: ../camel/providers/smtp/camel-smtp-transport.c:1245
+#: ../camel/providers/smtp/camel-smtp-transport.c:1252
+msgid "MAIL FROM command failed: "
+msgstr "MAIL FROM æ??ä»¤å¤±æ??ï¼?"
 
 # camel/providers/imap/camel-imap-command.c:240
-#. 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
-msgid "DATA command failed"
-msgstr "DATA æ??ä»¤å¤±æ??"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1275
+msgid "RCPT TO command failed: "
+msgstr "RCPT TO æ??ä»¤å¤±æ??ï¼?"
 
-# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1457
+#: ../camel/providers/smtp/camel-smtp-transport.c:1289
+#: ../camel/providers/smtp/camel-smtp-transport.c:1297
 #, c-format
-msgid "RSET command failed: %s"
-msgstr "RSET æ??ä»¤å¤±æ??ï¼?%s"
+msgid "RCPT TO <%s> failed: "
+msgstr "RCPT TO <%s> å¤±æ??ï¼?"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1473
-msgid "RSET command failed"
-msgstr "RSET æ??ä»¤å¤±æ??"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1335
+#: ../camel/providers/smtp/camel-smtp-transport.c:1344
+#: ../camel/providers/smtp/camel-smtp-transport.c:1354
+#: ../camel/providers/smtp/camel-smtp-transport.c:1411
+#: ../camel/providers/smtp/camel-smtp-transport.c:1427
+#: ../camel/providers/smtp/camel-smtp-transport.c:1438
+#: ../camel/providers/smtp/camel-smtp-transport.c:1445
+msgid "DATA command failed: "
+msgstr "DATA æ??ä»¤å¤±æ??ï¼?"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1496
-#, c-format
-msgid "QUIT command failed: %s"
-msgstr "QUIT æ??ä»¤å¤±æ??ï¼?%s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1467
+#: ../camel/providers/smtp/camel-smtp-transport.c:1479
+#: ../camel/providers/smtp/camel-smtp-transport.c:1486
+msgid "RSET command failed: "
+msgstr "RSET æ??ä»¤å¤±æ??ï¼?"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1510
-msgid "QUIT command failed"
-msgstr "QUIT æ??ä»¤å¤±æ??"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1508
+#: ../camel/providers/smtp/camel-smtp-transport.c:1521
+#: ../camel/providers/smtp/camel-smtp-transport.c:1527
+msgid "QUIT command failed: "
+msgstr "QUIT æ??ä»¤å¤±æ??ï¼?"
 
 # addressbook/contact-editor/e-contact-editor.c:1243
 # addressbook/contact-editor/e-contact-editor.c:1310
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:45
 msgid "Business"
 msgstr "å??å??é?»è©±"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:46
 msgid "Competition"
 msgstr "ç«¶ç?è??"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:47
 msgid "Favorites"
 msgstr "å??æ??ç??"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:48
 msgid "Gifts"
 msgstr "ç¦®ç?©"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:49
 msgid "Goals/Objectives"
 msgstr "çµ?é»?/ç?®æ¨?"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:50
 msgid "Holiday"
 msgstr "å??æ?¥"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:51
 msgid "Holiday Cards"
 msgstr "å??æ?¥é??è«?å?¡"
 
 # ui/evolution-addressbook.xml.h:17
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:53
 msgid "Hot Contacts"
 msgstr "ç?±é??é?£çµ¡äºº"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:54
 msgid "Ideas"
 msgstr "å?µæ??"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:55
 msgid "International"
 msgstr "å??é??ç??"
 
 # ui/evolution-event-editor.xml.h:15
 # ui/evolution-task-editor-dialog.xml.h:16
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:56
 msgid "Key Customer"
 msgstr "é??é?µå®¢æ?¶"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:57
 msgid "Miscellaneous"
 msgstr "é??é ?"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:58
 msgid "Personal"
 msgstr "å??äºº"
 
 # calendar/gui/e-meeting-dialog.glade.h:21
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:59
 msgid "Phone Calls"
 msgstr "é?»è©±"
 
 # calendar/gui/e-meeting-dialog.glade.h:23
 # mail/message-list.c:1081
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:61
 msgid "Status"
 msgstr "ç??æ??"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:62
 msgid "Strategies"
 msgstr "ç?ç?¥"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:63
 msgid "Suppliers"
 msgstr "ä¾?æ??å??"
 
 # addressbook/backend/ebook/e-card.c:3434
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:64
 msgid "Time & Expenses"
 msgstr "æ??é??è??é??é?·"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:65
 msgid "VIP"
 msgstr "VIP"
 
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:66
 msgid "Waiting"
 msgstr "æ£å?¨ç?å¾?"
 
@@ -5645,7 +5457,7 @@ msgstr "æ£å?¨ç?å¾?"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1633 ../libedataserver/e-time-utils.c:1898
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1902
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
@@ -5655,7 +5467,7 @@ msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1638 ../libedataserver/e-time-utils.c:1889
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1893
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %H:%M:%S"
 
@@ -5664,7 +5476,7 @@ msgstr "%Y/%m/%d (%a) %H:%M:%S"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1643 ../libedataserver/e-time-utils.c:1894
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1898
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
@@ -5673,21 +5485,21 @@ 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:1648 ../libedataserver/e-time-utils.c:1885
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1889
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 # e-util/e-time-utils.c:283
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1653
+#: ../libedataserver/e-time-utils.c:1655
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %m/%d/%Y %I %p"
 
 # e-util/e-time-utils.c:274
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1658
+#: ../libedataserver/e-time-utils.c:1660
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %m/%d/%Y %H"
 
@@ -5696,43 +5508,43 @@ msgstr "%a %m/%d/%Y %H"
 # widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1661 ../libedataserver/e-time-utils.c:1761
-#: ../libedataserver/e-time-utils.c:1880
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1765
+#: ../libedataserver/e-time-utils.c:1884
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
 # calendar/gui/calendar-model.c:797
 # e-util/e-time-utils.c:287
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1668
+#: ../libedataserver/e-time-utils.c:1670
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%m/%d/%Y %I:%M:%S %p"
 
 # calendar/gui/calendar-model.c:794
 # e-util/e-time-utils.c:278
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1672
+#: ../libedataserver/e-time-utils.c:1674
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%m/%d/%Y %H:%M:%S"
 
 # e-util/e-time-utils.c:283
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1677
+#: ../libedataserver/e-time-utils.c:1679
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%m/%d/%Y %I:%M %p"
 
 # e-util/e-time-utils.c:274
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1682
+#: ../libedataserver/e-time-utils.c:1684
 msgid "%m/%d/%Y %H:%M"
 msgstr "%m/%d/%Y %H:%M"
 
 # e-util/e-time-utils.c:283
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1687
+#: ../libedataserver/e-time-utils.c:1689
 msgid "%m/%d/%Y %I %p"
 msgstr "%m/%d/%Y %I %p"
 
@@ -5743,7 +5555,7 @@ msgstr "%m/%d/%Y %I %p"
 # widgets/misc/e-dateedit.c:1465
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1692
+#: ../libedataserver/e-time-utils.c:1694
 msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%Y %H"
 
@@ -5754,21 +5566,21 @@ msgstr "%m/%d/%Y %H"
 # widgets/misc/e-dateedit.c:1465
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1695 ../libedataserver/e-time-utils.c:1764
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1768
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
 # e-util/e-time-utils.c:323
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1822 ../libedataserver/e-time-utils.c:1942
+#: ../libedataserver/e-time-utils.c:1826 ../libedataserver/e-time-utils.c:1946
 msgid "%I:%M:%S %p"
 msgstr "%p %I:%M:%S"
 
 # e-util/e-time-utils.c:315
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1826 ../libedataserver/e-time-utils.c:1934
+#: ../libedataserver/e-time-utils.c:1830 ../libedataserver/e-time-utils.c:1938
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -5780,7 +5592,7 @@ msgstr "%H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1831 ../libedataserver/e-time-utils.c:1939
+#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1943
 msgid "%I:%M %p"
 msgstr "%p %I:%M"
 
@@ -5791,7 +5603,7 @@ msgstr "%p %I:%M"
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1931
+#: ../libedataserver/e-time-utils.c:1839 ../libedataserver/e-time-utils.c:1935
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -5800,7 +5612,7 @@ msgstr "%H:%M"
 # widgets/misc/e-dateedit.c:1318
 # widgets/misc/e-dateedit.c:1497
 #. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1838
+#: ../libedataserver/e-time-utils.c:1842
 msgid "%H%M"
 msgstr "%H%M"
 
@@ -5809,40 +5621,40 @@ msgstr "%H%M"
 # widgets/misc/e-dateedit.c:1321
 # widgets/misc/e-dateedit.c:1500
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1842
+#: ../libedataserver/e-time-utils.c:1846
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-book-auth-util.c:90
+#: ../libedataserverui/e-book-auth-util.c:93
 msgid "Accessing LDAP Server anonymously"
 msgstr "æ£ä»¥å?¿å??æ?¹å¼?å?å?? LDAP ä¼ºæ??å?¨"
 
-#: ../libedataserverui/e-book-auth-util.c:192
+#: ../libedataserverui/e-book-auth-util.c:199
 msgid "Failed to authenticate.\n"
 msgstr "é©?è?æ??è?å¤±æ??ã??\n"
 
 # calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.c:143
+#: ../libedataserverui/e-categories-dialog.c:145
 msgid "Category Icon"
 msgstr "å??é¡?å??ç¤º"
 
-#: ../libedataserverui/e-categories-dialog.c:149
+#: ../libedataserverui/e-categories-dialog.c:151
 msgid "_No Image"
 msgstr "æ²?æ??å??ç??(_N)"
 
-#: ../libedataserverui/e-categories-dialog.c:370
+#: ../libedataserverui/e-categories-dialog.c:372
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "å?¨çµ?æ??ä¸å·²ç¶?æ??å??ç?ºã??%sã??ç??å??é¡?ã??è«?ä½¿ç?¨å?¦å¤?ç??å??ç¨±"
 
-#: ../libedataserverui/e-categories-dialog.c:678
+#: ../libedataserverui/e-categories-dialog.c:680
 msgid "Icon"
 msgstr "å??ç¤º"
 
 # calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-categories-dialog.c:683
+#: ../libedataserverui/e-categories-dialog.c:685
 msgid "Category"
 msgstr "å??é¡?"
 
@@ -5862,10 +5674,9 @@ msgstr "å??é¡?å??ç¤º(_I)"
 msgid "Category _Name"
 msgstr "å??é¡?å??ç¨±(_N)"
 
-# addressbook/contact-editor/e-contact-editor.c:603
 #: ../libedataserverui/e-categories-dialog.ui.h:4
-msgid "Item(s) _belong to these categories:"
-msgstr "å±¬æ?¼é??äº?å??é¡?ç??é ?ç?®(_B):"
+msgid "Currently _used categories:"
+msgstr "ç?®å??ä½¿ç?¨ç??å??é¡?(_U):"
 
 # calendar/gui/e-calendar-table.c:150
 #: ../libedataserverui/e-categories-dialog.ui.h:5
@@ -5882,33 +5693,25 @@ msgid "categories"
 msgstr "å??é¡?"
 
 # calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-category-completion.c:290
+#: ../libedataserverui/e-category-completion.c:292
 #, c-format
 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:587
+#: ../libedataserverui/e-name-selector-dialog.c:658
 msgid "_Add"
 msgstr "å? å?¥(_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:612
+#: ../libedataserverui/e-name-selector-dialog.c:662
 msgid "_Remove"
 msgstr "ç§»é?¤(_R)"
 
 # calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-name-selector-dialog.c:789
+#: ../libedataserverui/e-name-selector-dialog.c:858
 #: ../libedataserverui/e-name-selector-dialog.ui.h:6
 msgid "Any Category"
 msgstr "ä»»ä½?å??é¡?"
@@ -5953,56 +5756,56 @@ msgid "_Search:"
 msgstr "æ??å°?(_S):"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2508
+#: ../libedataserverui/e-name-selector-entry.c:2559
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "å±?é??è¡?å?§ %s"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2523
+#: ../libedataserverui/e-name-selector-entry.c:2574
 #, c-format
 msgid "Cop_y %s"
 msgstr "è¤?è£½(_Y) %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2533
+#: ../libedataserverui/e-name-selector-entry.c:2584
 #, c-format
 msgid "C_ut %s"
 msgstr "å?ªä¸?(_U) %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2550
+#: ../libedataserverui/e-name-selector-entry.c:2601
 #, c-format
 msgid "_Edit %s"
 msgstr "ç·¨è¼¯ %s(_E)"
 
-#: ../libedataserverui/e-name-selector-list.c:469
+#: ../libedataserverui/e-name-selector-list.c:517
 #, c-format
 msgid "_Delete %s"
 msgstr "å?ªé?¤(_D) %s"
 
-#: ../libedataserverui/e-passwords.c:234
+#: ../libedataserverui/e-passwords.c:257
 #, c-format
 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 "æ?¨ç?? Caps Lock æ?¯é??å??ç??ã??"
 
-#: ../libedataserverui/e-passwords.c:1215
+#: ../libedataserverui/e-passwords.c:1238
 msgid "_Remember this passphrase"
 msgstr "è¨?ä½?é??å??å¯?èª?(_R)"
 
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:1239
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "è¨?ä½?é??å??ç?¨æ?¼å?©é¤?ç??å·¥ä½?é??æ®µç??å¯?èª?(_R)"
 
-#: ../libedataserverui/e-passwords.c:1221
+#: ../libedataserverui/e-passwords.c:1244
 msgid "_Remember this password"
 msgstr "è¨?ä½?é??å??å¯?ç¢¼(_R)"
 
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:1245
 msgid "_Remember this password for the remainder of this session"
 msgstr "è¨?ä½?é??å??ç?¨æ?¼å?©é¤?ç??å·¥ä½?é??æ®µç??å¯?ç¢¼(_R)"
 
@@ -6012,40 +5815,28 @@ msgstr "è¨?ä½?é??å??ç?¨æ?¼å?©é¤?ç??å·¥ä½?é??æ®µç??å¯?ç¢¼(_R)"
 msgid "Select destination"
 msgstr "é?¸å??ç?®ç??å?°"
 
-#: ../libedataserverui/e-source-selector-dialog.c:156
+#: ../libedataserverui/e-source-selector-dialog.c:172
 msgid "_Destination"
 msgstr "ç?®ç??ç«¯(_D)"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../servers/groupwise/e-gw-connection.c:225
+#: ../servers/groupwise/e-gw-connection.c:227
 msgid "Invalid connection"
 msgstr "ç?¡æ??ç??é?£ç·?"
 
 # camel/camel-sasl-kerberos4.c:218
 # camel/providers/imap/camel-imap-store.c:433
-#: ../servers/groupwise/e-gw-connection.c:229
+#: ../servers/groupwise/e-gw-connection.c:231
 msgid "Invalid response from server"
 msgstr "ç?¡æ??ç??ä¼ºæ??å?¨å??æ??"
 
 # camel/camel-sasl-kerberos4.c:218
 # camel/providers/imap/camel-imap-store.c:433
-#: ../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 "é?¯èª¤ç??å??æ?¸"
-
-#~ 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"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]